fix: fixes from merge

Author: rpenido

src/library-authoring/containers/UnitInfo.tsx

@@ -88,6 +88,12 @@ const UnitInfo = () => {
   ) ? sidebarTab : defaultTab.unit;
 
   const unitId = sidebarComponentInfo?.id;
+
+  // istanbul ignore if: this should never happen
+  if (!unitId) {
+    throw new Error('unitId is required');
+  }
+
   const { data: container } = useContainer(unitId);
 
   const handleOpenUnit = useCallback(() => {

src/library-authoring/data/apiHooks.ts

@@ -609,13 +609,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
@@ -673,7 +674,7 @@ export const useContainerChildren = (containerId: string) => {
     queryKey: libraryAuthoringQueryKeys.containerChildren(libraryId, containerId),
     queryFn: () => getLibraryContainerChildren(containerId!),
   });
-);
+};
 
 /**
  * Use this mutation to add components to a container

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,
@@ -55,7 +56,6 @@ export const LibraryUnitBlocks = () => {
     error,
   } = useContainerChildren(unitId);
 
-
   useEffect(() => setOrderedBlocks(blocks || []), [blocks]);
 
   if (isLoading) {
@@ -75,7 +75,7 @@ export const LibraryUnitBlocks = () => {
   };
 
   const onTagSidebarClose = () => {
-    queryClient.invalidateQueries(containerQueryKeys.children(unitId));
+    queryClient.invalidateQueries(libraryAuthoringQueryKeys.containerChildren(libraryId, unitId));
     closeManageTagsDrawer();
   };