refactor: address /code-review on R11 feedback symmetry
- admin._decide: add an idempotency guard (409 unless status was 'pending') so a repeat/stale approve OR deny can't re-run its side effects — now that deny emails, this stops duplicate denial mails and a rejection mail to an already-approved user. - SavedViewsWidget: extract runViewMutation(fn, failMsg) (returns success) — dedups the five try/catch+refresh blocks AND lets create/rename close their input only on success, so a failed create keeps the user's typed name. - worker._notify_download_done: take user_id/title captured BEFORE the caller's commit (no post-commit refresh SELECT); add a so the inbox labels an edit job 'Edit ready' instead of 'Download ready' (new inbox.editDone i18n, HU+EN). Gate green (ruff/tsc/eslint-0/prettier/knip/vitest 79/pytest 193); smoke-tested the saved-views + notifications surfaces render clean on a fresh dev server.
This commit is contained in:
@@ -259,9 +259,10 @@ function NotificationRow({
|
||||
});
|
||||
body = d.summary || n.body;
|
||||
} else if (isDownloadDone) {
|
||||
// "Download ready", with the video's title as the body (the producer ships it in data.title).
|
||||
const d = n.data as { title?: string | null };
|
||||
title = t("inbox.downloadDone.title");
|
||||
// "Download ready" / "Edit ready" per the producer's kind, with the video's title as the body
|
||||
// (shipped in data.title). Same notification type; the copy differs so an edit isn't mislabelled.
|
||||
const d = n.data as { title?: string | null; kind?: string };
|
||||
title = t(d.kind === "edit" ? "inbox.editDone.title" : "inbox.downloadDone.title");
|
||||
body = d.title || n.body;
|
||||
}
|
||||
return (
|
||||
|
||||
@@ -72,6 +72,22 @@ export default function SavedViewsWidget({
|
||||
}, [viewsQuery.data]);
|
||||
|
||||
const refresh = () => qc.invalidateQueries({ queryKey: qk.savedViews() });
|
||||
|
||||
// Run a saved-view mutation with uniform feedback: on failure surface the server's reason instead
|
||||
// of a silent swallow, and always refetch afterwards (which also reverts an optimistic change to
|
||||
// the server's truth). Returns whether it succeeded, so callers can gate success-only side effects
|
||||
// (e.g. closing an editor) and keep the input open — with the user's text — on failure.
|
||||
async function runViewMutation(fn: () => Promise<unknown>, failMsg: string): Promise<boolean> {
|
||||
try {
|
||||
await fn();
|
||||
return true;
|
||||
} catch (e) {
|
||||
notifyActionError(e, failMsg);
|
||||
return false;
|
||||
} finally {
|
||||
refresh();
|
||||
}
|
||||
}
|
||||
const currentKey = keyOf(filters);
|
||||
|
||||
async function save() {
|
||||
@@ -79,35 +95,30 @@ export default function SavedViewsWidget({
|
||||
if (!name) return;
|
||||
// Strip the transient shuffle seed so a saved "shuffle" view re-rolls fresh on apply.
|
||||
const { seed: _seed, ...clean } = filters;
|
||||
setNaming(false);
|
||||
setDraftName("");
|
||||
try {
|
||||
await api.createView(name, clean);
|
||||
} catch (e) {
|
||||
notifyActionError(e, t("views.actionFailed"));
|
||||
// Close the naming input only on success, so a failed create keeps the user's typed name.
|
||||
if (await runViewMutation(() => api.createView(name, clean), t("views.actionFailed"))) {
|
||||
setNaming(false);
|
||||
setDraftName("");
|
||||
}
|
||||
refresh();
|
||||
}
|
||||
|
||||
async function rename(id: number, name: string) {
|
||||
const next = name.trim();
|
||||
setRenameId(null);
|
||||
if (!next) return;
|
||||
try {
|
||||
await api.updateView(id, { name: next });
|
||||
} catch (e) {
|
||||
notifyActionError(e, t("views.actionFailed"));
|
||||
if (!next) {
|
||||
setRenameId(null);
|
||||
return;
|
||||
}
|
||||
// Close the rename editor only on success, so a failed rename stays open for a retry.
|
||||
if (await runViewMutation(() => api.updateView(id, { name: next }), t("views.actionFailed"))) {
|
||||
setRenameId(null);
|
||||
}
|
||||
refresh();
|
||||
}
|
||||
|
||||
async function toggleDefault(v: SavedView) {
|
||||
try {
|
||||
await api.updateView(v.id, { is_default: !v.is_default });
|
||||
} catch (e) {
|
||||
notifyActionError(e, t("views.actionFailed"));
|
||||
}
|
||||
refresh();
|
||||
await runViewMutation(
|
||||
() => api.updateView(v.id, { is_default: !v.is_default }),
|
||||
t("views.actionFailed"),
|
||||
);
|
||||
}
|
||||
|
||||
async function remove(v: SavedView) {
|
||||
@@ -117,12 +128,7 @@ export default function SavedViewsWidget({
|
||||
danger: true,
|
||||
});
|
||||
if (!ok) return;
|
||||
try {
|
||||
await api.deleteView(v.id);
|
||||
} catch (e) {
|
||||
notifyActionError(e, t("views.actionFailed"));
|
||||
}
|
||||
refresh();
|
||||
await runViewMutation(() => api.deleteView(v.id), t("views.actionFailed"));
|
||||
}
|
||||
|
||||
async function share(v: SavedView) {
|
||||
@@ -146,14 +152,9 @@ export default function SavedViewsWidget({
|
||||
qk.savedViews(),
|
||||
next.map((id) => views.find((v) => v.id === id)!),
|
||||
);
|
||||
// On failure the refetch below reverts the optimistic order to the server's truth; without the
|
||||
// toast the drop would silently snap back with no explanation.
|
||||
try {
|
||||
await api.reorderViews(next);
|
||||
} catch (e) {
|
||||
notifyActionError(e, t("views.reorderFailed"));
|
||||
}
|
||||
refresh();
|
||||
// On failure runViewMutation's refetch reverts the optimistic order to the server's truth;
|
||||
// without the toast the drop would silently snap back with no explanation.
|
||||
await runViewMutation(() => api.reorderViews(next), t("views.reorderFailed"));
|
||||
}
|
||||
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user