Take sources from eea core metadata

eea · Jan 13, 2023 · a46848d · a46848d
1 parent 2a96c25
commit a46848d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/src/Blocks/EmbedEEATableauBlock/View.jsx b/src/Blocks/EmbedEEATableauBlock/View.jsx
@@ -8,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;
 
@@ -25,10 +25,10 @@ const View = (props) => {
         <>
           <ConnectedTableau {...props.tableau_visualization} id={props.id} />
           {show_sources &&
-          props.data_provenance &&
-          props.data_provenance.data?.tableau_visualization_data.general?.url &&
-          props.tableau_visualization ? (
-            <Sources sources={props.data_provenance} />
+          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>
           ) : (

diff --git a/src/Sources/Sources.jsx b/src/Sources/Sources.jsx
@@ -21,18 +21,25 @@ const SourcesWidget = ({ sources }) => {
             title={expand ? 'Collapse' : 'Expand'}
             size="17px"
           />
-          Source:
+          Sources:
         </h3>
       </a>
       {expand && (
-        <li className="embed-source-param">
-          <UniversalLink
-            className="embed-sources-param-title"
-            href={sources?.data?.tableau_visualization_data?.general?.url}
-          >
-            {sources?.data?.tableau_visualization_data?.general?.url}
-          </UniversalLink>
-        </li>
+        <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>
   );