@eeacms/volto-cca-policy 0.1.41 → 0.1.42

package/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [0.1.42](https://github.com/eea/volto-cca-policy/compare/0.1.41...0.1.42) - 5 September 2023
+
+#### :hammer_and_wrench: Others
+
+- Refs #257400 - Add Key Type Measure - facet vocabulary terms instead of keys. [GhitaB - [`53070bc`](https://github.com/eea/volto-cca-policy/commit/53070bc9b32f31d1c7e64a05eb8a7409c8021029)]
+- Refs #257400 - Add Key Type Measure - test vocab. [GhitaB - [`d42e3d3`](https://github.com/eea/volto-cca-policy/commit/d42e3d3c88585461a7f07deac4eaa853787fefbd)]
+- Refs #257400 - Add Key Type Measure facet for ccaSearch. [GhitaB - [`242fa6d`](https://github.com/eea/volto-cca-policy/commit/242fa6dea274b1e9197642e42b5f6119a25abccc)]
+- Also fix health catalog [Tiberiu Ichim - [`6695897`](https://github.com/eea/volto-cca-policy/commit/6695897b6e70b3d3708e2ef895b5bd5a9b2fe9f5)]
+- Fix expiration date in search catalogue [Tiberiu Ichim - [`543dd0b`](https://github.com/eea/volto-cca-policy/commit/543dd0b4e950ea93dd35f2bfa9ceb4061a74e1fd)]
 ### [0.1.41](https://github.com/eea/volto-cca-policy/compare/0.1.40...0.1.41) - 1 September 2023
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/search/config.js

@@ -50,6 +50,19 @@ export default function installMainSearch(config) {
       cluster_name: {
         cca: 'Climate-ADAPT',
       },
+      'cca_key_type_measure.keyword': {
+        A1: 'A1: Policy Instruments',
+        A2: 'A2: Management and planning',
+        A3: 'A3: Coordination cooperation and networks',
+        B1: 'B1: Financing incentive instruments',
+        B2: 'B2: Insurance and risk sharing instruments',
+        C1: 'C1: Grey options',
+        C2: 'C2: Technological options',
+        D1: 'D1: Green options',
+        D2: 'D2: Blue options',
+        E1: 'E1: Information and awareness raising',
+        E2: 'E2: Capacity building empowering and lifestyle practices',
+      },
     },
     runtime_mappings: build_runtime_mappings(clusters),
   };
@@ -61,11 +74,11 @@ export default function installMainSearch(config) {
       cluster_name: 'cca',
     },
   });
-  ccaSearch.permanentFilters.push({
-    term: {
-      cca_include_in_search: 'true',
-    },
-  });
+  // ccaSearch.permanentFilters.push({
+  //   term: {
+  //     cca_include_in_search: 'true',
+  //   },
+  // });
 
   ccaSearch.permanentFilters.push({
     terms: {
@@ -172,6 +185,7 @@ export default function installMainSearch(config) {
     config.searchui.ccaSearch.host =
       process.env.RAZZLE_ES_PROXY_ADDR || getClientProxyAddress();
   }
+
   // console.log(config.searchui.ccaSearch);
 
   return config;

package/src/search/facets-health.js

@@ -1,3 +1,6 @@
+import { booleanFacet } from '@eeacms/search';
+import { getTodayWithTime } from './utils';
+
 const special = [
   {
     field: 'issued.date',
@@ -53,43 +56,32 @@ const special = [
     },
   },
 
-  {
+  booleanFacet(() => ({
     field: 'IncludeArchived',
     label: 'Include archived content',
-    on: null,
+    id: 'archived-facet',
+    showInFacetsList: false,
+    showInSecondaryFacetsList: true,
+    isFilter: true, // filters don't need facet options to show up
+
+    // we want this to be applied by default
+    // when the facet is checked, then apply the `on` key:
     off: {
       constant_score: {
         filter: {
           bool: {
             should: [
-              {
-                bool: {
-                  must_not: {
-                    exists: {
-                      field: 'expires',
-                    },
-                  },
-                },
-              },
-              {
-                range: {
-                  expires: {
-                    gte: '2023-04-27T11:52:29Z',
-                  },
-                },
-              },
+              { bool: { must_not: { exists: { field: 'expires' } } } },
+              // Functions should be supported in the buildFilters
+              { range: { expires: { gte: getTodayWithTime() } } },
             ],
           },
         },
       },
     },
-    factory: 'BooleanFacet',
-    wrapper: 'DummySUIFacetWrapper',
-    showInFacetsList: false,
-    id: 'archived-facet',
-    showInSecondaryFacetsList: true,
-    isFilter: true,
-  },
+    on: null,
+  })),
+
   {
     field: 'op_cluster',
     factory: 'MultiTermFacet',

package/src/search/facets.js

@@ -1,3 +1,6 @@
+import { booleanFacet } from '@eeacms/search';
+import { getTodayWithTime } from './utils';
+
 const facets = [
   {
     field: 'cca_adaptation_sectors.keyword',
@@ -12,44 +15,31 @@ const facets = [
     showAllOptions: true,
     alwaysVisible: true,
   },
-
-  {
+  booleanFacet(() => ({
     field: 'IncludeArchived',
     label: 'Include archived content',
-    on: null,
+    id: 'archived-facet',
+    showInFacetsList: false,
+    showInSecondaryFacetsList: true,
+    isFilter: true, // filters don't need facet options to show up
+
+    // we want this to be applied by default
+    // when the facet is checked, then apply the `on` key:
     off: {
       constant_score: {
         filter: {
           bool: {
             should: [
-              {
-                bool: {
-                  must_not: {
-                    exists: {
-                      field: 'expires',
-                    },
-                  },
-                },
-              },
-              {
-                range: {
-                  expires: {
-                    gte: '2023-04-27T11:52:29Z',
-                  },
-                },
-              },
+              { bool: { must_not: { exists: { field: 'expires' } } } },
+              // Functions should be supported in the buildFilters
+              { range: { expires: { gte: getTodayWithTime() } } },
             ],
           },
         },
       },
     },
-    factory: 'BooleanFacet',
-    wrapper: 'DummySUIFacetWrapper',
-    showInFacetsList: false,
-    id: 'archived-facet',
-    showInSecondaryFacetsList: true,
-    isFilter: true,
-  },
+    on: null,
+  })),
   {
     field: 'op_cluster',
     factory: 'MultiTermFacet',
@@ -1190,6 +1180,18 @@ const facets = [
     sortOn: 'custom',
     sortOnCustomLabel: 'Alphabetical',
   },
+  {
+    field: 'cca_key_type_measure.keyword',
+    factory: 'MultiTermFacet',
+    label: 'Key Type Measure',
+    showInFacetsList: true,
+    filterType: 'any',
+    isFilterable: false,
+    show: 10000,
+    isMulti: true,
+    sortOn: 'custom',
+    sortOnCustomLabel: 'Alphabetical',
+  },
   {
     field: 'cca_funding_programme.keyword',
     factory: 'MultiTermFacet',

package/src/search/utils.js

@@ -0,0 +1,29 @@
+export function getTodayWithTime() {
+  const d = new Date();
+  const month = d.getMonth() + 1;
+  const day = d.getDate();
+  const hour = d.getHours();
+  const minute = d.getMinutes();
+  const second = d.getSeconds();
+
+  const output = [
+    d.getFullYear(),
+    '-',
+    month < 10 ? '0' : '',
+    month,
+    '-',
+    day < 10 ? '0' : '',
+    day,
+    'T',
+    hour < 10 ? '0' : '',
+    hour,
+    ':',
+    minute < 10 ? '0' : '',
+    minute,
+    ':',
+    second < 10 ? '0' : '',
+    second,
+    'Z',
+  ].join('');
+  return output;
+}