Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: ignore canceled LoRA searches (#10688)

Adam Eivyfd65ff0e56fc
diff --git a/client/src/pages/Loras.jsx b/client/src/pages/Loras.jsx
index a0be00f1ea..5b7ef67422 100644
--- a/client/src/pages/Loras.jsx
+++ b/client/src/pages/Loras.jsx
@@ -1189,12 +1189,15 @@ function SuggestionsSection({ label, hint, cards, alwaysShow = false, runner = n
const [liveCards, setLiveCards] = useState(null);
const [cursor, setCursor] = useState(null);
const [loading, setLoading] = useState(false);
+ const requestIdRef = useRef(0);
// Drop any live search/pagination so the section falls back to the cached
// top-N. Shared by Clear, the empty-box submit, and the Refresh effect.
// Stable identity (setters never change) so the effect can depend on it.
const resetToCached = useCallback(() => {
+ requestIdRef.current += 1;
setActiveQuery(''); setLiveCards(null); setCursor(null);
+ setLoading(false);
}, []);
// A global Refresh (new fetchedAt) re-seeds the cached top-N — drop live
@@ -1203,9 +1206,12 @@ function SuggestionsSection({ label, hint, cards, alwaysShow = false, runner = n
useEffect(() => { setQuery(''); resetToCached(); }, [resetSignal, resetToCached]);
const fetchPage = useCallback(async (q, { append, useCursor }) => {
+ const requestId = requestIdRef.current + 1;
+ requestIdRef.current = requestId;
setLoading(true);
await searchCivitaiLoras({ runner, query: q, cursor: useCursor, limit: 12 })
.then((res) => {
+ if (requestIdRef.current !== requestId) return;
const items = res?.items || [];
setCursor(res?.nextCursor || null);
setActiveQuery(q);
@@ -1216,8 +1222,12 @@ function SuggestionsSection({ label, hint, cards, alwaysShow = false, runner = n
return [...prev, ...items.filter((c) => !seen.has(cardKey(c)))];
});
})
- .catch((err) => toast.error(err?.message || 'Civitai search failed'))
- .finally(() => setLoading(false));
+ .catch((err) => {
+ if (requestIdRef.current === requestId) toast.error(err?.message || 'Civitai search failed');
+ })
+ .finally(() => {
+ if (requestIdRef.current === requestId) setLoading(false);
+ });
}, [runner]);
const handleSearch = (e) => {
diff --git a/client/src/pages/Loras.test.jsx b/client/src/pages/Loras.test.jsx
index e85f8a95a9..b1fd5a6657 100644
--- a/client/src/pages/Loras.test.jsx
+++ b/client/src/pages/Loras.test.jsx
@@ -15,7 +15,7 @@ import { clickStartDownload } from '../test/downloadPreflightConfirm.js';
import Loras from './Loras';
import {
listLorasFull, deleteLoraFull, installLoraFromHuggingfaceStream, probeLoraEffect,
- previewLoraInstall, getCivitaiSuggestions, installLoraFromCivitai, searchVideoLoras,
+ previewLoraInstall, getCivitaiSuggestions, installLoraFromCivitai, searchCivitaiLoras, searchVideoLoras,
} from '../services/api';
vi.mock('../services/api', () => ({
@@ -201,6 +201,104 @@ describe('Loras Installed / Discover views', () => {
});
});
+describe('Loras Civitai search cancellation', () => {
+ const CACHED_CARD = { modelId: 42, versionId: 7, name: 'Cached LoRA', installUrl: 'https://civitai.com/models/42' };
+ const SEARCH_CARD = (name, modelId) => ({ modelId, versionId: 1, name, installUrl: `https://civitai.com/models/${modelId}` });
+
+ beforeEach(() => {
+ vi.clearAllMocks();
+ listLorasFull.mockResolvedValue([]);
+ getCivitaiSuggestions.mockResolvedValue({ runners: { mflux: [CACHED_CARD] }, video: [], fetchedAt: null });
+ });
+
+ it('keeps cached recommendations when Clear cancels an in-flight search', async () => {
+ let resolveSearch;
+ searchCivitaiLoras
+ .mockResolvedValueOnce({ items: [SEARCH_CARD('First result', 51)], nextCursor: 'next' })
+ .mockImplementationOnce(() => new Promise((resolve) => { resolveSearch = resolve; }));
+ await renderDiscover();
+
+ const input = screen.getByLabelText('Search Flux 1 LoRAs on Civitai');
+ const form = input.closest('form');
+ fireEvent.change(input, { target: { value: 'first' } });
+ fireEvent.submit(form);
+ expect(await screen.findByText('First result')).toBeInTheDocument();
+
+ fireEvent.change(input, { target: { value: 'second' } });
+ fireEvent.submit(form);
+ await waitFor(() => expect(resolveSearch).toBeTypeOf('function'));
+ fireEvent.click(screen.getByRole('button', { name: 'Clear' }));
+ await act(async () => resolveSearch({ items: [SEARCH_CARD('Canceled result', 52)], nextCursor: null }));
+
+ expect(input).toHaveValue('');
+ expect(screen.getByText('Cached LoRA')).toBeInTheDocument();
+ expect(screen.queryByText('Canceled result')).not.toBeInTheDocument();
+ expect(screen.queryByText(/results for “second”/)).not.toBeInTheDocument();
+ });
+
+ it('lets a new search proceed while stale completion cannot replace it or clear its loading state', async () => {
+ let resolveStale;
+ let resolveSecond;
+ searchCivitaiLoras
+ .mockResolvedValueOnce({ items: [SEARCH_CARD('Initial result', 60)], nextCursor: 'next' })
+ .mockImplementationOnce(() => new Promise((resolve) => { resolveStale = resolve; }))
+ .mockImplementationOnce(() => new Promise((resolve) => { resolveSecond = resolve; }));
+ await renderDiscover();
+
+ const input = screen.getByLabelText('Search Flux 1 LoRAs on Civitai');
+ const form = input.closest('form');
+ fireEvent.change(input, { target: { value: 'initial' } });
+ fireEvent.submit(form);
+ expect(await screen.findByText('Initial result')).toBeInTheDocument();
+
+ fireEvent.change(input, { target: { value: 'stale' } });
+ fireEvent.submit(form);
+ await waitFor(() => expect(resolveStale).toBeTypeOf('function'));
+ fireEvent.click(screen.getByRole('button', { name: 'Clear' }));
+
+ fireEvent.change(input, { target: { value: 'current' } });
+ fireEvent.submit(form);
+ await waitFor(() => expect(resolveSecond).toBeTypeOf('function'));
+ expect(screen.getByRole('button', { name: 'Searching…' })).toBeDisabled();
+
+ await act(async () => resolveStale({ items: [SEARCH_CARD('Stale result', 61)], nextCursor: null }));
+ expect(screen.getByRole('button', { name: 'Searching…' })).toBeDisabled();
+ expect(screen.queryByText('Stale result')).not.toBeInTheDocument();
+
+ await act(async () => resolveSecond({ items: [SEARCH_CARD('Current result', 62)], nextCursor: null }));
+ expect(await screen.findByText('Current result')).toBeInTheDocument();
+ expect(screen.queryByText('Stale result')).not.toBeInTheDocument();
+ });
+
+ it('invalidates an in-flight search when cached suggestions refresh', async () => {
+ let resolveSearch;
+ getCivitaiSuggestions
+ .mockResolvedValueOnce({ runners: { mflux: [CACHED_CARD] }, video: [], fetchedAt: 'first' })
+ .mockImplementationOnce(() => Promise.resolve({ runners: { mflux: [CACHED_CARD] }, video: [], fetchedAt: 'second' }));
+ searchCivitaiLoras
+ .mockResolvedValueOnce({ items: [SEARCH_CARD('Initial result', 70)], nextCursor: 'next' })
+ .mockImplementationOnce(() => new Promise((resolve) => { resolveSearch = resolve; }));
+ await renderDiscover();
+
+ const input = screen.getByLabelText('Search Flux 1 LoRAs on Civitai');
+ const form = input.closest('form');
+ fireEvent.change(input, { target: { value: 'initial' } });
+ fireEvent.submit(form);
+ expect(await screen.findByText('Initial result')).toBeInTheDocument();
+
+ fireEvent.change(input, { target: { value: 'pending' } });
+ fireEvent.submit(form);
+ await waitFor(() => expect(resolveSearch).toBeTypeOf('function'));
+ fireEvent.click(screen.getByRole('button', { name: 'Refresh' }));
+ await screen.findByText('Cached LoRA');
+ await act(async () => resolveSearch({ items: [SEARCH_CARD('Canceled result', 71)], nextCursor: null }));
+
+ expect(screen.getByText('Cached LoRA')).toBeInTheDocument();
+ expect(screen.queryByText('Canceled result')).not.toBeInTheDocument();
+ expect(screen.queryByText(/results for “pending”/)).not.toBeInTheDocument();
+ });
+});
+
describe('Loras installed-card delete confirmation', () => {
beforeEach(() => {
vi.clearAllMocks();