Merge branch 'main' into fix-468

isc-etamarch · isc-etamarch · commit 4631654ffa36 · 2024-10-21T11:29:50.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### 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)
 
 ## [2.6.0] - 2024-10-07
diff --git a/README.md b/README.md
@@ -41,15 +41,18 @@ For those with less experience using source control, we recommend this [page](/d
 ### Health Connect Cloud
 git-source control is the recommended source control for Health Connect Cloud. [This page](/docs/hcc.md) covers HCC specific usage of git-source-control, including the recommended development workflow, initial setup, and CICD pipelining.
 
-### Studio
+### VSCode
+The same right click menus as in Studio live under "Server Source Control..." when right-clicking in a file (in the editor) or on a file when exploring an isfs folder. The top level "source control" menu is accessible through the command palette or the source control icon in the top right of the editor.
+
+### Studio 
+
+Note: Studio has been deprecated. VSCode is the IDE recommended by InterSystems.
+
 Add a file for tracking by right-clicking on it in the workspace/project view and choosing Git &gt; Add.
 This same menu also has options to remove (stop tracking the file), discard changes (revert to the index), or commit changes.
 
 You can browse file history and commit changes through a user interface launched from the top level Git > "Launch Git UI" menu item. There is also a page for configuring settings.
 
-### VSCode
-The same right click menus as in Studio live under "Server Source Control..." when right-clicking in a file (in the editor) or on a file when exploring an isfs folder. The top level "source control" menu is accessible through the command palette or the source control icon in the top right of the editor.
-
 ## Notes
 
 ### Menu Options
diff --git a/cls/SourceControl/Git/Extension.cls b/cls/SourceControl/Git/Extension.cls
@@ -81,6 +81,15 @@ Method UserAction(Type As %Integer, Name As %String, InternalName As %String, Se
         quit $$$OK
     }
 
+    if (menuItemName = "Commit") {
+        set defaultBasic = ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode()
+        if (defaultBasic) {
+            Set Target = "WARNING: Please create a new branch before committing."
+            set Action = 6
+            quit $$$OK
+        }
+    }
+
     if (menuItemName = "Commit") || (menuItemName = "Sync") {
         if ..CheckCommitterIdentity(settings, .Action, .Target) {
             quit $$$OK
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -535,6 +535,11 @@ ClassMethod Sync(Msg As %String, Output alert As %String) As %Status
     if '..HasRemoteRepo() {
         write "No remote repository configured: skipping fetch, pull and push"
         do ..SyncCommit(Msg)
+    } elseif ..InDefaultBranchBasicMode() {
+        // Do not commit to default merge branch in basic mode
+        write "In Basic mode on default merge branch: skipping commit and push"
+        do ..Fetch()
+        do ..Pull()
     } else {
         do ..Fetch()
         do ..Pull()
@@ -2843,6 +2848,18 @@ ClassMethod SetConfiguredRemote(url) As %String
     quit output
 }
 
+// Returns true if the current branch is the default merge branch and we are in basic mode
+
+ClassMethod InDefaultBranchBasicMode() As %Boolean
+{
+    set basicMode = ..BasicMode()
+    set default = ..DefaultMergeBranch()
+    do ##class(SourceControl.Git.Utils).RunGitCommand("branch",.err,.out,"--show-current")
+    set current = out.ReadLine()
+    if (basicMode && (default = current)) { quit 1 }
+    quit 0
+}
+
 ClassMethod ConfigureFavoriteNamespaces(username As %String, newNamespaces As %String)
 {
     // Delete all the GIT favorite links for the user 
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
@@ -32,6 +32,10 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             set responseJSON = {
                 "environment": (##class(SourceControl.Git.Utils).EnvironmentName()) 
             }
+        } elseif $extract(pagePath, 6, *) = "basic-and-default" {
+            set responseJSON = {
+                "basic-and-default": (##class(SourceControl.Git.Utils).InDefaultBranchBasicMode())
+            }    
         } else {
             set %response.Status = ##class(%CSP.REST).#HTTP404NOTFOUND
             set responseJSON = {"error":("invalid URI: " _ pagePath)}
diff --git a/csp/sync.csp b/csp/sync.csp
@@ -57,6 +57,32 @@
                 border-radius: 4px;
             }
 
+            /* The alert message box */
+            .alert {
+            padding: 20px;
+            background-color: #f44336; /* Red */
+            color: white;
+            margin-bottom: 15px;
+            }
+
+            /* The close button */
+            .closebtn {
+            margin-left: 15px;
+            color: white;
+            font-weight: bold;
+            float: right;
+            font-size: 22px;
+            line-height: 20px;
+            cursor: pointer;
+            transition: 0.3s;
+            }
+
+            /* When moving the mouse over the close button */
+            .closebtn:hover {
+            color: black;
+            }
+
+
         </style>
     </head>
     <body>
@@ -83,6 +109,16 @@
             <h1 class="text-center">Sync Repository</h1>
             <div class="row">
                 <div class="offset-sm-2 col-sm-8">
+                    <server>
+                        if ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode() {
+                            &html<
+                                <div class = "alert">
+                                    <span class="closebtn" onclick="this.parentElement.style.display='none';">&times;</span>  
+                                    <strong>Warning!</strong> Please change branches to make sure your changes are committed.
+                                </div>
+                            >
+                        }
+                    </server>
                     <div style="display: #(fileSectionDisplay)#">
                         <h3 class="section-header">Files to be committed with sync:</h3>
                         <ul class="list-group">
diff --git a/git-webui/release/share/git-webui/webui/css/git-webui.css b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -192,12 +192,12 @@ body {
 }
 #sidebar #sidebar-content h4 {
   vertical-align: baseline;
-  margin: 0.5em 0 0 0;
+  margin: 0.25em 0 0 0;
 }
 #sidebar #sidebar-content > section h4 {
   font-size: 125%;
   cursor: pointer;
-  padding: 10px 0;
+  padding: 5px 0;
 }
 #sidebar #sidebar-content #sidebar-workspace h4:before {
   content: url(../img/computer.svg);
@@ -208,6 +208,9 @@ body {
 #sidebar #sidebar-content #sidebarDiscarded h4:before {
   content: url(../img/discarded.svg);
 }
+#sidebar #sidebar-content #sidebarDiscarded h4 {
+  border-bottom: 1px solid #5e5e5e;
+}
 #sidebar #sidebar-content #sidebar-remote h4:before {
   content: url(../img/daemon.svg);
 }
