@eeacms/volto-clms-theme 1.0.182 → 1.0.183

package/.coverage.babel.config.js

@@ -2,8 +2,8 @@ const defaultBabel = require('@plone/volto/babel');
 
 function applyDefault(api) {
   const voltoBabel = defaultBabel(api);
-  voltoBabel.plugins.push('@babel/plugin-transform-modules-commonjs', 'transform-class-properties', 'istanbul');
+  voltoBabel.plugins.push('istanbul');
   return voltoBabel;
 }
 
-module.exports = applyDefault;
+module.exports = applyDefault;

package/.project.eslintrc.js

@@ -1,8 +1,10 @@
 const fs = require('fs');
 const path = require('path');
 
-const projectRootPath = fs.realpathSync('./project');    // __dirname
-// const packageJson = require(path.join(projectRootPath, 'package.json'));
+const projectRootPath = fs.existsSync('./project')
+  ? fs.realpathSync('./project')
+  : fs.realpathSync('./../../../');
+const packageJson = require(path.join(projectRootPath, 'package.json'));
 const jsConfig = require(path.join(projectRootPath, 'jsconfig.json')).compilerOptions;
 
 const pathsConfig = jsConfig.paths;
@@ -43,4 +45,3 @@ module.exports = {
     },
   },
 };
-

package/CHANGELOG.md

