From a7f69ab0e301380186dd362f7c9170619fd2e8c3 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Mon, 21 Jun 2021 17:13:29 +0300 Subject: [PATCH] fix set of cluster entity icon src Signed-off-by: Jari Kolehmainen --- src/main/cluster-manager.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts index 66c9bda601..d43f9ad4d7 100644 --- a/src/main/cluster-manager.ts +++ b/src/main/cluster-manager.ts @@ -102,7 +102,7 @@ export class ClusterManager extends Singleton { const entity = catalogEntityRegistry.items[index] as KubernetesCluster; this.updateEntityStatus(entity, cluster); - + entity.metadata.labels = Object.assign({}, cluster.labels, entity.metadata.labels); if (cluster.preferences?.clusterName) { @@ -119,7 +119,10 @@ export class ClusterManager extends Singleton { entity.spec.metrics.prometheus = prometheus; } - entity.spec.icon.src = cluster.preferences.icon; + cluster.preferences.icon ? entity.spec.icon = { + src: cluster.preferences.icon, + ...entity.spec.icon + } : entity.spec.icon = null; catalogEntityRegistry.items.splice(index, 1, entity); }