Checkpoint

searchlib/components/Facets/Unconnected/MultiTermFacet.jsx

@@ -74,7 +74,7 @@ const Select = ({ options, value, onChange, className }) => {
   );
 };
 
-const ViewComponent = (props) => {
+const MultiTermFacetViewComponent = (props) => {
   const {
     className,
     label,
@@ -91,6 +91,8 @@ const ViewComponent = (props) => {
     filterType = 'any',
   } = props;
 
+  console.log('optiosn', options);
+
   const filterTypes = [
     { key: 2, text: 'Match any', value: 'any' },
     { key: 1, text: 'Match all', value: 'all' },
@@ -195,4 +197,4 @@ const ViewComponent = (props) => {
   );
 };
 
-export default ViewComponent;
+export default MultiTermFacetViewComponent;

searchlib/components/SearchApp/FacetApp.jsx

@@ -1,10 +1,6 @@
 import React from 'react';
 import { Facet as SUIFacet } from '@eeacms/search/components';
-import {
-  useSearchContext,
-  SearchContext,
-  useAppConfig,
-} from '@eeacms/search/lib/hocs';
+import { useSearchContext, useAppConfig } from '@eeacms/search/lib/hocs';
 import BasicSearchApp from './BasicSearchApp';
 import { atom, useAtom } from 'jotai';
 import { atomFamily } from 'jotai/utils';
@@ -21,6 +17,7 @@ function BoostrapFacetView(props) {
   // const { appConfig, registry } = props;
   const { appConfig, registry } = useAppConfig();
   const searchContext = useSearchContext();
+  console.log('searchContext', searchContext);
 
   const { filters } = searchContext;
 
@@ -76,19 +73,16 @@ function BoostrapFacetView(props) {
     setSavedFilters,
     value,
     searchContext,
-    // applySearch,
   ]);
 
   return (
-    <SearchContext.Provider value={searchContext}>
-      <SUIFacet
-        {...props}
-        active={true}
-        filterType={localFilterType}
-        onChangeFilterType={setLocalFilterType}
-        view={FacetComponent}
-      />
-    </SearchContext.Provider>
+    <SUIFacet
+      {...props}
+      active={true}
+      view={FacetComponent}
+      filterType={localFilterType}
+      onChangeFilterType={setLocalFilterType}
+    />
   );
 }
 

searchlib/lib/search/helpers.js

@@ -70,6 +70,7 @@ export function markSelectedFacetValuesFromFilters(
   const facetValues = facet.data;
   const filterValuesForField =
     findFilterValues(filters, fieldName, filterType) || [];
+  console.log({ facetValues, filterValuesForField });
   return {
     ...facet,
     data: facetValues.map((facetValue) => {
@@ -98,6 +99,7 @@ function getFilterValueDisplay(filterValue) {
  * @param {FilterValue} filterValue2
  */
 export function doFilterValuesMatch(filterValue1, filterValue2) {
+  console.log({ filterValue1, filterValue2 });
   if (filterValue1?.name || filterValue2?.name)
     // If two filters have matching names, then they are the same filter, there
     // is no need to do a more expensive deep equal comparison.

src/SearchBlock/SearchBlockView.jsx

@@ -51,7 +51,7 @@ function SearchBlockView(props) {
     <div>
       {mode !== 'view' && 'EEA Semantic Search block'}
       <Variation registry={registry} appName={appName} mode={mode}>
-        {children}
+        {mode !== 'view' ? children : null}
       </Variation>
     </div>
   );

src/SearchBlock/templates/FullView.jsx

@@ -11,6 +11,7 @@ const overlayStyle = {
 
 function FullView(props) {
   const { appName, mode } = props;
+  console.log('children', props.children);
 
   // TODO: (about bodyclass) this is a hack, please solve it properly
 
@@ -21,6 +22,7 @@ function FullView(props) {
           <div className="overlay" style={overlayStyle}></div>
         )}
         <SearchApp {...props} />
+        {props.children}
       </div>
     </BodyClass>
   );

src/SearchBlock/templates/LandingPageView.jsx

@@ -2,7 +2,12 @@ import React from 'react';
 import { LandingPageApp } from '@eeacms/search';
 
 function LandingPageView(props) {
-  return <LandingPageApp {...props} />;
+  return (
+    <>
+      <LandingPageApp {...props} />
+      {props.children}
+    </>
+  );
 }
 
 LandingPageView.schemaEnhancer = ({ schema }) => {

src/SearchBlock/templates/SearchInputView.jsx

@@ -11,12 +11,15 @@ function SearchInputView(props) {
   const url = flattenToAppURL(appConfig.url || '');
 
   return (
-    <SearchInputApp
-      {...props}
-      onSubmitSearch={(searchTerm) => {
-        history.push(`${url}?q=${searchTerm}`);
-      }}
-    />
+    <>
+      <SearchInputApp
+        {...props}
+        onSubmitSearch={(searchTerm) => {
+          history.push(`${url}?q=${searchTerm}`);
+        }}
+      />
+      {props.children}
+    </>
   );
 }