@openmrs/esm-metadataexport-app 4.4.1-pre.799 → 4.4.1-pre.805

package/src/components/{new-package/new-package.workspace.tsx → metadata-package-form/metadata-package-form.workspace.tsx}

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Button,
@@ -21,13 +21,18 @@ import {
   OpenmrsFetchError,
 } from '@openmrs/esm-framework';
 import { formatDomainLabel, useDomains } from '../../domain-lookups/domain-lookups.resource';
-import { createPackage } from '../../packages/packages.resource';
-import styles from './new-package.workspace.scss';
+import { createPackage, editPackage, usePackage } from '../../packages/packages.resource';
+import styles from './metadata-package-form.workspace.scss';
 
 const packagesUrl = `${restBaseUrl}/metadataexport/packages`;
 const isPackagesCacheKey = (key: unknown) => typeof key === 'string' && key.startsWith(packagesUrl);
 
-const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
+interface PackageFormWorkspaceProps extends DefaultWorkspaceProps {
+  uuid?: string;
+}
+
+const MetadataPackageFormWorkspace: React.FC<PackageFormWorkspaceProps> = ({
+  uuid,
   closeWorkspace,
   closeWorkspaceWithSavedChanges,
   promptBeforeClosing,
@@ -35,6 +40,7 @@ const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
   const { t } = useTranslation();
   const { mutate } = useSWRConfig();
   const isTablet = useLayoutType() === 'tablet';
+  const isEditMode = Boolean(uuid);
   const { domains, isLoading, error } = useDomains();
 
   const [packageName, setPackageName] = useState('');
@@ -45,6 +51,8 @@ const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
   const allSelected = domains.length > 0 && selectedDomains.size === domains.length;
   const someSelected = selectedDomains.size > 0 && !allSelected;
 
+  const { exportPackage, isLoading: isLoadingPackage, error: packageError } = usePackage(uuid ?? '');
+
   const toggleSelectAll = useCallback(
     (checked: boolean) => {
       setSelectedDomains(checked ? new Set(domains) : new Set());
@@ -70,6 +78,28 @@ const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
     promptBeforeClosing(() => hasUnsavedChanges);
   }, [hasUnsavedChanges, promptBeforeClosing]);
 
+  // Seed the form from the fetched package exactly once, so a later SWR revalidation
+  // of the package or domain list doesn't clobber the user's in-progress edits.
+  // An empty entries list means the package includes every registered domain.
+  const hasPrefilledFromPackage = useRef(false);
+  useEffect(() => {
+    if (!isEditMode || hasPrefilledFromPackage.current || !exportPackage) {
+      return;
+    }
+    // Wait for the domain list before expanding an "all domains" package.
+    if (exportPackage.entries.length === 0 && domains.length === 0) {
+      return;
+    }
+    hasPrefilledFromPackage.current = true;
+    setPackageName(exportPackage.name);
+    setDescription(exportPackage.description ?? '');
+    setSelectedDomains(
+      exportPackage.entries.length === 0
+        ? new Set(domains)
+        : new Set(exportPackage.entries.map((entry) => entry.domain)),
+    );
+  }, [isEditMode, exportPackage, domains]);
+
   const handleSubmit = useCallback(
     async (event: React.FormEvent<HTMLFormElement>) => {
       event.preventDefault();
@@ -77,17 +107,32 @@ const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
 
       // An explicit empty array tells the server to include every registered domain.
       const entries = allSelected ? [] : Array.from(selectedDomains, (domain) => ({ domain }));
+      const payload = { name: packageName.trim(), description: description.trim(), entries };
 
       try {
-        await createPackage({ name: packageName.trim(), description: description.trim(), entries });
-        // Revalidate the packages list so the table shows the new package without a refresh.
-        await mutate(isPackagesCacheKey);
-        showSnackbar({
-          title: t('packageCreated', 'Package created'),
-          subtitle: t('packageCreatedSubtitle', '{{name}} was created successfully', { name: packageName.trim() }),
-          kind: 'success',
-          isLowContrast: true,
-        });
+        const name = packageName.trim();
+
+        if (isEditMode && uuid) {
+          await editPackage(uuid, payload);
+          // Revalidate the packages list so the table reflects the change without a refresh.
+          await mutate(isPackagesCacheKey);
+          showSnackbar({
+            title: t('packageUpdated', 'Package updated'),
+            subtitle: t('packageUpdatedSubtitle', '{{name}} was updated successfully', { name }),
+            kind: 'success',
+            isLowContrast: true,
+          });
+        } else {
+          await createPackage(payload);
+          // Revalidate the packages list so the table reflects the change without a refresh.
+          await mutate(isPackagesCacheKey);
+          showSnackbar({
+            title: t('packageCreated', 'Package created'),
+            subtitle: t('packageCreatedSubtitle', '{{name}} was created successfully', { name }),
+            kind: 'success',
+            isLowContrast: true,
+          });
+        }
         // Bypass the "unsaved changes" prompt now that the package is persisted.
         closeWorkspaceWithSavedChanges();
       } catch (submitError) {
@@ -96,21 +141,63 @@ const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
           typeof responseBody === 'object' && responseBody !== null
             ? Object.values(responseBody.fieldErrors ?? {})[0] ?? responseBody.error
             : null;
-        showSnackbar({
-          title: t('packageCreationFailed', 'Failed to create package'),
-          subtitle: reason ?? t('unexpectedError', 'An unexpected error occurred'),
-          kind: 'error',
-          isLowContrast: false,
-        });
+        const subtitle = reason ?? t('unexpectedError', 'An unexpected error occurred');
+
+        if (isEditMode) {
+          showSnackbar({
+            title: t('packageUpdateFailed', 'Failed to update package'),
+            subtitle,
+            kind: 'error',
+            isLowContrast: false,
+          });
+        } else {
+          showSnackbar({
+            title: t('packageCreationFailed', 'Failed to create package'),
+            subtitle,
+            kind: 'error',
+            isLowContrast: false,
+          });
+        }
       } finally {
         setIsSubmitting(false);
       }
     },
-    [allSelected, closeWorkspaceWithSavedChanges, description, mutate, packageName, selectedDomains, t],
+    [
+      allSelected,
+      closeWorkspaceWithSavedChanges,
+      description,
+      isEditMode,
+      mutate,
+      packageName,
+      selectedDomains,
+      t,
+      uuid,
+    ],
   );
 
   const isSubmitDisabled = packageName.trim().length === 0 || selectedDomains.size === 0 || isSubmitting;
 
+  if (isEditMode && isLoadingPackage) {
+    return (
+      <div className={styles.form}>
+        <InlineLoading description={t('loadingPackage', 'Loading package…')} />
+      </div>
+    );
+  }
+
+  if (packageError) {
+    return (
+      <div className={styles.form}>
+        <InlineNotification
+          kind="error"
+          lowContrast
+          title={t('errorLoadingPackage', 'Error loading package')}
+          subtitle={packageError.message}
+        />
+      </div>
+    );
+  }
+
   return (
     <Form className={styles.form} onSubmit={handleSubmit}>
       <div className={styles.grid}>
@@ -184,7 +271,9 @@ const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
         </Button>
         <Button className={styles.button} kind="primary" type="submit" disabled={isSubmitDisabled}>
           {isSubmitting ? (
-            <InlineLoading description={t('creating', 'Creating') + '…'} />
+            <InlineLoading description={(isEditMode ? t('saving', 'Saving') : t('creating', 'Creating')) + '…'} />
+          ) : isEditMode ? (
+            t('saveChanges', 'Save changes')
           ) : (
             t('createPackage', 'Create package')
           )}
@@ -194,4 +283,4 @@ const NewPackageWorkspace: React.FC<DefaultWorkspaceProps> = ({
   );
 };
 
-export default NewPackageWorkspace;
+export default MetadataPackageFormWorkspace;

package/src/components/packages-table/packages-table.component.tsx

@@ -22,8 +22,8 @@ import {
 } from '@openmrs/esm-framework';
 import { formatDomainLabel } from '../../domain-lookups/domain-lookups.resource';
 import { useAllPackages } from '../../packages/packages.resource';
-import { launchAddNewPackageWorkspace } from '../new-package/new-package-utils';
-import ViewPackageActionButton from '../view-package/view-package-action-button/view-package-action-button.component';
+import { launchPackageFormWorkspace } from '../metadata-package-form/metadata-package-form-utils';
+import ViewPackageActionButton from '../view-metadata-package/view-package-action-button/view-package-action-button.component';
 import styles from './packages-table.scss';
 
 /**
@@ -97,7 +97,7 @@ const PackagesTable: React.FC = () => {
         <EmptyCard
           displayText={t('packages__lower', 'packages')}
           headerTitle={headerTitle}
-          launchForm={canManage ? () => launchAddNewPackageWorkspace(t) : undefined}
+          launchForm={canManage ? () => launchPackageFormWorkspace(t) : undefined}
         />
       </div>
     );

package/src/components/packages-table/packages-table.test.tsx

@@ -5,8 +5,8 @@ import { type Session, useSession, userHasAccess } from '@openmrs/esm-framework'
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { type ExportPackage } from '../../types/index';
 import { useAllPackages } from '../../packages/packages.resource';
-import { launchAddNewPackageWorkspace } from '../new-package/new-package-utils';
-import { launchViewPackageWorkspace } from '../view-package/view-package-utils';
+import { launchPackageFormWorkspace } from '../metadata-package-form/metadata-package-form-utils';
+import { launchViewMetadataPackageWorkspace } from '../view-metadata-package/view-metadata-package-utils';
 import PackagesTable from './packages-table.component';
 
 vi.mock('../../packages/packages.resource', async (importOriginal) => ({
@@ -14,19 +14,19 @@ vi.mock('../../packages/packages.resource', async (importOriginal) => ({
   useAllPackages: vi.fn(),
 }));
 
-vi.mock('../new-package/new-package-utils', () => ({
-  launchAddNewPackageWorkspace: vi.fn(),
+vi.mock('../metadata-package-form/metadata-package-form-utils', () => ({
+  launchPackageFormWorkspace: vi.fn(),
 }));
 
-vi.mock('../view-package/view-package-utils', () => ({
-  launchViewPackageWorkspace: vi.fn(),
+vi.mock('../view-metadata-package/view-metadata-package-utils', () => ({
+  launchViewMetadataPackageWorkspace: vi.fn(),
 }));
 
 const mockUseAllPackages = vi.mocked(useAllPackages);
 const mockUseSession = vi.mocked(useSession);
 const mockUserHasAccess = vi.mocked(userHasAccess);
-const mockLaunchAddNewPackageWorkspace = vi.mocked(launchAddNewPackageWorkspace);
-const mockLaunchViewPackageWorkspace = vi.mocked(launchViewPackageWorkspace);
+const mockLaunchPackageFormWorkspace = vi.mocked(launchPackageFormWorkspace);
+const mockLaunchViewPackageWorkspace = vi.mocked(launchViewMetadataPackageWorkspace);
 
 const sessionWithUser = () => ({ user: { uuid: 'cc8507b8-7c9a-486b-85dc-b8f25ad1e4cc' } }) as unknown as Session;
 
@@ -81,7 +81,7 @@ describe('PackagesTable', () => {
     await user.click(screen.getByRole('button', { name: 'Record packages' }));
 
     expect(mockUserHasAccess).toHaveBeenCalledWith('Manage Metadata Export Packages', expect.anything());
-    expect(mockLaunchAddNewPackageWorkspace).toHaveBeenCalledTimes(1);
+    expect(mockLaunchPackageFormWorkspace).toHaveBeenCalledTimes(1);
   });
 
   it('does not offer the empty-state action to users without the manage privilege', () => {
@@ -89,7 +89,7 @@ describe('PackagesTable', () => {
     render(<PackagesTable />);
 
     expect(screen.queryByRole('button', { name: 'Record packages' })).not.toBeInTheDocument();
-    expect(mockLaunchAddNewPackageWorkspace).not.toHaveBeenCalled();
+    expect(mockLaunchPackageFormWorkspace).not.toHaveBeenCalled();
   });
 
   it('renders the build status per package and launches the view workspace with the package for the clicked row', async () => {

package/src/components/{view-package/delete-package.modal.test.tsx → view-metadata-package/delete-metadata-package.modal.test.tsx}

@@ -3,7 +3,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { describe, it, expect, vi, type Mock } from 'vitest';
 import * as esmFramework from '@openmrs/esm-framework';
-import DeletePackageModal from './delete-package.modal';
+import DeleteMetadataPackageModal from './delete-metadata-package.modal';
 import { deletePackage } from '../../packages/packages.resource';
 import type { ExportPackage } from '../../types';
 
@@ -28,7 +28,9 @@ const mockCloseModal = vi.fn();
 const mockOnDeleted = vi.fn();
 
 function renderModal() {
-  render(<DeletePackageModal closeModal={mockCloseModal} exportPackage={exportPackage} onDeleted={mockOnDeleted} />);
+  render(
+    <DeleteMetadataPackageModal closeModal={mockCloseModal} exportPackage={exportPackage} onDeleted={mockOnDeleted} />,
+  );
 }
 
 describe('DeletePackageModal', () => {

package/src/components/{view-package/delete-package.modal.tsx → view-metadata-package/delete-metadata-package.modal.tsx}

@@ -5,7 +5,7 @@ import { useSWRConfig } from 'swr';
 import { OpenmrsFetchError, restBaseUrl, showSnackbar } from '@openmrs/esm-framework';
 import { deletePackage } from '../../packages/packages.resource';
 import type { ExportPackage } from '../../types';
-import styles from './delete-package.modal.scss';
+import styles from './delete-metadata-package.modal.scss';
 
 const packagesUrl = `${restBaseUrl}/metadataexport/packages`;
 const isPackagesCacheKey = (key: unknown) => typeof key === 'string' && key.startsWith(packagesUrl);
@@ -16,7 +16,7 @@ interface DeletePackageModalProps {
   onDeleted: () => void;
 }
 
-const DeletePackageModal: React.FC<DeletePackageModalProps> = ({ closeModal, exportPackage, onDeleted }) => {
+const DeleteMetadataPackageModal: React.FC<DeletePackageModalProps> = ({ closeModal, exportPackage, onDeleted }) => {
   const { t } = useTranslation();
   const { mutate } = useSWRConfig();
   const [isDeleting, setIsDeleting] = useState(false);
@@ -79,4 +79,4 @@ const DeletePackageModal: React.FC<DeletePackageModalProps> = ({ closeModal, exp
   );
 };
 
-export default DeletePackageModal;
+export default DeleteMetadataPackageModal;

package/src/components/{view-package/view-package-utils.ts → view-metadata-package/view-metadata-package-utils.ts}

@@ -1,8 +1,8 @@
 import { launchWorkspace } from '@openmrs/esm-framework';
 import { type ExportPackage } from '../../types/index';
 
-export const launchViewPackageWorkspace = (exportPackage: ExportPackage) => {
-  launchWorkspace('view-package-workspace', {
+export const launchViewMetadataPackageWorkspace = (exportPackage: ExportPackage) => {
+  launchWorkspace('view-metadata-package-workspace', {
     workspaceTitle: exportPackage.name,
     exportPackage,
   });

package/src/components/{view-package/view-package.workspace.scss → view-metadata-package/view-metadata-package.workspace.scss}

@@ -25,12 +25,24 @@
 
 .actionRow {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
   gap: layout.$spacing-04;
 }
 
 .triggerButton {
-  flex: 1 1 auto;
+  width: 100%;
+  max-width: none;
+  justify-content: center;
+}
+
+.secondaryActions {
+  display: flex;
+  flex-direction: row;
+  gap: layout.$spacing-04;
+}
+
+.secondaryButton {
+  flex: 1 1 0;
   max-width: none;
   justify-content: center;
 }

package/src/components/{view-package/view-package.workspace.test.tsx → view-metadata-package/view-metadata-package.workspace.test.tsx}

@@ -3,7 +3,7 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
 import * as esmFramework from '@openmrs/esm-framework';
-import ViewPackageWorkspace from './view-package.workspace';
+import ViewMetadataPackageWorkspace from './view-metadata-package.workspace';
 import { usePackageBuilds, triggerBuild } from '../../packages/packages.resource';
 import type { ExportPackage, ExportPackageBuild } from '../../types';
 
@@ -75,7 +75,7 @@ function mockBuilds(overrides: Partial<ReturnType<typeof usePackageBuilds>> = {}
 
 function renderWorkspace(pkg: ExportPackage = exportPackage) {
   render(
-    <ViewPackageWorkspace
+    <ViewMetadataPackageWorkspace
       exportPackage={pkg}
       closeWorkspace={mockCloseWorkspace}
       closeWorkspaceWithSavedChanges={mockCloseWorkspaceWithSavedChanges}
@@ -224,4 +224,54 @@ describe('ViewPackageWorkspace', () => {
       }),
     );
   });
+
+  it('triggers a build and revalidates the builds list', async () => {
+    const user = userEvent.setup();
+    const mutate = vi.fn();
+    mockBuilds({ mutate });
+    mockTriggerBuild.mockResolvedValue({});
+    renderWorkspace();
+
+    await user.click(screen.getByRole('button', { name: 'Trigger new build' }));
+
+    expect(mockTriggerBuild).toHaveBeenCalledWith(exportPackage.uuid);
+    await waitFor(() => expect(mutate).toHaveBeenCalled());
+    expect(mockShowSnackbar).toHaveBeenCalledWith(expect.objectContaining({ kind: 'success' }));
+  });
+
+  it('shows an error snackbar when triggering a build fails', async () => {
+    const user = userEvent.setup();
+    const error = new esmFramework.OpenmrsFetchError(
+      '/url',
+      {} as Response,
+      { error: 'A build is already running for this package' },
+      new Error(),
+    );
+    mockTriggerBuild.mockRejectedValue(error);
+    renderWorkspace();
+
+    await user.click(screen.getByRole('button', { name: 'Trigger new build' }));
+
+    await waitFor(() =>
+      expect(mockShowSnackbar).toHaveBeenCalledWith(
+        expect.objectContaining({ kind: 'error', subtitle: 'A build is already running for this package' }),
+      ),
+    );
+  });
+
+  it('launches the delete confirmation modal wired to close the workspace on success', async () => {
+    const user = userEvent.setup();
+    renderWorkspace();
+
+    await user.click(screen.getByRole('button', { name: /delete/i }));
+
+    expect(mockShowModal).toHaveBeenCalledWith(
+      'delete-package-modal',
+      expect.objectContaining({
+        exportPackage,
+        onDeleted: mockCloseWorkspace,
+        closeModal: expect.any(Function),
+      }),
+    );
+  });
 });

package/src/components/{view-package/view-package.workspace.tsx → view-metadata-package/view-metadata-package.workspace.tsx}

@@ -18,10 +18,12 @@ import {
 import { formatDomainLabel } from '../../domain-lookups/domain-lookups.resource';
 import { triggerBuild, usePackageBuilds } from '../../packages/packages.resource';
 import type { ExportBuildStatus, ExportPackage } from '../../types';
-import styles from './view-package.workspace.scss';
+import styles from './view-metadata-package.workspace.scss';
+import { launchPackageFormWorkspace } from '../metadata-package-form/metadata-package-form-utils';
 
 const packagesUrl = `${restBaseUrl}/metadataexport/packages`;
-const isPackagesCacheKey = (key: unknown) => typeof key === 'string' && key.startsWith(packagesUrl);
+// useOpenmrsPagination keys the cache with absolute URLs, so match on inclusion rather than prefix.
+const isPackagesCacheKey = (key: unknown) => typeof key === 'string' && key.includes(packagesUrl);
 
 interface ViewPackageWorkspaceProps extends DefaultWorkspaceProps {
   exportPackage: ExportPackage;
@@ -34,7 +36,7 @@ const statusTagType: Record<ExportBuildStatus, 'gray' | 'blue' | 'green' | 'red'
   FAILED: 'red',
 };
 
-const ViewPackageWorkspace: React.FC<ViewPackageWorkspaceProps> = ({ exportPackage, closeWorkspace }) => {
+const ViewMetadataPackageWorkspace: React.FC<ViewPackageWorkspaceProps> = ({ exportPackage, closeWorkspace }) => {
   const { t } = useTranslation();
   const session = useSession();
   const { mutate: globalMutate } = useSWRConfig();
@@ -102,6 +104,10 @@ const ViewPackageWorkspace: React.FC<ViewPackageWorkspaceProps> = ({ exportPacka
     return exportPackage.entries.map((entry) => formatDomainLabel(entry.domain)).join(', ');
   }, [exportPackage.entries, t]);
 
+  const editPackage = useCallback(() => {
+    launchPackageFormWorkspace(t, exportPackage.uuid);
+  }, [exportPackage.uuid, t]);
+
   return (
     <div className={styles.container}>
       <div className={styles.body}>
@@ -119,9 +125,24 @@ const ViewPackageWorkspace: React.FC<ViewPackageWorkspaceProps> = ({ exportPacka
                 t('triggerNewBuild', 'Trigger new build')
               )}
             </Button>
-            <Button kind="danger--tertiary" onClick={launchDeleteModal} disabled={isTriggeringBuild}>
-              {t('delete', 'Delete')}
-            </Button>
+            <div className={styles.secondaryActions}>
+              <Button
+                className={styles.secondaryButton}
+                kind="secondary"
+                onClick={editPackage}
+                disabled={isTriggeringBuild}
+              >
+                {t('edit', 'Edit')}
+              </Button>
+              <Button
+                className={styles.secondaryButton}
+                kind="danger--tertiary"
+                onClick={launchDeleteModal}
+                disabled={isTriggeringBuild}
+              >
+                {t('delete', 'Delete')}
+              </Button>
+            </div>
           </section>
         )}
 
@@ -188,4 +209,4 @@ const ViewPackageWorkspace: React.FC<ViewPackageWorkspaceProps> = ({ exportPacka
   );
 };
 
-export default ViewPackageWorkspace;
+export default ViewMetadataPackageWorkspace;

package/src/components/{view-package → view-metadata-package}/view-package-action-button/view-package-action-button.component.test.tsx

@@ -4,14 +4,14 @@ import userEvent from '@testing-library/user-event';
 import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
 import { type Session, useSession, userHasAccess } from '@openmrs/esm-framework';
 import ViewPackageActionButton from './view-package-action-button.component';
-import { launchViewPackageWorkspace } from '../view-package-utils';
+import { launchViewMetadataPackageWorkspace } from '../view-metadata-package-utils';
 import { type ExportPackage } from '../../../types';
 
-vi.mock('../view-package-utils', () => ({
-  launchViewPackageWorkspace: vi.fn(),
+vi.mock('../view-metadata-package-utils', () => ({
+  launchViewMetadataPackageWorkspace: vi.fn(),
 }));
 
-const mockLaunchViewPackageWorkspace = launchViewPackageWorkspace as Mock;
+const mockLaunchViewPackageWorkspace = launchViewMetadataPackageWorkspace as Mock;
 const mockUseSession = vi.mocked(useSession);
 const mockUserHasAccess = vi.mocked(userHasAccess);
 

package/src/components/{view-package → view-metadata-package}/view-package-action-button/view-package-action-button.component.tsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { Button } from '@carbon/react';
 import { ArrowRight } from '@carbon/react/icons';
 import { useSession, userHasAccess } from '@openmrs/esm-framework';
-import { launchViewPackageWorkspace } from '../view-package-utils';
+import { launchViewMetadataPackageWorkspace } from '../view-metadata-package-utils';
 import { type ExportPackage } from '../../../types';
 
 interface ViewPackageActionButtonProps {
@@ -17,7 +17,7 @@ const ViewPackageActionButton: React.FC<ViewPackageActionButtonProps> = ({ expor
   const canView = session.user ? userHasAccess('Get Metadata Export Packages', session.user) : false;
 
   const handleView = useCallback(() => {
-    launchViewPackageWorkspace(exportPackage);
+    launchViewMetadataPackageWorkspace(exportPackage);
   }, [exportPackage]);
 
   return (

package/src/index.ts

@@ -20,18 +20,18 @@ export const root = getAsyncLifecycle(() => import('./root.component'), options)
 export const metadataExportCardLink = getAsyncLifecycle(() => import('./admin-card-link.component'), options);
 
 // Modals
-export const deletePackageModal = getAsyncLifecycle(
-  () => import('./components/view-package/delete-package.modal'),
+export const deleteMetadataPackageModal = getAsyncLifecycle(
+  () => import('./components/view-metadata-package/delete-metadata-package.modal'),
   options,
 );
 
 // Workspaces
-export const newPackageWorkspace = getAsyncLifecycle(
-  () => import('./components/new-package/new-package.workspace'),
+export const metadataPackageFormWorkspace = getAsyncLifecycle(
+  () => import('./components/metadata-package-form/metadata-package-form.workspace'),
   options,
 );
 
-export const viewPackageWorkspace = getAsyncLifecycle(
-  () => import('./components/view-package/view-package.workspace'),
+export const viewMetadataPackageWorkspace = getAsyncLifecycle(
+  () => import('./components/view-metadata-package/view-metadata-package.workspace'),
   options,
 );