cleanup and remove of IGIB naming

rohberg · Dec 29, 2020 · 7a17bac · 7a17bac
1 parent 4f9cffa
commit 7a17bac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 54 deletions.
diff --git a/...nts/Searchkit/IGIBESRequestSerializer.jsx → ...s/Searchkit/CustomESRequestSerializer.jsx b/...nts/Searchkit/IGIBESRequestSerializer.jsx → ...s/Searchkit/CustomESRequestSerializer.jsx
@@ -1,13 +1,9 @@
-/*
- * respect IGIB filters: kompasscomponent, targetaudience, ...
- */
-
 import _extend from 'lodash/extend';
 import _isEmpty from 'lodash/isEmpty';
 
 import { listFields, nestedFields } from './constants.js';
 
-export class IGIBESRequestSerializer {
+export class CustomESRequestSerializer {
   getFilters = (filters) => {
     /**
      * input: [
@@ -50,8 +46,8 @@ export class IGIBESRequestSerializer {
    */
   serialize = (stateQuery) => {
     const { queryString, sortBy, sortOrder, page, size, filters } = stateQuery;
-    // console.debug('IGIBESRequestSerializer queryString', queryString);
-    // console.debug('IGIBESRequestSerializer filters', filters);
+    // console.debug('CustomESRequestSerializer queryString', queryString);
+    // console.debug('CustomESRequestSerializer filters', filters);
 
     const bodyParams = {};
     if (!_isEmpty(queryString)) {

diff --git a/src/components/Views/FacetedSearch.jsx b/src/components/Views/FacetedSearch.jsx
@@ -1,3 +1,4 @@
+// TODO update counts of BucketAggregation on selection of filter
 import React, { useEffect } from 'react';
 
 import { OverridableContext } from 'react-overridable';
@@ -25,7 +26,7 @@ import {
 } from 'react-searchkit';
 
 import { ESSearchApi } from '../Searchkit/ESSearchApi';
-import { IGIBESRequestSerializer } from '../Searchkit/IGIBESRequestSerializer';
+import { CustomESRequestSerializer } from '../Searchkit/CustomESRequestSerializer';
 import { Results } from '../Searchkit/Results';
 
 import { settings } from '~/config';
@@ -39,42 +40,6 @@ import './less/public.less';
 
 const OnResults = withState(Results);
 
-const customAggComp = (title, containerCmp) => {
-  return containerCmp ? (
-    <Menu vertical>
-      <Menu.Item>
-        <Menu.Header>{title}</Menu.Header>
-        {containerCmp}
-      </Menu.Item>
-    </Menu>
-  ) : null;
-};
-
-const customAggValuesContainerCmp = (valuesCmp) => (
-  <Menu.Menu>{valuesCmp}</Menu.Menu>
-);
-
-const customAggValueCmp = (
-  bucket,
-  isSelected,
-  onFilterClicked,
-  getChildAggCmps,
-) => {
-  const childAggCmps = getChildAggCmps(bucket);
-  return (
-    <Menu.Item
-      key={bucket.key}
-      name={bucket.key}
-      active={isSelected}
-      onClick={() => onFilterClicked(bucket.key)}
-    >
-      <Label>{bucket.doc_count}</Label>
-      {bucket.key}
-      {childAggCmps}
-    </Menu.Item>
-  );
-};
-
 // class Tags extends Component {
 //   onClick = (event, value) => {
 //     window.history.push({
@@ -97,7 +62,7 @@ const customAggValueCmp = (
 //   }
 // }
 
-const IGIBResultsListItem = ({ result, index }) => {
+const CustomResultsListItem = ({ result, index }) => {
   return (
     <Item key={index}>
       <Item.Content>
@@ -193,7 +158,7 @@ const myCountElement = ({ totalResults }) => <div>{totalResults} Treffer</div>;
 
 // One Filter of Faceted Navigation
 const customBucketAggregationElement = (props) => {
-  // console.debug('IGIBBucketAggregationElement', props);
+  // console.debug('customBucketAggregationElement', props);
   const { title, containerCmp } = props;
   const selectedFilters = containerCmp.props.selectedFilters.map((el) => el[1]);
   // console.debug(selectedFilters);
@@ -265,10 +230,10 @@ const customBucketAggregationValuesElement = (props) => {
 };
 
 const overriddenComponents = {
-  'BucketAggregation.element': customBucketAggregationElement,
-  'BucketAggregationContainer.element': customBucketAggregationContainerElement,
-  'BucketAggregationValues.element': customBucketAggregationValuesElement,
-  'ResultsList.item.elasticsearch': IGIBResultsListItem,
+  // 'BucketAggregation.element': customBucketAggregationElement,
+  // 'BucketAggregationContainer.element': customBucketAggregationContainerElement,
+  // 'BucketAggregationValues.element': customBucketAggregationValuesElement,
+  'ResultsList.item.elasticsearch': CustomResultsListItem,
   'Count.element': myCountElement,
 };
 
@@ -295,7 +260,7 @@ const FacetedSearch = ({ data, location }) => {
       headers: { Accept: 'application/json' },
     },
     es: {
-      requestSerializer: IGIBESRequestSerializer,
+      requestSerializer: CustomESRequestSerializer,
     },
   });
 
@@ -325,9 +290,6 @@ const FacetedSearch = ({ data, location }) => {
                         field: 'kompasscomponent',
                         aggName: 'kompasscomponent_agg.kompasscomponent_token',
                       }}
-                      renderElement={customAggComp}
-                      renderValuesContainerElement={customAggValuesContainerCmp}
-                      renderValueElement={customAggValueCmp}
                     />
                     <BucketAggregation
                       title="Zielpublikum"