passbolt-styleguide 5.14.0 → 5.14.2

package/build/locales/pl-PL/common.json

@@ -1323,8 +1323,8 @@
   "Tags management": "Zarządzanie tagami",
   "Tags starting with # are shared with all users who have access. Separate tags using commas.": "Tagi zaczynające się od znaku # są udostępniane wszystkim użytkownikom, którzy mają dostęp. Oddziel tagi przecinkami.",
   "Take a deep breath and enjoy being in the present moment...": "Weź głęboki wdech i naciesz się tą chwilą...",
-  "Tenant ID": "Tenant ID",
-  "Tenant ID is required.": "Tenant ID jest wymagane.",
+  "Tenant ID": "ID grupy dostępowej",
+  "Tenant ID is required.": "ID grupy dostępowej jest wymagane.",
   "Terms & Credits": "Warunki i podziękowania",
   "Test settings": "Testuj ustawienia",
   "Test settings report": "Przetestuj raport ustawień",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passbolt-styleguide",
-  "version": "5.14.0",
+  "version": "5.14.2",
   "license": "AGPL-3.0",
   "copyright": "Copyright 2023 Passbolt SA",
   "description": "Passbolt styleguide contains common styling assets used by the different sites, plugin, etc.",

package/src/locales/pl-PL/common.json

@@ -1323,8 +1323,8 @@
   "Tags management": "Zarządzanie tagami",
   "Tags starting with # are shared with all users who have access. Separate tags using commas.": "Tagi zaczynające się od znaku # są udostępniane wszystkim użytkownikom, którzy mają dostęp. Oddziel tagi przecinkami.",
   "Take a deep breath and enjoy being in the present moment...": "Weź głęboki wdech i naciesz się tą chwilą...",
-  "Tenant ID": "Tenant ID",
-  "Tenant ID is required.": "Tenant ID jest wymagane.",
+  "Tenant ID": "ID grupy dostępowej",
+  "Tenant ID is required.": "ID grupy dostępowej jest wymagane.",
   "Terms & Credits": "Warunki i podziękowania",
   "Test settings": "Testuj ustawienia",
   "Test settings report": "Przetestuj raport ustawień",

package/src/react-extension/components/Administration/DowngradeToCe/DowngradeToCe.js

@@ -41,7 +41,7 @@ import SpinnerSVG from "../../../../img/svg/spinner.svg";
 import SSOSVG from "../../../../img/svg/sso.svg";
 import TagsSVG from "../../../../img/svg/tags.svg";
 
