Merge branch 'main' into issue-548

isc-etamarch · isc-etamarch · commit bfb255945d2c · 2024-10-21T13:51:10.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix left-sidebar spacing (#525)
 - Fixed slowness loading some CSP pages with multiple instances sharing a webserver (#540)
 - Prevent direct commits to default merge branch in basic mode (#484)
+- Fixed git path configuration (#463)
+- Added feedback to settings page (#550)
 - Fix "Home" navigation to point to current namespace (#548)
 
 ## [2.6.0] - 2024-10-07
diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls
@@ -170,6 +170,13 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
         set propertyDef = ##class(%Dictionary.PropertyDefinition).%OpenId("SourceControl.Git.Settings||"_property_"")
         if ((propertyDef) && (propertyDef.Type = "%Boolean")) {
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetYesNo("_promptQuoted_",.value,,"_defaultPromptFlag_")")
+        } elseif ((propertyDef) && (propertyDef.Name = "gitBinPath")) {
+            do %code.WriteLine(" set valid = 0")
+            do %code.WriteLine(" while ('valid) {")
+            do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
+            do %code.WriteLine(" set status =  inst.ConfigureBinPath(.value)")
+            do %code.WriteLine(" if (status) { set valid = 1 }")
+            do %code.WriteLine(" }")
         } elseif ((propertyDef) && (propertyDef.Name = "basicMode")) {
             set basicModePromptFlag = defaultPromptFlag + $$$MatchExactArrayMask + $$$InitialDisplayMask
             do %code.WriteLine(" set list(1) = ""Yes""")
@@ -341,4 +348,36 @@ Method OnAfterConfigure() As %Boolean
     }
 }
 
+Method ConfigureBinPath(ByRef path As %String) As %Boolean
+{
+    if (path = "") { return 1 }
+    // Sometimes path is quoted 
+    set path = $replace(path,"""","")
+    if (##class(%File).DirectoryExists(path)) {
+        set gitFile = $case($$$isWINDOWS,1:"git.exe",:"git")
+        set path = ##class(%File).Construct(path, gitFile)
+    } 
+    
+    if (##class(%File).Exists(path)) {
+        // no-op
+    } else {
+        write !, "The entered path is not a valid path, please try again"
+        return 0
+    }
+    try {
+        set sysStorage = ##class(SourceControl.Git.Utils).%SYSNamespaceStorage()
+        kill @sysStorage@("%gitBinPath")
+        if (..gitBinPath '= "") {
+            set @sysStorage@("%gitBinPath") = path
+        }
+        kill ^||GitVersion
+        // Get and write the version
+        set gitExists = ##class(SourceControl.Git.Utils).GitBinExists(.version)
+        write !, "You are now using "_version
+    } catch e {
+        // no-op, user may not have privileges
+    }
+    return 1
+}
+
 }
diff --git a/csp/gitprojectsettings.csp b/csp/gitprojectsettings.csp
@@ -68,6 +68,27 @@ body {
     padding-left: 4px;
 }
 
+.alert {
+  padding: 20px;
+  background-color: #04AA6D;;
+  color: white;
+}
+
+.closebtn {
+  margin-left: 15px;
+  color: white;
+  font-weight: bold;
+  float: right;
+  font-size: 22px;
+  line-height: 20px;
+  cursor: pointer;
+  transition: 0.3s;
+}
+
+.closebtn:hover {
+  color: black;
+}
+
 </style>
 </head>
 <body>
@@ -134,7 +155,13 @@ body {
     do settings.%Save()
 }
 </server>
-<div class = 'container'>    
+<div class = 'container'>
+    <csp:if condition='$D(%request.Data("gitsettings",1)) && (##class(SourceControl.Git.Utils).NeedSettings() = 0)'>
+        <div class = "alert">
+        <span class="closebtn" onclick="this.parentElement.style.display='none';">&times;</span>  
+        <strong>Success!</strong> Your changes have been saved.
+    </div>
+    </csp:if>
     <form id="settingsForm" method='post'>
         <input type="hidden" name="Namespace" value="#(..EscapeHTML(namespace))#" />
         <input type="hidden" name="gitsettings" value="1" />
@@ -574,9 +601,6 @@ body {
         </div>
         
     </form>
-    <csp:if condition='$D(%request.Data("gitsettings",1)) && (##class(SourceControl.Git.Utils).NeedSettings() = 0)'>
-        <em>Settings saved. Click cross in the upper-right corner to close the settings window.</em>
-    </csp:if>
 </div>
 <script src="js/polyfills.js"></script>
 <script src="js/jquery.min.js"></script>
