@eeacms/volto-tableau 7.1.0 → 7.2.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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.2.0](https://github.com/eea/volto-tableau/compare/7.1.0...7.2.0) - 17 January 2024
+
+#### :rocket: New Features
+
+- feat: show embed error + always show sources [Razvan - [`c1df7a2`](https://github.com/eea/volto-tableau/commit/c1df7a221c427705e29bcd45d621666973e12edb)]
+
+#### :bug: Bug Fixes
+
+- fix: infinit requests patch [Razvan - [`9a9afa2`](https://github.com/eea/volto-tableau/commit/9a9afa2d73821c61d66044d5c44806ab060d3bd3)]
+
+#### :hammer_and_wrench: Others
+
+- Release 7.2.0 [Alin Voinea - [`7c0af33`](https://github.com/eea/volto-tableau/commit/7c0af336f63abfe5e25058a1ff1b07000a9a8c87)]
+- fix tests [Razvan - [`48f255a`](https://github.com/eea/volto-tableau/commit/48f255a7a437a909e018604fe81db8987b6bfe87)]
 ### [7.1.0](https://github.com/eea/volto-tableau/compare/7.0.5...7.1.0) - 13 December 2023
 
 #### :rocket: New Features

package/package.json

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

package/src/Blocks/EmbedTableauVisualization/View.jsx

@@ -41,7 +41,6 @@ const View = (props) => {
   } = props;
   const {
     with_notes = true,
-    with_sources = true,
     with_more_info = true,
     with_download = true,
     with_share = true,
@@ -135,7 +134,13 @@ const View = (props) => {
      * tableau visualization
      */
     const tableauVisId = flattenToAppURL(tableauVisualization['@id'] || '');
-    if (isBlock && tableau_vis_url && tableau_vis_url !== tableauVisId) {
+    if (
+      mode === 'edit' &&
+      !tableauVisualization.error &&
+      isBlock &&
+      tableau_vis_url &&
+      tableau_vis_url !== tableauVisId
+    ) {
       getContent(tableau_vis_url, null, id);
     }
   }, [id, isBlock, getContent, mode, tableau_vis_url, tableauVisualization]);
@@ -144,6 +149,12 @@ const View = (props) => {
     return <Message>Please select a tableau from block editor.</Message>;
   }
 
+  if (tableauVisualization?.error) {
+    return (
+      <p dangerouslySetInnerHTML={{ __html: tableauVisualization.error }} />
+    );
+  }
+
   return (
     <div className="embed-tableau">
       <PrivacyProtection
@@ -157,7 +168,7 @@ const View = (props) => {
             tableau_height:
               tableau_height || tableauVisualization.tableau_height,
             with_notes,
-            with_sources,
+            with_sources: true,
             with_more_info,
             with_download,
             with_share,

package/src/Blocks/EmbedTableauVisualization/__snapshots__/Edit.test.jsx.snap

@@ -154,14 +154,6 @@ Array [
                      - 
                     No description
                   </div>
-                  <div
-                    className="mocked-boolean-widget"
-                    id="mocked-field-with_sources"
-                  >
-                    Show sources
-                     - 
-                    Will show sources set in this page Data provenance
-                  </div>
                   <div
                     className="mocked-boolean-widget"
                     id="mocked-field-with_more_info"

package/src/Blocks/EmbedTableauVisualization/schema.js

@@ -83,7 +83,6 @@ export default (props) => {
         title: 'Toolbar',
         fields: [
           'with_notes',
-          'with_sources',
           'with_more_info',
           'with_download',
           'with_share',

package/src/Tableau/Tableau.jsx

@@ -118,6 +118,7 @@ const Tableau = forwardRef((props, ref) => {
     setVizState,
     onChangeBlock,
   } = props;
+
   const {
     data_provenance = {},
     figure_note = [],

package/src/Tableau/helpers.js

@@ -31,16 +31,21 @@ export function getTableauVisualization({
   tableauContent,
   content,
 }) {
-  const mergedContent = (isBlock ? tableauContent : content) || {};
-  const tableau_visualization =
+  const mergedContent =
     (isBlock
-      ? tableauContent?.tableau_visualization
-      : content?.tableau_visualization) ||
-    data?.tableau_visualization ||
-    {};
+      ? tableauContent
+      : {
+          ...content,
+          tableau_visualization: {
+            ...(content?.tableau_visualization || {}),
+            ...pickMetadata(content),
+          },
+        }) || {};
+  const tableau_visualization =
+    mergedContent?.tableau_visualization || data?.tableau_visualization || {};
   return {
-    ...pickMetadata(mergedContent),
     ...tableau_visualization,
+    ...(isBlock ? pickMetadata(mergedContent) : {}),
   };
 }