Merge branch 'main' into fix-add

Author: isc-tleavitt

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed JS errors in Studio on certain operations (#416)
 - Files are added to source control upon creation properly (#404)
 - Files show in uncommitted queue when automatically added (#407)
+- WebUI workspace view now works properly for filenames with spaces (#423)
+- Fixed error popups in interop editors in Studio on 2024.1 (#417)
 
 ## [2.4.0] - 2024-07-08
 

csp/gitprojectsettings.csp

@@ -670,6 +670,8 @@ $('[id^=noFoldersSwitch]').click(toggleNoFolders);
 </html>
 <script method='OnPreHTTP' language='cache' runat='server' returntype='%Boolean'>	
 	try {
+		set %session.UseSessionCookie = 1 // Always set back to autodetect
+		set %session.CookiePath = "" // Always clear
 		if (%request.UserAgent [ " Code/") {
 			// Workaround for VSCode webview
 			set %session.SessionScope = 0 // none; allowed because...

csp/webuidriver.csp

@@ -11,6 +11,8 @@
 	set %namespace = namespace
 
 	try {
+		set %session.UseSessionCookie = 1 // Always set back to autodetect
+		set %session.CookiePath = "" // Always clear
 		if (%request.UserAgent [ " Code/") {
 			// Workaround for VSCode webview
 			set %session.SessionScope = 0 // none; allowed because...

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

@@ -1304,11 +1304,11 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
                 right.webuiPrevScrollTop = 0;
                 right.webuiPrevScrollLeft = 0;
             }
-            webui.git("ls-files "+file, function(path){
-                self.gitFile = file;
+            webui.git("ls-files \""+file+"\"", function(path){
+                self.gitFile = "\"" + file + "\"";
                 self.noIndex = ""
                 if(path.length == 0 && file != undefined){
-                    self.gitFile = " /dev/null " + file;
+                    self.gitFile = " /dev/null " + "\"" + file + "\"";
                     self.noIndex = " --no-index "
                 }
                 if (self.gitCmd) {
@@ -2224,6 +2224,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     } else {
                         model = line;
                     }
+                    model = model.replace(/^"(.*)"$/g,'$1');
 
                     ++self.filesCount;
                     var isForCurrentUser;

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -1304,11 +1304,11 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
                 right.webuiPrevScrollTop = 0;
                 right.webuiPrevScrollLeft = 0;
             }
-            webui.git("ls-files "+file, function(path){
-                self.gitFile = file;
+            webui.git("ls-files \""+file+"\"", function(path){
+                self.gitFile = "\"" + file + "\"";
                 self.noIndex = ""
                 if(path.length == 0 && file != undefined){
-                    self.gitFile = " /dev/null " + file;
+                    self.gitFile = " /dev/null " + "\"" + file + "\"";
                     self.noIndex = " --no-index "
                 }
                 if (self.gitCmd) {
@@ -2224,6 +2224,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     } else {
                         model = line;
                     }
+                    model = model.replace(/^"(.*)"$/g,'$1');
 
                     ++self.filesCount;
                     var isForCurrentUser;