Remove the concept of caching namespaces; we now expect them to be re…

…source-independent
hashicorp · Jul 11, 2022 · a56cffd · a56cffd
1 parent 96f0021
commit a56cffd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 41 deletions.
diff --git a/ui/app/controllers/csi/volumes/index.js b/ui/app/controllers/csi/volumes/index.js
@@ -64,7 +64,7 @@ export default class IndexController extends Controller.extend(
 
   fuzzySearchEnabled = true;
 
-  @computed('qpNamespace', 'model.namespaces.[]', 'system.cachedNamespace')
+  @computed('qpNamespace', 'model.namespaces.[]')
   get optionsNamespaces() {
     const availableNamespaces = this.model.namespaces.map((namespace) => ({
       key: namespace.name,
@@ -81,7 +81,7 @@ export default class IndexController extends Controller.extend(
       // eslint-disable-next-line ember/no-incorrect-calls-with-inline-anonymous-functions
       scheduleOnce('actions', () => {
         // eslint-disable-next-line ember/no-side-effects
-        this.set('qpNamespace', this.system.cachedNamespace || '*');
+        this.set('qpNamespace', '*');
       });
     }
 
@@ -101,11 +101,6 @@ export default class IndexController extends Controller.extend(
   @alias('listSorted') listToSearch;
   @alias('listSearched') sortedVolumes;
 
-  @action
-  cacheNamespace(namespace) {
-    set(this, 'system.cachedNamespace', namespace);
-  }
-
   setFacetQueryParam(queryParam, selection) {
     this.set(queryParam, serialize(selection));
   }

diff --git a/ui/app/controllers/jobs/index.js b/ui/app/controllers/jobs/index.js
@@ -165,7 +165,7 @@ export default class IndexController extends Controller.extend(
     }));
   }
 
-  @computed('qpNamespace', 'model.namespaces.[]', 'system.cachedNamespace')
+  @computed('qpNamespace', 'model.namespaces.[]')
   get optionsNamespaces() {
     const availableNamespaces = this.model.namespaces.map((namespace) => ({
       key: namespace.name,
@@ -181,7 +181,7 @@ export default class IndexController extends Controller.extend(
     if (!availableNamespaces.mapBy('key').includes(this.qpNamespace)) {
       scheduleOnce('actions', () => {
         // eslint-disable-next-line ember/no-side-effects
-        this.set('qpNamespace', this.system.cachedNamespace || '*');
+        this.set('qpNamespace', '*');
       });
     }
 
@@ -252,11 +252,6 @@ export default class IndexController extends Controller.extend(
 
   isShowingDeploymentDetails = false;
 
-  @action
-  cacheNamespace(namespace) {
-    set(this, 'system.cachedNamespace', namespace);
-  }
-
   setFacetQueryParam(queryParam, selection) {
     this.set(queryParam, serialize(selection));
   }

diff --git a/ui/app/controllers/optimize.js b/ui/app/controllers/optimize.js
@@ -87,7 +87,7 @@ export default class OptimizeController extends Controller {
     if (!availableNamespaces.mapBy('key').includes(this.qpNamespace)) {
       scheduleOnce('actions', () => {
         // eslint-disable-next-line ember/no-side-effects
-        this.qpNamespace = this.system.cachedNamespace || '*';
+        this.qpNamespace = '*';
       });
     }
 
@@ -247,11 +247,6 @@ export default class OptimizeController extends Controller {
     });
   }
 
-  @action
-  cacheNamespace(namespace) {
-    this.system.cachedNamespace = namespace;
-  }
-
   @action
   setFacetQueryParam(queryParam, selection) {
     this[queryParam] = serialize(selection);

diff --git a/ui/app/services/system.js b/ui/app/services/system.js
@@ -132,12 +132,6 @@ export default class SystemService extends Service {
     );
   }
 
-  // The cachedNamespace is set on pages that have a namespaces filter.
-  // It is set so other pages that have a namespaces filter can default to
-  // what the previous namespaces filter page used rather than defaulting
-  // to 'default' or '*'.
-  @tracked cachedNamespace = null;
-
   @task(function* () {
     const emptyLicense = { License: { Features: [] } };
 

diff --git a/ui/app/templates/csi/volumes/index.hbs b/ui/app/templates/csi/volumes/index.hbs
@@ -33,9 +33,7 @@
             @label="Namespace"
             @options={{this.optionsNamespaces}}
             @selection={{this.qpNamespace}}
-            @onSelect={{action
-              (queue (action this.cacheNamespace) (action this.setFacetQueryParam "qpNamespace"))
-            }}
+            @onSelect={{action this.setFacetQueryParam "qpNamespace"}}
           />
         </div>
       </div>

diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
@@ -43,12 +43,7 @@
             @label="Namespace"
             @options={{this.optionsNamespaces}}
             @selection={{this.qpNamespace}}
-            @onSelect={{action
-              (queue
-                (action this.cacheNamespace)
-                (action this.setFacetQueryParam "qpNamespace")
-              )
-            }}
+            @onSelect={{action this.setFacetQueryParam "qpNamespace"}}
           />
         {{/if}}
         <MultiSelectDropdown

diff --git a/ui/app/templates/optimize.hbs b/ui/app/templates/optimize.hbs
@@ -23,12 +23,7 @@
                 @label="Namespace"
                 @options={{this.optionsNamespaces}}
                 @selection={{this.qpNamespace}}
-                @onSelect={{action
-                  (queue
-                    (action this.cacheNamespace)
-                    (action this.setFacetQueryParam "qpNamespace")
-                  )
-                }}
+                @onSelect={{action this.setFacetQueryParam "qpNamespace"}}
               />
             {{/if}}
             <MultiSelectDropdown