Sync community version to this one

.gitignore

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

MDX2JSON/AbstractREST.cls

@@ -28,7 +28,7 @@ ClassMethod OnPreDispatch(pUrl As %String, pMethod As %String, ByRef pContinue A
 
 	Set st = ..ConvertRequestBody()
 	If $$$ISERR(st) {
-		Do ..Http500(st)
+		#; Do ..Http500(st)
 		Set pContinue = $$$NO
 		Quit st
 	}
@@ -37,9 +37,9 @@ ClassMethod OnPreDispatch(pUrl As %String, pMethod As %String, ByRef pContinue A
 	Set Namespace = %request.Get("Namespace", $namespace)
 	Set st = ..CheckNamespace(.Namespace)
 	If $$$ISERR(st) {
-		Do ..Http500(st)
+		#; Do ..Http500(st)
 		Set pContinue = $$$NO 
-		Quit
+		Quit st
 	}
 
 	#; Dispatch
@@ -114,22 +114,6 @@ ClassMethod Login(skipheader As %Boolean = 1) As %Status
 	Return $$$OK
 }
 
-/// Issue an '500' error and give some indication as to what occurred.<br>
-/// <b>pStatus</b> - %status, not %Exception.AbstractException.
-ClassMethod Http500(pStatus As %Exception.AbstractException) As %Status
-{
-	// we are expecting status
-	#; Set the response Http status
-	Set %response.Status="500 Internal Server Error"
-
-	#; Skip duplicate calls 
-	Quit:$isObject(pStatus) $$$OK
-
-	#; Return a helpful error string
-	Write "{""Error"":"_$$$ZENJSSTR($System.Status.GetErrorText(pStatus,%session.Language))_"}"
-
-	Quit $$$OK
-}
 
 /// Returns info about MDX2JSON package mapping
 ClassMethod GetMappings() As %ArrayOfObjects

MDX2JSON/Dashboard.cls

@@ -96,6 +96,42 @@ ClassMethod WidgetsToProxyObject(Dashboard As %DeepSee.Dashboard.Definition, Out
 	return st
 }
 
+
+/// A very specific method of displaying the data type for cube measures. 
+/// Serves for the convenience of front-end development of the filter widget. 
+/// The return is something like this <b>%DeepSee.Time.DayMonthYear</b>
+ClassMethod GetCubeMeasuresDataType(Widget, Number, CubeName, Output DataType As %String) As %Status
+{
+
+	set st = $$$OK
+	set dataSource = $piece(Widget.dataSource, ".", *) // get dataSource type
+	try{
+		if ((dataSource '= "kpi") && (dataSource '= "")){
+			if ($FIND(Widget.controls.GetAt(Number).targetProperty, "[") && $FIND(Widget.controls.GetAt(Number).targetProperty, ".")){
+				set tMeasure = $TRANSLATE(Widget.controls.GetAt(Number).targetProperty, "[]", "")
+
+				set st = ##class(%DeepSee.Utils).%GetDimensionInfo(CubeName,tMeasure,.pDimNo,.pHierNo,.pLevelNo) // get positional info about dimension
+
+				Set tMbrInfo = $G($$$DeepSeeMetaGLVN("cubes",$$$UPPER(CubeName),"mbr#",pDimNo,pHierNo,pLevelNo))
+				set DataType = $LG(tMbrInfo,6) // get data type
+				if '($FIND(DataType, "%")){ // if DataType return cube fact search for dataType in "star"
+					Set tMbrInfo = $G($$$DeepSeeMetaGLVN("cubes", $$$UPPER(CubeName), "star", DataType, "prop", $LG(tMbrInfo,7), "type")) 
+					set DataType = tMbrInfo 
+				}
+		}else{
+
+			set DataType = ""
+		}
+		}else{
+
+			set DataType = ""
+		}
+	}catch ex {
+		set st = ex.AsStatus()
+	}
+	return st
+}
+
 /// Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObject.
 ClassMethod WidgetToProxyObject(Widget As %DeepSee.Dashboard.Widget, CubeName As %String) As %ZEN.proxyObject [ Internal ]
 {
@@ -108,13 +144,14 @@ ClassMethod WidgetToProxyObject(Widget As %DeepSee.Dashboard.Widget, CubeName As
 		// Linked widgets processing
 		set mdx = ""
 		set basemdx = ""
-		set obj.Link = Widget.dataLink
+		set obj.dataLink = Widget.dataLink
 	}
 
 	// datasource is a kpi
 	if $piece(Widget.dataSource, ".", *) = "kpi" {
 		set kpiClass = ##class(%DeepSee.Utils).%GetKPIClass(Widget.dataSource)
 		set obj.kpitype = $classmethod(kpiClass, "%GetSourceType")
+		set obj.kpiclass = kpiClass // showing kpi class for implementing context menu button for kpi
 
 	}
 
@@ -253,6 +290,13 @@ ClassMethod WidgetControlToProxyObject(Widget As %DeepSee.Dashboard.Widget, Numb
 	set obj.label = ##class(%DeepSee.UserPortal.Utils).%ResolveText(obj.label)
 	set obj.source = Widget.name
 
+	set st = ..GetCubeMeasuresDataType(Widget,Number,CubeName,.fDataType)
+
+	if (st = $$$OK)
+	{
+		set obj.targetPropertyDataType = fDataType
+	}
+
 	set:(obj.target="") obj.target = Widget.name
 
 	if ($e(obj.value)="@") {

MDX2JSON/REST.cls

@@ -49,6 +49,7 @@ XData UrlMap
    <Route Url="/MDX2JSONP" Method="POST" Call="WriteJSONPfromMDX"/>
    <Route Url="/MDXDrillthrough" Method="POST" Call="WriteDrillthroughJSON" />
    <Route Url="/MDX2XMLA" Method="POST" Call="WriteXMLAfromMDX" />
+   <Route Url="/KPI" Method="POST" Call="KPIExecute"/>
 
    <!-- Get info about availible filters and their values -->
    <Route Url="/Filters" Method="POST" Call="WriteFiltersForDataSource"/>
@@ -60,11 +61,16 @@ XData UrlMap
    <Route Url="/Widgets" Method="POST" Call="GetWidgetsList" />
    <Route Url="/Action/:Cube/:Action" Method="POST" Call="ExecuteAction"/>
 
+   <!-- Send dashboard JSON -->
+   <Route Url="/saveWidget" Method="POST" Call="saveWidget"/>
+   <Route Url="/deleteWidget" Method="POST" Call="deleteWidget"/>
+
    <!-- Get info about system format and locale-->
    <Route Url="/Format" Method="GET" Call="GetFormat"/>
 
    <!-- Get info about pivot-->
    <Route Url="/DataSource" Method="POST" Call="GetDataSource" />
+   <Route Url="/DataSourceList/:type" Method="POST" Call="GetListDataSources" />
 
    <!-- Get info about pivot-->
    <Route Url="/TermList" Method="POST" Call="GetTermList" />
@@ -85,7 +91,6 @@ XData UrlMap
    <Route Url="/MDX/:query" Method="GET" Call="WriteJSONfromMDXURL"/>
    <Route Url="/MDXfilters/:query" Method="GET" Call="WriteFiltersForMDX"/>
 
-    <Route Url="/KPI" Method="POST" Call="WriteJSONfromKPI"/>
 
    <!-- Test methods-->
    <Route Url="/Test" Method="GET" Call="Test"/>
@@ -114,7 +119,7 @@ ClassMethod Test() As %Status
 	set obj.Status = "OK"
 	set obj.Embed = $g(^MDX2JSON.Embed, $g(^%MDX2JSON.Embed, ""))
 	set obj.User = $Username
-	set obj.Version = "3.2.5"
+	set obj.Version = "3.2.38"
 	set obj.Parent = ##class(MDX2JSON.Tests).#LastCommit
 	set obj.ParentTS = ##class(MDX2JSON.Tests).#LastCommitTS
 	set obj.DefaultApp = $System.CSP.GetDefaultApp($Namespace)
@@ -132,6 +137,63 @@ ClassMethod Test() As %Status
 	return $$$OK
 }
 
+ClassMethod deleteWidget() As %Status
+{
+	set name = $$$R("key")
+	set dashboardData = $$$R("Dashboard")
+
+	return ##class(MDX2JSON.Utils).DeleteWidget(name,dashboardData)
+}
+
+ClassMethod saveWidget() As %Status
+{
+	set key = $$$R("key")
+	set widgetData= $$$R("WidgetData")
+	set dashboardData = $$$R("Dashboard")
+
+	return ##class(MDX2JSON.Utils).AddWidget(widgetData,dashboardData,key)
+}
+
+
+/// Get all data sources including "pivot", "kpi", "worksheets","metrics"
+ClassMethod GetListDataSources(Source) As %Status
+{
+
+	set Source = $ZCONVERT($ZCONVERT(Source ,"I","URL") ,"I","UTF8")
+
+	if (Source = "pivot")
+	{
+		Set tSC = ##class(%DeepSee.Utils).%GetPivotListArray(.tParms,.pMetaData,.pData)
+
+	}
+	elseif (Source = "kpi")
+	{
+		Set tSC = ##class(%DeepSee.Utils).%GetKPIListArray(.tParms,.pMetaData,.pData)
+
+	}
+	elseif (Source = "worksheets")
+	{
+		Set tSC = ##class(%DeepSee.Utils).%GetWorksheetListArray(.tParms,.pMetaData,.pData)
+
+	}
+	elseif (Source = "metrics")
+	{
+		Set tSC = ##class(%DeepSee.Utils).%GetMetricListArray(.tParms,.pMetaData,.pData)
+
+	}
+
+	quit:$$$ISERR(tSC) tSC
+
+	Set tSC = ##class(%DeepSee.REST.v1.DataServer).%CreateObjectFromArray(.pData,pMetaData,.tSourceObj)
+
+	quit:$$$ISERR(tSC) tSC
+
+	do tSourceObj.%ToJSON()
+
+	quit tSC
+}
+
+
 ClassMethod GetDataSource() As %Status
 {
 	return ##class(MDX2JSON.Utils).GetDataSource($$$R("DataSource"))
@@ -220,6 +282,41 @@ ClassMethod WriteFiltersForDataSource() As %Status
   	return st
 }
 
+///Execute requests from kpi
+ClassMethod KPIExecute() As %Status
+{
+	try{
+		set KPI = $$$R("KPI")
+		set Drillthrough = $$$R("Drillthrough")
+
+
+		if (Drillthrough = 1){
+			set SortOrder = $$$R("SortOrder")
+
+			if %request.Content.FILTERS
+			{
+				set Filters = $$$R("FILTERS")
+
+			}else{
+				set Filters = $$$R("Filters")
+			}
+
+			set SortColumn = $$$R("SortColumn")
+			set pSelection = SortColumn _ "," _ SortOrder
+
+			set st = ##class(MDX2JSON.Utils).WriteDrillthroughJSONKPI(KPI, Filters, pSelection)
+		}
+		else {
+			set st = ##class(%DeepSee.REST.v1.DataServer).WriteJSONfromKPI(KPI)
+		}
+
+	}catch ex {
+		set st=ex.AsStatus()
+	}
+
+	return st
+}
+
 /// Wrapper for ##class(MDX2JSON.Utils).WriteJSONPfromMDX(pMDX)<br>
 /// Converts incoming request object and calls abovementioned method.
 ClassMethod WriteJSONfromMDX() As %Status
@@ -324,12 +421,20 @@ ClassMethod WritePivotVariablesForCube(Cube As %String) As %Status
 ClassMethod WriteAddons() As %Status
 {
 	#dim sc As %Status = $$$OK
-
-	set app = "/dsw"
+
+	set currentApp =  $ZConvert($Get(%request.CgiEnvs("SCRIPT_NAME"), ""), "L")
+	set prefix = $piece(currentApp, "/mdx2json", 1)
+	set app = prefix _ "/dsw"
 	set path = $system.CSP.GetFileName(app _ "/")
 	set path = ##class(%File).NormalizeDirectory(path)
 	set path = ##class(%File).SubDirectoryName(path, "addons", $$$YES)	
 	set url = app _ "/addons/"
+
+	// Check if path exists
+	if '##class(%File).Exists(path) {
+		set sc = $$$ERROR($$$GeneralError, "Addons directory does not exist: "_path_". Probably different prefixes for MDX2JSON and DSW applications.")
+		quit sc
+	}
 
 	#dim rs As %SQL.ClassQueryResultSet = ##class(%File).FileSetFunc(path, "*.js")
 
@@ -350,12 +455,20 @@ ClassMethod WriteThemes() As %Status
 {
 	#dim sc As %Status = $$$OK
 
-	set app = "/dsw"
+	set currentApp =  $ZConvert($Get(%request.CgiEnvs("SCRIPT_NAME"), ""), "L")
+	set prefix = $piece(currentApp, "/mdx2json", 1)
+	set app = prefix _ "/dsw"
 	set path = $system.CSP.GetFileName(app _ "/")
 	set path = ##class(%File).NormalizeDirectory(path)
 	set path = ##class(%File).SubDirectoryName(path, "themes", $$$YES)	
 	set url = app _ "/themes/"
 
+	// Check if path exists
+	if '##class(%File).Exists(path) {
+		set sc = $$$ERROR($$$GeneralError, "Themes directory does not exist: "_path_". Probably different prefixes for MDX2JSON and DSW applications.")
+		quit sc
+	}
+
 	#dim rs As %SQL.ClassQueryResultSet = ##class(%File).FileSetFunc(path, "*.css")
 
 	set list = $$$NewDynDTList
@@ -377,4 +490,4 @@ ClassMethod WriteJSONfromKPI() As %Status [ CodeMode = objectgenerator ]
 	do %code.Write(base)
 }
 
-}
+}

