From 22787a13764f044e526f5d7ee30719153b462f8c Mon Sep 17 00:00:00 2001 From: "Hung-Han (Henry) Chen" Date: Wed, 29 Sep 2021 16:45:39 +0300 Subject: [PATCH] Move to .spec Signed-off-by: Hung-Han (Henry) Chen --- src/common/catalog-entities/kubernetes-cluster.ts | 1 + src/common/catalog-entities/web-link.ts | 1 + src/main/catalog-sources/weblinks.ts | 7 +++---- src/main/cluster-manager.ts | 4 ++-- .../components/+catalog/catalog-entity-details.test.tsx | 8 ++++---- .../components/+catalog/catalog-entity-details.tsx | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/common/catalog-entities/kubernetes-cluster.ts b/src/common/catalog-entities/kubernetes-cluster.ts index a94574634d..fb9b8dfcda 100644 --- a/src/common/catalog-entities/kubernetes-cluster.ts +++ b/src/common/catalog-entities/kubernetes-cluster.ts @@ -52,6 +52,7 @@ export interface KubernetesClusterSpec extends CatalogEntitySpec { background?: string; }; accessibleNamespaces?: string[]; + triggerOnRunAfterOnClickDetailIcon?: boolean } export interface KubernetesClusterMetadata extends CatalogEntityMetadata { diff --git a/src/common/catalog-entities/web-link.ts b/src/common/catalog-entities/web-link.ts index 886ffb186a..c4354a2a4d 100644 --- a/src/common/catalog-entities/web-link.ts +++ b/src/common/catalog-entities/web-link.ts @@ -32,6 +32,7 @@ export interface WebLinkStatus extends CatalogEntityStatus { export type WebLinkSpec = { url: string; + triggerOnRunAfterOnClickDetailIcon?: true, }; export class WebLink extends CatalogEntity { diff --git a/src/main/catalog-sources/weblinks.ts b/src/main/catalog-sources/weblinks.ts index 90c9c72433..88afbac3a3 100644 --- a/src/main/catalog-sources/weblinks.ts +++ b/src/main/catalog-sources/weblinks.ts @@ -75,12 +75,11 @@ export function syncWeblinks() { uid: weblinkData.id, name: weblinkData.name, source: "local", - labels: { - triggerOnRunAfterOnClickDetailIcon: "true", - } + labels: {} }, spec: { - url: weblinkData.url + url: weblinkData.url, + triggerOnRunAfterOnClickDetailIcon: true, }, status: { phase: "available", diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts index b58084d62f..23e8c77a4e 100644 --- a/src/main/cluster-manager.ts +++ b/src/main/cluster-manager.ts @@ -261,7 +261,6 @@ export function catalogEntityFromCluster(cluster: Cluster) { name: cluster.name, source: "local", labels: { - triggerOnRunAfterOnClickDetailIcon: "true", ...cluster.labels, }, distro: cluster.distribution, @@ -270,7 +269,8 @@ export function catalogEntityFromCluster(cluster: Cluster) { spec: { kubeconfigPath: cluster.kubeConfigPath, kubeconfigContext: cluster.contextName, - icon: {} + icon: {}, + triggerOnRunAfterOnClickDetailIcon: true, }, status: { phase: cluster.disconnected ? "disconnected" : "connected", diff --git a/src/renderer/components/+catalog/catalog-entity-details.test.tsx b/src/renderer/components/+catalog/catalog-entity-details.test.tsx index 3735083404..58672ec29b 100644 --- a/src/renderer/components/+catalog/catalog-entity-details.test.tsx +++ b/src/renderer/components/+catalog/catalog-entity-details.test.tsx @@ -121,14 +121,14 @@ describe("", () => { metadata: { uid: "", name: "", - labels: { - triggerOnRunAfterOnClickDetailIcon: "true", - }, + labels: {}, }, status: { phase: "", }, - spec: { }, + spec: { + triggerOnRunAfterOnClickDetailIcon: true + }, getId: () => "", getName: () => "", onContextMenuOpen: () => {}, diff --git a/src/renderer/components/+catalog/catalog-entity-details.tsx b/src/renderer/components/+catalog/catalog-entity-details.tsx index 1aa7e41a97..e333fedb7a 100644 --- a/src/renderer/components/+catalog/catalog-entity-details.tsx +++ b/src/renderer/components/+catalog/catalog-entity-details.tsx @@ -75,7 +75,7 @@ export class CatalogEntityDetails extends Component