From 07208759b76aaad640ab1287fb644e4f3ea27e00 Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Tue, 30 Jul 2024 16:31:02 -0400
Subject: [PATCH 1/9] temp ui sidebar change

---
 .../share/git-webui/webui/css/git-webui.css     | 15 +++++++++++++--
 .../share/git-webui/webui/js/git-webui.js       |  3 +++
 .../share/git-webui/webui/css/git-webui.less    | 17 +++++++++++++++--
 .../src/share/git-webui/webui/js/git-webui.js   |  3 +++
 4 files changed, 34 insertions(+), 4 deletions(-)

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
index aeb3a5b0..fcc0fc28 100644
--- a/git-webui/release/share/git-webui/webui/css/git-webui.css
+++ b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -180,10 +180,10 @@ body {
   border-top: 1px solid #1a1a1a;
   border-bottom: 1px solid #1a1a1a;
   color: #eeeeee;
-  padding-bottom: 6em;
+  padding-bottom: 100px;
 }
 #sidebar #sidebar-content > :first-child,
-#sidebar #sidebar-content > :last-child {
+#sidebar #sidebar-content > :nth-last-child(2) {
   border-top: 1px solid #5e5e5e;
 }
 #sidebar #sidebar-content h4:before {
@@ -216,6 +216,17 @@ body {
 #sidebar #sidebar-content #sidebar-tags h4:before {
   content: url(../img/tag.svg);
 }
+#sidebar #sidebar-content #sidebar-context h4:before {
+  content: url(../img/gear-fill.svg);
+}
+#sidebar #sidebar-content #sidebar-context {
+  position: absolute;
+  bottom: 42px;
+  width: 16.7em;
+  padding-bottom: 0.3rem;
+  margin-bottom: 0;
+  background-color: #333333;
+}
 #sidebar #sidebar-content #sidebar-settings h4:before {
   content: url(../img/gear-fill.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
index e36f87b6..6b0bc67d 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -798,6 +798,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
+                                '<section id="sidebar-context">' + 
+                                    '<h4>Change Context</h4>' +
+                                '</section>' +
                                 '<section id="sidebar-settings">' +
                                     '<h4>Settings</h4>' +
                                 '</section>' +
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
index 62700a43..0b5edffb 100644
--- a/git-webui/src/share/git-webui/webui/css/git-webui.less
+++ b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -255,9 +255,9 @@ body {
         border-top: 1px solid darken(@gray-dark, 10%);
         border-bottom: 1px solid darken(@gray-dark, 10%);
         color: @gray-lighter;
-        padding-bottom: 6em;
+        padding-bottom: 100px;
 
-        > :first-child, >:last-child {
+        > :first-child, >:nth-last-child(2) {
             border-top: 1px solid darken(@separator-line, 50%);
         }
 
@@ -301,6 +301,19 @@ body {
             content: url(../img/tag.svg);
         }
 
+        #sidebar-context h4:before {
+            content: url(../img/gear-fill.svg)
+        }
+
+        #sidebar-context {
+            position: absolute;
+            bottom: 42px;
+            width: 16.7em;
+            padding-bottom: 0.3rem;
+            margin-bottom: 0;
+            background-color: rgba(51, 51, 51, 1);
+        }
+
         #sidebar-settings h4:before {
             content: url(../img/gear-fill.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
index e36f87b6..6b0bc67d 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -798,6 +798,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
+                                '<section id="sidebar-context">' + 
+                                    '<h4>Change Context</h4>' +
+                                '</section>' +
                                 '<section id="sidebar-settings">' +
                                     '<h4>Settings</h4>' +
                                 '</section>' +

From d871bdd07a00a15d5938db6ceedab3c68db18f9d Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Thu, 1 Aug 2024 09:08:32 -0400
Subject: [PATCH 2/9] commit before changing branch

---
 cls/SourceControl/Git/Utils.cls               | 41 ++++++++++++++
 cls/SourceControl/Git/WebUIDriver.cls         |  5 +-
 .../share/git-webui/webui/css/git-webui.css   |  2 +-
 .../share/git-webui/webui/img/context.svg     |  1 +
 .../share/git-webui/webui/js/git-webui.js     | 53 ++++++++++++++++++-
 .../share/git-webui/webui/css/git-webui.less  |  2 +-
 .../src/share/git-webui/webui/img/context.svg |  1 +
 .../src/share/git-webui/webui/js/git-webui.js | 53 ++++++++++++++++++-
 8 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100644 git-webui/release/share/git-webui/webui/img/context.svg
 create mode 100644 git-webui/src/share/git-webui/webui/img/context.svg

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index 5c08b581..8719acc7 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -2316,6 +2316,47 @@ ClassMethod Localize()
     }
 }
 
