Switched to sql approach for favorite namespaces

Author: isc-akadoo

CHANGELOG.md

@@ -16,8 +16,8 @@ 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)
-- Fixed GetContexts utils function to return namespaces for WebUI (#468)
 - Fixed slowness loading some CSP pages with multiple instances sharing a webserver (#540)
+- Fixed GetContexts utils function to exclude implied namespaces from the list of namespaces(#468)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/Settings.cls

@@ -58,7 +58,7 @@ Property environmentName As %String(MAXLEN = "") [ InitialExpression = {##class(
 
 Property Mappings [ MultiDimensional ];
 
-Property favoriteNamespaces As %String [ InitialExpression = {##class(SourceControl.Git.Utils).FavoriteNamespaces()} ];
+Property favoriteNamespaces As %DynamicArray;
 
 Method %OnNew() As %Status
 {
@@ -71,10 +71,7 @@ Method %OnNew() As %Status
     if ('isDefault) {
         set ..gitBinPath = gitBinPath
     }
-    if ..favoriteNamespaces= "" {
-        set namespaces = ##class(SourceControl.Git.Utils).GetContexts(1)
-        set ..favoriteNamespaces = namespaces.%ToJSON()
-    }
+    set ..favoriteNamespaces = ##class(SourceControl.Git.Utils).FavoriteNamespaces()
     quit $$$OK
 }
 

cls/SourceControl/Git/Utils.cls

@@ -74,7 +74,9 @@ $Get(@..#Storage@("settings","settingsUIReadOnly"), 0)
 
 ClassMethod FavoriteNamespaces() As %String
 {
-    quit $get(@..#Storage@("settings", "user", $username, "favNamespaces"),"")
+    set favNamespaces = []
+    do ..GetFavoriteNamespaces(.favNamespaces,[])
+    return favNamespaces
 }
 
 /// Returns the current (or previous) value of the flag.
@@ -2841,19 +2843,8 @@ ClassMethod SetConfiguredRemote(url) As %String
     quit output
 }
 
-ClassMethod ConfigureFavoriteNamespaces(username As %String, favNamespaces As %String)
+ClassMethod ConfigureFavoriteNamespaces(username As %String, newNamespaces As %String)
 {
-    set newNamespaces = [].%FromJSON(favNamespaces)
-    set namespaces = ..GetContexts(1)
-
-    set iterator = namespaces.%GetIterator()
-    while iterator.%GetNext(.key, .value) {
-        new $Namespace
-        set $Namespace = value
-        kill @..#Storage@("settings", "user", $username, "favNamespaces")
-        set @..#Storage@("settings", "user", $username, "favNamespaces") = favNamespaces
-    }
-
     // Delete all the GIT favorite links for the user
     set iterator = newNamespaces.%GetIterator()
     while iterator.%GetNext(.key, .value) {
@@ -2882,4 +2873,20 @@ ClassMethod ConfigureFavoriteNamespaces(username As %String, favNamespaces As %S
     }
 }
 
+ClassMethod GetFavoriteNamespaces(ByRef favNamespaces As %DynamicArray, ByRef nonFavNamespaces As %DynamicArray) {
+    set allNamespaces = ..GetContexts(1)
+    set iterator = allNamespaces.%GetIterator()
+
+    while iterator.%GetNext(.key, .value) {
+        set sql = "select * from %SYS_Portal.Users where username='"_$username_"' and page='Git: "_value_"'"
+        set statement = ##class(%SQL.Statement).%New()
+        set res = ##class(%SQL.Statement).%ExecDirect(statement,sql)
+        if (res.%Next()) {
+            do favNamespaces.%Push(value)
+        } else {
+            do nonFavNamespaces.%Push(value)
+        }
+    }
+}
+
 }

csp/gitprojectsettings.csp

@@ -130,6 +130,18 @@ body {
         }
             set i = i+1
         }
+
+        set i = 1
+        set contexts = []
+
+        while ( $Data(%request.Data("favNamespace",i)) ){
+        if ($Get(%request.Data("favNamespace",i)) '= "") {
+            do contexts.%Push($Get(%request.Data("favNamespace",i)))
+        }
+        set i = i+1
+        }
+
+        set settings.favoriteNamespaces = contexts
     }
     do settings.%Save()
 }
@@ -569,23 +581,14 @@ body {
             <div class="col-sm-7">
                 <select multiple class="form-control" id="addToFav" name="favNamespace">
                 <server>
-                    set contextList = ##class(SourceControl.Git.Utils).GetContexts(1)
-                    set selectedNamespaces = [].%FromJSON(settings.favoriteNamespaces)
+                    set nonFavNamespaces = []
+                    set selectedNamespaces = []
+                    do ##class(SourceControl.Git.Utils).GetFavoriteNamespaces(.selectedNamespaces,.nonFavNamespaces)
                     set iterator = selectedNamespaces.%GetIterator()
                     while iterator.%GetNext(.key, .value) {
                         &html<<option selected value=#(value)#>#(value)#</option>>
-                        set k = -1
-                        set citerator = contextList.%GetIterator()
-                        while citerator.%GetNext(.ckey, .cvalue) {
-                            if (cvalue = value) {
-                                set k = ckey
-                            }
-                        }
-                        if (k > -1) {
-                            do contextList.%Remove(k)
-                        }
                     }
-                    set iterator = contextList.%GetIterator()
+                    set iterator = nonFavNamespaces.%GetIterator()
                     while iterator.%GetNext(.key, .value) {   
                         &html<<option value=#(value)#>#(value)#</option>>
                     }

csp/pull.csp

@@ -11,6 +11,7 @@
 <body>
 <pre for="contextSelect" style="padding-top: 2em;white-space: pre-wrap;">Change Context:  <select id="newContext" onchange="updateContext()">
 	<server>
+		set $NAMESPACE = %request.Data("$NAMESPACE",1)
 		set contextList = ##class(SourceControl.Git.Utils).GetContexts(1)
         set iterator = contextList.%GetIterator()
 		&html<<option>Select</option>>
@@ -57,10 +58,8 @@ function execute() {
 }
 
 function updateContext() {
-    const contextSelect = document.getElementById('newContext');
-    const selectedContext = contextSelect.value;
-	
-	window.location.href = "/isc/studio/usertemplates/gitsourcecontrol/pull.csp?$NAMESPACE=" + selectedContext;
+    var contextSelect = document.getElementById('newContext');
+	window.location.href = "#(%request.URLPrefix)#/isc/studio/usertemplates/gitsourcecontrol/pull.csp?$NAMESPACE=" + contextSelect.value;
 }
 
 preview();