From 653958d8f9a323e3c6ac3e639ab34885bf4d40b5 Mon Sep 17 00:00:00 2001
From: Mikko Aspiala <mikko.aspiala@houston-inc.com>
Date: Fri, 5 Nov 2021 13:40:09 +0200
Subject: [PATCH] Tweak UI in a dialog

Co-authored-by: Janne Savolainen <janne.savolainen@live.fi>
Signed-off-by: Mikko Aspiala <mikko.aspiala@houston-inc.com>
---
 .../kube-object-menu.test.tsx.snap            |  8 +++++-
 .../kube-object-menu/kube-object-menu.tsx     | 26 +++++++------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
index ab42e739f0..0836ac62ab 100644
--- a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
+++ b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
@@ -111,8 +111,14 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
         <div>
           <p>
             Remove 
+            some-kind
+             
             <b>
-              Some cluster name/some-kind/some-name
+              some-name
+            </b>
+             from 
+            <b>
+              Some cluster name
             </b>
             ?
           </p>
diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
index 5125c5f001..c9d33c4f5d 100644
--- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx
+++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx
@@ -92,9 +92,7 @@ export class KubeObjectMenu<
     }
 
     const breadcrumbParts = [
-      this.dependencies.clusterName,
       object.getNs(),
-      object.kind,
       object.getName(),
     ];
 
@@ -102,7 +100,7 @@ export class KubeObjectMenu<
 
     return (
       <p>
-        Remove <b>{breadcrumb}</b>?
+        Remove {object.kind} <b>{breadcrumb}</b> from <b>{this.dependencies.clusterName}</b>?
       </p>
     );
   }
@@ -116,20 +114,14 @@ export class KubeObjectMenu<
 
     return this.dependencies.kubeObjectMenuRegistry
       .getItemsForKind(object.kind, object.apiVersion)
-      .map(
-        (
-          {
-            components: { MenuItem },
-          }: { components: { MenuItem: React.ReactType<any> }},
-          index: number,
-        ) => (
-          <MenuItem
-            object={object}
-            toolbar={toolbar}
-            // TODO: Fix misuse of index in key
-            key={`menu-item-${index}`}
-          />
-        ),
+      .map(({ components: { MenuItem }}: { components: { MenuItem: React.ReactType<any> }}, index: number) => (
+        <MenuItem
+          object={object}
+          toolbar={toolbar}
+          // TODO: Fix misuse of index in key
+          key={`menu-item-${index}`}
+        />
+      ),
       );
   }