Skip to content

wktui-345 Correct display message when domain status is available. #123

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.

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 3 commits into from
Apr 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions electron/app/locales/en/webui.json
Original file line number Diff line number Diff line change
Expand Up @@ -1183,10 +1183,10 @@
"k8s-domain-status-checker-ns-not-exist-error-message": "Unable to get the domain status because the domain namespace {{namespace}} does not exist.",
"k8s-domain-status-checker-validate-domain-failed-error-message": "Unable to get domain status because an error occurred while trying to verify that domain {{domain}} exists: {{error}}.",
"k8s-domain-status-checker-domain-not-exist-error-message": "Unable to get the domain status because the domain {{domain}} does not exist.",
"k8s-domain-status-checker-domain-status-unknown": "Unknown - Cannot determine the domain status now - check back later",
"k8s-domain-status-checker-domain-status-unknown": "Unknown - Cannot determine the domain status now - check back later. Reason: {{reason}}",
"k8s-domain-status-checker-domain-status-complete": "Complete - Domain is deployed and all servers are up and running",
"k8s-domain-status-checker-domain-status-failed": "Failed - Domain failed to deploy. Reason: {{reason}}",
"k8s-domain-status-checker-domain-status-available": "Available - Domain is deployed and some servers are up and running but the domain has not reaching the replicas count goal yet. Reason: {{reason}}",
"k8s-domain-status-checker-domain-status-available": "Available - Domain is deployed and some servers are up and running but the domain has not reached the replicas count goal yet, check again later. Reason: {{reason}}",
"k8s-domain-status-checker-domain-status-progressing": "Progressing - Domain is being deployed or servers just starting up. Reason: {{reason}}",
"k8s-domain-status-checker-get-status-failed-title": "WebLogic Domain Status Check Failed",
"k8s-domain-status-checker-get-status-failed-error-message": "Unable to get the domain status due to an error: {{error}}.",
Expand Down
17 changes: 12 additions & 5 deletions webui/src/js/utils/k8s-domain-status-checker.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
if (ready) {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-complete');
} else {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available');
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available',
{reason: latestCondition.reason});
}
} else {
// remain in progressing
Expand All @@ -194,20 +195,26 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
const hasErrors = this.hasErrorConditions(conditions);
const completeCondition = this.getCompletedCondition(conditions);
const availableCondition = this.getAvailableCondition(conditions);
const latestCondition = conditions[0];

if (hasErrors.error) {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-failed', {reason: hasErrors.reason});
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-failed',
{reason: hasErrors.reason});
} else if (completeCondition.status === 'True' && availableCondition.status === 'True') {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-complete');
} else {
// Assume this is introspection progressing

if (completeCondition.status === 'False' && !this.hasAvailableCondition(conditions)) {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-progressing');
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-progressing',
{reason: latestCondition.reason});
} else if (completeCondition.status === 'False' && availableCondition.status === 'False') {
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available');
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available',
{reason: latestCondition.reason});
} else {
// should never happened?
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-unknown');
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-unknown',
{reason: latestCondition.reason});
}
}
}
Expand Down