Merge branch 'main' of https://github.com/intersystems/git-source-control into cd-decomp

Author: isc-pbarton

CHANGELOG.md

@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - LoadProductionsFromDirectory method to help custom deployment scripts load decomposed productions from the repository (#670)
 
+### Fixed
+- Fixed not showing warnings on Studio (#660)
+- Fixed business processes and rules not being added to source control automatically (#676)
+- Embedded Git commits settings when cloning empty repo to avert any issues
+
 ## [2.9.0] - 2025-01-09
 
 ### Added

cls/SourceControl/Git/Extension.cls

@@ -59,6 +59,13 @@ Method UserAction(Type As %Integer, Name As %String, InternalName As %String, Se
         set filename = ##class(SourceControl.Git.Utils).FullExternalName(.InternalName)
         do ##class(SourceControl.Git.Change).GetUncommitted(filename,.tAction)
         do ..GetStatus(.InternalName, .isInSourceControl, .isEditable,.isCheckedOut,.userCheckedOut)
+
+        // Deal with Business Processes and Rules
+        // Note: Business Processes and Rules do not have a 'new document' User Action, and thus must be added like this
+        if (('isInSourceControl)) {
+            do ..CheckBusinessProcessesAndRules(InternalName)
+        }
+
         if '$data(tAction) {
             set user = "", inNamespace = ""
             if 'isEditable || ##class(SourceControl.Git.Utils).Locked() {
@@ -371,6 +378,8 @@ Method OnAfterSave(InternalName As %String, Object As %RegisteredObject = {$$$NU
                         $$$ThrowOnError(##class(SourceControl.Git.Change).SetUncommitted(filename, "edit", InternalName, $username, "", 1, "", "", 0))
                     }
                 }
+            } else {
+                do ..CheckBusinessProcessesAndRules(InternalName)
             }
         }
     } catch e {
@@ -535,4 +544,18 @@ Method CheckCommitterIdentity(Settings As SourceControl.Git.Settings, ByRef Acti
     return 0
 }
 
+/// Deal with Business Processes and Rules
+Method CheckBusinessProcessesAndRules(InternalName As %String) As %Status
+{
+    // Note: Business Processes and Rules are not added through normal user action processes because of upstream hook issues,
+    //       so we have to add them like this
+    if (##class(SourceControl.Git.Utils).Type(InternalName) = "cls") {
+        set name = $piece(InternalName,".CLS",1)
+        set exists = ##class(%Dictionary.CompiledClass).%ExistsId(name)
+        if (exists && ($classmethod(name,"%Extends","Ens.BusinessProcess") || $classmethod(name,"%Extends","Ens.Rule.Definition"))) {
+            do ..AddToSourceControl(InternalName)
+        }
+    }
+}
+
 }

cls/SourceControl/Git/Settings.cls

@@ -448,6 +448,15 @@ Method OnAfterConfigure() As %Boolean
             $$$ThrowOnError(workMgr.WaitForComplete())
             // export settings file without committing
             $$$ThrowOnError(..SaveWithSourceControl())
+
+            // Empty repo breaks Embedded Git, commit the settings file
+            do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("log",,.errStream,.outStream)
+            do errStream.Rewind()
+            if (errStream.Read() [ "does not have any commits yet") {
+                w !,"Cloned Empty Repository, committing initial source control settings",!
+                $$$ThrowOnError(##class(SourceControl.Git.Utils).AddToSourceControl(##class(SourceControl.Git.Settings.Document).#INTERNALNAME))
+                $$$ThrowOnError(##class(SourceControl.Git.Utils).Commit(##class(SourceControl.Git.Settings.Document).#INTERNALNAME,"initial commit"))
+            }
         }
     }
 }

docs/images/production-decomposition.png

@@ -1,6 +1,9 @@
 # Production Decomposition
 Production Decomposition is a feature of Embedded Git that allows multiple developers to edit the same IRIS Interoperability production in the same namespace. In the past, the production class has been an obstacle preventing organizations using multi-user development namespaces from adopting source control. Production Decomposition resolves this by representing the production as a directory of files for each production item that may be edited independently. An uncommitted change to the settings for a single item through the Interoperability Portal will block other users from editing that item while allowing changes to other items in the production.
 
+
+![Productions in Git](images/production-decomposition.png)
+
 ## Enabling production decomposition
 The feature may be enabled by checking the "Decompose Productions" box in the Git Settings page. For deployment of changes to other environments through git to work properly, the value of this setting must match on all namespaces connected to this repository. To assist, settings are automatically exported into a `embedded-git-config.json` file at the root of the repository that may be committed and imported into other environments.
 

docs/production-decomposition.md

@@ -146,7 +146,7 @@ webui.parseGitResponse = function(data) {
     };
 }
 
-webui.processGitResponse = function(data, command, callback) {
+webui.processGitResponse = function(data, command, callback, warningCallback) {
     var result = webui.parseGitResponse(data);
     var rcode = result.rcode;
     var output = result.output;
@@ -158,7 +158,7 @@ webui.processGitResponse = function(data, command, callback) {
         }
         // Return code is 0 but there is stderr output: this is a warning message
         if (message.length > 0) {
-            if(warningCallback) {
+            if (warningCallback) {
                 warningCallback(message);
             } else {
                 webui.showWarning(message);
@@ -185,7 +185,7 @@ webui.processGitResponse = function(data, command, callback) {
     }
 }
 
-webui.git_command = function(command, callback) {
+webui.git_command = function(command, callback, warningCallback) {
     $.ajax({
         url: "git-command",
         type: "POST",
@@ -194,7 +194,7 @@ webui.git_command = function(command, callback) {
             command: command
         }),
         success: function(data) {
-            webui.processGitResponse(data, command, callback);
+            webui.processGitResponse(data, command, callback, warningCallback);
         },
         error: function(data) {
             var trimmedData = data.replace(/(\r\n)/gm, "\n");

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

@@ -146,7 +146,7 @@ webui.parseGitResponse = function(data) {
     };
 }
 
-webui.processGitResponse = function(data, command, callback) {
+webui.processGitResponse = function(data, command, callback, warningCallback) {
     var result = webui.parseGitResponse(data);
     var rcode = result.rcode;
     var output = result.output;
@@ -158,7 +158,7 @@ webui.processGitResponse = function(data, command, callback) {
         }
         // Return code is 0 but there is stderr output: this is a warning message
         if (message.length > 0) {
-            if(warningCallback) {
+            if (warningCallback) {
                 warningCallback(message);
             } else {
                 webui.showWarning(message);
@@ -185,7 +185,7 @@ webui.processGitResponse = function(data, command, callback) {
     }
 }
 
-webui.git_command = function(command, callback) {
+webui.git_command = function(command, callback, warningCallback) {
     $.ajax({
         url: "git-command",
         type: "POST",
@@ -194,7 +194,7 @@ webui.git_command = function(command, callback) {
             command: command
         }),
         success: function(data) {
-            webui.processGitResponse(data, command, callback);
+            webui.processGitResponse(data, command, callback, warningCallback);
         },
         error: function(data) {
             var trimmedData = data.replace(/(\r\n)/gm, "\n");