From bbd0d9c4565c9f9cb8acdcc1c7b00808317ae8dd Mon Sep 17 00:00:00 2001
From: Lauri Nevala <lauri.nevala@gmail.com>
Date: Thu, 5 Nov 2020 14:33:44 +0200
Subject: [PATCH] Refactoring

Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
---
 .../+workloads-deployments/deployments.tsx    |  4 ++--
 .../components/+workloads-pods/pods.tsx       | 20 ++-----------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/renderer/components/+workloads-deployments/deployments.tsx b/src/renderer/components/+workloads-deployments/deployments.tsx
index e418aef324..fdc7348590 100644
--- a/src/renderer/components/+workloads-deployments/deployments.tsx
+++ b/src/renderer/components/+workloads-deployments/deployments.tsx
@@ -71,19 +71,19 @@ export class Deployments extends React.Component<Props> {
         renderHeaderTitle={<Trans>Deployments</Trans>}
         renderTableHeader={[
           { title: <Trans>Name</Trans>, className: "name", sortBy: sortBy.name },
+          { className: "warning" },
           { title: <Trans>Namespace</Trans>, className: "namespace", sortBy: sortBy.namespace },
           { title: <Trans>Pods</Trans>, className: "pods" },
           { title: <Trans>Replicas</Trans>, className: "replicas", sortBy: sortBy.replicas },
-          { className: "warning" },
           { title: <Trans>Age</Trans>, className: "age", sortBy: sortBy.age },
           { title: <Trans>Conditions</Trans>, className: "conditions", sortBy: sortBy.condition },
         ]}
         renderTableContents={(deployment: Deployment) => [
           deployment.getName(),
+          <KubeObjectStatusIcon object={deployment}/>,
           deployment.getNs(),
           this.renderPods(deployment),
           deployment.getReplicas(),
-          <KubeObjectStatusIcon object={deployment}/>,
           deployment.getAge(),
           this.renderConditions(deployment),
         ]}
diff --git a/src/renderer/components/+workloads-pods/pods.tsx b/src/renderer/components/+workloads-pods/pods.tsx
index 04f99c00ff..cc0afaf846 100644
--- a/src/renderer/components/+workloads-pods/pods.tsx
+++ b/src/renderer/components/+workloads-pods/pods.tsx
@@ -68,22 +68,6 @@ export class Pods extends React.Component<Props> {
     });
   }
 
-  renderPodStatus(pod: Pod) {
-    return {
-      className: kebabCase(pod.getStatusMessage()),
-      children: (
-        <span>
-          {pod.getStatusMessage()}
-        </span>
-      )
-    }
-  }
-
-  renderPodStatusIcons(pod: Pod) {
-    return (
-      <KubeObjectStatusIcon object={pod} />
-    )
-  }
   render() {
     return (
       <KubeObjectListLayout
@@ -117,7 +101,7 @@ export class Pods extends React.Component<Props> {
         ]}
         renderTableContents={(pod: Pod) => [
           pod.getName(),
-          this.renderPodStatusIcons(pod),
+          <KubeObjectStatusIcon object={pod} />,
           pod.getNs(),
           this.renderContainersStatus(pod),
           pod.getRestartsCount(),
@@ -132,7 +116,7 @@ export class Pods extends React.Component<Props> {
           }),
           pod.getQosClass(),
           pod.getAge(),
-          this.renderPodStatus(pod)
+          { title: pod.getStatusMessage(), className: kebabCase(pod.getStatusMessage()) }
         ]}
       />
     )