@eeacms/volto-tableau 3.0.0 → 3.0.2

package/CHANGELOG.md

@@ -4,7 +4,19 @@ 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).
 
-### [3.0.0](https://github.com/eea/volto-tableau/compare/2.0.0...3.0.0) - 12 January 2023
+### [3.0.2](https://github.com/eea/volto-tableau/compare/3.0.1...3.0.2) - 13 January 2023
+
+#### :hammer_and_wrench: Others
+
+- Add version choice to widget [dana-cfc4 - [`0689e40`](https://github.com/eea/volto-tableau/commit/0689e403e4ef427f0996dedd718f6d095d8df33f)]
+- Take sources from eea core metadata [dana-cfc4 - [`a46848d`](https://github.com/eea/volto-tableau/commit/a46848d84bd12e39badad503429c768c15ef1631)]
+- Add data provenance [dana-cfc4 - [`2a96c25`](https://github.com/eea/volto-tableau/commit/2a96c254ae7c3b56423204fa3696c0c5093c1f88)]
+### [3.0.1](https://github.com/eea/volto-tableau/compare/3.0.0...3.0.1) - 13 January 2023
+
+#### :hammer_and_wrench: Others
+
+- helper comments [andreiggr - [`b13abfd`](https://github.com/eea/volto-tableau/commit/b13abfd3fe5813f872b98de66de63c98f4721c62)]
+## [3.0.0](https://github.com/eea/volto-tableau/compare/2.0.0...3.0.0) - 13 January 2023
 
 #### :hammer_and_wrench: Others
 
@@ -39,6 +51,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Update commands.js [Nilesh - [`7c48437`](https://github.com/eea/volto-tableau/commit/7c4843780efb9b85a4728de73c00d831c1d8fdcf)]
 - Update e2e.js [Nilesh - [`f67b45c`](https://github.com/eea/volto-tableau/commit/f67b45c170f58f8d0301192994226f173e4cb00a)]
 - latest volto compatibility refs #154757 [nileshgulia1 - [`881ba48`](https://github.com/eea/volto-tableau/commit/881ba482dc9b82e7fdac16549d41e80a6d26b3de)]
+- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`58e25df`](https://github.com/eea/volto-tableau/commit/58e25df2291add09670143bee54cde103ee835b9)]
 ### [1.3.0](https://github.com/eea/volto-tableau/compare/1.2.5...1.3.0) - 28 September 2022
 
 #### :hammer_and_wrench: Others
@@ -52,11 +65,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Use volto 16 alpha 14 [Miu Razvan - [`93641be`](https://github.com/eea/volto-tableau/commit/93641be4c2393f49008aff789400cf7c947949fd)]
 - Revert volto-tableau group to common [Andrei Grigore - [`9d24c6d`](https://github.com/eea/volto-tableau/commit/9d24c6d2767fed6a840cddaee55dbd5cecb544b5)]
 - Tableaugroup typo fix [Andrei Grigore - [`b0b5378`](https://github.com/eea/volto-tableau/commit/b0b5378a437043120a96c9e5e8802584145daa22)]
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`3234347`](https://github.com/eea/volto-tableau/commit/3234347e524cc0ed4918242f503fe9e7dba266b2)]
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`d237e1c`](https://github.com/eea/volto-tableau/commit/d237e1c72817d7e68a3eb698563674d1514db24f)]
 ### [1.2.4](https://github.com/eea/volto-tableau/compare/1.2.3...1.2.4) - 25 October 2021
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`2b19679`](https://github.com/eea/volto-tableau/commit/2b19679e2c7bcdc83082d1c73a595eea8b86d14f)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`384ccae`](https://github.com/eea/volto-tableau/commit/384ccaebed8c414a5c90eb96c6ce0a2b091f249c)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`589258e`](https://github.com/eea/volto-tableau/commit/589258e9b3cbba9cee37c57bb85ca5b707bc65d7)]
 ### [1.2.3](https://github.com/eea/volto-tableau/compare/1.2.2...1.2.3) - 14 June 2021
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/Blocks/EmbedEEATableauBlock/Edit.jsx

@@ -45,8 +45,7 @@ export default compose(
   connect(
     (state, props) => ({
       block_data: state.content.data,
-      data_provenance:
-        state.content.subrequests?.[props.id]?.data?.data_provenance,
+      data_provenance: state.content.subrequests?.[props.id]?.data_provenance,
     }),
     {
       getContent,

package/src/Blocks/EmbedEEATableauBlock/View.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import ConnectedTableau from '../../ConnectedTableau/ConnectedTableau';
+import { Sources } from '../../Sources';
 
 import { getContent } from '@plone/volto/actions';
 
@@ -7,7 +8,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 
 const View = (props) => {
-  const { data } = props || {};
+  const { data, data_provenance, tableau_visualization } = props || {};
   const { vis_url = '' } = data;
   const show_sources = data?.show_sources ?? false;
 
@@ -24,9 +25,10 @@ const View = (props) => {
         <>
           <ConnectedTableau {...props.tableau_visualization} id={props.id} />
           {show_sources &&
-          data.tableauSources &&
-          props.tableau_visualization ? (
-            ''
+          data_provenance &&
+          data_provenance?.data?.data_provenance &&
+          tableau_visualization ? (
+            <Sources sources={data_provenance.data.data_provenance} />
           ) : show_sources ? (
             <div>Data provenance is not set in the visualization</div>
           ) : (
@@ -43,8 +45,7 @@ const View = (props) => {
 export default compose(
   connect(
     (state, props) => ({
-      data_provenance:
-        state.content.subrequests?.[props.id]?.data?.data_provenance,
+      data_provenance: state.content.subrequests?.[props.id],
       tableau_visualization:
         state.content.subrequests?.[props.id]?.data?.tableau_visualization_data,
     }),

package/src/ConnectedTableau/ConnectedTableau.jsx

@@ -13,6 +13,7 @@ const ConnectedTableau = (props) => {
         setLoaded={setLoaded}
         data={{ ...props?.general, ...props?.options, ...props?.extraOptions }}
         url={props?.general?.url}
+        version={props?.general?.version}
       />
     </div>
   );

package/src/Sources/Sources.jsx

@@ -0,0 +1,48 @@
+/* eslint-disable jsx-a11y/no-static-element-interactions */
+/* eslint-disable jsx-a11y/click-events-have-key-events */
+/* eslint-disable jsx-a11y/anchor-is-valid */
+
+import React from 'react';
+import { UniversalLink, Icon } from '@plone/volto/components';
+
+import rightKeySVG from '@plone/volto/icons/right-key.svg';
+import downKeySVG from '@plone/volto/icons/down-key.svg';
+
+import './style.css';
+
+const SourcesWidget = ({ sources }) => {
+  const [expand, setExpand] = React.useState(true);
+  return (
+    <div>
+      <a className="embed-sources-header" onClick={() => setExpand(!expand)}>
+        <h3>
+          <Icon
+            name={expand ? downKeySVG : rightKeySVG}
+            title={expand ? 'Collapse' : 'Expand'}
+            size="17px"
+          />
+          Sources:
+        </h3>
+      </a>
+      {expand && (
+        <ul>
+          {sources &&
+            sources.data &&
+            sources.data.map((param, i) => (
+              <li key={i} className="embed-source-param">
+                <UniversalLink
+                  className="embed-sources-param-title"
+                  href={param.link}
+                >
+                  {param.title}
+                </UniversalLink>
+                , {param.organisation}
+              </li>
+            ))}
+        </ul>
+      )}
+    </div>
+  );
+};
+
+export default SourcesWidget;

package/src/Sources/index.js

@@ -0,0 +1,3 @@
+import Sources from './Sources';
+
+export { Sources };

package/src/Sources/style.css

@@ -0,0 +1,7 @@
+.embed-sources-header {
+  cursor: pointer;
+}
+
+.embed-sources-param-description {
+  margin-left: 5px;
+}

package/src/Widgets/schema.js

@@ -1,21 +1,41 @@
-const generalSchema = {
-  title: 'General',
+const generalSchema = (config) => {
+  return {
+    title: 'General',
 
-  fieldsets: [
-    {
-      id: 'general',
-      title: 'General',
-      fields: ['url'],
-    },
-  ],
+    fieldsets: [
+      {
+        id: 'general',
+        title: 'General',
+        fields: ['version', 'url'],
+      },
+    ],
 
-  properties: {
-    url: {
-      title: 'Url',
-      type: 'textarea',
+    properties: {
+      version: {
+        title: 'Version',
+        type: 'array',
+        choices: [
+          ...[
+            '2.8.0',
+            '2.7.0',
+            '2.6.0',
+            '2.5.0',
+            '2.4.0',
+            '2.3.0',
+            '2.2.2',
+            '2.1.2',
+            '2.0.3',
+          ].map((version) => [version, `tableau-${version}`]),
+        ],
+        default: config.settings.tableauVersion || '2.8.0',
+      },
+      url: {
+        title: 'Url',
+        type: 'textarea',
+      },
     },
-  },
-  required: ['url'],
+    required: ['url', 'version'],
+  };
 };
 
 const optionsSchema = {
@@ -158,7 +178,7 @@ export default (config) => {
         schemas: [
           {
             id: 'general',
-            schema: generalSchema,
+            schema: generalSchema(config),
           },
           {
             id: 'options',

package/src/helpers.js

@@ -25,16 +25,29 @@ const loadTableauScript = (callback, version) => {
 
 const isMyScriptLoaded = (version) => {
   //check for loaded Tableau script in dom scripts
-  var scripts = document.getElementsByTagName('script');
-  for (var i = scripts.length; i--; ) {
-    // eslint-disable-next-line eqeqeq
-    if (
-      scripts[i].src ===
-      `https://public.tableau.com/javascripts/api/tableau-${version}.min.js`
-    )
-      return true;
+  var scripts = __CLIENT__ && document.getElementsByTagName('script');
+  if (scripts) {
+    for (var i = scripts.length; i--; ) {
+      // eslint-disable-next-line eqeqeq
+      if (
+        scripts[i].src ===
+        `https://public.tableau.com/javascripts/api/tableau-${version}.min.js`
+      )
+        return true;
+    }
   }
   return false;
 };
 
 export { loadTableauScript, isMyScriptLoaded };
+
+//script url for each version. In case you might need to add them in the load balancer
+// https://public.tableau.com/javascripts/api/tableau-2.8.0.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.7.0.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.6.0.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.5.0.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.4.0.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.3.0.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.2.2.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.1.2.min.js
+// https://public.tableau.com/javascripts/api/tableau-2.0.3.min.js