@eeacms/volto-cca-policy 0.2.22 → 0.2.24

package/src/components/manage/Blocks/RelevantAceContent/RelevantAceContentView.jsx

@@ -21,57 +21,37 @@ const RelevantAceContentView = (props) => {
   const hasAnyFilter = [element_type, sector, search_type, special_tags].some(
     (list) => list?.length > 0,
   );
+  const showBlock = (items && items.length > 0) || results.length > 0;
 
-  return (
+  const itemList = (items || []).map((item, index) => (
+    <List.Item key={index}>
+      <Link to={flattenToAppURL(item.link)}>{item.item_title}</Link>
+    </List.Item>
+  ));
+  const resultsList = results.map((result, index) => (
+    <List.Item key={index} title={result[1]}>
+      <Link to={flattenToAppURL(result[4])}>{result[0]}</Link>
+    </List.Item>
+  ));
+  const showResults = hasAnyFilter || search_text != null;
+
+  return showBlock ? (
     <div className="block relevant-acecontent-block">
       {title && <h4>{title}</h4>}
 
       {combine_results ? (
         <>
-          {(items || []).map((item, index) => (
-            <List.Item key={index}>
-              <Link to={flattenToAppURL(item.link)}>{item.item_title}</Link>
-            </List.Item>
-          ))}
-
-          {!isEdit && (hasAnyFilter || search_text != null) && (
-            <>
-              {results.map((result, index) => (
-                <List.Item key={index} title={result[1]}>
-                  <Link to={flattenToAppURL(result[4])}>{result[0]}</Link>
-                </List.Item>
-              ))}
-            </>
-          )}
+          {itemList}
+          {!isEdit && showResults && resultsList}
         </>
+      ) : items && items.length > 0 ? (
+        itemList
       ) : (
-        <>
-          {items && items.length > 0 ? (
-            <>
-              {items.map((item, index) => (
-                <List.Item key={index}>
-                  <Link to={flattenToAppURL(item.link)}>{item.item_title}</Link>
-                </List.Item>
-              ))}
-            </>
-          ) : (
-            <>
-              {!isEdit && (hasAnyFilter || search_text != null) && (
-                <>
-                  {results.map((result, index) => (
-                    <List.Item key={index} title={result[1]}>
-                      <Link to={flattenToAppURL(result[4])}>{result[0]}</Link>
-                    </List.Item>
-                  ))}
-                </>
-              )}
-            </>
-          )}
-        </>
+        !isEdit && showResults && resultsList
       )}
-
-      {isEdit && <div>Relevant AceContent Block</div>}
     </div>
+  ) : (
+    <>{isEdit && <div>No items</div>}</>
   );
 };
 

package/src/search/index.js

@@ -1,8 +1,9 @@
 import installMainSearch from './config';
 import installHealthSearch from './health_observatory/config-health';
 import installMissionStoriesSearch from './mission_stories/config-stories';
-import installMissionProjectsSearch from './mission_projects/config-projects';
 import installMissionToolsSearch from './mission_tools/config-tools';
+import installMissionProjectsSearch from './mission_projects/config-projects';
+import installMissionFundingSearch from './mission_funding/config-funding';
 
 const extraQueryParams = {
   text_fields: [
@@ -25,21 +26,14 @@ const extraQueryParams = {
 };
 
 const applyConfig = (config) => {
-  config.settings.searchlib = installHealthSearch(
-    installMainSearch(config.settings.searchlib),
-  );
-
-  config.settings.searchlib = installMissionStoriesSearch(
-    config.settings.searchlib,
-  );
-
-  config.settings.searchlib = installMissionProjectsSearch(
-    installMainSearch(config.settings.searchlib),
-  );
-
-  config.settings.searchlib = installMissionToolsSearch(
-    installMainSearch(config.settings.searchlib),
-  );
+  config.settings.searchlib = [
+    installMainSearch,
+    installHealthSearch,
+    installMissionStoriesSearch,
+    installMissionProjectsSearch,
+    installMissionToolsSearch,
+    installMissionFundingSearch,
+  ].reduce((acc, cur) => cur(acc), config.settings.searchlib);
 
   config.settings.searchlib.searchui.ccaSearch.extraQueryParams = extraQueryParams;
   config.settings.searchlib.searchui.ccaHealthSearch.extraQueryParams = extraQueryParams;
@@ -47,6 +41,8 @@ const applyConfig = (config) => {
   config.settings.searchlib.searchui.missionStoriesSearch.extraQueryParams = extraQueryParams;
   config.settings.searchlib.searchui.missionToolsSearch.extraQueryParams = extraQueryParams;
 
+  // console.log(config.settings.searchlib);
+
   return config;
 };
 export default applyConfig;

package/src/search/mission_funding/config-funding.js

@@ -0,0 +1,44 @@
+import { mergeConfig } from '@eeacms/search';
+import { getClientProxyAddress } from '../utils';
+
+import facets from './facets-funding';
+
+const missionFundingSearchConfig = {
+  title: 'Mission Funding Search',
+  ...facets,
+};
+
+export default function installMissionFundingSearch(config) {
+  const envConfig = process.env.RAZZLE_ENV_CONFIG
+    ? JSON.parse(process.env.RAZZLE_ENV_CONFIG)
+    : missionFundingSearchConfig;
+
+  const pjson = require('@eeacms/volto-cca-policy/../package.json');
+  envConfig.app_name = pjson.name;
+  envConfig.app_version = pjson.version;
+
+  config.searchui.missionFundingSearch = {
+    ...mergeConfig(envConfig, config.searchui.globalsearchbase),
+    elastic_index: '_es/globalsearch',
+    index_name: 'data_searchui',
+    host: process.env.RAZZLE_ES_PROXY_ADDR || 'http://localhost:3000',
+    vocab: {
+      cluster_name: {
+        cca: 'Mission Portal',
+      },
+    },
+  };
+
+  const { missionFundingSearch } = config.searchui;
+
+  missionFundingSearch.facets = facets;
+
+  if (typeof window !== 'undefined') {
+    config.searchui.missionFundingSearch.host =
+      process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
+  }
+
+  // console.log(config.searchui);
+
+  return config;
+}

package/src/search/mission_funding/facets-funding.js

@@ -0,0 +1,28 @@
+import { multiTermFacet } from '@eeacms/search';
+
+import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+import { cca_adaptation_sectors } from './../common';
+
+const blacklist = ['IncludeArchived', 'issued.date'];
+
+const facets = [
+  multiTermFacet({
+    field: 'cca_rast_steps.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'RAST step(s) of relevance',
+    alwaysVisible: false,
+  }),
+  multiTermFacet({
+    field: 'cca_eligible_entities.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Eligible to receive funding',
+    alwaysVisible: false,
+  }),
+  cca_adaptation_sectors,
+
+  ...globalSearchBaseConfig.facets.filter((f) => !blacklist.includes(f.field)),
+];
+
+export default facets;