merge with facet_updates branch

eea · Dec 15, 2023 · 1c36558 · 1c36558
2 parents db223bf + 528f293
commit 1c36558
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 23 deletions.
diff --git a/searchlib/components/Facets/DropdownFacetsList.jsx b/searchlib/components/Facets/DropdownFacetsList.jsx
@@ -74,23 +74,25 @@ const DropdownFacetsList = ({ defaultWrapper }) => {
             wrapper="DropdownFacetWrapper"
           />
         ))}
-        <div className="dropdown-facet">
-          <Button
-            className="sui-button basic"
-            onClick={() => setShowSidebar(true)}
-            onKeyDown={(e) => {
-              if (e.key === 'Enter') {
-                setShowSidebar(true);
-              }
-              if (e.key === 'Escape') {
-                setShowSidebar(false);
-              }
-            }}
-            // disabled={isLiveSearch}
-          >
-            <span className="facet-title">+ More filters</span>
-          </Button>
-        </div>
+        {sidebarFacets.length > 0 && (
+          <div className="dropdown-facet">
+            <Button
+              className="sui-button basic"
+              onClick={() => setShowSidebar(true)}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  setShowSidebar(true);
+                }
+                if (e.key === 'Escape') {
+                  setShowSidebar(false);
+                }
+              }}
+              // disabled={isLiveSearch}
+            >
+              <span className="facet-title">+ More filters</span>
+            </Button>
+          </div>
+        )}
         {/*
         {filterNames.length > 0 && (
           <Button

diff --git a/searchlib/components/Facets/Wrappers/AccordionFacetWrapper.jsx b/searchlib/components/Facets/Wrappers/AccordionFacetWrapper.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import { Accordion, Icon } from 'semantic-ui-react';
 import { useAtom } from 'jotai';
 import { openFacetsAtom } from '../state';
@@ -8,9 +9,9 @@ import Facet from '../Facet';
 import { Dimmer } from 'semantic-ui-react';
 
 const AccordionFacetWrapper = (props) => {
-  const { collapsable = true, field, label, isLoading } = props;
+  const { collapsable = true, field, label, token, isLoading } = props;
   const searchContext = useSearchContext();
-  const { filters } = searchContext;
+  const { facets, filters } = searchContext;
 
   const hasFilter = !!filters.find((filter) => field === filter.field);
   const [openFacets] = useAtom(openFacetsAtom);
@@ -43,7 +44,8 @@ const AccordionFacetWrapper = (props) => {
 
   let isOpened = openFacets[field]?.opened || false;
   const [counter, setCounter] = React.useState(0);
-
+  if (facets[field] === undefined) return null;
+  if (facet?.authOnly && token === undefined) return null;
   return collapsable ? (
     <Accordion>
       <Accordion.Title
@@ -100,4 +102,6 @@ const AccordionFacetWrapper = (props) => {
   );
 };
 
-export default AccordionFacetWrapper;
+export default connect((state) => ({
+  token: state.userSession?.token,
+}))(AccordionFacetWrapper);
diff --git a/searchlib/components/Facets/Wrappers/DropdownFacetWrapper.jsx b/searchlib/components/Facets/Wrappers/DropdownFacetWrapper.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import {
   useAppConfig,
   useProxiedSearchContext,
@@ -31,13 +32,14 @@ const DropdownFacetWrapper = (props) => {
     sortedOptions,
     filterType,
     isLoading,
+    token,
   } = props;
   const rawSearchContext = useSearchContext();
   const {
     searchContext: facetSearchContext,
     applySearch,
   } = useProxiedSearchContext(rawSearchContext);
-  const { filters } = facetSearchContext;
+  const { facets, filters } = facetSearchContext;
 
   const { appConfig } = useAppConfig();
   const facet = appConfig.facets?.find((f) => f.field === field);
@@ -65,6 +67,8 @@ const DropdownFacetWrapper = (props) => {
 
   const { width } = useWindowDimensions();
   const isSmallScreen = width < SMALL_SCREEN_SIZE;
+  if (facets[field] === undefined) return null;
+  if (facet?.authOnly && token === undefined) return null;
 
   return (
     <>
@@ -199,4 +203,6 @@ const DropdownFacetWrapper = (props) => {
   );
 };
 
-export default DropdownFacetWrapper;
+export default connect((state) => ({
+  token: state.userSession?.token,
+}))(DropdownFacetWrapper);
diff --git a/src/SearchBlock/SearchBlockView.jsx b/src/SearchBlock/SearchBlockView.jsx
@@ -28,6 +28,7 @@ function SearchBlockView(props) {
   const schemaFields = [
     'availableFacets',
     'defaultFacets',
+    'authOnlyFacets',
     'defaultFilters',
     'showClusters',
     'defaultSort',

diff --git a/src/SearchBlock/templates/schema.js b/src/SearchBlock/templates/schema.js
@@ -58,6 +58,7 @@ export const searchResultsSchemaEnhancer = ({ schema, formData }) => {
       'landingPageURL',
       'availableFacets',
       'defaultFacets',
+      'authOnlyFacets',
       'defaultFilters',
       'defaultSort',
     ],
@@ -112,6 +113,11 @@ export const searchResultsSchemaEnhancer = ({ schema, formData }) => {
       widget: 'array',
       choices: [],
     },
+    authOnlyFacets: {
+      title: 'Facets for authenticated users',
+      widget: 'array',
+      choices: [],
+    },
     defaultSort: {
       title: 'Default sort',
       // widget: 'sort_widget',
@@ -138,6 +144,9 @@ export const searchResultsSchemaEnhancer = ({ schema, formData }) => {
     schema.properties.defaultFacets.choices = availableFacets;
     schema.properties.defaultFacets.items = { choices: availableFacets };
 
+    schema.properties.authOnlyFacets.choices = availableFacets;
+    schema.properties.authOnlyFacets.items = { choices: availableFacets };
+
     // fill in defaultResultView choices
     schema.properties.defaultResultView = {
       ...schema.properties.defaultResultView,

diff --git a/src/SearchBlock/utils.js b/src/SearchBlock/utils.js
@@ -62,6 +62,12 @@ const _applyBlockSettings = (config, appName, data, schema) => {
     });
   }
 
+  if (data.authOnlyFacets) {
+    settings.facets.forEach((f) => {
+      f.authOnly = data.authOnlyFacets.indexOf(f.field) > -1 ? true : false;
+    });
+  }
+
   if (data.defaultFilters) {
     const filters = data.defaultFilters
       .map((f) => ({