Merge pull request #82 from eea/develop

slate from volto

.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;

.gitignore

@@ -1,7 +1,9 @@
 .vscode/
 .history
 .eslintrc.js
+nyc_output
 project
+coverage
 logs
 *.log
 npm-debug.log*

CHANGELOG.md

@@ -4,6 +4,20 @@ 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.2.21](https://github.com/eea/volto-forests-theme/compare/0.2.20...0.2.21) - 7 November 2022
+
+#### :hammer_and_wrench: Others
+
+- Add linkintegritycheck to our customization [andreiggr - [`85e78d1`](https://github.com/eea/volto-forests-theme/commit/85e78d164c1b510ff1b1b9009024d5c7fe5fd908)]
+- giMerge branch 'develop' of github.com:eea/volto-forests-theme into develop [andreiggr - [`9660a8c`](https://github.com/eea/volto-forests-theme/commit/9660a8c1ddfc1d37c1ed2ea10f9d966f1b6b079e)]
+- clear custom Renderblocks as solution is in volto core [andreiggr - [`7734b8a`](https://github.com/eea/volto-forests-theme/commit/7734b8abbac12ddec65eea610ac377f61bca732f)]
+- clean [andreiggr - [`83a9b03`](https://github.com/eea/volto-forests-theme/commit/83a9b031ce940c7343c8e52a0d79b66b139c03ee)]
+- fix layouts for new volto [andreiggr - [`c002349`](https://github.com/eea/volto-forests-theme/commit/c002349bfa4d24fbf6ecac3775cf363065587918)]
+- resolve imports [andreiggr - [`eb5bcf9`](https://github.com/eea/volto-forests-theme/commit/eb5bcf97f843a41430cb4996a054db4da5fa9b1d)]
+- cypress & volto updates [Andrei Grigore - [`12db55b`](https://github.com/eea/volto-forests-theme/commit/12db55b9eb54fe7016ed5084a27e30daa9fb42b2)]
+- config new slate route [andreiggr - [`dbfcfb5`](https://github.com/eea/volto-forests-theme/commit/dbfcfb51b0ec8e24d1649308a4f8ed9efcc3568c)]
+- use alpha in cy [andreiggr - [`a4b489f`](https://github.com/eea/volto-forests-theme/commit/a4b489fe9e2668899a570334d109c9c4fa52ec4d)]
+- slate from volto [andreiggr - [`5b6a21f`](https://github.com/eea/volto-forests-theme/commit/5b6a21fcf445cb692328a2815dd45224c781ef9a)]
 ### [0.2.20](https://github.com/eea/volto-forests-theme/compare/0.2.19...0.2.20) - 4 October 2022
 
 #### :hammer_and_wrench: Others
@@ -95,7 +109,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Fix crash on no selected columns [andreiggr - [`30f2c17`](https://github.com/eea/volto-forests-theme/commit/30f2c17d4200fb0579a6a90efbf4943597f2156b)]
 - Use volto-openlayers & fixes [andreiggr - [`6bff44c`](https://github.com/eea/volto-forests-theme/commit/6bff44c737a3d124c399b928cf3339d4d9f53dbc)]
 - openlayers markers wip [andreiggr - [`08e447e`](https://github.com/eea/volto-forests-theme/commit/08e447e2f5cc495d334864693b4ee8cf261c2eba)]
-- [JENKINSFILE] use NodeJS from ${nodeJS}/bin [valentinab25 - [`3c73d31`](https://github.com/eea/volto-forests-theme/commit/3c73d31e2d1689cec97a6b42121859770657ceff)]
 ### [0.2.6](https://github.com/eea/volto-forests-theme/compare/0.2.5...0.2.6) - 11 April 2022
 
 #### :hammer_and_wrench: Others
@@ -293,7 +306,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - use standalone slate-inline stlyes [nileshgulia1 - [`53422fe`](https://github.com/eea/volto-forests-theme/commit/53422fe68677953b0c46079c388e912968f18928)]
 - fix anchor color [nileshgulia1 - [`332d681`](https://github.com/eea/volto-forests-theme/commit/332d681a6e6683030cf02089aaa49d3fdb07c524)]
 - anchor color [nileshgulia1 - [`c981adb`](https://github.com/eea/volto-forests-theme/commit/c981adb70b34e526bc573d135c3b7999c1fe485e)]
-- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`6a7f316`](https://github.com/eea/volto-forests-theme/commit/6a7f3168c8e4e20df94f458bd8ff21d509db1dcd)]
 ### [0.1.11](https://github.com/eea/volto-forests-theme/compare/0.1.10...0.1.11) - 16 November 2021
 
 #### :hammer_and_wrench: Others
@@ -373,7 +385,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - add packages [nileshgulia1 - [`6523575`](https://github.com/eea/volto-forests-theme/commit/6523575f6e3b593d321420803efb17c584c8f2de)]
 - forest theme components and customisations [nileshgulia1 - [`5724a62`](https://github.com/eea/volto-forests-theme/commit/5724a62e1e9e7b072214fac200bd52e8b9fd5bc9)]
 - update readme [nileshgulia1 - [`1d8a9c2`](https://github.com/eea/volto-forests-theme/commit/1d8a9c24611c5b8fafa165070917e72b12967071)]
-- yarn bootstrap [nileshgulia1 - [`bba2bf9`](https://github.com/eea/volto-forests-theme/commit/bba2bf9de053a1631db3aece8466e2aca26e920a)]
 ### 0.1.0 - 3 November 2021
 
 #### :hammer_and_wrench: Others

Jenkinsfile

@@ -6,7 +6,7 @@ pipeline {
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu"
         DEPENDENCIES = ""
-        VOLTO = "16.0.0-alpha.14"
+        VOLTO = "alpha"
     }
 
   stages {
@@ -41,19 +41,19 @@ pipeline {
 
           "ES lint": {
             node(label: 'docker') {
-              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" plone/volto-addon-ci 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 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" plone/volto-addon-ci 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 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" plone/volto-addon-ci 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'''
             }
           }
         )
@@ -77,8 +77,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone/volto-addon-ci'''
-                  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" plone/volto-addon-ci'''
+                  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/'''
@@ -126,7 +126,7 @@ pipeline {
               script {
                 try {
                   sh '''docker pull eeacms/plone-backend; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend'''
-                  sh '''docker pull plone/volto-addon-ci; 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 NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci cypress'''
+                  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 NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci:alpha cypress'''
                 } finally {
                   try {
                     sh '''rm -rf cypress-reports cypress-results cypress-coverage'''

jest-addon.config.js

@@ -11,16 +11,14 @@ module.exports = {
     '@package/(.*)$': '<rootDir>/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
     '@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
-    'volto-slate/(.*)$': '<rootDir>/src/addons/volto-slate/src/$1',
+    '@plone/volto-slate':
+      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
   },
   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',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-forests-theme",
-  "version": "0.2.20",
+  "version": "0.2.21",
   "description": "@eeacms/volto-forests-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -34,7 +34,9 @@
     "react-highlight-words": "^0.16.0",
     "react-image-gallery": "1.2.7",
     "react-lazy-load-image-component": "^1.5.0",
-    "react-stickynode": "^2.1.1"
+    "react-stickynode": "^2.1.1",
+    "redux-connect": "10.0.0",
+    "@sentry/browser": "7.17.3"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",

src/components/manage/Blocks/ImageCards/View.jsx

@@ -3,7 +3,7 @@ import cx from 'classnames';
 import config from '@plone/volto/registry';
 import DefaultImageSVG from '@plone/volto/components/manage/Blocks/Listing/default-image.svg';
 import { Card, Message } from 'semantic-ui-react';
-import { serializeNodes } from 'volto-slate/editor/render';
+import { serializeNodes } from '@plone/volto-slate/editor/render';
 import { compose } from 'redux';
 import { flattenToAppURL } from '@plone/volto/helpers';
 import { withRouter } from 'react-router-dom';

src/constants/Layouts.js

@@ -1,5 +1,6 @@
-import layouts from '@plone/volto/constants/Layouts';
+import config from '@plone/volto/registry';
+
 export default {
-  ...layouts,
+  ...config.views.layoutViewsNamesMapping,
   country_tab_view: 'Country page',
 };

src/constants/runtime.js

@@ -1,4 +1,4 @@
-export const RAZZLE_FRONTEND_VERSION = 'eeacms/forests-frontend:2.4.3';
+export const RAZZLE_FRONTEND_VERSION = 'eeacms/forests-frontend:2.26.8';
 export const RAZZLE_FRONTEND_VERSION_URL =
-  'https://github.com/eea/forests-frontend/releases/tag/2.4.3';
-export const RAZZLE_FRONTEND_PUBLISHED_AT = '2021-06-18T15:15:04Z';
+  'https://github.com/eea/forests-frontend/releases/tag/2.26.8';
+export const RAZZLE_FRONTEND_PUBLISHED_AT = '2022-11-03T12:36:42Z';

src/customizations/volto/actions/content/content.js

@@ -13,6 +13,7 @@ import {
   UPDATECOLUMNS_CONTENT,
   LOCK_CONTENT,
   UNLOCK_CONTENT,
+  LINK_INTEGRITY_CHECK,
 } from '@plone/volto/constants/ActionTypes';
 import { nestContent } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
@@ -250,3 +251,14 @@ export function unlockContent(urls, force = false) {
           })),
   };
 }
+
+export function linkIntegrityCheck(selection) {
+  return {
+    type: LINK_INTEGRITY_CHECK,
+    mode: 'serial',
+    request: {
+      op: 'get',
+      path: '@linkintegrity?' + selection.map((uid) => `uids=${uid}`).join('&'),
+    },
+  };
+}