From b37a17908894395842540f7b107e044b830ea1b4 Mon Sep 17 00:00:00 2001
From: siemiatj <kuba@saskla.cz>
Date: Mon, 5 Feb 2018 18:40:18 +0100
Subject: [PATCH] #1559 - fix loading data in HU editor

---
 src/components/DataLayoutWrapper.js | 30 +++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/components/DataLayoutWrapper.js b/src/components/DataLayoutWrapper.js
index f92505b64..875b1d9b1 100644
--- a/src/components/DataLayoutWrapper.js
+++ b/src/components/DataLayoutWrapper.js
@@ -39,17 +39,27 @@ class DataLayoutWrapper extends Component {
     const { windowType: windowId, viewId } = this.props;
     const { dataId: rowId } = this.state;
 
-    patchViewAttributes(windowId, viewId, rowId, prop, value).then(response => {
-      const preparedData = parseToDisplay(response.data[0].fieldsByName);
-      preparedData &&
-        Object.keys(preparedData).map(key => {
-          this.setState(prevState => ({
-            data: Object.assign({}, prevState.data, {
-              [key]: Object.assign({}, prevState.data[key], preparedData[key])
-            })
-          }));
-        });
+    /*eslint-disable */
+    patchViewAttributes(windowId, viewId, rowId, prop, value).then(({ data }) => {
+      if (data.length) {
+        const preparedData = parseToDisplay(data[0].fieldsByName);
+        
+        if (preparedData) {
+          Object.keys(preparedData).map(key => {
+            this.setState({
+              data: {
+                ...this.state.data,
+                [key]: {
+                  ...this.state.data[key],
+                  ...preparedData[key]
+                }
+              }
+            });
+          });
+        }
+      }
     });
+    /*eslint-enable */
 
     cb && cb();
   };