@eeacms/volto-tableau 8.0.7 → 8.1.1

package/CHANGELOG.md

@@ -4,6 +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).
 
+### [8.1.1](https://github.com/eea/volto-tableau/compare/8.1.0...8.1.1) - 11 October 2024
+
+#### :bug: Bug Fixes
+
+- fix: Increase wait time EEA Screenshooter when saving preview image - refs #277935 [dobri1408 - [`f9e5d01`](https://github.com/eea/volto-tableau/commit/f9e5d01033fd011c1b411b2cb3e271dfc140f19b)]
+
+### [8.1.0](https://github.com/eea/volto-tableau/compare/8.0.7...8.1.0) - 13 September 2024
+
+#### :hammer_and_wrench: Others
+
+- Update version [dobri1408 - [`dc7280a`](https://github.com/eea/volto-tableau/commit/dc7280ae0a99dd91af2c589715ee16a789eae9f9)]
+- Make an extra cleaning step  for the action [dobri1408 - [`cec9ff9`](https://github.com/eea/volto-tableau/commit/cec9ff98dde77a729c04339bac889463949f3d1c)]
 ### [8.0.7](https://github.com/eea/volto-tableau/compare/8.0.6...8.0.7) - 9 September 2024
 
 #### :house: Internal changes

package/cypress/e2e/block-tableau.cy.js

@@ -27,13 +27,18 @@ describe('Blocks Tests', () => {
   afterEach(slateAfterEach);
 
   it('Add Tableau block', () => {
+    cy.intercept('GET', `/**/*?expand*`, {
+      statusCode: 200,
+    }).as('content');
     // when I add a maps block
     cy.addNewBlock('tableau');
 
     cy.get(
       `.sidebar-container .field-wrapper-tableau_vis_url #field-tableau_vis_url`,
     ).type('/path/to/dashboard', { force: true });
+    cy.wait('@content');
     cy.get('#toolbar-save').click({ force: true });
+    cy.intercept('GET', `/**/*?expand*`).as('content');
     cy.wait('@content');
     cy.url().should('eq', Cypress.config().baseUrl + '/cypress/my-page');
   });

package/package.json

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

package/src/Tableau/Tableau.jsx

@@ -433,7 +433,7 @@ const Tableau = forwardRef((props, ref) => {
                 }
                 return v;
               });
-            if (value.length) {
+            if (value?.length) {
               workbook.changeParameterValueAsync(fieldName, value);
             }
           }

package/src/Widgets/VisualizationWidget.jsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { withRouter } from 'react-router';
 import { connect } from 'react-redux';
+import { injectIntl } from 'react-intl';
 import { compose } from 'redux';
 import { isEqual } from 'lodash';
 import { Modal, Button, Grid } from 'semantic-ui-react';
@@ -125,12 +126,16 @@ const VisualizationWidget = (props) => {
    * Get schema
    */
   React.useEffect(() => {
-    getSchema({ config, viz: viz.current, vizState, data: value }).then(
-      (schema) => {
-        setSchema(schema);
-      },
-    );
-  }, [vizState, value]);
+    getSchema({
+      config,
+      viz: viz.current,
+      vizState,
+      data: value,
+      intl: props.intl,
+    }).then((schema) => {
+      setSchema(schema);
+    });
+  }, [vizState, value, props.intl]);
 
   React.useEffect(() => {
     if (value && value.url && value.preview_url_loaded !== value.url) {
@@ -139,7 +144,7 @@ const VisualizationWidget = (props) => {
           '',
         )}/cors-proxy/https://screenshot.eea.europa.eu/api/v1/retrieve_image_for_url?url=${encodeURIComponent(
           value.url,
-        )}&w=1920&h=1000&waitfor=4000`,
+        )}&w=1920&h=1000&waitfor=8000`,
       )
         .then((e) => e.blob())
         .then((myBlob) => {
@@ -260,5 +265,6 @@ const VisualizationWidget = (props) => {
 
 export default compose(
   withRouter,
+  injectIntl,
   connect((state) => ({ content: state?.content?.data })),
 )(VisualizationWidget);

package/src/Widgets/schema.js

@@ -1,9 +1,21 @@
+import { defineMessages } from 'react-intl';
 import { find, includes } from 'lodash';
 import {
   getSheetnamesChoices,
   canChangeVizData,
 } from '@eeacms/volto-tableau/Tableau/helpers';
 
+const messages = defineMessages({
+  CSSHeight: {
+    id: 'CSS height',
+    defaultMessage: 'CSS height',
+  },
+  CSSTableauHeightDescription: {
+    id: 'Tableau height',
+    defaultMessage: 'Tableau height',
+  },
+});
+
 async function getUrlParametersSchema({ viz, vizState, data }) {
   const tableauParameters =
     vizState.loaded && viz ? await viz.getWorkbook().getParametersAsync() : [];
@@ -170,7 +182,7 @@ const breakpointUrlSchema = (config) => {
   };
 };
 
-const schema = async ({ config, viz, vizState, data }) => {
+const schema = async ({ config, viz, vizState, data, intl }) => {
   const isDisabled = !canChangeVizData(viz, vizState);
 
   return {
@@ -189,6 +201,7 @@ const schema = async ({ config, viz, vizState, data }) => {
           'hideTabs',
           'hideToolbar',
           'autoScale',
+          'tableau_height',
           'toolbarPosition',
           'breakpointUrls',
         ],
@@ -230,6 +243,18 @@ const schema = async ({ config, viz, vizState, data }) => {
         description: 'Scale down tableau according to width',
         isDisabled,
       },
+      tableau_height: {
+        title: (
+          <a
+            rel="noopener noreferrer"
+            target="_blank"
+            href="https://developer.mozilla.org/en-US/docs/Web/CSS/height"
+          >
+            {intl.formatMessage(messages.CSSHeight)}
+          </a>
+        ),
+        description: intl.formatMessage(messages.CSSTableauHeightDescription),
+      },
       toolbarPosition: {
         title: 'Toolbar position',
         choices: [

package/src/middlewares/preview_image.js

@@ -3,6 +3,33 @@ import {
   UPDATE_CONTENT,
 } from '@plone/volto/constants/ActionTypes';
 
+const cleanAction = (action) => {
+  if (action?.request?.data?.tableau_visualization) {
+    const tableauVisualizationData = {
+      ...action.request.data.tableau_visualization,
+    };
+
+    if (
+      tableauVisualizationData.preview &&
+      tableauVisualizationData.preview_url_loaded
+    )
+      delete tableauVisualizationData.preview;
+    delete tableauVisualizationData.preview_url_loaded;
+
+    return {
+      ...action,
+      request: {
+        ...action.request,
+        data: {
+          ...action.request.data,
+
+          tableau_visualization: tableauVisualizationData,
+        },
+      },
+    };
+  } else return action;
+};
+
 export const preview_image = (middlewares) => [
   (store) => (next) => (action) => {
     if (![CREATE_CONTENT, UPDATE_CONTENT].includes(action.type)) {
@@ -22,37 +49,14 @@ export const preview_image = (middlewares) => [
       contentData.preview_image_saved ||
       !action?.request?.data?.tableau_visualization?.preview
     ) {
-      return next(action);
+      return next(cleanAction(action));
     }
 
     if (
       lastPreviewImage &&
       lastPreviewImage !== 'preview_image_generated_tableau_visualization.png'
     ) {
-      if (action?.request?.data?.tableau_visualization) {
-        const tableauVisualizationData = {
-          ...action.request.data.tableau_visualization,
-        };
-
-        if (
-          tableauVisualizationData.preview &&
-          tableauVisualizationData.preview_url_loaded
-        )
-          delete tableauVisualizationData.preview;
-        delete tableauVisualizationData.preview_url_loaded;
-
-        return next({
-          ...action,
-          request: {
-            ...action.request,
-            data: {
-              ...action.request.data,
-
-              tableau_visualization: tableauVisualizationData,
-            },
-          },
-        });
-      } else return next(action);
+      return next(cleanAction(action));
     }
 
     try {