addressing pull request requested changes

Author: isc-hwojnick

cls/SourceControl/Git/Settings.cls

@@ -32,10 +32,10 @@ Property gitUserEmail As %String(MAXLEN = 255) [ InitialExpression = {##class(So
 /// Attribution: Whether mapped items should be read-only, preventing them from being added to source control
 Property mappedItemsReadOnly As %Boolean [ InitialExpression = {##class(SourceControl.Git.Utils).MappedItemsReadOnly()} ];
 
-/// Attribution: Whether basic mode should be enabled for user ${username}, greatly simplifying the functionality of the package, requiring no knowledge of git
+/// Whether basic mode should be enabled for user ${username}, greatly simplifying the functionality of the package, requiring no knowledge of git
 Property basicMode As %String [ InitialExpression = {##class(SourceControl.Git.Utils).BasicMode()} ];
 
-/// This does not map to a setting on the screen but is used to select the value to be displayed for the user's basic mode setting
+/// A read-only setting used to display the basic mode setting that is chosen in the settings page
 Property userBasicMode As %String [ InitialExpression = {##class(SourceControl.Git.Utils).UserBasicMode()} ];
 
 /// The system's default mode. If true, the system defaults to basic mode
@@ -125,6 +125,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
     for {
         set sequence = $order(orderedProperties(sequence),1,property)
         quit:sequence=""
+        continue:property="userBasicMode"
         do %code.WriteLine(" set value = inst."_property)
         set prompt = $$$comMemberKeyGet(%class.Name,$$$cCLASSproperty,property,$$$cPROPdescription)
         set promptQuoted = $$$QUOTE(prompt_":")

cls/SourceControl/Git/Utils.cls

@@ -349,14 +349,14 @@ ClassMethod SwitchBranch(targetBranchName As %String) As %Status
 
 ClassMethod PreSync() As %String
 {
-    set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("user")
+    set uncommittedFilesWithAction = ##class(SourceControl.Git.Utils).UncommittedWithAction().%Get("user")
     quit ..GenerateCommitMessageFromFiles(uncommittedFilesWithAction)
 }
 
 /// Commits all the files as needed by the Sync operation 
 ClassMethod SyncCommit(Msg As %String) As %Status
 {
-    set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("user")
+    set uncommittedFilesWithAction = ##class(SourceControl.Git.Utils).UncommittedWithAction().%Get("user")
     set username = ..GitUserName()
     set email = ..GitUserEmail()
     set author = username_" <"_email_">"
@@ -370,7 +370,7 @@ ClassMethod SyncCommit(Msg As %String) As %Status
 /// Goes through all the added files and stages them
 ClassMethod StageAddedFiles()
 {
-    set uncommittedFilesWithAction = ##class(SourceControl.Git.WebUIDriver).UncommittedWithAction().%Get("user")
+    set uncommittedFilesWithAction = ##class(SourceControl.Git.Utils).UncommittedWithAction().%Get("user")
     set iterator = uncommittedFilesWithAction.%GetIterator()
     while iterator.%GetNext(,.value,) {
         set file = value.%Get("file")
@@ -2073,6 +2073,41 @@ ClassMethod GetSourceControlInclude() As %String
         1: "")
 }
 
+ClassMethod UncommittedWithAction() As %Library.DynamicObject
+{
+    do ##class(SourceControl.Git.Change).RefreshUncommitted()
+    do ##class(SourceControl.Git.Utils).GitStatus(.files, 1)
+    set output = ""
+    set key = ""
+
+    set editedByCurrentUser = []
+    set fileToOtherDevelopers = {}
+    for {
+        set key = $order(files(key), 1, fileData)
+        quit:key=""
+
+        set filename = ##class(SourceControl.Git.Utils).FullExternalName(key)
+        if (($ISVALIDNUM(key)) && (files(key) '= "")) {
+            set edit = {}
+            do edit.%Set("file", $listget(fileData, 2))
+            do edit.%Set("action", $listget(fileData, 1))
+            do editedByCurrentUser.%Push(edit)
+        } else {
+            set sc=##class(SourceControl.Git.Change).GetUncommitted(filename, .tAction, .tInternalName, .UncommittedUser, .tSource, .UncommittedLastUpdated)
+            if ($$$ISOK(sc)) && ($data(tAction)&&(UncommittedUser=$username)) {
+                set edit = {}
+                do edit.%Set("file", $listget(fileData, 2))
+            do edit.%Set("action", $listget(fileData, 1))
+            do editedByCurrentUser.%Push(edit)
+            }
+        }
+    }
+
+    do fileToOtherDevelopers.%Set("user", editedByCurrentUser)
+    do fileToOtherDevelopers.%Set("other", ##class(SourceControl.Git.Change).GetOtherDeveloperChanges())
+    quit fileToOtherDevelopers
+}
+
 ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status
 {
     #define sourcedir $System.Util.InstallDirectory()_"devuser/studio/templates/gitsourcecontrol/"

cls/SourceControl/Git/WebUIDriver.cls

@@ -208,37 +208,8 @@ ClassMethod Uncommitted() As %SystemBase
 
 ClassMethod UncommittedWithAction() As %SystemBase
 {
-    do ##class(SourceControl.Git.Change).RefreshUncommitted()
-    do ##class(SourceControl.Git.Utils).GitStatus(.files, 1)
-    set output = ""
-    set key = ""
-
-    set editedByCurrentUser = []
-    set fileToOtherDevelopers = {}
-    for {
-        set key = $order(files(key), 1, fileData)
-        quit:key=""
-
-        set filename = ##class(SourceControl.Git.Utils).FullExternalName(key)
-        if (($ISVALIDNUM(key)) && (files(key) '= "")) {
-            set edit = {}
-            do edit.%Set("file", $listget(fileData, 2))
-            do edit.%Set("action", $listget(fileData, 1))
-            do editedByCurrentUser.%Push(edit)
-        } else {
-            set sc=##class(SourceControl.Git.Change).GetUncommitted(filename, .tAction, .tInternalName, .UncommittedUser, .tSource, .UncommittedLastUpdated)
-            if ($$$ISOK(sc)) && ($data(tAction)&&(UncommittedUser=$username)) {
-                set edit = {}
-                do edit.%Set("file", $listget(fileData, 2))
-            do edit.%Set("action", $listget(fileData, 1))
-            do editedByCurrentUser.%Push(edit)
-            }
-        }
-    }
-
-    do fileToOtherDevelopers.%Set("user", editedByCurrentUser)
-    do fileToOtherDevelopers.%Set("other", ##class(SourceControl.Git.Change).GetOtherDeveloperChanges())
-    quit fileToOtherDevelopers
+    set uncomittedWithAction = ##class(SourceControl.Git.Utils).UncommittedWithAction()
+    quit uncomittedWithAction
 }
 
 ClassMethod GetURLPrefix(%request As %CSP.Request, URL As %String) As %String

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -2147,9 +2147,7 @@ webui.ChangedFilesView = function(workspaceView, type, label) {
         var col = type == "working-copy" ? 1 : 0;
         webui.git("status -u --porcelain", function(data) {
             $.get("api/uncommitted", function (uncommitted) {
-                console.log(uncommitted);
                 var uncommittedItems = JSON.parse(uncommitted)["current user's changes"];
-                console.log(uncommittedItems);
                 var otherDeveloperUncommittedItems = JSON.parse(uncommitted)["other users' changes"];
                 self.filesCount = 0;
                 function addItemToFileList(fileList, otherDeveloperUsername, model) {