Bug 1798858: Fix bug where installed operators list status is missing…

… or incorrect Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1798858
openshift · Feb 10, 2020 · 5bcc87c · 5bcc87c
1 parent 61168ce
commit 5bcc87c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/frontend/packages/console-shared/src/components/status/Status.tsx b/frontend/packages/console-shared/src/components/status/Status.tsx
@@ -31,12 +31,15 @@ export const Status: React.FC<StatusProps> = ({ status, title, children, iconOnl
 
     case 'In Progress':
     case 'Installing':
+    case 'InstallReady':
+    case 'Replacing':
     case 'Running':
     case 'Updating':
     case 'Upgrading':
       return <StatusIconAndText {...statusProps} icon={<SyncAltIcon />} />;
 
     case 'Cancelled':
+    case 'Deleting':
     case 'Expired':
     case 'Not Ready':
     case 'Terminating':
@@ -65,6 +68,7 @@ export const Status: React.FC<StatusProps> = ({ status, title, children, iconOnl
     case 'Bound':
     case 'Complete':
     case 'Completed':
+    case 'Copied':
     case 'Created':
     case 'Enabled':
     case 'Succeeded':

diff --git a/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx b/frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx
@@ -13,7 +13,6 @@ import {
   ErrorStatus,
   ProgressStatus,
   Status,
-  SuccessStatus,
   WarningStatus,
   getNamespace,
   getUID,
@@ -184,9 +183,9 @@ const ClusterServiceVersionStatus: React.FC<ClusterServiceVersionStatusProps> =
   obj,
   subscription,
 }) => {
-  const statusString = _.get(obj, 'status.reason', ClusterServiceVersionPhase.CSVPhaseUnknown);
-  const showSuccessIcon = statusString === 'Copied' || statusString === 'InstallSucceeded';
+  const status = _.get(obj, 'status.phase');
   const subscriptionStatus = getSubscriptionStatus(subscription);
+
   if (obj.metadata.deletionTimestamp) {
     return <>Disabling</>;
   }
@@ -202,16 +201,16 @@ const ClusterServiceVersionStatus: React.FC<ClusterServiceVersionStatusProps> =
 
   return (
     <>
-      {_.get(obj, 'status.phase') !== ClusterServiceVersionPhase.CSVPhaseFailed ? (
-        <span className={classNames({ 'co-icon-and-text': showSuccessIcon })}>
-          {showSuccessIcon && <SuccessStatus title={statusString} />}
-        </span>
+      {status ? (
+        <>
+          <span className="co-icon-and-text">
+            <Status status={status} />
+          </span>
+          {subscription && <span className="text-muted">{subscriptionStatus.title}</span>}
+        </>
       ) : (
-        <span className="co-icon-and-text">
-          <ErrorStatus title={statusString} />
-        </span>
+        <Status status={ClusterServiceVersionPhase.CSVPhaseUnknown} />
       )}
-      {subscription && <span className="text-muted">{subscriptionStatus.title}</span>}
     </>
   );
 };