+
{{if .DatabaseType.IsMySQL}}
{{ctx.Locale.Tr "admin.self_check.database_fix_mysql"}}
{{else if .DatabaseType.IsMSSQL}}
@@ -29,22 +31,22 @@
{{end}}
{{if .DatabaseCheckInconsistentCollationColumns}}
- {{ctx.Locale.Tr "admin.self_check.database_inconsistent_collation_columns" .DatabaseCheckResult.DatabaseCollation}}
-
- {{range .DatabaseCheckInconsistentCollationColumns}}
- - {{.}}
- {{end}}
-
+
+ {{ctx.Locale.Tr "admin.self_check.database_inconsistent_collation_columns" .DatabaseCheckResult.DatabaseCollation}}
+
+ {{range .DatabaseCheckInconsistentCollationColumns}}
+ - {{.}}
+ {{end}}
+
+
{{end}}
{{end}}
-
- {{if and (not .StartupProblems) (not .DatabaseCheckHasProblems)}}
-
+ {{/* only shown when there is no visible "self-check-problem" */}}
+
{{ctx.Locale.Tr "admin.self_check.no_problem_found"}}
- {{end}}
{{template "admin/layout_footer" .}}
diff --git a/web_src/js/bootstrap.js b/web_src/js/bootstrap.js
index 8339b4bd82..26627dfded 100644
--- a/web_src/js/bootstrap.js
+++ b/web_src/js/bootstrap.js
@@ -16,20 +16,20 @@ function shouldIgnoreError(err) {
return false;
}
-export function showGlobalErrorMessage(msg) {
+export function showGlobalErrorMessage(msg, msgType = 'error') {
const msgContainer = document.querySelector('.page-content') ?? document.body;
const msgCompact = msg.replace(/\W/g, '').trim(); // compact the message to a data attribute to avoid too many duplicated messages
let msgDiv = msgContainer.querySelector(`.js-global-error[data-global-error-msg-compact="${msgCompact}"]`);
if (!msgDiv) {
const el = document.createElement('div');
- el.innerHTML = `
`;
+ el.innerHTML = `
`;
msgDiv = el.childNodes[0];
}
// merge duplicated messages into "the message (count)" format
const msgCount = Number(msgDiv.getAttribute(`data-global-error-msg-count`)) + 1;
msgDiv.setAttribute(`data-global-error-msg-compact`, msgCompact);
msgDiv.setAttribute(`data-global-error-msg-count`, msgCount.toString());
- msgDiv.textContent = msg + (msgCount > 1 ? ` (${msgCount})` : '');
+ msgDiv.querySelector('.ui.message').textContent = msg + (msgCount > 1 ? ` (${msgCount})` : '');
msgContainer.prepend(msgDiv);
}
diff --git a/web_src/js/features/admin/selfcheck.js b/web_src/js/features/admin/selfcheck.js
new file mode 100644
index 0000000000..699395b363
--- /dev/null
+++ b/web_src/js/features/admin/selfcheck.js
@@ -0,0 +1,31 @@
+import {toggleElem} from '../../utils/dom.js';
+import {POST} from '../../modules/fetch.js';
+
+const {appSubUrl} = window.config;
+
+export async function initAdminSelfCheck() {
+ const elCheckByFrontend = document.querySelector('#self-check-by-frontend');
+ if (!elCheckByFrontend) return;
+
+ const elContent = document.querySelector('.page-content.admin .admin-setting-content');
+
+ // send frontend self-check request
+ const resp = await POST(`${appSubUrl}/admin/self_check`, {
+ data: new URLSearchParams({
+ location_origin: window.location.origin,
+ now: Date.now(), // TODO: check time difference between server and client
+ }),
+ });
+ const json = await resp.json();
+ toggleElem(elCheckByFrontend, Boolean(json.problems?.length));
+ for (const problem of json.problems ?? []) {
+ const elProblem = document.createElement('div');
+ elProblem.classList.add('ui', 'warning', 'message');
+ elProblem.textContent = problem;
+ elCheckByFrontend.append(elProblem);
+ }
+
+ // only show the "no problem" if there is no visible "self-check-problem"
+ const hasProblem = Boolean(elContent.querySelectorAll('.self-check-problem:not(.tw-hidden)').length);
+ toggleElem(elContent.querySelector('.self-check-no-problem'), !hasProblem);
+}
diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js
index 5b8673105d..3b021d4485 100644
--- a/web_src/js/features/common-global.js
+++ b/web_src/js/features/common-global.js
@@ -451,5 +451,5 @@ export function checkAppUrl() {
return;
}
showGlobalErrorMessage(`Your ROOT_URL in app.ini is "${appUrl}", it's unlikely matching the site you are visiting.
-Mismatched ROOT_URL config causes wrong URL links for web UI/mail content/webhook notification/OAuth2 sign-in.`);
+Mismatched ROOT_URL config causes wrong URL links for web UI/mail content/webhook notification/OAuth2 sign-in.`, 'warning');
}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index fc2f6b9b0b..1867556eee 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -87,6 +87,7 @@ import {initRepoDiffCommitBranchesAndTags} from './features/repo-diff-commit.js'
import {initDirAuto} from './modules/dirauto.js';
import {initRepositorySearch} from './features/repo-search.js';
import {initColorPickers} from './features/colorpicker.js';
+import {initAdminSelfCheck} from './features/admin/selfcheck.js';
// Init Gitea's Fomantic settings
initGiteaFomantic();
@@ -132,6 +133,7 @@ onDomReady(() => {
initAdminEmails();
initAdminUserListSearchForm();
initAdminConfigs();
+ initAdminSelfCheck();
initDashboardRepoList();