@eeacms/volto-clms-theme 1.1.16 → 1.1.18

package/CHANGELOG.md

@@ -4,6 +4,24 @@ 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).
 
+### [1.1.18](https://github.com/eea/volto-clms-theme/compare/1.1.17...1.1.18) - 3 July 2023
+
+#### :hammer_and_wrench: Others
+
+- lint [Mikel Larreategi - [`f828104`](https://github.com/eea/volto-clms-theme/commit/f82810407be009f416090d005a84175bc87c21fe)]
+- clms-2329 remove periodicity from calendar picker [Mikel Larreategi - [`9272a58`](https://github.com/eea/volto-clms-theme/commit/9272a580cdb11051a33832e2d1e4c738ca1a47e6)]
+### [1.1.17](https://github.com/eea/volto-clms-theme/compare/1.1.16...1.1.17) - 30 June 2023
+
+#### :hammer_and_wrench: Others
+
+- remove NUTS text for area naming in the cart [ionlizarazu - [`062e0a3`](https://github.com/eea/volto-clms-theme/commit/062e0a375f5352bc13c18ff7ec33fad4bcc59f2f)]
+- dependencies [ionlizarazu - [`405ef96`](https://github.com/eea/volto-clms-theme/commit/405ef96090fe7bd4af73a49d3285a92fad712e3b)]
+- yarn.lock [ionlizarazu - [`7132119`](https://github.com/eea/volto-clms-theme/commit/71321195c4dd4fceed67f2f0872f3e24bba61c17)]
+- volto-blocks-grid module mapping [ionlizarazu - [`4fec3ca`](https://github.com/eea/volto-clms-theme/commit/4fec3cabc437322ad92ed90d682250bd123ccaaf)]
+- volto-blocks-grid v7.0.2 [ionlizarazu - [`2557e60`](https://github.com/eea/volto-clms-theme/commit/2557e6039d3cea33ca0bd11a0a3ef4764c611f78)]
+- remove styling from teaser block [ionlizarazu - [`879e684`](https://github.com/eea/volto-clms-theme/commit/879e684057c88f52f60f0fa54cbaa155c7d14688)]
+- update dependency [Mikel Larreategi - [`a937ef3`](https://github.com/eea/volto-clms-theme/commit/a937ef376d6fe636c6e5688e9e615e9e03bf7f69)]
+- teaser card image left [ionlizarazu - [`cd4746f`](https://github.com/eea/volto-clms-theme/commit/cd4746f0e32818c18e17904d059373829c63ce91)]
 ### [1.1.16](https://github.com/eea/volto-clms-theme/compare/1.1.15...1.1.16) - 29 June 2023
 
 #### :rocket: New Features
@@ -86,6 +104,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`b4cbf65`](https://github.com/eea/volto-clms-theme/commit/b4cbf6557fbc67f7fc4cea5aa2cb19804f3d7e3c)]
 
 #### :hammer_and_wrench: Others
 
@@ -1284,6 +1303,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - related products and datasets added to news and meeting views and login-plone route created [Unai - [`5704a1a`](https://github.com/eea/volto-clms-theme/commit/5704a1a766148746162b60efaf232ea90dc20cf4)]
+- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`46eb694`](https://github.com/eea/volto-clms-theme/commit/46eb69415280a3c982405299135027ae4221426a)]
 - sort items according to the lowercased label and put those with special meaning at the end [Mikel Larreategi - [`6410abe`](https://github.com/eea/volto-clms-theme/commit/6410abe096f60dcad54dced2026c9df9b7946d68)]
 - lint fix [Unai - [`1264a7a`](https://github.com/eea/volto-clms-theme/commit/1264a7adfe8d679fea1bd821ad087add20f4271d)]
 - footer newsletter subscription change, global search maxLength change from 8000 to 200 and /login design change [Unai - [`a09d24a`](https://github.com/eea/volto-clms-theme/commit/a09d24adbb6fa053fb2a2cc0071506b906593b42)]
@@ -1434,6 +1454,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - search block new features [ionlizarazu - [`8e814cb`](https://github.com/eea/volto-clms-theme/commit/8e814cbd359782540c21fe37b37ef146d331f0d6)]
 - language selector cookie management [ionlizarazu - [`1385ac9`](https://github.com/eea/volto-clms-theme/commit/1385ac95795702206d3623ba6e780faa43a89e0a)]
 - toolbar cookie management [ionlizarazu - [`5c23200`](https://github.com/eea/volto-clms-theme/commit/5c23200790b20e1d4f1bc966463c37bf4c808f47)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0316a0d`](https://github.com/eea/volto-clms-theme/commit/0316a0d8b6fb0fa14af13002415f3c95d9f8ede3)]
 ### [1.0.84](https://github.com/eea/volto-clms-theme/compare/1.0.83...1.0.84) - 18 March 2022
 
 #### :hammer_and_wrench: Others
@@ -2338,11 +2359,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - replace @collective/volto-dropdownmenu with volto-dropdownmenu [ionlizarazu - [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)]
+- yarn.lock [ionlizarazu - [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)]
 - add NODE_ENV parameter [ionlizarazu - [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)]
 - upgrade volto-dropdownmenu version [ionlizarazu - [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)]
 - HomeSearch block missing url behaviour [ionlizarazu - [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)]
 - babel configuration [ionlizarazu - [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)]
 - prettier [ionlizarazu - [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)]
+- add yarn lock [ionlizarazu - [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)]
 - Jenkinsfile cypress test [ionlizarazu - [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)]
 - cypress [ionlizarazu - [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)]
 - some fixes [ionlizarazu - [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)]

package/jest-addon.config.js

@@ -15,6 +15,8 @@ module.exports = {
       '<rootDir>/src/addons/volto-clms-theme/src/$1',
     '@eeacms/volto-clms-utils/(.*)$':
       '<rootDir>/node_modules/@eeacms/volto-clms-utils/src/$1',
+    '@kitconcept/volto-blocks-grid/(.*)$':
+      '<rootDir>/node_modules/@kitconcept/volto-blocks-grid/src/$1',
     '@plone/volto-slate':
       '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
     '~/(.*)$': '<rootDir>/src/$1',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -18,6 +18,7 @@
     "url": "git@github.com:eea/volto-clms-theme.git"
   },
   "addons": [
+    "@kitconcept/volto-blocks-grid",
     "volto-dropdownmenu",
     "@eeacms/volto-arcgis-block",
     "@eeacms/volto-columns-block",
@@ -36,7 +37,7 @@
   "dependencies": {
     "@eeacms/volto-accordion-block": "7.0.0",
     "@eeacms/volto-arcgis-block": "*",
-    "@eeacms/volto-clms-utils": "0.1.7",
+    "@eeacms/volto-clms-utils": "0.1.8",
     "@eeacms/volto-columns-block": "6.0.2",
     "@eeacms/volto-embed": "5.0.1",
     "@eeacms/volto-metadata-block": "5.0.1",
@@ -50,6 +51,7 @@
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
     "@ginkgo-bioworks/react-json-schema-form-builder": "2.10.1",
+    "@kitconcept/volto-blocks-grid": "7.0.2",
     "connected-react-router": "6.8.0",
     "husky": "7.0.4",
     "lightgallery": "^2.4.0",

package/src/components/Blocks/customBlocks.js

@@ -86,6 +86,9 @@ import { default as CustomVideoView } from '@eeacms/volto-clms-theme/components/
 import { default as CustomVideoEdit } from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VideoBlock/Edit';
 import { default as CustomHtmlView } from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/HtmlBlock/View';
 import { default as CustomHtmlEdit } from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/HtmlBlock/Edit';
+
+import { TeaserSchema } from '@kitconcept/volto-blocks-grid/components/Teaser/schema';
+
 export const customGroupBlocksOrder = [
   {
     id: 'ccl_blocks',
@@ -629,6 +632,15 @@ const customBlocks = (config) => ({
       view: [], // Future proof (not implemented yet) view user role(s)
     },
   },
+  teaser: {
+    ...config.blocks.blocksConfig.teaser,
+    blockSchema: (intl) => {
+      const schema = TeaserSchema(intl);
+      delete schema.properties.styles;
+      schema.fieldsets = schema.fieldsets.filter((s) => s.id === 'default');
+      return schema;
+    },
+  },
 });
 
 export default customBlocks;

package/src/components/CLMSDownloadCartView/AreaNaming.jsx

@@ -20,7 +20,7 @@ export const AreaNaming = (areaProps) => {
         </>
       );
     case 'nuts':
-      return 'NUTS: ' + (item.area.valueName || item.area.value);
+      return item.area.valueName || item.area.value;
     case undefined:
       return item.area || item.file || '-';
     case typeof item.area === 'string':

package/src/components/CLMSDownloadCartView/TimeseriesPicker.jsx

@@ -8,7 +8,7 @@ import { cclDateFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
 
 export const TimeseriesPicker = (props) => {
-  const { start, end, period, item, setTimeseriesValue } = props;
+  const { start, end, item, setTimeseriesValue } = props;
   const [startValue, setStartValue] = useState(
     item?.TemporalFilter?.StartDate
       ? new Date(cclDateFormat(item.TemporalFilter.StartDate))
@@ -20,23 +20,7 @@ export const TimeseriesPicker = (props) => {
       : null,
   );
   const [isOpen, setIsOpen] = useState(false);
-  const getPeriodicity = (p) => {
-    if (p === 1 / 24 || p === 'PT1H') {
-      return 'hourly';
-    } else if (p === 1 || p === 'P1D') {
-      return 'daily';
-    } else if (p === 7 || p === 'P7D' || p === 'P1W') {
-      return 'weekly';
-    } else if (p === 10 || p === 'P10D') {
-      return '10-daily';
-    } else if ((p >= 28 && p <= 31) || p === 'P1M') {
-      return 'monthly';
-    } else if (p === 365 || p === 366 || p === 'P1Y') {
-      return 'yearly';
-    } else {
-      return 'not regular';
-    }
-  };
+
   return (
     <>
       <Popup
@@ -78,8 +62,6 @@ export const TimeseriesPicker = (props) => {
       >
         <Grid.Column className="datetime-picker">
           <Grid.Row>
-            The periodicity of this dataset is {getPeriodicity(period)}
-            <br />
             <DatePicker
               id="start_date"
               inline