fix(sidebar): show loading while global search is in flight

This commit is contained in:
Melody Ruch authored and GitHub committed 2026-08-15 18:56:58 +08:00
1 parent bdf5f6a87c
commit c573c249ed
6 files changed
+123 -8

No files matched your search

@@ -134,6 +134,11 @@ export class MetadataLoadCoordinator {
return this.inFlight.has(key);
}
inFlightPromise<T>(scope: MetadataScopeInput | string): Promise<T> | undefined {
const key = typeof scope === "string" ? scope : metadataScopeKey(scope);
return this.inFlight.get(key)?.promise as Promise<T> | undefined;
}
clear(scope?: MetadataScopeInput | string) {
if (scope === undefined) {
this.inFlight.clear();
@@ -0,0 +1,43 @@
import { describe, expect, it } from "vitest";
import { createSidebarSearchLoadingTracker } from "@/lib/sidebar/sidebarSearchLoadingTracker";
describe("sidebar search loading tracker", () => {
it("is idle until a search dispatch begins", () => {
const tracker = createSidebarSearchLoadingTracker();
expect(tracker.isLoading).toBe(false);
});
it("reports loading while a dispatch is in flight and clears on matching end", () => {
const tracker = createSidebarSearchLoadingTracker();
const generation = tracker.begin();
expect(tracker.isLoading).toBe(true);
expect(tracker.end(generation)).toBe(true);
expect(tracker.isLoading).toBe(false);
});
it("ignores a stale end() from a superseded dispatch (fast typing race)", () => {
// This is the exact race in ConnectionTree.vue's search watcher: each keystroke
// (after debounce) re-dispatches expansion tasks; a slow earlier dispatch must not
// clear the spinner set by a newer, still-in-flight dispatch.
const tracker = createSidebarSearchLoadingTracker();
const firstGeneration = tracker.begin();
const secondGeneration = tracker.begin();
expect(tracker.isLoading).toBe(true);
expect(tracker.end(firstGeneration)).toBe(false);
expect(tracker.isLoading).toBe(true);
expect(tracker.end(secondGeneration)).toBe(true);
expect(tracker.isLoading).toBe(false);
});
it("cancel() immediately clears loading and invalidates any pending end()", () => {
const tracker = createSidebarSearchLoadingTracker();
const generation = tracker.begin();
tracker.cancel();
expect(tracker.isLoading).toBe(false);
expect(tracker.end(generation)).toBe(false);
expect(tracker.isLoading).toBe(false);
});
});
@@ -0,0 +1,34 @@
export interface SidebarSearchLoadingTracker {
readonly isLoading: boolean;
/** Marks a new search dispatch as in flight; returns a generation token for `end`. */
begin(): number;
/** Clears the loading state if `generation` is still the latest dispatch; returns whether it cleared. */
end(generation: number): boolean;
/** Immediately clears the loading state and invalidates any in-flight `end` calls (e.g. query cleared). */
cancel(): void;
}
export function createSidebarSearchLoadingTracker(): SidebarSearchLoadingTracker {
let generation = 0;
let loading = false;
return {
get isLoading() {
return loading;
},
begin() {
generation += 1;
loading = true;
return generation;
},
end(calledGeneration: number) {
if (calledGeneration !== generation) return false;
loading = false;
return true;
},
cancel() {
generation += 1;
loading = false;
},
};
}