Fix: user namespace override (Fixes argoproj#9266) (argoproj#9267)

fix: user namespace override Signed-off-by: Loric ANDRE <loric.a@padoa-group.com> Signed-off-by: Reddy <Rajshekar.Reddy@lowes.com>
reddymh · Jan 2, 2023 · 112fd7a · 112fd7a
1 parent b963528
commit 112fd7a
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/ui/src/app/shared/utils.ts b/ui/src/app/shared/utils.ts
@@ -103,8 +103,12 @@ export const Utils = {
     },
 
     get currentNamespace() {
-        // we always prefer the user namespace
-        return this.userNamespace || this.managedNamespace || this.fixLocalStorageString(localStorage.getItem(currentNamespaceKey));
+        // we always prefer the managed namespace
+        if (localStorage.getItem(currentNamespaceKey) === null) {
+            return this.userNamespace || this.managedNamespace;
+        } else {
+            return this.fixLocalStorageString(localStorage.getItem(currentNamespaceKey));
+        }
     },
 
     // return a namespace, favoring managed namespace when set
@@ -114,7 +118,7 @@ export const Utils = {
 
     // return a namespace, never return null/undefined, defaults to "default"
     getNamespaceWithDefault(namespace: string) {
-        return this.userNamespace || this.managedNamespace || namespace || this.currentNamespace || 'default';
+        return namespace || this.currentNamespace || this.userNamespace || this.managedNamespace || 'default';
     },
 
     queryParams(filter: {