fix: merge errors

open-craft · Jul 24, 2024 · dacf7c7 · dacf7c7
1 parent 88e5bae
commit dacf7c7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/library-authoring/LibraryAuthoringPage.test.tsx b/src/library-authoring/LibraryAuthoringPage.test.tsx
@@ -269,7 +269,6 @@ describe('<LibraryAuthoringPage />', () => {
     fireEvent.click(getByRole('tab', { name: 'Home' }));
   });
 
-
   it('should open and close new content sidebar', async () => {
     mockUseParams.mockReturnValue({ libraryId: libraryData.id });
     axiosMock.onGet(getContentLibraryApiUrl(libraryData.id)).reply(200, libraryData);
@@ -288,7 +287,7 @@ describe('<LibraryAuthoringPage />', () => {
     fireEvent.click(closeButton);
 
     expect(screen.queryByText(/add content/i)).not.toBeInTheDocument();
-  });    
+  });
 
   it('show the "View All" button when viewing library with many components', async () => {
     mockUseParams.mockReturnValue({ libraryId: libraryData.id });

diff --git a/src/library-authoring/LibraryAuthoringPage.tsx b/src/library-authoring/LibraryAuthoringPage.tsx
@@ -120,7 +120,7 @@ const LibraryAuthoringPage = () => {
                 <FilterByBlockType />
                 <ClearFiltersButton />
                 <div className="flex-grow-1" />
-                <SearchSortWidget />                
+                <SearchSortWidget />
               </div>
               <Tabs
                 variant="tabs"

diff --git a/src/library-authoring/LibraryHome.tsx b/src/library-authoring/LibraryHome.tsx
@@ -16,7 +16,6 @@ type LibraryHomeProps = {
   handleTabChange: (key: string) => void,
 };
 
-
 const LibraryHome = ({ libraryId, tabList, handleTabChange } : LibraryHomeProps) => {
   const intl = useIntl();
   const {

diff --git a/src/library-authoring/components/LibraryComponents.tsx b/src/library-authoring/components/LibraryComponents.tsx
@@ -32,7 +32,7 @@ const LibraryComponents = ({
     searchKeywords,
   } = useSearchContext();
 
-  const componentList = variant === 'preview' ? hits.slice(0, 4) : hits;
+  const componentList = variant === 'preview' ? hits.slice(0, LIBRARY_SECTION_PREVIEW_LIMIT) : hits;
 
   // TODO add this to LibraryContext
   const { data: blockTypesData } = useLibraryBlockTypes(libraryId);
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ type LibraryHomeProps = { @@
       handleTabChange: (key: string) => void,
     };
     const LibraryHome = ({ libraryId, tabList, handleTabChange } : LibraryHomeProps) => {
       const intl = useIntl();
       const {
@@ Expand Down @@