passbolt-styleguide 5.14.0 → 5.14.2

package/src/react-extension/components/Resource/HandlePermissionWorkflow/flows/ResourceCreationFlow.js

@@ -61,10 +61,12 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
     this.formSubmitted = false;
     this.shareConfirmed = false;
     this.pendingResourceFormEntity = null;
+    this.createResourceDialogFocusBackListener = null;
     this.handleCreateResourceSubmit = this.handleCreateResourceSubmit.bind(this);
     this.handleCreateResourceClose = this.handleCreateResourceClose.bind(this);
     this.handleShareDialogConfirm = this.handleShareDialogConfirm.bind(this);
     this.handleShareDialogClose = this.handleShareDialogClose.bind(this);
+    this.setFocusBackListener = this.setFocusBackListener.bind(this);
   }
 
   /**
@@ -74,6 +76,7 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
   get defaultState() {
     return {
       status: RESOURCE_CREATION_FLOW_STATUS.INITIALIZING,
+      createResourceDialogId: null,
       snapshot: null,
     };
   }
@@ -100,13 +103,17 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
    * Open the CreateResource dialog and transition to the CREATE_RESOURCE_OPEN state.
    */
   openCreateResourceDialog() {
-    this.props.dialogContext.open(CreateResource, {
+    const createResourceDialogId = this.props.dialogContext.open(CreateResource, {
       resourceType: this.props.resourceType,
       folderParentId: this.props.folderParentId,
       onSubmit: this.handleCreateResourceSubmit,
       onClose: this.handleCreateResourceClose,
+      setFocusBackListener: this.setFocusBackListener,
+    });
+    this.setState({
+      status: RESOURCE_CREATION_FLOW_STATUS.CREATE_RESOURCE_OPEN,
+      createResourceDialogId: createResourceDialogId,
     });
-    this.setState({ status: RESOURCE_CREATION_FLOW_STATUS.CREATE_RESOURCE_OPEN });
   }
 
   /**
@@ -122,6 +129,7 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
           permissions: this.state.snapshot.permissions,
         },
       ],
+      initialChanges: this.state.snapshot.permissions.items,
       initialGroups: this.state.snapshot.groups,
       initialUsers: this.state.snapshot.users,
       onConfirm: this.handleShareDialogConfirm,
@@ -150,6 +158,8 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
         this.props.t("The resource has been added successfully"),
         `/app/passwords/view/${created.id}`,
       );
+      this.closeCreateResourceDialog();
+      this.terminate();
     } catch (error) {
       this.handleError(error);
     }
@@ -161,9 +171,6 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
    * dialog or API call); ignore it. Otherwise it's a cancellation: terminate.
    */
   handleCreateResourceClose() {
-    if (this.formSubmitted) {
-      return;
-    }
     this.terminate();
   }
 
@@ -196,13 +203,14 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
         // exist yet. The extension stamps real ids server-side as part of its create-then-share
         // orchestration, so passing null here is fine.
         null,
-        this.props.context.loggedInUser.id,
       );
       const created = await this.createResource(this.pendingResourceFormEntity, finalChanges);
       await this.finalizeSuccess(
         this.props.t("The resource has been added successfully"),
         `/app/passwords/view/${created.id}`,
       );
+      this.closeCreateResourceDialog();
+      this.terminate();
     } catch (error) {
       this.handleError(error);
     }
