mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-14 05:41:27 +01:00
Backport #28873 by wxiaoguang
Gitea treat JS errors seriously, so sometimes the JS errors caused by
3rdparty code (eg: browser extensions) would also be reported on Gitea
UI: TypeError: WeakMap key undefined (caused by extension DarkReader's
bug) #28861
To avoid fill the user's screen with a lot of error messages, this PR
merges the same error messages into one.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit b7e32b2382
)
This commit is contained in:
parent
7db542a029
commit
6aa5554161
3 changed files with 29 additions and 4 deletions
15
web_src/js/bootstrap.js
vendored
15
web_src/js/bootstrap.js
vendored
|
@ -8,10 +8,21 @@ __webpack_public_path__ = `${window.config?.assetUrlPrefix ?? '/assets'}/`;
|
||||||
export function showGlobalErrorMessage(msg) {
|
export function showGlobalErrorMessage(msg) {
|
||||||
const pageContent = document.querySelector('.page-content');
|
const pageContent = document.querySelector('.page-content');
|
||||||
if (!pageContent) return;
|
if (!pageContent) return;
|
||||||
|
|
||||||
|
// compact the message to a data attribute to avoid too many duplicated messages
|
||||||
|
const msgCompact = msg.replace(/\W/g, '').trim();
|
||||||
|
let msgDiv = pageContent.querySelector(`.js-global-error[data-global-error-msg-compact="${msgCompact}"]`);
|
||||||
|
if (!msgDiv) {
|
||||||
const el = document.createElement('div');
|
const el = document.createElement('div');
|
||||||
el.innerHTML = `<div class="ui container negative message center aligned js-global-error" style="white-space: pre-line;"></div>`;
|
el.innerHTML = `<div class="ui container negative message center aligned js-global-error" style="white-space: pre-line;"></div>`;
|
||||||
el.childNodes[0].textContent = msg;
|
msgDiv = el.childNodes[0];
|
||||||
pageContent.prepend(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})` : '');
|
||||||
|
pageContent.prepend(msgDiv);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
12
web_src/js/bootstrap.test.js
vendored
Normal file
12
web_src/js/bootstrap.test.js
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
import {showGlobalErrorMessage} from './bootstrap.js';
|
||||||
|
|
||||||
|
test('showGlobalErrorMessage', () => {
|
||||||
|
document.body.innerHTML = '<div class="page-content"></div>';
|
||||||
|
showGlobalErrorMessage('test msg 1');
|
||||||
|
showGlobalErrorMessage('test msg 2');
|
||||||
|
showGlobalErrorMessage('test msg 1'); // duplicated
|
||||||
|
|
||||||
|
expect(document.body.innerHTML).toContain('>test msg 1 (2)<');
|
||||||
|
expect(document.body.innerHTML).toContain('>test msg 2<');
|
||||||
|
expect(document.querySelectorAll('.js-global-error').length).toEqual(2);
|
||||||
|
});
|
|
@ -1,3 +1,5 @@
|
||||||
|
window.__webpack_public_path__ = '';
|
||||||
|
|
||||||
window.config = {
|
window.config = {
|
||||||
csrfToken: 'test-csrf-token-123456',
|
csrfToken: 'test-csrf-token-123456',
|
||||||
pageData: {},
|
pageData: {},
|
||||||
|
|
Loading…
Reference in a new issue