Simplify mapping

yext · Nov 4, 2021 · 044a6e2 · 044a6e2
1 parent 90fafc7
commit 044a6e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/sample-app/src/components/DecoratedAppliedFilters.tsx b/sample-app/src/components/DecoratedAppliedFilters.tsx
@@ -3,14 +3,16 @@ import { AppliedQueryFilter } from "@yext/answers-core";
 import { useAnswersState } from '@yext/answers-headless-react';
 import { GroupedFilters } from '../models/groupedFilters';
 import { getGroupedAppliedFilters } from '../utils/appliedfilterutils';
-import { StaticFiltersLabelConfig } from "./StaticFilters";
 
 export interface DecoratedAppliedFiltersConfig {
   showFieldNames?: boolean,
   hiddenFields?: Array<string>,
   labelText?: string,
   delimiter?: string,
-  staticFiltersGroupLabels?: Record<string, StaticFiltersLabelConfig>,
+  /**
+   * A mapping of static filter fieldIds to their displayed group labels.
+   */
+  staticFiltersGroupLabels?: Record<string, string>,
   appliedQueryFilters?: AppliedQueryFilter[]
 }
 

diff --git a/sample-app/src/components/StaticFilters.tsx b/sample-app/src/components/StaticFilters.tsx
@@ -2,10 +2,6 @@ import React, { Fragment } from 'react';
 import { Filter, CombinedFilter, FilterCombinator, Matcher } from '@yext/answers-core';
 import { AnswersHeadlessContext } from '@yext/answers-headless-react';
 
-export interface StaticFiltersLabelConfig {
-  label: string
-}
-
 interface CheckBoxProps {
   fieldId: string,
   value: string,

diff --git a/sample-app/src/pages/VerticalSearchPage.tsx b/sample-app/src/pages/VerticalSearchPage.tsx
@@ -51,9 +51,7 @@ const facetConfigs = {
 }
 
 const staticFiltersGroupLabels = {
-  c_employeeCountry: {
-    label: 'Employee Country'
-  }
+  c_employeeCountry: 'Employee Country'
 }
 
 export default function VerticalSearchPage(props: {

diff --git a/sample-app/src/utils/appliedfilterutils.tsx b/sample-app/src/utils/appliedfilterutils.tsx
@@ -9,7 +9,6 @@ import {
   getDisplayableAppliedFacets,
   getDisplayableNlpFilters
 } from "./displayablefilterutils";
-import { StaticFiltersLabelConfig } from "../components/StaticFilters";
 
 /**
  * Returns a new list of nlp filters with duplicates of other filters and 
@@ -65,7 +64,7 @@ export function getGroupedAppliedFilters(
   appliedFiltersState: FiltersState,
   nlpFilters: AppliedQueryFilter[],
   hiddenFields: string[],
-  staticFiltersGroupLabels: Record<string, StaticFiltersLabelConfig>
+  staticFiltersGroupLabels: Record<string, string>
 ): Array<GroupedFilters>  {
   const displayableStaticFilters = getDisplayableStaticFilters(flattenFilters(appliedFiltersState?.static), staticFiltersGroupLabels);
   const displayableFacets = getDisplayableAppliedFacets(appliedFiltersState?.facets);

diff --git a/sample-app/src/utils/displayablefilterutils.tsx b/sample-app/src/utils/displayablefilterutils.tsx
@@ -1,5 +1,4 @@
 import { AppliedQueryFilter, Filter, DisplayableFacet } from '@yext/answers-core';
-import { StaticFiltersLabelConfig } from '../components/StaticFilters';
 import { DisplayableFilter } from '../models/displayableFilter';
 import { getFilterDisplayValue } from './filterutils';
 
@@ -32,14 +31,14 @@ export function getDisplayableAppliedFacets(facets: DisplayableFacet[] | undefin
  */
 export function getDisplayableStaticFilters(
   filters: Filter[],
-  groupLabels: Record<string, StaticFiltersLabelConfig>
+  groupLabels: Record<string, string>
 ): DisplayableFilter[] {
   let appliedStaticFilters: DisplayableFilter[] = [];
   filters?.forEach(filter => {
     appliedStaticFilters.push({
       filterType: 'STATIC_FILTER',
       filter: filter,
-      groupLabel: groupLabels?.[filter.fieldId]?.label || filter.fieldId,
+      groupLabel: groupLabels?.[filter.fieldId] || filter.fieldId,
       label: getFilterDisplayValue(filter),
     });
   });