Merge branch 'main' into fix-124

Author: isc-etamarch

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added 'git push --force' in expert mode (#527)
+- Add remote repository to settings page (#448)
 - Added environment awareness in configuration, and showing of environment name in UI (#124)
 
 ### Fixed

cls/SourceControl/Git/Utils.cls

@@ -2808,4 +2808,28 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
     return sc
 }
 
+/// Returns the url for the remote repository (censoring the username)
+ClassMethod GetConfiguredRemote() As %String
+{
+    d ..RunGitCommand("remote",.err,.out,"-v")
+    set line = out.ReadLine()
+    set url = $piece($piece(line,$char(9),2)," ",1)
+    return url
+}
+
+ClassMethod GetRedactedRemote() As %String
+{
+    set url = ..GetConfiguredRemote()
+    set username= $piece($piece(url,":",3),"@",1)
+    set censoredUrl = $replace(url, username,"*******")
+    return censoredUrl
+}
+
+ClassMethod SetConfiguredRemote(url) As %String
+{
+    do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("remote",,.errStream,.outStream,"set-url","origin",url)
+    set output = outStream.ReadLine(outStream.Size)
+    quit output
+}
+
 }

cls/SourceControl/Git/WebUIDriver.cls

@@ -26,6 +26,8 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             set responseJSON = {
                 "url": (..GetHomeURL())
             }
+        } elseif $extract(pagePath,6,*) = "remote" {
+            set responseJSON = ..GetRemote()   
         } elseif $extract(pagePath,6,*) = "environment" {
                 set responseJSON = {
                     "environment": (##class(SourceControl.Git.Utils).EnvironmentName()) 
@@ -411,4 +413,10 @@ ClassMethod GetHomeURL() As %String
     quit prefix_"/csp/sys/UtilHome.csp"
 }
 
+ClassMethod GetRemote() As %Library.DynamicObject
+{
+    set remote = ##class(SourceControl.Git.Utils).GetRedactedRemote()
+    quit {"remote": (remote)}
+}
+
 }

csp/gitprojectsettings.csp

@@ -79,6 +79,8 @@ body {
  set homeURL = ##class(SourceControl.Git.WebUIDriver).GetHomeURL()
 
  set settings = ##class(SourceControl.Git.Settings).%New()
+ set remote = ##class(SourceControl.Git.Utils).GetRedactedRemote()
+ /// After Save
  if $Data(%request.Data("gitsettings",1)) {
     for param="gitUserName","gitUserEmail" {
         set $Property(settings,param) = $Get(%request.Data(param,1))
@@ -94,6 +96,12 @@ body {
             set settings.mappedItemsReadOnly = 0
         }
 
+        set newRemote = $Get(%request.Data("remoteRepo",1))
+        // If entry was modified, set new remote repo
+        if (newRemote '= ##class(SourceControl.Git.Utils).GetRedactedRemote()) {
+            do ##class(SourceControl.Git.Utils).SetConfiguredRemote(newRemote)
+        }
+
         set settings.compileOnImport = ($Get(%request.Data("compileOnImport", 1)) = 1)
 
         if ($Get(%request.Data("basicMode", 1)) = 1) {
@@ -340,6 +348,16 @@ body {
                 <input type="text" class="form-control" id="defaultMergeBranch" name="defaultMergeBranch" value='#(..EscapeHTML(settings.defaultMergeBranch))#' placeholder="sample-remote-branch">
             </div>
         </div>
+
+        <div class="form-group row mb-3">
+            <label for="remoteRepo" class="offset-sm-1 col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="Url to Remote repository">Remote Repository</label>
+            <div class="col-sm-7">
+                <input type="text" class="form-control" id="remoteRepo" name="remoteRepo" value='#(..EscapeHTML(remote))#' placeholder="ex. [email protected]:User/UserRepo.git"/>
+                <div class = "neutral-feedback">
+                    (Username is redacted)
+                </div>
+            </div>
+        </div>
 
         <div class="form-group row mb-3">
             <label for="mappedItemsReadOnly" class="offset-sm-1 col-sm-3 col-form-label" data-toggle="tooltip" data-placement="top" title="Whether items mapped from a database other than this namespace's default routine database should be read-only. If enabled, mapped items won't be saved to source control or exported. NOTE: These are different from the mappings configured in this settings page"> Treat Mapped Items as Read-only</label>