chore / small fixes

Signed-off-by: Roman <ixrock@gmail.com>

src/renderer/components/+namespaces/namespace.store.ts

@@ -45,13 +45,6 @@ export class NamespaceStore extends KubeObjectStore<Namespace> {
     this.init();
   }
 
-  onContextChange(callback: (contextNamespaces: string[]) => void, opts: IReactionOptions = {}): IReactionDisposer {
-    return reaction(() => this.contextNs.toJS(), callback, {
-      equals: comparer.identity,
-      ...opts,
-    });
-  }
-
   private async init() {
     await clusterStore.whenLoaded;
     if (!getHostedCluster()) return;
@@ -59,29 +52,32 @@ export class NamespaceStore extends KubeObjectStore<Namespace> {
     this.isReady = true;
 
     this.setContext(this.initNamespaces);
+    this.onSelectedNamespacesChange();
+    this.onAllowedNamespacesChange();
+  }
 
-    const disposers: IReactionDisposer[] = [];
+  public onContextChange(callback: (contextNamespaces: string[]) => void, opts: IReactionOptions = {}): IReactionDisposer {
+    return reaction(() => this.contextNs.toJS(), callback, {
+      equals: comparer.identity,
+      ...opts,
+    });
+  }
 
-    // save selected namespaces to local-storage and update URL
+  private onSelectedNamespacesChange(): IReactionDisposer {
-    disposers.push(
+    return this.onContextChange(namespaces => {
-      this.onContextChange(namespaces => {
+      storage.set(namespaces); // save to local-storage
-        storage.set(namespaces);
+      namespaceUrlParam.set(namespaces, { replaceHistory: true }); // update url
-        namespaceUrlParam.set(namespaces, { replaceHistory: true });
     }, {
       fireImmediately: true,
       equals: comparer.identity,
-      })
+    });
-    );
+  }
 
-    // auto-load allowed namespaces
+  private onAllowedNamespacesChange(): IReactionDisposer {
-    disposers.push(
+    return reaction(() => this.allowedNamespaces, () => this.loadAll(), {
-      reaction(() => this.allowedNamespaces, () => this.loadAll(), {
       fireImmediately: true,
       equals: comparer.identity,
-      })
+    });
-    );
-
-    return disposers;
   }
 
   get allowedNamespaces(): string[] {

src/renderer/components/item-object-list/item-list-layout.tsx

@@ -112,19 +112,21 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
   }
 
   async componentDidMount() {
+    if (!this.props.isClusterScoped) {
       disposeOnUnmount(this, [
         namespaceStore.onContextChange(() => this.loadStores(), {
           fireImmediately: true,
         })
       ]);
     }
+  }
 
   async componentWillUnmount() {
     this.isUnmounting = true;
     this.unsubscribeStores();
   }
 
-  async loadStores() {
+  @computed get stores() {
     const { store, dependentStores, isClusterScoped } = this.props;
     const stores = new Set([store, ...dependentStores]);
 
@@ -132,11 +134,14 @@ export class ItemListLayout extends React.Component<ItemListLayoutProps> {
       stores.add(namespaceStore);
     }
 
-    // reset
+    return stores;
-    this.unsubscribeStores();
+  }
+
+  async loadStores() {
+    this.unsubscribeStores(); // reset first
 
     // load
-    for (const store of stores) {
+    for (const store of this.stores) {
       if (this.isUnmounting) {
         this.unsubscribeStores();
         break;

src/renderer/kube-object.store.ts

@@ -99,8 +99,14 @@ export abstract class KubeObjectStore<T extends KubeObject = any> extends ItemSt
     let items: T[];
 
     try {
+      let contextNamespaces = params.namespaces;
+
+      if (!params.namespaces) {
         const { namespaceStore } = await import("./components/+namespaces/namespace.store");
-      const contextNamespaces = params.namespaces || namespaceStore.getContextNamespaces();
+
+        await namespaceStore.whenReady;
+        contextNamespaces = namespaceStore.getContextNamespaces();
+      }
 
       items = await this.loadItems({
         isAdmin: getHostedCluster().isAdmin,