From b9e04fafba606000780ac755555a69874dd04b3e Mon Sep 17 00:00:00 2001 From: Johnny Shum Date: Mon, 4 Apr 2022 08:04:20 -0500 Subject: [PATCH 1/3] wktui-345 Correct display message when domain status is available. --- electron/app/locales/en/webui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/app/locales/en/webui.json b/electron/app/locales/en/webui.json index 50a85891d..bc51c7602 100644 --- a/electron/app/locales/en/webui.json +++ b/electron/app/locales/en/webui.json @@ -1186,7 +1186,7 @@ "k8s-domain-status-checker-domain-status-unknown": "Unknown - Cannot determine the domain status now - check back later", "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 reaching the replicas count goal yet, check again later.", "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}}.", From fbb670afcacad019b1542db5a990c358da0ddcb1 Mon Sep 17 00:00:00 2001 From: jshum2479 Date: Mon, 4 Apr 2022 20:33:22 -0500 Subject: [PATCH 2/3] correct grammar --- electron/app/locales/en/webui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/app/locales/en/webui.json b/electron/app/locales/en/webui.json index bc51c7602..bd6c0f013 100644 --- a/electron/app/locales/en/webui.json +++ b/electron/app/locales/en/webui.json @@ -1186,7 +1186,7 @@ "k8s-domain-status-checker-domain-status-unknown": "Unknown - Cannot determine the domain status now - check back later", "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, check again later.", + "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.", "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}}.", From 8d67eec7162bd72a8ebc0f93c12b22d313e873f7 Mon Sep 17 00:00:00 2001 From: jshum2479 Date: Tue, 5 Apr 2022 17:08:21 -0500 Subject: [PATCH 3/3] add latest condition to status --- electron/app/locales/en/webui.json | 4 ++-- webui/src/js/utils/k8s-domain-status-checker.js | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/electron/app/locales/en/webui.json b/electron/app/locales/en/webui.json index bd6c0f013..4386352fa 100644 --- a/electron/app/locales/en/webui.json +++ b/electron/app/locales/en/webui.json @@ -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 reached the replicas count goal yet, check again later.", + "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}}.", diff --git a/webui/src/js/utils/k8s-domain-status-checker.js b/webui/src/js/utils/k8s-domain-status-checker.js index 2498e1a3e..74107ba1a 100644 --- a/webui/src/js/utils/k8s-domain-status-checker.js +++ b/webui/src/js/utils/k8s-domain-status-checker.js @@ -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 @@ -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}); } } }