From a6e266f3b640ab048c1138775b09ac410e43d00f Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Mon, 29 Mar 2021 09:44:58 -0400
Subject: [PATCH] make single source of truth for status icon

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../kube-object-status-icon.tsx               | 25 +++----------------
 .../kube-object/kube-object-meta.tsx          | 23 ++++-------------
 2 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx
index 49748c605f..582d9746a1 100644
--- a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx
+++ b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx
@@ -6,18 +6,7 @@ import { cssNames, formatDuration } from "../../utils";
 import { KubeObject, KubeObjectStatus, KubeObjectStatusLevel } from "../../..//extensions/renderer-api/k8s-api";
 import { kubeObjectStatusRegistry } from "../../../extensions/registries";
 
-interface BaseProps {
-  statuses?: KubeObjectStatus[];
-  object?: KubeObject;
-}
-
-interface StatusProps extends BaseProps {
-  statuses: KubeObjectStatus[];
-  object?: undefined;
-}
-
-interface ObjectProps extends BaseProps {
-  statuses?: undefined;
+export interface ObjectProps {
   object: KubeObject;
 }
 
@@ -74,7 +63,7 @@ function splitByLevel(src: KubeObjectStatus[]): SplitStatusesByLevel {
   return { maxLevel, criticals, warnings, infos };
 }
 
-export class KubeObjectStatusIcon extends React.Component<StatusProps | ObjectProps> {
+export class KubeObjectStatusIcon extends React.Component<ObjectProps> {
   renderStatuses(statuses: KubeObjectStatus[], level: number) {
     const filteredStatuses = statuses.filter((item) => item.level == level);
 
@@ -94,16 +83,8 @@ export class KubeObjectStatusIcon extends React.Component<StatusProps | ObjectPr
     );
   }
 
-  resolveStatusesFromProps() {
-    if (this.props.statuses) {
-      return this.props.statuses;
-    }
-
-    return kubeObjectStatusRegistry.getItemsForObject(this.props.object);
-  }
-
   render() {
-    const statuses = this.resolveStatusesFromProps();
+    const statuses = kubeObjectStatusRegistry.getItemsForObject(this.props.object);
 
     if (statuses.length === 0) {
       return null;
diff --git a/src/renderer/components/kube-object/kube-object-meta.tsx b/src/renderer/components/kube-object/kube-object-meta.tsx
index 535500855a..6d402f14a6 100644
--- a/src/renderer/components/kube-object/kube-object-meta.tsx
+++ b/src/renderer/components/kube-object/kube-object-meta.tsx
@@ -5,7 +5,6 @@ import { lookupApiLink } from "../../api/kube-api";
 import { Link } from "react-router-dom";
 import { KubeObjectStatusIcon } from "../kube-object-status-icon";
 import { getDetailsUrl } from "./kube-object-details";
-import { kubeObjectStatusRegistry } from "../../../extensions/registries";
 
 export interface KubeObjectMetaProps {
   object: KubeObject;
@@ -23,25 +22,12 @@ export class KubeObjectMeta extends React.Component<KubeObjectMetaProps> {
     return hideFields.includes(field);
   }
 
-  renderObjectName() {
-    const { object } = this.props;
-    const statuses = kubeObjectStatusRegistry.getItemsForObject(object);
-
-    if (statuses.length === 0) {
-      return object.getName();
-    }
-
-    return <>{object.getName()} <KubeObjectStatusIcon key="icon" statuses={statuses} /></>;
-  }
-
   render() {
     const { object } = this.props;
     const {
-      getNs, getLabels, getResourceVersion, selfLink,
-      getAnnotations, getFinalizers, getId, getAge,
-      metadata: { creationTimestamp },
+      getNs, getLabels, getResourceVersion, selfLink, getAnnotations,
+      getFinalizers, getId, getAge, getName, metadata: { creationTimestamp },
     } = object;
-
     const ownerRefs = object.getOwnerRefs();
 
     return (
@@ -50,7 +36,8 @@ export class KubeObjectMeta extends React.Component<KubeObjectMetaProps> {
           {getAge(true, false)} ago ({creationTimestamp})
         </DrawerItem>
         <DrawerItem name="Name" hidden={this.isHidden("name")}>
-          {this.renderObjectName()}
+          {getName()}
+          <KubeObjectStatusIcon key="icon" object={object} />
         </DrawerItem>
         <DrawerItem name="Namespace" hidden={this.isHidden("namespace") || !getNs()}>
           {getNs()}
@@ -79,7 +66,7 @@ export class KubeObjectMeta extends React.Component<KubeObjectMetaProps> {
           labels={getFinalizers()}
           hidden={this.isHidden("finalizers")}
         />
-        {ownerRefs && ownerRefs.length > 0 &&
+        {ownerRefs?.length > 0 &&
         <DrawerItem name="Controlled By" hidden={this.isHidden("ownerReferences")}>
           {
             ownerRefs.map(ref => {