React components: First working step with language

rohberg · Apr 10, 2024 · a60c62c · a60c62c
1 parent 7181cca
commit a60c62c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/components/Searchkit/CustomESRequestSerializer.jsx b/src/components/Searchkit/CustomESRequestSerializer.jsx
@@ -9,6 +9,7 @@ export class CustomESRequestSerializer {
     this.allowed_content_types = config.allowed_content_types;
     this.allowed_review_states = config.allowed_review_states;
     this.search_sections = config.search_sections;
+    this.language = config.language;
   }
   /**
    * Convert Array of filters to Object of filters
@@ -258,6 +259,11 @@ export class CustomESRequestSerializer {
 
     // Generate terms of global filters
     let terms = [];
+    terms.push({
+      terms: {
+        language: [this.language], // TODO language
+      },
+    });
     this.allowed_content_types?.length > 0 &&
       terms.push({
         terms: {

diff --git a/src/components/Searchkit/ESSearchApi.jsx b/src/components/Searchkit/ESSearchApi.jsx
@@ -37,6 +37,7 @@ export class PloneSearchApi {
       allowed_content_types: config.allowed_content_types,
       allowed_review_states: config.allowed_review_states,
       search_sections: config.search_sections,
+      language: config.language,
     });
     this.responseSerializer = new responseSerializerCls({
       backend_url: config.backend_url,

diff --git a/src/components/Views/FacetedSearch.jsx b/src/components/Views/FacetedSearch.jsx
@@ -57,7 +57,7 @@ import './less/springisnow-volto-searchkit-block.less';
 import config from '@plone/volto/registry';
 
 // TODO Make reviewstatemapping configurable
-export const ploneSearchApi = (data) => {
+export const ploneSearchApi = (data, language='en') => {
   const cookies = new Cookies();
   const authToken = cookies.get('auth_token');
   return new PloneSearchApi({
@@ -78,6 +78,7 @@ export const ploneSearchApi = (data) => {
     allowed_content_types: data.allowed_content_types,
     allowed_review_states: data.allowed_review_states,
     search_sections: data.search_sections,
+    language: language,
     backend_url: data.backend_url,
     frontend_url: data.frontend_url,
     // elastic_search_api_url: data.elastic_search_api_url,
@@ -708,6 +709,7 @@ const FacetedSearch = ({ data, overriddenComponents }) => {
   };
 
   // TODO Check if check on client could be made simpler
+  const language = useSelector((state) => state.intl.locale);
   const [isClient, setIsClient] = React.useState(null);
   React.useEffect(() => setIsClient(true), []);
 
@@ -716,7 +718,7 @@ const FacetedSearch = ({ data, overriddenComponents }) => {
       {isClient && (
         <OverridableContext.Provider value={overriddenComponents}>
           <ReactSearchKit
-            searchApi={ploneSearchApi(data)}
+            searchApi={ploneSearchApi(data, language)}
             eventListenerEnabled={true}
             initialQueryState={{
               ...initialState,