@@ -216,6 +219,9 @@ body {
 #sidebar #sidebar-content #sidebar-switch-branches h4:before {
   content: url(../img/branch.svg);
 }
+#sidebar #sidebar-content #space-filler {
+  padding-bottom: 50px;
+}
 #sidebar #sidebar-content #sidebar-tags h4:before {
   content: url(../img/tag.svg);
 }
@@ -224,49 +230,53 @@ body {
 }
 #sidebar #sidebar-content #sidebar-vscode h4 {
   padding: 0px;
+  margin-bottom: 10px;
 }
 #sidebar #sidebar-content #sidebar-vscode h4:before {
   content: url(../img/file.svg);
 }
 #sidebar #sidebar-content #sidebar-vscode {
   position: absolute;
-  bottom: 90px;
+  bottom: 60px;
   width: 16.7em;
   background-color: #333333;
 }
 #sidebar #sidebar-content #sidebar-context h4 {
   padding: 0px;
+  margin-bottom: 10px;
 }
 #sidebar #sidebar-content #sidebar-context h4:before {
   content: url(../img/context.svg);
 }
 #sidebar #sidebar-content #sidebar-context {
   position: absolute;
-  bottom: 50px;
+  bottom: 30px;
   width: 16.7em;
   background-color: #333333;
 }
 #sidebar #sidebar-content #sidebar-settings h4 {
   padding: 0px;
