Merge pull request #563 from intersystems/fix-542

isc-tleavitt · web-flow · commit bb716fb81ce5 · 2024-10-22T10:41:45.000-04:00
fix: production config page no longer closes UIs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,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)
 
 ## [2.6.0] - 2024-10-07
 
diff --git a/cls/SourceControl/Git/StreamServer.cls b/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
     }
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -2603,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()
diff --git a/csp/sync.csp b/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'>
diff --git a/git-webui/release/share/git-webui/webui/index.html b/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">
diff --git a/git-webui/src/share/git-webui/webui/index.html b/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">

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,13 @@ ClassMethod OnPage() As %Status`
`8`	`8`	`{`
`9`	`9`	`if (%stream '= $$$NULLOREF) && $data(%base)#2 {`
`10`	`10`	`set sourceControlInclude = ##class(SourceControl.Git.Utils).GetSourceControlInclude()`
	`11`	`+ set bodyAttrs = ##class(SourceControl.Git.Utils).ProductionConfigBodyAttributes()`
	`12`	`+ set configScript = ##class(SourceControl.Git.Utils).ProductionConfigScript()`
`11`	`13`	`while '%stream.AtEnd {`
`12`		`- set text = %stream.Read()`
	`14`	`+ set text = %stream.Read(1000000)`
`13`	`15`	`set text = $replace(text,"{{baseHref}}",..EscapeHTML(%base))`
`14`		`- write $replace(text,"{{sourceControlInclude}}",sourceControlInclude)`
	`16`	`+ set text = $replace(text,"{{bodyAttrs}}",bodyAttrs)`
	`17`	`+ write $replace(text,"{{sourceControlInclude}}",sourceControlInclude_$$$NL_configScript)`
`15`	`18`	`}`
`16`	`19`	`quit $$$OK`
`17`	`20`	`}`