@@ -217,7 +225,23 @@ export class ResourceCreationFlow extends AbstractPermissionFlow {
     if (this.shareConfirmed) {
       return;
     }
-    this.terminate();
+    this.createResourceDialogFocusBackListener?.();
+  }
+
+  /**
+   * Closes the currently opened create resource dialog.
+   */
+  closeCreateResourceDialog() {
+    this.props.dialogContext.close(this.state.createResourceDialogId);
+  }
+
+  /**
+   * Sets the callback for when the create resource dialog needs to get the focus back.
+   * It's necessary for when the operator cancels the "share" process.
+   * @param {function} listener
+   */
+  setFocusBackListener(listener) {
+    this.createResourceDialogFocusBackListener = listener;
   }
 
   /**

package/src/react-extension/components/Resource/HandlePermissionWorkflow/flows/ResourceCreationFlow.test.js

@@ -165,9 +165,10 @@ describe("ResourceCreationFlow", () => {
       // the operator's autocomplete addition; the operator's own row is excluded.
       const createCall = props.context.port.request.mock.calls.find(([event]) => event === "passbolt.resources.create");
       const createPermissionsArg = createCall[3];
-      expect(createPermissionsArg).toHaveLength(2);
+      expect(createPermissionsArg).toHaveLength(3);
       expect(createPermissionsArg).toEqual(
         expect.arrayContaining([
+          expect.objectContaining({ is_new: true, aro_foreign_key: operatorId, type: 15 }),
           expect.objectContaining({ is_new: true, aro_foreign_key: readerId, type: 1 }),
           expect.objectContaining({ is_new: true, aro_foreign_key: newAroId, type: 1 }),
         ]),
@@ -342,7 +343,7 @@ describe("ResourceCreationFlow", () => {
       );
     });
 
-    it("As LU cancelling ShareDialog should terminate the workflow without creating the resource", async () => {
+    it("As LU cancelling ShareDialog should go back to the resource creation dialog without creating the resource", async () => {
       expect.assertions(2);
       const props = defaultProps();
       const operatorId = props.context.loggedInUser.id;
@@ -381,7 +382,7 @@ describe("ResourceCreationFlow", () => {
       const shareProps = dialogPropsFor(props.dialogContext, ShareDialog);
       shareProps.onClose();
 
-      expect(props.onStop).toHaveBeenCalledTimes(1);
+      expect(props.onStop).not.toHaveBeenCalled();
       expect(props.context.port.request).not.toHaveBeenCalledWith(
         "passbolt.resources.create",
         expect.anything(),

package/src/react-extension/components/Resource/HandlePermissionWorkflow/flows/ResourceEditFlow.js

@@ -20,8 +20,8 @@ import { withActionFeedback } from "../../../../contexts/ActionFeedbackContext";
 import EditResource from "../../EditResource/EditResource";
 import ShareDialog from "../../../Share/ShareDialog";
 import PermissionEntity from "../../../../../shared/models/entity/permission/permissionEntity";
-import { RESOURCE_TYPE_PASSWORD_STRING_SLUG } from "../../../../../shared/models/entity/resourceType/resourceTypeSchemasDefinition";
 import { AbstractPermissionFlow, PERMISSION_FLOW_STATUS } from "./AbstractPermissionFlow";
+import { withResourceWorkspace } from "../../../../contexts/ResourceWorkspaceContext";
 
 /**
  * Status values driving the resource-edition flow state machine.
@@ -61,10 +61,13 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
     this.formSubmitted = false;
     this.shareConfirmed = false;
     this.pendingResourceFormEntity = null;
+    this.pendingResourceSecret = null;
+    this.editResourceDialogFocusBackListener = null;
     this.handleEditResourceSubmit = this.handleEditResourceSubmit.bind(this);
     this.handleEditResourceClose = this.handleEditResourceClose.bind(this);
     this.handleShareDialogConfirm = this.handleShareDialogConfirm.bind(this);
     this.handleShareDialogClose = this.handleShareDialogClose.bind(this);
+    this.setFocusBackListener = this.setFocusBackListener.bind(this);
   }
 
   /**
@@ -74,6 +77,7 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
   get defaultState() {
     return {
       status: RESOURCE_EDIT_FLOW_STATUS.INITIALIZING,
+      editResourceDialogId: null,
       snapshot: null,
     };
   }
@@ -108,12 +112,13 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
    * Open the EditResource dialog and transition to the EDIT_RESOURCE_OPEN state.
    */
   openEditResourceDialog() {
-    this.props.dialogContext.open(EditResource, {
+    const editResourceDialogId = this.props.dialogContext.open(EditResource, {
       resource: this.props.resource,
       onSubmit: this.handleEditResourceSubmit,
       onClose: this.handleEditResourceClose,
+      setFocusBackListener: this.setFocusBackListener,
     });
-    this.setState({ status: RESOURCE_EDIT_FLOW_STATUS.EDIT_RESOURCE_OPEN });
+    this.setState({ status: RESOURCE_EDIT_FLOW_STATUS.EDIT_RESOURCE_OPEN, editResourceDialogId: editResourceDialogId });
   }
 
   /**
@@ -146,19 +151,22 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
    * @param {ResourceFormEntity} resourceFormEntity The validated form entity.
    * @returns {Promise<void>}
    */
-  async handleEditResourceSubmit(resourceFormEntity) {
+  async handleEditResourceSubmit(resourceFormEntity, secretDto) {
     this.formSubmitted = true;
     this.pendingResourceFormEntity = resourceFormEntity;
+    this.pendingResourceSecret = secretDto;
     try {
       if (this.isShared(this.state.snapshot)) {
         this.openShareDialog();
         return;
       }
-      await this.updateResource(resourceFormEntity);
+      await this.updateResource(resourceFormEntity, secretDto);
       await this.finalizeSuccess(
         this.props.t("The resource has been updated successfully"),
         `/app/passwords/view/${this.props.resource.id}`,
       );
+      this.closeEditResourceDialog();
+      this.terminate();
     } catch (error) {
       this.handleError(error);
     }
@@ -170,9 +178,6 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
    * or API call); ignore it. Otherwise it's a cancellation: terminate.
    */
   handleEditResourceClose() {
-    if (this.formSubmitted) {
-      return;
-    }
     this.terminate();
   }
 
@@ -200,11 +205,14 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
           ),
         );
       }
