Merge pull request #4270 from rhamilto/bz1798858

Bug 1798858: Fix bug where installed operators list status is missin…
openshift · Feb 14, 2020 · 977ce60 · 977ce60
2 parents 492e5c0 + 95037eb
commit 977ce60
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 48 deletions.
diff --git a/frontend/packages/console-shared/src/components/status/Status.tsx b/frontend/packages/console-shared/src/components/status/Status.tsx
@@ -27,17 +27,21 @@ export const Status: React.FC<StatusProps> = ({ status, title, children, iconOnl
       return <StatusIconAndText {...statusProps} icon={<ClipboardListIcon />} />;
 
     case 'ContainerCreating':
+    case 'UpgradePending':
       return <ProgressStatus {...statusProps} />;
 
     case 'In Progress':
     case 'Installing':
+    case 'InstallReady':
+    case 'Replacing':
     case 'Running':
     case 'Updating':
     case 'Upgrading':
     case 'Provisioned as node':
       return <StatusIconAndText {...statusProps} icon={<SyncAltIcon />} />;
 
     case 'Cancelled':
+    case 'Deleting':
     case 'Expired':
     case 'Not Ready':
     case 'Terminating':
@@ -59,13 +63,15 @@ export const Status: React.FC<StatusProps> = ({ status, title, children, iconOnl
     case 'InstallCheckFailed':
     case 'Lost':
     case 'Rejected':
+    case 'UpgradeFailed':
       return <ErrorStatus {...statusProps}>{children}</ErrorStatus>;
 
     case 'Accepted':
     case 'Active':
     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
@@ -8,16 +8,7 @@ import { Helmet } from 'react-helmet';
 import { AddCircleOIcon } from '@patternfly/react-icons';
 import { Alert, Card, CardBody, CardFooter, CardHeader } from '@patternfly/react-core';
 import * as UIActions from '@console/internal/actions/ui';
-import {
-  ALL_NAMESPACES_KEY,
-  ErrorStatus,
-  ProgressStatus,
-  Status,
-  SuccessStatus,
-  WarningStatus,
-  getNamespace,
-  getUID,
-} from '@console/shared';
+import { ALL_NAMESPACES_KEY, Status, WarningStatus, getNamespace, getUID } from '@console/shared';
 import {
   DetailsPage,
   Table,
@@ -78,7 +69,6 @@ import {
   InstallPlanKind,
   PackageManifestKind,
   SubscriptionKind,
-  SubscriptionState,
 } from '../types';
 import { subscriptionForCSV, getSubscriptionStatus } from '../status/csv-status';
 import { getInternalObjects, isInternalObject } from '../utils';
@@ -88,8 +78,6 @@ import { operatorGroupFor, operatorNamespaceFor } from './operator-group';
 import { SubscriptionDetails, catalogSourceForSubscription } from './subscription';
 import { ClusterServiceVersionLogo, referenceForProvidedAPI, providedAPIsFor } from './index';
 
-const FAILED_SUBSCRIPTION_STATES = ['Unknown', SubscriptionState.SubscriptionStateFailed];
-
 const isSubscription = (obj) => referenceFor(obj) === referenceForModel(SubscriptionModel);
 const isCSV = (obj) => referenceFor(obj) === referenceForModel(ClusterServiceVersionModel);
 const tableColumnClasses = [
@@ -184,11 +172,15 @@ 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</>;
+    return (
+      <span className="co-icon-and-text">
+        <Status status={ClusterServiceVersionPhase.CSVPhaseDeleting} />
+      </span>
+    );
   }
 
   if (catalogSourceMissing) {
@@ -202,16 +194,14 @@ 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>
-      ) : (
-        <span className="co-icon-and-text">
-          <ErrorStatus title={statusString} />
-        </span>
-      )}
-      {subscription && <span className="text-muted">{subscriptionStatus.title}</span>}
+      {status ? (
+        <>
+          <span className="co-icon-and-text">
+            <Status status={status} />
+          </span>
+          {subscription && <span className="text-muted">{subscriptionStatus.title}</span>}
+        </>
+      ) : null}
     </>
   );
 };
@@ -305,7 +295,7 @@ export const ClusterServiceVersionTableRow = withFallback<ClusterServiceVersionT
   },
 );
 
-export const FailedSubscriptionTableRow: React.FC<FailedSubscriptionTableRowProps> = ({
+const SubscriptionTableRow: React.FC<SubscriptionTableRowProps> = ({
   catalogSourceMissing,
   key,
   obj,
@@ -326,22 +316,11 @@ export const FailedSubscriptionTableRow: React.FC<FailedSubscriptionTableRowProp
         </>
       );
     }
-    if (FAILED_SUBSCRIPTION_STATES.includes(subscriptionState)) {
-      return (
-        <span className="co-icon-and-text">
-          <ErrorStatus title={subscriptionState} />
-        </span>
-      );
-    }
-
-    if (subscriptionState === SubscriptionState.SubscriptionStateUpgradePending) {
-      return (
-        <span className="co-icon-and-text">
-          <ProgressStatus title={subscriptionState} />
-        </span>
-      );
-    }
-    return 'Unknown';
+    return (
+      <span className="co-icon-and-text">
+        <Status status={subscriptionState} />
+      </span>
+    );
   };
 
   return (
@@ -363,14 +342,14 @@ export const FailedSubscriptionTableRow: React.FC<FailedSubscriptionTableRowProp
         <ResourceLink kind="Namespace" title={namespace} name={namespace} />
       </TableData>
 
+      {/* Status */}
+      <TableData className={tableColumnClasses[3]}>{getStatus()}</TableData>
+
       {/* Deployment */}
       <TableData className={tableColumnClasses[2]}>
         <span className="text-muted">None</span>
       </TableData>
 
-      {/* Status */}
-      <TableData className={tableColumnClasses[3]}>{getStatus()}</TableData>
-
       {/* Provided APIs */}
       <TableData className={tableColumnClasses[4]}>
         <span className="text-muted">None</span>
@@ -405,7 +384,7 @@ const InstalledOperatorTableRow: React.FC<InstalledOperatorTableRowProps> = ({
       subscription={subscription}
     />
   ) : (
-    <FailedSubscriptionTableRow
+    <SubscriptionTableRow
       {...rest}
       catalogSourceMissing={catalogSourceMissing}
       obj={subscription as SubscriptionKind}
@@ -962,7 +941,7 @@ export type ClusterServiceVersionTableRowProps = {
   subscription: SubscriptionKind;
 };
 
-export type FailedSubscriptionTableRowProps = {
+type SubscriptionTableRowProps = {
   catalogSourceMissing: boolean;
   index: number;
   key?: string;