From c0f62a7cc95d0b4f5aea20c0850066180066f9a2 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Mon, 21 Jun 2021 11:09:11 -0400
Subject: [PATCH] Fixing placement of typings for icons

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 src/common/catalog-entities/kubernetes-cluster.ts | 11 +++++++----
 src/main/cluster-manager.ts                       | 10 ++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/common/catalog-entities/kubernetes-cluster.ts b/src/common/catalog-entities/kubernetes-cluster.ts
index 322675b23a..e1766c1bb0 100644
--- a/src/common/catalog-entities/kubernetes-cluster.ts
+++ b/src/common/catalog-entities/kubernetes-cluster.ts
@@ -38,9 +38,6 @@ export interface KubernetesClusterPrometheusMetrics {
     prefix: string;
   };
   type?: string;
-  icon?: {
-    src?: string;
-  };
 }
 
 export interface KubernetesClusterSpec extends CatalogEntitySpec {
@@ -49,7 +46,13 @@ export interface KubernetesClusterSpec extends CatalogEntitySpec {
   metrics?: {
     source: string;
     prometheus?: KubernetesClusterPrometheusMetrics;
-  }
+  };
+  icon?: {
+    // TODO: move to CatalogEntitySpec once any-entity icons are supported
+    src?: string;
+    material?: string;
+    background?: string;
+  };
 }
 
 export interface KubernetesClusterStatus extends CatalogEntityStatus {
diff --git a/src/main/cluster-manager.ts b/src/main/cluster-manager.ts
index e302b403b7..b15cce8ae7 100644
--- a/src/main/cluster-manager.ts
+++ b/src/main/cluster-manager.ts
@@ -119,10 +119,12 @@ export class ClusterManager extends Singleton {
       entity.spec.metrics.prometheus = prometheus;
     }
 
-    cluster.preferences.icon ? entity.spec.icon = {
-      ...entity.spec.icon,
-      src: cluster.preferences.icon
-    } : entity.spec.icon = null;
+    if (cluster.preferences.icon) {
+      entity.spec.icon ??= {};
+      entity.spec.icon.src = cluster.preferences.icon;
+    } else {
+      entity.spec.icon = null;
+    }
 
     catalogEntityRegistry.items.splice(index, 1, entity);
   }