Alert user about commits in basic mode on default branch

isc-etamarch · isc-etamarch · commit 4e642e5d3cc6 · 2024-10-11T11:40:05.000-04:00
Tell the user that they cannot commit when in basic mode and default branch
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
@@ -220,8 +229,7 @@ Method OnSourceMenuContextItem(itemName As %String, menuItemName As %String, ByR
     } elseif menuItemName = "Commit" {
         set Enabled = 1
         do ..GetStatus(.itemName, .isInSourceControl, .isEditable,.isCheckedOut,.userCheckedOut)
-        set defaultBasic = ##class(SourceControl.Git.Utils).InDefaultBranchBasicMode()
-        if '(##class(SourceControl.Git.Change).IsUncommitted(##class(SourceControl.Git.Utils).FullExternalName(itemName))) || ($username '= userCheckedOut) || (defaultBasic) {
+        if '(##class(SourceControl.Git.Change).IsUncommitted(##class(SourceControl.Git.Utils).FullExternalName(itemName))) || ($username '= userCheckedOut) {
             set Enabled = 0
         }
     } elseif ##class(SourceControl.Git.Utils).IsInSourceControl(itemName) {
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">
