Skip to content

Commit 0594199

Browse files
committed
Return only namespaces that potentially contain actual DeepSee dashboards
1 parent 1be674a commit 0594199

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

MDX2JSON/AbstractREST.cls.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,15 +305,16 @@ Returns OK if namespace both exists and contains MDX2JSON package.<br>
305305
return $$$OK
306306
}
307307
308-
return:('##class(%SYS.Namespace).Exists(Namespace)) $$$ERROR($$$NamespaceUnavailable,Namespace)
309-
310-
if Namespace'=$Namespace {
311-
set oldNS = $Namespace
312-
zn Namespace
313-
set exists = ##class(%Dictionary.CompiledClass).%ExistsId("MDX2JSON.Utils")
314-
zn oldNS
315-
return:(exists=0) $$$ERROR($$$GeneralError, "MDX2JSON package is not mapped to " _ Namespace)
316-
}
308+
return:('##class(%SYS.Namespace).Exists(Namespace)) $$$ERROR($$$NamespaceUnavailable, Namespace)
309+
new $Namespace
310+
set $Namespace = Namespace
311+
312+
set exists = ##class(%Dictionary.CompiledClass).%ExistsId("MDX2JSON.Utils")
313+
return:(exists=$$$NO) $$$ERROR($$$GeneralError, "MDX2JSON package is not mapped to " _ Namespace)
314+
315+
// Strictly speaking this can be a false-positive check
316+
set exists = ($data(@##class(MDX2JSON.DashboardRS).#global)>0)
317+
return:(exists=$$$NO) $$$ERROR($$$GeneralError, "No dashboards exist in " _ Namespace)
317318
318319
return $$$OK
319320
]]></Implementation>

MDX2JSON/Tests.cls.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Classes with support methods for testing MDX2JSON</Description>
88

99
<Parameter name="LastCommit">
1010
<Type>%String</Type>
11-
<Default>18872dc518d8009bdc105425f541953d2c9d461e</Default>
11+
<Default>1be674a6a470c42bf148cae9b91a7b1c1b8973c0</Default>
1212
</Parameter>
1313

1414
<Parameter name="LastCommitTS">
1515
<Type>%TimeStamp</Type>
16-
<Default>2017-05-26 16:20:17.307</Default>
16+
<Default>2017-08-10 17:27:32.707</Default>
1717
</Parameter>
1818

1919
<Method name="ProjectLength">

0 commit comments

Comments
 (0)