Merge branch 'main' into issue-549

Author: isc-tleavitt

CHANGELOG.md

@@ -10,18 +10,26 @@ 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 change context option to pull page (#468)
+- Added favorite namespaces setting for a user (#468, #510) 
 - Added environment awareness in configuration, and showing of environment name in UI (#124)
+- Warning on sync page if other users have unstaged changes (#493)
+- Added "Export System Default Settings" menu item (#544)
 
 ### Fixed
 - Fixed display of other users' username in workspace view on Unix (#530)
 - 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 GetContexts utils function to exclude implied namespaces from the list of namespaces (#468)
 - Fixed git path configuration (#463)
 - Added feedback to settings page (#550)
 - Fix "Home" navigation to point to current namespace (#548)
 - Fixed issues when user checks out nonexistent branch (#549)
 - Fixed checking out branch with uncommitted work (#539)
+- Make sure more fetch calls prune the remote branches (#471)
+- Force export of item if it has been modified (#354)
+- Production configuration page no longer closes Sync/WebUI when operations there change the production (#542)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/Extension.cls

@@ -29,6 +29,7 @@ XData Menu
 <MenuItem Name="NewBranch" />
 <MenuItem Name="SwitchBranch" />
 <MenuItem Separator="true"/>
+<MenuItem Name="ExportSystemDefaults" />
 <MenuItem Name="Export" />
 <MenuItem Name="ExportForce" />
 <MenuItem Name="Import" />
@@ -125,6 +126,7 @@ Method LocalizeName(name As %String) As %String
         "Settings":$$$Text("@Settings@Settings"),
         "Init":$$$Text("@Init@Initialize"),
         "GitWebUI":$$$Text("@GitWebUI@Launch Git UI"),
+        "ExportSystemDefaults":$$$Text("@ExportSystemDefaults@Export System Default Settings"),
         "Export":$$$Text("@Export@Export All"),
         "ExportForce":$$$Text("@ExportForce@Export All (Force)"),
         "Import":$$$Text("@Import@Import All"),
@@ -160,6 +162,11 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
             quit ..OnSourceMenuContextItem(InternalName,name,.Enabled,.DisplayName)
         }
 
+        if name = "ExportSystemDefaults" {
+            set Enabled = ##class(%Library.EnsembleMgr).IsEnsembleNamespace()
+            quit $$$OK
+        }
+
         if ##class(SourceControl.Git.Utils).BasicMode() {
             set Enabled = $CASE(name,
                 "Status": 1,
@@ -171,7 +178,6 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
                 "Sync": 1,
                 "": 1,
                 :-1
-            
             )
         } else {
             set Enabled = $CASE(name, 
@@ -328,7 +334,8 @@ Method OnAfterSave(InternalName As %String, Object As %RegisteredObject = {$$$NU
             } else {
                 set filename = ##class(SourceControl.Git.Utils).FullExternalName(InternalName)
                 $$$ThrowOnError(##class(SourceControl.Git.Utils).RemoveRoutineTSH(InternalName))
-                $$$ThrowOnError(##class(SourceControl.Git.Utils).ExportItem(InternalName))
+                set forceExport = (InternalName'= "") && ($data(..Modified(InternalName)))
+                $$$ThrowOnError(##class(SourceControl.Git.Utils).ExportItem(InternalName,,forceExport))
                 if '##class(SourceControl.Git.Change).IsUncommitted(filename) {
                     $$$ThrowOnError(##class(SourceControl.Git.Change).SetUncommitted(filename, "edit", InternalName, $username, "", 1, "", "", 0))
                 }

cls/SourceControl/Git/Settings.cls

@@ -58,6 +58,8 @@ Property environmentName As %String(MAXLEN = "") [ InitialExpression = {##class(
 
 Property Mappings [ MultiDimensional ];
 
+Property favoriteNamespaces As %DynamicArray;
+
 Method %OnNew() As %Status
 {
     set mappingsNode = ##class(SourceControl.Git.Utils).MappingsNode()
@@ -69,6 +71,7 @@ Method %OnNew() As %Status
     if ('isDefault) {
         set ..gitBinPath = gitBinPath
     }
+    set ..favoriteNamespaces = ##class(SourceControl.Git.Utils).FavoriteNamespaces()
     quit $$$OK
 }
 
@@ -130,9 +133,11 @@ Method %Save() As %Status
     // update value of basicUserMode to reflect the updated setting for basicMode
     set ..userBasicMode = ##class(SourceControl.Git.Utils).UserBasicMode()
 
-
     kill @##class(SourceControl.Git.Utils).MappingsNode()
     merge @##class(SourceControl.Git.Utils).MappingsNode() = ..Mappings
+    
+    do ##class(SourceControl.Git.Utils).ConfigureFavoriteNamespaces($username, ..favoriteNamespaces)
+
     quit $$$OK
 }
 
@@ -163,6 +168,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
         set sequence = $order(orderedProperties(sequence),1,property)
         quit:sequence=""
         continue:property="userBasicMode"
+        continue:property="favoriteNamespaces"
         do %code.WriteLine(" set value = inst."_property)
         set prompt = $$$comMemberKeyGet(%class.Name,$$$cCLASSproperty,property,$$$cPROPdescription)
         set promptQuoted = $$$QUOTE(prompt_":")

cls/SourceControl/Git/StreamServer.cls

@@ -8,10 +8,13 @@ ClassMethod OnPage() As %Status
 {
     if (%stream '= $$$NULLOREF) && $data(%base)#2 {
         set sourceControlInclude = ##class(SourceControl.Git.Utils).GetSourceControlInclude()
+        set bodyAttrs = ##class(SourceControl.Git.Utils).ProductionConfigBodyAttributes()
+        set configScript = ##class(SourceControl.Git.Utils).ProductionConfigScript()
         while '%stream.AtEnd {
-            set text = %stream.Read()
+            set text = %stream.Read(1000000)
             set text = $replace(text,"{{baseHref}}",..EscapeHTML(%base))
-            write $replace(text,"{{sourceControlInclude}}",sourceControlInclude)
+            set text = $replace(text,"{{bodyAttrs}}",bodyAttrs)
+            write $replace(text,"{{sourceControlInclude}}",sourceControlInclude_$$$NL_configScript)
         }
         quit $$$OK
     }

cls/SourceControl/Git/Utils.cls

@@ -72,6 +72,13 @@ ClassMethod SettingsUIReadOnly() As %Status [ CodeMode = expression ]
 $Get(@..#Storage@("settings","settingsUIReadOnly"), 0)
 }
 
+ClassMethod FavoriteNamespaces() As %String
+{
+    set favNamespaces = []
+    do ..GetFavoriteNamespaces(.favNamespaces,[])
+    return favNamespaces
+}
+
 /// Returns the current (or previous) value of the flag.
 ClassMethod Locked(newFlagValue As %Boolean) As %Boolean
 {
@@ -251,6 +258,8 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
         if ec {
             write !,"==export done==",!
         }
+    } elseif (menuItemName = "ExportSystemDefaults") {
+        set ec = ..ExportSystemDefaults()
     } elseif (menuItemName = "Import") {
         set ec = ..ImportAll()
         set Reload = 1
@@ -576,7 +585,7 @@ ClassMethod Push(remote As %String = "origin", force As %Boolean = 0) As %Status
 
 ClassMethod Fetch(ByRef diffFiles) As %Status
 {
-    do ..RunGitCommand("fetch", .errStream, .outStream)
+    do ..RunGitCommand("fetch", .errStream, .outStream, "--prune")
     write !, "Fetch done"
     kill errStream, outStream
     do ..RunGitCommand("diff", .errStream, .outStream, "..origin/"_..GetCurrentBranch(), "--name-only")
@@ -1630,6 +1639,13 @@ ClassMethod ExportAll(force As %Boolean = 0) As %Status
     quit ..ExportRoutines(force)
 }
 
+ClassMethod ExportSystemDefaults() As %Status
+{
+    new %SourceControl
+    do ##class(%Studio.SourceControl.Interface).SourceControlCreate()
+    quit %SourceControl.OnAfterSave("Ens.Config.DefaultSettings.ESD")
+}
+
 /// if <var>force</var> = 1 then we import item even if timestamp in system is newer
 ClassMethod ImportAll(force As %Boolean = 0) As %Status
 {
@@ -1852,7 +1868,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
             set diffBase = ..GetCurrentBranch()
         }
 
-        do ..RunGitCommand("fetch", .errorStream, .outputStream)
+        do ..RunGitCommand("fetch", .errorStream, .outputStream,"--prune")
         kill errorStream, outputStream
         do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errorStream,.outputStream, diffBase_$Case(diffCompare,"":"",:"..")_diffCompare, "--name-status")
         do ..ParseDiffStream(outputStream,,.files)
@@ -2505,28 +2521,32 @@ ClassMethod Localize()
     }
 }
 
-ClassMethod GetContexts() As %DynamicArray
+ClassMethod GetContexts(onlyNamespaces As %Boolean) As %DynamicArray
 {
     set contexts = []
     set namespaces = ..GetGitEnabledNamespaces()
     set ptr = 0
     while $listnext(namespaces,ptr,value) {
-        do contexts.%Push(value)
+        if '($FIND(value,"^^")){
+            do contexts.%Push(value)
+        }
     }
 
     set name = ""
 
     // Using embedded for backwards compatability
-    &sql(DECLARE C1 CURSOR FOR SELECT name into :name from %Library.RoutineMgr_StudioOpenDialog('*.ZPM'))
-    &sql(OPEN C1)
-        throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
-    &sql(FETCH C1)
-    while(SQLCODE = 0) {
-        set package = name
-        do contexts.%Push(package)
+    if '(onlyNamespaces) {
+        &sql(DECLARE C1 CURSOR FOR SELECT name into :name from %Library.RoutineMgr_StudioOpenDialog('*.ZPM'))
+        &sql(OPEN C1)
+            throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
         &sql(FETCH C1)
+        while(SQLCODE = 0) {
+            set package = name
+            do contexts.%Push(package)
+            &sql(FETCH C1)
+        }
+        &sql(CLOSE C1)
     }
-    &sql(CLOSE C1)
 
     return contexts
 }
@@ -2598,6 +2618,47 @@ ClassMethod GetSourceControlInclude(prefix As %String = {%request.URLPrefix}) As
         1: "")
 }
 
+XData ProductionConfigScript [ MimeType = text/javascript ]
+{
+    function checkProductionConfigLoad() {
+        timerState(false);
+    }
+
+    function checkProductionConfigUnload() {
+        timerState(true);
+    }
+
+    function timerState(start) {
+        if (window.parent && window.parent.opener && window.parent.opener.zenPage) {
+            if (start && window.parent.opener.zenPage.startTimers) {
+                window.parent.opener.zenPage.startTimers();
+            }
+            if (!start && window.parent.opener.zenPage.stopTimers) {
+                window.parent.opener.zenPage.stopTimers();
+            }
+        }
+    }
+}
+
+ClassMethod ProductionConfigScript() As %String [ CodeMode = objectgenerator ]
+{
+    do %code.WriteLine(" set html = ""<script type='text/javascript'>""_$c(13,10)")
+    set xdata = ##class(%Dictionary.XDataDefinition).IDKEYOpen(%compiledclass.Name,%compiledmethod.Name,,.sc)
+    $$$ThrowOnError(sc)
+    while 'xdata.Data.AtEnd {
+        set line = xdata.Data.ReadLine()
+        do %code.WriteLine(" set html = html_"_$$Quote^%qcr(line)_"_$c(13,10)")
+    }
+    do %code.WriteLine(" set html = html_$c(13,10)_""</script>""")
+    do %code.WriteLine(" quit html")
+    quit $$$OK
+}
+
+ClassMethod ProductionConfigBodyAttributes() As %String [ CodeMode = expression ]
+{
+"onload='checkProductionConfigLoad()' onbeforeunload='checkProductionConfigUnload()'"
+}
+
 ClassMethod UncommittedWithAction() As %Library.DynamicObject
 {
     do ##class(SourceControl.Git.Change).RefreshUncommitted()
@@ -2864,4 +2925,55 @@ ClassMethod InDefaultBranchBasicMode() As %Boolean
     quit 0
 }
 
+ClassMethod ConfigureFavoriteNamespaces(username As %String, newNamespaces As %String)
+{
+    // Delete all the GIT favorite links for the user 
+    &sql(DELETE FROM %SYS_Portal.Users WHERE Username = :username AND Page LIKE '%Git%')
+
+    set iterator = newNamespaces.%GetIterator()
+    while iterator.%GetNext(.key, .value) {
+        set installNamespace = value
+        
+        // Insert Git link
+        set caption = "Git: " _ installNamespace
+        set link = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/" _ installNamespace _ "/"
+        &sql(INSERT OR UPDATE INTO %SYS_Portal.Users (Username, Page, Data) VALUES (:username, :caption, :link))
+        
+        // Insert Git Pull link
+        set caption = "Git Pull: " _ installNamespace
+        set link = "/isc/studio/usertemplates/gitsourcecontrol/pull.csp?$NAMESPACE=" _ installNamespace
+        &sql(INSERT OR UPDATE INTO %SYS_Portal.Users (Username, Page, Data) VALUES (:username, :caption, :link))
+    }
+}
+
+ClassMethod GetFavoriteNamespaces(ByRef favNamespaces As %DynamicArray, ByRef nonFavNamespaces As %DynamicArray)
+{
+    set allNamespaces = ..GetContexts(1)
+    set iterator = allNamespaces.%GetIterator()
+
+    set username = $USERNAME
+    set pagePrefix = "Git:"    
+    &sql(DECLARE FavCursor CURSOR FOR SELECT Page into :page from %SYS_Portal.Users where username = :username and page %STARTSWITH :pagePrefix)
+
+    while iterator.%GetNext(.key, .value) {
+        set foundFlag = 0
+        &sql(OPEN FavCursor)
+        throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
+        &sql(FETCH FavCursor)
+        while (SQLCODE = 0) {
+            set pageValue = "Git: "_value 
+            if (page = pageValue) {
+                do favNamespaces.%Push(value)
+                set foundFlag = 1
+            }
+            &sql(FETCH FavCursor)
+        }
+        &sql(CLOSE FavCursor)
+
+        if ('foundFlag) {
+            do nonFavNamespaces.%Push(value)
+        }
+    }
+}
+
 }

cls/SourceControl/Git/WebUIDriver.cls

@@ -156,7 +156,8 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do discardsInBranch.%ToJSON(%data)
                 set handled = 1
             } elseif (pathStart = "contexts") {
-                set contexts = ##class(SourceControl.Git.Utils).GetContexts()
+                set onlyNamespaces = %request.Data("onlyNamespaces", 1)
+                set contexts = ##class(SourceControl.Git.Utils).GetContexts(onlyNamespaces)
                 do contexts.%ToJSON(%data)
                 set handled = 1
             }

cls/_zpkg/isc/sc/git/Socket.cls

@@ -13,6 +13,7 @@ ClassMethod Run()
 {
 	If %request.Get("method") = "preview" {
 		Set branchName = ##class(SourceControl.Git.Utils).GetCurrentBranch()
+		Write !,"Current namespace: ",$NAMESPACE
 		Write !,"Current branch: ",branchName
 		Do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "fetch")
 		Kill errStream, outStream

csp/gitprojectsettings.csp

@@ -151,6 +151,18 @@ body {
         }
             set i = i+1
         }
+
+        set i = 1
+        set contexts = []
+
+        while ( $Data(%request.Data("favNamespace",i)) ){
+        if ($Get(%request.Data("favNamespace",i)) '= "") {
+            do contexts.%Push($Get(%request.Data("favNamespace",i)))
+        }
+        set i = i+1
+        }
+
+        set settings.favoriteNamespaces = contexts
     }
     do settings.%Save()
 }
@@ -591,6 +603,27 @@ body {
             </div> -->
         </div>
 
+        <div class="form-group row mb-3">
+            <label for="addToFav" class="offset-sm-1 col-sm-3 col-form-label"  data-toggle="tooltip" data-placement="top" title="Favorite namespaces for user to add link on Home page.">Favorite Namespaces</label>
+            <div class="col-sm-7">
+                <select multiple class="form-control" id="addToFav" name="favNamespace">
+                <server>
+                    set nonFavNamespaces = []
+                    set selectedNamespaces = []
+                    do ##class(SourceControl.Git.Utils).GetFavoriteNamespaces(.selectedNamespaces,.nonFavNamespaces)
+                    set iterator = selectedNamespaces.%GetIterator()
+                    while iterator.%GetNext(.key, .value) {
+                        &html<<option selected value=#(value)#>#(value)#</option>>
+                    }
+                    set iterator = nonFavNamespaces.%GetIterator()
+                    while iterator.%GetNext(.key, .value) {   
+                        &html<<option value=#(value)#>#(value)#</option>>
+                    }
+                </server>
+                </select>
+                <small> Hold the [Ctrl] or [Cmd] key while clicking to select multiple namespaces.</small>
+            </div>
+        </div>
         <br/>
         </fieldset>