Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1780629: Add <Status> to Operator resources #3707

Merged
merged 1 commit into from Dec 6, 2019
Merged

Bug 1780629: Add <Status> to Operator resources #3707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions frontend/packages/console-shared/src/components/status/Status.tsx
View file
Open in desktop
@@ -1,12 +1,14 @@
import * as React from 'react';
import {
ClipboardListIcon,
HourglassStartIcon,
HourglassHalfIcon,
SyncAltIcon,
BanIcon,
ExclamationTriangleIcon,
UnknownIcon,
} from '@patternfly/react-icons';
import { GreenCheckCircleIcon, YellowExclamationTriangleIcon } from '@console/shared';
import { DASH } from '../../constants';
import StatusIconAndText from './StatusIconAndText';
import { ErrorStatus, InfoStatus, ProgressStatus, SuccessStatus } from './statuses';
Expand All @@ -21,10 +23,14 @@ export const Status: React.FC<StatusProps> = ({ status, title, children, iconOnl
case 'Pending':
return <StatusIconAndText {...statusProps} icon={<HourglassHalfIcon />} />;

case 'Planning':
return <StatusIconAndText {...statusProps} icon={<ClipboardListIcon />} />;

case 'ContainerCreating':
return <ProgressStatus {...statusProps} />;

case 'In Progress':
case 'Installing':
case 'Running':
case 'Updating':
case 'Upgrading':
Expand All @@ -39,11 +45,16 @@ export const Status: React.FC<StatusProps> = ({ status, title, children, iconOnl
case 'Warning':
return <StatusIconAndText {...statusProps} icon={<ExclamationTriangleIcon />} />;

case 'RequiresApproval':
return <StatusIconAndText {...statusProps} icon={<YellowExclamationTriangleIcon />} />;

case 'ContainerCannotRun':
case 'CrashLoopBackOff':
case 'Critical':
case 'Error':
case 'ErrorImagePull':
case 'Failed':
case 'ImagePullBackOff':
case 'InstallCheckFailed':
case 'Lost':
case 'Rejected':
Expand All @@ -60,6 +71,9 @@ export const Status: React.FC<StatusProps> = ({ status, title, children, iconOnl
case 'Up to date':
return <SuccessStatus {...statusProps} />;

case 'Created':
return <StatusIconAndText {...statusProps} icon={<GreenCheckCircleIcon />} />;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

D'oh. case 'Created': sholuld have been added on line 68. Will fix in follow on.


case 'Info':
return <InfoStatus {...statusProps}>{children}</InfoStatus>;

Expand Down
5 changes: 4 additions & 1 deletion frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ import {
ErrorStatus,
getName,
ProgressStatus,
Status,
SuccessStatus,
WarningStatus,
getNamespace,
Expand Down Expand Up @@ -709,7 +710,9 @@ export const ClusterServiceVersionDetails: React.SFC<ClusterServiceVersionDetail
</div>
<div className="col-sm-6">
<dt>Status</dt>
<dd>{status ? status.phase : 'Unknown'}</dd>
<dd>
<Status status={status ? status.phase : 'Unknown'} />
</dd>
<dt>Status Reason</dt>
<dd>{status ? status.message : 'Unknown'}</dd>
<dt>Operator Deployments</dt>
Expand Down
15 changes: 5 additions & 10 deletions frontend/packages/operator-lifecycle-manager/src/components/install-plan.tsx
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ import {
k8sUpdate,
apiVersionForReference,
} from '@console/internal/module/k8s';
import { GreenCheckCircleIcon, YellowExclamationTriangleIcon } from '@console/shared';
import { GreenCheckCircleIcon, Status } from '@console/shared';
import {
SubscriptionModel,
ClusterServiceVersionModel,
Expand Down Expand Up @@ -96,14 +96,7 @@ export const InstallPlanTableRow: React.FC<InstallPlanTableRowProps> = ({
key,
style,
}) => {
const phaseFor = (phase: InstallPlanKind['status']['phase']) =>
phase === 'RequiresApproval' ? (
<>
<YellowExclamationTriangleIcon /> {phase}
</>
) : (
phase
);
const phaseFor = (phase: InstallPlanKind['status']['phase']) => <Status status={phase} />;
return (
<TableRow id={obj.metadata.uid} index={index} trKey={key} style={style}>
<TableData className={tableColumnClasses[0]}>
Expand Down Expand Up @@ -269,7 +262,9 @@ export const InstallPlanDetails: React.SFC<InstallPlanDetailsProps> = ({ obj })
<div className="col-sm-6">
<dl className="co-m-pane__details">
<dt>Status</dt>
<dd>{_.get(obj.status, 'phase', 'Unknown')}</dd>
<dd>
<Status status={_.get(obj.status, 'phase', 'Unknown')} />
</dd>
<dt>Components</dt>
{(obj.spec.clusterServiceVersionNames || []).map((csvName) => (
<dd key={csvName}>
Expand Down
5 changes: 4 additions & 1 deletion frontend/packages/operator-lifecycle-manager/src/components/k8s-resource.tsx
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ import * as _ from 'lodash';
import * as classNames from 'classnames';
import { sortable } from '@patternfly/react-table';
import { match } from 'react-router';
import { Status } from '@console/shared';
import {
ResourceLink,
Timestamp,
Expand Down Expand Up @@ -63,7 +64,9 @@ export const ResourceTableRow: React.FC<ResourceTableRowProps> = ({
<TableRow id={obj.metadata.uid} index={index} trKey={obj.metadata.uid} style={style}>
<TableData className={tableColumnClasses[0]}>{linkFor(obj)}</TableData>
<TableData className={tableColumnClasses[1]}>{obj.kind}</TableData>
<TableData className={tableColumnClasses[2]}>{_.get(obj.status, 'phase', 'Created')}</TableData>
<TableData className={tableColumnClasses[2]}>
<Status status={_.get(obj.status, 'phase', 'Created')} />
</TableData>
<TableData className={tableColumnClasses[3]}>
<Timestamp timestamp={obj.metadata.creationTimestamp} />
</TableData>
Expand Down