fix: issues from merge

src/content-tags-drawer/ContentTagsDrawer.tsx

@@ -100,10 +100,10 @@ const ContentTagsDrawerTitle = () => {
 
 interface ContentTagsDrawerVariantFooterProps {
   onClose: () => void,
-  canTagObject: boolean,
+  readOnly: boolean,
 }
 
-const ContentTagsDrawerVariantFooter = ({ onClose, canTagObject }: ContentTagsDrawerVariantFooterProps) => {
+const ContentTagsDrawerVariantFooter = ({ onClose, readOnly }: ContentTagsDrawerVariantFooterProps) => {
   const intl = useIntl();
   const {
     commitGlobalStagedTagsStatus,
@@ -131,7 +131,7 @@ const ContentTagsDrawerVariantFooter = ({ onClose, canTagObject }: ContentTagsDr
                 ? messages.tagsDrawerCancelButtonText
                 : messages.tagsDrawerCloseButtonText)}
             </Button>
-            {canTagObject && (
+            {!readOnly && (
               <Button
                 className="rounded-0"
                 onClick={isEditMode
@@ -218,7 +218,6 @@ const ContentTagsComponentVariantFooter = ({ readOnly = false }: ContentTagsComp
 interface ContentTagsDrawerProps {
   id?: string;
   onClose?: () => void;
-  canTagObject?: boolean;
   variant?: 'drawer' | 'component';
   readOnly?: boolean;
 }
@@ -235,7 +234,6 @@ interface ContentTagsDrawerProps {
 const ContentTagsDrawer = ({
   id,
   onClose,
-  canTagObject = false,
   variant = 'drawer',
   readOnly = false,
 }: ContentTagsDrawerProps) => {
@@ -248,7 +246,7 @@ const ContentTagsDrawer = ({
     throw new Error('Error: contentId cannot be null.');
   }
 
-  const context = useContentTagsDrawerContext(contentId, canTagObject);
+  const context = useContentTagsDrawerContext(contentId, !readOnly);
   const { blockingSheet } = useContext(ContentTagsDrawerSheetContext);
 
   const {
@@ -312,7 +310,7 @@ const ContentTagsDrawer = ({
     if (isTaxonomyListLoaded && isContentTaxonomyTagsLoaded) {
       switch (variant) {
         case 'drawer':
-          return <ContentTagsDrawerVariantFooter onClose={onCloseDrawer} canTagObject={canTagObject} />;
+          return <ContentTagsDrawerVariantFooter onClose={onCloseDrawer} readOnly={readOnly} />;
         case 'component':
           return <ContentTagsComponentVariantFooter readOnly={readOnly} />;
         default:

src/content-tags-drawer/ContentTagsDrawerSheet.jsx

@@ -14,7 +14,7 @@ const ContentTagsDrawerSheet = ({ id, onClose, showSheet }) => {
 
   // ContentTagsDrawerSheet is only used when editing Courses/Course Units,
   // so we assume it's ok to edit the object tags too.
-  const canTagObject = true;
+  const readOnly = false;
 
   return (
     <ContentTagsDrawerSheetContext.Provider value={context}>
@@ -27,7 +27,7 @@ const ContentTagsDrawerSheet = ({ id, onClose, showSheet }) => {
         <ContentTagsDrawer
           id={id}
           onClose={onClose}
-          canTagObject={canTagObject}
+          readOnly={readOnly}
         />
       </Sheet>
     </ContentTagsDrawerSheetContext.Provider>

src/library-authoring/common/context.tsx

@@ -102,6 +102,7 @@ export const LibraryProvider = ({
   }, []);
 
   const closeLibrarySidebar = useCallback(() => {
+    resetSidebar();
   }, []);
   const openAddContentSidebar = useCallback(() => {
     resetSidebar();

src/library-authoring/component-info/ComponentManagement.test.tsx

@@ -5,23 +5,22 @@ import {
   initializeMocks,
   render as baseRender,
   screen,
+  waitFor,
 } from '../../testUtils';
 import { LibraryProvider } from '../common/context';
 import { mockContentLibrary, mockLibraryBlockMetadata } from '../data/api.mocks';
 import ComponentManagement from './ComponentManagement';
 
 jest.mock('../../content-tags-drawer', () => ({
-  ContentTagsDrawer: ({ canTagObject }: { canTagObject: boolean }) => (
-    <div>Mocked {canTagObject ? 'editable' : 'read-only'} ContentTagsDrawer</div>
+  ContentTagsDrawer: ({ readOnly }: { readOnly: boolean }) => (
+    <div>Mocked {readOnly ? 'editable' : 'read-only'} ContentTagsDrawer</div>
   ),
 }));
 
 mockContentLibrary.applyMock();
 mockLibraryBlockMetadata.applyMock();
 mockContentTaxonomyTagsData.applyMock();
 
-const { libraryId: mockLibraryId } = mockContentLibrary;
-
 /*
  * This function is used to get the inner text of an element.
  * https://stackoverflow.com/questions/47902335/innertext-is-undefined-in-jest-test
@@ -36,15 +35,14 @@ const matchInnerText = (nodeName: string, textToMatch: string) => (_: string, el
   element.nodeName === nodeName && getInnerText(element) === textToMatch
 );
 
-const render = (usageKey: string) => baseRender(<ComponentManagement />, {
+const render = (usageKey: string, libraryId?: string) => baseRender(<ComponentManagement />, {
   extraWrapper: ({ children }) => (
-    <LibraryProvider libraryId={mockLibraryId} sidebarComponentUsageKey={usageKey}>
+    <LibraryProvider libraryId={libraryId || mockContentLibrary.libraryId} sidebarComponentUsageKey={usageKey}>
       {children}
     </LibraryProvider>
   ),
 });
-// lib:OpenedX:CSPROB2
-//
+
 describe('<ComponentManagement />', () => {
   beforeEach(() => {
     initializeMocks();
@@ -82,9 +80,10 @@ describe('<ComponentManagement />', () => {
         ...getConfig(),
         ENABLE_TAGGING_TAXONOMY_PAGES: 'true',
       });
-      render(libraryId);
-      expect(await screen.findByText('Tags (0)')).toBeInTheDocument();
-      expect(screen.queryByText(`Mocked ${expected} ContentTagsDrawer`)).toBeInTheDocument();
+      render(mockLibraryBlockMetadata.usageKeyForTags, libraryId);
+      await waitFor(() => {
+        expect(screen.getByText(`Mocked ${expected} ContentTagsDrawer`)).toBeInTheDocument();
+      });
     },
   );
 

src/library-authoring/library-team/LibraryTeam.test.tsx

@@ -140,7 +140,7 @@ describe('<LibraryTeam />', () => {
     await waitFor(() => {
       expect(axiosMock.history.patch.length).toEqual(1);
       expect(axiosMock.history.patch[0].data).toBe(
-        `{"id":"${libraryId}","allow_public_read":true}`,
+        '{"allow_public_read":true}',
       );
     });
   });