Handle new geoblock case or geoblock with no value

nens · Oct 19, 2021 · 945dfb6 · 945dfb6
1 parent b2f2d9a
commit 945dfb6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/utils/createGraphLayout.ts b/src/utils/createGraphLayout.ts
@@ -25,7 +25,7 @@ export const createGraphLayout = (
   const nodeHeight = 36;
 
   const source: GeoBlockSource = JSON.parse(jsonString);
-  const allBlockNames = Object.keys(source.graph);
+  const allBlockNames = source && source.graph ? Object.keys(source.graph) : [];
 
   elements.forEach(el => {
     dagreGraph.setNode(el.id, {

diff --git a/src/utils/geoblockUtils.ts b/src/utils/geoblockUtils.ts
@@ -265,6 +265,10 @@ export const convertGeoblockSourceToFlowElements = (
   setElements: React.Dispatch<React.SetStateAction<Elements<any>>>
 ) => {
   const source: GeoBlockSource = JSON.parse(jsonString);
+
+  // Return empty array if it is a new geoblock or the geoblock has no value yet
+  if (!source || !source.graph) return [];
+
   const rasterElements = getRasterElements(source.graph, setElements);
   const blockElements = getBlockElements(source, setElements);
   const numberElements = getNumberElements(blockElements, setElements);