mirror of
https://github.com/Elysola/WebHooker.git
synced 2026-11-21 01:23:40 +00:00
fix(console-data): discard superseded load responses
Only the latest request may update a list, its error or loading state. Invalidate pending group loads after a save so an older response cannot restore stale configuration during persistent-console navigation.
This commit is contained in:
1 parent
de84155e09
commit
05d025ef9c
4 files changed
+34
-11
No files matched your search
@@ -5,8 +5,12 @@ export function useAuditApi() {
|
|||||||
const entries = ref<AuditEntry[]>([]);
|
const entries = ref<AuditEntry[]>([]);
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
const error = ref("");
|
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<void> {
|
async function load(limit = 50, groupId?: string): Promise<void> {
|
||||||
|
const mine = ++request;
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
error.value = "";
|
error.value = "";
|
||||||
needLogin.value = false;
|
needLogin.value = false;
|
||||||
@@ -14,11 +18,12 @@ export function useAuditApi() {
|
|||||||
let url = `/admin/api/audit?limit=${limit}`;
|
let url = `/admin/api/audit?limit=${limit}`;
|
||||||
if (groupId) url += `&groupId=${encodeURIComponent(groupId)}`;
|
if (groupId) url += `&groupId=${encodeURIComponent(groupId)}`;
|
||||||
const data = await apiFetch<{ audit?: AuditEntry[] }>(url);
|
const data = await apiFetch<{ audit?: AuditEntry[] }>(url);
|
||||||
entries.value = data.audit ?? [];
|
if (mine === request) entries.value = data.audit ?? [];
|
||||||
} catch (err) {
|
} 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 {
|
} finally {
|
||||||
loading.value = false;
|
if (mine === request) loading.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ export function useGroupsApi() {
|
|||||||
const error = ref("");
|
const error = ref("");
|
||||||
/** A load has succeeded: an id missing from `groups` really is unknown. */
|
/** A load has succeeded: an id missing from `groups` really is unknown. */
|
||||||
const loaded = ref(false);
|
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 {
|
function roleOf(groupId: string): GroupRole | undefined {
|
||||||
return isSuper.value ? "owner" : roles.value[groupId];
|
return isSuper.value ? "owner" : roles.value[groupId];
|
||||||
@@ -26,6 +29,7 @@ export function useGroupsApi() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function load(): Promise<void> {
|
async function load(): Promise<void> {
|
||||||
|
const mine = ++request;
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
error.value = "";
|
error.value = "";
|
||||||
needLogin.value = false;
|
needLogin.value = false;
|
||||||
@@ -35,14 +39,16 @@ export function useGroupsApi() {
|
|||||||
isSuper?: boolean;
|
isSuper?: boolean;
|
||||||
roles?: Record<string, GroupRole>;
|
roles?: Record<string, GroupRole>;
|
||||||
}>("/admin/api/groups");
|
}>("/admin/api/groups");
|
||||||
|
if (mine !== request) return;
|
||||||
groups.value = data.groups ?? [];
|
groups.value = data.groups ?? [];
|
||||||
isSuper.value = data.isSuper ?? false;
|
isSuper.value = data.isSuper ?? false;
|
||||||
roles.value = data.roles ?? {};
|
roles.value = data.roles ?? {};
|
||||||
loaded.value = true;
|
loaded.value = true;
|
||||||
} catch (err) {
|
} 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 {
|
} finally {
|
||||||
loading.value = false;
|
if (mine === request) loading.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,6 +57,8 @@ export function useGroupsApi() {
|
|||||||
method: "PUT",
|
method: "PUT",
|
||||||
body: JSON.stringify({ groups: next }),
|
body: JSON.stringify({ groups: next }),
|
||||||
});
|
});
|
||||||
|
request++;
|
||||||
|
loading.value = false;
|
||||||
groups.value = next;
|
groups.value = next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,12 @@ export function useSendLogs() {
|
|||||||
const logs = ref<SendRecord[]>([]);
|
const logs = ref<SendRecord[]>([]);
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
const error = ref("");
|
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<void> {
|
async function load(limit = 50, groupId?: string): Promise<void> {
|
||||||
|
const mine = ++request;
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
error.value = "";
|
error.value = "";
|
||||||
needLogin.value = false;
|
needLogin.value = false;
|
||||||
@@ -14,11 +18,12 @@ export function useSendLogs() {
|
|||||||
let url = `/admin/api/logs?limit=${limit}`;
|
let url = `/admin/api/logs?limit=${limit}`;
|
||||||
if (groupId) url += `&groupId=${encodeURIComponent(groupId)}`;
|
if (groupId) url += `&groupId=${encodeURIComponent(groupId)}`;
|
||||||
const data = await apiFetch<{ logs?: SendRecord[] }>(url);
|
const data = await apiFetch<{ logs?: SendRecord[] }>(url);
|
||||||
logs.value = data.logs ?? [];
|
if (mine === request) logs.value = data.logs ?? [];
|
||||||
} catch (err) {
|
} 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 {
|
} finally {
|
||||||
loading.value = false;
|
if (mine === request) loading.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,19 +5,24 @@ export function useMetrics() {
|
|||||||
const metrics = ref<DeliveryMetrics | null>(null);
|
const metrics = ref<DeliveryMetrics | null>(null);
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
const error = ref("");
|
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<void> {
|
async function load(groupId?: string): Promise<void> {
|
||||||
|
const mine = ++request;
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
error.value = "";
|
error.value = "";
|
||||||
needLogin.value = false;
|
needLogin.value = false;
|
||||||
try {
|
try {
|
||||||
const qs = groupId ? `?groupId=${encodeURIComponent(groupId)}` : "";
|
const qs = groupId ? `?groupId=${encodeURIComponent(groupId)}` : "";
|
||||||
const data = await apiFetch<{ metrics?: DeliveryMetrics }>(`/admin/api/metrics${qs}`);
|
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) {
|
} 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 {
|
} finally {
|
||||||
loading.value = false;
|
if (mine === request) loading.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user