Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #196 #197

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
19 changes: 8 additions & 11 deletions dist/typesense-instantsearch-adapter.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/typesense-instantsearch-adapter.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/typesense-instantsearch-adapter.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/typesense-instantsearch-adapter.min.js.map

Large diffs are not rendered by default.

16 changes: 7 additions & 9 deletions lib/SearchRequestAdapter.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/SearchRequestAdapter.js.map

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions lib/SearchResponseAdapter.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/SearchResponseAdapter.js.map

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions src/SearchRequestAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ export class SearchRequestAdapter {
});

adaptedResult = transformedTypesenseFilters.join(" && ");
// console.log(`${JSON.stringify(facetFilters)} => ${adaptedResult}`);

return adaptedResult;
}

Expand Down Expand Up @@ -350,19 +348,21 @@ export class SearchRequestAdapter {
}
}

_adaptFilters(instantsearchParams, collectionName) {
_adaptFilters(instantsearchParams, collectionName, filterBy) {
const adaptedFilters = [];

// `filters` can be used with the `Configure` widget
// However the format needs to be in the Typesense filter_by format, instead of Algolia filter format.
if (instantsearchParams.filters) {
adaptedFilters.push(instantsearchParams.filters);
}
if (filterBy) adaptedFilters.push(filterBy);
adaptedFilters.push(this._adaptFacetFilters(instantsearchParams.facetFilters, collectionName));
adaptedFilters.push(this._adaptNumericFilters(instantsearchParams.numericFilters));
adaptedFilters.push(this._adaptGeoFilter(instantsearchParams));

return adaptedFilters.filter((filter) => filter && filter !== "").join(" && ");
const res = adaptedFilters.filter((filter) => filter && filter !== "").join(" && ");
return res;
}

_adaptIndexName(indexName) {
Expand Down Expand Up @@ -415,7 +415,10 @@ export class SearchRequestAdapter {
q: params.query === "" || params.query === undefined ? "*" : params.query,
facet_by:
snakeCasedAdditionalSearchParameters.facet_by || this._adaptFacetBy(params.facets, adaptedCollectionName),
filter_by: this._adaptFilters(params, adaptedCollectionName) || snakeCasedAdditionalSearchParameters.filter_by,
filter_by:
this._adaptFilters(params, adaptedCollectionName, snakeCasedAdditionalSearchParameters.filter_by) ||
snakeCasedAdditionalSearchParameters.filter_by,

sort_by: adaptedSortBy || snakeCasedAdditionalSearchParameters.sort_by,
max_facet_values: params.maxValuesPerFacet,
page: (params.page || 0) + 1,
Expand All @@ -435,9 +438,6 @@ export class SearchRequestAdapter {
typesenseSearchParams.vector_query = params.typesenseVectorQuery;
}

// console.log(params);
// console.log(typesenseSearchParams);

// Filter out empty or null values, so we don't accidentally override values set in presets
// eslint-disable-next-line no-unused-vars
return Object.fromEntries(Object.entries(typesenseSearchParams).filter(([_, v]) => v != null && v !== ""));
Expand All @@ -451,8 +451,6 @@ export class SearchRequestAdapter {
}

async request() {
// console.log(this.instantsearchRequests);

const searches = this.instantsearchRequests.map((instantsearchRequest) =>
this._buildSearchParameters(instantsearchRequest)
);
Expand Down
1 change: 0 additions & 1 deletion src/SearchResponseAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ export class SearchResponseAdapter {
...(Object.keys(adaptedRenderingContent).length > 0 ? { renderingContent: adaptedRenderingContent } : null),
};

// console.log(adaptedResult);
return adaptedResult;
}
}
Expand Down