@eeacms/volto-tableau 4.1.0 → 5.0.0

package/CHANGELOG.md

@@ -4,11 +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).
 
-### [4.1.0](https://github.com/eea/volto-tableau/compare/4.0.0...4.1.0) - 15 June 2023
+### [5.0.0](https://github.com/eea/volto-tableau/compare/4.1.1...5.0.0) - 25 July 2023
+
+#### :nail_care: Enhancements
 
-#### :rocket: New Features
+- refactor: remove countup - refs #254634 [dobri1408 - [`8f08d1a`](https://github.com/eea/volto-tableau/commit/8f08d1ae5e4612a706cdb2f487db81b6b20a9c4f)]
+
+#### :hammer_and_wrench: Others
 
-- feat: improved tableau [Miu Razvan - [`4189653`](https://github.com/eea/volto-tableau/commit/41896533c23857cc4ffc9517b042b1066dfe590b)]
+- Release 5.0.0 [Alin Voinea - [`97c98e9`](https://github.com/eea/volto-tableau/commit/97c98e98b1295a4ad45756326dc20cd59517515f)]
+### [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)]
+### [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
 

package/Jenkinsfile

@@ -4,7 +4,7 @@ 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,industry.eea.europa.eu"
+        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,demo-www.eea.europa.eu,www.eea.europa.eu-en"
         DEPENDENCIES = ""
         VOLTO = ""
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-tableau",
-  "version": "4.1.0",
+  "version": "5.0.0",
   "description": "@eeacms/volto-tableau: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -32,9 +32,6 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "md5": "^2.3.0"
   },
-  "resolutions": {
-    "react-countup/countup.js": "2.5.0"
-  },
   "scripts": {
     "release": "release-it",
     "release-major-beta": "release-it major --preRelease=beta",

package/src/Views/VisualizationView.jsx

@@ -1,6 +1,8 @@
 import React from 'react';
+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 Tableau from '@eeacms/volto-tableau/Tableau/Tableau';
 
 const VisualizationView = (props) => {
@@ -9,18 +11,22 @@ const VisualizationView = (props) => {
 
   return (
     <Container id="page-document">
-      <Tableau
-        data={{
-          ...tableau_visualization,
-          with_sources: true,
-          with_download: true,
-          with_share: true,
-        }}
-        sources={data_provenance.data || []}
-        breakpoints={
-          config.blocks.blocksConfig.embed_tableau_visualization.breakpoints
-        }
-      />
+      {hasBlocksData(content) ? (
+        <RenderBlocks {...props} />
+      ) : (
+        <Tableau
+          data={{
+            ...tableau_visualization,
+            with_sources: true,
+            with_download: true,
+            with_share: true,
+          }}
+          sources={data_provenance.data || []}
+          breakpoints={
+            config.blocks.blocksConfig.embed_tableau_visualization.breakpoints
+          }
+        />
+      )}
     </Container>
   );
 };

package/src/Widgets/VisualizationViewWidget.jsx

@@ -0,0 +1,20 @@
+import Tableau from '@eeacms/volto-tableau/Tableau/Tableau';
+import config from '@plone/volto/registry';
+
+export default function VisualizationViewWidget(props) {
+  const { value = {} } = props;
+  return (
+    <Tableau
+      data={{
+        ...value,
+        with_sources: true,
+        with_download: true,
+        with_share: true,
+      }}
+      sources={[]}
+      breakpoints={
+        config.blocks.blocksConfig.embed_tableau_visualization.breakpoints
+      }
+    />
+  );
+}

package/src/Widgets/index.js

@@ -1,3 +1,4 @@
 import VisualizationWidget from './VisualizationWidget';
+import VisualizationViewWidget from './VisualizationViewWidget';
 
-export { VisualizationWidget };
+export { VisualizationWidget, VisualizationViewWidget };

package/src/index.js

@@ -1,6 +1,6 @@
 import installBlocks from './Blocks';
 import { VisualizationView } from './Views';
-import { VisualizationWidget } from './Widgets';
+import { VisualizationWidget, VisualizationViewWidget } from './Widgets';
 
 const applyConfig = (config) => {
   config.settings.allowed_cors_destinations = [
@@ -12,6 +12,7 @@ const applyConfig = (config) => {
 
   config.views.contentTypesViews.tableau_visualization = VisualizationView;
   config.widgets.id.tableau_visualization = VisualizationWidget;
+  config.widgets.views.id.tableau_visualization = VisualizationViewWidget;
 
   return [installBlocks].reduce((acc, apply) => apply(acc), config);
 };