Merge branch 'main' into safeguard-discard

Author: isc-etamarch

.github/workflows/main.yml

@@ -63,6 +63,7 @@ jobs:
         run: |
           echo "zpm \"install testcoverage\":1:1" > install-testcoverage
           docker exec --interactive $instance iris session $instance -B < install-testcoverage
+          chmod 777 $GITHUB_WORKSPACE
           
       - name: Build and Test
         run: |
@@ -72,7 +73,12 @@ jobs:
           echo "do \$System.OBJ.CompilePackage(\"$test_package\",\"ckd\") " > test.script
           # Run tests
           echo "zpm \"$package test -only $test_flags\":1:1" >> test.script
-          docker exec --interactive $instance iris session $instance -B < build.script && docker exec --interactive $instance iris session $instance -B < test.script &&bash <(curl -s https://codecov.io/bash)
+          docker exec --interactive $instance iris session $instance -B < build.script && docker exec --interactive $instance iris session $instance -B < test.script
+          
+      - name: Upload coverage reports to Codecov with GitHub Action
+        uses: codecov/codecov-action@v4.2.0
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Produce CE Artifact
         run: |

CHANGELOG.md

@@ -10,10 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Discards safeguarded by discard stash and warning modal (#455)
 - Files in uncommitted queue in any namespace warn users when opened except for in VSCode (#370)
+- Added link back to IRIS management portal from Settings, Git WebUI pages (#449)
+- Added Import all and Import All (Force) to basic mode menu (#498)
 
 ### Fixed
 - Changed prompts in configure from 0/1 to no/yes (#461)
 - Added warnings when user is using incompatible git version (#488)
+- Fixed the back button navigation between WebUI and Settings page (#361)
+- Basic mode Sync operation now imports items changed on the remote merge branch (#506)
+- Fetch diff output uses correct remote branch (#509)
 
 ## [2.5.0] - 2024-09-24
 

cls/SourceControl/Git/Extension.cls

@@ -145,6 +145,8 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
             set Enabled = $CASE(name,
                 "Status": 1,
                 "GitWebUI" : 1,
+                "Import": 1,
+                "ImportForce": 1,
                 "NewBranch": 1,
                 "SwitchBranch": 1,
                 "Sync": 1,

cls/SourceControl/Git/Utils.cls

@@ -441,7 +441,7 @@ ClassMethod MergeDefaultRemoteBranch(Output alert As %String = "") As %Boolean
         do ..RunGitWithArgs(.errStream, .outStream, "fetch", "origin", defaultMergeBranch_":"_defaultMergeBranch)
         do ..PrintStreams(errStream, outStream)
 
-        do ..RunGitWithArgs(,.outStream, "rev-parse", defaultMergeBranch)
+        do ..RunGitWithArgs(,.outStream, "rev-parse", "HEAD")
         set startSha = outStream.ReadLine()
 
         // Start a transaction so code changes can be rolled back
@@ -535,7 +535,7 @@ ClassMethod Fetch(ByRef diffFiles) As %Status
     do ..RunGitCommand("fetch", .errStream, .outStream)
     write !, "Fetch done"
     kill errStream, outStream
-    do ..RunGitCommand("diff", .errStream, .outStream, "..origin", "--name-only")
+    do ..RunGitCommand("diff", .errStream, .outStream, "..origin/"_..GetCurrentBranch(), "--name-only")
     set diffFiles = ""
     while (outStream.AtEnd = 0) {
         set diffFiles = diffFiles_$listbuild(outStream.ReadLine())
@@ -2694,4 +2694,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
-

cls/SourceControl/Git/WebUIDriver.cls

@@ -22,6 +22,10 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             set responseJSON = ..GetPackageVersion()
         } elseif $extract(pagePath, 6, *) = "git-version" {
             set responseJSON = ..GetGitVersion()
+        } elseif $extract(pagePath,6,*) = "home"{
+            set responseJSON = {
+                "url": (..GetHomeURL())
+            }
         } else {
             set %response.Status = ##class(%CSP.REST).#HTTP404NOTFOUND
             set responseJSON = {"error":("invalid URI: " _ pagePath)}
@@ -394,4 +398,13 @@ ClassMethod GetGitVersion() As %Library.DynamicObject
     quit {"version": (version)}
 }
 
+ClassMethod GetHomeURL() As %String
+{
+    set prefix = ""
+    if $IsObject($Get(%request)) {
+        set prefix = $Piece(%request.Application,%request.AppMatch)
+    }
+    quit prefix_"/csp/sys/UtilHome.csp"
+}
+
 }

csp/gitprojectsettings.csp

@@ -40,6 +40,9 @@ body {
 #webuiURL {
     display: none;
 }
+#homeURL {
+    display: none;
+}
 
 .custom-switch {
     padding: 0.4rem 0.5rem 0 2.75rem;
@@ -73,6 +76,7 @@ body {
  set version = ##class(SourceControl.Git.Utils).GetPackageVersion()
  set webuiURL = "/isc/studio/usertemplates/gitsourcecontrol/webuidriver.csp/"_namespace_"/?CSPSHARE=1"
  set webuiURL = ##class(SourceControl.Git.WebUIDriver).GetURLPrefix(%request, webuiURL)
+ set homeURL = ##class(SourceControl.Git.WebUIDriver).GetHomeURL()
 
  set settings = ##class(SourceControl.Git.Settings).%New()
  if $Data(%request.Data("gitsettings",1)) {
@@ -128,12 +132,17 @@ body {
         <input type="hidden" name="gitsettings" value="1" />
         <div class="col-sm-12"><br></div>
         <div class="row">
-            <div class="offset-sm-1 col-sm-8">
+            <div class="offset-sm-1 col-sm-7" id="settingsTitle">
                 <h1>Git Project Settings</h1>
                 <h3> Package version: #(version)# </h3>
             </div>
 
-            <div class="col-sm-2">
+            <div class="col-sm-4" id="settingsNavBtn">
+                <button class="btn btn-lg btn-outline-dark" id="goToHome">Home
+                </button>
+                <div id="homeURL">
+                    #(homeURL)#
+                </div>
                 <button class="btn btn-lg btn-outline-dark" id="goToWebUI">Go to WebUI
                 </button>
                 <div id="webuiURL">
@@ -542,6 +551,17 @@ body {
 <script src="js/popper.min.js"></script>
 <script src="js/bootstrap.min.js"></script>
 <script type="text/javascript">
+
+// Removing the home button if not a top-level page
+if ((window !== window.parent) || (navigator.userAgent.indexOf('MSIE 7') > -1) || (navigator.userAgent.indexOf(" Code/") > -1)) {
+    $("#goToHome", self.element).remove();
+    $("#homeURL", self.element).remove();
+    $('#settingsTitle').removeClass('col-sm-7');
+    $('#settingsNavBtn').removeClass('col-sm-4');
+    $('#settingsTitle').addClass('col-sm-8');
+    $('#settingsNavBtn').addClass('col-sm-2');
+}
+
 function getSocket(urlPostfix) {
     var socketURL = window.location.href.replace('http','ws').replace('gitprojectsettings.csp','_zpkg.isc.sc.git.Socket.cls') + "&" + urlPostfix;
 	return new WebSocket(socketURL);
@@ -633,8 +653,12 @@ $(function()
 
     $(document).on('click', "#goToWebUI", function(e){
         e.preventDefault();
-        console.log($("#webuiURL")[0].innerText);
-        window.location.replace($("#webuiURL")[0].innerText);
+        window.location.href = $("#webuiURL")[0].innerText;
+    })
+
+    $(document).on('click', "#goToHome", function(e){
+        e.preventDefault();
+        window.location.href = $("#homeURL")[0].innerText;
     })
 });
 

git-webui/release/share/git-webui/webui/css/git-webui.css

@@ -183,7 +183,7 @@ body {
   padding-bottom: 100px;
 }
 #sidebar #sidebar-content > :first-child,
-#sidebar #sidebar-content > :nth-last-child(3) {
+#sidebar #sidebar-content > :last-child {
   border-top: 1px solid #5e5e5e;
 }
 #sidebar #sidebar-content h4:before {
@@ -230,7 +230,7 @@ body {
 }
 #sidebar #sidebar-content #sidebar-vscode {
   position: absolute;
-  bottom: 80px;
+  bottom: 90px;
   width: 16.7em;
   background-color: #333333;
 }
@@ -242,7 +242,7 @@ body {
 }
 #sidebar #sidebar-content #sidebar-context {
   position: absolute;
-  bottom: 40px;
+  bottom: 50px;
   width: 16.7em;
   background-color: #333333;
 }
@@ -254,7 +254,19 @@ body {
 }
 #sidebar #sidebar-content #sidebar-settings {
   position: absolute;
-  bottom: 0px;
+  bottom: 10px;
+  width: 16.7em;
+  background-color: #333333;
+}
+#sidebar #sidebar-content #sidebar-home h4 {
+  padding: 0px;
+}
+#sidebar #sidebar-content #sidebar-home h4:before {
+  content: url(../img/home.svg);
+}
+#sidebar #sidebar-content #sidebar-home {
+  position: absolute;
+  bottom: 130px;
   width: 16.7em;
   background-color: #333333;
 }

git-webui/release/share/git-webui/webui/img/home.svg

@@ -69,6 +69,12 @@ $.get("api/settings", function(settingsURL){
     webui.settingsURL = url.url;
 });
 
+webui.homeURL = "";
+$.get("api/home", function(homeURL){
+    var url = JSON.parse(homeURL);
+    webui.homeURL = url.url;
+});
+
 webui.showSuccess = function(message) {
     var messageBox = $("#message-box");
     messageBox.empty();
@@ -913,7 +919,11 @@ webui.SideBarView = function(mainView, noEventHandlers) {
     }
 
     self.goToSettingsPage = function() {
-        window.location.replace(webui.settingsURL);
+        window.location.href = webui.settingsURL;
+    }
+
+    self.goToHomePage = function() {
+        window.location.href = webui.homeURL;
     }
 
     self.fetchSection = function(section, title, id, gitCommand) {
@@ -989,14 +999,17 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
-                                '<section id="sidebar-vscode">' +
-                                    '<h4><a href="vscode-workspace" target="_blank">Code Workspace</a></h4>' +
+                                '<section id="sidebar-settings">' +
+                                    '<h4>Settings</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-context" data-toggle="tooltip" data-placement="right" title="' + self.currentContext + '">' + 
                                     '<h4>Change Context</h4>' +
                                 '</section>' +
-                                '<section id="sidebar-settings">' +
-                                    '<h4>Settings</h4>' +
+                                '<section id="sidebar-vscode">' +
+                                    '<h4><a href="vscode-workspace" target="_blank">Code Workspace</a></h4>' +
+                                '</section>' +
+                                '<section id="sidebar-home">' +
+                                    '<h4>Home</h4>' +
                                 '</section>' +
                             '</div>' +
                         '</div>')[0];
@@ -1029,8 +1042,13 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $('.btn-prune-remote-branches', self.element).click(self.pruneRemoteBranches);
         $("#sidebar-settings", self.element).click(self.goToSettingsPage);
         $("#sidebar-context", self.element).click(self.changeContextGet);
+        $("#sidebar-home", self.element).click(self.goToHomePage);
     }
 
+    // Removing the link to home if not a top-level page
+    if ((window !== window.parent) || (navigator.userAgent.indexOf('MSIE 7') > -1) || (navigator.userAgent.indexOf(" Code/") > -1)) {
+        $("#sidebar-home", self.element).remove();
+    }
 
     self.getPackageVersion();
     self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");

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

@@ -257,7 +257,7 @@ body {
         color: @gray-lighter;
         padding-bottom: 100px;
 
-        > :first-child, >:nth-last-child(3) {
+        > :first-child, >:last-child {
             border-top: 1px solid darken(@separator-line, 50%);
         }
 
@@ -319,7 +319,7 @@ body {
 
         #sidebar-vscode {
             position: absolute;
-            bottom: 80px;
+            bottom: 90px;
             width: 16.7em;
             background-color: rgba(51, 51, 51, 1);
         }
@@ -334,7 +334,7 @@ body {
 
         #sidebar-context {
             position: absolute;
-            bottom: 40px;
+            bottom: 50px;
             width: 16.7em;
             background-color: rgba(51, 51, 51, 1);
         }
@@ -349,7 +349,22 @@ body {
 
         #sidebar-settings {
             position: absolute;
-            bottom: 0px;
+            bottom: 10px;
+            width: 16.7em;
+            background-color: rgba(51, 51, 51, 1);
+        }
+
+        #sidebar-home h4 {
+            padding: 0px;
+        }
+
+        #sidebar-home h4:before {
+            content: url(../img/home.svg);
+        }
+
+        #sidebar-home {
+            position: absolute;
+            bottom: 130px;
             width: 16.7em;
             background-color: rgba(51, 51, 51, 1);
         }