-      await this.updateResource(this.pendingResourceFormEntity, permissionChanges);
+      await this.updateResource(this.pendingResourceFormEntity, this.pendingResourceSecret, permissionChanges);
       await this.finalizeSuccess(
         this.props.t("The resource has been updated successfully"),
         `/app/passwords/view/${this.props.resource.id}`,
       );
+      this.closeEditResourceDialog();
+      this.terminate();
+      this.props.resourceWorkspaceContext.onResourceEdited();
     } catch (error) {
       this.handleError(error);
     }
@@ -219,7 +227,24 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
     if (this.shareConfirmed) {
       return;
     }
-    this.terminate();
+    this.editResourceDialogFocusBackListener?.();
+  }
+
+  /**
+   * Closes the currently opened edit resource dialog.
+   */
+  closeEditResourceDialog() {
+    this.pendingResourceSecret = null;
+    this.props.dialogContext.close(this.state.editResourceDialogId);
+  }
+
+  /**
+   * Sets the callback for when the edit resource dialog needs to get the focus back.
+   * It's necessary for when the operator cancels the "share" process.
+   * @param {function} listener
+   */
+  setFocusBackListener(listener) {
+    this.editResourceDialogFocusBackListener = listener;
   }
 
   /**
@@ -230,13 +255,8 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
    * @param {Array<object>} [permissionChanges] Operator-confirmed permission changes.
    * @returns {Promise<Object>} The updated resource DTO.
    */
-  updateResource(resourceFormEntity, permissionChanges) {
+  updateResource(resourceFormEntity, secretDto, permissionChanges) {
     const resourceDto = resourceFormEntity.toResourceDto();
-    const resourceType = resourceFormEntity.resourceTypeId
-      ? this.props.context.resourceTypesCollection?.getFirstById(resourceFormEntity.resourceTypeId)
-      : null;
-    const isV4PasswordString = resourceType?.slug === RESOURCE_TYPE_PASSWORD_STRING_SLUG;
-    const secretDto = isV4PasswordString ? resourceFormEntity.toSecretDto().password : resourceFormEntity.toSecretDto();
     return this.permissionServiceWorkerService.updateResource(resourceDto, secretDto, permissionChanges);
   }
 }
