Deploying to gh-pages from @ aa9887d 🚀

iframe.html

@@ -363,4 +363,4 @@
 
 
 
-            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.27ec7551.iframe.bundle.js"></script><script src="832.1f4b3c69.iframe.bundle.js"></script><script src="main.7c63ad66.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.27ec7551.iframe.bundle.js"></script><script src="832.1f4b3c69.iframe.bundle.js"></script><script src="main.3dfc7458.iframe.bundle.js"></script></body></html>

project.json

@@ -1 +1 @@
-{"generatedAt":1723453161618,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":true,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"10.7.0"},"language":"javascript","storybookPackages":{},"framework":{},"addons":{"@storybook/addon-links":{"version":"6.5.16"},"@storybook/addon-essentials":{"options":{"backgrounds":false},"version":"6.5.16"}}}
+{"generatedAt":1723472035002,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":true,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"10.7.0"},"language":"javascript","storybookPackages":{},"framework":{},"addons":{"@storybook/addon-links":{"version":"6.5.16"},"@storybook/addon-essentials":{"options":{"backgrounds":false},"version":"6.5.16"}}}

react-extension/components/ResourceDescription/EditResourceDescription/EditResourceDescription.js

@@ -43,7 +43,7 @@ class EditResourceDescription extends React.Component {
   getDefaultState() {
     return {
       encryptDescription: this.mustEncryptDescription(),
-      description: this.props.plaintextSecretDto?.description || this.props.resource.description, // description of the resource
+      description: this.props.plaintextSecretDto?.description || this.props.resource.metadata.description, // description of the resource
       processing: false, // component processing
       error: "" // error to display
     };
@@ -185,7 +185,10 @@ class EditResourceDescription extends React.Component {
   async updateCleartextDescription() {
     const resourceDto = {
       ...this.props.resource,
-      description: this.state.description
+      metadata: {
+        ...this.props.resource.metadata,
+        description: this.state.description,
+      }
     };
 
     await this.props.context.port.request("passbolt.resources.update", resourceDto, null);

react-extension/components/ResourceDescription/EditResourceDescription/EditResourceDescription.test.stories.js

@@ -50,7 +50,10 @@ const Template = args =>
 export const Initial = Template.bind({});
 Initial.args = {
   resource: {
-    "resource_type_id": "669f8c64-242a-59fb-92fc-81f660975fd3"
+    resource_type_id: "669f8c64-242a-59fb-92fc-81f660975fd3",
+    metadata: {
+      description: "This is an amazing resource!"
+    }
   },
   onClose: () => {}
 };

react-extension/components/ResourceDetails/DisplayResourceDetails/DisplayResourceDetailsDescription.test.js

@@ -142,7 +142,7 @@ describe("See description", () => {
       await page.passwordSidebarDescriptionSection.click(page.descriptionEditor.saveButton);
       expect(page.descriptionEditor.component).toBeNull();
       const resourceDto = resourceOwnedWithNoDescriptionMock;
-      resourceDto.description = "Updated description";
+      resourceDto.metadata.description = "Updated description";
       expect(context.port.request).toHaveBeenCalledWith("passbolt.resources.update", resourceDto, null);
       // notification toaster called
       expect(ActionFeedbackContext._currentValue.displaySuccess).toHaveBeenCalledWith("The description has been updated successfully");

react-extension/components/Share/ShareDialog.js

@@ -388,7 +388,7 @@ class ShareDialog extends Component {
       return;
     }
     if (this.isAboutAResource()) {
-      return this.resources[0].name;
+      return this.resources[0].metadata.name;
     }
     if (this.isAboutAFolder()) {
       return this.folders[0].name;
@@ -408,7 +408,7 @@ class ShareDialog extends Component {
     if (!acos || !acos.length || acos.length === 1) {
       return '';
     }
-    return acos.map(acos => acos.name).join(', ');
+    return acos.map(aco => aco.permission.aco === "Resource" ? aco.metadata.name : aco.name).join(', ');
   }
 
   /**