Merge branch 'padms/2751' into staging

equinor · Jan 16, 2025 · e878966 · e878966
2 parents 7cab02f + 2166de4
commit e878966
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/web/core/Breadcrumbs/Breadcrumbs.tsx b/web/core/Breadcrumbs/Breadcrumbs.tsx
@@ -24,13 +24,17 @@ const buildJsonLdElements = (crumbs: Breadcrumb[], router: ReturnType<typeof use
   }))
 }
 
-const capitalize = (text: string): string => text[0].toUpperCase() + text.slice(1)
+const capitalize = (text: string): string => text?.[0].toUpperCase() + text?.slice(1)
 
 const parseBreadcrumbs = (crumbs: Breadcrumb[]) => {
-  return crumbs.map((item) => ({
-    ...item,
-    label: capitalize(item.label),
-  }))
+  return crumbs
+    .filter((item) => item?.slug && item?.label)
+    .map((item) => {
+      return {
+        ...item,
+        label: capitalize(item.label),
+      }
+    })
 }
 
 export const Breadcrumbs = ({
@@ -76,4 +80,4 @@ export const Breadcrumbs = ({
       <BreadcrumbJsonLd itemListElements={buildJsonLdElements(crumbs, router)} />
     </BackgroundContainer>
   )
-}
+}
diff --git a/web/templates/newsroom/Newsroom.tsx b/web/templates/newsroom/Newsroom.tsx
@@ -134,7 +134,7 @@ const NewsRoomTemplate = forwardRef<HTMLElement, NewsRoomTemplateProps>(function
   const queriedSearchClient: SearchClient = {
     ...searchClient,
     search(requests: any) {
-      if (requests.every(({ params }: any) => !params.query)) {
+      if (requests.every(({ params }: any) => !params.query && params?.facetFilters?.flat().length > 2)) {
         return Promise.resolve({
           results: requests.map(() => initialSearchResponse),
         })