Merge pull request #282 from intersystems/fix-default-mappings

fixed issue #250 -- Set up default mappings with SourceControl.Git.Settings

Author: isc-tleavitt

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Web UI includes a "Push Branch" button for local branches that are ahead of upstream
 
 ### Fixed
+- Fixed empty mappings when SourceControl.Git.Settings is instantiated (#250)
 - Studio export path doesn't get weird mixed slahes on Windows (#252)
 - Fixed bug with adding mappings through the Settings page (#270)
 - Pulling add/delete of multiple non-IRIS files no longer causes error (#273)

cls/SourceControl/Git/API.cls

@@ -12,10 +12,7 @@ ClassMethod Configure()
         write !,"Configured SourceControl.Git.Extension as source control class for namespace ",$namespace
         set mappingsNode = ##class(SourceControl.Git.Utils).MappingsNode()
         if '$data(@mappingsNode) {
-            set @mappingsNode@("CLS","*")="cls/"
-            set @mappingsNode@("CLS","UnitTest")="test/"
-            set @mappingsNode@("INC","*")="inc/"
-            set @mappingsNode@("MAC","*")="rtn/"
+            do ##class(SourceControl.Git.Utils).SetDefaultMappings(mappingsNode)
             write !,"Configured default mappings for classes, routines, and include files. You can customize these in the global:",!?5,mappingsNode
         }
         set gitExists = ##class(SourceControl.Git.Utils).GitBinExists(.version)

cls/SourceControl/Git/Settings.cls

@@ -30,7 +30,11 @@ Property Mappings [ MultiDimensional ];
 
 Method %OnNew() As %Status
 {
-    merge ..Mappings = @##class(SourceControl.Git.Utils).MappingsNode()
+    set mappingsNode = ##class(SourceControl.Git.Utils).MappingsNode()
+    if '$data(@mappingsNode) {
+        do ##class(SourceControl.Git.Utils).SetDefaultMappings(mappingsNode)
+    }
+    merge ..Mappings = @mappingsNode
     set gitBinPath = ##class(SourceControl.Git.Utils).GitBinPath(.isDefault)
     if ('isDefault) {
         set ..gitBinPath = gitBinPath
@@ -168,3 +172,4 @@ Method OnAfterConfigure() As %Boolean
 }
 
 }
+

cls/SourceControl/Git/Utils.cls

@@ -233,10 +233,6 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
         set ec = ..AddToSourceControl(InternalName)
     } elseif (menuItemName = "RemoveFromSC") {
         set ec = ..RemoveFromSourceControl(InternalName)
-    } elseif (menuItemName = "Commit") {
-        set Target = "Please enter a commit message"
-        set Action = 7
-        quit $$$OK
     }
     quit ec
 }
@@ -1986,5 +1982,13 @@ ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status
     quit sc
 }
 
+ClassMethod SetDefaultMappings(mappingsNode As %String)
+{
+    set @mappingsNode@("CLS","*")="cls/"
+    set @mappingsNode@("CLS","UnitTest")="test/"
+    set @mappingsNode@("INC","*")="inc/"
+    set @mappingsNode@("MAC","*")="rtn/"
+}
+
 }