@eeacms/volto-tableau 7.0.0 → 7.0.2

package/CHANGELOG.md

@@ -4,7 +4,22 @@ 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).
 
-### [7.0.0](https://github.com/eea/volto-tableau/compare/6.0.6...7.0.0) - 23 November 2023
+### [7.0.2](https://github.com/eea/volto-tableau/compare/7.0.1...7.0.2) - 28 November 2023
+
+#### :bug: Bug Fixes
+
+- fix: fix error on missing value [kreafox - [`a19cf71`](https://github.com/eea/volto-tableau/commit/a19cf715a20b5b499436b98e09efdbc67ae9698b)]
+- fix: pass static parameters to tableau in widget view [kreafox - [`88a1911`](https://github.com/eea/volto-tableau/commit/88a191179be1074688924389fd4303aa3ace4c2f)]
+
+#### :hammer_and_wrench: Others
+
+- test: update tests [kreafox - [`7daa993`](https://github.com/eea/volto-tableau/commit/7daa9935518d16f0b609dc382ec220dbcb0253c2)]
+### [7.0.1](https://github.com/eea/volto-tableau/compare/7.0.0...7.0.1) - 24 November 2023
+
+#### :hammer_and_wrench: Others
+
+- update [Miu Razvan - [`e274b41`](https://github.com/eea/volto-tableau/commit/e274b416f65b446f0e2453e9f0ed6f4cdd27a3f6)]
+## [7.0.0](https://github.com/eea/volto-tableau/compare/6.0.6...7.0.0) - 23 November 2023
 
 #### :bug: Bug Fixes
 
@@ -25,12 +40,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test [Dobricean Ioan Dorian - [`48505ca`](https://github.com/eea/volto-tableau/commit/48505caef84d12091035fdd79cf64067e7f819e2)]
 - split the view and edit [Dobricean Ioan Dorian - [`7227bb1`](https://github.com/eea/volto-tableau/commit/7227bb1fb70e5d895f15872ed6533e089be99836)]
 - update embed tableau so it can work with serialized data [Dobricean Ioan Dorian - [`59d958c`](https://github.com/eea/volto-tableau/commit/59d958c7a1a5055ea62e04abcbf34ee93f52e23a)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`c452d70`](https://github.com/eea/volto-tableau/commit/c452d704819fb485e3cd3b39c2501361d20e8559)]
 ### [6.0.6](https://github.com/eea/volto-tableau/compare/6.0.5...6.0.6) - 17 November 2023
 
 #### :hammer_and_wrench: Others
 
 - tests: add cypress for tableau [nileshgulia1 - [`6eca683`](https://github.com/eea/volto-tableau/commit/6eca6834b85cdab4ed82367fee32fdbbb35b0f5e)]
 - tests: update unit tests [nileshgulia1 - [`96cae09`](https://github.com/eea/volto-tableau/commit/96cae09eab2e737f032c97eb401a3efa88e68ec6)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`c7e81cb`](https://github.com/eea/volto-tableau/commit/c7e81cb0768f755dd4107a4998253d9bccc33809)]
 - comment test [Miu Razvan - [`a459525`](https://github.com/eea/volto-tableau/commit/a459525fdccf8ee61651d4cb2e04eb253e841c61)]
 ### [6.0.5](https://github.com/eea/volto-tableau/compare/6.0.4...6.0.5) - 15 November 2023
 
@@ -57,6 +74,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`903b90a`](https://github.com/eea/volto-tableau/commit/903b90a2df0abc183aa68d99a89bb688de3a0c73)]
 
 #### :hammer_and_wrench: Others
 
@@ -66,6 +84,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - tests: increase coverage [kreafox - [`ecb9262`](https://github.com/eea/volto-tableau/commit/ecb92625a44365faf4c39f0ff3f02ccc4ca21656)]
 - Fix tableau height [kreafox - [`6194c24`](https://github.com/eea/volto-tableau/commit/6194c2405e2bd93aba9865caed76292cd55193d3)]
 - Show share & download button on widget view [kreafox - [`a66e253`](https://github.com/eea/volto-tableau/commit/a66e2537d08dc7129e249c28e1daa27246c88815)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`9d2189d`](https://github.com/eea/volto-tableau/commit/9d2189d4edb13dd449d75cd6dd9052bbed67304d)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`f2fa3f9`](https://github.com/eea/volto-tableau/commit/f2fa3f9ccabab918586179ac16ead44e2eba8498)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`5748183`](https://github.com/eea/volto-tableau/commit/5748183c27dae18a4ebbc067d659cbc24cad8f71)]
 - use toolbar from volto-embed [Miu Razvan - [`1a232a1`](https://github.com/eea/volto-tableau/commit/1a232a15f2bbe05da75307800590d0a0a1c4996b)]
 ## [6.0.0](https://github.com/eea/volto-tableau/compare/5.0.2...6.0.0) - 30 October 2023
 
@@ -123,6 +144,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test: change volto version in Jenkinsfile [ana-oprea - [`347aceb`](https://github.com/eea/volto-tableau/commit/347aceb07d152fddeebbf3a7e7a6ac9c55dc21ba)]
 - test: increase cypress timeout [ana-oprea - [`bdf4408`](https://github.com/eea/volto-tableau/commit/bdf44083cd84c96b4914d3f8a3bb17c5187f191c)]
 - test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`caff974`](https://github.com/eea/volto-tableau/commit/caff9742a703b224133a8dd2a969629e70c9fd33)]
+- test: Fix eslint and yarn i18n [Alin Voinea - [`b8be7fb`](https://github.com/eea/volto-tableau/commit/b8be7fb9ab10faed0a1be8ce7e3d4e7c78ebe020)]
 - i18n: Add en [Alin Voinea - [`c5e20dd`](https://github.com/eea/volto-tableau/commit/c5e20ddea25c830ac80665ee9a71e557e8cd117d)]
 - test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`2116ff9`](https://github.com/eea/volto-tableau/commit/2116ff95c6454e813bdca44e6c3aa81fa0a916b8)]
 ## [5.0.0](https://github.com/eea/volto-tableau/compare/4.1.1...5.0.0) - 25 July 2023
@@ -134,17 +156,21 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Release 5.0.0 [Alin Voinea - [`97c98e9`](https://github.com/eea/volto-tableau/commit/97c98e98b1295a4ad45756326dc20cd59517515f)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`2acb3a5`](https://github.com/eea/volto-tableau/commit/2acb3a5490f62ce0a95ebbd03c32874ac3a42603)]
 ### [4.1.1](https://github.com/eea/volto-tableau/compare/4.1.0...4.1.1) - 21 July 2023
 
 #### :hammer_and_wrench: Others
 
 - Add VisualizationViewWidget [Tiberiu Ichim - [`fa881cb`](https://github.com/eea/volto-tableau/commit/fa881cbc3643a46697fb16d1c86ada1d4121a46a)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`cbcbad2`](https://github.com/eea/volto-tableau/commit/cbcbad26f7aa3683122199c8d5cbd142903df93b)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`51abe6d`](https://github.com/eea/volto-tableau/commit/51abe6d4db80825fe2e396e04c7003c6ad79b480)]
 ### [4.1.0](https://github.com/eea/volto-tableau/compare/4.0.0...4.1.0) - 15 June 2023
 
 ## [4.0.0](https://github.com/eea/volto-tableau/compare/3.0.8...4.0.0) - 13 June 2023
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`e33bb21`](https://github.com/eea/volto-tableau/commit/e33bb21eb429c33e3a15d771487a1c9af8ccb0d5)]
 
 #### :hammer_and_wrench: Others
 
@@ -176,6 +202,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`f5deccd`](https://github.com/eea/volto-tableau/commit/f5deccd84372752908b300c5cfd78134818e5ce4)]
 ### [3.0.6](https://github.com/eea/volto-tableau/compare/3.0.5...3.0.6) - 30 January 2023
 
 ### [3.0.5](https://github.com/eea/volto-tableau/compare/3.0.4...3.0.5) - 26 January 2023
@@ -247,6 +274,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Update commands.js [Nilesh - [`7c48437`](https://github.com/eea/volto-tableau/commit/7c4843780efb9b85a4728de73c00d831c1d8fdcf)]
 - Update e2e.js [Nilesh - [`f67b45c`](https://github.com/eea/volto-tableau/commit/f67b45c170f58f8d0301192994226f173e4cb00a)]
 - latest volto compatibility refs #154757 [nileshgulia1 - [`881ba48`](https://github.com/eea/volto-tableau/commit/881ba482dc9b82e7fdac16549d41e80a6d26b3de)]
+- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`58e25df`](https://github.com/eea/volto-tableau/commit/58e25df2291add09670143bee54cde103ee835b9)]
 ### [1.3.0](https://github.com/eea/volto-tableau/compare/1.2.5...1.3.0) - 28 September 2022
 
 #### :hammer_and_wrench: Others
@@ -260,11 +288,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Use volto 16 alpha 14 [Miu Razvan - [`93641be`](https://github.com/eea/volto-tableau/commit/93641be4c2393f49008aff789400cf7c947949fd)]
 - Revert volto-tableau group to common [Andrei Grigore - [`9d24c6d`](https://github.com/eea/volto-tableau/commit/9d24c6d2767fed6a840cddaee55dbd5cecb544b5)]
 - Tableaugroup typo fix [Andrei Grigore - [`b0b5378`](https://github.com/eea/volto-tableau/commit/b0b5378a437043120a96c9e5e8802584145daa22)]
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`3234347`](https://github.com/eea/volto-tableau/commit/3234347e524cc0ed4918242f503fe9e7dba266b2)]
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`d237e1c`](https://github.com/eea/volto-tableau/commit/d237e1c72817d7e68a3eb698563674d1514db24f)]
 ### [1.2.4](https://github.com/eea/volto-tableau/compare/1.2.3...1.2.4) - 25 October 2021
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2b19679`](https://github.com/eea/volto-tableau/commit/2b19679e2c7bcdc83082d1c73a595eea8b86d14f)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`384ccae`](https://github.com/eea/volto-tableau/commit/384ccaebed8c414a5c90eb96c6ce0a2b091f249c)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`589258e`](https://github.com/eea/volto-tableau/commit/589258e9b3cbba9cee37c57bb85ca5b707bc65d7)]
 ### [1.2.3](https://github.com/eea/volto-tableau/compare/1.2.2...1.2.3) - 14 June 2021
 
 #### :hammer_and_wrench: Others

package/Jenkinsfile

@@ -248,33 +248,33 @@ pipeline {
       }
     }
 
-    stage('SonarQube compare to master') {
-      when {
-        anyOf {
-          allOf {
-            not { environment name: 'CHANGE_ID', value: '' }
-            environment name: 'CHANGE_TARGET', value: 'develop'
-          }
-          allOf {
-            environment name: 'CHANGE_ID', value: ''
-            branch 'develop'
-            not { changelog '.*^Automated release [0-9\\.]+$' }
-          }
-        }
-      }
-      steps {
-        script {
-          sh '''echo "Error" > checkresult.txt'''
-          catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-            sh '''set -o pipefail; docker run -i --rm --pull always --name="$IMAGE_NAME-gitflow-sn" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" eeacms/gitflow /checkSonarqubemaster.sh | grep -v "Found script" | tee checkresult.txt'''
-          }
+    // stage('SonarQube compare to master') {
+    //   when {
+    //     anyOf {
+    //       allOf {
+    //         not { environment name: 'CHANGE_ID', value: '' }
+    //         environment name: 'CHANGE_TARGET', value: 'develop'
+    //       }
+    //       allOf {
+    //         environment name: 'CHANGE_ID', value: ''
+    //         branch 'develop'
+    //         not { changelog '.*^Automated release [0-9\\.]+$' }
+    //       }
+    //     }
+    //   }
+    //   steps {
+    //     script {
+    //       sh '''echo "Error" > checkresult.txt'''
+    //       catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+    //         sh '''set -o pipefail; docker run -i --rm --pull always --name="$IMAGE_NAME-gitflow-sn" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" eeacms/gitflow /checkSonarqubemaster.sh | grep -v "Found script" | tee checkresult.txt'''
+    //       }
 
-          publishChecks name: 'SonarQube', title: 'Sonarqube Code Quality Check', summary: 'Quality check on the SonarQube metrics from branch develop, comparing it with the ones from master branch. No bugs are allowed',
-                        text: readFile(file: 'checkresult.txt'), conclusion: "${currentBuild.currentResult}",
-                        detailsURL: "${env.BUILD_URL}display/redirect"
-        }
-      }
-    }
+    //       publishChecks name: 'SonarQube', title: 'Sonarqube Code Quality Check', summary: 'Quality check on the SonarQube metrics from branch develop, comparing it with the ones from master branch. No bugs are allowed',
+    //                     text: readFile(file: 'checkresult.txt'), conclusion: "${currentBuild.currentResult}",
+    //                     detailsURL: "${env.BUILD_URL}display/redirect"
+    //     }
+    //   }
+    // }
 
     stage('Pull Request') {
       when {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-tableau",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "description": "@eeacms/volto-tableau: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -75,4 +75,4 @@
     "cypress:open": "make cypress-open",
     "prepare": "husky install"
   }
-}
+}

package/src/Blocks/EmbedTableauVisualization/View.jsx

@@ -51,8 +51,6 @@ const View = (props) => {
     }
   }, [id, isBlock, getContent, mode, tableau_vis_url, tableau_visualization]);
 
-  const { figure_note = [], data_provenance = {} } = tableau_visualization;
-
   if (props.mode === 'edit' && !tableau_vis_url) {
     return <Message>Please select a tableau from block editor.</Message>;
   }
@@ -75,8 +73,6 @@ const View = (props) => {
             tableau_height,
             tableau_vis_url,
           }}
-          figure_note={figure_note}
-          sources={data_provenance?.data || []}
         />
       </PrivacyProtection>
     </div>

package/src/Blocks/EmbedTableauVisualization/index.js

@@ -6,7 +6,7 @@ import sliderSVG from '@plone/volto/icons/slider.svg';
 export default (config) => {
   config.blocks.blocksConfig.embed_tableau_visualization = {
     id: 'embed_tableau_visualization',
-    title: 'Embed EEA Tableau visualization',
+    title: 'Embed Dashboard (Tableau)',
     icon: sliderSVG,
     group: 'common',
     edit: EmbedTableauVisualizatonEdit,

package/src/Blocks/TableauBlock/View.jsx

@@ -29,7 +29,7 @@ const View = React.forwardRef((props, ref) => {
   const extraOptions = React.useMemo(() => {
     const options = {};
     staticParameters.forEach((parameter) => {
-      if (parameter.field) {
+      if (parameter.field && parameter.value) {
         options[parameter.field] = parameter.value;
       }
     });

package/src/Tableau/Tableau.jsx

@@ -89,20 +89,19 @@ const Tableau = forwardRef((props, ref) => {
     extraOptions = {},
     mode = 'view',
     screen = {},
-    figure_note = [],
-    sources,
     version = '2.8.0',
     setVizState,
     onChangeBlock,
   } = props;
   const {
+    data_provenance = {},
+    figure_note = [],
     autoScale = false,
     hideTabs = false,
     hideToolbar = false,
     sheetname = '',
     toolbarPosition = 'Top',
     breakpointUrls = [],
-    tableau_vis_url,
     with_notes = true,
     with_sources = true,
     with_more_info = true,
@@ -317,14 +316,14 @@ const Tableau = forwardRef((props, ref) => {
   };
 
   const updateScale = () => {
-    const tableauEl = vizEl.current.querySelector('iframe');
+    const iframe = vizEl.current.querySelector('iframe');
     const { sheetSize = {} } = viz.current.getVizSize() || {};
     const vizWidth = sheetSize?.minSize?.width || 1;
     const scale = Math.min(vizEl.current.clientWidth / vizWidth, 1);
-    tableauEl.style.transform = `scale(${scale})`;
+    iframe.style.transform = `scale(${scale})`;
     window.requestAnimationFrame(() => {
       if (vizEl.current) {
-        vizEl.current.style.height = `${scale * tableauEl.clientHeight}px`;
+        vizEl.current.style.height = `${scale * iframe.clientHeight}px`;
       }
     });
   };
@@ -441,9 +440,9 @@ const Tableau = forwardRef((props, ref) => {
       {loaded && (
         <div className={cx('visualization-toolbar', { mobile })}>
           <div className="left-col">
-            {with_notes && <FigureNote note={figure_note || []} />}
-            {with_sources && <Sources sources={sources} />}
-            {with_more_info && <MoreInfo href={tableau_vis_url || data.url} />}
+            {with_notes && <FigureNote notes={figure_note || []} />}
+            {with_sources && <Sources sources={data_provenance?.data || []} />}
+            {with_more_info && <MoreInfo href={data['@id']} />}
           </div>
           <div className="right-col">
             {with_enlarge && loaded && (
@@ -463,9 +462,7 @@ const Tableau = forwardRef((props, ref) => {
               </Enlarge>
             )}
             {with_download && loaded && <Download viz={viz.current} />}
-            {with_share && loaded && (
-              <Share href={tableau_vis_url || data.url} />
-            )}
+            {with_share && loaded && <Share href={data['@id']} />}
           </div>
         </div>
       )}

package/src/Views/VisualizationView.jsx

@@ -3,6 +3,7 @@ import { hasBlocksData } from '@plone/volto/helpers';
 import { Container } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+import { pickMetadata } from '@eeacms/volto-embed/helpers';
 import Tableau from '@eeacms/volto-tableau/Tableau/Tableau';
 
 const VisualizationView = (props) => {
@@ -17,6 +18,7 @@ const VisualizationView = (props) => {
         <Tableau
           data={{
             ...tableau_visualization,
+            ...pickMetadata(content),
             with_notes: false,
             with_sources: false,
             with_more_info: false,

package/src/Widgets/VisualizationViewWidget.jsx

@@ -1,13 +1,27 @@
-import Tableau from '@eeacms/volto-tableau/Tableau/Tableau';
+import React from 'react';
+import { connect } from 'react-redux';
 import config from '@plone/volto/registry';
+import { pickMetadata } from '@eeacms/volto-embed/helpers';
+import Tableau from '@eeacms/volto-tableau/Tableau/Tableau';
 
-export default function VisualizationViewWidget(props) {
-  const { value = {} } = props;
+function VisualizationViewWidget(props) {
+  const { staticParameters = [] } = props.value;
+
+  const extraOptions = React.useMemo(() => {
+    const options = {};
+    staticParameters.forEach((parameter) => {
+      if (parameter.field && parameter.value) {
+        options[parameter.field] = parameter.value;
+      }
+    });
+    return options;
+  }, [staticParameters]);
 
   return (
     <Tableau
       data={{
-        ...value,
+        ...(props.value || {}),
+        ...pickMetadata(props.content),
         with_notes: false,
         with_sources: false,
         with_more_info: false,
@@ -15,9 +29,14 @@ export default function VisualizationViewWidget(props) {
         with_enlarge: true,
         with_download: true,
       }}
+      extraOptions={extraOptions}
       breakpoints={
         config.blocks.blocksConfig?.embed_tableau_visualization?.breakpoints
       }
     />
   );
 }
+
+export default connect((state) => ({ content: state.content.data }))(
+  VisualizationViewWidget,
+);

package/src/Widgets/VisualizationViewWidget.test.jsx

@@ -6,13 +6,19 @@ import configureStore from 'redux-mock-store';
 import VisualizationViewWidget from './VisualizationViewWidget';
 
 const mockStore = configureStore([]);
-const store = mockStore({});
+const store = mockStore({
+  content: { data: {} },
+});
 
 jest.mock('@plone/volto/components', () => ({
   Icon: ({ children }) => <img alt="incon">{children}</img>,
   Toast: ({ children }) => <p>{children}</p>,
 }));
 
+jest.mock('@eeacms/volto-embed/helpers', () => ({
+  pickMetadata: (data) => data,
+}));
+
 describe('VisualizationViewWidget', () => {
   it('should render the component', () => {
     const data = {
@@ -23,9 +29,13 @@ describe('VisualizationViewWidget', () => {
       with_share: true,
     };
 
+    const value = {
+      staticParameters: [],
+    };
+
     const { container } = render(
       <Provider store={store}>
-        <VisualizationViewWidget data={data} />
+        <VisualizationViewWidget data={data} value={value} />
       </Provider>,
     );
     expect(container.querySelector('.tableau-wrapper')).toBeInTheDocument();

package/src/Widgets/VisualizationWidget.jsx

@@ -24,7 +24,7 @@ const VisualizationWidget = (props) => {
   const extraOptions = React.useMemo(() => {
     const options = {};
     (value.staticParameters || []).forEach((parameter) => {
-      if (parameter.field) {
+      if (parameter.field && parameter.value) {
         options[parameter.field] = parameter.value;
       }
     });