Merge branch 'main' into issue-356

Author: isc-etamarch

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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)
+- Added "Export System Default Settings" menu item (#544)
 
 ### Fixed
 - Fixed display of other users' username in workspace view on Unix (#530)
@@ -24,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added feedback to settings page (#550)
 - Fix "Home" navigation to point to current namespace (#548)
 - 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)
 - Remove leading/trailing spaces from input to Configure() (#356)
 
 ## [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, 

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

@@ -258,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
@@ -1622,6 +1624,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
 {
@@ -2594,6 +2603,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()

csp/sync.csp

@@ -84,8 +84,16 @@
 
 
         </style>
+        <script type="text/javascript">
+        function disableInput() {
+            document.getElementById('syncMsg').disabled = true;
+            document.getElementById('syncBtn').innerHTML = 'Syncing...';
+            document.getElementById('syncBtn').disabled = true;
+        }
+        </script>
+        #(##class(SourceControl.Git.Utils).ProductionConfigScript())#
     </head>
-    <body>
+    <body #(##class(SourceControl.Git.Utils).ProductionConfigBodyAttributes())#>
         <server>
             set settings = ##class(SourceControl.Git.Settings).%New()
 
@@ -158,13 +166,6 @@
 
         </div>
     </body>
-    <script type="text/javascript">
-    function disableInput() {
-        document.getElementById('syncMsg').disabled = true;
-        document.getElementById('syncBtn').innerHTML = 'Syncing...';
-        document.getElementById('syncBtn').disabled = true;
-    }
-    </script>
     <script language="cache" method="PerformSync" arguments="syncMsg:%String">
         &js<document.getElementById('outputContainer').style.display = 'block'>
         &js<document.getElementById('outputHeader').style.display = 'block'>

git-webui/release/share/git-webui/webui/index.html

@@ -28,7 +28,7 @@
         <link rel="stylesheet" type="text/css" href="css/git-webui.css" />
         <link rel="icon" href="img/git-icon.png" />
     </head>
-    <body>
+    <body {{bodyAttrs}}>
         <!-- Error modal dialog -->
         <div class="modal fade" id="error-modal" tabindex="-1" role="dialog">
             <div class="modal-dialog">

git-webui/src/share/git-webui/webui/index.html

@@ -28,7 +28,7 @@
         <link rel="stylesheet" type="text/css" href="css/git-webui.css" />
         <link rel="icon" href="img/git-icon.png" />
     </head>
-    <body>
+    <body {{bodyAttrs}}>
         <!-- Error modal dialog -->
         <div class="modal fade" id="error-modal" tabindex="-1" role="dialog">
             <div class="modal-dialog">