Merge pull request #88 from eea/develop

fix(DataFigure): Edit Data sources and Institutional Mandate - refs #…
eea · Apr 11, 2022 · 92039e9 · 92039e9
2 parents 8d980b7 + e3d2380
commit 92039e9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,15 @@ 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).
 
+#### [4.6.2](https://github.com/eea/volto-block-data-figure/compare/4.6.1...4.6.2)
+
+- fix(DataFigure): Edit Data sources and Institutional Mandate - refs #144026 [`28fa6b1`](https://github.com/eea/volto-block-data-figure/commit/28fa6b1bee140fbb92db6453e9d07cc383b0c241)
+
 #### [4.6.1](https://github.com/eea/volto-block-data-figure/compare/4.6.0...4.6.1)
 
-- Fix: Close figure sidebars when clicking outside [`ddd43b7`](https://github.com/eea/volto-block-data-figure/commit/ddd43b7b12605f22947d7fd0ce9702d6b51a7880)
+> 20 January 2022
+
+- Fix: Close figure sidebars when clicking outside [`#87`](https://github.com/eea/volto-block-data-figure/pull/87)
 
 #### [4.6.0](https://github.com/eea/volto-block-data-figure/compare/4.5.7...4.6.0)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-block-data-figure",
-  "version": "4.6.1",
+  "version": "4.6.2",
   "description": "volto-block-data-figure: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/components/manage/Blocks/DataFigure/ImageSidebar.jsx b/src/components/manage/Blocks/DataFigure/ImageSidebar.jsx
@@ -387,7 +387,11 @@ const ImageSidebar = ({
                   className="data-source-toolbar"
                   block={block}
                   properties={data}
-                  value={metadata?.dataSources?.value || getDefaultValue()}
+                  value={
+                    metadata?.dataSources?.value?.length
+                      ? metadata?.dataSources?.value
+                      : getDefaultValue()
+                  }
                   placeholder="Enter Data Sources"
                 />
               </div>
@@ -425,7 +429,9 @@ const ImageSidebar = ({
                   block={block}
                   properties={data}
                   value={
-                    metadata?.institutionalMandate?.value || getDefaultValue()
+                    metadata?.institutionalMandate?.value?.length
+                      ? metadata?.institutionalMandate?.value
+                      : getDefaultValue()
                   }
                   placeholder="Enter Institutional Mandate"
                 />