Merge pull request #116 from Frisle/master

FIX: errors when dataSource did not exist and cubeName is wrong for some reason

Author: eduard93

.gitignore

@@ -1 +1,2 @@
 sc-list.txt
+.vscode/settings.json

MDX2JSON/Dashboard.cls

@@ -290,8 +290,12 @@ ClassMethod WidgetControlToProxyObject(Widget As %DeepSee.Dashboard.Widget, Numb
 	set obj.label = ##class(%DeepSee.UserPortal.Utils).%ResolveText(obj.label)
 	set obj.source = Widget.name
 
-	set filterDataType = ..GetCubeMeasuresDataType(Widget,Number,CubeName,.fDataType)
-	set obj.targetPropertyDataType = fDataType
+	set st = ..GetCubeMeasuresDataType(Widget,Number,CubeName,.fDataType)
+
+	if (st = $$$OK)
+	{
+		set obj.targetPropertyDataType = fDataType
+	}
 
 	set:(obj.target="") obj.target = Widget.name
 

MDX2JSON/Utils.cls

@@ -573,8 +573,11 @@ ClassMethod AddWidget(sWidget As %String, sDashboard As %String, key As %String)
 		set tWidgets = ##class(%DeepSee.Dashboard.Widget).%New()
 		set st = ..UpdateWidget(tWidgets, sWidget)
 
-		$$$Insert(tDash.widgets, tWidgets)
-		do tDash.%Save()
+		if (st = $$$OK) // checking for errors in UpdateWidget
+		{
+			$$$Insert(tDash.widgets, tWidgets)
+			do tDash.%Save()
+		}
 
 	} else {		
 		// Edit exists widget				
@@ -596,7 +599,10 @@ ClassMethod AddWidget(sWidget As %String, sDashboard As %String, key As %String)
 		}
 		if (changed '= "") {
 			set st = ..UpdateWidget(changed, sWidget)
-			do tDash.%Save()	
+			if (st = $$$OK) // checking for errors in UpdateWidget
+			{
+				do tDash.%Save()	
+			}	
 		}
 	}