fix: resolve conflicts

Author: navinkarkera

src/library-authoring/components/ContainerCard.tsx

@@ -58,7 +58,8 @@ type ContainerCardPreviewProps = {
 };
 
 const ContainerCardPreview = ({ containerId, showMaxChildren = 5 }: ContainerCardPreviewProps) => {
-  const { data, isLoading, isError } = useContainerChildren(containerId);
+  const { libraryId } = useLibraryContext();
+  const { data, isLoading, isError } = useContainerChildren(libraryId, containerId);
   if (isLoading || isError) {
     return null;
   }

src/library-authoring/data/api.mocks.ts

@@ -545,7 +545,7 @@ mockGetContainerChildren.childTemplate = {
 } satisfies api.LibraryBlockMetadata;
 /** Apply this mock. Returns a spy object that can tell you if it's been called. */
 mockGetContainerChildren.applyMock = () => {
-  jest.spyOn(api, 'getContainerChildren').mockImplementation(mockGetContainerChildren);
+  jest.spyOn(api, 'getLibraryContainerChildren').mockImplementation(mockGetContainerChildren);
 };
 
 /**

src/library-authoring/data/apiHooks.ts

@@ -107,11 +107,6 @@ export const libraryAuthoringQueryKeys = {
     'blockTypes',
     libraryId,
   ],
-  container: (libraryId?: string, containerId?: string) => [
-    ...libraryAuthoringQueryKeys.all,
-    libraryId,
-    containerId,
-  ],
 };
 
 export const xblockQueryKeys = {