+Query Namespaces() As %Query(ROWSPEC = "Namespace:%String,SourceControlClass:%String,Accessible:%Boolean") [ SqlProc ]
+{
+}
+ 
+ClassMethod NamespacesExecute(ByRef qHandle As %Binary) As %Status
+{
+	Set sc = ##class(%SYS.Namespace).ListAll(.array)
+	Merge qHandle = array
+	Set qHandle = ""
+	Quit sc
+}
+ 
+ClassMethod NamespacesFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef AtEnd As %Integer = 0) As %Status [ PlaceAfter = NamespacesExecute ]
+{
+	Set qHandle = $Order(qHandle(qHandle))
+	If (qHandle = "") {
+		Set AtEnd = 1
+	} ElseIf $Extract(qHandle) = "^" {
+		Quit ..NamespacesFetch(.qHandle,.Row,.AtEnd)
+	} Else {
+		Try {
+			New $Namespace
+			Set $Namespace = qHandle
+			Set scc = ##class(%Studio.SourceControl.Interface).SourceControlClassGet()
+			Set Row = $ListBuild(qHandle,scc,1)
+		} Catch e {
+			Set Row = $ListBuild(qHandle,"",0)
+		}
+	}
+	Quit $$$OK
+}
+ 
+ClassMethod NamespacesClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter = NamespacesExecute ]
+{
+	Quit $$$OK
+}
+
+ClassMethod GetContexts() As %DynamicArray{
+    
+}
+
 ClassMethod ConfigureWeb()
 {
     set installNamespace = $Namespace
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index e271c9bf..9ad10732 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -27,7 +27,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
         if $isobject($get(responseJSON)) {
             do responseJSON.%ToJSON(%data)
         }
-    } elseif $match(pathStart,"git|dirname|hostname|viewonly") {
+    } elseif $match(pathStart,"git|dirname|hostname|viewonly|contexts") {
         if (%request.Method = "GET") {
             set %data = ##class(%Stream.TmpCharacter).%New()
             // Things not handled from Python backend:
@@ -76,6 +76,9 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             } elseif (pathStart = "dirname") {
                 do %data.Write(##class(SourceControl.Git.Utils).TempFolder())
                 set handled = 1
+            } elseif (pathStart = "contexts") {
+                set contexts = ##class(SourceControl.Git.Utils).GetContexts()
+                
             }
         } elseif (%request.Method = "POST") {
             // Things not handled from Python backend:
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
index fcc0fc28..a05571e6 100644
--- a/git-webui/release/share/git-webui/webui/css/git-webui.css
+++ b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -217,7 +217,7 @@ body {
   content: url(../img/tag.svg);
 }
 #sidebar #sidebar-content #sidebar-context h4:before {
-  content: url(../img/gear-fill.svg);
+  content: url(../img/context.svg);
 }
 #sidebar #sidebar-content #sidebar-context {
   position: absolute;
diff --git a/git-webui/release/share/git-webui/webui/img/context.svg b/git-webui/release/share/git-webui/webui/img/context.svg
new file mode 100644
index 00000000..e3732172
--- /dev/null
+++ b/git-webui/release/share/git-webui/webui/img/context.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#eee"><path d="M600-40q-33 0-56.5-23.5T520-120q0-23 11-41t29-29v-221q-18-11-29-28.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 23-11 40.5T640-411v115l160-53v-62q-18-11-29-28.5T760-480q0-33 23.5-56.5T840-560q33 0 56.5 23.5T920-480q0 23-11 40.5T880-411v119l-240 80v22q18 11 29 29t11 41q0 33-23.5 56.5T600-40ZM160-160v-560 560Zm0 0q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640H447l-80-80H160v480h280v80H160Z"/></svg>
\ No newline at end of file
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
index 6b0bc67d..82c7c0b5 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -504,6 +504,56 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         })
     }
 
+    self.changeContext = function() {
+        function removePopup(popup) {
+            $(popup).children(".modal-fade").modal("hide");
+            $(".modal-backdrop").remove();
+            $("#changeContextModal").remove();
+        }
+
+        var popup = $(
+            '<div class="modal fade" tab-index="-1" id="changeContextModal" role="dialog">' + 
+                '<div class="modal-dialog modal-md" role="document">' +
+                    '<div class="modal-content">' + 
+                        '<div class="modal-header">' +
+                            '<h5 class="modal-title">Change Context</h5>' +
+                            '<button type="button" class="btn btn-default close" data-dismiss="modal">' + webui.largeXIcon + '</button>' +
+                        '</div>' +
+                        '<div class="modal-body"></div>' +
+                        '<div class="modal-footer"></div>' +
+                    '</div>' + 
+                '</div>' +
+            '</div>'
+        )[0];
+
+        $("body").append(popup);
+        var popupBody = $(".modal-body", popup)[0];
+        webui.detachChildren(popupBody);
+
+        $(
+            '<div class="">'+
+                '<h6>Select context for Git Source Control</h6>' +
+                '<select class="custom-select">'+ 
+                    '<option selected>context!</option>' +
+                '</select>' +
+            '</div>'
+        ).appendTo(popupBody);
+
+        var popupFooter = $(".modal-footer", popup)[0];
+        webui.detachChildren(popupFooter);
+
+        $(
+            '<button class="btn btn-sm btn-primary action-btn" id="chooseContextBtn">Choose Context</button>' + 
+            '<button class="btn btn-sm btn-secondary" id="cancelContextBtn">Cancel</button>'
+        ).appendTo(popupFooter);
+
+        $(popup).modal('show');
+
+        $('#changeContextModal').find('#cancelContextBtn', '.close').click(function() {
+            removePopup(popup);
+        });
+    }
+
     
     self.checkoutBranch = function(branchType, refName) {
         $("#confirm-branch-checkout").remove();
@@ -798,7 +848,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
-                                '<section id="sidebar-context">' + 
+                                '<section id="sidebar-context" data-toggle="tooltip" data-placement="right" title="Current Context">' + 
                                     '<h4>Change Context</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-settings">' +
@@ -827,6 +877,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $(".btn-add", self.element).click(self.createNewLocalBranch);
         $('.btn-prune-remote-branches', self.element).click(self.pruneRemoteBranches);
         $("#sidebar-settings", self.element).click(self.goToSettingsPage);
+        $("#sidebar-context", self.element).click(self.changeContext);
     }
     self.getPackageVersion();
     self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
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
index 0b5edffb..251de78c 100644
--- a/git-webui/src/share/git-webui/webui/css/git-webui.less
+++ b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -302,7 +302,7 @@ body {
         }
 
         #sidebar-context h4:before {
