Update

Author: hiifong

routers/web/admin/config.go

@@ -9,6 +9,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"time"
 
 	system_model "code.gitea.io/gitea/models/system"
 	"code.gitea.io/gitea/modules/base"
@@ -26,10 +27,16 @@ import (
 )
 
 const (
-	tplConfig         base.TplName = "admin/config"
-	tplConfigSettings base.TplName = "admin/config_settings"
+	tplConfig                       base.TplName = "admin/config"
+	tplConfigIncomingMailTestResult base.TplName = "admin/config_incoming_mail_test_result"
+	tplConfigSettings               base.TplName = "admin/config_settings"
 )
 
+var incomingMailResult struct {
+	Time   int64
+	Result string
+}
+
 // SendTestMail send test mail to confirm mail service is OK
 func SendTestMail(ctx *context.Context) {
 	email := ctx.FormString("email")
@@ -43,6 +50,21 @@ func SendTestMail(ctx *context.Context) {
 	ctx.Redirect(setting.AppSubURL + "/-/admin/config")
 }
 
+// TestIncomingMail ...
+func TestIncomingMail(ctx *context.Context) {
+	log.Trace("call TestIncomingMail")
+	incomingMailResult.Time = time.Now().Unix()
+	incomingMailResult.Result = "ok"
+	ctx.Redirect(setting.AppSubURL + "/-/admin/config")
+}
+
+// IncomingMail ...
+func IncomingMail(ctx *context.Context) {
+	log.Trace("call IncomingMail")
+	ctx.Data["IncomingMailResult"] = incomingMailResult
+	ctx.HTML(http.StatusOK, tplConfigIncomingMailTestResult)
+}
+
 // TestCache test the cache settings
 func TestCache(ctx *context.Context) {
 	elapsed, err := cache.Test()
@@ -157,6 +179,7 @@ func Config(ctx *context.Context) {
 		ctx.Data["IncomingMailEnabled"] = true
 	}
 	ctx.Data["IncomingMail"] = setting.IncomingEmail
+	ctx.Data["IncomingMailResult"] = incomingMailResult
 
 	ctx.Data["CacheAdapter"] = setting.CacheService.Adapter
 	ctx.Data["CacheInterval"] = setting.CacheService.Interval

routers/web/web.go

@@ -712,8 +712,12 @@ func registerRoutes(m *web.Router) {
 		m.Group("/config", func() {
 			m.Get("", admin.Config)
 			m.Post("", admin.ChangeConfig)
-			m.Post("/test_mail", admin.SendTestMail)
-			m.Post("/test_cache", admin.TestCache)
+			m.Group("/test", func() {
+				m.Post("/mail", admin.SendTestMail)
+				m.Get("/incoming-mail", admin.IncomingMail)
+				m.Post("/incoming-mail", admin.TestIncomingMail)
+				m.Post("/cache", admin.TestCache)
+			})
 			m.Get("/settings", admin.ConfigSettings)
 		})
 

templates/admin/config.tmpl

@@ -231,7 +231,7 @@
 					<div class="divider"></div>
 					<dt class="tw-py-1 tw-flex tw-items-center">{{ctx.Locale.Tr "admin.config.send_test_mail"}}</dt>
 					<dd class="tw-py-0">
-						<form class="ui form ignore-dirty" action="{{AppSubUrl}}/-/admin/config/test_mail" method="post">
+						<form class="ui form ignore-dirty" action="{{AppSubUrl}}/-/admin/config/test/mail" method="post">
 							{{.CsrfTokenHtml}}
 							<div class="ui tiny input">
 								<input type="email" name="email" placeholder="{{ctx.Locale.Tr "admin.config.test_email_placeholder"}}" size="29" required>
@@ -272,15 +272,17 @@
 					<div class="divider"></div>
 					<dt>{{ctx.Locale.Tr "admin.config.incoming_mail_test"}}</dt>
 					<dd class="tw-py-0">
-						<form class="ui form" action="#" method="post">
+						<form class="ui form" action="{{AppSubUrl}}/-/admin/config/test/incoming-mail" method="post">
 							{{.CsrfTokenHtml}}
 							<button class="ui tiny primary button" data-tooltip-placement="top" data-tooltip-content={{ctx.Locale.Tr "admin.config.incoming_mail_description"}} data-tooltip-follow-cursor="horizontal">
 								{{ctx.Locale.Tr "admin.config.incoming_mail_test_btn"}}
 							</button>
 						</form>
 					</dd>
 					<dt class="tw-py-1 tw-flex tw-items-center">{{ctx.Locale.Tr "admin.config.incoming_mail_result"}}</dt>
-					<dd><pre class="tw-m-0">{{ctx.Locale.Tr "admin.config.incoming_mail_result"}}</pre></dd>
+					<dd hx-get="{{$.Link}}/test/incoming-mail" hx-swap="morph:innerHTML" hx-trigger="every 5s" hx-indicator=".no-loading-indicator">
+						{{template "admin/config_incoming_mail_test_result" .}}
+					</dd>
 				{{end}}
 			</dl>
 		</div>
@@ -305,7 +307,7 @@
 				<div class="divider"></div>
 				<dt class="tw-py-1 tw-flex tw-items-center">{{ctx.Locale.Tr "admin.config.cache_test"}}</dt>
 				<dd class="tw-py-0">
-					<form class="ui form ignore-dirty" action="{{AppSubUrl}}/-/admin/config/test_cache" method="post">
+					<form class="ui form ignore-dirty" action="{{AppSubUrl}}/-/admin/config/test/cache" method="post">
 						{{.CsrfTokenHtml}}
 						<button class="ui tiny primary button">{{ctx.Locale.Tr "test"}}</button>
 					</form>

templates/admin/config_incoming_mail_test_result.tmpl

@@ -0,0 +1,8 @@
+{{if gt .IncomingMailResult.Time 0}}
+<pre class="tw-m-0">
+{
+	"time": {{.IncomingMailResult.Time}},
+	"result": {{.IncomingMailResult.Result}}
+}
+</pre>
+{{end}}