chore: fix merge conflicts

src/library-authoring/LibraryAuthoringPage.test.tsx

@@ -570,7 +570,7 @@ describe('<LibraryAuthoringPage />', () => {
     expect(screen.getByText(/add content/i)).toBeInTheDocument();
 
     // Open New collection Modal
-    const newCollectionButton = screen.getByRole('button', { name: /collection/i });
+    const newCollectionButton = screen.getAllByRole('button', { name: /collection/i })[4];
     fireEvent.click(newCollectionButton);
     const collectionModalHeading = await screen.findByRole('heading', { name: /new collection/i });
     expect(collectionModalHeading).toBeInTheDocument();
@@ -614,7 +614,7 @@ describe('<LibraryAuthoringPage />', () => {
     expect(screen.getByText(/add content/i)).toBeInTheDocument();
 
     // Open New collection Modal
-    const newCollectionButton = screen.getByRole('button', { name: /collection/i });
+    const newCollectionButton = screen.getAllByRole('button', { name: /collection/i })[4];
     fireEvent.click(newCollectionButton);
     const collectionModalHeading = await screen.findByRole('heading', { name: /new collection/i });
     expect(collectionModalHeading).toBeInTheDocument();
@@ -647,7 +647,7 @@ describe('<LibraryAuthoringPage />', () => {
     expect(screen.getByText(/add content/i)).toBeInTheDocument();
 
     // Open New collection Modal
-    const newCollectionButton = screen.getByRole('button', { name: /collection/i });
+    const newCollectionButton = screen.getAllByRole('button', { name: /collection/i })[4];
     fireEvent.click(newCollectionButton);
     const collectionModalHeading = await screen.findByRole('heading', { name: /new collection/i });
     expect(collectionModalHeading).toBeInTheDocument();
@@ -661,4 +661,20 @@ describe('<LibraryAuthoringPage />', () => {
     fireEvent.change(descriptionField, { target: { value: description } });
     fireEvent.click(createButton);
   });
+
+  it('shows both components and collections in recently modified section', async () => {
+    await renderLibraryPage();
+
+    expect(await screen.findByText('Content library')).toBeInTheDocument();
+    expect((await screen.findAllByText(libraryTitle))[0]).toBeInTheDocument();
+
+    // "Recently Modified" header + sort shown
+    expect(screen.getAllByText('Recently Modified').length).toEqual(2);
+    const recentModifiedContainer = (await screen.findAllByText('Recently Modified'))[1].parentElement?.parentElement?.parentElement;
+    expect(recentModifiedContainer).toBeTruthy();
+
+    const container = within(recentModifiedContainer!);
+    expect(container.queryAllByText('Text').length).toBeGreaterThan(0);
+    expect(container.queryAllByText('Collection').length).toBeGreaterThan(0);
+  });
 });

src/library-authoring/create-collection/CreateCollectionModal.tsx

@@ -18,7 +18,7 @@ import { ToastContext } from '../../generic/toast-context';
 const CreateCollectionModal = () => {
   const intl = useIntl();
   const { libraryId } = useParams();
-  const create = useCreateLibraryCollection(libraryId);
+  const create = useCreateLibraryCollection(libraryId!);
   const {
     isCreateCollectionModalOpen,
     closeCreateCollectionModal,

src/library-authoring/data/apiHooks.ts

@@ -216,19 +216,12 @@ export const useUpdateXBlockFields = (contentLibraryId: string, usageKey: string
 /**
  * Use this mutation to create a library collection
  */
-export const useCreateLibraryCollection = (libraryId: string | undefined) => {
+export const useCreateLibraryCollection = (libraryId: string) => {
   const queryClient = useQueryClient();
   return useMutation({
-    mutationFn: (data: CreateLibraryCollectionDataRequest) => {
-      if (libraryId) {
-        return createCollection(libraryId, data);
-      }
-      return Promise.resolve();
-    },
+    mutationFn: (data: CreateLibraryCollectionDataRequest) => createCollection(libraryId, data),
     onSettled: () => {
-      if (libraryId) {
-        queryClient.invalidateQueries({ predicate: (query) => libraryQueryPredicate(query, libraryId) });
-      }
+      queryClient.invalidateQueries({ predicate: (query) => libraryQueryPredicate(query, libraryId) });
     },
   });
 };