@eeacms/volto-tableau 3.0.5 → 3.0.7

package/CHANGELOG.md

@@ -4,6 +4,21 @@ 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).
 
+### [3.0.7](https://github.com/eea/volto-tableau/compare/3.0.6...3.0.7) - 6 April 2023
+
+#### :nail_care: Enhancements
+
+- refactor(package.json): reorder dependencies and addons [Miu Razvan - [`6f1922e`](https://github.com/eea/volto-tableau/commit/6f1922e5c060c3808d8cbae46579cef0c90accb0)]
+
+#### :house: Internal changes
+
+- chore(Jenkinsfile): remove VOLTO variable from pipeline configuration [Miu Razvan - [`6fe1423`](https://github.com/eea/volto-tableau/commit/6fe14231c4d1c32a3b9310d68c18da341b749c7b)]
+
+#### :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
 
 #### :hammer_and_wrench: Others

package/Jenkinsfile

@@ -4,9 +4,8 @@ pipeline {
   environment {
         GIT_NAME = "volto-tableau"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,water.europa.eu-freshwater,water.europa.eu-marine"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,water.europa.eu-freshwater,water.europa.eu-marine,industry.eea.europa.eu"
         DEPENDENCIES = ""
-        VOLTO = "alpha"
     }
 
   stages {
@@ -41,19 +40,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" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha 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 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" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha 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 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" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha 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 prettier'''
             }
           }
         )
@@ -77,8 +76,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  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 '''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" -e VOLTO=$VOLTO plone/volto-addon-ci'''
                   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 +125,7 @@ pipeline {
               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 NODE_ENV=development -e VOLTO=$VOLTO plone/volto-addon-ci:alpha cypress'''
+                  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'''
                 } finally {
                   try {
                     sh '''rm -rf cypress-reports cypress-results cypress-coverage'''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-tableau",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "@eeacms/volto-tableau: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -18,13 +18,11 @@
   },
   "addons": [
     "@eeacms/volto-resize-helper",
-    "@eeacms/volto-embed",
-    "@eeacms/volto-block-style"
+    "@eeacms/volto-embed"
   ],
   "dependencies": {
-    "@eeacms/volto-resize-helper": "^0.2.4",
     "@eeacms/volto-embed": "5.0.0",
-    "@eeacms/volto-block-style": "4.1.0"
+    "@eeacms/volto-resize-helper": "^0.2.4"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",

package/src/Blocks/EmbedEEATableauBlock/Edit.jsx

@@ -5,9 +5,6 @@ import { getContent } from '@plone/volto/actions';
 import View from './View';
 import Schema from './schema';
 
-import { BlockStyleWrapperEdit } from '@eeacms/volto-block-style/BlockStyleWrapper';
-import cx from 'classnames';
-
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 
@@ -26,20 +23,7 @@ const Edit = (props) => {
   }, [block, data, onChangeBlock]);
 
   return (
-    <BlockStyleWrapperEdit
-      {...props}
-      role="presentation"
-      data={{
-        ...(props.data || {}),
-        styles: {
-          ...(props.data?.styles || {}),
-          customClass: cx(
-            props.data?.styles?.customClass || '',
-            'custom-embed-class',
-          ),
-        },
-      }}
-    >
+    <React.Fragment>
       <View {...props} data={data} id={id} mode="edit" />
       <SidebarPortal selected={props.selected}>
         <BlockDataForm
@@ -55,7 +39,7 @@ const Edit = (props) => {
           formData={data}
         />
       </SidebarPortal>
-    </BlockStyleWrapperEdit>
+    </React.Fragment>
   );
 };
 

package/src/Blocks/EmbedEEATableauBlock/View.jsx

@@ -3,9 +3,6 @@ import ConnectedTableau from '../../ConnectedTableau/ConnectedTableau';
 import { Sources } from '../../Sources';
 import { PrivacyProtection } from '@eeacms/volto-embed';
 
-import { StyleWrapperView } from '@eeacms/volto-block-style/StyleWrapper';
-import cx from 'classnames';
-
 import { getContent } from '@plone/volto/actions';
 
 import { connect } from 'react-redux';
@@ -25,14 +22,7 @@ const View = (props) => {
   }, [vis_url]);
 
   return (
-    <StyleWrapperView
-      {...props}
-      data={data}
-      styleData={{
-        ...data.styles,
-        customClass: cx(data.styles?.customClass || '', 'embed-container'),
-      }}
-    >
+    <div className="embed-container">
       <PrivacyProtection data={data} {...props}>
         {data?.vis_url ? (
           <>
@@ -63,7 +53,7 @@ const View = (props) => {
           <div>Please select a visualization from block editor.</div>
         )}
       </PrivacyProtection>
-    </StyleWrapperView>
+    </div>
   );
 };
 

package/src/DownloadExtras/TableauDownload.jsx

@@ -1,22 +1,64 @@
 import React from 'react';
-import { Popup, Button, Modal } from 'semantic-ui-react';
+import { Popup, Button, Modal, Dropdown } from 'semantic-ui-react';
 import { Icon } from '@plone/volto/components';
 import downloadSVG from '@plone/volto/icons/download.svg';
 
 const TableauDownload = (props) => {
-  const [open, setOpen] = React.useState(false);
   const viz = props.viz || {};
 
+  const [open, setOpen] = React.useState(false);
+  const [
+    isSheetSelectorCsvVisible,
+    setIsSheetSelectorCsvVisible,
+  ] = React.useState(false);
+  const [
+    isSheetSelectorExcelVisible,
+    setIsSheetSelectorExcelVisible,
+  ] = React.useState(false);
+  const [availableSheets, setAvailableSheets] = React.useState([]);
+
+  const initializeDropdown = () => {
+    const sheets = viz
+      ?.getWorkbook()
+      ?.getActiveSheet()
+      ?.getWorksheets()
+      .map((sheet, index) => ({
+        key: index,
+        text: sheet.getName(),
+        value: sheet.getName(),
+      }));
+    setAvailableSheets(sheets);
+  };
+
   const exportImage = () => {
+    setIsSheetSelectorCsvVisible(false);
+    setIsSheetSelectorExcelVisible(false);
     viz.showExportImageDialog();
   };
 
   const exportToCSV = () => {
-    viz.showExportCrossTabDialog();
+    setIsSheetSelectorExcelVisible(false);
+    initializeDropdown();
+    setIsSheetSelectorCsvVisible(true);
   };
 
   const exportToExcel = () => {
-    viz.exportCrossTabToExcel();
+    setIsSheetSelectorCsvVisible(false);
+    initializeDropdown();
+    setIsSheetSelectorExcelVisible(true);
+  };
+
+  const handleSheetSelectionCsvChange = (e, data) => {
+    viz.showExportCrossTabDialog(data.value);
+  };
+
+  const handleSheetSelectionExcelChange = (e, data) => {
+    viz.exportCrossTabToExcel(data.value);
+  };
+
+  const hideDropdowns = () => {
+    setIsSheetSelectorCsvVisible(false);
+    setIsSheetSelectorExcelVisible(false);
   };
 
   return (
@@ -28,7 +70,11 @@ const TableauDownload = (props) => {
         on="click"
         trigger={
           <div className="toolbar-button-wrapper">
-            <Button className="toolbar-button" title="Download">
+            <Button
+              className="toolbar-button"
+              title="Download"
+              onClick={hideDropdowns}
+            >
               <Icon name={downloadSVG} size="26px" />
             </Button>
             <span className="btn-text">Save</span>
@@ -40,7 +86,23 @@ const TableauDownload = (props) => {
           <p>Select your file format.</p>
           <Button onClick={exportImage}>Image</Button>
           <Button onClick={exportToCSV}>CSV</Button>
+          {isSheetSelectorCsvVisible ? (
+            <Dropdown
+              placeholder="Sheet"
+              selection
+              options={availableSheets}
+              onChange={handleSheetSelectionCsvChange}
+            />
+          ) : null}
           <Button onClick={exportToExcel}>Excel</Button>
+          {isSheetSelectorExcelVisible ? (
+            <Dropdown
+              placeholder="Sheet"
+              selection
+              options={availableSheets}
+              onChange={handleSheetSelectionExcelChange}
+            />
+          ) : null}
         </Popup.Content>
       </Popup>