diff --git a/app/composables/useAudit.ts b/app/composables/useAudit.ts index da08cd0..e4e9e4d 100644 --- a/app/composables/useAudit.ts +++ b/app/composables/useAudit.ts @@ -5,8 +5,12 @@ export function useAuditApi() { const entries = ref([]); const loading = ref(false); const error = ref(""); + // Bumped by every load, so only the latest request may land (an older one, + // e.g. from the page the user just left, must not overwrite newer data). + let request = 0; async function load(limit = 50, groupId?: string): Promise { + const mine = ++request; loading.value = true; error.value = ""; needLogin.value = false; @@ -14,11 +18,12 @@ export function useAuditApi() { let url = `/admin/api/audit?limit=${limit}`; if (groupId) url += `&groupId=${encodeURIComponent(groupId)}`; const data = await apiFetch<{ audit?: AuditEntry[] }>(url); - entries.value = data.audit ?? []; + if (mine === request) entries.value = data.audit ?? []; } 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; } } diff --git a/app/composables/useGroups.ts b/app/composables/useGroups.ts index 263a419..822a7a5 100644 --- a/app/composables/useGroups.ts +++ b/app/composables/useGroups.ts @@ -10,6 +10,9 @@ export function useGroupsApi() { const error = ref(""); /** A load has succeeded: an id missing from `groups` really is unknown. */ const loaded = ref(false); + // Bumped by every load and save, so only the latest request may land: a + // load that started before a save must not bring back the old groups. + let request = 0; function roleOf(groupId: string): GroupRole | undefined { return isSuper.value ? "owner" : roles.value[groupId]; @@ -26,6 +29,7 @@ export function useGroupsApi() { } async function load(): Promise { + const mine = ++request; loading.value = true; error.value = ""; needLogin.value = false; @@ -35,14 +39,16 @@ export function useGroupsApi() { isSuper?: boolean; roles?: Record; }>("/admin/api/groups"); + if (mine !== request) return; groups.value = data.groups ?? []; isSuper.value = data.isSuper ?? false; roles.value = data.roles ?? {}; loaded.value = true; } 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; } } @@ -51,6 +57,8 @@ export function useGroupsApi() { method: "PUT", body: JSON.stringify({ groups: next }), }); + request++; + loading.value = false; groups.value = next; } diff --git a/app/composables/useLogs.ts b/app/composables/useLogs.ts index ed7222e..b9b1561 100644 --- a/app/composables/useLogs.ts +++ b/app/composables/useLogs.ts @@ -5,8 +5,12 @@ export function useSendLogs() { const logs = ref([]); const loading = ref(false); const error = ref(""); + // Bumped by every load, so only the latest request may land (an older one, + // e.g. from the page the user just left, must not overwrite newer data). + let request = 0; async function load(limit = 50, groupId?: string): Promise { + const mine = ++request; loading.value = true; error.value = ""; needLogin.value = false; @@ -14,11 +18,12 @@ export function useSendLogs() { let url = `/admin/api/logs?limit=${limit}`; if (groupId) url += `&groupId=${encodeURIComponent(groupId)}`; const data = await apiFetch<{ logs?: SendRecord[] }>(url); - logs.value = data.logs ?? []; + if (mine === request) logs.value = data.logs ?? []; } 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; } } diff --git a/app/composables/useMetrics.ts b/app/composables/useMetrics.ts index a406165..293b5c0 100644 --- a/app/composables/useMetrics.ts +++ b/app/composables/useMetrics.ts @@ -5,19 +5,24 @@ export function useMetrics() { const metrics = ref(null); const loading = ref(false); const error = ref(""); + // Bumped by every load, so only the latest request may land: Overview + // (all groups) and Stats (maybe one group) share this state. + let request = 0; async function load(groupId?: string): Promise { + const mine = ++request; loading.value = true; error.value = ""; needLogin.value = false; try { const qs = groupId ? `?groupId=${encodeURIComponent(groupId)}` : ""; const data = await apiFetch<{ metrics?: DeliveryMetrics }>(`/admin/api/metrics${qs}`); - metrics.value = data.metrics ?? null; + if (mine === request) metrics.value = data.metrics ?? null; } 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; } }