-            content: url(../img/gear-fill.svg)
+            content: url(../img/context.svg)
         }
 
         #sidebar-context {
diff --git a/git-webui/src/share/git-webui/webui/img/context.svg b/git-webui/src/share/git-webui/webui/img/context.svg
new file mode 100644
index 00000000..e3732172
--- /dev/null
+++ b/git-webui/src/share/git-webui/webui/img/context.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#eee"><path d="M600-40q-33 0-56.5-23.5T520-120q0-23 11-41t29-29v-221q-18-11-29-28.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 23-11 40.5T640-411v115l160-53v-62q-18-11-29-28.5T760-480q0-33 23.5-56.5T840-560q33 0 56.5 23.5T920-480q0 23-11 40.5T880-411v119l-240 80v22q18 11 29 29t11 41q0 33-23.5 56.5T600-40ZM160-160v-560 560Zm0 0q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640H447l-80-80H160v480h280v80H160Z"/></svg>
\ No newline at end of file
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
index 6b0bc67d..82c7c0b5 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -504,6 +504,56 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         })
     }
 
+    self.changeContext = function() {
+        function removePopup(popup) {
+            $(popup).children(".modal-fade").modal("hide");
+            $(".modal-backdrop").remove();
+            $("#changeContextModal").remove();
+        }
+
+        var popup = $(
+            '<div class="modal fade" tab-index="-1" id="changeContextModal" role="dialog">' + 
+                '<div class="modal-dialog modal-md" role="document">' +
+                    '<div class="modal-content">' + 
+                        '<div class="modal-header">' +
+                            '<h5 class="modal-title">Change Context</h5>' +
+                            '<button type="button" class="btn btn-default close" data-dismiss="modal">' + webui.largeXIcon + '</button>' +
+                        '</div>' +
+                        '<div class="modal-body"></div>' +
+                        '<div class="modal-footer"></div>' +
+                    '</div>' + 
+                '</div>' +
+            '</div>'
+        )[0];
+
+        $("body").append(popup);
+        var popupBody = $(".modal-body", popup)[0];
+        webui.detachChildren(popupBody);
+
+        $(
+            '<div class="">'+
+                '<h6>Select context for Git Source Control</h6>' +
+                '<select class="custom-select">'+ 
+                    '<option selected>context!</option>' +
+                '</select>' +
+            '</div>'
+        ).appendTo(popupBody);
+
+        var popupFooter = $(".modal-footer", popup)[0];
+        webui.detachChildren(popupFooter);
+
+        $(
+            '<button class="btn btn-sm btn-primary action-btn" id="chooseContextBtn">Choose Context</button>' + 
+            '<button class="btn btn-sm btn-secondary" id="cancelContextBtn">Cancel</button>'
+        ).appendTo(popupFooter);
+
+        $(popup).modal('show');
+
+        $('#changeContextModal').find('#cancelContextBtn', '.close').click(function() {
+            removePopup(popup);
+        });
+    }
+
     
     self.checkoutBranch = function(branchType, refName) {
         $("#confirm-branch-checkout").remove();
@@ -798,7 +848,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
-                                '<section id="sidebar-context">' + 
+                                '<section id="sidebar-context" data-toggle="tooltip" data-placement="right" title="Current Context">' + 
                                     '<h4>Change Context</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-settings">' +
@@ -827,6 +877,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $(".btn-add", self.element).click(self.createNewLocalBranch);
         $('.btn-prune-remote-branches', self.element).click(self.pruneRemoteBranches);
         $("#sidebar-settings", self.element).click(self.goToSettingsPage);
+        $("#sidebar-context", self.element).click(self.changeContext);
     }
     self.getPackageVersion();
     self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");

