fix: settings import/export supports NoFolders

Author: isc-pbarton

cls/SourceControl/Git/Settings.cls

@@ -177,7 +177,10 @@ Method ToDynamicObject() As %DynamicObject
         do settingsJSON.Mappings.%Set(k1, {})
         set k2 = $order(..Mappings(k1,""))
         while (k2 '= "") {
-            do settingsJSON.Mappings.%Get(k1).%Set(k2,..Mappings(k1,k2))
+            do settingsJSON.Mappings.%Get(k1).%Set(k2,{"directory": (..Mappings(k1,k2))})
+            if $get(..Mappings(k1,k2,"NoFolders")) {
+                do settingsJSON.Mappings.%Get(k1).%Get(k2).%Set("noFolders", 1, "boolean")
+            }
             set k2 = $order(..Mappings(k1, k2))
         }
         set k1 = $order(..Mappings(k1))
@@ -196,7 +199,10 @@ Method ImportDynamicObject(pSettingsDyn As %DynamicObject)
     while i1.%GetNext(.k1, .v1) {
         set i2 = v1.%GetIterator()
         while i2.%GetNext(.k2, .v2) {
-            set ..Mappings(k1, k2) = v2
+            set ..Mappings(k1, k2) = v2.%Get("directory")
+            if v2.%Get("noFolders") {
+                set ..Mappings(k1, k2, "NoFolders") = 1
+            }
         }
     }
 }

test/UnitTest/SourceControl/Git/Settings.cls

@@ -13,11 +13,18 @@ Method SampleSettingsJSON()
         "decomposeProductions": true,
         "Mappings": {
             "TUV": { 
-                "*": "tuv/",
-                "UnitTest": "tuv2/"
+                "*": {
+                    "directory": "tuv/"
+                },
+                "UnitTest": {
+                    "directory": "tuv2/",
+                    "noFolders": true
+                }
             },
             "XYZ": {
-                "*": "xyz/"
+                "*": {
+                    "directory": "xyz/"
+                }
             }
         }
     }
@@ -36,6 +43,7 @@ Method TestJSONImportExport()
     do $$$AssertEquals(settings.pullEventClass, "pull event class")
     do $$$AssertEquals($get(settings.Mappings("TUV","*")),"tuv/")
     do $$$AssertEquals($get(settings.Mappings("TUV","UnitTest")),"tuv2/")
+    do $$$AssertTrue($get(settings.Mappings("TUV","UnitTest","NoFolders")))
     do $$$AssertEquals($get(settings.Mappings("XYZ","*")),"xyz/")
 
     $$$ThrowOnError(settings.%Save())
@@ -44,9 +52,10 @@ Method TestJSONImportExport()
     do $$$AssertEquals(settingsDynObj.decomposeProductions, 1)
     do $$$AssertEquals(settingsDynObj.percentClassReplace, "x")
     do $$$AssertEquals(settingsDynObj.pullEventClass, "pull event class")
-    do $$$AssertEquals(settingsDynObj.Mappings."TUV"."*","tuv/")
-    do $$$AssertEquals(settingsDynObj.Mappings."TUV"."UnitTest","tuv2/")
-    do $$$AssertEquals(settingsDynObj.Mappings."XYZ"."*","xyz/")
+    do $$$AssertEquals(settingsDynObj.Mappings."TUV"."*".directory,"tuv/")
+    do $$$AssertEquals(settingsDynObj.Mappings."TUV"."UnitTest".directory,"tuv2/")
+    do $$$AssertTrue(settingsDynObj.Mappings."TUV"."UnitTest".noFolders)
+    do $$$AssertEquals(settingsDynObj.Mappings."XYZ"."*".directory,"xyz/")
 }
 
 Method TestSaveAndImportSettings()