Add toasts to UI (#25449)
Fixes https://github.com/go-gitea/gitea/issues/24353 In some case like async success/error, it is useful to show toasts in UI.
This commit is contained in:
parent
72c60f94c1
commit
c71e8abbc3
15 changed files with 220 additions and 20 deletions
|
@ -9,6 +9,7 @@ import {hideElem, showElem, toggleElem} from '../utils/dom.js';
|
|||
import {htmlEscape} from 'escape-goat';
|
||||
import {createTippy} from '../modules/tippy.js';
|
||||
import {confirmModal} from './comp/ConfirmModal.js';
|
||||
import {showErrorToast} from '../modules/toast.js';
|
||||
|
||||
const {appUrl, appSubUrl, csrfToken, i18n} = window.config;
|
||||
|
||||
|
@ -439,7 +440,7 @@ export function initGlobalButtons() {
|
|||
return;
|
||||
}
|
||||
// should never happen, otherwise there is a bug in code
|
||||
alert('Nothing to hide');
|
||||
showErrorToast('Nothing to hide');
|
||||
});
|
||||
|
||||
initGlobalShowModal();
|
||||
|
|
|
@ -8,6 +8,7 @@ import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js';
|
|||
import {renderPreviewPanelContent} from '../repo-editor.js';
|
||||
import {easyMDEToolbarActions} from './EasyMDEToolbarActions.js';
|
||||
import {initTextExpander} from './TextExpander.js';
|
||||
import {showErrorToast} from '../../modules/toast.js';
|
||||
|
||||
let elementIdCounter = 0;
|
||||
|
||||
|
@ -26,7 +27,7 @@ export function validateTextareaNonEmpty($textarea) {
|
|||
$form[0]?.reportValidity();
|
||||
} else {
|
||||
// The alert won't hurt users too much, because we are dropping the EasyMDE and the check only occurs in a few places.
|
||||
alert('Require non-empty content');
|
||||
showErrorToast('Require non-empty content');
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import $ from 'jquery';
|
||||
import {svg} from '../svg.js';
|
||||
import {showErrorToast} from '../modules/toast.js';
|
||||
|
||||
const {appSubUrl, csrfToken} = window.config;
|
||||
let i18nTextEdited;
|
||||
|
@ -39,12 +40,12 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
|
|||
if (resp.ok) {
|
||||
$dialog.modal('hide');
|
||||
} else {
|
||||
alert(resp.message);
|
||||
showErrorToast(resp.message);
|
||||
}
|
||||
});
|
||||
}
|
||||
} else { // required by eslint
|
||||
window.alert(`unknown option item: ${optionItem}`);
|
||||
showErrorToast(`unknown option item: ${optionItem}`);
|
||||
}
|
||||
},
|
||||
onHide() {
|
||||
|
|
|
@ -4,6 +4,7 @@ import {toggleElem} from '../utils/dom.js';
|
|||
import {htmlEscape} from 'escape-goat';
|
||||
import {Sortable} from 'sortablejs';
|
||||
import {confirmModal} from './comp/ConfirmModal.js';
|
||||
import {showErrorToast} from '../modules/toast.js';
|
||||
|
||||
function initRepoIssueListCheckboxes() {
|
||||
const $issueSelectAll = $('.issue-checkbox-all');
|
||||
|
@ -75,7 +76,7 @@ function initRepoIssueListCheckboxes() {
|
|||
).then(() => {
|
||||
window.location.reload();
|
||||
}).catch((reason) => {
|
||||
window.alert(reason.responseJSON.error);
|
||||
showErrorToast(reason.responseJSON.error);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
60
web_src/js/modules/toast.js
Normal file
60
web_src/js/modules/toast.js
Normal file
|
@ -0,0 +1,60 @@
|
|||
import {htmlEscape} from 'escape-goat';
|
||||
import {svg} from '../svg.js';
|
||||
|
||||
const levels = {
|
||||
info: {
|
||||
icon: 'octicon-check',
|
||||
background: 'var(--color-green)',
|
||||
duration: 2500,
|
||||
},
|
||||
warning: {
|
||||
icon: 'gitea-exclamation',
|
||||
background: 'var(--color-orange)',
|
||||
duration: -1, // requires dismissal to hide
|
||||
},
|
||||
error: {
|
||||
icon: 'gitea-exclamation',
|
||||
background: 'var(--color-red)',
|
||||
duration: -1, // requires dismissal to hide
|
||||
},
|
||||
};
|
||||
|
||||
// See https://github.com/apvarun/toastify-js#api for options
|
||||
async function showToast(message, level, {gravity, position, duration, ...other} = {}) {
|
||||
if (!message) return;
|
||||
|
||||
const {default: Toastify} = await import(/* webpackChunkName: 'toastify' */'toastify-js');
|
||||
const {icon, background, duration: levelDuration} = levels[level ?? 'info'];
|
||||
|
||||
const toast = Toastify({
|
||||
text: `
|
||||
<div class='toast-icon'>${svg(icon)}</div>
|
||||
<div class='toast-body'>${htmlEscape(message)}</div>
|
||||
<button class='toast-close'>${svg('octicon-x')}</button>
|
||||
`,
|
||||
escapeMarkup: false,
|
||||
gravity: gravity ?? 'top',
|
||||
position: position ?? 'center',
|
||||
duration: duration ?? levelDuration,
|
||||
style: {background},
|
||||
...other,
|
||||
});
|
||||
|
||||
toast.showToast();
|
||||
|
||||
toast.toastElement.querySelector('.toast-close').addEventListener('click', () => {
|
||||
toast.removeElement(toast.toastElement);
|
||||
});
|
||||
}
|
||||
|
||||
export async function showInfoToast(message, opts) {
|
||||
return await showToast(message, 'info', opts);
|
||||
}
|
||||
|
||||
export async function showWarningToast(message, opts) {
|
||||
return await showToast(message, 'warning', opts);
|
||||
}
|
||||
|
||||
export async function showErrorToast(message, opts) {
|
||||
return await showToast(message, 'error', opts);
|
||||
}
|
17
web_src/js/modules/toast.test.js
Normal file
17
web_src/js/modules/toast.test.js
Normal file
|
@ -0,0 +1,17 @@
|
|||
import {test, expect} from 'vitest';
|
||||
import {showInfoToast, showErrorToast, showWarningToast} from './toast.js';
|
||||
|
||||
test('showInfoToast', async () => {
|
||||
await showInfoToast('success 😀', {duration: -1});
|
||||
expect(document.querySelector('.toastify')).toBeTruthy();
|
||||
});
|
||||
|
||||
test('showWarningToast', async () => {
|
||||
await showWarningToast('warning 😐', {duration: -1});
|
||||
expect(document.querySelector('.toastify')).toBeTruthy();
|
||||
});
|
||||
|
||||
test('showErrorToast', async () => {
|
||||
await showErrorToast('error 🙁', {duration: -1});
|
||||
expect(document.querySelector('.toastify')).toBeTruthy();
|
||||
});
|
11
web_src/js/standalone/devtest.js
Normal file
11
web_src/js/standalone/devtest.js
Normal file
|
@ -0,0 +1,11 @@
|
|||
import {showInfoToast, showWarningToast, showErrorToast} from '../modules/toast.js';
|
||||
|
||||
document.getElementById('info-toast').addEventListener('click', () => {
|
||||
showInfoToast('success 😀');
|
||||
});
|
||||
document.getElementById('warning-toast').addEventListener('click', () => {
|
||||
showWarningToast('warning 😐');
|
||||
});
|
||||
document.getElementById('error-toast').addEventListener('click', () => {
|
||||
showErrorToast('error 🙁');
|
||||
});
|
Loading…
Add table
Add a link
Reference in a new issue