Merge branch 'develop' into MAT-9993

Author: ethankaplan

src/components/measureActions/dialogs/shareDialog/ShareDialog.test.tsx

@@ -1564,10 +1564,50 @@ describe("UnshareFromMe Confirmation Dialog component", () => {
       />
     );
 
-    expect(screen.getByTestId("share-confirmation-dialog")).toBeInTheDocument();
+    expect(
+      await screen.findByTestId("share-confirmation-dialog")
+    ).toBeInTheDocument();
     expect(screen.queryByTestId("share-dialog")).toBeNull();
   });
 
+  it("should unshare the passed unshareFromUser (not the logged-in user) and show the measure name", async () => {
+    const mockOnSave = jest.fn();
+    mockMeasureServiceApi.unshareMeasures = mockUnshareMeasures;
+    render(
+      <ShareDialog
+        measures={[mockMeasure1, mockMeasure2]}
+        open={true}
+        option="UnshareFromMe"
+        onClose={jest.fn()}
+        onSave={mockOnSave}
+        unshareFromUser="userId1"
+      />
+    );
+
+    const dialog = await screen.findByTestId("share-confirmation-dialog");
+    expect(dialog).toHaveTextContent(mockMeasure1.measureName);
+    expect(dialog).toHaveTextContent(mockMeasure2.measureName);
+
+    // The target user is the passed profile user, not the logged-in "test user".
+    expect(dialog).toHaveTextContent("userId1");
+    expect(dialog).not.toHaveTextContent("test user");
+
+    await userEvent.click(
+      await screen.findByTestId("share-confirmation-dialog-accept-button")
+    );
+
+    await waitFor(() => {
+      expect(mockUnshareMeasures).toHaveBeenCalledWith(expect.any(Map));
+    });
+    const requestMap = mockUnshareMeasures.mock.calls[0][0] as Map<
+      string,
+      string[]
+    >;
+
+    expect(requestMap.get(mockMeasure1.id)).toEqual(["userId1"]);
+    expect(requestMap.get(mockMeasure2.id)).toEqual(["userId1"]);
+  });
+
   it("should close Share dialog and call onClose when option is 'Share With'", async () => {
     const onCloseMock = jest.fn();
 
@@ -1627,7 +1667,9 @@ describe("UnshareFromMe Confirmation Dialog component", () => {
       />
     );
 
-    expect(screen.getByTestId("share-confirmation-dialog")).toBeInTheDocument();
+    expect(
+      await screen.findByTestId("share-confirmation-dialog")
+    ).toBeInTheDocument();
     expect(screen.queryByTestId("share-dialog")).toBeNull();
 
     const cancelButton = screen.getByTestId(

src/components/measureActions/dialogs/shareDialog/ShareDialog.tsx

@@ -55,6 +55,10 @@ interface ShareDialogProps {
   onClose: Function;
   onSave: Function;
   isAdmin?: boolean;
+  // HARP id to unshare from on the "UnshareFromMe" path. Defaults to the
+  // logged-in user in the Measures workspace while the Admin User Profile passes the
+  // profile user being viewed.
+  unshareFromUser?: string;
 }
 
 interface SharedMeasure {
@@ -116,9 +120,13 @@ const ShareDialog = ({
   onClose,
   onSave,
   isAdmin,
+  unshareFromUser,
 }: ShareDialogProps) => {
   const { getUserName } = useOktaTokens();
   const userName = getUserName();
+  // User whose access is removed on the "UnshareFromMe" path: the profile user
+  // in the Admin User Profile or defaults to the logged-in user if no unshareFromUser provided.
+  const unshareTargetUser = unshareFromUser ?? userName;
 
   const showShareDialog = option === "Share With" || option === "Unshare";
 
@@ -626,19 +634,19 @@ const ShareDialog = ({
   }, [rowSelection]);
 
   useEffect(() => {
-    // Only trigger when dialog is open and the option is UnshareFromMe
-    if (option === "UnshareFromMe" && open) {
-      // Prepare the unshare request
+    // Only trigger once the dialog is open, the option is UnshareFromMe, and the
+    // shared measures have loaded.
+    if (option === "UnshareFromMe" && open && sharedMeasures.length) {
       const directUnshareRequest = new Map<string, string[]>();
-      measures.forEach((measure) => {
-        directUnshareRequest.set(measure.id, [userName]);
+      sharedMeasures.forEach((sharedMeasure) => {
+        directUnshareRequest.set(sharedMeasure.measureId, [unshareTargetUser]);
       });
       setUnshareMeasuresRequest(directUnshareRequest);
 
       // Open the confirmation dialog
       setConfirmationDialogOpen(true);
     }
-  }, [option, open, measures, userName]);
+  }, [option, open, sharedMeasures, unshareTargetUser]);
 
   // export user list in Excel format for admin users
   const handleExportUserList = async (e) => {