From 9ac6f5213b7fe755c365cb4a476498b4cc8659e9 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 9 Mar 2023 10:25:17 -0500 Subject: [PATCH] Revert changes to KubeObjectStore Signed-off-by: Sebastian Malton --- .../core/src/common/k8s-api/kube-object.store.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/common/k8s-api/kube-object.store.ts b/packages/core/src/common/k8s-api/kube-object.store.ts index affeb8c144..571e395a7b 100644 --- a/packages/core/src/common/k8s-api/kube-object.store.ts +++ b/packages/core/src/common/k8s-api/kube-object.store.ts @@ -113,15 +113,15 @@ export abstract class KubeObjectStore< this.bindWatchEventsUpdater(); } + // TODO: Circular dependency: KubeObjectStore -> ClusterFrameContext -> NamespaceStore -> KubeObjectStore @computed get contextItems(): K[] { - if (!this.api.isNamespaced) { - return this.items; - } - const namespaces = this.dependencies.context.contextNamespaces; - return this.items - .filter(item => namespaces.includes(item.getNs() as string)); + return this.items.filter(item => { + const itemNamespace = item.getNs(); + + return !itemNamespace /* cluster-wide */ || namespaces.includes(itemNamespace); + }); } getTotalCount(): number {