@eeacms/volto-cca-policy 0.1.41 → 0.1.43

package/.husky/pre-commit

@@ -0,0 +1,2 @@
+[ -n "$CI" ] && exit 0
+yarn lint-staged

package/CHANGELOG.md

@@ -4,6 +4,29 @@ 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.43](https://github.com/eea/volto-cca-policy/compare/0.1.42...0.1.43) - 15 September 2023
+
+#### :hammer_and_wrench: Others
+
+- Refs #161485 - Solve search result breadcrumbs format in Health Catalogue. [GhitaB - [`46c4fb9`](https://github.com/eea/volto-cca-policy/commit/46c4fb99416763258116f14a449a4c6e2464d6d3)]
+- Refs #161485 - Solve URL format in Health Catalogue. [GhitaB - [`5cbf970`](https://github.com/eea/volto-cca-policy/commit/5cbf9709681899cba2de0d0790e0fb0ef4735583)]
+- Refs #161485 - WIP add custom horizontal card result, in order to personalize results URLS. [GhitaB - [`cebb56f`](https://github.com/eea/volto-cca-policy/commit/cebb56f0e45600aa005167d822693512e6559941)]
+- Refs #257521 - Fix error in GeocharsWidget, when no value. [GhitaB - [`e372af6`](https://github.com/eea/volto-cca-policy/commit/e372af6bf417c74ea81a7c77852f3e829bdc656e)]
+- Refs #257521 - Try: fix Jenkins [GhitaB - [`292618a`](https://github.com/eea/volto-cca-policy/commit/292618a8e9ecf1f748cb225af9c1371a5d3e27ca)]
+- Refs #257521 - Fix GeolocationWidget error when no value (error in case study add form). [GhitaB - [`355478b`](https://github.com/eea/volto-cca-policy/commit/355478bcc7349a295b074d416b10ccfd5b807e8c)]
+- test: fix comments [valentinab25 - [`dd918df`](https://github.com/eea/volto-cca-policy/commit/dd918df04d718c222a219b6a5d361872e5535bf6)]
+- Refs #257521 - Enable slate popup (volto-slate-label). [GhitaB - [`f299392`](https://github.com/eea/volto-cca-policy/commit/f299392787ea01a1e3a60064d4d7c01dd1864ca2)]
+- Code cleanup [Tiberiu Ichim - [`9704770`](https://github.com/eea/volto-cca-policy/commit/97047707c6916d55b617786ccdc8f52e6ed6b67b)]
+- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`2cacb91`](https://github.com/eea/volto-cca-policy/commit/2cacb91dd8d09807c5835a30e5b53f7d6dd31f5a)]
+### [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/cypress.config.js

@@ -2,12 +2,12 @@ const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
   viewportWidth: 1280,
-  defaultCommandTimeout: 8888,
+  defaultCommandTimeout: 5000,
   chromeWebSecurity: false,
   reporter: 'junit',
   video: true,
   retries: {
-    runMode: 8,
+    runMode: 1,
     openMode: 0,
   },
   reporterOptions: {

package/locales/en/LC_MESSAGES/volto.po

@@ -0,0 +1,14 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language: \n"
+"Language-Team: \n"
+"Content-Type: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -22,6 +22,7 @@
     "@eeacms/volto-widget-geolocation",
     "@eeacms/volto-widget-dataprovenance",
     "@eeacms/volto-accordion-block",
+    "@eeacms/volto-slate-label",
     "@eeacms/volto-eea-design-system",
     "@eeacms/volto-globalsearch"
   ],
@@ -30,6 +31,7 @@
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-globalsearch": "*",
     "@eeacms/volto-openlayers-map": "*",
+    "@eeacms/volto-slate-label": "*",
     "@eeacms/volto-widget-dataprovenance": "*",
     "@eeacms/volto-widget-geolocation": "*",
     "@eeacms/volto-widget-temporal-coverage": "*",
@@ -41,8 +43,31 @@
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "cypress-fail-fast": "^5.0.1",
+    "husky": "*",
+    "lint-staged": "*",
     "md5": "^2.3.0"
   },
+  "lint-staged": {
+    "src/**/*.{js,jsx,ts,tsx,json}": [
+      "make lint-fix",
+      "make prettier-fix"
+    ],
+    "src/**/*.{jsx}": [
+      "make i18n"
+    ],
+    "theme/**/*.{css,less}": [
+      "make stylelint-fix"
+    ],
+    "src/**/*.{css,less}": [
+      "make stylelint-fix"
+    ],
+    "theme/**/*.overrides": [
+      "make stylelint-fix"
+    ],
+    "src/**/*.overrides": [
+      "make stylelint-fix"
+    ]
+  },
   "scripts": {
     "release": "release-it",
     "release-major-beta": "release-it major --preRelease=beta",
@@ -60,6 +85,7 @@
     "lint:fix": "make lint-fix",
     "i18n": "make i18n",
     "cypress:run": "make cypress-run",
-    "cypress:open": "make cypress-open"
+    "cypress:open": "make cypress-open",
+    "prepare": "husky install"
   }
 }

package/src/components/Result/HealthHorizontalCardItem.jsx

@@ -0,0 +1,103 @@
+// Original: https://github.com/eea/volto-searchlib/blob/master/searchlib/components/Result/HorizontalCardItem.jsx
+// We need custom href for results.
+import React from 'react';
+import { Label } from 'semantic-ui-react';
+import {
+  SegmentedBreadcrumb,
+  StringList,
+  DateTime,
+} from '@eeacms/search/components';
+import { useAppConfig } from '@eeacms/search/lib/hocs';
+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';
+
+const healthURL = (href) => {
+  return href.replace(/\/metadata\//, '/observatory/++aq++metadata/');
+};
+
+const healthBreadcrumb = (href) => {
+  // It's only cosmetic. We don't want to show ++aq...
+  return href.replace(/\/metadata\//, '/observatory/');
+};
+
+const ExtraContent = (props) => {
+  const { result, vocab } = props;
+  return (
+    <div>
+      <div className="result-bottom">
+        <div className="result-info">
+          {/* <span className="result-info-title">Published: </span> */}
+          <DateTime format="DATE_MED" value={result.issued} />
+        </div>
+        <div className="result-info">
+          <span className="result-info-title">Topics: </span>
+          <StringList value={result.tags} />
+        </div>
+      </div>
+      <div>
+        <div className="result-info result-source">
+          <span className="result-info-title">Source: </span>
+          <ExternalLink href={healthURL(result.href)}>
+            <strong title={result.source} className="source">
+              {firstWords(
+                getTermDisplayValue({
+                  vocab,
+                  field: 'cluster_name',
+                  term: result.source,
+                }),
+                8,
+              )}
+            </strong>
+            <SegmentedBreadcrumb
+              href={healthBreadcrumb(result.href)}
+              short={true}
+              maxChars={40}
+            />
+          </ExternalLink>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+const HealthHorizontalCardItem = (props) => {
+  const { result } = props;
+  const { appConfig, registry } = useAppConfig();
+  const { vocab = {} } = appConfig;
+  const clusters = result.clusterInfo;
+
+  const UniversalCard = registry.resolve['UniversalCard'].component;
+
+  const item = {
+    '@id': result.href,
+    title: (
+      <>
+        <ExternalLink href={healthURL(result.href)} title={result.title}>
+          {result.title}
+          {result.isNew && <Label className="new-item">New</Label>}
+          {result.isExpired && (
+            <Label className="archived-item">Archived</Label>
+          )}
+        </ExternalLink>
+      </>
+    ),
+    meta: <ContentClusters clusters={clusters} item={result} />,
+    description: props.children ? props.children : <ResultContext {...props} />,
+    preview_image_url: result.hasImage ? result.thumbUrl : undefined,
+    extra: <ExtraContent result={result} vocab={vocab} />,
+  };
+
+  const itemModel = {
+    hasImage: result.hasImage,
+    hasDescription: true,
+    imageOnRightSide: true,
+    '@type': 'searchItem',
+  };
+
+  return <UniversalCard item={item} itemModel={itemModel} />;
+};
+
+export default HealthHorizontalCardItem;

package/src/components/theme/Header.jsx

@@ -233,8 +233,8 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
         inverted={isHomePageInverse ? true : false}
         transparency={isHomePageInverse ? true : false}
         logo={
-          <div {...(isSubsite ? { className: 'logo-wrapper' } : {})}>
-            {!!subsite && subsite.title ? (
+          <div className={isSubsite && 'logo-wrapper'}>
+            {subsite?.title ? (
               <>
                 {subsite.subsite_logo ? (
                   <Logo

package/src/components/theme/Widgets/GeocharsWidget.jsx

@@ -131,14 +131,6 @@ const GeocharsWidget = (props) => {
   );
   const [selectedCity, setSelectedCity] = useState('');
 
-  const geoElements = JSON.parse(value).geoElements;
-  const element = geoElements.element;
-  const countries = geoElements.countries;
-  const macroRegions = geoElements.macrotrans;
-  const bioRegions = geoElements.biotrans;
-  const subRegions = geoElements.subnational;
-  const city = geoElements.city;
-
   const DEFAULT_GEOCHARS = {
     geoElements: {
       element: 'GLOBAL',
@@ -150,6 +142,21 @@ const GeocharsWidget = (props) => {
     },
   };
 
+  let geoElements;
+
+  if (value !== null) {
+    geoElements = JSON.parse(value).geoElements;
+  } else {
+    geoElements = DEFAULT_GEOCHARS;
+  }
+
+  const element = geoElements.element;
+  const countries = geoElements.countries;
+  const macroRegions = geoElements.macrotrans;
+  const bioRegions = geoElements.biotrans;
+  const subRegions = geoElements.subnational;
+  const city = geoElements.city;
+
   const getJSON = () => {
     return JSON.parse(value);
   };

package/src/components/theme/Widgets/GeolocationWidget.jsx

@@ -56,6 +56,11 @@ const GeolocationWidget = (props) => {
     setAddress(event.target.value);
   };
 
+  const defaultValue = {
+    latitude: 55.6761,
+    longitude: 12.5683,
+  };
+
   const handleSearch = (e) => {
     e.preventDefault();
 
@@ -101,9 +106,11 @@ const GeolocationWidget = (props) => {
         </div>
       </div>
       <MapContainer
-        key={`${value.latitude}_${value.longitude}`}
-        longitude={value.longitude}
-        latitude={value.latitude}
+        key={`${value?.latitude || defaultValue.latitude}_${
+          value?.longitude || defaultValue.longitude
+        }`}
+        longitude={value?.longitude || defaultValue.longitude}
+        latitude={value?.latitude || defaultValue.latitude}
         source={tileWMSSources[0]}
       />
       <div className="ui form">
@@ -112,14 +119,14 @@ const GeolocationWidget = (props) => {
             <Input
               type="number"
               placeholder="latitude"
-              value={value.latitude}
+              value={value?.latitude || defaultValue.latitude}
             />
           </div>
           <div className="field">
             <Input
               type="number"
               placeholder="longitude"
-              value={value.longitude}
+              value={value?.longitude || defaultValue.longitude}
             />
           </div>
         </div>

package/src/index.js

@@ -14,6 +14,8 @@ import ToolView from './components/theme/Views/ToolView';
 import VideoView from './components/theme/Views/VideoView';
 import C3SIndicatorView from './components/theme/Views/C3SIndicatorView';
 
+import HealthHorizontalCardItem from './components/Result/HealthHorizontalCardItem';
+
 import ccaLogo from '@eeacms/volto-cca-policy/../theme/assets/images/Header/climate-adapt-logo.svg';
 import eeaWhiteLogo from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/logo/eea-logo-white.svg';
 import europeanComissionLogo from '@eeacms/volto-cca-policy/../theme/assets/images/Footer/ec_logo.svg';
@@ -270,6 +272,11 @@ const applyConfig = (config) => {
     },
   ];
 
+  // Custom results
+  config.settings.searchlib.resolve.HealthHorizontalCardItem = {
+    component: HealthHorizontalCardItem,
+  };
+
   // Custom widgets
   config.widgets.id.geochars = GeocharsWidget;
   config.widgets.id.geolocation = GeolocationWidget;

package/src/search/config-health.js

@@ -2,8 +2,8 @@ import { mergeConfig } from '@eeacms/search';
 import { build_runtime_mappings } from '@eeacms/volto-globalsearch/utils';
 
 import facets from './facets-health';
+import views from './views-health';
 
-// import views from './views';
 // import filters from './filters';
 // import vocabs from './vocabulary';
 
@@ -16,6 +16,7 @@ const getClientProxyAddress = () => {
 
 const ccaConfig = {
   title: 'ClimateAdapt Health',
+  ...views,
 };
 
 export const clusters = {
@@ -80,6 +81,7 @@ export default function installMainSearch(config) {
   });
 
   ccaHealthSearch.facets = facets;
+  // ccaHealthSearch.views = views;
 
   ccaHealthSearch.initialView.tilesLandingPageParams.sections = [
     {

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;
+}

package/src/search/views-health.js

@@ -0,0 +1,15 @@
+export default {
+  resultViews: [
+    {
+      id: 'healthHorizontalCardItem',
+      title: 'Health catalogue items',
+      icon: 'bars',
+      render: null,
+      isDefault: true,
+      factories: {
+        view: 'HorizontalCard.Group',
+        item: 'HealthHorizontalCardItem',
+      },
+    },
+  ],
+};