fix: minor fixes

openedx · Oct 10, 2024 · 7e61a2c · 7e61a2c
1 parent 545e67b
commit 7e61a2c
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 12 deletions.
diff --git a/src/library-authoring/LibraryAuthoringPage.tsx b/src/library-authoring/LibraryAuthoringPage.tsx
@@ -167,6 +167,7 @@ const LibraryAuthoringPage = () => {
     return <Loading />;
   }
 
+  // istanbul ignore if: this should never happen
   if (activeKey === undefined) {
     return <NotFoundAlert />;
   }

diff --git a/src/library-authoring/collections/LibraryCollectionPage.tsx b/src/library-authoring/collections/LibraryCollectionPage.tsx
@@ -59,15 +59,17 @@ const HeaderActions = () => {
 
 const SubHeaderTitle = ({
   title,
-  canEditLibrary,
   infoClickHandler,
 }: {
   title: string;
-  canEditLibrary: boolean;
   infoClickHandler: () => void;
 }) => {
   const intl = useIntl();
 
+  const { readOnly, componentPickerMode } = useLibraryContext();
+
+  const showReadOnlyBadge = readOnly && !componentPickerMode;
+
   return (
     <Stack direction="vertical">
       <Stack direction="horizontal" gap={2}>
@@ -80,7 +82,7 @@ const SubHeaderTitle = ({
           variant="primary"
         />
       </Stack>
-      {!canEditLibrary && (
+      {showReadOnlyBadge && (
         <div>
           <Badge variant="primary" style={{ fontSize: '50%' }}>
             {intl.formatMessage(messages.readOnlyBadge)}
@@ -134,6 +136,7 @@ const LibraryCollectionPage = () => {
   if (isError) {
     return <ErrorAlert error={error} />;
   }
+
   const breadcumbs = !componentPickerMode ? (
     <Breadcrumb
       ariaLabel={intl.formatMessage(messages.breadcrumbsAriaLabel)}
@@ -159,7 +162,7 @@ const LibraryCollectionPage = () => {
       ariaLabel={intl.formatMessage(messages.breadcrumbsAriaLabel)}
       links={[
         {
-          label: '← Test',
+          label: intl.formatMessage(messages.returnToLibrarySelection),
           onClick: () => { setCollectionId(undefined); },
         },
       ]}
@@ -188,7 +191,6 @@ const LibraryCollectionPage = () => {
               title={(
                 <SubHeaderTitle
                   title={collectionData.title}
-                  canEditLibrary={libraryData.canEditLibrary}
                   infoClickHandler={() => openCollectionInfoSidebar(collectionId)}
                 />
               )}

diff --git a/src/library-authoring/collections/messages.ts b/src/library-authoring/collections/messages.ts
@@ -126,6 +126,11 @@ const messages = defineMessages({
     defaultMessage: 'Edit collection title',
     description: 'Alt text for edit collection title icon button',
   },
+  returnToLibrarySelection: {
+    id: 'course-authoring.library-authoring.collection.component-picker.return-to-library-selection',
+    defaultMessage: '← Change Library',
+    description: 'Breadcrumbs link to return to library selection',
+  },
 });
 
 export default messages;
diff --git a/src/library-authoring/component-info/ComponentInfo.tsx b/src/library-authoring/component-info/ComponentInfo.tsx
@@ -28,25 +28,25 @@ const ComponentInfo = () => {
     componentPickerMode,
   } = useLibraryContext();
 
+  // istanbul ignore if: this should never happen
+  if (!usageKey) {
+    throw new Error('usageKey is required');
+  }
+
   const {
     mutate: addComponentToCourse,
     isSuccess: addComponentToCourseSuccess,
     isError: addComponentToCourseError,
   } = useAddComponentToCourse();
 
   if (addComponentToCourseSuccess) {
-    // TODO: Call endpoint to add component to course
     window.parent.postMessage('closeComponentPicker', '*');
   }
 
   if (addComponentToCourseError) {
     showToast(intl.formatMessage(messages.addComponentToCourseError));
   }
 
-  if (!usageKey) {
-    return null;
-  }
-
   const canEdit = canEditComponent(usageKey);
 
   const handleAddComponentToCourse = () => {

diff --git a/src/library-authoring/component-info/ComponentManagement.tsx b/src/library-authoring/component-info/ComponentManagement.tsx
@@ -15,6 +15,7 @@ const ComponentManagement = () => {
   const intl = useIntl();
   const { sidebarComponentUsageKey: usageKey, readOnly } = useLibraryContext();
 
+  // istanbul ignore if: this should never happen
   if (!usageKey) {
     throw new Error('usageKey is required');
   }

diff --git a/src/library-authoring/components/ComponentCard.tsx b/src/library-authoring/components/ComponentCard.tsx
@@ -94,7 +94,6 @@ const ComponentCard = ({ contentHit }: ComponentCardProps) => {
   } = useAddComponentToCourse();
 
   if (addComponentToCourseSuccess) {
-    // TODO: Call endpoint to add component to course
     window.parent.postMessage('closeComponentPicker', '*');
   }
 

diff --git a/src/library-authoring/data/api.ts b/src/library-authoring/data/api.ts
@@ -378,3 +378,12 @@ export async function restoreCollection(libraryId: string, collectionId: string)
   const client = getAuthenticatedHttpClient();
   await client.post(getLibraryCollectionRestoreApiUrl(libraryId, collectionId));
 }
+
+/**
+ * Add a component to a course.
+ */
+// istanbul ignore next
+export async function addComponentToCourse() {
+  // TODO: Call endpoint to add component to course
+  return Promise.resolve();
+}
diff --git a/src/library-authoring/data/apiHooks.ts b/src/library-authoring/data/apiHooks.ts
@@ -34,6 +34,7 @@ import {
   restoreCollection,
   setXBlockOLX,
   getXBlockAssets,
+  addComponentToCourse,
 } from './api';
 
 export const libraryQueryPredicate = (query: Query, libraryId: string): boolean => {
@@ -373,8 +374,11 @@ export const useRestoreCollection = (libraryId: string, collectionId: string) =>
   });
 };
 
+/**
+ * Use this mutation to add a component to a course
+ */
 export const useAddComponentToCourse = () => (
   useMutation({
-    mutationFn: async () => {},
+    mutationFn: addComponentToCourse,
   })
 );