+  margin-bottom: 10px;
 }
 #sidebar #sidebar-content #sidebar-settings h4:before {
   content: url(../img/gear-fill.svg);
 }
 #sidebar #sidebar-content #sidebar-settings {
   position: absolute;
-  bottom: 10px;
+  bottom: 0;
   width: 16.7em;
   background-color: #333333;
 }
 #sidebar #sidebar-content #sidebar-home h4 {
   padding: 0px;
+  margin-bottom: 10px;
 }
 #sidebar #sidebar-content #sidebar-home h4:before {
   content: url(../img/home.svg);
 }
 #sidebar #sidebar-content #sidebar-home {
   position: absolute;
-  bottom: 130px;
+  bottom: 90px;
   width: 16.7em;
   background-color: #333333;
 }
diff --git a/git-webui/release/share/git-webui/webui/img/discarded.svg b/git-webui/release/share/git-webui/webui/img/discarded.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#eee"><path d="m366-589 86-144-43-72q-14-23-41.5-23T326-805l-84 141 124 75Zm380 253-87-144 125-72 65 107q10 16 10.5 34t-7.5 35q-9 19-26.5 29.5T787-336h-41ZM624-74 480-218l144-144v74h184l-52 104q-10 18-27.5 29T691-144h-67v70Zm-362-70q-17 0-32-9t-23-25q-7-14-6-29t9-29l31-52h167v144H262Zm-95-115-59-117q-8-17-7-35t10-34l20-34-62-37 198-49 49 198-62-37-87 145Zm518-319-198-50 62-37-119-199h127q19 0 35 9.5t26 25.5l54 90 62-37-49 198Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="16px" viewBox="0 -960 960 960" width="16px" fill="#eee"><path d="m366-589 86-144-43-72q-14-23-41.5-23T326-805l-84 141 124 75Zm380 253-87-144 125-72 65 107q10 16 10.5 34t-7.5 35q-9 19-26.5 29.5T787-336h-41ZM624-74 480-218l144-144v74h184l-52 104q-10 18-27.5 29T691-144h-67v70Zm-362-70q-17 0-32-9t-23-25q-7-14-6-29t9-29l31-52h167v144H262Zm-95-115-59-117q-8-17-7-35t10-34l20-34-62-37 198-49 49 198-62-37-87 145Zm518-319-198-50 62-37-119-199h127q19 0 35 9.5t26 25.5l54 90 62-37-49 198Z"/></svg>
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -994,20 +994,21 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                     '<h4>Discarded Files</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-local-branches">' +
-                                    '<h4 class="mt-3">Local Branches' +
+                                    '<h4 class="mt-1">Local Branches' +
                                     '<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" >' +
                                         webui.circlePlusIcon+
                                     '</button>' + '</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-remote-branches">' +
-                                    '<h4 class="mt-3">Remote Branches' +
+                                    '<h4 class="mt-1">Remote Branches' +
                                     '<button type="button" class="btn btn-default btn-sidebar-icon btn-prune-remote-branches shadow-none" >'+
                                         webui.refreshIcon+
                                       '</button>' +'</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
+                                '<section id="space-filler"></section>'+
                                 '<section id="sidebar-settings">' +
                                     '<h4>Settings</h4>' +
                                 '</section>' +
@@ -2600,13 +2601,20 @@ webui.NewChangedFilesView = function(workspaceView) {
                 });
                 $("#commitBtn").off("click");
                 $("#commitBtn").on("click", function() {
-                    if (selectedItemsFromOtherUser.length > 0) {
-                        self.confirmActionOnOtherUsersChanges("commit");
-                    } else {
-                        var commitMessage = $('#commitMsg').val();
-                        self.commit(commitMessage, $("#commitMsgDetail").val());
-                    }
-                    
+                    // Make sure we are not commiting to default merge branch in basic mode
+                    $.get("api/basic-and-default", function (data) {
+                        var basicAndDefault = JSON.parse(data)["basic-and-default"]
+                        if (basicAndDefault == "1") {
+                            self.noCommitsOnDefault();
+                        } else {
+                            if (selectedItemsFromOtherUser.length > 0) {
+                                self.confirmActionOnOtherUsersChanges("commit");
+                            } else {
+                                var commitMessage = $('#commitMsg').val();
+                                self.commit(commitMessage, $("#commitMsgDetail").val());
+                            }
+                        }
+                    })                    
                 });
 
                 $("#amendBtn").off("click");
