@eeacms/volto-tableau 6.0.3 → 6.0.5

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).
 
-### [6.0.3](https://github.com/eea/volto-tableau/compare/6.0.2...6.0.3) - 10 November 2023
+### [6.0.5](https://github.com/eea/volto-tableau/compare/6.0.4...6.0.5) - 15 November 2023
 
-#### :hammer_and_wrench: Others
+#### :rocket: New Features
+
+- feat: add enlarge option for tableau [kreafox - [`4af7c29`](https://github.com/eea/volto-tableau/commit/4af7c29462302b318a5d24118288ef982cc1cd1c)]
+
+### [6.0.4](https://github.com/eea/volto-tableau/compare/6.0.3...6.0.4) - 15 November 2023
+
+#### :bug: Bug Fixes
+
+- fix: disabled tableau url field [kreafox - [`3bb8273`](https://github.com/eea/volto-tableau/commit/3bb827306704541826090b2c718399b352e44feb)]
+- fix: set default height [kreafox - [`586cbb3`](https://github.com/eea/volto-tableau/commit/586cbb3836fe1578ec0331d96b782dbce0b367f2)]
+
+### [6.0.3](https://github.com/eea/volto-tableau/compare/6.0.2...6.0.3) - 10 November 2023
 
-- fix tableau for real this time [Miu Razvan - [`a304c2c`](https://github.com/eea/volto-tableau/commit/a304c2cce2a68cfa6b1123a853cfda0b57501ab3)]
 ### [6.0.2](https://github.com/eea/volto-tableau/compare/6.0.1...6.0.2) - 10 November 2023
 
 #### :rocket: New Features

package/package.json

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

package/src/Blocks/EmbedTableauVisualization/View.jsx

@@ -14,7 +14,8 @@ const View = (props) => {
     with_more_info = true,
     with_download = true,
     with_share = true,
-    tableau_height,
+    with_enlarge = true,
+    tableau_height = 700,
   } = data;
   const { figure_note = [], data_provenance = {}, tableau_visualization } =
     props.tableau_visualization_data || {};
@@ -51,6 +52,7 @@ const View = (props) => {
                   with_more_info,
                   with_download,
                   with_share,
+                  with_enlarge,
                   tableau_height,
                   tableau_vis_url,
                 }}

package/src/Blocks/EmbedTableauVisualization/schema.js

@@ -58,6 +58,7 @@ export default () => {
           'with_more_info',
           'with_download',
           'with_share',
+          'with_enlarge',
         ],
       },
       {
@@ -87,6 +88,11 @@ export default () => {
         type: 'boolean',
         defaultValue: true,
       },
+      with_enlarge: {
+        title: 'Show enlarge button',
+        type: 'boolean',
+        defaultValue: true,
+      },
       with_download: {
         title: 'Show download button',
         type: 'boolean',

package/src/Blocks/TableauBlock/View.jsx

@@ -22,6 +22,7 @@ const View = React.forwardRef((props, ref) => {
     with_sources = true,
     with_download = true,
     with_share = true,
+    with_enlarge = true,
     sources,
   } = data;
 
@@ -75,7 +76,13 @@ const View = React.forwardRef((props, ref) => {
         ref={viz}
         mode={mode}
         block={block}
-        data={{ ...data, with_sources, with_download, with_share }}
+        data={{
+          ...data,
+          with_sources,
+          with_download,
+          with_share,
+          with_enlarge,
+        }}
         sources={sources}
         extraFilters={extraFilters}
         extraOptions={extraOptions}

package/src/Blocks/TableauBlock/schema.js

@@ -100,6 +100,7 @@ export default (config, viz, vizState) => {
           'with_sources',
           'with_download',
           'with_share',
+          'with_enlarge',
         ],
       },
       {
@@ -128,7 +129,6 @@ export default (config, viz, vizState) => {
       url: {
         title: 'Url',
         widget: 'textarea',
-        isDisabled,
       },
       title: {
         title: 'Title',
@@ -148,6 +148,11 @@ export default (config, viz, vizState) => {
         type: 'boolean',
         defaultValue: true,
       },
+      with_enlarge: {
+        title: 'Show enlarge button',
+        type: 'boolean',
+        defaultValue: true,
+      },
       with_sources: {
         title: 'Show sources',
         type: 'boolean',

package/src/Tableau/Tableau.jsx

@@ -19,6 +19,7 @@ import {
   Sources,
   MoreInfo,
   Share,
+  Enlarge,
 } from '@eeacms/volto-embed/Toolbar';
 import { useTableau } from '@eeacms/volto-tableau/hooks';
 import { JsonCodeSnippet, Download } from '@eeacms/volto-tableau/Utils';
@@ -107,7 +108,8 @@ const Tableau = forwardRef((props, ref) => {
     with_more_info = true,
     with_download = true,
     with_share = true,
-    tableau_height,
+    with_enlarge = true,
+    tableau_height = 700,
   } = data;
   const device = useMemo(
     () => getDevice(breakpoints, screen.page?.width || Infinity),
@@ -430,7 +432,7 @@ const Tableau = forwardRef((props, ref) => {
         clearData={clearData}
       />
       <div
-        style={{ height: tableau_height ? tableau_height + 'px' : '100%' }}
+        style={{ height: tableau_height + 'px' }}
         className={cx('tableau', `tableau-${version}`, {
           'tableau-autoscale': autoScale,
         })}
@@ -444,6 +446,22 @@ const Tableau = forwardRef((props, ref) => {
             {with_more_info && <MoreInfo href={tableau_vis_url || data.url} />}
           </div>
           <div className="right-col">
+            {with_enlarge && loaded && (
+              <Enlarge>
+                <Tableau
+                  {...props}
+                  data={{
+                    ...props.data,
+                    with_notes: false,
+                    with_sources: false,
+                    with_more_info: false,
+                    with_enlarge: false,
+                    with_share: false,
+                    with_download: false,
+                  }}
+                />
+              </Enlarge>
+            )}
             {with_download && loaded && <Download viz={viz.current} />}
             {with_share && loaded && (
               <Share href={tableau_vis_url || data.url} />

package/src/Views/VisualizationView.jsx

@@ -21,6 +21,7 @@ const VisualizationView = (props) => {
             with_sources: false,
             with_more_info: false,
             with_share: false,
+            with_enlarge: false,
             with_download: true,
           }}
           breakpoints={

package/src/Widgets/VisualizationViewWidget.jsx

@@ -10,8 +10,9 @@ export default function VisualizationViewWidget(props) {
         ...value,
         with_notes: false,
         with_sources: false,
-        with_more_info: true,
+        with_more_info: false,
         with_share: true,
+        with_enlarge: true,
         with_download: true,
       }}
       breakpoints={

package/src/Widgets/VisualizationWidget.jsx

@@ -78,6 +78,7 @@ const VisualizationWidget = (props) => {
                   with_sources: false,
                   with_more_info: false,
                   with_share: false,
+                  with_enlarge: false,
                   with_download: false,
                 }}
                 mode="edit"
@@ -127,6 +128,7 @@ const VisualizationWidget = (props) => {
           with_sources: false,
           with_more_info: false,
           with_share: false,
+          with_enlarge: false,
           with_download: false,
         }}
         breakpoints={

package/src/Widgets/schema.js

@@ -93,7 +93,6 @@ export default (config, viz, vizState) => {
       url: {
         title: 'Url',
         widget: 'textarea',
-        isDisabled,
       },
       sheetname: {
         title: 'Sheetname',