From 26aeeabc817926d5bb5958bd8c1d5a35a3055090 Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Thu, 1 Aug 2024 10:00:57 -0400
Subject: [PATCH 3/9] changing branch again

---
 cls/SourceControl/Git/Utils.cls | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index 8719acc7..ed9975d4 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -2319,7 +2319,7 @@ ClassMethod Localize()
 Query Namespaces() As %Query(ROWSPEC = "Namespace:%String,SourceControlClass:%String,Accessible:%Boolean") [ SqlProc ]
 {
 }
- 
+
 ClassMethod NamespacesExecute(ByRef qHandle As %Binary) As %Status
 {
 	Set sc = ##class(%SYS.Namespace).ListAll(.array)
@@ -2327,7 +2327,7 @@ ClassMethod NamespacesExecute(ByRef qHandle As %Binary) As %Status
 	Set qHandle = ""
 	Quit sc
 }
- 
+
 ClassMethod NamespacesFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef AtEnd As %Integer = 0) As %Status [ PlaceAfter = NamespacesExecute ]
 {
 	Set qHandle = $Order(qHandle(qHandle))
@@ -2347,14 +2347,14 @@ ClassMethod NamespacesFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef
 	}
 	Quit $$$OK
 }
- 
+
 ClassMethod NamespacesClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter = NamespacesExecute ]
 {
 	Quit $$$OK
 }
 
-ClassMethod GetContexts() As %DynamicArray{
-    
+ClassMethod GetContexts() As %DynamicArray
+{
 }
 
 ClassMethod ConfigureWeb()

From c4b70c15f07ea9117ec5699c67765d20351ae09b Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Thu, 1 Aug 2024 15:29:25 -0400
Subject: [PATCH 4/9] now gets all namespaces

---
 cls/SourceControl/Git/Utils.cls | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index ed9975d4..d5ca287b 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -2316,7 +2316,7 @@ ClassMethod Localize()
     }
 }
 
-Query Namespaces() As %Query(ROWSPEC = "Namespace:%String,SourceControlClass:%String,Accessible:%Boolean") [ SqlProc ]
+Query Namespaces() As %Query(ROWSPEC = "Namespace:%String,GitSourceControl:%Boolean,Accessible:%Boolean") [ SqlProc ]
 {
 }
 
@@ -2340,7 +2340,8 @@ ClassMethod NamespacesFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef
 			New $Namespace
 			Set $Namespace = qHandle
 			Set scc = ##class(%Studio.SourceControl.Interface).SourceControlClassGet()
-			Set Row = $ListBuild(qHandle,scc,1)
+            set isGitSC = $select(scc = "SourceControl.Git.Extension":1, 1:0)
+			Set Row = $ListBuild(qHandle,isGitSC,1)
 		} Catch e {
 			Set Row = $ListBuild(qHandle,"",0)
 		}
@@ -2355,6 +2356,16 @@ ClassMethod NamespacesClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter =
 
 ClassMethod GetContexts() As %DynamicArray
 {
+    set namespaces = []
+    set namespacesResultSet = ..NamespacesFunc()
+    while namespacesResultSet.%Next() {
+        set namespace = namespacesResultSet.Namespace
+        if namespacesResultSet.GitSourceControl && namespacesResultSet.Accessible {
+            do namespaces.%Push(namespace)
+        }
+    }
+
+    return namespaces
 }
 
 ClassMethod ConfigureWeb()

From 14c0ba75a27ac85e5750b3642ba201ef3d3ce5df Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Mon, 5 Aug 2024 09:27:17 -0400
Subject: [PATCH 5/9] feat: context can be changed in UI

---
 cls/SourceControl/Git/Utils.cls               | 11 +++-
 cls/SourceControl/Git/WebUIDriver.cls         |  5 +-
 .../share/git-webui/webui/js/git-webui.js     | 55 +++++++++++++++++--
 .../src/share/git-webui/webui/js/git-webui.js | 55 +++++++++++++++++--
 4 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index d5ca287b..545355f9 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -2356,16 +2356,21 @@ ClassMethod NamespacesClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter =
 
 ClassMethod GetContexts() As %DynamicArray
 {
-    set namespaces = []
+    set contexts = []
     set namespacesResultSet = ..NamespacesFunc()
     while namespacesResultSet.%Next() {
         set namespace = namespacesResultSet.Namespace
         if namespacesResultSet.GitSourceControl && namespacesResultSet.Accessible {
-            do namespaces.%Push(namespace)
+            do contexts.%Push(namespace)
         }
     }
 
-    return namespaces
+    set packagesResultSet = ##class(%SQL.Statement).%ExecDirect(, "SELECT name from %Library.RoutineMgr_StudioOpenDialog('*.ZPM')")
+    while packagesResultSet.%Next() {
+        set package = packagesResultSet.Name
+        do contexts.%Push(package)
+    }
+    return contexts
 }
 
 ClassMethod ConfigureWeb()
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 9ad10732..e9276514 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -20,6 +20,8 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             set responseJSON = ..GetSettingsURL(%request)
         } elseif $extract(pagePath, 6, *) = "get-package-version"{
             set responseJSON = ..GetPackageVersion()
+        } elseif $extract(pagePath, 6, *) = "namespace"{
+            set responseJSON = $NAMESPACE
         } else {
             set %response.Status = ##class(%CSP.REST).#HTTP404NOTFOUND
             set responseJSON = {"error":("invalid URI: " _ pagePath)}
@@ -78,7 +80,8 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 set handled = 1
             } elseif (pathStart = "contexts") {
                 set contexts = ##class(SourceControl.Git.Utils).GetContexts()
-                
+                do contexts.%ToJSON(%data)
+                set handled = 1
             }
         } elseif (%request.Method = "POST") {
             // Things not handled from Python backend:
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
index 82c7c0b5..e7ccf035 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -504,7 +504,15 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         })
     }
 