@@ -244,6 +264,9 @@ export class ResourceEditFlow extends AbstractPermissionFlow {
 ResourceEditFlow.propTypes = {
   ...AbstractPermissionFlow.propTypes,
   resource: PropTypes.object.isRequired, // the resource DTO being edited (carries the operator's own permission)
+  resourceWorkspaceContext: PropTypes.any, // The resource workspace context
 };
 
-export default withAppContext(withDialog(withActionFeedback(withRouter(withTranslation("common")(ResourceEditFlow)))));
+export default withAppContext(
+  withDialog(withActionFeedback(withRouter(withResourceWorkspace(withTranslation("common")(ResourceEditFlow))))),
+);

package/src/react-extension/components/Resource/HandlePermissionWorkflow/flows/ResourceEditFlow.test.js

@@ -64,6 +64,7 @@ function dialogPropsFor(dialogContext, DialogComponent) {
 }
 
 const fakeResourceFormEntity = { toResourceDto: () => ({}), toSecretDto: () => ({}) };
+const fakeSecretDto = { object_type: "PASSBOLT_SECRET_DATA" };
 
 /**
  * Mount the flow and wait until the EditResource dialog is open.
@@ -110,7 +111,7 @@ describe("ResourceEditFlow", () => {
 
       // Submit the form: ShareDialog must follow because the resource is shared.
       const editProps = dialogPropsFor(props.dialogContext, EditResource);
-      await act(() => editProps.onSubmit(fakeResourceFormEntity));
+      await act(() => editProps.onSubmit(fakeResourceFormEntity, fakeSecretDto));
       await waitFor(() => {
         if (page._instance.state.status !== RESOURCE_EDIT_FLOW_STATUS.SHARE_DIALOG_OPEN) {
           throw new Error("ShareDialog not yet opened");
@@ -168,7 +169,7 @@ describe("ResourceEditFlow", () => {
 
       const page = await mountUntilEditOpen(props);
       const editProps = dialogPropsFor(props.dialogContext, EditResource);
-      await act(() => editProps.onSubmit(fakeResourceFormEntity));
+      await act(() => editProps.onSubmit(fakeResourceFormEntity, fakeSecretDto));
       await waitFor(() => {
         if (page._instance.state.status !== RESOURCE_EDIT_FLOW_STATUS.SHARE_DIALOG_OPEN) {
           throw new Error("ShareDialog not yet opened");
@@ -214,7 +215,7 @@ describe("ResourceEditFlow", () => {
 
       const page = await mountUntilEditOpen(props);
       const editProps = dialogPropsFor(props.dialogContext, EditResource);
-      await act(() => editProps.onSubmit(fakeResourceFormEntity));
+      await act(() => editProps.onSubmit(fakeResourceFormEntity, fakeSecretDto));
       await waitFor(() => {
         if (page._instance.state.status !== RESOURCE_EDIT_FLOW_STATUS.SHARE_DIALOG_OPEN) {
           throw new Error("ShareDialog not yet opened");
@@ -255,7 +256,7 @@ describe("ResourceEditFlow", () => {
       jest
         .spyOn(props.context.port, "request")
         .mockImplementation((event) => (event === "passbolt.resources.update" ? { id: props.resource.id } : undefined));
-      await act(() => editProps.onSubmit(fakeResourceFormEntity));
+      await act(() => editProps.onSubmit(fakeResourceFormEntity, fakeSecretDto));
 
       expect(props.context.port.request).toHaveBeenCalledWith(
         "passbolt.resources.update",
@@ -292,8 +293,8 @@ describe("ResourceEditFlow", () => {
       );
     });
 
-    it("As LU cancelling ShareDialog should terminate the workflow without updating the resource", async () => {
-      expect.assertions(2);
+    it("As LU cancelling ShareDialog should return to the edit dialog without updating the resource", async () => {
+      expect.assertions(3);
       const props = defaultProps();
       const operatorId = props.context.loggedInUser.id;
       wireSnapshotListeners(props.context.port, {
@@ -305,7 +306,10 @@ describe("ResourceEditFlow", () => {
 
       const page = await mountUntilEditOpen(props);
       const editProps = dialogPropsFor(props.dialogContext, EditResource);
-      await act(() => editProps.onSubmit(fakeResourceFormEntity));
+      // The edit dialog registers a focus-back listener the flow calls to refocus it on share cancel.
+      const focusBackListener = jest.fn();
+      editProps.setFocusBackListener(focusBackListener);
+      await act(() => editProps.onSubmit(fakeResourceFormEntity, fakeSecretDto));
       await waitFor(() => {
         if (page._instance.state.status !== RESOURCE_EDIT_FLOW_STATUS.SHARE_DIALOG_OPEN) {
           throw new Error("ShareDialog not yet opened");
@@ -316,7 +320,9 @@ describe("ResourceEditFlow", () => {
       const shareProps = dialogPropsFor(props.dialogContext, ShareDialog);
       shareProps.onClose();
 
-      expect(props.onStop).toHaveBeenCalledTimes(1);
+      // Cancelling the share step returns to the edit dialog: the workflow is not terminated.
+      expect(focusBackListener).toHaveBeenCalledTimes(1);
+      expect(props.onStop).not.toHaveBeenCalled();
       expect(props.context.port.request).not.toHaveBeenCalledWith(
         "passbolt.resources.update",
         expect.anything(),

package/src/react-extension/components/Share/GroupPermissionItem.js

@@ -157,9 +157,11 @@ class GroupPermissionItem extends Component {
           />
         </div>
 
-        <div className="actions">
-          <SharePermissionDeleteButton onClose={this.handleDelete} disabled={isInputDisabled} />
-        </div>
+        {!this.props.isReadOnly && (
+          <div className="actions">
+            <SharePermissionDeleteButton onClose={this.handleDelete} disabled={isInputDisabled} />
+          </div>
+        )}
       </li>
     );
   }
@@ -183,6 +185,7 @@ GroupPermissionItem.propTypes = {
   shouldDisplayGroupMembers: PropTypes.bool,
   canDisplayGroupMembers: PropTypes.bool,
   permissionType: PropTypes.number,
+  isReadOnly: PropTypes.bool,
   t: PropTypes.func, // The translation function
 };
 

package/src/react-extension/components/Share/ShareDialog.js

@@ -82,6 +82,15 @@ class ShareDialog extends Component {
 
     this.shareChanges = new ShareChanges(this.resources, this.folders);
     const permissions = this.shareChanges.aggregatePermissionsByAro();
+
+    const permissionsMap = new Map(permissions.map((p) => [p.aro.id, p]));
+    this.props.initialChanges?.forEach((change) => {
+      const permission = permissionsMap.get(change.aroForeignKey);
+      if (permission) {
+        this.shareChanges.markPermissionHasChanged(permission);
+      }
+    });
+
     this.setState({ loading: false, name: "", permissions: permissions }, () => {
       // scroll at the top of the permission list
       this.permissionListRef.current.scrollTo(0);
@@ -326,7 +335,7 @@ class ShareDialog extends Component {
 
     // TODO restore to original permission if any
     const permission = this.shareChanges.addAroPermissions(aro);
-    permission.updated = true;
+    permission.updated = this.shareChanges.hasChanges(aro.id);
     const permissions = this.state.permissions;
     permissions.push(permission);
     this.setState({ permissions: permissions }, () => {
@@ -718,6 +727,7 @@ class ShareDialog extends Component {
           onToggleGroupMemberVisibility={this.handleToggleGroupMemberVisibility}
           shouldDisplayGroupMembers={this.state.expandedGroupIds.includes(permission.aro.id)}
           canDisplayGroupMembers={this.isControlledMode()}
+          isReadOnly={this.props.readOnly}
         />
       );
     }
@@ -733,6 +743,7 @@ class ShareDialog extends Component {
         disabled={this.hasAllInputDisabled() || this.isReadOnly()}
         onUpdate={this.handlePermissionUpdate}
         onDelete={this.handlePermissionDelete}
+        isReadOnly={this.props.readOnly}
       />
     );
   }
@@ -851,6 +862,7 @@ class ShareDialog extends Component {
 ShareDialog.defaultProps = {
   listMinSize: 4,
   isPermissionConfirmationMode: true,
+  initialChanges: [],
 };
 
 ShareDialog.propTypes = {
@@ -862,6 +874,7 @@ ShareDialog.propTypes = {
   listMinSize: PropTypes.number, // The minimum size to be renderered in the permission list
   isPermissionConfirmationMode: PropTypes.bool, // Is the dialog used to confirm permissions
   initialResources: PropTypes.array, // Controlled mode: the ACOs to seed the dialog with instead of fetching from the API, each as { id, metadata, permission, permissions: PermissionsCollection }
+  initialChanges: PropTypes.array, // Set of permission to mark them as "modified" in the initial list
   acoType: PropTypes.string, // Controlled mode: the ACO type of the seeded entries (PermissionEntity.ACO_RESOURCE, default, or ACO_FOLDER)
   initialGroups: PropTypes.object, // Controlled mode: GroupsCollection providing the groups referenced by the resources' permissions
   initialUsers: PropTypes.object, // Controlled mode: UsersCollection providing the users referenced by the resources' permissions

package/src/react-extension/components/Share/UserPermissionItem.js

@@ -185,9 +185,11 @@ class UserPermissionItem extends Component {
           />
         </div>
 
-        <div className="actions">
-          <SharePermissionDeleteButton onClose={this.handleDelete} disabled={isInputDisabled} />
-        </div>
+        {!this.props.isReadOnly && (
+          <div className="actions">
+            <SharePermissionDeleteButton onClose={this.handleDelete} disabled={isInputDisabled} />
+          </div>
+        )}
       </li>
     );
   }
@@ -203,6 +205,7 @@ UserPermissionItem.propTypes = {
   onUpdate: PropTypes.func,
   onDelete: PropTypes.func,
   permissionType: PropTypes.number,
+  isReadOnly: PropTypes.bool,
   t: PropTypes.func, // The translation function
 };
 

package/src/react-extension/components/Share/Utility/ShareChanges.js

@@ -206,6 +206,18 @@ export default class ShareChanges {
     });
   }
 
+  /**
+   * Used to initialise the ShareChanges list with already "changed" permissions.
+   * For example when creating a new shared resource, the permissions must be shown as "new"
+   * instead of "already existing".
+   * @param {PermissionEntity} permission
+   */
+  markPermissionHasChanged(permission) {
+    const permissionChange = this._buildChange(permission.permissions[0].aco, permission.aro, permission.type);
+    this._changes.push(permissionChange);
+    permission.updated = true;
+  }
+
   /**
    * Delete aro's permissions.
    * @param {string} aroId The aro to delete the permissions for

package/src/shared/context/ResourceTypesLocalStorageContext/ResourceTypesLocalStorageContext.js

@@ -83,8 +83,8 @@ export class ResourceTypesLocalStorageContextProvider extends React.Component {
    * Handles update of the resource types in the local storage.
    */
   handleStorageChange(changes) {
-    if (changes.resourceTypes) {
-      this.set(changes.resourceTypes.newValue);
+    if (changes[this.storageKey] && changes[this.storageKey].newValue) {
+      this.set(changes[this.storageKey].newValue);
     }
   }
 

package/src/shared/context/ResourceTypesLocalStorageContext/ResourceTypesLocalStorageContext.test.js

@@ -80,7 +80,7 @@ describe("ResourceTypesLocalStorageContext", () => {
       const expectedResourceTypes = resourceTypesCollectionDto();
 
       contextProvider.handleStorageChange({
-        resourceTypes: {
+        [contextProvider.storageKey]: {
           newValue: expectedResourceTypes,
         },
       });
@@ -112,7 +112,7 @@ describe("ResourceTypesLocalStorageContext", () => {
       const expectedResourceTypes = resourceTypesCollectionDto();
 
       contextProvider.handleStorageChange({
-        resourceTypes: {
+        [contextProvider.storageKey]: {
           newValue: expectedResourceTypes,
         },
       });
@@ -127,7 +127,7 @@ describe("ResourceTypesLocalStorageContext", () => {
       mockComponentSetState(contextProvider);
 
       contextProvider.handleStorageChange({
-        resourceTypes: {
+        [contextProvider.storageKey]: {
           newValue: [],
         },
       });

package/src/shared/services/permission/permissionChangesService.js

@@ -27,15 +27,11 @@ export default class PermissionChangesService {
    * @param {PermissionSnapshotEntity} snapshot The snapshot shown in ShareDialog.
    * @param {Array<object>} dialogChanges Deltas as `ShareChanges.getResourcesChanges()` emits them.
    * @param {string} resourceId Id of the freshly-created resource.
-   * @param {string} operatorId Id of the logged-in user (excluded from output).
    * @returns {Array<object>} `is_new`-flagged permission DTOs in the shape `share.resources.save` accepts.
    */
-  buildResourcePermissionChanges(snapshot, dialogChanges, resourceId, operatorId) {
+  buildResourcePermissionChanges(snapshot, dialogChanges, resourceId) {
     const finalByAroId = new Map();
     for (const permission of snapshot.permissions.items) {
-      if (permission.aroForeignKey === operatorId) {
-        continue;
-      }
       finalByAroId.set(permission.aroForeignKey, {
         is_new: true,
         aro: permission.aro,

package/src/shared/services/permission/permissionChangesService.test.js

@@ -38,7 +38,7 @@ describe("PermissionChangesService", () => {
   }
 
   describe("::buildResourcePermissionChanges", () => {
-    it("emits every non-operator snapshot row as is_new targeting the new resource when there are no dialog edits", () => {
+    it("emits every row as is_new targeting the new resource when there are no dialog edits", () => {
       expect.assertions(3);
 
       const resourceId = uuidv4();
@@ -64,8 +64,16 @@ describe("PermissionChangesService", () => {
 
       const changes = service.buildResourcePermissionChanges(snapshot, [], resourceId, operatorId);
 
-      expect(changes).toHaveLength(1);
+      expect(changes).toHaveLength(2);
       expect(changes[0]).toMatchObject({
+        is_new: true,
+        aro: "User",
+        aro_foreign_key: operatorId,
+        aco: "Resource",
+        aco_foreign_key: resourceId,
+        type: 15,
+      });
+      expect(changes[1]).toMatchObject({
         is_new: true,
         aro: "User",
         aro_foreign_key: readerId,
@@ -73,8 +81,6 @@ describe("PermissionChangesService", () => {
         aco_foreign_key: resourceId,
         type: 1,
       });
-      // Operator row is the implicit owner on the newly-created resource and must not be emitted.
-      expect(changes.find((change) => change.aro_foreign_key === operatorId)).toBeUndefined();
     });
 
     it("drops a snapshot row when the operator's dialog edits include a matching `delete` delta", () => {
@@ -94,11 +100,11 @@ describe("PermissionChangesService", () => {
 
       const changes = service.buildResourcePermissionChanges(snapshot, dialogChanges, resourceId, operatorId);
 
-      expect(changes).toEqual([]);
+      expect(changes).toHaveLength(1);
     });
 
     it("patches the type of a snapshot row when the operator's dialog edits include a type-update delta", () => {
-      expect.assertions(2);
+      expect.assertions(3);
 
       const folderId = uuidv4();
       const resourceId = uuidv4();
@@ -112,10 +118,11 @@ describe("PermissionChangesService", () => {
         { aro: "User", aro_foreign_key: readerId, aco: "Resource", aco_foreign_key: null, type: 15 },
       ];
 
-      const changes = service.buildResourcePermissionChanges(snapshot, dialogChanges, resourceId, operatorId);
+      const changes = service.buildResourcePermissionChanges(snapshot, dialogChanges, resourceId);
 
-      expect(changes).toHaveLength(1);
-      expect(changes[0]).toMatchObject({ is_new: true, aro_foreign_key: readerId, type: 15 });
+      expect(changes).toHaveLength(2);
+      expect(changes[0]).toMatchObject({ is_new: true, aro_foreign_key: operatorId, type: 15 });
+      expect(changes[1]).toMatchObject({ is_new: true, aro_foreign_key: readerId, type: 15 });
     });
 
     it("appends a brand-new aro from the operator's dialog edits with aco_foreign_key stamped", () => {
@@ -134,8 +141,8 @@ describe("PermissionChangesService", () => {
 
       const changes = service.buildResourcePermissionChanges(snapshot, dialogChanges, resourceId, operatorId);
 
-      expect(changes).toHaveLength(1);
-      expect(changes[0]).toMatchObject({
+      expect(changes).toHaveLength(2);
+      expect(changes[1]).toMatchObject({
         is_new: true,
         aro_foreign_key: newAroId,
         aco: "Resource",
@@ -143,36 +150,5 @@ describe("PermissionChangesService", () => {
         type: 1,
       });
     });
-
-    it("excludes the operator's own row from the output even when the snapshot lists it explicitly", () => {
-      expect.assertions(2);
-
-      const folderId = uuidv4();
-      const resourceId = uuidv4();
-      const operatorId = uuidv4();
-      const readerId = uuidv4();
-      const snapshot = snapshotWithPermissions([
-        defaultPermissionDto({ aco: "Folder", aco_foreign_key: folderId, aro_foreign_key: operatorId, type: 15 }),
-        defaultPermissionDto({ aco: "Folder", aco_foreign_key: folderId, aro_foreign_key: readerId, type: 1 }),
-      ]);
-
-      const changes = service.buildResourcePermissionChanges(snapshot, [], resourceId, operatorId);
-
-      expect(changes).toHaveLength(1);
-      expect(changes.find((change) => change.aro_foreign_key === operatorId)).toBeUndefined();
-    });
-
-    it("returns an empty array when the snapshot has only the operator and the dialog has no edits", () => {
-      expect.assertions(1);
-
-      const folderId = uuidv4();
-      const resourceId = uuidv4();
-      const operatorId = uuidv4();
-      const snapshot = snapshotWithPermissions([
-        defaultPermissionDto({ aco: "Folder", aco_foreign_key: folderId, aro_foreign_key: operatorId, type: 15 }),
-      ]);
-
-      expect(service.buildResourcePermissionChanges(snapshot, [], resourceId, operatorId)).toEqual([]);
-    });
   });
 });