Add ConnectedTableau

eea · Jan 12, 2023 · d83417d · d83417d
1 parent f268b10
commit d83417d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/src/Blocks/EmbedEEATableauBlock/Edit.jsx b/src/Blocks/EmbedEEATableauBlock/Edit.jsx
@@ -20,14 +20,9 @@ const Edit = (props) => {
     }
   }, [block, data, onChangeBlock]);
 
-  React.useEffect(() => {
-    props.getContent(data.vis_url, null, id);
-    //  eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [data.vis_url]);
-
   return (
     <>
-      <View data={data} id={id} mode="edit" />
+      <View data={data} id={id} />
       <SidebarPortal selected={props.selected}>
         <BlockDataForm
           block={block}

diff --git a/src/Blocks/EmbedEEATableauBlock/View.jsx b/src/Blocks/EmbedEEATableauBlock/View.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import TableauView from '../../TableauBlock/View';
+import ConnectedTableau from '../../ConnectedTableau/ConnectedTableau';
+
 import { Sources } from '../../Sources';
 import { getContent } from '@plone/volto/actions';
 
@@ -18,13 +19,9 @@ const View = (props) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [vis_url]);
 
-  console.log(
-    props.tableau_visualization,
-    'tableau_visualization data here <====',
-  );
   return (
     <>
-      <TableauView {...props} />
+      <ConnectedTableau {...props.tableau_visualization} id={props.id} />
       {with_sources &&
         (props.mode !== 'edit' ? <Sources data={data.tableauSources} /> : '')}
     </>

diff --git a/src/ConnectedTableau/ConnectedTableau.jsx b/src/ConnectedTableau/ConnectedTableau.jsx
@@ -0,0 +1,15 @@
+import React from 'react';
+import Tableau from '@eeacms/volto-tableau/Tableau/View';
+
+const ConnectedTableau = (props) => {
+  return (
+    <div className="tableau-block">
+      <Tableau
+        data={{ ...props?.general, ...props?.options, ...props?.extraOptions }}
+        url={props?.general?.url}
+      />
+    </div>
+  );
+};
+
+export default ConnectedTableau;
diff --git a/src/Views/VisualizationView.jsx b/src/Views/VisualizationView.jsx
@@ -10,7 +10,7 @@ const VisualizationView = (props) => {
     return (
       <div className="tableau-block not_displayed_tableau">
         <div className="tableau-info">
-          {!tableau_visualization_data.general.url ? (
+          {!tableau_visualization_data.general?.url ? (
             <p className="tableau-error">URL required</p>
           ) : tableauError ? (
             <p className="tableau-error">{tableauError}</p>
@@ -23,7 +23,7 @@ const VisualizationView = (props) => {
   };
   return (
     <div>
-      {!tableau_visualization_data.general.url || tableauError ? (
+      {!tableau_visualization_data.general?.url || tableauError ? (
         <TableauNotDisplayed />
       ) : (
         ''