Skip to content

fix: harden error messages for UI actions #1127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jiangmuran wants to merge 1 commit into from
Closed

fix: harden error messages for UI actions #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion packages/ui-default/components/zipDownloader/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,13 @@ export async function downloadProblemSet(pids, name = 'Export') {
await download(`${name}.zip`, targets);
} catch (e) {
window.captureException?.(e);
Notification.error(`${e.message} ${e.params?.[0]}`);
const err = e as { message?: string; params?: unknown };
const params = Array.isArray(err.params)
? err.params
: err.params
? [String(err.params)]
: [];
const message = [err.message, ...params].filter(Boolean).join(' ') || i18n('Unknown error');
Notification.error(message);
}
}
79 changes: 25 additions & 54 deletions packages/ui-default/pages/contest_user.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +1,19 @@
import $ from 'jquery';
import UserSelectAutoComplete from 'vj/components/autocomplete/UserSelectAutoComplete';
import { ActionDialog } from 'vj/components/dialog';
import { confirm, prompt } from 'vj/components/dialog/index';
import Notification from 'vj/components/notification';
import { NamedPage } from 'vj/misc/Page';
import {
i18n, pjax, request, tpl,
i18n, pjax, request,
} from 'vj/utils';

const page = new NamedPage('contest_user', () => {
const addUserDialogContent = $(tpl`
<div>
<div class="row"><div class="columns">
<h1>${i18n('Add User')}</h1>
</div></div>
<div class="row"><div class="columns">
<label>
${i18n('Users')}
<input name="add_user_users" type="text" class="textbox" autocomplete="off">
</label>
</div></div>
<div class="row"><div class="columns">
<label>
${i18n('Rank')}
<br />
<label class="checkbox">
<input type="checkbox" name="unrank" class="checkbox">${i18n('UnRank')}
</label>
</label>
</div></div>
</div>
`);
addUserDialogContent.appendTo(document.body);
const userSelect = UserSelectAutoComplete.getOrConstruct<UserSelectAutoComplete<true>>(
addUserDialogContent.find('[name="add_user_users"]'),
{ multi: true, height: 'auto' },
);

const addUserDialog = new ActionDialog({
$body: addUserDialogContent,
onDispatch(action) {
if (action === 'ok' && !userSelect.value()) {
userSelect.focus();
return false;
}
return true;
},
});
addUserDialog.clear = function () {
userSelect.clear();
addUserDialog.$dom.find('[name="unrank"]').prop('checked', false);
return this;
};

const page = new NamedPage(['contest_user', 'homework_user'], () => {
async function handleClickAddUser() {
const action = await addUserDialog.clear().open();
if (action !== 'ok') return;
const unrank = addUserDialog.$dom.find('[name="unrank"]').prop('checked');
const uids = userSelect.value();
let uids = $('[name="uids"]').val() as string;
uids = uids.trim().split(' ');
if (uids.length === 0) return;
uids = uids.filter((i) => i && i !== '');
if (uids.length === 0) return;
const unrank = $('[name="unrank"]').prop('checked');
try {
const res = await request.post('', {
operation: 'add_user',
Expand All @@ -69,7 +26,14 @@ const page = new NamedPage('contest_user', () => {
pjax.request({ push: false });
}
} catch (error) {
Notification.error([error.message, ...error.params].join(' '));
const err = error as { message?: string; params?: unknown };
const params = Array.isArray(err.params)
? err.params
: err.params
? [String(err.params)]
: [];
const message = [err.message, ...params].filter(Boolean).join(' ') || i18n('Unknown error');
Notification.error(message);
}
}

Expand All @@ -86,7 +50,14 @@ const page = new NamedPage('contest_user', () => {
pjax.request({ push: false });
}
} catch (error) {
Notification.error([error.message, ...error.params].join(' '));
const err = error as { message?: string; params?: unknown };
const params = Array.isArray(err.params)
? err.params
: err.params
? [String(err.params)]
: [];
const message = [err.message, ...params].filter(Boolean).join(' ') || i18n('Unknown error');
Notification.error(message);
}
}

Expand Down
28 changes: 23 additions & 5 deletions packages/ui-default/pages/problem_files.page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,21 @@ const page = new NamedPage('problem_files', () => {
const type = $(ev.currentTarget).closest('[data-type]').attr('data-type');
const files = ensureAndGetSelectedFiles(type);
if (files === null) return;
const { links, pdoc } = await request.post('', { operation: 'get_links', files, type });
const targets = [];
for (const filename of Object.keys(links)) targets.push({ filename, url: links[filename] });
await download(`${pdoc.docId} ${pdoc.title} ${type}.zip`, targets);
try {
const { links, pdoc } = await request.post('', { operation: 'get_links', files, type });
const targets = [];
for (const filename of Object.keys(links)) targets.push({ filename, url: links[filename] });
await download(`${pdoc.docId} ${pdoc.title} ${type}.zip`, targets);
} catch (error) {
const err = error as { message?: string; params?: unknown };
const params = Array.isArray(err.params)
? err.params
: err.params
? [String(err.params)]
: [];
const message = [err.message, ...params].filter(Boolean).join(' ') || i18n('Unknown error');
Notification.error(message);
}
}

async function handleGenerateTestdata(ev) {
Expand Down Expand Up @@ -74,7 +85,14 @@ const page = new NamedPage('problem_files', () => {
await pjax.request({ push: false });
}
} catch (error) {
Notification.error([error.message, ...error.params].join(' '));
const err = error as { message?: string; params?: unknown };
const params = Array.isArray(err.params)
? err.params
: err.params
? [String(err.params)]
: [];
const message = [err.message, ...params].filter(Boolean).join(' ') || i18n('Unknown error');
Notification.error(message);
}
}

Expand Down