feat: show embed error + always show sources

eea · Jan 16, 2024 · 35f5465 · 35f5465
1 parent 94cc865
commit 35f5465
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/components/Blocks/EmbedEEAMap/Edit.jsx b/src/components/Blocks/EmbedEEAMap/Edit.jsx
@@ -33,7 +33,6 @@ const Edit = (props) => {
     enable_queries,
     show_legend = true,
     show_note = true,
-    show_sources = true,
     show_more_info = true,
     show_share = true,
     dataprotection = { enabled: true },
@@ -66,7 +65,7 @@ const Edit = (props) => {
 
   useEffect(() => {
     const mapVisId = flattenToAppURL(map_visualization_data['@id'] || '');
-    if (vis_url && vis_url !== mapVisId) {
+    if (!map_visualization_data?.error && vis_url && vis_url !== mapVisId) {
       getContent(vis_url, null, id);
     }
     if (!vis_url) {
@@ -118,7 +117,7 @@ const Edit = (props) => {
               ...data,
               show_legend,
               show_note,
-              show_sources,
+              show_sources: true,
               show_more_info,
               show_share,
               dataprotection,

diff --git a/src/components/Blocks/EmbedEEAMap/Schema.js b/src/components/Blocks/EmbedEEAMap/Schema.js
@@ -86,7 +86,6 @@ export const Schema = (props) => {
           'show_legend',
           'show_viewer',
           'show_note',
-          'show_sources',
           'show_more_info',
           'show_share',
         ],

diff --git a/src/components/Blocks/EmbedEEAMap/View.jsx b/src/components/Blocks/EmbedEEAMap/View.jsx
@@ -13,7 +13,6 @@ const View = (props) => {
     enable_queries,
     show_legend = true,
     show_note = true,
-    show_sources = true,
     show_more_info = true,
     show_share = true,
     dataprotection = { enabled: true },
@@ -40,6 +39,12 @@ const View = (props) => {
     ? `${map_visualization_data.layers.map_layers[0].map_layer.map_service_url}?f=jsapi`
     : '';
 
+  if (map_visualization_data?.error) {
+    return (
+      <p dangerouslySetInnerHTML={{ __html: map_visualization_data.error }} />
+    );
+  }
+
   return (
     <PrivacyProtection
       className="embed-map-visualization"
@@ -54,7 +59,7 @@ const View = (props) => {
               ...data,
               show_legend,
               show_note,
-              show_sources,
+              show_sources: true,
               show_more_info,
               show_share,
               dataprotection,