MAT-9817: Revert changes to consolidate in madie-util.

Author: mcmcphillips

package-lock.json

@@ -76,13 +76,12 @@
   },
   "dependencies": {
     "@madie/madie-design-system": "^1.2.93",
-    "@madie/madie-models": "^1.4.73",
+    "@madie/madie-models": "^1.4.76",
     "@mui/icons-material": "^6.5.0",
     "@mui/material": "^6.5.0",
     "@tanstack/react-table": "^8.21.3",
     "ace-builds": "^1.44.0",
     "axios": "^1.17.0",
-    "file-saver": "^2.0.5",
     "formik": "^2.4.9",
     "lodash": "^4.18.1",
     "react": "^17.0.2",
@@ -92,8 +91,7 @@
     "single-spa": "^5.9.3",
     "single-spa-react": "^4.2.0",
     "tailwindcss": "^3.4.1",
-    "twin.macro": "^3.4.1",
-    "yup": "^1.7.1"
+    "twin.macro": "^3.4.1"
   },
   "types": "dist/madie-madie-admin.d.ts",
   "overrides": {

package.json

@@ -39,7 +39,7 @@ jest.mock("@madie/madie-util", () => ({
   })),
   useOktaTokens: jest.fn().mockReturnValue({
     getAccessToken: () => "test-token",
-    getUserName: () => "testUser",
+    getUserName: () => "test_user",
   }),
   useUserRoles: jest
     .fn()
@@ -158,10 +158,7 @@ jest.mock("@madie/madie-util", () => ({
         </button>
       </div>
     ) : null,
-}));
-jest.mock(
-  "./actionCenter/LibraryShareDialog/LibraryShareDialog",
-  () => (props: any) =>
+  LibraryShareDialog: () => (props: any) =>
     props.open ? (
       <div data-testid="library-share-dialog" data-option={props.option}>
         Library Share Dialog
@@ -186,8 +183,16 @@ jest.mock(
           Close
         </button>
       </div>
-    ) : null
-);
+    ) : null,
+  LibraryShareAction: jest.fn((props) => (
+    <button
+      data-testid="share-action-btn"
+      onClick={() => props.onClick?.("Share With")}
+    >
+      Share
+    </button>
+  )),
+}));
 
 const renderAt = (initialEntry: string) =>
   render(
@@ -2605,91 +2610,7 @@ describe("UserProfile", () => {
     });
   });
 
