Remember the most recently selected namespace (kubeflow#6663)

* Remember the most recently selected namespace This way, Centraldashboard restores the namespace the user visited last * Include user and namespace in localstorage's key Remembering the most recently selected ns now works in multi-user envs * Changed localstorage key to /centraldashboard/selectedNamespace/<user>
maroroman · Feb 7, 2023 · ec3c616 · ec3c616
1 parent a4c2a8d
commit ec3c616
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/components/centraldashboard/public/components/main-page.js b/components/centraldashboard/public/components/main-page.js
@@ -303,6 +303,15 @@ export class MainPage extends utilitiesMixin(PolymerElement) {
     _namespaceChanged(namespace) {
         // update namespaced menu item when namespace is changed
         // by namespace selector
+
+        if (namespace) {
+            // Save the user's choice so we are able to restore it, 
+            // when re-loading the page without a queryParam
+            const localStorageKey = "/centraldashboard/selectedNamespace/" +
+                (this.user && "." + this.user || "");
+            localStorage.setItem(localStorageKey, namespace);
+        }
+
         if (this.namespacedItemTemplete &&
             this.namespacedItemTemplete.includes('{ns}')) {
             this.set('subRouteData.path',

diff --git a/components/centraldashboard/public/components/main-page.pug b/components/centraldashboard/public/components/main-page.pug
@@ -79,7 +79,8 @@ app-drawer-layout.flex(narrow='{{narrowMode}}',
                     query-params='{{queryParams}}', route='{{route}}',
                     namespaces='[[namespaces]]', selected='{{namespace}}',
                     hides, hidden$='[[hideNamespaces]]'
-                    all-namespaces='[[allNamespaces]]')
+                    all-namespaces='[[allNamespaces]]', 
+                    user='[[user]]')
                 footer#User-Badge
                     a(target="_top", href="/logout")
                         iron-icon.icon(icon='kubeflow:logout' title="Logout")

diff --git a/components/centraldashboard/public/components/namespace-selector.js b/components/centraldashboard/public/components/namespace-selector.js
@@ -118,6 +118,7 @@ export class NamespaceSelector extends PolymerElement {
                 notify: true,
             },
             allNamespaces: {type: Boolean, value: false},
+            user: String,
             selectedNamespaceIsOwned: {
                 type: Boolean,
                 readOnly: true,
@@ -196,6 +197,18 @@ export class NamespaceSelector extends PolymerElement {
      * @return {string}
      */
     getDefaultNamespace() {
+        // Restore the user's previous namespace choice
+        const localStorageKey = "/centraldashboard/selectedNamespace/" +
+            (this.user && "." + this.user || "");
+        const previousNamespaceName = localStorage.getItem(localStorageKey);
+        if (previousNamespaceName) {
+            const previousNamespace = this.namespaces.find(
+                (n) => n.namespace === previousNamespaceName);
+            if (previousNamespace) {
+                return previousNamespace;
+            }
+        }
+
         return this.namespaces.find(
             (n) => n.role == 'owner');
     }