-    self.changeContext = function() {
+    self.changeContextGet = function() {
+        $.get("contexts", function(contextList) {
+            var contexts = JSON.parse(contextList);
+            self.changeContext(contexts);
+        });
+    }
+
+    self.changeContext = function(contexts) {
+        
         function removePopup(popup) {
             $(popup).children(".modal-fade").modal("hide");
             $(".modal-backdrop").remove();
@@ -533,12 +541,20 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $(
             '<div class="">'+
                 '<h6>Select context for Git Source Control</h6>' +
-                '<select class="custom-select">'+ 
-                    '<option selected>context!</option>' +
+                '<select id="chosenContext" class="custom-select">'+ 
                 '</select>' +
             '</div>'
         ).appendTo(popupBody);
 
+        var selectDropdown = $(".custom-select", popupBody)[0];
+
+        contexts.forEach(function(context) {
+            $(
+                '<option value="' + context + '" ' + (context == self.currentContext ? "selected" : "") + ' >' + context + '</option>'
+            ).appendTo(selectDropdown);
+        })
+        
+
         var popupFooter = $(".modal-footer", popup)[0];
         webui.detachChildren(popupFooter);
 
@@ -552,9 +568,36 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $('#changeContextModal').find('#cancelContextBtn', '.close').click(function() {
             removePopup(popup);
         });
+
+        $("#chooseContextBtn").on("click", function() {
+            self.updateContext($("#chosenContext").val());
+        });
+    }
+
+    self.getCurrentContext = function() {
+        var urlParts = window.location.href.split("/");
+        if (urlParts[urlParts.length - 1] == "") {
+            // return namespace as context
+            return urlParts[urlParts.length - 2];
+        } else {
+            // return package as context
+            return urlParts[urlParts.length - 1];
+        }
+    }
+
+    self.updateContext = function(context) {
+        var urlParts = window.location.href.split("/");
+        if (context.indexOf(".ZPM") != -1) {
+            urlParts[urlParts.length - 1] = context;
+        } else {
+            urlParts[urlParts.length - 1] = "";
+            urlParts[urlParts.length - 2] = context;
+        }
+
+        window.location = urlParts.join("/");
+        self.currentContext = context;
     }
 
-    
     self.checkoutBranch = function(branchType, refName) {
         $("#confirm-branch-checkout").remove();
 
@@ -877,8 +920,10 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $(".btn-add", self.element).click(self.createNewLocalBranch);
         $('.btn-prune-remote-branches', self.element).click(self.pruneRemoteBranches);
         $("#sidebar-settings", self.element).click(self.goToSettingsPage);
-        $("#sidebar-context", self.element).click(self.changeContext);
+        $("#sidebar-context", self.element).click(self.changeContextGet);
     }
+
+    self.currentContext = self.getCurrentContext();
     self.getPackageVersion();
     self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
     self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
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
index 82c7c0b5..e7ccf035 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -504,7 +504,15 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         })
     }
 
