From 29beb9b75d1c2107df1d62fbf65dd4862232348f Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 17 Jan 2023 11:02:45 +0100
Subject: [PATCH] Improved visibility Admin Domain Test errors

---
 dev/View/Popup/Domain.js                      | 36 ++++---------------
 .../templates/Views/Admin/PopupsDomain.html   |  9 +++--
 2 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index fcec744dc..7babe05b8 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -89,9 +89,6 @@ export class DomainPopupView extends AbstractViewPopup {
 			testingImapError: false,
 			testingSieveError: false,
 			testingSmtpError: false,
-			testingImapErrorDesc: '',
-			testingSieveErrorDesc: '',
-			testingSmtpErrorDesc: '',
 
 			imapHostFocus: false,
 			sieveHostFocus: false,
@@ -142,10 +139,6 @@ export class DomainPopupView extends AbstractViewPopup {
 		});
 
 		addSubscribablesTo(this, {
-			testingImapError: value => value || this.testingImapErrorDesc(''),
-			testingSieveError: value => value || this.testingSieveErrorDesc(''),
-			testingSmtpError: value => value || this.testingSmtpErrorDesc(''),
-
 			// smart form improvements
 			imapHostFocus: value =>
 				value && this.name() && !this.imapHost() && this.imapHost(this.name().replace(/[.]?[*][.]?/g, '')),
@@ -226,7 +219,7 @@ export class DomainPopupView extends AbstractViewPopup {
 	}
 
 	testConnectionCommand() {
-		this.clearTesting(false);
+		this.clearTesting();
 		// https://github.com/the-djmaze/snappymail/issues/477
 		AskPopupView.credentials('IMAP', 'GLOBAL/TEST').then(credentials => {
 			if (credentials) {
@@ -240,29 +233,14 @@ export class DomainPopupView extends AbstractViewPopup {
 					(iError, oData) => {
 						this.testing(false);
 						if (iError) {
-							this.testingImapError(true);
-							this.testingSieveError(true);
-							this.testingSmtpError(true);
+							this.testingImapError(getNotification(iError));
+							this.testingSieveError(getNotification(iError));
+							this.testingSmtpError(getNotification(iError));
 						} else {
 							this.testingDone(true);
-							this.testingImapError(true !== oData.Result.Imap);
-							this.testingSieveError(true !== oData.Result.Sieve);
-							this.testingSmtpError(true !== oData.Result.Smtp);
-
-							if (this.testingImapError() && oData.Result.Imap) {
-								this.testingImapErrorDesc('');
-								this.testingImapErrorDesc(oData.Result.Imap);
-							}
-
-							if (this.testingSieveError() && oData.Result.Sieve) {
-								this.testingSieveErrorDesc('');
-								this.testingSieveErrorDesc(oData.Result.Sieve);
-							}
-
-							if (this.testingSmtpError() && oData.Result.Smtp) {
-								this.testingSmtpErrorDesc('');
-								this.testingSmtpErrorDesc(oData.Result.Smtp);
-							}
+							this.testingImapError(true !== oData.Result.Imap ? oData.Result.Imap : false);
+							this.testingSieveError(true !== oData.Result.Sieve ? oData.Result.Sieve : false);
+							this.testingSmtpError(true !== oData.Result.Smtp ? oData.Result.Smtp : false);
 						}
 					},
 					params
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
index 086401273..b732551a1 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomain.html
@@ -20,9 +20,10 @@
 
 			<input type="radio" name="tabs" id="tab-imap" checked>
 			<label for="tab-imap" role="tab" tabindex="0"
-				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingImapError }, tooltipErrorTip: testingImapErrorDesc"
+				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingImapError }"
 				>IMAP</label>
 			<div class="tab-content" role="tabpanel" aria-hidden="false">
+				<div class="alert alert-error" data-bind="visible: testingImapError, text: testingImapError"></div>
 				<div class="row">
 					<div class="span">
 						<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
@@ -135,9 +136,10 @@
 
 			<input type="radio" name="tabs" id="tab-smtp">
 			<label for="tab-smtp" role="tab" tabindex="0"
-				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSmtpError }, tooltipErrorTip: testingSmtpErrorDesc"
+				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSmtpError }"
 				>SMTP</label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
+				<div class="alert alert-error" data-bind="visible: testingSmtpError, text: testingSmtpError"></div>
 				<div data-bind="visible: !smtpUsePhpMail()">
 					<div class="row">
 						<div class="span">
@@ -220,11 +222,12 @@
 
 			<input type="radio" name="tabs" id="tab-sieve">
 			<label for="tab-sieve" role="tab" tabindex="0"
-				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSieveError }, tooltipErrorTip: testingSieveErrorDesc">
+				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSieveError }">
 				<i class="icon-filter"></i>
 				SIEVE
 			</label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
+				<div class="alert alert-error" data-bind="visible: testingSieveError, text: testingSieveError"></div>
 				<div class="row">
 					<div class="span5" data-bind="component: {
 						name: 'Checkbox',