fix: fixes from merge

Author: rpenido

src/library-authoring/add-content/AddContent.tsx

@@ -208,7 +208,7 @@ const AddContent = () => {
     unitId,
   } = useLibraryContext();
   const addComponentsToCollectionMutation = useAddItemsToCollection(libraryId, collectionId);
-  const addComponentsToContainerMutation = useAddComponentsToContainer(libraryId, unitId);
+  const addComponentsToContainerMutation = useAddComponentsToContainer(unitId);
   const createBlockMutation = useCreateLibraryBlock();
   const pasteClipboardMutation = useLibraryPasteClipboard();
   const { showToast } = useContext(ToastContext);

src/library-authoring/containers/UnitInfo.tsx

@@ -112,19 +112,14 @@ const UnitInfo = () => {
     );
   }, [hiddenTabs, defaultTab.unit, unitId]);
 
-  // istanbul ignore if: this should never happen
-  if (!unitId) {
-    throw new Error('unitId is required');
-  }
-
   useEffect(() => {
     // Show Organize tab if JumpToAddCollections action is set in sidebarComponentInfo
     if (jumpToCollections) {
       setSidebarTab(UNIT_INFO_TABS.Organize);
     }
   }, [jumpToCollections, setSidebarTab]);
 
-  if (!container) {
+  if (!container || !unitId) {
     return null;
   }
 

src/library-authoring/data/apiHooks.test.tsx

@@ -259,14 +259,13 @@ describe('library api hooks', () => {
   });
 
   it('should add components to container', async () => {
-    const libraryId = 'lib:org:1';
     const componentId = 'lb:org:lib:html:1';
     const containerId = 'ltc:org:lib:unit:1';
 
     const url = getLibraryContainerChildrenApiUrl(containerId);
 
     axiosMock.onPost(url).reply(200);
-    const { result } = renderHook(() => useAddComponentsToContainer(libraryId, containerId), { wrapper });
+    const { result } = renderHook(() => useAddComponentsToContainer(containerId), { wrapper });
     await result.current.mutateAsync([componentId]);
 
     expect(axiosMock.history.post[0].url).toEqual(url);

src/library-authoring/data/apiHooks.ts

@@ -100,16 +100,14 @@ export const libraryAuthoringQueryKeys = {
     'blockTypes',
     libraryId,
   ],
-  container: (libraryId?: string, containerId?: string) => [
+  container: (containerId?: string) => [
     ...libraryAuthoringQueryKeys.all,
     'container',
-    libraryId,
     containerId,
   ],
-  containerChildren: (libraryId?: string, containerId?: string) => [
+  containerChildren: (containerId?: string) => [
     ...libraryAuthoringQueryKeys.all,
     'container',
-    libraryId,
     containerId,
     'children',
   ],
@@ -131,14 +129,6 @@ export const xblockQueryKeys = {
   componentDownstreamLinks: (usageKey: string) => [...xblockQueryKeys.xblock(usageKey), 'downstreamLinks'],
 };
 
-export const containerQueryKeys = {
-  all: ['container', 'children'],
-  /**
-   * Base key for data specific to a container
-   */
-  container: (containerId?: string) => [...containerQueryKeys.all, containerId],
-};
-
 /**
  * Tell react-query to refresh its cache of any data related to the given
  * component (XBlock).
@@ -276,7 +266,7 @@ export const useRevertLibraryChanges = () => {
 /**
  * Hook to fetch a content library's team members
  */
-export const useLibraryTeam = (libraryId: string | undefined) => (
+export const useLibraryTeam = (libraryId?: string) => (
   useQuery({
     queryKey: libraryAuthoringQueryKeys.libraryTeam(libraryId),
     queryFn: () => getLibraryTeam(libraryId!),
@@ -287,7 +277,7 @@ export const useLibraryTeam = (libraryId: string | undefined) => (
 /**
  * Hook to fetch the list of XBlock types that can be added to this library.
  */
-export const useBlockTypesMetadata = (libraryId: string | undefined) => (
+export const useBlockTypesMetadata = (libraryId?: string) => (
   useQuery({
     queryKey: libraryAuthoringQueryKeys.blockTypes(libraryId),
     queryFn: () => getBlockTypes(libraryId!),
@@ -612,7 +602,7 @@ export const useCreateLibraryContainer = (libraryId: string) => {
 export const useContainer = (containerId?: string) => (
   useQuery({
     enabled: !!containerId,
-    queryKey: containerQueryKeys.container(containerId),
+    queryKey: libraryAuthoringQueryKeys.container(containerId!),
     queryFn: () => getContainerMetadata(containerId!),
   })
 );
@@ -629,7 +619,7 @@ export const useUpdateContainer = (containerId: string) => {
       // NOTE: We invalidate the library query here because we need to update the library's
       // container list.
       queryClient.invalidateQueries({ predicate: (query) => libraryQueryPredicate(query, libraryId) });
-      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.containerChildren(libraryId, containerId) });
+      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.container(containerId) });
     },
   });
 };
@@ -666,19 +656,18 @@ export const useRestoreContainer = (containerId: string) => {
 /**
  * Get the metadata and children for a container in a library
  */
-export const useContainerChildren = (containerId: string) => {
-  const libraryId = getLibraryId(containerId);
-  return useQuery({
+export const useContainerChildren = (containerId?: string) => (
+  useQuery({
     enabled: !!containerId,
-    queryKey: libraryAuthoringQueryKeys.containerChildren(libraryId, containerId),
+    queryKey: libraryAuthoringQueryKeys.containerChildren(containerId),
     queryFn: () => getLibraryContainerChildren(containerId!),
-  });
+  })
 );
 
 /**
  * Use this mutation to add components to a container
  */
-export const useAddComponentsToContainer = (libraryId?: string, containerId?: string) => {
+export const useAddComponentsToContainer = (containerId?: string) => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async (componentIds: string[]) => {
@@ -688,7 +677,7 @@ export const useAddComponentsToContainer = (libraryId?: string, containerId?: st
       return undefined;
     },
     onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.containerChildren(libraryId, containerId) });
+      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.containerChildren(containerId!) });
     },
   });
 };

src/library-authoring/units/LibraryUnitBlocks.tsx

@@ -18,7 +18,7 @@ import TagCount from '../../generic/tag-count';
 import { useLibraryContext } from '../common/context/LibraryContext';
 import ComponentMenu from '../components';
 import { LibraryBlockMetadata } from '../data/api';
-import { containerQueryKeys, useContainerChildren } from '../data/apiHooks';
+import { libraryAuthoringQueryKeys, useContainerChildren } from '../data/apiHooks';
 import { LibraryBlock } from '../LibraryBlock';
 import { useLibraryRoutes } from '../routes';
 import messages from './messages';
@@ -42,11 +42,6 @@ export const LibraryUnitBlocks = () => {
     openAddContentSidebar,
   } = useSidebarContext();
 
-  // istanbul ignore if: this should never happen
-  if (!unitId) {
-    throw new Error('unitId is required');
-  }
-
   const queryClient = useQueryClient();
   const {
     data: blocks,
@@ -55,7 +50,6 @@ export const LibraryUnitBlocks = () => {
     error,
   } = useContainerChildren(unitId);
 
-
   useEffect(() => setOrderedBlocks(blocks || []), [blocks]);
 
   if (isLoading) {
@@ -75,7 +69,7 @@ export const LibraryUnitBlocks = () => {
   };
 
   const onTagSidebarClose = () => {
-    queryClient.invalidateQueries(containerQueryKeys.children(unitId));
+    queryClient.invalidateQueries(libraryAuthoringQueryKeys.containerChildren(unitId));
     closeManageTagsDrawer();
   };