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

Hide upgrade paths and show checklist progress during upgrades #5972

Merged
merged 1 commit into from
Jul 20, 2020
Merged

Hide upgrade paths and show checklist progress during upgrades #5972

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
3 changes: 2 additions & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
"react-redux": "7.1.0",
"react-router": "5.0.1",
"react-router-dom": "5.0.1",
"react-router-hash-link": "^2.0.0",
"react-tagsinput": "3.19.x",
"react-transition-group": "2.3.x",
"react-virtualized": "9.x",
Expand All @@ -156,11 +157,11 @@
},
"devDependencies": {
"@babel/core": "^7.10.3",
"@pmmmwh/react-refresh-webpack-plugin": "^0.3.3",
"@graphql-codegen/cli": "^1.15.1",
"@graphql-codegen/typescript": "^1.15.1",
"@graphql-codegen/typescript-graphql-files-modules": "^1.15.1",
"@graphql-codegen/typescript-operations": "^1.15.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.3.3",
"@types/classnames": "^2.2.7",
"@types/enzyme": "3.10.x",
"@types/glob": "7.x",
Expand Down
17 changes: 17 additions & 0 deletions frontend/public/components/cluster-settings/_cluster-settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,23 @@ $co-channel-height: 60px;
display: none;
}
}

&__updates-group {
margin: 0 0 var(--pf-global--spacer--lg) 0;

&--divided {
border-top: 1px solid $color-pf-black-200;
padding-top: var(--pf-global--spacer--lg);
}
}

&__updates-progress {
padding: var(--pf-global--spacer--sm) var(--pf-global--spacer--lg) 0 0;
}

&__updates-type {
margin: 0 0 var(--pf-global--spacer--xs) 0;
}
}

.co-update-status {
Expand Down
10 changes: 8 additions & 2 deletions frontend/public/components/cluster-settings/cluster-operator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
} from '../utils';
import { GreenCheckCircleIcon, YellowExclamationTriangleIcon } from '@console/shared';
import RelatedObjectsPage from './related-objects';
import { ClusterVersionConditionsLink, UpdatingMessageText } from './cluster-settings';

export const clusterOperatorReference: K8sResourceKindReference = referenceForModel(
ClusterOperatorModel,
Expand Down Expand Up @@ -154,8 +155,13 @@ const UpdateInProgressAlert: React.SFC<UpdateInProgressAlertProps> = ({ cv }) =>
<>
{updateCondition && (
<div className="co-m-pane__body co-m-pane__body--section-heading">
<Alert isInline className="co-alert" variant="info" title="Cluster update in progress.">
{updateCondition.message}
<Alert
isInline
className="co-alert"
variant="info"
title={<UpdatingMessageText cv={cv} />}
>
<ClusterVersionConditionsLink cv={cv} />
</Alert>
</div>
)}
Expand Down