Fix UI and post-discard refresh

isc-etamarch · isc-etamarch · commit 8739093947d2 · 2024-09-26T11:29:03.000-04:00
Fixed the UI so that the "Restore" button in the discarded files is always visible
Run a refresh of the uncommitted queue after the discard
diff --git a/cls/SourceControl/Git/Build.cls b/cls/SourceControl/Git/Build.cls
@@ -14,4 +14,4 @@ ClassMethod BuildUIForDevMode(devMode As %Boolean, rootDirectory As %String)
     write !, $zf(-100, "/SHELL", "npm", "run", "build", "--prefix", webUIDirectory)
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/File.cls b/cls/SourceControl/Git/File.cls
@@ -68,4 +68,4 @@ Storage Default
 <Type>%Storage.Persistent</Type>
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/Modification.cls b/cls/SourceControl/Git/Modification.cls
@@ -11,4 +11,4 @@ Property internalName As %String;
 /// Type of change (A|C|D|M|R|T|U|X|B). See git diff documentation.
 Property changeType As %String;
 
-}
+}
diff --git a/cls/SourceControl/Git/PackageManagerContext.cls b/cls/SourceControl/Git/PackageManagerContext.cls
@@ -50,4 +50,4 @@ Method Dump()
     write !?4,"Git-enabled? ",$select(..IsInGitEnabledPackage:"Yes",1:"No"),!
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/PullEventHandler.cls b/cls/SourceControl/Git/PullEventHandler.cls
@@ -44,4 +44,4 @@ ClassMethod ForInternalNames(InternalName As %String) As %Status
     quit ..ForModifications(.files)
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/PullEventHandler/Default.cls b/cls/SourceControl/Git/PullEventHandler/Default.cls
@@ -15,4 +15,4 @@ Method OnPull() As %Status
     quit ##class(SourceControl.Git.PullEventHandler.IncrementalLoad)$this.OnPull()
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/PullEventHandler/PackageManager.cls b/cls/SourceControl/Git/PullEventHandler/PackageManager.cls
@@ -11,4 +11,4 @@ Method OnPull() As %Status
     quit ##class(%ZPM.PackageManager).Shell("load "_..LocalRoot)
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls
@@ -302,4 +302,4 @@ Method OnAfterConfigure() As %Boolean
     }
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/Util/Buffer.cls b/cls/SourceControl/Git/Util/Buffer.cls
@@ -280,4 +280,4 @@ Method UsePreviousDeviceAndSettings() [ Internal, Private ]
 	}
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/Util/ProductionConflictResolver.cls b/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
@@ -153,4 +153,4 @@ ClassMethod ResolveStream(stream As %Stream.Object)
     Quit 1
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/Util/Singleton.cls b/cls/SourceControl/Git/Util/Singleton.cls
@@ -166,4 +166,4 @@ Method %RemoveOref() As %Status [ CodeMode = objectgenerator, Final, Internal, P
 	Quit $$$OK
 }
 
-}
+}
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
@@ -246,7 +246,6 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                             set isFile = 1
                         }
                     }
-                    do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 }
 
                 set argsArr = ""
@@ -278,6 +277,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do %data.WriteLine("Git-Stderr-Length: " _ (errStream.Size + nLines))
                 do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
                 do %data.Rewind()
+                do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 set handled = 1
             } elseif (pathStart = "restore-discarded") {
                 merge data = %request.Data 
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
@@ -991,20 +991,20 @@ body {
 #discardedView header .discard-date {
   margin-left: auto;
 }
-#discardedView .external-name {
-  font-size: 1rem;
-  padding: 20px 15px 0 0;
+#discardedView .restore-discarded {
+  padding-top: 15px;
+  margin-left: 15px;
+  margin-right: 15px;
 }
 #discardedView .contents-menu {
   display: flex;
   display: -webkit-flex;
   min-height: 0;
   min-width: 0;
 }
