From 652d1ad5108dea61fe59a6acac69f8b606e30c4a Mon Sep 17 00:00:00 2001
From: Andre Wanlin <awanlin@rapidrtc.com>
Date: Fri, 8 Oct 2021 14:03:16 -0500
Subject: [PATCH] Combined the Status and Result columns into a single State

Signed-off-by: Andre Wanlin <awanlin@rapidrtc.com>
---
 .../src/components/BuildTable/BuildTable.tsx  | 100 +++++++++++++-----
 1 file changed, 72 insertions(+), 28 deletions(-)

diff --git a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
index b3d239d914..a6cfb9bf81 100644
--- a/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
+++ b/plugins/azure-devops/src/components/BuildTable/BuildTable.tsx
@@ -23,6 +23,8 @@ import {
   StatusOK,
   StatusWarning,
   StatusAborted,
+  StatusRunning,
+  StatusPending,
 } from '@backstage/core-components';
 import { Link, Box, Typography } from '@material-ui/core';
 import Alert from '@material-ui/lab/Alert';
@@ -32,22 +34,80 @@ import {
   BuildStatus,
 } from 'azure-devops-node-api/interfaces/BuildInterfaces';
 
-const getBuildResultComponent = (
-  result: number | undefined = BuildResult.None,
-) => {
+const getBuildResultComponent = (result: number | undefined) => {
   switch (result) {
-    case BuildResult.None:
-      return <StatusError />;
     case BuildResult.Succeeded:
-      return <StatusOK />;
+      return (
+        <span>
+          <StatusOK /> Succeeded{' '}
+        </span>
+      );
     case BuildResult.PartiallySucceeded:
-      return <StatusWarning />;
+      return (
+        <span>
+          <StatusWarning /> Partially Succeeded{' '}
+        </span>
+      );
     case BuildResult.Failed:
-      return <StatusError />;
+      return (
+        <span>
+          <StatusError /> Failed{' '}
+        </span>
+      );
     case BuildResult.Canceled:
-      return <StatusAborted />;
+      return (
+        <span>
+          <StatusAborted /> Canceled{' '}
+        </span>
+      );
+    case BuildResult.None:
     default:
-      return <StatusWarning />;
+      return (
+        <span>
+          <StatusWarning /> Unknown
+        </span>
+      );
+  }
+};
+
+const getBuildStateComponent = (
+  status: number | undefined,
+  result: number | undefined,
+) => {
+  switch (status) {
+    case BuildStatus.InProgress:
+      return (
+        <span>
+          <StatusRunning /> In Progress
+        </span>
+      );
+    case BuildStatus.Completed:
+      return getBuildResultComponent(result);
+    case BuildStatus.Cancelling:
+      return (
+        <span>
+          <StatusAborted /> Cancelling
+        </span>
+      );
+    case BuildStatus.Postponed:
+      return (
+        <span>
+          <StatusPending /> Postponed
+        </span>
+      );
+    case BuildStatus.NotStarted:
+      return (
+        <span>
+          <StatusAborted /> Not Started
+        </span>
+      );
+    case BuildStatus.None:
+    default:
+      return (
+        <span>
+          <StatusWarning /> Unknown
+        </span>
+      );
   }
 };
 
@@ -74,28 +134,12 @@ const columns: TableColumn[] = [
     width: 'auto',
   },
   {
-    title: 'Status',
-    field: 'status',
+    title: 'State',
     width: 'auto',
     render: (row: Partial<RepoBuild>) => (
       <Box display="flex" alignItems="center">
-        <Box mr={1} />
         <Typography variant="button">
-          {BuildStatus[row.status || BuildStatus.None]}
-        </Typography>
-      </Box>
-    ),
-  },
-  {
-    title: 'Result',
-    field: 'result',
-    width: 'auto',
-    render: (row: Partial<RepoBuild>) => (
-      <Box display="flex" alignItems="center">
-        {getBuildResultComponent(row.result)}
-        <Box mr={1} />
-        <Typography variant="button">
-          {BuildResult[row.result || BuildResult.None]}
+          {getBuildStateComponent(row.status, row.result)}
         </Typography>
       </Box>
     ),