@@ -4,6 +4,96 @@ 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.0.183](https://github.com/eea/volto-clms-theme/compare/1.0.182...1.0.183) - 8 March 2023
+
+#### :hammer_and_wrench: Others
+
+- report to sonarqube removed [Unai - [`8ac14b7`](https://github.com/eea/volto-clms-theme/commit/8ac14b707259d3c034dbc3f080027c0df177282e)]
+- integration test removed [Unai - [`b4b316c`](https://github.com/eea/volto-clms-theme/commit/b4b316c60713318a606af740144b59939921abef)]
+- cypress test removed from jenkinsfile [Unai - [`bb28ff4`](https://github.com/eea/volto-clms-theme/commit/bb28ff42a8bb74cb2d378f6a6b974e40527bb6a9)]
+- cypress [Unai - [`625f17e`](https://github.com/eea/volto-clms-theme/commit/625f17e2178caf71374c7adffd514a235ebe5f7c)]
+- remover volot version from jenkinsfile [Unai - [`a6777dc`](https://github.com/eea/volto-clms-theme/commit/a6777dc56429855e9ada37acde2517d608e23c49)]
+- revert last change [Unai - [`c603878`](https://github.com/eea/volto-clms-theme/commit/c6038787d4ce79f79d706aa5a2c861b4d399e4e6)]
+- jenkinsfile [Unai - [`6ba3252`](https://github.com/eea/volto-clms-theme/commit/6ba3252e8032aa19f4b4ff74cb17a21a21615568)]
+- revert last change [Unai - [`52bde39`](https://github.com/eea/volto-clms-theme/commit/52bde397eb2a7f0d6c5430ce077b6f2f66ee79e9)]
+- test [Unai - [`ba59628`](https://github.com/eea/volto-clms-theme/commit/ba59628b32365d960908e12178c71bbdf1a7eabc)]
+- jenkinsfile change [Unai - [`2a5109c`](https://github.com/eea/volto-clms-theme/commit/2a5109c2c151d685763c268a83e5189186714c4a)]
+- utils path added to jest-addon-config [Unai - [`03f8c59`](https://github.com/eea/volto-clms-theme/commit/03f8c59ac6e3223d5e604023e69e4e0cb94b9c0e)]
+- jest addon config fix [Unai - [`f46102d`](https://github.com/eea/volto-clms-theme/commit/f46102d8e6d553341ca36ed0b7614b29a9d915af)]
+- moduleNameMapper [ionlizarazu - [`9d371ad`](https://github.com/eea/volto-clms-theme/commit/9d371ad0866df397625b9d56b1c8332209791365)]
+- add root to jest.addon.config [ionlizarazu - [`5ea9676`](https://github.com/eea/volto-clms-theme/commit/5ea96767f13e20d5e91af48306129f8ab0d142f4)]
+- unused imports [Unai - [`675063b`](https://github.com/eea/volto-clms-theme/commit/675063b1b8677dbd690799b6a5341446d6073c88)]
+- tab and card test fix [Unai - [`edca8e1`](https://github.com/eea/volto-clms-theme/commit/edca8e1e0ed55ea5fb021ca9a9f684e469ad1a99)]
+- add intl provider to test [ionlizarazu - [`d8d8b15`](https://github.com/eea/volto-clms-theme/commit/d8d8b15700f379573a317a8831c50f9db688fa47)]
+- test fix [Unai - [`2cfd3e4`](https://github.com/eea/volto-clms-theme/commit/2cfd3e4b57fbfa1637ce226c5fc631083451d13a)]
+- original data default to [] [ionlizarazu - [`7b14bb2`](https://github.com/eea/volto-clms-theme/commit/7b14bb2748bad8147519224e50a9f75d9dd1923b)]
+- add Provider and store to DownloadDataSetContent test [ionlizarazu - [`00afec6`](https://github.com/eea/volto-clms-theme/commit/00afec65ede0dcd0a35843d4e3d5cd27253d5cfc)]
+- subscriber reducer test [Unai - [`dd3a413`](https://github.com/eea/volto-clms-theme/commit/dd3a4135d81c888a3a71fbf20b5b51cab0701c07)]
+- newsItemView test [Unai - [`f1ab6ca`](https://github.com/eea/volto-clms-theme/commit/f1ab6ca6b2ca806ebba3143c9c08cf1db98abb80)]
+- add provider and store to CclTab test [ionlizarazu - [`fa0abff`](https://github.com/eea/volto-clms-theme/commit/fa0abff256c81200006444d84ced1f504321d394)]
+- update snapshot [ionlizarazu - [`268d002`](https://github.com/eea/volto-clms-theme/commit/268d0020f2bf99c9e5395e2ae0ae73cabb113768)]
+- set selected to false by default [ionlizarazu - [`5c6ce02`](https://github.com/eea/volto-clms-theme/commit/5c6ce0277550b8398df11610c3c331a4eaf256ee)]
+- update snapshots [ionlizarazu - [`80af6ee`](https://github.com/eea/volto-clms-theme/commit/80af6ee00fe2c0be77ecab57aac53ac49b8307f8)]
+- ContextNavigationComponent import [ionlizarazu - [`dad046d`](https://github.com/eea/volto-clms-theme/commit/dad046d5977d85694b5d3f1ad2125026bea95f12)]
+- ContextNavigationComponent import [ionlizarazu - [`c3bdc24`](https://github.com/eea/volto-clms-theme/commit/c3bdc243988da0021a999ff5a4277ecb851fc43f)]
+- some test fixes [Unai - [`e8df30d`](https://github.com/eea/volto-clms-theme/commit/e8df30de368b3ce7e56cda6d49f5953eb712d936)]
+- updated snapshot [Unai - [`84d5c07`](https://github.com/eea/volto-clms-theme/commit/84d5c073597b8a08301c1b2164e203415cc947eb)]
+- jest-css-modules removed [Unai - [`82c8e76`](https://github.com/eea/volto-clms-theme/commit/82c8e76104f99b5b3c0c61f86ebed17b2ad94627)]
+- jest-css-modules added as dependencie [Unai - [`686f90d`](https://github.com/eea/volto-clms-theme/commit/686f90d67dd241a619d741a80089565dffd21555)]
+- jest addon config [Unai - [`d1ce7be`](https://github.com/eea/volto-clms-theme/commit/d1ce7bed6ead9c4cb9e9f42936dc06e5d1ae842f)]
+- jest-css-module removed fom jest addon config [Unai - [`bdca603`](https://github.com/eea/volto-clms-theme/commit/bdca603aca40877ba7d03a5ef9917dc3031d0bac)]
+- jest addon config [Unai - [`4bf039e`](https://github.com/eea/volto-clms-theme/commit/4bf039ea312de58fcb02600f248359914ae7291f)]
+- adjust babel config [Mikel Larreategi - [`142d1fe`](https://github.com/eea/volto-clms-theme/commit/142d1fe8d94ed5ed01a91c31552d5202d22493a5)]
+- update .project.eslintrc.js and Jenkinsfile from volto-eea-website-policy [Mikel Larreategi - [`6fecbeb`](https://github.com/eea/volto-clms-theme/commit/6fecbeb384e8b1b47d3c88dce4658de72bf0c4ee)]
+- adjust test running docker images [Mikel Larreategi - [`816cb53`](https://github.com/eea/volto-clms-theme/commit/816cb53387c263cc8a35d8948cbf27fe85fb5447)]
+- adjust test running docker images [Mikel Larreategi - [`13591a4`](https://github.com/eea/volto-clms-theme/commit/13591a4329ca8d560fe734e98c9084cb1a66da64)]
+- top main menu and footer menu fix [Unai - [`711109c`](https://github.com/eea/volto-clms-theme/commit/711109cc51931410252c900d2ecf479e212a2b2d)]
+- stale config change and volto-slate customizations moved to packages [Unai - [`14c344f`](https://github.com/eea/volto-clms-theme/commit/14c344f61c0492bb6b8cd9f56a71c355886560c1)]
+- searchwidget fix search at global-search [Unai - [`ec1bccb`](https://github.com/eea/volto-clms-theme/commit/ec1bccb34ac809df2fc170717b74ef990d8ef482)]
+- inlinetoolbar override deleted not necesary in volto 16 and slate link advanced configuration added [Unai - [`982a5a2`](https://github.com/eea/volto-clms-theme/commit/982a5a2d29096d4d55e5e61ea38d0524f9e23fe3)]
+- added ...rest to volto-form-block field [Unai - [`2769893`](https://github.com/eea/volto-clms-theme/commit/27698935f37da56ffb823edaaac1da8096a4b974)]
+- volto 16 volto-form-block field [Unai - [`939fcd3`](https://github.com/eea/volto-clms-theme/commit/939fcd306109827330ec9d62c0ef1a873e1b0945)]
+- sitemap override deleted using volto 16 base sitemap [Unai - [`5dd4cee`](https://github.com/eea/volto-clms-theme/commit/5dd4ceeb4493fd9204b4d295cab3dfc8a5f26df6)]
+- volto 16 sitemap [Unai - [`c2a40f9`](https://github.com/eea/volto-clms-theme/commit/c2a40f9e5ad676489afd3b46ebf9550d137ba971)]
+- serachwidgect override to apply style [Unai - [`0462f38`](https://github.com/eea/volto-clms-theme/commit/0462f38ea585347aaaa4a9a1c8496f142d345936)]
+- volto 16 searchWidget [Unai - [`20c51b3`](https://github.com/eea/volto-clms-theme/commit/20c51b310fd9b35d51c1361f604d96a01bc561a1)]
+- navigation override [Unai - [`a74e72a`](https://github.com/eea/volto-clms-theme/commit/a74e72a183ad57b5a730542b4a80d1e482680ee3)]
+- volto 16 navigation [Unai - [`a89b3b5`](https://github.com/eea/volto-clms-theme/commit/a89b3b58d0b295c2c49a6ae6dc8e127236a28d60)]
+- logout overrided not to return login [Unai - [`3338b41`](https://github.com/eea/volto-clms-theme/commit/3338b412f5ae77348f172defcb340dfba6e26fda)]
+- volto 16 logout [Unai - [`509a047`](https://github.com/eea/volto-clms-theme/commit/509a047cc763b75c084c8df3a5a3568dafcbf781)]
+- login override [Unai - [`9490ecb`](https://github.com/eea/volto-clms-theme/commit/9490ecba03222572f99a9fb41041664d4f44fb94)]
+- volto 16 login [Unai - [`86cdd58`](https://github.com/eea/volto-clms-theme/commit/86cdd58a950611a77692469367adff351ab45f7f)]
+- prettier fix [Unai - [`272a169`](https://github.com/eea/volto-clms-theme/commit/272a1698cff169fec1bcbe2c1fe7a64f50fd62bc)]
+- restored footer customization [Unai - [`906f180`](https://github.com/eea/volto-clms-theme/commit/906f180624ca94591e2fa77b27f5491436264a82)]
+- volto 16 footer component [Unai - [`c4fd98e`](https://github.com/eea/volto-clms-theme/commit/c4fd98ef52540d34567c6da1301d517384fc6f0e)]
+- logo override [Unai - [`9aefd6f`](https://github.com/eea/volto-clms-theme/commit/9aefd6f255e44b4be2f71c195b49efe85d9095b6)]
+- volto 16 logo component [Unai - [`818e215`](https://github.com/eea/volto-clms-theme/commit/818e215887c4d1930454e8ee95a3b3744d8dad16)]
+- header overrided [Unai - [`227d47b`](https://github.com/eea/volto-clms-theme/commit/227d47b5c71335dec4ee2d0e4b57a3bb121db0b0)]
+- volto 16 header [Unai - [`3f08fd7`](https://github.com/eea/volto-clms-theme/commit/3f08fd7b013ab6704b57c25f2267a1953f20712d)]
+- deleted unused listingview [Unai - [`24583ba`](https://github.com/eea/volto-clms-theme/commit/24583bac4ab6a026940a99118ea741505d5b464c)]
+- unauthorized customization [Unai - [`0ae63d5`](https://github.com/eea/volto-clms-theme/commit/0ae63d5cf801cb7795bce54f807c850515273306)]
+- volto 16 unauthorized [Unai - [`996fa46`](https://github.com/eea/volto-clms-theme/commit/996fa46e6afb2820d1a3591deeda6f19f1af6f07)]
+- deleted unused contextNavigation override [Unai - [`a543b3c`](https://github.com/eea/volto-clms-theme/commit/a543b3c73deda20d1de96d8c1a1e679e2538bde0)]
+- overrided universallink and removed unnecesary file [Unai - [`3f0c635`](https://github.com/eea/volto-clms-theme/commit/3f0c6355bd57bfbd3fc05fe367e2453f8d5b665c)]
+- volto 16 universallink [Unai - [`21ed038`](https://github.com/eea/volto-clms-theme/commit/21ed038160d8510ce77f345739106753c90800f7)]
+- volto 16 universallink and deleted diffield [Unai - [`e900b7b`](https://github.com/eea/volto-clms-theme/commit/e900b7b03bc2459d91278933c9d834152c05b2ee)]
+- volto 16 diffField [Unai - [`d028f96`](https://github.com/eea/volto-clms-theme/commit/d028f968cfc80587bfd46ba7e6e2a2c5b54c907d)]
+- facets customizatin [Unai - [`31df7e9`](https://github.com/eea/volto-clms-theme/commit/31df7e9fa6467ccc8b8482a5d64ccc8bc680056d)]
+- volto 16 facets component [Unai - [`d1570f6`](https://github.com/eea/volto-clms-theme/commit/d1570f6025cae8c883b4e72b8ba9ba6b82f20156)]
+- remove ArrayWidget, unneeded customization with Volto 16 [ionlizarazu - [`b8c49e8`](https://github.com/eea/volto-clms-theme/commit/b8c49e8c67f23b42b4fb7d9a8e8fd3276e37572f)]
+- Breadcrumbs customization [ionlizarazu - [`9fcb66a`](https://github.com/eea/volto-clms-theme/commit/9fcb66ab4d7b46fb3ba5d0668f798beeeffe0bae)]
+- Original Breadcrubms volto 16.12.0 [ionlizarazu - [`598a65e`](https://github.com/eea/volto-clms-theme/commit/598a65e2ddec302699d910338fd59cafa512f86e)]
+- volto-slate imports [ionlizarazu - [`872ccf6`](https://github.com/eea/volto-clms-theme/commit/872ccf6a4656339e22c838c0d9acad7ba2e83804)]
+- send 'data' to SearchDetails [ionlizarazu - [`d4c80f6`](https://github.com/eea/volto-clms-theme/commit/d4c80f6bb8c917067a6961ed1ee549c9fe697034)]
+- customize Toolbar [ionlizarazu - [`6504e61`](https://github.com/eea/volto-clms-theme/commit/6504e61ad67b41df96634a6bd5025a8865590be4)]
+- original Toolbar volto 16.12.0 [ionlizarazu - [`7e85226`](https://github.com/eea/volto-clms-theme/commit/7e852269ce24c108f6fe1d5fd1fccc04341494a6)]
+- load Font [ionlizarazu - [`21410a2`](https://github.com/eea/volto-clms-theme/commit/21410a2674ffccb551ab3d9d5683c4d6b7afeee0)]
+- Jenkinsfile with volto 16.10.0 [ionlizarazu - [`9b518cc`](https://github.com/eea/volto-clms-theme/commit/9b518ccab7a4629212e2fd7d5968d89e9b7942c8)]
+- dependencies order and remove some unneeded configurations [ionlizarazu - [`cd597b3`](https://github.com/eea/volto-clms-theme/commit/cd597b39f337390e29ca4f4e69ce214e609d06d2)]
+- jest addon config [ionlizarazu - [`5f5bc40`](https://github.com/eea/volto-clms-theme/commit/5f5bc40f5f75595018e9b6d0b6b94d74ece627bc)]
+- babel config [ionlizarazu - [`16f34c9`](https://github.com/eea/volto-clms-theme/commit/16f34c9f552e967caa1b9e1fe75c4f53e22be5a0)]
+- uncomment theme folders and fix the siteFolder route [ionlizarazu - [`2c274ad`](https://github.com/eea/volto-clms-theme/commit/2c274ad067d6b62151971529e1c71cbbc5045ca5)]
+- volto 16 [Unai - [`b30e9c4`](https://github.com/eea/volto-clms-theme/commit/b30e9c42bcf80a90450fb5a8d1fd6d1fe7a49364)]
 ### [1.0.182](https://github.com/eea/volto-clms-theme/compare/1.0.181...1.0.182) - 2 March 2023
 
 #### :bug: Bug Fixes

package/Jenkinsfile

@@ -6,7 +6,7 @@ pipeline {
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "clms.land.copernicus.eu,volto.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu"
         DEPENDENCIES = ""
-        VOLTO = "15.16.0"
+        VOLTO = ""
     }
 
   stages {
@@ -41,22 +41,19 @@ pipeline {
 
           "ES lint": {
             node(label: 'docker') {
-              sh '''docker pull plone/volto-addon-ci:15.x'''
-              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e VOLTO=$VOLTO -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci:15.x eslint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha eslint'''
             }
           },
 
           "Style lint": {
             node(label: 'docker') {
-              sh '''docker pull plone/volto-addon-ci:15.x'''
-              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e VOLTO=$VOLTO -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci:15.x stylelint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha stylelint'''
             }
           },
 
           "Prettier": {
             node(label: 'docker') {
-              sh '''docker pull plone/volto-addon-ci:15.x'''
-              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e VOLTO=$VOLTO -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci:15.x prettier'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha prettier'''
             }
           }
         )
@@ -80,8 +77,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone/volto-addon-ci:15.x'''
-                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e VOLTO=$VOLTO -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci:15.x'''
+                  sh '''docker pull plone/volto-addon-ci:alpha'''
+                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha'''
                   sh '''rm -rf xunit-reports'''
                   sh '''mkdir -p xunit-reports'''
                   sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/coverage xunit-reports/'''
@@ -111,93 +108,93 @@ pipeline {
       }
     }
 
-    stage('Integration tests') {
-      when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-           not { changelog '.*^Automated release [0-9\\.]+$' }
-           branch 'master'
-          }
-        }
-      }
-      steps {
-        parallel(
-
-          "Cypress": {
-            node(label: 'docker') {
-              script {
-                try {
-                  sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
-                  sh '''docker pull plone/volto-addon-ci:15.x; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e VOLTO=$VOLTO -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=test plone/volto-addon-ci:15.x cypress'''
-                } finally {
-                  try {
-                    sh '''rm -rf cypress-reports cypress-results cypress-coverage'''
-                    sh '''mkdir -p cypress-reports cypress-results cypress-coverage'''
-                    sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/src/addons/$GIT_NAME/cypress/videos cypress-reports/'''
-                    sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/src/addons/$GIT_NAME/cypress/reports cypress-results/'''
-                    coverage = sh script: '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/src/addons/$GIT_NAME/coverage cypress-coverage/''', returnStatus: true
-                    if ( coverage == 0 ) {
-                         publishHTML (target : [allowMissing: false,
-                             alwaysLinkToLastBuild: true,
-                             keepAll: true,
-                             reportDir: 'cypress-coverage/coverage/lcov-report',
-                             reportFiles: 'index.html',
-                             reportName: 'CypressCoverage',
-                             reportTitles: 'Integration Tests Code Coverage'])
-                    }
-                    sh '''touch empty_file; for ok_test in $(grep -E 'file=.*failures="0"' $(grep 'testsuites .*failures="0"' $(find cypress-results -name *.xml) empty_file | awk -F: '{print $1}') empty_file | sed 's/.* file="\\(.*\\)" time.*/\\1/' | sed 's#^cypress/integration/##g' | sed 's#^../../../node_modules/@eeacms/##g'); do rm -f cypress-reports/videos/$ok_test.mp4; rm -f cypress-reports/$ok_test.mp4; done'''
-                    archiveArtifacts artifacts: 'cypress-reports/**/*.mp4', fingerprint: true, allowEmptyArchive: true
-                    stash name: "cypress-coverage", includes: "cypress-coverage/**", allowEmpty: true
-                  }
-                  finally {
-                    catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
-                        junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
-                    }
-                    sh script: "docker stop $BUILD_TAG-plone", returnStatus: true
-                    sh script: "docker rm -v $BUILD_TAG-plone", returnStatus: true
-                    sh script: "docker rm -v $BUILD_TAG-cypress", returnStatus: true
-
-                  }
-                }
-              }
-            }
-          }
-
-        )
-      }
-    }
-
-    stage('Report to SonarQube') {
-      when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-            branch 'master'
-            allOf {
-              branch 'develop'
-              not { changelog '.*^Automated release [0-9\\.]+$' }
-            }
-          }
-        }
-      }
-      steps {
-        node(label: 'swarm') {
-          script{
-            checkout scm
-            unstash "xunit-reports"
-            unstash "cypress-coverage"
-            def scannerHome = tool 'SonarQubeScanner';
-            def nodeJS = tool 'NodeJS';
-            withSonarQubeEnv('Sonarqube') {
-              sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
-              sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
-              sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
-            }
-          }
-        }
-      }
-    }
+    // stage('Integration tests') {
+    //   when {
+    //     allOf {
+    //       environment name: 'CHANGE_ID', value: ''
+    //       anyOf {
+    //        not { changelog '.*^Automated release [0-9\\.]+$' }
+    //        branch 'master'
+    //       }
+    //     }
+    //   }
+    //   steps {
+    //     parallel(
+
+    //       "Cypress": {
+    //         node(label: 'docker') {
+    //           script {
+    //             try {
+    //               sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend'''
+    //               sh '''docker pull plone/volto-addon-ci:alpha; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha cypress'''
+    //             } finally {
+    //               try {
+    //                 sh '''rm -rf cypress-reports cypress-results cypress-coverage'''
+    //                 sh '''mkdir -p cypress-reports cypress-results cypress-coverage'''
+    //                 sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/src/addons/$GIT_NAME/cypress/videos cypress-reports/'''
+    //                 sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/src/addons/$GIT_NAME/cypress/reports cypress-results/'''
+    //                 coverage = sh script: '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/src/addons/$GIT_NAME/coverage cypress-coverage/''', returnStatus: true
+    //                 if ( coverage == 0 ) {
+    //                      publishHTML (target : [allowMissing: false,
+    //                          alwaysLinkToLastBuild: true,
+    //                          keepAll: true,
+    //                          reportDir: 'cypress-coverage/coverage/lcov-report',
+    //                          reportFiles: 'index.html',
+    //                          reportName: 'CypressCoverage',
+    //                          reportTitles: 'Integration Tests Code Coverage'])
+    //                 }
+    //                 sh '''touch empty_file; for ok_test in $(grep -E 'file=.*failures="0"' $(grep 'testsuites .*failures="0"' $(find cypress-results -name *.xml) empty_file | awk -F: '{print $1}') empty_file | sed 's/.* file="\\(.*\\)" time.*/\\1/' | sed 's#^cypress/integration/##g' | sed 's#^../../../node_modules/@eeacms/##g'); do rm -f cypress-reports/videos/$ok_test.mp4; rm -f cypress-reports/$ok_test.mp4; done'''
+    //                 archiveArtifacts artifacts: 'cypress-reports/**/*.mp4', fingerprint: true, allowEmptyArchive: true
+    //                 stash name: "cypress-coverage", includes: "cypress-coverage/**", allowEmpty: true
+    //               }
+    //               finally {
+    //                 catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
+    //                     junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
+    //                 }
+    //                 sh script: "docker stop $BUILD_TAG-plone", returnStatus: true
+    //                 sh script: "docker rm -v $BUILD_TAG-plone", returnStatus: true
+    //                 sh script: "docker rm -v $BUILD_TAG-cypress", returnStatus: true
+
+    //               }
+    //             }
+    //           }
+    //         }
+    //       }
+
+    //     )
+    //   }
+    // }
+
+    // stage('Report to SonarQube') {
+    //   when {
+    //     allOf {
+    //       environment name: 'CHANGE_ID', value: ''
+    //       anyOf {
+    //         branch 'master'
+    //         allOf {
+    //           branch 'develop'
+    //           not { changelog '.*^Automated release [0-9\\.]+$' }
+    //         }
+    //       }
+    //     }
+    //   }
+    //   steps {
+    //     node(label: 'swarm') {
+    //       script{
+    //         checkout scm
+    //         unstash "xunit-reports"
+    //         unstash "cypress-coverage"
+    //         def scannerHome = tool 'SonarQubeScanner';
+    //         def nodeJS = tool 'NodeJS';
+    //         withSonarQubeEnv('Sonarqube') {
+    //           sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
+    //           sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+    //           sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
+    //         }
+    //       }
+    //     }
+    //   }
+    // }
 
     stage('Pull Request') {
       when {
@@ -242,4 +239,4 @@ pipeline {
       }
     }
   }
-}
+}

package/babel.config.js

@@ -1 +1,17 @@
-module.exports = require('@plone/volto/babel');
+module.exports = function (api) {
+  api.cache(true);
+  const presets = ['razzle'];
+  const plugins = [
+    [
+      'react-intl', // React Intl extractor, required for the whole i18n infrastructure to work
+      {
+        messagesDir: './build/messages/',
+      },
+    ],
+  ];
+
+  return {
+    plugins,
+    presets,
+  };
+};

package/cypress/{integration/block-basics.js → e2e/block-basics.cy.js}

@@ -1,4 +1,4 @@
-import { setupBeforeEach, tearDownAfterEach } from '../support';
+import { setupBeforeEach, tearDownAfterEach } from '../support/e2e';
 
 describe('Blocks Tests', () => {
   beforeEach(setupBeforeEach);
@@ -6,13 +6,15 @@ describe('Blocks Tests', () => {
 
   it('Add Block: Empty', () => {
     // Change page title
-    cy.get('.documentFirstHeading > .public-DraftStyleDefault-block')
+    cy.get('.documentFirstHeading')
+      .focused()
       .clear()
       .type('My Add-on Page')
-      .get('.documentFirstHeading span[data-text]')
+      .get('.documentFirstHeading')
       .contains('My Add-on Page');
 
-    cy.get('.documentFirstHeading > .public-DraftStyleDefault-block').type('{enter}');
+    cy.get('.documentFirstHeading') /* .focused() */
+      .type('{enter}');
 
     // Add block
     cy.get('.ui.basic.icon.button.block-add-button').first().click();

package/cypress/support/{index.js → e2e.js}

@@ -27,7 +27,7 @@ coverage-end */
 export const setupBeforeEach = () => {
   cy.autologin();
   cy.createContent({
-    contentType: 'Folder',
+    contentType: 'Document',
     contentId: 'cypress',
     contentTitle: 'Cypress',
   });
@@ -44,7 +44,7 @@ export const setupBeforeEach = () => {
   cy.waitForResourceToLoad('@types');
   cy.waitForResourceToLoad('my-page');
   cy.navigate('/cypress/my-page/edit');
-  cy.get(`.block.title [data-contents]`);
+  // cy.get(`.block.title [data-contents]`);
 };
 
 export const tearDownAfterEach = () => {

package/cypress.config.js

@@ -0,0 +1,21 @@
+const { defineConfig } = require('cypress')
+
+module.exports = defineConfig({
+  viewportWidth: 1280,
+  defaultCommandTimeout: 15000,
+  reporter: 'junit',
+  video: true,
+  reporterOptions: {
+    mochaFile: 'cypress/reports/cypress-[hash].xml',
+    jenkinsMode: true,
+    toConsole: true,
+  },
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:3000',
+  },
+})

package/jest-addon.config.js

@@ -8,12 +8,15 @@ module.exports = {
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
-    '@eeacms/volto-clms-utils/(.*)$':
-      '<rootDir>/node_modules/@eeacms/volto-clms-utils/src/$1',
     '@package/(.*)$': '<rootDir>/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
-    '@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
-    'volto-clms-theme/(.*)$': '<rootDir>/src/addons/volto-clms-theme/src/$1',
+    '@eeacms/volto-clms-theme/(.*)$':
+      '<rootDir>/src/addons/volto-clms-theme/src/$1',
+    '@eeacms/volto-clms-utils/(.*)$':
+      '<rootDir>/node_modules/@eeacms/volto-clms-utils/src/$1',
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
+    '@plone/volto-slate':
+      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
     '~/(.*)$': '<rootDir>/src/$1',
     '@root/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     'load-volto-addons':
@@ -21,9 +24,6 @@ module.exports = {
   },
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',
-    '^.+\\.css$': 'jest-css-modules',
-    '^.+\\.less$': 'jest-css-modules',
-    '^.+\\.scss$': 'jest-css-modules',
     '^.+\\.(png)$': 'jest-file',
     '^.+\\.(jpg)$': 'jest-file',
     '^.+\\.(svg)$': './node_modules/@plone/volto/jest-svgsystem-transform.js',
@@ -39,7 +39,4 @@ module.exports = {
       statements: 5,
     },
   },
-  roots: ['<rootDir>'],
-  modulePaths: ['<rootDir>'],
-  moduleDirectories: ['node_modules'],
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.182",
+  "version": "1.0.183",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -34,89 +34,55 @@
     "@eeacms/volto-embed"
   ],
   "dependencies": {
-    "volto-cookie-banner": "2.1.0",
-    "@eeacms/volto-accordion-block": "3.5.0",
+    "@eeacms/volto-accordion-block": "7.0.0",
     "@eeacms/volto-arcgis-block": "*",
     "@eeacms/volto-clms-utils": "0.1.7",
-    "@eeacms/volto-columns-block": "4.4.3",
-    "@eeacms/volto-metadata-block": "^2.1.0",
-    "@eeacms/volto-react-table-widget": "0.1.1",
-    "@eeacms/volto-resize-helper": "0.2.1",
-    "@eeacms/volto-tabs-block": "1.2.7",
-    "@eeacms/volto-taxonomy": "^1.0.0",
-    "@eeacms/volto-tableau": "1.2.4",
-    "@eeacms/volto-embed": "4.0.2",
+    "@eeacms/volto-columns-block": "6.0.2",
+    "@eeacms/volto-embed": "5.0.1",
+    "@eeacms/volto-metadata-block": "5.0.1",
+    "@eeacms/volto-react-table-widget": "0.1.3",
+    "@eeacms/volto-resize-helper": "1.0.1",
+    "@eeacms/volto-tableau": "3.0.6",
+    "@eeacms/volto-tabs-block": "3.0.1",
+    "@eeacms/volto-taxonomy": "3.0.1",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
-    "@ginkgo-bioworks/react-json-schema-form-builder": "2.10.1",
     "@fortawesome/free-regular-svg-icons": "5.15.3",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/react-fontawesome": "0.1.14",
+    "@ginkgo-bioworks/react-json-schema-form-builder": "2.10.1",
+    "connected-react-router": "6.8.0",
     "husky": "7.0.4",
+    "lightgallery": "^2.4.0",
     "react-csv": "2.2.2",
+    "react-input-range": "^1.3.0",
     "react-native-mime-types": "2.3.0",
     "react-slick": "0.28.1",
     "react-svg": "14.0.4",
     "slick-carousel": "1.8.1",
-    "volto-dropdownmenu": "2.2.7",
-    "volto-form-block": "2.8.0",
-    "react-input-range": "^1.3.0",
-    "lightgallery": "^2.4.0",
     "validator": "13.7.0",
-    "connected-react-router": "6.8.0"
+    "volto-cookie-banner": "2.1.0",
+    "volto-dropdownmenu": "4.0.0",
+    "volto-form-block": "3.0.1"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",
+    "@plone/scripts": "2.1.1",
+    "@wojtekmaj/enzyme-adapter-react-17": "0.6.6",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.6",
-    "@wojtekmaj/enzyme-adapter-react-17": "0.6.6",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^8.2.0",
     "eslint-plugin-prettier": "3.1.3",
     "eslint-plugin-react-app": "^6.2.2",
     "husky": "7.0.4",
     "jsconfig": "^0.2.0",
+    "md5": "^2.3.0",
     "prettier": "2.0.5",
     "prettier-eslint": "^12.0.0",
     "stylelint": "^13.12.0",
     "stylelint-config-idiomatic-order": "8.1.0",
-    "stylelint-prettier": "1.1.2",
-    "md5": "^2.3.0"
-  },
-  "prettier": {
-    "trailingComma": "all",
-    "singleQuote": true,
-    "overrides": [
-      {
-        "files": "*.overrides",
-        "options": {
-          "parser": "less"
-        }
-      }
-    ]
-  },
-  "stylelint": {
-    "extends": [
-      "stylelint-config-idiomatic-order"
-    ],
-    "plugins": [
-      "stylelint-prettier"
-    ],
-    "rules": {
-      "prettier/prettier": true,
-      "rule-empty-line-before": [
-        "always-multi-line",
-        {
-          "except": [
-            "first-nested"
-          ],
-          "ignore": [
-            "after-comment"
-          ]
-        }
-      ]
-    },
-    "ignoreFiles": "theme/themes/default/**/*.overrides"
+    "stylelint-prettier": "1.1.2"
   },
   "scripts": {
     "release": "release-it",

package/src/components/Blocks/CclButtonBlock/CclButtonBlockEdit.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
-import { SidebarPortal } from '@plone/volto/components';
-import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import { InlineForm } from '@plone/volto/components';
 import { cclButtonSchema } from './Schema';
 import './styles.less';