-#discardedView .contents-menu .restore-discarded {
-  padding-top: 15px;
-  margin-left: auto;
-  margin-right: 15px;
+#discardedView .contents-menu .external-name {
+  font-size: 1rem;
+  padding: 20px 15px 0 0;
 }
 #discardedView .has-items {
   padding-bottom: 20px;
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
@@ -1961,8 +1961,9 @@ webui.DiscardedView = function(mainView) {
         discardedList.innerHTML = '';
         $('.file-contents').html('');
         $('.contents-menu').removeClass("has-items");
-        $('.external-name').text('');
         $('.restore-discarded').html('');
+        $('.external-name').text('');
+        
 
         // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
@@ -2037,8 +2038,8 @@ webui.DiscardedView = function(mainView) {
             '</div>' +
             '<div class="col-sm-5">' +
                 '<div class="contents-menu">' +
-                    '<div class="nav-item external-name"></div>' +
                     '<div class="nav-item restore-discarded"></div>' +
+                    '<div class="nav-item external-name"></div>' +
                 '</div>' +
                 '<div class="container file-contents">' +
 
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
@@ -1009,24 +1009,22 @@ body {
         }
     }
 
-    .external-name {
-        font-size: 1rem;
-        padding: 20px 15px 0 0;
-    }
 
+    .restore-discarded {
+        padding-top: 15px;
+        margin-left: 15px;
+        margin-right: 15px;
+    }
     
 
     .contents-menu {
         .display-flex();
 
-        .restore-discarded {
-            padding-top: 15px;
-            margin-left: auto;
-            margin-right: 15px;
+        .external-name {
+            font-size: 1rem;
+            padding: 20px 15px 0 0;
         }
 
-        
-       
     }
 
     .has-items {
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
@@ -1961,8 +1961,9 @@ webui.DiscardedView = function(mainView) {
         discardedList.innerHTML = '';
         $('.file-contents').html('');
         $('.contents-menu').removeClass("has-items");
-        $('.external-name').text('');
         $('.restore-discarded').html('');
+        $('.external-name').text('');
+        
 
         // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
@@ -2032,13 +2033,13 @@ webui.DiscardedView = function(mainView) {
 
     self.element = $(
         '<div class="row" id="discardedView">' +
-            '<div class="col-sm-7">' +
+            '<div class="col-sm-5">' +
                 '<div id="discardedList"></div>' +
             '</div>' +
             '<div class="col-sm-5">' +
                 '<div class="contents-menu">' +
-                    '<div class="nav-item external-name"></div>' +
                     '<div class="nav-item restore-discarded"></div>' +
+                    '<div class="nav-item external-name"></div>' +
                 '</div>' +
                 '<div class="container file-contents">' +
 

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ ClassMethod BuildUIForDevMode(devMode As %Boolean, rootDirectory As %String)`
`14`	`14`	`write !, $zf(-100, "/SHELL", "npm", "run", "build", "--prefix", webUIDirectory)`
`15`	`15`	`}`
`16`	`16`
`17`		`-}`
	`17`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,4 @@ Storage Default`
`68`	`68`	`<Type>%Storage.Persistent</Type>`
`69`	`69`	`}`
`70`	`70`
`71`		`-}`
	`71`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,4 @@ Method Dump()`
`50`	`50`	`write !?4,"Git-enabled? ",$select(..IsInGitEnabledPackage:"Yes",1:"No"),!`
`51`	`51`	`}`
`52`	`52`
`53`		`-}`
	`53`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ ClassMethod ForInternalNames(InternalName As %String) As %Status`
`44`	`44`	`quit ..ForModifications(.files)`
`45`	`45`	`}`
`46`	`46`
`47`		`-}`
	`47`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ Method OnPull() As %Status`
`15`	`15`	`quit ##class(SourceControl.Git.PullEventHandler.IncrementalLoad)$this.OnPull()`
`16`	`16`	`}`
`17`	`17`
`18`		`-}`
	`18`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,4 @@ Method OnPull() As %Status`
`11`	`11`	`quit ##class(%ZPM.PackageManager).Shell("load "_..LocalRoot)`
`12`	`12`	`}`
`13`	`13`
`14`		`-}`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -302,4 +302,4 @@ Method OnAfterConfigure() As %Boolean`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`305`		`-}`
	`305`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -280,4 +280,4 @@ Method UsePreviousDeviceAndSettings() [ Internal, Private ]`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`
`283`		`-}`
	`283`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -153,4 +153,4 @@ ClassMethod ResolveStream(stream As %Stream.Object)`
`153`	`153`	`Quit 1`
`154`	`154`	`}`
`155`	`155`
`156`		`-}`
	`156`	`+}`