From 7c67696c10499e162aa01a57d01a472205081461 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Wed, 4 May 2022 16:35:41 -0400
Subject: [PATCH] fix merge build issues

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../kube-object-menu-items/get-kube-object-menu-items.ts    | 6 ++++--
 src/renderer/components/layout/sidebar-cluster.tsx          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts
index d363095e3c..7539edd041 100644
--- a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts
+++ b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts
@@ -16,8 +16,10 @@ export const getKubeObjectMenuItems = ({
   extensions,
   kubeObject,
 }: Dependencies) => {
-  return staticMenuItems
-    .concat(extensions.flatMap((extension) => extension.kubeObjectMenuItems))
+  return [
+    ...staticMenuItems,
+    ...extensions.flatMap((extension) => extension.kubeObjectMenuItems),
+  ]
     .filter(
       conforms({
         kind: eq(kubeObject?.kind),
diff --git a/src/renderer/components/layout/sidebar-cluster.tsx b/src/renderer/components/layout/sidebar-cluster.tsx
index b41d98880c..e7e85be17b 100644
--- a/src/renderer/components/layout/sidebar-cluster.tsx
+++ b/src/renderer/components/layout/sidebar-cluster.tsx
@@ -25,7 +25,7 @@ import navigateInjectable from "../../navigation/navigate.injectable";
 import normalizeCatalogEntityContextMenuInjectable from "../../catalog/normalize-menu-item.injectable";
 
 export interface SidebarClusterProps {
-  clusterEntity: CatalogEntity;
+  clusterEntity: CatalogEntity | null | undefined;
 }
 
 interface Dependencies {