@eeacms/volto-cca-policy 0.1.64 → 0.1.66

package/CHANGELOG.md

@@ -4,12 +4,32 @@ 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.66](https://github.com/eea/volto-cca-policy/compare/0.1.65...0.1.66) - 26 January 2024
+
+#### :hammer_and_wrench: Others
+
+- Revert "test: Update jest,Jenkinsfile,lint to volto-addons-template PR30". [GhitaB - [`692d7ad`](https://github.com/eea/volto-cca-policy/commit/692d7ad68da6bbb56598dac5e7a16b51d41fed16)]
+- Improve code - fix duplicate common facets: objectProvides, language, issued_date. [GhitaB - [`a19ded5`](https://github.com/eea/volto-cca-policy/commit/a19ded5032d6542ccddfde3f276cc609bde1a35f)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`0ec53e4`](https://github.com/eea/volto-cca-policy/commit/0ec53e43f9bede8fc404897f30132a70d8288934)]
+- Improve code - fix duplicate common facets: include_archived. [GhitaB - [`4936864`](https://github.com/eea/volto-cca-policy/commit/4936864997032fba0f69f7605aa5d66de25f363e)]
+- Improve code - fix duplicate common facets: include_archived. [GhitaB - [`1685bab`](https://github.com/eea/volto-cca-policy/commit/1685bab113a231e08b8db2ca334fd8ac109f0e3c)]
+- Improve code - fix duplicate /Blocks/withResponsiveContainer.js. [GhitaB - [`2790a8f`](https://github.com/eea/volto-cca-policy/commit/2790a8f79ddee64f3d333cc13c277b3acd25e45b)]
+- Improve code /components/theme/Views/CaseStudyView.jsx. [GhitaB - [`4fc14e3`](https://github.com/eea/volto-cca-policy/commit/4fc14e32ee2c991a3650a9c67426e6f694c05f99)]
+- Clean code in Blocks/TransRegionSelect/countries.js. [GhitaB - [`7f5a5c6`](https://github.com/eea/volto-cca-policy/commit/7f5a5c69b6cd7126ebe443ec2594b2bc832882d8)]
+- Revert "test: Update jest,Jenkinsfile,lint to volto-addons-template PR30" [David Ichim - [`3cbb0f4`](https://github.com/eea/volto-cca-policy/commit/3cbb0f458e26c4274d96c009b59ad818ecd32e03)]
+- Set main search as default [Tiberiu Ichim - [`379879b`](https://github.com/eea/volto-cca-policy/commit/379879b667289e0d470644b2a861a3d95330f705)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`e82fd72`](https://github.com/eea/volto-cca-policy/commit/e82fd72f0c11cb9d7ebcb2f37f27c29018df8f97)]
+- Fix custom facet values in health observatory [Tiberiu Ichim - [`8f59ab9`](https://github.com/eea/volto-cca-policy/commit/8f59ab966193e2a93a5027fe305abd88ed64f934)]
+### [0.1.65](https://github.com/eea/volto-cca-policy/compare/0.1.64...0.1.65) - 24 January 2024
+
+#### :hammer_and_wrench: Others
+
+- Comment code [Tiberiu Ichim - [`c9494d6`](https://github.com/eea/volto-cca-policy/commit/c9494d601166f427d4bb6bc3745af0e13192669f)]
 ### [0.1.64](https://github.com/eea/volto-cca-policy/compare/0.1.63...0.1.64) - 23 January 2024
 
 #### :hammer_and_wrench: Others
 
 - Update menu for translated search menu (fix show children) [Ghiță Bizău - [`b151b96`](https://github.com/eea/volto-cca-policy/commit/b151b96cb0dfcfc6ab9354e73260691c6378d65a)]
-- Add dependency on volto-searchlib [Tiberiu Ichim - [`c2117c4`](https://github.com/eea/volto-cca-policy/commit/c2117c4b540572141a859c4f6aea95a65c347ba0)]
 ### [0.1.63](https://github.com/eea/volto-cca-policy/compare/0.1.62...0.1.63) - 23 January 2024
 
 ### [0.1.62](https://github.com/eea/volto-cca-policy/compare/0.1.61...0.1.62) - 22 January 2024

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.64",
+  "version": "0.1.66",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -46,6 +46,7 @@
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "cypress-fail-fast": "^5.0.1",
+    "dotenv": "^16.3.2",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
     "md5": "^2.3.0"

package/src/components/manage/Blocks/CountryMapHeatIndex/View.js

@@ -5,7 +5,7 @@ import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { Grid } from 'semantic-ui-react';
 import { compose } from 'redux';
 import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
-import withResponsiveContainer from './withResponsiveContainer.js';
+import withResponsiveContainer from './../withResponsiveContainer.js';
 import { addAppURL } from '@plone/volto/helpers';
 import {
   getFocusCountriesFeature,

package/src/components/manage/Blocks/CountryMapObservatory/CountryMapObservatoryView.js

@@ -4,7 +4,7 @@ import './styles.css';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { compose } from 'redux';
 import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
-import withResponsiveContainer from './withResponsiveContainer.js';
+import withResponsiveContainer from './../withResponsiveContainer.js';
 import {
   getFocusCountriesFeature,
   getFocusCountryNames,

package/src/components/manage/Blocks/CountryMapProfile/View.js

@@ -5,7 +5,7 @@ import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { Grid } from 'semantic-ui-react';
 import { compose } from 'redux';
 import { clientOnly } from '@eeacms/volto-cca-policy/helpers';
-import withResponsiveContainer from './withResponsiveContainer.js';
+import withResponsiveContainer from './../withResponsiveContainer.js';
 import { addAppURL } from '@plone/volto/helpers';
 import {
   getFocusCountriesFeature,

package/src/components/manage/Blocks/TransRegionSelect/countries.js

@@ -31,7 +31,6 @@ export const regionCountries = [
       ['Finland', '/countries/finland'],
       ['Ireland', '/countries/ireland'],
       ['Sweden', '/countries/sweden'],
-      // ['United Kingdom', '/countries/united-kingdom'],
       ['Iceland', '/countries/iceland'],
       ['Norway', '/countries/norway'],
       ['Greenland', ''],
@@ -45,19 +44,8 @@ export const regionCountries = [
       ['Ireland', '/countries/ireland'],
       ['Portugal', '/countries/portugal'],
       ['Spain', '/countries/spain'],
-      // ['United Kingdom', '/countries/united-kingdom'],
     ],
   },
-  // {
-  //   region: 'Balkan-Mediterranean',
-  //   countries: [
-  //     ['Bulgaria', '/countries/bulgaria'],
-  //     ['Cyprus', '/countries/cyprus'],
-  //     ['Greece', '/countries/greece'],
-  //     ['Albania', ''],
-  //     ['Republic of North Macedonia', ''],
-  //   ],
-  // },
   {
     region: 'Baltic Sea',
     countries: [
@@ -70,8 +58,6 @@ export const regionCountries = [
       ['Poland', '/countries/poland'],
       ['Sweden', '/countries/sweden'],
       ['Norway', '/countries/norway'],
-      // ['Russia', ''],
-      // ['Belarus', ''],
     ],
   },
   {
@@ -124,7 +110,6 @@ export const regionCountries = [
       ['Republic of North Macedonia', ''],
       ['Slovenia', '/countries/slovenia'],
       ['Spain', '/countries/spain'],
-      // ['United Kingdom', '/countries/united-kingdom'],
     ],
   },
   {
@@ -136,7 +121,6 @@ export const regionCountries = [
       ['France', '/countries/france'],
       ['Netherlands', '/countries/netherlands'],
       ['Sweden', '/countries/sweden'],
-      // ['United Kingdom', '/countries/united-kingdom'],
       ['Norway', '/countries/norway'],
     ],
   },
@@ -150,7 +134,6 @@ export const regionCountries = [
       ['Luxembourg', '/countries/luxembourg'],
       ['Netherlands', '/countries/netherlands'],
       ['Switzerland', '/countries/switzerland'],
-      // ['United Kingdom', '/countries/united-kingdom'],
     ],
   },
   {
@@ -159,12 +142,7 @@ export const regionCountries = [
       ['France', '/countries/france'],
       ['Portugal', '/countries/portugal'],
       ['Spain', '/countries/spain'],
-      // ['United Kingdom', '/countries/united-kingdom'],
       ['Andorra', ''],
     ],
   },
-  // {
-  //   region: 'Other regions',
-  //   countries: [],
-  // },
 ];

package/src/components/theme/Views/CaseStudyView.jsx

@@ -1,5 +1,4 @@
-import React from 'react';
-import { Fragment } from 'react';
+import React, { Fragment } from 'react';
 import {
   HTMLField,
   ContentMetadata,

package/src/index.js

@@ -143,7 +143,7 @@ const applyConfig = (config) => {
     },
     headerSearchBox: [
       {
-        isDefault: true,
+        isDefault: false,
         // to replace search path change path to whatever you want and match with the page in volto website
         matchpath: '/en/mission',
         path: '/en/mission/knowledge-and-data/search-the-database',
@@ -163,6 +163,16 @@ const applyConfig = (config) => {
         buttonTitle: 'Go to advanced search',
         buttonUrl: 'https://www.eea.europa.eu/en/advanced-search',
       },
+      {
+        isDefault: true,
+        // to replace search path change path to whatever you want and match with the page in volto website
+        matchpath: '/',
+        path: '/en/data-and-downloads',
+        placeholder: 'Search the Climate-ADAPT database',
+        description: 'Looking for more information?',
+        buttonTitle: 'Explore more on Climate-ADAPT',
+        buttonUrl: 'https://climate-adapt.eea.europa.eu/en/data-and-downloads/',
+      },
     ],
     logoTargetUrl: '/',
     organisationName: 'Climate-ADAPT',

package/src/search/common.js

@@ -0,0 +1,148 @@
+import { booleanFacet } from '@eeacms/search';
+import { getTodayWithTime } from './utils';
+
+export const include_archived = booleanFacet(() => ({
+  field: 'IncludeArchived',
+  label: 'Include archived content',
+  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' } } } },
+            // Functions should be supported in the buildFilters
+            { range: { expires: { gte: getTodayWithTime() } } },
+          ],
+        },
+      },
+    },
+  },
+  on: null,
+}));
+
+export const objectProvides = {
+  field: 'objectProvides',
+  factory: 'MultiTermFacet',
+  label: 'Type of item',
+  showInFacetsList: true,
+  filterType: 'any',
+  isFilterable: false,
+  show: 10000,
+  isMulti: true,
+  iconsFamily: 'Content types',
+  optionsFilter: 'typesForClustersOptionsFilter',
+};
+
+export const issued_date = {
+  field: 'issued.date',
+  factory: 'DropdownRangeFilter',
+  wrapper: 'DummySUIFacetWrapper',
+  label: ' ',
+  showInFacetsList: false,
+  filterType: 'any',
+  isFilterable: false,
+  activeFilterLabel: 'Published',
+  isFilter: true,
+  showInSecondaryFacetsList: true,
+  isMulti: false,
+  ignoreFromNlp: true,
+  ranges: [
+    {
+      key: 'All time',
+    },
+    {
+      key: 'Last week',
+      from: 'now-1w',
+      to: 'now',
+    },
+    {
+      key: 'Last month',
+      from: 'now-1m',
+      to: 'now',
+    },
+    {
+      key: 'Last 3 months',
+      from: 'now-3m',
+      to: 'now',
+    },
+    {
+      key: 'Last year',
+      from: 'now-1y',
+      to: 'now',
+    },
+    {
+      key: 'Last 2 years',
+      from: 'now-2y',
+      to: 'now',
+    },
+    {
+      key: 'Last 5 years',
+      from: 'now-5y',
+      to: 'now',
+    },
+  ],
+  default: {
+    values: ['Last 5 years'],
+    type: 'any',
+  },
+};
+
+export const language = {
+  field: 'language',
+  factory: 'MultiTermFacet',
+  label: 'Language',
+  showInFacetsList: false,
+  filterType: 'any',
+  isFilterable: false,
+  show: 10000,
+  isMulti: true,
+  default: {
+    values: ['en'],
+    type: 'any',
+  },
+  facetValues: [
+    'ar',
+    'sr',
+    'sq',
+    'bg',
+    'bs',
+    'cs',
+    'hr',
+    'da',
+    'nl',
+    'el',
+    'en',
+    'et',
+    'fi',
+    'fr',
+    'ga',
+    'de',
+    'hu',
+    'is',
+    'it',
+    'lv',
+    'lt',
+    'mk',
+    'mt',
+    'no',
+    'pl',
+    'pt',
+    'ro',
+    'ru',
+    'sh',
+    'sk',
+    'sl',
+    'es',
+    'sv',
+    'tr',
+  ],
+  sortOn: 'custom',
+  sortOnCustomLabel: 'Alphabetical',
+};

package/src/search/facets.js

@@ -1,5 +1,9 @@
-import { booleanFacet } from '@eeacms/search';
-import { getTodayWithTime } from './utils';
+import {
+  include_archived,
+  objectProvides,
+  language,
+  issued_date,
+} from './common';
 
 const adaptation_sectors = {
   field: 'cca_adaptation_sectors.keyword',
@@ -15,110 +19,17 @@ const adaptation_sectors = {
   alwaysVisible: true,
 };
 
-const include_archived = booleanFacet(() => ({
-  field: 'IncludeArchived',
-  label: 'Include archived content',
-  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' } } } },
-            // Functions should be supported in the buildFilters
-            { range: { expires: { gte: getTodayWithTime() } } },
-          ],
-        },
-      },
-    },
-  },
-  on: null,
-}));
-
-const clusters = {
-  field: 'op_cluster',
-  factory: 'MultiTermFacet',
-  isFilterable: true,
-  isMulti: true,
-  label: 'Section',
-  show: 10000,
-  showInFacetsList: false,
-  ignoreNLPWhenActive: true,
-  blacklist: ['Others', 'Publications'],
-};
-
-const objectProvides = {
-  field: 'objectProvides',
-  factory: 'MultiTermFacet',
-  label: 'Type of item',
-  showInFacetsList: true,
-  filterType: 'any',
-  isFilterable: false,
-  show: 10000,
-  isMulti: true,
-  iconsFamily: 'Content types',
-  optionsFilter: 'typesForClustersOptionsFilter',
-};
-
-const issued = {
-  field: 'issued.date',
-  factory: 'DropdownRangeFilter',
-  wrapper: 'DummySUIFacetWrapper',
-  label: ' ',
-  showInFacetsList: false,
-  filterType: 'any',
-  isFilterable: false,
-  activeFilterLabel: 'Published',
-  isFilter: true,
-  showInSecondaryFacetsList: true,
-  isMulti: false,
-  ignoreFromNlp: true,
-  ranges: [
-    {
-      key: 'All time',
-    },
-    {
-      key: 'Last week',
-      from: 'now-1w',
-      to: 'now',
-    },
-    {
-      key: 'Last month',
-      from: 'now-1m',
-      to: 'now',
-    },
-    {
-      key: 'Last 3 months',
-      from: 'now-3m',
-      to: 'now',
-    },
-    {
-      key: 'Last year',
-      from: 'now-1y',
-      to: 'now',
-    },
-    {
-      key: 'Last 2 years',
-      from: 'now-2y',
-      to: 'now',
-    },
-    {
-      key: 'Last 5 years',
-      from: 'now-5y',
-      to: 'now',
-    },
-  ],
-  default: {
-    values: ['Last 5 years'],
-    type: 'any',
-  },
-};
+// const clusters = {
+//   field: 'op_cluster',
+//   factory: 'MultiTermFacet',
+//   isFilterable: true,
+//   isMulti: true,
+//   label: 'Section',
+//   show: 10000,
+//   showInFacetsList: false,
+//   ignoreNLPWhenActive: true,
+//   blacklist: ['Others', 'Publications'],
+// };
 
 const climate_impacts = {
   field: 'cca_climate_impacts.keyword',
@@ -129,8 +40,8 @@ const climate_impacts = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
+  // sortOn: 'custom',
+  // sortOnCustomLabel: 'Alphabetical',
   alwaysVisible: true,
 };
 
@@ -143,8 +54,8 @@ const transnational_regions = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
+  // sortOn: 'custom',
+  // sortOnCustomLabel: 'Alphabetical',
 };
 
 const adaptation_elements = {
@@ -156,8 +67,8 @@ const adaptation_elements = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
+  // sortOn: 'custom',
+  // sortOnCustomLabel: 'Alphabetical',
 };
 
 const key_type_measure = {
@@ -169,8 +80,8 @@ const key_type_measure = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
+  // sortOn: 'custom',
+  // sortOnCustomLabel: 'Alphabetical',
 };
 
 const funding_programme = {
@@ -182,8 +93,8 @@ const funding_programme = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
+  // sortOn: 'custom',
+  // sortOnCustomLabel: 'Alphabetical',
 };
 
 const origin_websites = {
@@ -195,8 +106,8 @@ const origin_websites = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
+  // sortOn: 'custom',
+  // sortOnCustomLabel: 'Alphabetical',
 };
 
 const geographic_countries = {
@@ -208,69 +119,16 @@ const geographic_countries = {
   isFilterable: false,
   show: 10000,
   isMulti: true,
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
-};
-
-const language = {
-  field: 'language',
-  factory: 'MultiTermFacet',
-  label: 'Language',
-  showInFacetsList: false,
-  filterType: 'any',
-  isFilterable: false,
-  show: 10000,
-  isMulti: true,
-  default: {
-    values: ['en'],
-    type: 'any',
-  },
-  facetValues: [
-    'ar',
-    'sr',
-    'sq',
-    'bg',
-    'bs',
-    'cs',
-    'hr',
-    'da',
-    'nl',
-    'el',
-    'en',
-    'et',
-    'fi',
-    'fr',
-    'ga',
-    'de',
-    'hu',
-    'is',
-    'it',
-    'lv',
-    'lt',
-    'mk',
-    'mt',
-    'no',
-    'pl',
-    'pt',
-    'ro',
-    'ru',
-    'sh',
-    'sk',
-    'sl',
-    'es',
-    'sv',
-    'tr',
-  ],
-  sortOn: 'custom',
-  sortOnCustomLabel: 'Alphabetical',
+  // sortOn: 'custom',
+  // sortOnCustomLabel: 'Alphabetical',
 };
 
 const facets = [
   adaptation_sectors,
   include_archived,
-  clusters,
+  // clusters,
   objectProvides,
-  issued,
+  issued_date,
   climate_impacts,
   transnational_regions,
   adaptation_elements,