Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(dashboard): keep search results when loading more fails
Yudhi Armyndharis73038cb7fcf2
diff --git a/dashboard/src/components/GlobalSearch.test.ts b/dashboard/src/components/GlobalSearch.test.tsindex 8e0e0c8ed..236d200f9 100644--- a/dashboard/src/components/GlobalSearch.test.ts+++ b/dashboard/src/components/GlobalSearch.test.ts@@ -7,6 +7,8 @@ import assert from 'node:assert/strict';import { createElement } from 'react';const pending = new Map<string, (hits: string[], total?: number) => void>();+// Answers the held search for a query with an HTTP error instead of hits.+const failing = new Map<string, (status: number) => void>();const offsets: string[] = [];const scopes: string[] = [];@@ -21,6 +23,7 @@ function installFetchStub(): void {offsets.push(offset);scopes.push(url.searchParams.get('sessionId') ?? '');return new Promise(resolve => {+ failing.set(q, status => resolve(new Response(JSON.stringify({ message: 'failed' }), { status })));pending.set(q, (texts, total = texts.length) =>resolve(new Response(@@ -58,6 +61,7 @@ before(async () => {afterEach(() => {rtl.cleanup();pending.clear();+ failing.clear();offsets.length = 0;scopes.length = 0;});@@ -168,6 +172,44 @@ test('a mouse click on "more" keeps the results open and appends the next page',assert.equal(screen.getAllByRole('option').length, 40);});+test('a failed "more" keeps the results already shown and offers the button again', async () => {+ const { screen, fireEvent, act, waitFor } = rtl;+ rtl.render(createElement(GlobalSearch, { onHit: () => undefined }));+ const input = screen.getByRole('textbox');+ input.focus();+ await typeAndWaitForRequest(input, 'refund');+ await act(async () => pending.get('refund')!(page(0), 40));+ fireEvent.click(await screen.findByRole('button', { name: '40 results' }));+ await waitFor(() => assert.deepEqual(offsets, ['0', '20']));+ await act(async () => failing.get('refund')!(500));++ await screen.findByText('Search failed. Try again.');+ assert.equal(screen.getAllByRole('option').length, 20, 'the first page was dropped');+ // The retry runs the same page again, and its success clears the error.+ fireEvent.click(screen.getByRole('button', { name: '40 results' }));+ await waitFor(() => assert.deepEqual(offsets, ['0', '20', '20']));+ await act(async () => pending.get('refund')!(page(20), 40));+ await waitFor(() => assert.equal(screen.getAllByRole('option').length, 40));+ assert.equal(screen.queryByText('Search failed. Try again.'), null);+});++test('a failed search shows only the error', async () => {+ const { screen, act } = rtl;+ rtl.render(createElement(GlobalSearch, { onHit: () => undefined }));+ const input = screen.getByRole('textbox');+ input.focus();+ await typeAndWaitForRequest(input, 'refund');+ await act(async () => pending.get('refund')!(page(0), 40));+ await screen.findByRole('button', { name: '40 results' });++ await typeAndWaitForRequest(input, 'refunds');+ await act(async () => failing.get('refunds')!(500));+ await screen.findByText('Search failed. Try again.');+ assert.equal(screen.queryAllByRole('option').length, 0, "the previous query's hits stayed on screen");+ assert.equal(screen.queryByRole('button', { name: '40 results' }), null);+ assert.equal(screen.queryByText('No messages found.'), null);+});+test('Tab then Enter on "more" keeps the results open and returns focus to the input', async () => {const { screen, fireEvent, act, waitFor } = rtl;rtl.render(createElement(GlobalSearch, { onHit: () => undefined }));diff --git a/dashboard/src/components/GlobalSearch.tsx b/dashboard/src/components/GlobalSearch.tsxindex dc955b979..5932d677c 100644--- a/dashboard/src/components/GlobalSearch.tsx+++ b/dashboard/src/components/GlobalSearch.tsx@@ -62,8 +62,11 @@ export function GlobalSearch({ onHit, currentSessionId }: GlobalSearchProps) {if (status === 501) setError(t('search.unavailable'));else if (status === 503) setError(t('search.error'));else setError(t('search.error'));- setHits([]);- setTotal(0);+ // A failed next page keeps the pages already shown, and "more" stays on as the retry.+ if (!append) {+ setHits([]);+ setTotal(0);+ }} finally {if (id === requestId.current) setLoading(false);}@@ -167,7 +170,6 @@ export function GlobalSearch({ onHit, currentSessionId }: GlobalSearchProps) {{!loading && error && <div className="global-search-state">{error}</div>}{!loading && !error && hits.length === 0 && <div className="global-search-state">{t('search.empty')}</div>}{!loading &&- !error &&hits.map(h => (<buttonkey={h.messageId}@@ -191,7 +193,7 @@ export function GlobalSearch({ onHit, currentSessionId }: GlobalSearchProps) {</div></button>))}- {!loading && !error && hits.length < total && (+ {!loading && hits.length < total && (// preventDefault on mousedown keeps focus in the input, so a mouse click does not start the// close timer; click still fires for the mouse and for Enter/Space.<button className="global-search-more" onMouseDown={e => e.preventDefault()} onClick={loadMore}>