Skip to content

resolving installer status report after upgrade #214

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

Merged
merged 1 commit into from
Mar 2, 2023
Merged

resolving installer status report after upgrade #214

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion electron/app/js/vzInstaller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ function _getStatusFromConditions(vzObject, status) {
}

status.payload = latestCondition;
if (latestCondition && latestCondition.type === 'InstallComplete' && Boolean(latestCondition.status)) {
if (latestCondition &&
(latestCondition.type === 'InstallComplete' || latestCondition.type === 'UpgradeComplete') &&
Boolean(latestCondition.status)) {
status.isComplete = true;
status.version = version;
_normalizeVersionData(status);
Expand Down
1 change: 1 addition & 0 deletions electron/app/locales/en/webui.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,6 +1773,7 @@

"vz-application-status-checker-get-status-failed-title-message": "Get Application Status Failed",
"vz-application-status-checker-get-status-failed-error-message": "Unable to get the application status due to an error: {{error}}.",
"vz-application-status-checker-validate-ns-failed-error-message": "Unable to get the application status because an error occurred while trying to validate the Kubernetes namespace {{namespace}}: {{error}}.",
"vz-application-status-checker-application-not-exist-error-message": "Unable to get the application status because the application {{application}} does not exist.",
"vz-application-status-checker-ns-not-exist-error-message": "Unable to get the application status because the application namespace {{namespace}} does not exist.",
"vz-application-status-checker-domain-not-exist-error-message": "Unable to get the application status because the domain UID {{domain}} does not exist.",
Expand Down
2 changes: 1 addition & 1 deletion webui/src/js/views/k8s-helper-choose-cluster-dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
<div slot="body">
<div class="oj-panel">
<oj-form-layout max-columns="2" direction="row">
<oj-form-layout max-columns="1" direction="row">
<oj-select-single label-hint="[[labelMapper('name-label')]]"
value="{{selectedTestClusterName}}"
data="{{testClusterNamesDP}}"
Expand Down