Skip to content

Commit e8edbc0

Browse files
jshum2479robertpatrick
authored andcommitted
wktui-345 Correct display message when domain status is available. (#123)
* wktui-345 Correct display message when domain status is available. * correct grammar * add latest condition to status
1 parent e14fb7b commit e8edbc0

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

electron/app/locales/en/webui.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,10 +1198,10 @@
11981198
"k8s-domain-status-checker-ns-not-exist-error-message": "Unable to get the domain status because the domain namespace {{namespace}} does not exist.",
11991199
"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}}.",
12001200
"k8s-domain-status-checker-domain-not-exist-error-message": "Unable to get the domain status because the domain {{domain}} does not exist.",
1201-
"k8s-domain-status-checker-domain-status-unknown": "Unknown - Cannot determine the domain status now - check back later",
1201+
"k8s-domain-status-checker-domain-status-unknown": "Unknown - Cannot determine the domain status now - check back later. Reason: {{reason}}",
12021202
"k8s-domain-status-checker-domain-status-complete": "Complete - Domain is deployed and all servers are up and running",
12031203
"k8s-domain-status-checker-domain-status-failed": "Failed - Domain failed to deploy. Reason: {{reason}}",
1204-
"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}}",
1204+
"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}}",
12051205
"k8s-domain-status-checker-domain-status-progressing": "Progressing - Domain is being deployed or servers just starting up. Reason: {{reason}}",
12061206
"k8s-domain-status-checker-get-status-failed-title": "WebLogic Domain Status Check Failed",
12071207
"k8s-domain-status-checker-get-status-failed-error-message": "Unable to get the domain status due to an error: {{error}}.",

webui/src/js/utils/k8s-domain-status-checker.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
183183
if (ready) {
184184
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-complete');
185185
} else {
186-
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available');
186+
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available',
187+
{reason: latestCondition.reason});
187188
}
188189
} else {
189190
// remain in progressing
@@ -194,20 +195,26 @@ function (K8sDomainActionsBase, project, wktConsole, i18n, projectIo, dialogHelp
194195
const hasErrors = this.hasErrorConditions(conditions);
195196
const completeCondition = this.getCompletedCondition(conditions);
196197
const availableCondition = this.getAvailableCondition(conditions);
198+
const latestCondition = conditions[0];
197199

198200
if (hasErrors.error) {
199-
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-failed', {reason: hasErrors.reason});
201+
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-failed',
202+
{reason: hasErrors.reason});
200203
} else if (completeCondition.status === 'True' && availableCondition.status === 'True') {
201204
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-complete');
202205
} else {
203206
// Assume this is introspection progressing
207+
204208
if (completeCondition.status === 'False' && !this.hasAvailableCondition(conditions)) {
205-
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-progressing');
209+
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-progressing',
210+
{reason: latestCondition.reason});
206211
} else if (completeCondition.status === 'False' && availableCondition.status === 'False') {
207-
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available');
212+
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-available',
213+
{reason: latestCondition.reason});
208214
} else {
209215
// should never happened?
210-
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-unknown');
216+
result['domainOverallStatus'] = i18n.t('k8s-domain-status-checker-domain-status-unknown',
217+
{reason: latestCondition.reason});
211218
}
212219
}
213220
}

0 commit comments

Comments
 (0)