@eeacms/volto-cca-policy 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -32,10 +32,10 @@
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-eea-website-theme": "^1.35.0",
     "@eeacms/volto-embed": "^9.1.1",
-    "@eeacms/volto-globalsearch": "^1.1.0",
+    "@eeacms/volto-globalsearch": "2.0.4",
     "@eeacms/volto-hero-block": "^7.1.0",
     "@eeacms/volto-openlayers-map": "*",
-    "@eeacms/volto-searchlib": "2.0.7",
+    "@eeacms/volto-searchlib": "2.0.8",
     "@eeacms/volto-slate-label": "^0.6.0",
     "@eeacms/volto-tabs-block": "^7.5.1",
     "@elastic/search-ui": "1.21.2",

package/src/components/Result/ClusterHorizontalCardItem.jsx

@@ -1,5 +1,6 @@
 // Original: https://github.com/eea/volto-searchlib/blob/master/searchlib/components/Result/HorizontalCardItem.jsx
 // We need custom href for results.
+import { FormattedMessage } from 'react-intl';
 import React from 'react';
 import { Label } from 'semantic-ui-react';
 import {
@@ -38,13 +39,17 @@ const ExtraContent = (props) => {
           <DateTime format="DATE_MED" value={result.issued} />
         </div>
         <div className="result-info">
-          <span className="result-info-title">Topics: </span>
+          <span className="result-info-title">
+            <FormattedMessage id="Topics:" defaultMessage="Topics:" />{' '}
+          </span>
           <StringList value={result.tags} />
         </div>
       </div>
       <div>
         <div className="result-info result-source">
-          <span className="result-info-title">Source: </span>
+          <span className="result-info-title">
+            <FormattedMessage id="Source:" defaultMessage="Source:" />{' '}
+          </span>
           <ExternalLink href={result.href}>
             <strong title={result.source} className="source">
               {title}
@@ -94,7 +99,12 @@ const ClusterHorizontalCardItem = (props) => {
       <>
         <ExternalLink href={result.href} title={result.title}>
           {result.title}
-          {result.isNew && <Label className="new-item">New</Label>}
+          {result.isNew && (
+            <Label className="new-item">
+              {' '}
+              <FormattedMessage id="New" defaultMessage="New" />
+            </Label>
+          )}
           {result.isExpired && (
             <Label className="archived-item">Archived</Label>
           )}

package/src/components/Result/HealthHorizontalCardItem.jsx

@@ -13,6 +13,7 @@ import { firstWords, getTermDisplayValue } from '@eeacms/search/lib/utils';
 import ExternalLink from '@eeacms/search/components/Result/ExternalLink';
 import ResultContext from '@eeacms/search/components/Result/ResultContext';
 import ContentClusters from '@eeacms/search/components/Result/ContentClusters';
+import { FormattedMessage } from 'react-intl';
 
 const healthBreadcrumb = (href) => {
   // It's only cosmetic. We don't want to show ++aq...
@@ -29,13 +30,17 @@ const ExtraContent = (props) => {
           <DateTime format="DATE_MED" value={result.issued} />
         </div>
         <div className="result-info">
-          <span className="result-info-title">Topics: </span>
+          <span className="result-info-title">
+            <FormattedMessage id="Topics:" defaultMessage="Topics:" />{' '}
+          </span>
           <StringList value={result.tags} />
         </div>
       </div>
       <div>
         <div className="result-info result-source">
-          <span className="result-info-title">Source: </span>
+          <span className="result-info-title">
+            <FormattedMessage id="Source:" defaultMessage="Source:" />{' '}
+          </span>
           <ExternalLink href={result.href}>
             <strong title={result.source} className="source">
               {firstWords(

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

@@ -9,7 +9,7 @@ export default function View(props) {
   // const dataJson = JSON.parse(
   //   props?.properties['@components']?.countryprofile?.html,
   // );
-  const dataJson = props?.properties['@components']?.countryprofile?.html;
+  const dataJson = props?.properties['@components']?.countryprofile?.html || {};
   const [activePanes, setActivePanes] = React.useState({});
 
   const panes = [];

package/src/components/manage/Blocks/TransRegionSelect/TransRegionSelectView.jsx

@@ -38,13 +38,14 @@ export default function TransRegionSelectView(props) {
   const { data, metadata, properties, mode = 'view' } = props;
   const content = metadata || properties;
   if (mode === 'edit') {
-    return <div>TransRegionSelectView</div>;
+    return <div>TransRegionSelectView: {data.region}</div>;
   }
   const { title } = content;
-  const { regions, countries: countriesAndFlag } = content['@components'][
-    'transnationalregion'
-  ];
-  const [countries] = countriesAndFlag;
+  const { regions, countries: countriesAndFlag } =
+    content['@components']['transnationalregion'] || data._v_ || {};
+  const [countries] = countriesAndFlag || [];
+
+  // console.log(regions, countries);
 
   const defaultValue = !!countries
     ? title

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

@@ -4,13 +4,19 @@ export default {
     {
       id: 'default',
       title: 'Default',
-      fields: ['title'],
+      fields: ['title', 'region'],
     },
   ],
   properties: {
     title: {
       title: 'Block title',
     },
+    region: {
+      title: 'Region',
+      vocabulary: {
+        '@id': 'eea.climateadapt.regions',
+      },
+    },
   },
   required: [],
 };

package/src/search/cca/facets.js

@@ -5,10 +5,47 @@ import {
   geographic_countries,
 } from '../common';
 
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  adaptationApproaches: {
+    id: 'Adaptation Approaches',
+    defaultMessage: 'Adaptation Approaches',
+  },
+  adaptationSectors: {
+    id: 'Adaptation Sectors',
+    defaultMessage: 'Adaptation Sectors',
+  },
+  climateImpacts: {
+    id: 'Climate Impacts',
+    defaultMessage: 'Climate Impacts',
+  },
+  fundingProgramme: {
+    id: 'Funding Programme',
+    defaultMessage: 'Funding Programme',
+  },
+  itemFromThirdParties: {
+    id: 'Item from third parties',
+    defaultMessage: 'Item from third parties',
+  },
+  keyTypeMeasure: {
+    id: 'Key Type Measure',
+    defaultMessage: 'Key Type Measure',
+  },
+  section: {
+    id: 'Section',
+    defaultMessage: 'Section',
+  },
+  transnationalRegions: {
+    id: 'Transnational regions',
+    defaultMessage: 'Transnational regions',
+  },
+});
+
 const adaptation_sectors = {
   field: 'cca_adaptation_sectors.keyword',
   factory: 'MultiTermFacet',
-  label: 'Adaptation Sectors',
+  label: messages.adaptationSectors,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: true,
@@ -23,7 +60,7 @@ const op_cluster = {
   factory: 'MultiTermFacet',
   isFilterable: true,
   isMulti: true,
-  label: 'Section',
+  label: messages.section,
   show: 10000,
   showInFacetsList: false,
   ignoreNLPWhenActive: true,
@@ -44,7 +81,7 @@ const op_cluster = {
 const climate_impacts = {
   field: 'cca_climate_impacts.keyword',
   factory: 'MultiTermFacet',
-  label: 'Climate impacts',
+  label: messages.climateImpacts,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -58,7 +95,7 @@ const climate_impacts = {
 const transnational_regions = {
   field: 'cca_geographic_transnational_region.keyword',
   factory: 'MultiTermFacet',
-  label: 'Transnational regions',
+  label: messages.transnationalRegions,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -71,7 +108,7 @@ const transnational_regions = {
 const adaptation_elements = {
   field: 'cca_adaptation_elements.keyword',
   factory: 'MultiTermFacet',
-  label: 'Adaptation Approaches',
+  label: messages.adaptationApproaches,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -84,7 +121,7 @@ const adaptation_elements = {
 const key_type_measure = {
   field: 'cca_key_type_measure.keyword',
   factory: 'MultiTermFacet',
-  label: 'Key Type Measure',
+  label: messages.keyTypeMeasure,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -97,7 +134,7 @@ const key_type_measure = {
 const funding_programme = {
   field: 'cca_funding_programme.keyword',
   factory: 'MultiTermFacet',
-  label: 'Funding Programme',
+  label: messages.fundingProgramme,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -110,7 +147,7 @@ const funding_programme = {
 const origin_websites = {
   field: 'cca_origin_websites.keyword',
   factory: 'MultiTermFacet',
-  label: 'Item from third parties',
+  label: messages.itemFromThirdParties,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,

package/src/search/common.js

@@ -1,10 +1,39 @@
 import { booleanFacet } from '@eeacms/search';
 import { getTodayWithTime } from './utils';
 
+import { defineMessages, FormattedMessage } from 'react-intl';
+
+const messages = defineMessages({
+  countries: {
+    id: 'Countries',
+    defaultMessage: 'Countries',
+  },
+  climateImpacts: {
+    id: 'Climate Impacts',
+    defaultMessage: 'Climate Impacts',
+  },
+  adaptationSectors: {
+    id: 'Adaptation Sectors',
+    defaultMessage: 'Adaptation Sectors',
+  },
+  includeArchivedContent: {
+    id: 'Include archived content',
+    defaultMessage: 'Include archived content',
+  },
+  typeOfItem: {
+    id: 'Type of item',
+    defaultMessage: 'Type of item',
+  },
+  language: {
+    id: 'Language',
+    defaultMessage: 'Language',
+  },
+});
+
 export const geographic_countries = {
   field: 'cca_geographic_countries.keyword',
   factory: 'MultiTermFacet',
-  label: 'Countries',
+  label: messages.countries,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -15,7 +44,7 @@ export const geographic_countries = {
 export const cca_climate_impacts = {
   field: 'cca_climate_impacts.keyword',
   factory: 'MultiTermFacet',
-  label: 'Climate Impacts',
+  label: messages.climateImpacts,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -26,7 +55,7 @@ export const cca_climate_impacts = {
 export const cca_adaptation_sectors = {
   field: 'cca_adaptation_sectors.keyword',
   factory: 'MultiTermFacet',
-  label: 'Adaptation Sectors',
+  label: messages.adaptationSectors,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -36,7 +65,7 @@ export const cca_adaptation_sectors = {
 
 export const include_archived = booleanFacet(() => ({
   field: 'IncludeArchived',
-  label: 'Include archived content',
+  label: messages.includeArchivedContent,
   id: 'IncludeArchived',
   showInFacetsList: false,
   showInSecondaryFacetsList: true,
@@ -63,7 +92,7 @@ export const include_archived = booleanFacet(() => ({
 export const objectProvides = {
   field: 'objectProvides',
   factory: 'MultiTermFacet',
-  label: 'Type of item',
+  label: messages.typeOfItem,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -88,34 +117,48 @@ export const issued_date = {
   ignoreFromNlp: true,
   ranges: [
     {
+      label: <FormattedMessage id="All time" defaultMessage="All time" />,
       key: 'All time',
     },
     {
+      label: <FormattedMessage id="Last week" defaultMessage="Last week" />,
+
       key: 'Last week',
       from: 'now-1w',
       to: 'now',
     },
     {
+      label: <FormattedMessage id="Last month" defaultMessage="Last month" />,
       key: 'Last month',
       from: 'now-1m',
       to: 'now',
     },
     {
+      label: (
+        <FormattedMessage id="Last 3 months" defaultMessage="Last 3 months" />
+      ),
       key: 'Last 3 months',
       from: 'now-3m',
       to: 'now',
     },
     {
+      label: <FormattedMessage id="Last year" defaultMessage="Last year" />,
       key: 'Last year',
       from: 'now-1y',
       to: 'now',
     },
     {
+      label: (
+        <FormattedMessage id="Last 2 years" defaultMessage="Last 2 years" />
+      ),
       key: 'Last 2 years',
       from: 'now-2y',
       to: 'now',
     },
     {
+      label: (
+        <FormattedMessage id="Last 5 years" defaultMessage="Last 5 years" />
+      ),
       key: 'Last 5 years',
       from: 'now-5y',
       to: 'now',
@@ -130,7 +173,7 @@ export const issued_date = {
 export const language = {
   field: 'language',
   factory: 'MultiTermFacet',
-  label: 'Language',
+  label: messages.language,
   showInFacetsList: false,
   filterType: 'any',
   isFilterable: false,

package/src/search/health_observatory/config-health.js

@@ -6,6 +6,20 @@ import vocabs from './../vocabulary';
 import facets from './facets-health';
 import views from './views-health';
 
+// import { defineMessages } from 'react-intl';
+
+// const messages = defineMessages({
+//   types: {
+//     id: 'Types',
+//     defaultMessage: 'Types',
+//   },
+//   healthImpacts: { id: 'Health Impacts', defaultMessage: 'Health Impacts' },
+//   observatoryPartner: {
+//     id: 'Observatory partner',
+//     defaultMessage: 'Observatory partner',
+//   },
+// });
+
 const ccaConfig = {
   title: 'ClimateAdapt Health',
   ...views,
@@ -133,6 +147,7 @@ export default function installMainSearch(config) {
     {
       id: 'types',
       title: 'Types',
+      // title: messages.types,
       facetField: 'objectProvides',
       sortOn: 'alpha',
       icon: {
@@ -142,6 +157,7 @@ export default function installMainSearch(config) {
     {
       id: 'healthImpacts',
       title: 'Health Impacts',
+      // title: messages.healthImpacts,
       facetField: 'cca_health_impacts.keyword',
       sortOn: 'alpha',
       whitelist: [
@@ -155,6 +171,7 @@ export default function installMainSearch(config) {
     {
       id: 'observatoryPartner',
       title: 'Observatory partner',
+      // title: messages.observatoryPartner,
       facetField: 'cca_partner_contributors.keyword',
       sortOn: 'alpha',
     },

package/src/search/health_observatory/facets-health.js

@@ -5,13 +5,37 @@ import {
   issued_date,
   geographic_countries,
 } from './../common';
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  adaptationApproaches: {
+    id: 'Adaptation Approaches',
+    defaultMessage: 'Adaptation Approaches',
+  },
+  healthImpacts: {
+    id: 'Health impacts',
+    defaultMessage: 'Health impacts',
+  },
+  observatoryPartner: {
+    id: 'Observatory partner',
+    defaultMessage: 'Observatory partner',
+  },
+  publishingYear: {
+    id: 'Publishing year',
+    defaultMessage: 'Publishing year',
+  },
+  sections: {
+    id: 'Sections',
+    defaultMessage: 'Sections',
+  },
+});
 
 const op_cluster = {
   field: 'op_cluster',
   factory: 'MultiTermFacet',
   isFilterable: true,
   isMulti: true,
-  label: 'Section',
+  label: messages.sections,
   show: 10000,
   showInFacetsList: false,
   ignoreNLPWhenActive: true,
@@ -21,7 +45,7 @@ const op_cluster = {
 const healthImpacts = {
   field: 'cca_health_impacts.keyword',
   factory: 'MultiTermFacet',
-  label: 'Health impacts',
+  label: messages.healthImpacts,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -46,7 +70,7 @@ const healthImpacts = {
 const partnerContributions = {
   field: 'cca_partner_contributors.keyword',
   factory: 'MultiTermFacet',
-  label: 'Observatory partner',
+  label: messages.observatoryPartner,
   showInFacetsList: true,
   filterType: 'any',
   isFilterable: false,
@@ -60,7 +84,7 @@ const partnerContributions = {
 const year = {
   field: 'year',
   factory: 'HistogramFacet',
-  label: 'Publishing year',
+  label: messages.publishingYear,
   height: 100,
   showInFacetsList: true,
   isFilterable: false,

package/src/search/mission_all/facets-all.js

@@ -8,6 +8,19 @@ import {
   cca_adaptation_sectors,
 } from '../common';
 
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  typeOfItem: {
+    id: 'Type of item',
+    defaultMessage: 'Type of item',
+  },
+  adaptationApproaches: {
+    id: 'Adaptation Approaches',
+    defaultMessage: 'Adaptation Approaches',
+  },
+});
+
 const blacklist = ['IncludeArchived', 'issued.date', 'language'];
 let globalFacets = globalSearchBaseConfig.facets.filter(
   (f) => !blacklist.includes(f.field),
@@ -15,7 +28,8 @@ let globalFacets = globalSearchBaseConfig.facets.filter(
 
 for (let i = 0; i < globalFacets.length; i++) {
   if (globalFacets[i]['field'] === 'objectProvides') {
-    globalFacets[i]['label'] = 'Type of item';
+    // globalFacets[i]['label'] = 'Type of item';
+    globalFacets[i]['label'] = messages.typeOfItem;
   }
 }
 
@@ -28,7 +42,8 @@ globalFacets = globalFacets.concat(
     field: 'cca_adaptation_elements.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Adaptation Approaches',
+    // label: 'Adaptation Approaches',
+    label: messages.adaptationApproaches,
     alwaysVisible: false,
   }),
 );

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

@@ -2,6 +2,18 @@ import { multiTermFacet } from '@eeacms/search';
 import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
 // import spatialWhitelist from '@eeacms/volto-globalsearch/config/json/spatialWhitelist';
 import { cca_adaptation_sectors, language } from './../common';
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  rastStepssOfRelevance: {
+    id: 'RAST step(s) of relevance',
+    defaultMessage: 'RAST step(s) of relevance',
+  },
+  eligibleToReceiveFunding: {
+    id: 'Eligible to receive funding',
+    defaultMessage: 'Eligible to receive funding',
+  },
+});
 
 const blacklist = ['IncludeArchived', 'issued.date', 'spatial', 'language'];
 
@@ -10,14 +22,14 @@ const facets = [
     field: 'cca_rast_steps.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'RAST step(s) of relevance',
+    label: messages.rastStepssOfRelevance,
     alwaysVisible: false,
   }),
   multiTermFacet({
     field: 'cca_eligible_entities.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Eligible to receive funding',
+    label: messages.eligibleToReceiveFunding,
     alwaysVisible: false,
   }),
   cca_adaptation_sectors,

package/src/search/mission_projects/facets-projects.js

@@ -9,12 +9,25 @@ import {
   cca_adaptation_sectors,
 } from './../common';
 
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  fundingProgramme: {
+    id: 'Funding Programme',
+    defaultMessage: 'Funding Programme',
+  },
+  adaptationApproaches: {
+    id: 'Adaptation Approaches',
+    defaultMessage: 'Adaptation Approaches',
+  },
+});
+
 const facets = [
   multiTermFacet({
     field: 'cca_funding_programme.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Funding Programme',
+    label: messages.fundingProgramme,
     iconsFamily: 'Funding Programme',
     alwaysVisible: false,
   }),
@@ -24,7 +37,7 @@ const facets = [
     field: 'cca_adaptation_elements.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Adaptation Approaches',
+    label: messages.adaptationApproaches,
     alwaysVisible: false,
   }),
   geographic_countries,

package/src/search/mission_tools/facets-tools.js

@@ -9,19 +9,41 @@ import {
   language,
 } from './../common';
 
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  rastStepsOfRelevance: {
+    id: 'RAST step(s) of relevance',
+    defaultMessage: 'RAST step(s) of relevance',
+  },
+  geographicalScale: {
+    id: 'Geographical scale',
+    defaultMessage: 'Geographical scale',
+  },
+  languagesOfTheTool: {
+    id: 'Language(s) of the tool',
+    defaultMessage: 'Language(s) of the tool',
+  },
+  mostUsefulFor: { id: 'Most useful for', defaultMessage: 'Most useful for' },
+  userRequirements: {
+    id: 'User requirements',
+    defaultMessage: 'User requirements',
+  },
+});
+
 const facets = [
   multiTermFacet({
     field: 'cca_rast_steps.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'RAST step(s) of relevance',
+    label: messages.rastStepsOfRelevance,
     alwaysVisible: false,
   }),
   multiTermFacet({
     field: 'cca_geographical_scale.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Geographical scale',
+    label: messages.geographicalScale,
     alwaysVisible: false,
   }),
   cca_climate_impacts,
@@ -29,7 +51,7 @@ const facets = [
     field: 'cca_tool_language.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Language(s) of the tool',
+    label: messages.languagesOfTheTool,
     alwaysVisible: false,
   }),
   cca_adaptation_sectors,
@@ -37,14 +59,14 @@ const facets = [
     field: 'cca_most_useful_for.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Most useful for',
+    label: messages.mostUsefulFor,
     alwaysVisible: false,
   }),
   multiTermFacet({
     field: 'cca_user_requirements.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'User requirements',
+    label: messages.userRequirements,
     alwaysVisible: false,
   }),
   language,