MDX2JSON/ResultSet.cls

@@ -35,7 +35,7 @@ Method ToProxyObject(Output pStatus As %Status) As %ZEN.proxyObject
 	try {			
 		set obj.Info = ..InfoToProxyObject() // basic info about cube and query
 		quit:obj.Info.percentDone<100
-				
+
 		set obj.Cols = ..AxesToListOfObjects() // all axes
 		set obj.Data = ..DataToListOfDataTypes() // array of all cells, left-to-right, up-to-down
 	} catch ex {
@@ -79,7 +79,7 @@ Method InfoToProxyObject() As %ZEN.proxyObject
  	set info.numericGroupSeparator = ##class(%SYS.NLS.Format).GetFormatItem("NumericGroupSeparator")
 	set info.numericGroupSize = ##class(%SYS.NLS.Format).GetFormatItem("NumericGroupSize")
 	set info.decimalSeparator = ##class(%SYS.NLS.Format).GetFormatItem("DecimalSeparator")
-									
+
 	return info
 }
 
@@ -130,7 +130,7 @@ Method ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, No
 	set cell.vis = $LG(tNode,2) // visibility helper - does not help (apperently it shows if the cell is the lowest level)  
 
 	// now we process cell children, if any exist
-	if ($D($$$DeepSeeAxisGLVN(CubeIndex, AxisKey, "axes", Node, "ch")) = 10) {
+	if ($D($$$DeepSeeAxisGLVN(CubeIndex, AxisKey, "axes", Node, "ch")) = 10) && ($LG(tNode, 1)'="agg") {
 		set cell.children = $$$NewDynObjList
 		set key = $O($$$DeepSeeAxisGLVN(CubeIndex, AxisKey, "axes", Node, "ch", ""))
 		while (key'="") {
@@ -154,23 +154,23 @@ Method ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, No
 	if (..IsCellNull(cell, AxisNumber, Node)=1) {
 		return cell.children
 	}
-	
+
 	try {
 		set cell.path = ##class(%DeepSee.Query.Engine).%GetSpecForAxisNode(CubeName, QueryKey, AxisNumber, Node) // MDX cell path
 		set:$e(cell.path)="(" cell.path = $e(cell.path, 2, *-1)  // removing redundant parentheses
 	} catch ex {
 		set cell.path = "path too long"		
 	}
-	
+
 	set cell.format = $LG(tNode,12) // format for numbers, eg: $## ###.##
 	set cell.total = $LG(tNode,8) //COUNT,AVG function
 	set cell.type = $LG(tNode,1) // mbr,cmbr,lit,exp
 	set cell.valueID = $LG(tNode,6) // id in mdx dimension for mbr, path for cmbr
 	set cell.title = $LG(tNode,23)
-	
+
 	set cell.headerStyle = $LG(tNode,19)
 	set cell.cellStyle = $LG(tNode,18)
-	
+
 	set info = $LG(tNode,18)
 	if info'="" { // extract aggregation information, leave the rest as css
 		set summaryposition = $f(info,"summary")
@@ -181,7 +181,7 @@ Method ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, No
 		}
 		set cell.style = info // css
 	}
-	
+
 	set tDimNo = $LG(tNode,9)
 	set tHierNo = $LG(tNode,10)
 	set tLevelNo = $LG(tNode,11)
@@ -190,7 +190,7 @@ Method ProcessOneAxisCell(CubeIndex, AxisKey, CubeName, QueryKey, AxisNumber, No
 	do ##class(%DeepSee.Utils).%GetDimensionCaption(CubeName,tDimNo, tHierNo,tLevelNo, .tAxisCaption)
 	set cell.dimension = tCaption // cube dimension taken from the name of the axes.
 	if (cell.dimension = "") {set cell.dimension = tCaption} // hack for assigne dimension property in case of empty dimension
-	
+
 
 	set:$$$Debug cell.visible = '..IsCellNull(cell,AxisNumber,Node)
 	set:$$$Debug cell.node = Node