-    self.changeContext = function() {
+    self.changeContextGet = function() {
+        $.get("contexts", function(contextList) {
+            var contexts = JSON.parse(contextList);
+            self.changeContext(contexts);
+        });
+    }
+
+    self.changeContext = function(contexts) {
+        
         function removePopup(popup) {
             $(popup).children(".modal-fade").modal("hide");
             $(".modal-backdrop").remove();
@@ -533,12 +541,20 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $(
             '<div class="">'+
                 '<h6>Select context for Git Source Control</h6>' +
-                '<select class="custom-select">'+ 
-                    '<option selected>context!</option>' +
+                '<select id="chosenContext" class="custom-select">'+ 
                 '</select>' +
             '</div>'
         ).appendTo(popupBody);
 
+        var selectDropdown = $(".custom-select", popupBody)[0];
+
+        contexts.forEach(function(context) {
+            $(
+                '<option value="' + context + '" ' + (context == self.currentContext ? "selected" : "") + ' >' + context + '</option>'
+            ).appendTo(selectDropdown);
+        })
+        
+
         var popupFooter = $(".modal-footer", popup)[0];
         webui.detachChildren(popupFooter);
 
@@ -552,9 +568,36 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $('#changeContextModal').find('#cancelContextBtn', '.close').click(function() {
             removePopup(popup);
         });
+
+        $("#chooseContextBtn").on("click", function() {
+            self.updateContext($("#chosenContext").val());
+        });
+    }
+
+    self.getCurrentContext = function() {
+        var urlParts = window.location.href.split("/");
+        if (urlParts[urlParts.length - 1] == "") {
+            // return namespace as context
+            return urlParts[urlParts.length - 2];
+        } else {
+            // return package as context
+            return urlParts[urlParts.length - 1];
+        }
+    }
+
+    self.updateContext = function(context) {
+        var urlParts = window.location.href.split("/");
+        if (context.indexOf(".ZPM") != -1) {
+            urlParts[urlParts.length - 1] = context;
+        } else {
+            urlParts[urlParts.length - 1] = "";
+            urlParts[urlParts.length - 2] = context;
+        }
+
+        window.location = urlParts.join("/");
+        self.currentContext = context;
     }
 
-    
     self.checkoutBranch = function(branchType, refName) {
         $("#confirm-branch-checkout").remove();
 
@@ -877,8 +920,10 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $(".btn-add", self.element).click(self.createNewLocalBranch);
         $('.btn-prune-remote-branches', self.element).click(self.pruneRemoteBranches);
         $("#sidebar-settings", self.element).click(self.goToSettingsPage);
-        $("#sidebar-context", self.element).click(self.changeContext);
+        $("#sidebar-context", self.element).click(self.changeContextGet);
     }
+
+    self.currentContext = self.getCurrentContext();
     self.getPackageVersion();
     self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
     self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");

From d46e0be8550d1780e5e5c5f99c0d0b5e7150c87a Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Mon, 5 Aug 2024 09:33:11 -0400
Subject: [PATCH 6/9] feat: now shows current context on sidebar button hover

---
 CHANGELOG.md                                            | 7 ++++++-
 git-webui/release/share/git-webui/webui/js/git-webui.js | 6 +++---
 git-webui/src/share/git-webui/webui/js/git-webui.js     | 6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e84ad42..48b50235 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.4.1] - Unreleased
+## [2.5.0] - Unreleased
+
+### Added
+- New way to change context of Git-Source-Control from UI (#280)
+
+## [2.4.1] - 2024-08-02
 
 ### Added
 - New API endpoint that accepts git commands as array instead of string (#437)
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
index 9e8cd633..e68e7f19 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -948,7 +948,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
     };
 
     self.mainView = mainView;
-    
+    self.currentContext = self.getCurrentContext();
     self.element = $(   '<div id="sidebar">' +
                             '<a href="#" data-toggle="modal" data-target="#help-modal"><img id="sidebar-logo" src="img/git-logo.png"></a>' +
                             '<h5 id="packageVersion"></h5>' +
@@ -974,7 +974,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
-                                '<section id="sidebar-context" data-toggle="tooltip" data-placement="right" title="Current Context">' + 
+                                '<section id="sidebar-context" data-toggle="tooltip" data-placement="right" title="' + self.currentContext + '">' + 
                                     '<h4>Change Context</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-settings">' +
@@ -1006,7 +1006,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $("#sidebar-context", self.element).click(self.changeContextGet);
     }
 
-    self.currentContext = self.getCurrentContext();
+    
     self.getPackageVersion();
     self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
     self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");
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
index 9e8cd633..e68e7f19 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -948,7 +948,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
     };
 
     self.mainView = mainView;
-    
+    self.currentContext = self.getCurrentContext();
     self.element = $(   '<div id="sidebar">' +
                             '<a href="#" data-toggle="modal" data-target="#help-modal"><img id="sidebar-logo" src="img/git-logo.png"></a>' +
                             '<h5 id="packageVersion"></h5>' +
@@ -974,7 +974,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-tags">' +
                                     '<h4>Tags</h4>' +
                                 '</section>' +
-                                '<section id="sidebar-context" data-toggle="tooltip" data-placement="right" title="Current Context">' + 
+                                '<section id="sidebar-context" data-toggle="tooltip" data-placement="right" title="' + self.currentContext + '">' + 
                                     '<h4>Change Context</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-settings">' +
@@ -1006,7 +1006,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         $("#sidebar-context", self.element).click(self.changeContextGet);
     }
 
-    self.currentContext = self.getCurrentContext();
+    
     self.getPackageVersion();
     self.fetchSection($("#sidebar-local-branches", self.element)[0], "Local Branches", "local-branches", "branch --verbose --verbose");
     self.fetchSection($("#sidebar-remote-branches", self.element)[0], "Remote Branches", "remote-branches", "branch --remotes");

From dd93e01d21e347f16e77599ecb61f18c0a16318e Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Mon, 5 Aug 2024 09:35:44 -0400
Subject: [PATCH 7/9] removes popup now before updating context

---
 git-webui/src/share/git-webui/webui/js/git-webui.js | 1 +
 1 file changed, 1 insertion(+)

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
index e68e7f19..7ebb49be 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -653,6 +653,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         });
 
         $("#chooseContextBtn").on("click", function() {
+            removePopup(popup);
             self.updateContext($("#chosenContext").val());
         });
     }

