From 682d3211ce5266af71cdc199ecb981d79393d498 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 27 Jan 2022 09:44:12 -0500 Subject: [PATCH] Finish up CatalogEntity.getId() replacements Signed-off-by: Sebastian Malton --- .../catalog-entities/kubernetes-cluster.ts | 16 ++++++++-------- src/common/k8s/resource-stack.ts | 8 ++++---- src/main/catalog/catalog-entity-registry.ts | 2 +- src/main/cluster-manager.ts | 6 +++--- src/migrations/hotbar-store/5.0.0-beta.5.ts | 2 +- src/renderer/api/catalog-entity-registry.ts | 2 +- .../cluster-settings/cluster-settings.tsx | 2 +- src/renderer/initializers/catalog.tsx | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/common/catalog-entities/kubernetes-cluster.ts b/src/common/catalog-entities/kubernetes-cluster.ts index 813d5d3866..0e8a87494e 100644 --- a/src/common/catalog-entities/kubernetes-cluster.ts +++ b/src/common/catalog-entities/kubernetes-cluster.ts @@ -67,22 +67,22 @@ export class KubernetesCluster extends CatalogEntity { if (app) { - await ClusterStore.getInstance().getById(this.metadata.uid)?.activate(); + await ClusterStore.getInstance().getById(this.getId())?.activate(); } else { - await requestMain(clusterActivateHandler, this.metadata.uid, false); + await requestMain(clusterActivateHandler, this.getId(), false); } } async disconnect(): Promise { if (app) { - ClusterStore.getInstance().getById(this.metadata.uid)?.disconnect(); + ClusterStore.getInstance().getById(this.getId())?.disconnect(); } else { - await requestMain(clusterDisconnectHandler, this.metadata.uid, false); + await requestMain(clusterDisconnectHandler, this.getId(), false); } } async onRun(context: CatalogEntityActionContext) { - context.navigate(`/cluster/${this.metadata.uid}`); + context.navigate(`/cluster/${this.getId()}`); } onDetailsOpen(): void { @@ -100,7 +100,7 @@ export class KubernetesCluster extends CatalogEntity broadcastMessage( IpcRendererNavigationEvents.NAVIGATE_IN_APP, - `/entity/${this.metadata.uid}/settings`, + `/entity/${this.getId()}/settings`, ), }); } @@ -111,14 +111,14 @@ export class KubernetesCluster extends CatalogEntity requestMain(clusterDisconnectHandler, this.metadata.uid), + onClick: () => requestMain(clusterDisconnectHandler, this.getId()), }); break; case LensKubernetesClusterStatus.DISCONNECTED: context.menuItems.push({ title: "Connect", icon: "link", - onClick: () => context.navigate(`/cluster/${this.metadata.uid}`), + onClick: () => context.navigate(`/cluster/${this.getId()}`), }); break; } diff --git a/src/common/k8s/resource-stack.ts b/src/common/k8s/resource-stack.ts index 08aae15d0b..52e2c664b2 100644 --- a/src/common/k8s/resource-stack.ts +++ b/src/common/k8s/resource-stack.ts @@ -41,7 +41,7 @@ export class ResourceStack { } protected async applyResources(resources: string[], extraArgs?: string[]): Promise { - const clusterModel = ClusterStore.getInstance().getById(this.cluster.metadata.uid); + const clusterModel = ClusterStore.getInstance().getById(this.cluster.getId()); if (!clusterModel) { throw new Error(`cluster not found`); @@ -54,7 +54,7 @@ export class ResourceStack { if (app) { return await new ResourceApplier(clusterModel).kubectlApplyAll(resources, kubectlArgs); } else { - const response = await requestMain(clusterKubectlApplyAllHandler, this.cluster.metadata.uid, resources, kubectlArgs); + const response = await requestMain(clusterKubectlApplyAllHandler, this.cluster.getId(), resources, kubectlArgs); if (response.stderr) { throw new Error(response.stderr); @@ -65,7 +65,7 @@ export class ResourceStack { } protected async deleteResources(resources: string[], extraArgs?: string[]): Promise { - const clusterModel = ClusterStore.getInstance().getById(this.cluster.metadata.uid); + const clusterModel = ClusterStore.getInstance().getById(this.cluster.getId()); if (!clusterModel) { throw new Error(`cluster not found`); @@ -78,7 +78,7 @@ export class ResourceStack { if (app) { return await new ResourceApplier(clusterModel).kubectlDeleteAll(resources, kubectlArgs); } else { - const response = await requestMain(clusterKubectlDeleteAllHandler, this.cluster.metadata.uid, resources, kubectlArgs); + const response = await requestMain(clusterKubectlDeleteAllHandler, this.cluster.getId(), resources, kubectlArgs); if (response.stderr) { throw new Error(response.stderr); diff --git a/src/main/catalog/catalog-entity-registry.ts b/src/main/catalog/catalog-entity-registry.ts index 65f60d8e4e..5c6e760052 100644 --- a/src/main/catalog/catalog-entity-registry.ts +++ b/src/main/catalog/catalog-entity-registry.ts @@ -36,7 +36,7 @@ export class CatalogEntityRegistry { } getById(id: string): T | undefined { - return this.items.find((entity) => entity.metadata.uid === id) as T | undefined; + return this.items.find(entity => entity.getId() === id) as T | undefined; } getItemsForApiKind(apiVersion: string, kind: string): T[] { diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts index b7e17ff762..11b7af5f4c 100644 --- a/src/main/cluster-manager.ts +++ b/src/main/cluster-manager.ts @@ -85,7 +85,7 @@ export class ClusterManager extends Singleton { } protected updateEntityFromCluster(cluster: Cluster) { - const index = catalogEntityRegistry.items.findIndex((entity) => entity.metadata.uid === cluster.id); + const index = catalogEntityRegistry.items.findIndex((entity) => entity.getId() === cluster.id); if (index === -1) { return; @@ -169,11 +169,11 @@ export class ClusterManager extends Singleton { @action protected syncClustersFromCatalog(entities: KubernetesCluster[]) { for (const entity of entities) { - const cluster = this.store.getById(entity.metadata.uid); + const cluster = this.store.getById(entity.getId()); if (!cluster) { const model = { - id: entity.metadata.uid, + id: entity.getId(), kubeConfigPath: entity.spec.kubeconfigPath, contextName: entity.spec.kubeconfigContext, accessibleNamespaces: entity.spec.accessibleNamespaces ?? [], diff --git a/src/migrations/hotbar-store/5.0.0-beta.5.ts b/src/migrations/hotbar-store/5.0.0-beta.5.ts index 421bc2b908..bb7ceb2567 100644 --- a/src/migrations/hotbar-store/5.0.0-beta.5.ts +++ b/src/migrations/hotbar-store/5.0.0-beta.5.ts @@ -16,7 +16,7 @@ export default { for (const hotbar of hotbars) { for (let i = 0; i < hotbar.items.length; i += 1) { const item = hotbar.items[i]; - const entity = catalogEntityRegistry.items.find((entity) => entity.metadata.uid === item?.entity.uid); + const entity = catalogEntityRegistry.items.find((entity) => entity.getId() === item?.entity.uid); if (!entity) { // Clear disabled item diff --git a/src/renderer/api/catalog-entity-registry.ts b/src/renderer/api/catalog-entity-registry.ts index 85477245a4..a3720d5d4f 100644 --- a/src/renderer/api/catalog-entity-registry.ts +++ b/src/renderer/api/catalog-entity-registry.ts @@ -120,7 +120,7 @@ export class CatalogEntityRegistry { const entity = this.categoryRegistry.getEntityForData(item); if (entity) { - this._entities.set(entity.metadata.uid, entity); + this._entities.set(entity.getId(), entity); } else { this.rawEntities.push(item); } diff --git a/src/renderer/components/cluster-settings/cluster-settings.tsx b/src/renderer/components/cluster-settings/cluster-settings.tsx index bfd89bda36..e89a600095 100644 --- a/src/renderer/components/cluster-settings/cluster-settings.tsx +++ b/src/renderer/components/cluster-settings/cluster-settings.tsx @@ -11,7 +11,7 @@ import type { CatalogEntity } from "../../api/catalog-entity"; import * as components from "./components"; function getClusterForEntity(entity: CatalogEntity) { - return ClusterStore.getInstance().getById(entity.metadata.uid); + return ClusterStore.getInstance().getById(entity.getId()); } export function GeneralSettings({ entity }: EntitySettingViewProps) { diff --git a/src/renderer/initializers/catalog.tsx b/src/renderer/initializers/catalog.tsx index 3c4b0e87c4..da1cb31945 100644 --- a/src/renderer/initializers/catalog.tsx +++ b/src/renderer/initializers/catalog.tsx @@ -50,7 +50,7 @@ export function initCatalog({ openCommandDialog }: Dependencies) { context.menuItems.push({ title: "Delete", icon: "delete", - onClick: () => onClusterDelete(entity.metadata.uid), + onClick: () => onClusterDelete(entity.getId()), }); } });