fix(editors): scope async results and fragment writes to sessions

A completed save or dry run must not close or overwrite a newer editor. Keep fragment state scoped by group, reject writes until the real list is ready, and retain in-flight fragment locks across navigation.
This commit is contained in:
翅膀 committed 2026-10-17 15:48:21 +08:00
1 parent 5dfd0426aa
commit 79c9eba1df
4 files changed
+106 -18

No files matched your search

+48 -7
View File
@@ -4,9 +4,37 @@ export function useFragmentsApi() {
const { needLogin } = useAuthState();
const fragments = ref<NamedFragment[]>([]);
const loading = ref(false);
const saving = ref(false);
const error = ref("");
/** Group whose fragments are shown; responses for any other group are dropped. */
const shownGroupId = ref<string | null>(null);
/** Group whose fragments were last loaded (or saved) successfully. */
const loadedGroupId = ref<string | null>(null);
// Bumped by every load/save, so only the latest request may land.
let request = 0;
/**
* Whether a write may start for `groupId`: the shown list is that group's
* real fragments and nothing is loading or saving. Saving replaces a group's
* whole fragment list, so each write must build on the previous one.
*/
function readyFor(groupId: string): boolean {
return (
shownGroupId.value === groupId &&
loadedGroupId.value === groupId &&
!error.value &&
!loading.value &&
!saving.value
);
}
async function load(groupId: string): Promise<void> {
const mine = ++request;
if (shownGroupId.value !== groupId) {
fragments.value = [];
loadedGroupId.value = null;
}
shownGroupId.value = groupId;
loading.value = true;
error.value = "";
needLogin.value = false;
@@ -14,21 +42,34 @@ export function useFragmentsApi() {
const data = await apiFetch<{ fragments?: NamedFragment[] }>(
`/admin/api/groups/${encodeURIComponent(groupId)}/fragments`,
);
if (mine !== request) return;
fragments.value = data.fragments ?? [];
loadedGroupId.value = groupId;
} catch (err) {
if (!needLogin.value) error.value = err instanceof Error ? err.message : String(err);
if (mine === request && !needLogin.value)
error.value = err instanceof Error ? err.message : String(err);
} finally {
loading.value = false;
if (mine === request) loading.value = false;
}
}
async function save(groupId: string, next: NamedFragment[]): Promise<void> {
await apiFetch(`/admin/api/groups/${encodeURIComponent(groupId)}/fragments`, {
method: "PUT",
body: JSON.stringify({ fragments: next }),
});
saving.value = true;
try {
await apiFetch(`/admin/api/groups/${encodeURIComponent(groupId)}/fragments`, {
method: "PUT",
body: JSON.stringify({ fragments: next }),
});
} finally {
saving.value = false;
}
if (shownGroupId.value !== groupId) return;
request++;
loading.value = false;
error.value = "";
fragments.value = next;
loadedGroupId.value = groupId;
}
return { fragments, loading, needLogin, error, load, save };
return { fragments, loading, needLogin, error, readyFor, load, save };
}
+2
View File
@@ -294,6 +294,7 @@ const en: Dict = {
"routeEditor.fragmentsSave": "Save as fragment",
"routeEditor.fragmentsNamePlaceholder": "Fragment name",
"routeEditor.fragmentsNameRequired": "Fragment name is required",
"routeEditor.fragmentsNotReady": "The group's fragments are still loading; try again in a moment",
"routeEditor.errPath": "Field filters need a path",
"routeEditor.errValues": "Add at least one value",
"routeEditor.errGroupEmpty": "Group needs at least one condition",
@@ -735,6 +736,7 @@ const zh: Dict = {
"routeEditor.fragmentsSave": "存为片段",
"routeEditor.fragmentsNamePlaceholder": "片段名称",
"routeEditor.fragmentsNameRequired": "请填写片段名称",
"routeEditor.fragmentsNotReady": "分组的片段仍在加载,请稍后再试",
"routeEditor.errPath": "字段过滤需要路径",
"routeEditor.errValues": "至少需要一个值",
"routeEditor.errGroupEmpty": "分组至少需要一个条件",