From 68001990a0802a55c88645bd23608371fe54fe71 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 8 Dec 2020 15:46:18 +0200 Subject: [PATCH] fix: reverting NamespaceStore public-api breaking changes Signed-off-by: Roman --- .../components/+namespaces/namespace.store.ts | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/renderer/components/+namespaces/namespace.store.ts b/src/renderer/components/+namespaces/namespace.store.ts index c5a415abe0..1c028aef1f 100644 --- a/src/renderer/components/+namespaces/namespace.store.ts +++ b/src/renderer/components/+namespaces/namespace.store.ts @@ -14,14 +14,14 @@ export const namespaceUrlParam = createPageParam({ isSystem: true, multiValues: true, get defaultValue() { - return storage.get(); + return storage.get(); // initial namespaces coming from URL or local-storage (default) } }); @autobind() export class NamespaceStore extends KubeObjectStore { api = namespacesApi; - contextNs = observable.array(storage.get()); + contextNs = observable.array(); constructor() { super(); @@ -29,8 +29,7 @@ export class NamespaceStore extends KubeObjectStore { } private init() { - // setup initial context namespaces from URL (when provided) or local-storage (default) - this.setContext(namespaceUrlParam.get()); + this.setContext(this.initNamespaces); return reaction(() => this.contextNs.toJS(), namespaces => { storage.set(namespaces); // save to local-storage @@ -41,12 +40,22 @@ export class NamespaceStore extends KubeObjectStore { }); } + get initNamespaces() { + return namespaceUrlParam.get() + } + + getContextParams() { + return { + namespaces: this.contextNs.toJS(), + }; + } + subscribe(apis = [this.api]) { const { allowedNamespaces } = getHostedCluster(); // if user has given static list of namespaces let's not start watches because watch adds stuff that's not wanted if (allowedNamespaces.length > 0) { - return () => { return; }; + return Function; // no-op } return super.subscribe(apis);