-export const LEARN_MORE_URL = "https://www.passbolt.com/docs";
+export const LEARN_MORE_URL = "https://www.passbolt.com/docs/hosting/manage-plan/downgrade";
 
 class DowngradeToCe extends React.Component {
   /**

package/src/react-extension/components/Resource/CreateResource/CreateResource.js

@@ -86,6 +86,7 @@ class CreateResource extends Component {
     this.rejectCreationConfirmation = this.rejectCreationConfirmation.bind(this);
     this.consumePasswordEntropyError = this.consumePasswordEntropyError.bind(this);
     this.save = this.save.bind(this);
+    this.props.setFocusBackListener(this.handleFocusBack.bind(this));
   }
 
   /**
@@ -410,7 +411,6 @@ class CreateResource extends Component {
    */
   async save(resource) {
     await this.props.onSubmit(resource);
-    this.handleClose();
   }
 
   /*
@@ -502,6 +502,15 @@ class CreateResource extends Component {
     });
   }
 
+  /**
+   * Triggered when the dialog should have the focus back.
+   */
+  handleFocusBack() {
+    this.setState({
+      isProcessing: false,
+    });
+  }
+
   /**
    * Get the expiration date on the given resource according to the password expiry settings.
    * The value is set to `undefined` if the feature is not activated,
@@ -612,6 +621,7 @@ CreateResource.propTypes = {
   passwordPoliciesContext: PropTypes.object, // The password policy context
   resourceTypes: PropTypes.instanceOf(ResourceTypesCollection), // The resource types collection
   resourceType: PropTypes.instanceOf(ResourceTypeEntity).isRequired, // The resource types entity
+  setFocusBackListener: PropTypes.func, // Event handler for handling focusing back on this dialog
   t: PropTypes.func, // The translation function
 };
 

package/src/react-extension/components/Resource/CreateResource/CreateResource.test.data.js

@@ -58,6 +58,8 @@ export function defaultProps(data = {}) {
     dialogContext: defaultDialogContext(),
     clipboardContext: defaultClipboardContext(),
     onConfirm: jest.fn(),
+    onSubmit: jest.fn(),
+    setFocusBackListener: jest.fn(),
   };
 
   return Object.assign(defaultData, data);

package/src/react-extension/components/Resource/CreateResource/CreateResource.test.js

@@ -1288,11 +1288,11 @@ describe("See the Create Resource", () => {
       });
       resolveSubmit();
       await waitFor(() => {
-        if (!props.onClose.mock.calls.length) {
+        if (!props.onSubmit.mock.calls.length) {
           throw new Error("onClose not yet invoked");
         }
       });
-      expect(props.onClose).toHaveBeenCalledTimes(1);
+      expect(props.onSubmit).toHaveBeenCalledTimes(1);
     });
   });
 });

package/src/react-extension/components/Resource/EditResource/EditResource.js

@@ -91,6 +91,7 @@ class EditResource extends Component {
     this.rejectEditionConfirmation = this.rejectEditionConfirmation.bind(this);
     this.consumePasswordEntropyError = this.consumePasswordEntropyError.bind(this);
     this.save = this.save.bind(this);
+    this.props.setFocusBackListener(this.handleFocusBack.bind(this));
   }
 
   /**
@@ -480,53 +481,18 @@ class EditResource extends Component {
    * @returns {Promise<void>}
    */
   async save(resource) {
-    if (this.props.onSubmit) {
-      await this.props.onSubmit(resource);
-      this.handleClose();
-      return;
-    }
-    await this.updateResource(resource);
-    await this.handleSaveSuccess();
-  }
-
-  /*
-   * =============================================================
-   *  Update resource
-   * =============================================================
-   */
-  /**
-   * Update the resource
-   * @param {ResourceFormEntity} resource
-   * @returns {Promise<void>}
-   */
-  async updateResource(resource) {
     const isSecretChanged = resource.secret.areSecretsDifferent(this.state.originalSecret);
-    if (this.props.resource.resource_type_id === resource.resourceTypeId) {
-      if (!isSecretChanged) {
-        await this.props.context.port.request("passbolt.resources.update", resource.toResourceDto(), null);
-        return;
-      }
-    }
-
     if (isSecretChanged && this.shouldUpdateExpirationDate()) {
       resource.set("expired", this.getResourceExpirationDate());
     }
 
-    const resourceDto = resource.toResourceDto();
-    const resourceType = this.props.resourceTypes.getFirstById(resource.resourceTypeId);
-    const secretDto = resourceType.isPasswordString() ? resource.toSecretDto().password : resource.toSecretDto();
-
-    await this.props.context.port.request("passbolt.resources.update", resourceDto, secretDto);
-  }
+    let secretDto = null;
+    if (isSecretChanged || this.props.resource.resource_type_id !== resource.resourceTypeId) {
+      const resourceType = this.props.resourceTypes.getFirstById(resource.resourceTypeId);
+      secretDto = resourceType.isPasswordString() ? resource.toSecretDto().password : resource.toSecretDto();
+    }
 
-  /**
-   * Handle save operation success.
-   * @returns {Promise<void>}
-   */
-  async handleSaveSuccess() {
-    await this.props.actionFeedbackContext.displaySuccess(this.translate("The resource has been updated successfully"));
-    this.props.resourceWorkspaceContext.onResourceEdited();
-    this.handleClose();
+    await this.props.onSubmit(resource, secretDto);
   }
 
   /*
@@ -618,6 +584,15 @@ class EditResource extends Component {
     });
   }
 
+  /**
+   * Triggered when the dialog should have the focus back.
+   */
+  handleFocusBack() {
+    this.setState({
+      isProcessing: false,
+    });
+  }
+
   /**
    * Is allowed to convert a note
    * @returns {boolean}
@@ -775,6 +750,7 @@ EditResource.propTypes = {
   actionFeedbackContext: PropTypes.any, // The action feedback context
   resourceTypes: PropTypes.instanceOf(ResourceTypesCollection), // The resource types collection
   metadataTypeSettings: PropTypes.instanceOf(MetadataTypesSettingsEntity), // The metadata type settings
+  setFocusBackListener: PropTypes.func, // Event handler for handling focusing back on this dialog
   t: PropTypes.func, // The translation function
 };
 

package/src/react-extension/components/Resource/EditResource/EditResource.test.data.js

@@ -66,6 +66,8 @@ export function defaultProps(data = {}) {
     onClose: jest.fn(),
     dialogContext: defaultDialogContext(),
     clipboardContext: defaultClipboardContext(),
+    setFocusBackListener: jest.fn(),
+    onSubmit: jest.fn(),
   };
 
   return Object.assign(defaultData, data);

package/src/react-extension/components/Resource/EditResource/EditResource.test.js

@@ -282,7 +282,7 @@ describe("See the Create Resource", () => {
       });
 
       it("As a signed-in user I should be able to delete secret custom fields without a resource type mutation", async () => {
-        expect.assertions(6);
+        expect.assertions(5);
 
         const props = defaultProps();
         mockContextRequest(props.context, () => ({
@@ -330,19 +330,12 @@ describe("See the Create Resource", () => {
         };
 
         // expectations
-        expect(props.context.port.request).toHaveBeenCalledWith(
-          "passbolt.resources.update",
-          resourceDtoExpected,
-          secretDtoExpected,
-        );
-        expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-          "The resource has been updated successfully",
-        );
-        expect(props.onClose).toHaveBeenCalled();
+        expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+        expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
       });
 
       it("As LU operated by a workflow (onSubmit provided) I should delegate the save and not call passbolt.resources.update", async () => {
-        expect.assertions(3);
+        expect.assertions(2);
 
         const onSubmit = jest.fn();
         const props = defaultProps({ onSubmit });
@@ -355,12 +348,7 @@ describe("See the Create Resource", () => {
 
         // The workflow owns the API call: EditResource hands it the form entity and closes.
         expect(onSubmit).toHaveBeenCalledTimes(1);
-        expect(props.context.port.request).not.toHaveBeenCalledWith(
-          "passbolt.resources.update",
-          expect.anything(),
-          expect.anything(),
-        );
-        expect(props.onClose).toHaveBeenCalled();
+        expect(props.onSubmit).not.toHaveBeenCalledWith(expect.anything(), expect.anything());
       });
 
       it("As a signed-in user I should be able to delete secret with a resource type mutation", async () => {
@@ -1351,7 +1339,7 @@ describe("See the Create Resource", () => {
 
         const error = new Error("unexpected error");
         jest.spyOn(props.dialogContext, "open").mockImplementationOnce((component, props) => props.onConfirm());
-        jest.spyOn(props.context.port, "request").mockImplementation(() => {
+        props.onSubmit.mockImplementation(() => {
           throw error;
         });
 
@@ -1466,7 +1454,7 @@ describe("See the Create Resource", () => {
 
         const error = new Error("unexpected error");
         jest.spyOn(props.dialogContext, "open").mockImplementationOnce((component, props) => props.onConfirm());
-        jest.spyOn(props.context.port, "request").mockImplementation(() => {
+        props.onSubmit.mockImplementation(() => {
           throw error;
         });
 
@@ -1554,7 +1542,7 @@ describe("See the Create Resource", () => {
 
   describe("should save a secret to a resource", () => {
     it("As a signed-in user I should be able to save a resource v5 default", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const expirationPeriod = 15;
       const passwordExpirySettings = overridenPasswordExpirySettingsEntityDto({
         default_expiry_period: expirationPeriod,
@@ -1607,19 +1595,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v5 default with no expiry update", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const expirationPeriod = 15;
       const passwordExpirySettings = overridenPasswordExpirySettingsEntityDto({
         default_expiry_period: expirationPeriod,
@@ -1673,19 +1654,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v5 default with totp empty", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps({
         resource: defaultResourceDto({
           resource_type_id: TEST_RESOURCE_TYPE_V5_DEFAULT,
@@ -1732,19 +1706,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v5 default with totp and custom fields", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps();
       mockContextRequest(props.context, () => ({ password: "password" }));
       let page;
@@ -1778,13 +1745,11 @@ describe("See the Create Resource", () => {
       await page.click(page.addUri);
       await page.fillInput(page.getAdditionalUri(1), "https://www.passbolt.com/docs");
 
-      const customFields = {};
-      mockContextRequest(
-        props.context,
-        jest.fn(async (message, arg1) => Object.assign(customFields, arg1.metadata.custom_fields)),
-      );
       await page.click(page.saveButton);
 
+      const resourceDto = props.onSubmit.mock.calls[0][0].toResourceDto();
+      const customFields = resourceDto.metadata.custom_fields;
+
       const resourceDtoExpected = {
         id: props.resource.id,
         expired: null,
@@ -1832,19 +1797,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v5 default with totp with password null", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps();
       mockContextRequest(props.context, () => ({ object_type: SECRET_DATA_OBJECT_TYPE, password: "password" }));
       let page;
@@ -1892,19 +1850,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v5 totp after password, custom fields and note deleted", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps();
       mockContextRequest(props.context, () => ({
         object_type: SECRET_DATA_OBJECT_TYPE,
@@ -1954,19 +1905,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v5 standalone custom fields", async () => {
-      expect.assertions(4);
+      expect.assertions(3);
       const props = defaultCustomFieldsProps();
       mockContextRequest(props.context, () => ({
         object_type: SECRET_DATA_OBJECT_TYPE,
@@ -1986,13 +1930,11 @@ describe("See the Create Resource", () => {
 
       await page.fillInput(page.name, "v5 standalone custom fields");
 
-      const customFields = {};
-      mockContextRequest(
-        props.context,
-        jest.fn(async (message, arg1) => Object.assign(customFields, arg1.metadata.custom_fields)),
-      );
       await page.click(page.saveButton);
 
+      const resourceDto = props.onSubmit.mock.calls[0][0].toResourceDto();
+      const customFields = resourceDto.metadata.custom_fields;
+
       const resourceDtoExpected = {
         id: props.resource.id,
         expired: null,
@@ -2037,19 +1979,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v4 default with password deleted", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps({
         resource: defaultResourceDto({
           metadata: defaultResourceMetadataDto({
@@ -2096,19 +2031,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v4 default totp with password deleted", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps({
         resource: defaultResourceDto({
           metadata: defaultResourceMetadataDto({
@@ -2161,19 +2089,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v4 default totp", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps({
         resource: defaultResourceDto({ resource_type_id: TEST_RESOURCE_TYPE_PASSWORD_STRING }),
       });
@@ -2215,19 +2136,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to upgrade and save a resource v4 default to v5 default", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps({
         resource: defaultResourceDto({
           metadata: defaultResourceMetadataDto({
@@ -2269,19 +2183,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v4 default without changing secret, only resource type", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps({
         resource: defaultResourceDto({ resource_type_id: TEST_RESOURCE_TYPE_PASSWORD_STRING }),
       });
@@ -2319,19 +2226,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v4 totp after password and note deleted", async () => {
-      expect.assertions(3);
+      expect.assertions(2);
       const props = defaultProps({
         resource: defaultResourceDto({
           metadata: defaultResourceMetadataDto({
@@ -2377,19 +2277,12 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As a signed-in user I should be able to save a resource v4 password and note after standalone totp deleted", async () => {
-      expect.assertions(4);
+      expect.assertions(3);
       const props = defaultProps({
         resource: defaultResourceDto({
           metadata: defaultResourceMetadataDto({ resource_type_id: TEST_RESOURCE_TYPE_TOTP, description: null }),
@@ -2439,15 +2332,8 @@ describe("See the Create Resource", () => {
       };
 
       // expectations
-      expect(props.context.port.request).toHaveBeenCalledWith(
-        "passbolt.resources.update",
-        resourceDtoExpected,
-        secretDtoExpected,
-      );
-      expect(props.actionFeedbackContext.displaySuccess).toHaveBeenCalledWith(
-        "The resource has been updated successfully",
-      );
-      expect(props.onClose).toHaveBeenCalled();
+      expect(props.onSubmit.mock.calls[0][0].toResourceDto()).toStrictEqual(resourceDtoExpected);
+      expect(props.onSubmit.mock.calls[0][1]).toStrictEqual(secretDtoExpected);
     });
 
     it("As LU I should see an error dialog if the submit operation fails for an unexpected reason", async () => {
@@ -2462,7 +2348,7 @@ describe("See the Create Resource", () => {
       await act(async () => (page = new EditResourcePage(props)));
 
       const error = new PassboltApiFetchError("Jest simulate API error.");
-      jest.spyOn(props.context.port, "request").mockImplementation(() => {
+      props.onSubmit.mockImplementation(() => {
         throw error;
       });
       jest.spyOn(props.dialogContext, "open").mockImplementationOnce(jest.fn);