From 34be7a41a4b06bf13253d0f03b437eedecccfef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nedeljko=20Ru=C5=BEi=C4=87?=
 <33520721+NenoR96@users.noreply.github.com>
Date: Thu, 22 Jun 2023 18:30:22 +0200
Subject: [PATCH 1/2] prevent losing data and fix corrupted instances

---
 src/control/content/index.html | 3 +++
 src/control/design/index.html  | 4 ++++
 src/widget/widget.js           | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/src/control/content/index.html b/src/control/content/index.html
index 669b412..82ebc68 100644
--- a/src/control/content/index.html
+++ b/src/control/content/index.html
@@ -142,6 +142,9 @@
                     return;
                 }
 
+                if(!newObj.content || !newObj.design)
+                    return;
+
                 buildfire.datastore.save(newObj, function (err, result) {
                     if (err || !result) {
                         console.error('Error saving the widget details: ', err);
diff --git a/src/control/design/index.html b/src/control/design/index.html
index 561a391..4d3df72 100644
--- a/src/control/design/index.html
+++ b/src/control/design/index.html
@@ -73,6 +73,7 @@
                 }
 
                 if (result && result.data && !angular.equals({}, result.data)) {
+                    if(!result.data.design) result.data.design = $scope.data.design;
                     $scope.data = result.data;
                     $scope.id = result.id;
                 }
@@ -111,6 +112,9 @@
                     return;
                 }
 
+                if(!newObj.content || !newObj.design)
+                    return;
+
                 buildfire.datastore.save(newObj, function (err, result) {
                     if (err || !result) {
                         console.error('Error saving the widget details: ', err);
diff --git a/src/widget/widget.js b/src/widget/widget.js
index 6fcb2ae..da91d57 100644
--- a/src/widget/widget.js
+++ b/src/widget/widget.js
@@ -54,12 +54,14 @@ function init() {
     state.data = result.data && result.data.content
       ? result.data
       : defaultData;
+    !state.data.design ? state.data.design = defaultData.design : null;
     render();
   });
 
   // Keep state up to date with control changes
   buildfire.datastore.onUpdate((result) => {
     state.data = result.data;
+    !state.data.design ? state.data.design = defaultData.design : null;
     render();
   });
 }

From 32857d7c026c21b5459e88abd1f1604563e8bca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nedeljko=20Ru=C5=BEi=C4=87?=
 <33520721+NenoR96@users.noreply.github.com>
Date: Mon, 3 Jul 2023 18:37:49 +0200
Subject: [PATCH 2/2] qa feedback

---
 src/control/content/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/control/content/index.html b/src/control/content/index.html
index 82ebc68..37cd540 100644
--- a/src/control/content/index.html
+++ b/src/control/content/index.html
@@ -81,6 +81,7 @@
                 }
 
                 if (result && result.data && !angular.equals({}, result.data) && result.id) {
+                    if(!result.data.design) result.data.design = $scope.data.design;
                     $scope.data = result.data;
                     $scope.id = result.id;
                     if($scope.data.content && $scope.data.content.carouselImages)