fix: rebase issues

Author: navinkarkera

src/library-authoring/EmptyStates.tsx

@@ -14,9 +14,11 @@ import { useContentLibrary } from './data/apiHooks';
 export const NoComponents = ({
   infoText = messages.noComponents,
   addBtnText = messages.addComponent,
+  searchType = "component",
 }: {
-  infoText: MessageDescriptor;
-  addBtnText: MessageDescriptor;
+  infoText?: MessageDescriptor;
+  addBtnText?: MessageDescriptor;
+  searchType?: "collection" | "component";
 }) => {
   const { openAddContentSidebar, openCreateCollectionModal } = useContext(LibraryContext);
   const { libraryId } = useParams();
@@ -46,7 +48,7 @@ export const NoComponents = ({
 export const NoSearchResults = ({
   infoText = messages.noSearchResults,
 }: {
-  infoText: MessageDescriptor;
+  infoText?: MessageDescriptor;
 }) => (
   <Stack direction="horizontal" gap={3} className="my-6 justify-content-center">
     <FormattedMessage {...infoText} />

src/library-authoring/LibraryLayout.tsx

@@ -13,7 +13,6 @@ import LibraryAuthoringPage from './LibraryAuthoringPage';
 import { LibraryProvider } from './common/context';
 import { CreateCollectionModal } from './create-collection';
 import { invalidateComponentData } from './data/apiHooks';
-import LibraryCollectionPageWrapper from './LibraryCollectionPage';
 import LibraryCollectionPageWrapper from './collections/LibraryCollectionPage';
 
 const LibraryLayout = () => {

src/library-authoring/collections/LibraryCollectionComponents.tsx

@@ -10,7 +10,10 @@ const LibraryCollectionComponents = ({ libraryId }: { libraryId: string }) => {
   if (componentCount === 0) {
     return isFiltered ?
       <NoSearchResults infoText={messages.noSearchResultsInCollection} />
-      : <NoComponents infoText={messages.noComponentsInCollection} addBtnText={messages.addComponentsInCollection} />;
+      : <NoComponents
+        infoText={messages.noComponentsInCollection}
+        addBtnText={messages.addComponentsInCollection}
+      />;
   }
 
   return (

src/library-authoring/collections/LibraryCollectionPage.tsx

@@ -137,8 +137,8 @@ const LibraryCollectionPage = ({
   ];
 
   return (
-    <div className="d-flex overflow-auto">
-      <div className="flex-grow-1 align-content-center">
+    <div className="d-flex">
+      <div className="flex-grow-1">
         <Header
           number={libraryData.slug}
           title={libraryData.title}

src/library-authoring/collections/LibraryCollections.tsx

@@ -40,7 +40,11 @@ const LibraryCollections = ({ variant }: LibraryCollectionsProps) => {
   if (totalCollectionHits === 0) {
     return isFiltered ?
       <NoSearchResults infoText={messages.noSearchResultsCollections} />
-      : <NoComponents infoText={messages.noCollections} addBtnText={messages.addCollection} />;
+      : <NoComponents
+        infoText={messages.noCollections}
+        addBtnText={messages.addCollection}
+        searchType="collection"
+      />;
   }
 
   return (

src/library-authoring/library-sidebar/LibrarySidebar.tsx

@@ -33,14 +33,14 @@ const LibrarySidebar = ({ library, collection }: LibrarySidebarProps) => {
   const {
     sidebarBodyComponent,
     closeLibrarySidebar,
-    currentComponentKey,
+    currentComponentUsageKey,
   } = useContext(LibraryContext);
 
   const bodyComponentMap = {
     [SidebarBodyComponentId.AddContent]: <AddContentContainer />,
     [SidebarBodyComponentId.Info]: <LibraryInfo library={library} />,
     [SidebarBodyComponentId.ComponentInfo]: (
-      currentComponentKey && <ComponentInfo usageKey={currentComponentKey} />
+      currentComponentUsageKey && <ComponentInfo usageKey={currentComponentUsageKey} />
     ),
     [SidebarBodyComponentId.CollectionInfo]: <CollectionInfo />,
     unknown: null,
@@ -50,7 +50,7 @@ const LibrarySidebar = ({ library, collection }: LibrarySidebarProps) => {
     [SidebarBodyComponentId.AddContent]: <AddContentHeader />,
     [SidebarBodyComponentId.Info]: <LibraryInfoHeader library={library} />,
     [SidebarBodyComponentId.ComponentInfo]: (
-      currentComponentKey && <ComponentInfoHeader library={library} usageKey={currentComponentKey} />
+      currentComponentUsageKey && <ComponentInfoHeader library={library} usageKey={currentComponentUsageKey} />
     ),
     [SidebarBodyComponentId.CollectionInfo]: <CollectionInfoHeader collection={collection} />,
     unknown: null,