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

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app-search/AppSearchDriver.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export default class AppSearchDriver {
this._setState({
current,
error: "",
facets: resultList.info.facets,
facets: resultList.info.facets || {},
filters,
requestId: resultList.info.meta.request_id,
results: resultList.results,
Expand Down
41 changes: 41 additions & 0 deletions src/app-search/AppSearchDriver.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ const resultList = {
results: [{}, {}]
};

const resultListWithoutFacets = {
info: {
meta: {
page: {
total_results: 1000
},
request_id: "12345"
}
},
results: [{}, {}]
};

const params = {
engineName: "some-engine",
hostIdentifier: "host-XXXX",
Expand All @@ -31,6 +43,11 @@ beforeAll(() => {
SwiftypeAppSearch.createClient.mockReturnValue(mockClient);
});

beforeEach(() => {
mockClient.search = jest.fn().mockReturnValue({ then: cb => cb(resultList) });
mockClient.click = jest.fn().mockReturnValue({ then: () => {} });
});

it("can be initialized", () => {
const driver = new AppSearchDriver(params);
expect(driver).toBeInstanceOf(AppSearchDriver);
Expand Down Expand Up @@ -62,6 +79,30 @@ it("will use initial state if provided", () => {
});
});

it("will default facets to {} in state if facets is missing from the response", () => {
const initialState = {
searchTerm: "test"
};

mockClient.search = jest
.fn()
.mockReturnValue({ then: cb => cb(resultListWithoutFacets) });

const driver = new AppSearchDriver({
...params,
initialState
});
const stateAfterCreation = driver.getState();

expect(stateAfterCreation).toEqual({
...DEFAULT_STATE,
...initialState,
requestId: "12345",
results: [{}, {}],
totalResults: 1000
});
});

it("will trigger a search if searchTerm or filters are provided in initial state", () => {
const initialState = {
filters: [{ initial: "value" }],
Expand Down
10 changes: 5 additions & 5 deletions src/config/config-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@ export function buildSearchOptionsFromConfig() {
return acc;
}, undefined);

return {
facets,
result_fields: resultFields,
search_fields: searchFields
};
const searchOptions = {};
if (facets) searchOptions.facets = facets;
searchOptions.result_fields = resultFields;
searchOptions.search_fields = searchFields;
return searchOptions;
}

export function buildSortOptionsFromConfig() {
Expand Down