Add special getActiveFilters method

eea · Jan 16, 2023 · 155488b · 155488b
1 parent e6495bd
commit 155488b
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 31 deletions.
diff --git a/searchlib/components/FilterList/ActiveFilterList.jsx b/searchlib/components/FilterList/ActiveFilterList.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { Segment, Accordion, Button, Icon } from 'semantic-ui-react';
 import { useAppConfig, useSearchContext } from '@eeacms/search/lib/hocs';
-import { isFilterValueDefaultValue } from '@eeacms/search/lib/search/helpers';
 import { isLandingPageAtom } from '@eeacms/search/state';
 import { useAtom } from 'jotai';
 
@@ -11,23 +10,10 @@ const ActiveFilterList = (props) => {
   const { filters, clearFilters, setFilter, removeFilter } = useSearchContext();
   const [isOpened, setIsOpened] = React.useState(true);
   const [isLandingPage] = useAtom(isLandingPageAtom);
-  const { appConfig } = useAppConfig();
-  const { facets = [] } = appConfig;
+  const { appConfig, registry } = useAppConfig();
 
-  const filterableFacets = facets.filter(
-    (f) =>
-      f.isFilter ||
-      (typeof f.showInFacetsList !== 'undefined' ? f.showInFacetsList : true),
-  );
-  const facetNames = filterableFacets.map((f) => f.field);
-
-  const filterNames = filters
-    .filter((f) => facetNames.includes(f.field))
-    .map((f) => f.field);
-
-  const activeFilters = filters
-    .filter((f) => filterNames.includes(f.field))
-    .filter((f) => !isFilterValueDefaultValue(f, appConfig));
+  const factoryName = appConfig.getActiveFilters;
+  const activeFilters = registry.resolve[factoryName](filters, appConfig);
 
   return !isLandingPage && activeFilters.length ? (
     <Segment className="active-filter-list">

diff --git a/searchlib/index.js b/searchlib/index.js
@@ -6,6 +6,7 @@ export * from './lib/facets';
 export * from './lib/utils';
 export * from './lib/hocs';
 export * from './lib/search';
+export * from './lib/search/helpers';
 export * from './lib/models';
 export * from './lib/serialize';
 export * from './state';

diff --git a/searchlib/lib/search/helpers.js b/searchlib/lib/search/helpers.js
@@ -218,3 +218,22 @@ export const checkInteracted = ({ searchContext, appConfig }) => {
 
   return wasInteracted;
 };
+
+export function getActiveFilters(filters, appConfig) {
+  const { facets = [] } = appConfig;
+  const filterableFacets = facets.filter(
+    (f) =>
+      f.isFilter ||
+      (typeof f.showInFacetsList !== 'undefined' ? f.showInFacetsList : true),
+  );
+  const facetNames = filterableFacets.map((f) => f.field);
+  const filterNames = filters
+    .filter((f) => facetNames.includes(f.field))
+    .map((f) => f.field);
+
+  const activeFilters = filters
+    .filter((f) => filterNames.includes(f.field))
+    .filter((f) => !isFilterValueDefaultValue(f, appConfig));
+
+  return activeFilters;
+}
diff --git a/searchlib/lib/search/query/highlight.js b/searchlib/lib/search/query/highlight.js
@@ -48,15 +48,15 @@ export const buildHighlight = (searchTerm, config) => {
 
   return searchTerm && config.highlight?.fields
     ? {
-      highlight: {
-        ...config.highlight.queryParams,
-        fields: Object.assign(
-          {},
-          ...config.highlight.fields.map((name) => ({
-            [name]: _highlight(searchTerm, name),
-          })),
-        ),
-      },
-    }
+        highlight: {
+          ...config.highlight.queryParams,
+          fields: Object.assign(
+            {},
+            ...config.highlight.fields.map((name) => ({
+              [name]: _highlight(searchTerm, name),
+            })),
+          ),
+        },
+      }
     : {};
 };
diff --git a/searchlib/registry.js b/searchlib/registry.js
@@ -49,7 +49,6 @@ import {
   getValueFacet,
   getRangeFacet,
   getDateRangeFilter,
-  // getDateRangeFacet,
   getHistogramFilter,
   getBooleanFilter,
   getBooleanFacet,
@@ -58,8 +57,6 @@ import {
   buildHistogramFacetAggregationRequest,
   buildRangeFacetAggregationRequest,
   buildMLTFilter,
-  // getHistogramFacet,
-  // getMLTValue,
   highlightQueryBuilder,
   buildBooleanFacetRequest,
 } from '@eeacms/search/lib/search';
@@ -68,7 +65,7 @@ import {
   addQAParams,
   extractAnswers,
 } from '@eeacms/search/components/AnswerBox';
-// import { valueToString } from './lib/utils';
+import { getActiveFilters } from '@eeacms/search/lib/search/helpers';
 
 const config = {
   resolve: {
@@ -236,6 +233,7 @@ const config = {
 
     ResultModel,
     highlightQueryBuilder,
+    defaultGetActiveFilters: getActiveFilters,
   },
 
   searchui: {
@@ -278,6 +276,7 @@ const config = {
       promptQueryInterval: 20000,
       alwaysSearchOnInitialLoad: false, // used in elastic search driver
       showFilters: true, // enables the filters interface, to allow falling back to just a simple results list
+      getActiveFilters: 'defaultGetActiveFilters',
 
       // highlight: {
       //   queryParams: {