From 9a17da6870ddb59bc2505ff4f3f51e7c385f1942 Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Wed, 7 Aug 2024 14:21:23 -0400
Subject: [PATCH 8/9] fix: issues presented in pr

---
 CHANGELOG.md                          | 2 +-
 cls/SourceControl/Git/WebUIDriver.cls | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48b50235..da66ace6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [2.5.0] - Unreleased
 
 ### Added
-- New way to change context of Git-Source-Control from UI (#280)
+- Allow changing namespaces and IPM package context from web UI (#280)
 
 ## [2.4.1] - 2024-08-02
 
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 681cf3e8..5d8a2b17 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -20,8 +20,6 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             set responseJSON = ..GetSettingsURL(%request)
         } elseif $extract(pagePath, 6, *) = "get-package-version"{
             set responseJSON = ..GetPackageVersion()
-        } elseif $extract(pagePath, 6, *) = "namespace"{
-            set responseJSON = $NAMESPACE
         } else {
             set %response.Status = ##class(%CSP.REST).#HTTP404NOTFOUND
             set responseJSON = {"error":("invalid URI: " _ pagePath)}
@@ -275,4 +273,3 @@ ClassMethod GetPackageVersion() As %Library.DynamicObject
 }
 
 }
-

From 6a2bcfe183f676f2895ceb4d2d2e9241b9fe9629 Mon Sep 17 00:00:00 2001
From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:45:02 -0400
Subject: [PATCH 9/9] fix errors with SQL privileges and in Studio

---
 cls/SourceControl/Git/Utils.cls               | 78 ++++++++-----------
 .../share/git-webui/webui/css/git-webui.css   |  2 +-
 .../share/git-webui/webui/js/git-webui.js     | 25 +++---
 .../share/git-webui/webui/css/git-webui.less  |  2 +-
 .../src/share/git-webui/webui/js/git-webui.js | 26 +++----
 5 files changed, 59 insertions(+), 74 deletions(-)

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index 6d5974e7..9b6405c7 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -2315,56 +2315,20 @@ ClassMethod Localize()
     }
 }
 
