remove pictures from show-more for location and date, unfold TagOverv…

…iew (#633) * remove pictures from show-more for location and date, unfold TagOverview * fix tests
hpi-swa-lab · Aug 22, 2023 · 74ecd83 · 74ecd83
1 parent f258784
commit 74ecd83
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 43 deletions.
diff --git a/projects/bp-gallery/cypress/e2e/show-more.cy.ts b/projects/bp-gallery/cypress/e2e/show-more.cy.ts
@@ -148,12 +148,6 @@ describe('Global Show More View', () => {
         targetText
       );
     });
-
-    // check for images in show more view
-    cy.contains('Mehr als 100 Bilder');
-    for (const id of [2, 3, 4, 5]) {
-      cy.get(`.picture-grid .row #picture-preview-for-${id}`).should('exist');
-    }
   });
 
   it('shows show more view for single decade "70er"', () => {
@@ -181,12 +175,6 @@ describe('Global Show More View', () => {
         `VERIFIZIERTER TESTORT ${num}`
       );
     }
-
-    // check for images in show more view
-    cy.contains('Mehr als 100 Bilder');
-    for (const id of [2, 3, 4, 5]) {
-      cy.get(`.picture-grid .row #picture-preview-for-${id}`).should('exist');
-    }
   });
 
   it('shows show more for single location "Verifizierter Testort 3"', () => {

diff --git a/projects/bp-gallery/src/components/common/TagOverview.tsx b/projects/bp-gallery/src/components/common/TagOverview.tsx
@@ -27,6 +27,7 @@ interface TagOverviewProps {
   queryParams?: LocationTagFiltersInput | PersonTagFiltersInput | KeywordTagFiltersInput;
   thumbnailQueryParams?: PictureFiltersInput;
   archiveId?: string;
+  allowFold?: boolean;
 }
 
 const TagOverview = ({
@@ -37,6 +38,7 @@ const TagOverview = ({
   queryParams,
   thumbnailQueryParams,
   archiveId,
+  allowFold,
 }: TagOverviewProps) => {
   const { t } = useTranslation();
   const ref = useRef<HTMLDivElement | null>(null);
@@ -114,6 +116,7 @@ const TagOverview = ({
               currentItemAmount={rows ? rowLength * rows : undefined}
               queryParams={queryParams}
               thumbnailQueryParams={thumbnailQueryParams}
+              allowFold={allowFold}
             />
           ) : (
             <DecadesList

diff --git a/projects/bp-gallery/src/components/views/search/TagList.tsx b/projects/bp-gallery/src/components/views/search/TagList.tsx
@@ -30,6 +30,7 @@ const TagList = ({
   currentItemAmount,
   queryParams,
   thumbnailQueryParams,
+  allowFold = true,
 }: {
   type: TagType;
   scroll?: boolean;
@@ -38,6 +39,7 @@ const TagList = ({
   currentItemAmount?: number;
   queryParams?: LocationTagFiltersInput | PersonTagFiltersInput | KeywordTagFiltersInput;
   thumbnailQueryParams?: PictureFiltersInput;
+  allowFold?: boolean;
 }) => {
   const { visit, location } = useVisit();
   const { t } = useTranslation();
@@ -73,7 +75,8 @@ const TagList = ({
   );
 
   const isFoldable = Boolean(
-    flattenedTags &&
+    allowFold &&
+      flattenedTags &&
       elementsPerRow &&
       flattenedTags.length > MAX_ROWS_WITHOUT_FOLDING * elementsPerRow &&
       !currentItemAmount

diff --git a/projects/bp-gallery/src/components/views/show-more/ShowMoreView.tsx b/projects/bp-gallery/src/components/views/show-more/ShowMoreView.tsx
@@ -82,36 +82,38 @@ const ShowMoreView = ({
           flattenedTags={flattenedTags}
         />
         <ShowStats>
-          <PictureScrollGrid
-            queryParams={getPictureQueryParams(
-              categoryType,
-              categoryId,
-              archiveId,
-              collectionsInfo
-            )}
-            sortBy={
-              categoryType !== 'pictures' && categoryId
-                ? ['time_range_tag.start:asc']
-                : categoryType === 'most-liked'
-                ? ['likes:desc']
-                : ['createdAt:desc']
-            }
-            hashbase={'show-more'}
-            extraAdornments={showcaseAdornment ? [showcaseAdornment] : []}
-            bulkOperations={[
-              removeFromCollection,
-              linkToCollection,
-              moveToCollection,
-              createSequence,
-              bulkEdit,
-              ...(exhibitionId ? [addToExhibition] : []),
-            ]}
-            maxNumPictures={
-              categoryType === 'latest' || categoryType === 'most-liked' ? 500 : undefined
-            }
-            textFilter={null}
-            fetchPolicy='cache-and-network'
-          />
+          {((categoryType !== 'location' && categoryType !== 'date') || categoryId) && (
+            <PictureScrollGrid
+              queryParams={getPictureQueryParams(
+                categoryType,
+                categoryId,
+                archiveId,
+                collectionsInfo
+              )}
+              sortBy={
+                categoryType !== 'pictures' && categoryId
+                  ? ['time_range_tag.start:asc']
+                  : categoryType === 'most-liked'
+                  ? ['likes:desc']
+                  : ['createdAt:desc']
+              }
+              hashbase={'show-more'}
+              extraAdornments={showcaseAdornment ? [showcaseAdornment] : []}
+              bulkOperations={[
+                removeFromCollection,
+                linkToCollection,
+                moveToCollection,
+                createSequence,
+                bulkEdit,
+                ...(exhibitionId ? [addToExhibition] : []),
+              ]}
+              maxNumPictures={
+                categoryType === 'latest' || categoryType === 'most-liked' ? 500 : undefined
+              }
+              textFilter={null}
+              fetchPolicy='cache-and-network'
+            />
+          )}
         </ShowStats>
       </div>
     );

diff --git a/projects/bp-gallery/src/components/views/show-more/ShowMoreViewHeader.tsx b/projects/bp-gallery/src/components/views/show-more/ShowMoreViewHeader.tsx
@@ -76,6 +76,7 @@ const ShowMoreViewHeader = ({
           type={categoryType as TagType}
           queryParams={getCategoryQueryParams(archiveId)}
           archiveId={archiveId}
+          allowFold={false}
         />
       </div>
     );