Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/search/BaseSearchSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import type {
SearchSourceState,
SearchSourceType,
} from './types';
import type { APIError } from '../errors';
import { isAPIError, isErrorRetryable } from '../errors';

export type DebounceOptions = {
debounceMs: number;
Expand Down Expand Up @@ -237,6 +239,9 @@ export abstract class BaseSearchSource<T>
stateUpdate.items = await this.filterQueryResults(items);
} catch (e) {
stateUpdate.lastQueryError = e as Error;
if (isAPIError(e as Error) && !isErrorRetryable(e as APIError)) {
stateUpdate.hasNext = false;
}
} finally {
this.state.next(this.getStateAfterQuery(stateUpdate, hasNewSearchQuery));
}
Expand Down Expand Up @@ -285,6 +290,9 @@ export abstract class BaseSearchSourceSync<T>
stateUpdate.items = this.filterQueryResults(items);
} catch (e) {
stateUpdate.lastQueryError = e as Error;
if (isAPIError(e as Error) && !isErrorRetryable(e as APIError)) {
stateUpdate.hasNext = false;
}
} finally {
this.state.next(this.getStateAfterQuery(stateUpdate, hasNewSearchQuery));
}
Expand Down
40 changes: 39 additions & 1 deletion test/unit/search/SearchController.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import {
import { generateUser } from '../test-utils/generateUser';
import { generateChannel } from '../test-utils/generateChannel';

import { describe, it, expect, beforeEach, afterEach } from 'vitest';
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
import { ErrorFromResponse } from '../../../src';
import { APIErrorCodes } from '../../../src/errors';

describe('SearchController', () => {
let searchController;
Expand Down Expand Up @@ -407,6 +409,42 @@ describe('BaseSearchSource and implementations', () => {
expect(searchSource.items).to.deep.equal(['item1']);
expect(searchSource.hasNext).to.be.false;
});

it('stores error from a failed request, keeps ability to paginate', async () => {
searchSource.pageSize = 1;
searchSource.state.partialNext({
items: [],
isActive: true,
searchQuery: 'test',
});

vi.spyOn(searchSource, 'query').mockRejectedValue(new Error('anything'));

await searchSource.executeQuery();
expect(searchSource.items).toStrictEqual([]);
expect(searchSource.hasNext).toBe(true);
});

it('terminates pagination on non-retryable error', async () => {
searchSource.pageSize = 1;
searchSource.state.partialNext({
items: [],
isActive: true,
searchQuery: 'test',
});

vi.spyOn(searchSource, 'query').mockRejectedValue(
new ErrorFromResponse('anything', {
code: APIErrorCodes[4],
response: {},
status: 400,
}),
);

await searchSource.executeQuery();
expect(searchSource.items).toStrictEqual([]);
expect(searchSource.hasNext).toBe(false);
});
});

describe('search debounce', () => {
Expand Down
Loading