-  describe("library share actions", () => {
-    it("opens LibraryShareDialog when Share With is selected for a library", async () => {
-      mockAdminSearchMeasures.mockResolvedValue(pageWith([ownedMeasure], 1));
-      mockFetchCqlLibraries.mockResolvedValue(pageWith([ownedLibrary], 1));
-
-      renderAt("/admin/userProfile/test_user");
-
-      await userEvent.click(await screen.findByTestId("owned-libraries-tab"));
-
-      await userEvent.click(await screen.findByTestId("checkbox-lib1"));
-
-      await userEvent.click(await screen.findByTestId("share-action-btn"));
-
-      await userEvent.click(await screen.findByTestId("Share With-option"));
-
-      expect(
-        await screen.findByTestId("library-share-dialog")
-      ).toBeInTheDocument();
-
-      expect(screen.getByTestId("library-share-dialog")).toHaveAttribute(
-        "data-option",
-        "Share With"
-      );
-    });
-    it("handles successful library share dialog close and displays success toast", async () => {
-      mockAdminSearchMeasures.mockResolvedValue(pageWith([ownedMeasure], 1));
-      mockFetchCqlLibraries.mockResolvedValue(pageWith([ownedLibrary], 1));
-
-      renderAt("/admin/userProfile/test_user");
-
-      await userEvent.click(await screen.findByTestId("owned-libraries-tab"));
-
-      await userEvent.click(await screen.findByTestId("checkbox-lib1"));
-
-      await userEvent.click(await screen.findByTestId("share-action-btn"));
-
-      await userEvent.click(await screen.findByTestId("Share With-option"));
-
-      const callsBefore = mockFetchCqlLibraries.mock.calls.length;
-
-      await userEvent.click(
-        await screen.findByTestId("library-share-success-btn")
-      );
-
-      expect(
-        screen.queryByTestId("library-share-dialog")
-      ).not.toBeInTheDocument();
-
-      expect(
-        await screen.findByText("Library Successfully Shared")
-      ).toBeInTheDocument();
-
-      await waitFor(() => {
-        expect(mockFetchCqlLibraries.mock.calls.length).toBeGreaterThan(
-          callsBefore
-        );
-      });
-    });
-    it("handles library share dialog close with a non-success message", async () => {
-      mockAdminSearchMeasures.mockResolvedValue(pageWith([ownedMeasure], 1));
-      mockFetchCqlLibraries.mockResolvedValue(pageWith([ownedLibrary], 1));
-
-      renderAt("/admin/userProfile/test_user");
-
-      await userEvent.click(await screen.findByTestId("owned-libraries-tab"));
-
-      await userEvent.click(await screen.findByTestId("checkbox-lib1"));
-
-      await userEvent.click(await screen.findByTestId("share-action-btn"));
-
-      await userEvent.click(await screen.findByTestId("Share With-option"));
-
-      await userEvent.click(
-        await screen.findByTestId("library-share-danger-btn")
-      );
-
-      expect(
-        screen.queryByTestId("library-share-dialog")
-      ).not.toBeInTheDocument();
-
-      expect(
-        await screen.findByText("Unable to share library")
-      ).toBeInTheDocument();
-    });
-  });
+  describe("library share actions", () => {});
 
   describe("transfer action", () => {
     const ownedMeasureRow = {

src/components/landing/userManagement/userProfile/UserProfile.test.tsx

@@ -14,6 +14,7 @@ import {
   adminUserStore,
   useFeatureFlags,
   ExportDialog,
+  LibraryShareDialog,
   ViewHRModal,
   ViewMeasureHistoryDialog,
   CompareVersionsDialog,
@@ -22,6 +23,7 @@ import {
   exportMeasure as downloadMeasureExport,
   formatCmsId,
   checkUserCanEdit,
+  useOktaTokens,
 } from "@madie/madie-util";
 import {
   ColumnDef,
@@ -53,7 +55,6 @@ import {
 import ActionCenter from "./actionCenter/ActionCenter";
 import "./UserProfile.scss";
 import LibraryActionCenter from "./actionCenter/LibraryActionCenter";
-import LibraryShareDialog from "./actionCenter/LibraryShareDialog/LibraryShareDialog";
 import _ from "lodash";
 
 type Ownership =
@@ -325,6 +326,8 @@ const MeasureStatusChips = ({ measure }: { measure: any }) => (
 
 const UserProfile = () => {
   const { harpId } = useParams<{ harpId: string }>() as { harpId: string };
+  const { getUserName } = useOktaTokens();
+  const userName = getUserName();
   const userServiceApi = useRef(useUserServiceApi()).current;
   const measureServiceApi = useRef(useMeasureServiceApi()).current;
   const cqlLibraryServiceApi = useRef(useCqlLibraryServiceApi()).current;
@@ -423,7 +426,6 @@ const UserProfile = () => {
     setExpandedLibraryRows([]);
     setSelectedExpandedLibraryRowIds([]);
   }, []);
-
   useEffect(() => {
     const controller = new AbortController();
     userServiceApi
@@ -1476,7 +1478,7 @@ const UserProfile = () => {
       if (draft) {
         await cqlLibraryServiceApi.deleteDraft(id);
       } else {
-        await cqlLibraryServiceApi.deleteLibrary(id, harpId);
+        await cqlLibraryServiceApi.deleteLibrary(id, userName);
       }
 
       setToastType("success");
@@ -1500,6 +1502,7 @@ const UserProfile = () => {
     closeDeleteDialog,
     libraryTable,
     harpId,
+    getUserName,
   ]);
   const handleContinueDialog = useCallback(() => {
     setDownloadState(null);
@@ -1704,11 +1707,12 @@ const UserProfile = () => {
             >
               <LibraryActionCenter
                 libraries={selectedLibraries}
-                activeTab={activeTab}
+                activeTab={activeTab - 2}
                 onDelete={openDeleteDialog}
                 onShare={handleLibraryShare}
                 disabledReason={deleteDisabledReason}
                 canDelete={canDelete}
+                userName={getUserName()}
               />
             </div>
           )}

src/components/landing/userManagement/userProfile/UserProfile.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { type CqlLibrary } from "@madie/madie-models";
 
 import DeleteAction from "./deleteAction/DeleteAction";
-import AdminLibraryShareAction from "./LibraryShareAction/LibraryShareAction";
+import { LibraryShareAction } from "@madie/madie-util";
 
 interface PropTypes {
   libraries: CqlLibrary[];
@@ -12,6 +12,7 @@ interface PropTypes {
   onShare?: (option: string) => void;
   disabledReason?: string;
   target?: string;
+  userName: string;
 }
 
 export default function LibraryActionCenter({
@@ -22,12 +23,18 @@ export default function LibraryActionCenter({
   onDelete,
   onShare,
   disabledReason,
+  userName,
 }: PropTypes) {
   return (
     <div className="action-center" data-testid="action-center">
-      <AdminLibraryShareAction
+      <LibraryShareAction
         libraries={libraries}
         onClick={onShare}
+        canEdit={true}
+        userName={userName}
+        owners={libraries.map((library) => library.librarySet?.owner)}
+        // doesn't matter
+        isSharedWithUser={false}
         activeTab={activeTab}
       />
       <DeleteAction