fix: fixes from merge

Author: rpenido

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.ts

@@ -131,14 +131,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).
@@ -609,13 +601,14 @@ export const useCreateLibraryContainer = (libraryId: string) => {
 /**
  * Get the metadata for a container in a library
  */
-export const useContainer = (containerId?: string) => (
-  useQuery({
+export const useContainer = (containerId?: string) => {
+  const libraryId = getLibraryId(containerId);
+  return useQuery({
     enabled: !!containerId,
-    queryKey: containerQueryKeys.container(containerId),
+    queryKey: libraryAuthoringQueryKeys.container(libraryId, containerId!),
     queryFn: () => getContainerMetadata(containerId!),
-  })
-);
+  });
+};
 
 /**
  * Use this mutation to update the fields of a container in a library
@@ -629,7 +622,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(libraryId, containerId) });
     },
   });
 };
@@ -666,19 +659,19 @@ 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);
+export const useContainerChildren = (containerId?: string) => {
+  const libraryId = containerId ? getLibraryId(containerId) : undefined;
   return useQuery({
     enabled: !!containerId,
     queryKey: libraryAuthoringQueryKeys.containerChildren(libraryId, containerId),
     queryFn: () => getLibraryContainerChildren(containerId!),
   });
-);
+};
 
 /**
  * Use this mutation to add components to a container
  */
-export const useAddComponentsToContainer = (libraryId?: string, containerId?: string) => {
+export const useAddComponentsToContainer = (libraryId: string, containerId?: string) => {
   const queryClient = useQueryClient();
   return useMutation({
     mutationFn: async (componentIds: string[]) => {
@@ -688,7 +681,7 @@ export const useAddComponentsToContainer = (libraryId?: string, containerId?: st
       return undefined;
     },
     onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.containerChildren(libraryId, containerId) });
+      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.containerChildren(libraryId, containerId!) });
     },
   });
 };
@@ -702,7 +695,7 @@ export const useUpdateContainerCollections = (containerId: string) => {
   return useMutation({
     mutationFn: async (collectionKeys: string[]) => updateContainerCollections(containerId, collectionKeys),
     onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.container(containerId) });
+      queryClient.invalidateQueries({ queryKey: libraryAuthoringQueryKeys.container(libraryId, containerId) });
       queryClient.invalidateQueries({ predicate: (query) => libraryQueryPredicate(query, libraryId) });
     },
   });

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';
@@ -31,6 +31,7 @@ export const LibraryUnitBlocks = () => {
   const { navigateTo } = useLibraryRoutes();
 
   const {
+    libraryId,
     unitId,
     showOnlyPublished,
     componentId,
@@ -42,11 +43,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 +51,6 @@ export const LibraryUnitBlocks = () => {
     error,
   } = useContainerChildren(unitId);
 
-
   useEffect(() => setOrderedBlocks(blocks || []), [blocks]);
 
   if (isLoading) {
@@ -75,7 +70,7 @@ export const LibraryUnitBlocks = () => {
   };
 
   const onTagSidebarClose = () => {
-    queryClient.invalidateQueries(containerQueryKeys.children(unitId));
+    queryClient.invalidateQueries(libraryAuthoringQueryKeys.containerChildren(libraryId, unitId));
     closeManageTagsDrawer();
   };