-Query Namespaces() As %Query(ROWSPEC = "Namespace:%String,GitSourceControl:%Boolean,Accessible:%Boolean") [ SqlProc ]
-{
-}
-
-ClassMethod NamespacesExecute(ByRef qHandle As %Binary) As %Status
-{
-	Set sc = ##class(%SYS.Namespace).ListAll(.array)
-	Merge qHandle = array
-	Set qHandle = ""
-	Quit sc
-}
-
-ClassMethod NamespacesFetch(ByRef qHandle As %Binary, ByRef Row As %List, ByRef AtEnd As %Integer = 0) As %Status [ PlaceAfter = NamespacesExecute ]
-{
-	Set qHandle = $Order(qHandle(qHandle))
-	If (qHandle = "") {
-		Set AtEnd = 1
-	} ElseIf $Extract(qHandle) = "^" {
-		Quit ..NamespacesFetch(.qHandle,.Row,.AtEnd)
-	} Else {
-		Try {
-			New $Namespace
-			Set $Namespace = qHandle
-			Set scc = ##class(%Studio.SourceControl.Interface).SourceControlClassGet()
-            set isGitSC = $select(scc = "SourceControl.Git.Extension":1, 1:0)
-			Set Row = $ListBuild(qHandle,isGitSC,1)
-		} Catch e {
-			Set Row = $ListBuild(qHandle,"",0)
-		}
-	}
-	Quit $$$OK
-}
-
-ClassMethod NamespacesClose(ByRef qHandle As %Binary) As %Status [ PlaceAfter = NamespacesExecute ]
-{
-	Quit $$$OK
-}
-
 ClassMethod GetContexts() As %DynamicArray
 {
     set contexts = []
-    set namespacesResultSet = ..NamespacesFunc()
-    while namespacesResultSet.%Next() {
-        set namespace = namespacesResultSet.Namespace
-        if namespacesResultSet.GitSourceControl && namespacesResultSet.Accessible {
-            do contexts.%Push(namespace)
-        }
+    set namespaces = ..GetGitEnabledNamespaces()
+    set ptr = 0
+    while $listnext(namespaces,ptr,value) {
+        do contexts.%Push(value)
     }
 
-    set packagesResultSet = ##class(%SQL.Statement).%ExecDirect(, "SELECT name from %Library.RoutineMgr_StudioOpenDialog('*.ZPM')")
+    set query = "SELECT name from %Library.RoutineMgr_StudioOpenDialog('*.ZPM')"
+    set statement = ##class(%SQL.Statement).%New()
+    $$$ThrowOnError(statement.%Prepare(query, 0))
+    set packagesResultSet = statement.%Execute()
+    throw:packagesResultSet.%SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(packagesResultSet.%SQLCODE,packagesResultSet.%Message)
     while packagesResultSet.%Next() {
         set package = packagesResultSet.Name
         do contexts.%Push(package)
@@ -2474,6 +2438,29 @@ ClassMethod UncommittedWithAction() As %Library.DynamicObject
     quit fileToOtherDevelopers
 }
 
+/// Retrieve the list of Namespaces that have git enabled
+ClassMethod GetGitEnabledNamespaces() As %String
+{
+    // Get all namespaces
+    set allNamespaces = ""
+    do ##class(%SYS.Namespace).ListAll(.allNamespaces)
+
+    set enabledNamespaces = ""
+    set namespace = ""
+    for {
+        set namespace = $ORDER(allNamespaces(namespace))
+        quit:namespace=""
+        try {
+            set sourceControlClass = ##class(%Studio.SourceControl.Interface).SourceControlClassGet(namespace)
+        } catch err {
+            set sourceControlClass = "" // user does not have access to this namespace
+        }
+        if (sourceControlClass = "SourceControl.Git.Extension") set enabledNamespaces = enabledNamespaces _ $listbuild(namespace)
+    }
+
+    quit enabledNamespaces
+}
+
 ClassMethod BuildCEInstallationPackage(ByRef destination As %String) As %Status
 {
     #define sourcedir $System.Util.InstallDirectory()_"devuser/studio/templates/gitsourcecontrol/"
@@ -2628,3 +2615,4 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
+
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
index a05571e6..0a0043b7 100644
--- a/git-webui/release/share/git-webui/webui/css/git-webui.css
+++ b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -221,7 +221,7 @@ body {
 }
 #sidebar #sidebar-content #sidebar-context {
   position: absolute;
-  bottom: 42px;
+  bottom: 50px;
   width: 16.7em;
   padding-bottom: 0.3rem;
   margin-bottom: 0;
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
index e68e7f19..9625c506 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -654,30 +654,29 @@ webui.SideBarView = function(mainView, noEventHandlers) {
 
         $("#chooseContextBtn").on("click", function() {
             self.updateContext($("#chosenContext").val());
+            removePopup(popup);
         });
     }
 
     self.getCurrentContext = function() {
-        var urlParts = window.location.href.split("/");
-        if (urlParts[urlParts.length - 1] == "") {
-            // return namespace as context
-            return urlParts[urlParts.length - 2];
-        } else {
-            // return package as context
-            return urlParts[urlParts.length - 1];
+        var args = window.location.href.split("webuidriver.csp/")[1].split("/");
+        var context = args[0];
+        if (args[1] && (args[1].indexOf(".ZPM") != -1)) {
+            context = args[1];
         }
+        return context;
     }
 
     self.updateContext = function(context) {
-        var urlParts = window.location.href.split("/");
+        var urlParts = window.location.href.split("webuidriver.csp/");
+        var args = urlParts[1].split("/");
         if (context.indexOf(".ZPM") != -1) {
-            urlParts[urlParts.length - 1] = context;
+            args[1] = context;
         } else {
-            urlParts[urlParts.length - 1] = "";
-            urlParts[urlParts.length - 2] = context;
+            args[0] = context;
+            args[1] = "";
         }
-
-        window.location = urlParts.join("/");
+        window.location = urlParts[0] + "webuidriver.csp/" + args.join("/");
         self.currentContext = context;
     }
 
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
index 251de78c..652d5bdb 100644
--- a/git-webui/src/share/git-webui/webui/css/git-webui.less
+++ b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -307,7 +307,7 @@ body {
 
         #sidebar-context {
             position: absolute;
-            bottom: 42px;
+            bottom: 50px;
             width: 16.7em;
             padding-bottom: 0.3rem;
             margin-bottom: 0;
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
index 7ebb49be..9625c506 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -653,32 +653,30 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         });
 
         $("#chooseContextBtn").on("click", function() {
-            removePopup(popup);
             self.updateContext($("#chosenContext").val());
+            removePopup(popup);
         });
     }
 
     self.getCurrentContext = function() {
-        var urlParts = window.location.href.split("/");
-        if (urlParts[urlParts.length - 1] == "") {
-            // return namespace as context
-            return urlParts[urlParts.length - 2];
-        } else {
-            // return package as context
-            return urlParts[urlParts.length - 1];
+        var args = window.location.href.split("webuidriver.csp/")[1].split("/");
+        var context = args[0];
+        if (args[1] && (args[1].indexOf(".ZPM") != -1)) {
+            context = args[1];
         }
+        return context;
     }
 
     self.updateContext = function(context) {
-        var urlParts = window.location.href.split("/");
+        var urlParts = window.location.href.split("webuidriver.csp/");
+        var args = urlParts[1].split("/");
         if (context.indexOf(".ZPM") != -1) {
-            urlParts[urlParts.length - 1] = context;
+            args[1] = context;
         } else {
-            urlParts[urlParts.length - 1] = "";
-            urlParts[urlParts.length - 2] = context;
+            args[0] = context;
+            args[1] = "";
         }
-
-        window.location = urlParts.join("/");
+        window.location = urlParts[0] + "webuidriver.csp/" + args.join("/");
         self.currentContext = context;
     }