@@ -2751,6 +2759,55 @@ webui.NewChangedFilesView = function(workspaceView) {
         });
     }
 
+    // Popup for when trying to commit to default merge branch in basic mode
+    self.noCommitsOnDefault = function () {
+        function removePopup(popup) {
+            $(popup).children(".modal-fade").modal("hide");
+            $(".modal-backdrop").remove();
+            $("#noCommitsDefault").remove();
+        }
+
+        var popup = $(
+            '<div class="modal fade" tabindex="-1" id="noCommitsDefault" role="dialog" data-backdrop="static">' +
+                '<div class="modal-dialog modal-md" role="document">' +
+                    '<div class="modal-content">' + 
+                        '<div class="modal-header">' +
+                            '<h5 class="modal-title">Cannot commit to Default Branch</h5>' +
+                            '<button type="button" class="btn btn-default close" data-dismiss="modal">' + webui.largeXIcon + '</button>' +
+                        '</div>' +
+                        '<div class="modal-body">' + 
+                            '<div class="row">' +
+                                '<div class="col-sm-1">' +
+                                    webui.warningIcon +
+                                '</div>' +
+                                '<div class="col-sm-11">' +
+                                    '<p>You cannot commit directly to the default merge branch while using basic mode. Please switch to another branch.</p>' + 
+                                '</div>' +
+                            '</div>' +
+                        '</div>' +
+                        '<div class="modal-footer"></div>' +
+                    '</div>' + 
+                '</div>' +
+            '</div>'
+        )[0];
+
+        $("body").append(popup);
+
+        var popupFooter = $(".modal-footer", popup)[0];
+        webui.detachChildren(popupFooter);
+
+        $(
+            '<button class="btn btn-sm btn-secondary action-btn" id="noCommitDefaultButton">Ok</button>'
+        ).appendTo(popupFooter);
+
+        $(popup).modal('show');
+
+        $("#noCommitsDefault").find(".close, #noCommitDefaultButton").click(function() {
+            removePopup(popup);
+        })
+
+    };
+
     self.confirmActionOnOtherUsersChanges = function(action) {
             function removeWarningModal(popup) {
                 $(popup).children(".modal-fade").modal("hide");
diff --git a/git-webui/src/share/git-webui/webui/css/git-webui.less b/git-webui/src/share/git-webui/webui/css/git-webui.less
diff --git a/git-webui/src/share/git-webui/webui/img/discarded.svg b/git-webui/src/share/git-webui/webui/img/discarded.svg
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js

Original file line number	Diff line number	Diff line change
`@@ -192,12 +192,12 @@ body {`
`192`	`192`	`}`
`193`	`193`	`#sidebar #sidebar-content h4 {`
`194`	`194`	`vertical-align: baseline;`
`195`		`- margin: 0.5em 0 0 0;`
	`195`	`+ margin: 0.25em 0 0 0;`
`196`	`196`	`}`
`197`	`197`	`#sidebar #sidebar-content > section h4 {`
`198`	`198`	`font-size: 125%;`
`199`	`199`	`cursor: pointer;`
`200`		`- padding: 10px 0;`
	`200`	`+ padding: 5px 0;`
`201`	`201`	`}`
`202`	`202`	`#sidebar #sidebar-content #sidebar-workspace h4:before {`
`203`	`203`	`content: url(../img/computer.svg);`
`@@ -208,6 +208,9 @@ body {`
`208`	`208`	`#sidebar #sidebar-content #sidebarDiscarded h4:before {`
`209`	`209`	`content: url(../img/discarded.svg);`
`210`	`210`	`}`
	`211`	`+#sidebar #sidebar-content #sidebarDiscarded h4 {`
	`212`	`+ border-bottom: 1px solid #5e5e5e;`
	`213`	`+}`
`211`	`214`	`#sidebar #sidebar-content #sidebar-remote h4:before {`
`212`	`215`	`content: url(../img/daemon.svg);`
`213`	`216`	`}`
`@@ -216,6 +219,9 @@ body {`
`216`	`219`	`#sidebar #sidebar-content #sidebar-switch-branches h4:before {`
`217`	`220`	`content: url(../img/branch.svg);`
`218`	`221`	`}`
	`222`	`+#sidebar #sidebar-content #space-filler {`
	`223`	`+ padding-bottom: 50px;`
	`224`	`+}`
`219`	`225`	`#sidebar #sidebar-content #sidebar-tags h4:before {`
`220`	`226`	`content: url(../img/tag.svg);`
`221`	`227`	`}`
`@@ -224,49 +230,53 @@ body {`
`224`	`230`	`}`
`225`	`231`	`#sidebar #sidebar-content #sidebar-vscode h4 {`
`226`	`232`	`padding: 0px;`
	`233`	`+ margin-bottom: 10px;`
`227`	`234`	`}`
`228`	`235`	`#sidebar #sidebar-content #sidebar-vscode h4:before {`
`229`	`236`	`content: url(../img/file.svg);`
`230`	`237`	`}`
`231`	`238`	`#sidebar #sidebar-content #sidebar-vscode {`
`232`	`239`	`position: absolute;`
`233`		`- bottom: 90px;`
	`240`	`+ bottom: 60px;`
`234`	`241`	`width: 16.7em;`
`235`	`242`	`background-color: #333333;`
`236`	`243`	`}`
`237`	`244`	`#sidebar #sidebar-content #sidebar-context h4 {`
`238`	`245`	`padding: 0px;`
	`246`	`+ margin-bottom: 10px;`
`239`	`247`	`}`
`240`	`248`	`#sidebar #sidebar-content #sidebar-context h4:before {`
`241`	`249`	`content: url(../img/context.svg);`
`242`	`250`	`}`
`243`	`251`	`#sidebar #sidebar-content #sidebar-context {`
`244`	`252`	`position: absolute;`
`245`		`- bottom: 50px;`
	`253`	`+ bottom: 30px;`
`246`	`254`	`width: 16.7em;`
`247`	`255`	`background-color: #333333;`
`248`	`256`	`}`
`249`	`257`	`#sidebar #sidebar-content #sidebar-settings h4 {`
`250`	`258`	`padding: 0px;`
	`259`	`+ margin-bottom: 10px;`
`251`	`260`	`}`
`252`	`261`	`#sidebar #sidebar-content #sidebar-settings h4:before {`
`253`	`262`	`content: url(../img/gear-fill.svg);`
`254`	`263`	`}`
`255`	`264`	`#sidebar #sidebar-content #sidebar-settings {`
`256`	`265`	`position: absolute;`
`257`		`- bottom: 10px;`
	`266`	`+ bottom: 0;`
`258`	`267`	`width: 16.7em;`
`259`	`268`	`background-color: #333333;`
`260`	`269`	`}`
`261`	`270`	`#sidebar #sidebar-content #sidebar-home h4 {`
`262`	`271`	`padding: 0px;`
	`272`	`+ margin-bottom: 10px;`
`263`	`273`	`}`
`264`	`274`	`#sidebar #sidebar-content #sidebar-home h4:before {`
`265`	`275`	`content: url(../img/home.svg);`
`266`	`276`	`}`
`267`	`277`	`#sidebar #sidebar-content #sidebar-home {`
`268`	`278`	`position: absolute;`
`269`		`- bottom: 130px;`
	`279`	`+ bottom: 90px;`
`270`	`280`	`width: 16.7em;`
`271`	`281`	`background-color: #333333;`
`272`	`282`	`}`