Merge pull request #23 from eea/develop

Fix link slate - Refs#254128

CHANGELOG.md

@@ -4,11 +4,18 @@ 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).
 
-### [2.0.14](https://github.com/eea/volto-industry-theme/compare/2.0.13...2.0.14) - 5 April 2023
+### [2.0.15](https://github.com/eea/volto-industry-theme/compare/2.0.14...2.0.15) - 4 July 2023
+
+#### :house: Internal changes
 
-#### :nail_care: Enhancements
+- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`290f048`](https://github.com/eea/volto-industry-theme/commit/290f048c13aeafdeba34f49d38cf1fb48569a318)]
 
-- refactor(package.json): simplify scripts by using make commands instead of direct paths to executables [Miu Razvan - [`cbfb89d`](https://github.com/eea/volto-industry-theme/commit/cbfb89d286b97be72401079eee5c70ee73b79879)]
+#### :hammer_and_wrench: Others
+
+- fix slate link [Miu Razvan - [`1599759`](https://github.com/eea/volto-industry-theme/commit/15997596db5f667c34c88bda963908441b79d067)]
+- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`65dc3b5`](https://github.com/eea/volto-industry-theme/commit/65dc3b598445094a20ac46c502d4ba375cad1569)]
+- test: Fix test config, coverage Refs #253277 [valentinab25 - [`4382843`](https://github.com/eea/volto-industry-theme/commit/4382843739d4d51b97a87039d49f0e00698eab3c)]
+### [2.0.14](https://github.com/eea/volto-industry-theme/compare/2.0.13...2.0.14) - 5 April 2023
 
 #### :house: Internal changes
 

Jenkinsfile

@@ -6,6 +6,7 @@ pipeline {
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "volto.eea.europa.eu,industry.eea.europa.eu"
         DEPENDENCIES = ""
+        VOLTO = ""
     }
 
   stages {
@@ -187,6 +188,7 @@ pipeline {
             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 '''sed -i "s#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'''
             }

jest-addon.config.js

@@ -5,19 +5,19 @@ module.exports = {
     '!src/**/*.d.ts',
   ],
   moduleNameMapper: {
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
     '@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',
     '@package/(.*)$': '<rootDir>/src/$1',
     '@root/(.*)$': '<rootDir>/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
-    '@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
+    '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
     '@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',
-    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
   },
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-industry-theme",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "@eeacms/volto-industry-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withRouter } from 'react-router';
-import Tableau from '@eeacms/volto-tableau/Tableau/View';
+import Tableau from '@eeacms/volto-tableau/Tableau/Tableau';
 import config from '@plone/volto/registry';
 import { connectToProviderData } from '@eeacms/volto-datablocks/hocs';
 import qs from 'querystring';

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withRouter } from 'react-router';
-import Tableau from '@eeacms/volto-tableau/Tableau/View';
+import Tableau from '@eeacms/volto-tableau/Tableau/Tableau';
 import config from '@plone/volto/registry';
 import qs from 'querystring';
 import '@eeacms/volto-tableau/less/tableau.less';

src/index.js

@@ -7,6 +7,7 @@ import {
   installAppExtras,
 } from '@eeacms/volto-industry-theme/components';
 import addonReducers from '@eeacms/volto-industry-theme/reducers';
+import installLink from '@plone/volto-slate/editor/plugins/AdvancedLink';
 
 import iconC from '@eeacms/volto-columns-block/ColumnsBlock/icons/one-third-right.svg';
 
@@ -30,6 +31,8 @@ const applyConfig = (config) => {
     ],
   };
 
+  config = installLink(config);
+
   config.blocks.groupBlocksOrder = [
     ...config.blocks.groupBlocksOrder,
     { id: 'eprtr_blocks', title: 'Eprtr Blocks' },