Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8623d6e
feat(infinite-hits): implement `transformItems`
francoischalifour Jul 20, 2018
56da733
feat(hits): implement `transformItems`
francoischalifour Jul 20, 2018
85033ec
feat(breadcrumb): implement `transformItems`
francoischalifour Jul 20, 2018
f5aec2e
feat(hierarchical-menu): implement `transformItems`
francoischalifour Jul 20, 2018
e9b2d4c
feat(menu): implement `transformItems`
francoischalifour Jul 20, 2018
e55dba2
feat(menu-select): implement `transformItems`
francoischalifour Jul 20, 2018
1818edb
feat(refinement-list): implement `transformItems`
francoischalifour Jul 23, 2018
526d308
feat(geo-search): implement `transformItems`
francoischalifour Jul 23, 2018
c898c4a
feat(sort-by): implement `transformItems`
francoischalifour Jul 23, 2018
ee19dd7
feat(hits-per-page): implement `transformItems`
francoischalifour Jul 23, 2018
93e7af4
feat(current-refined-values): implement `transformItems`
francoischalifour Jul 23, 2018
b0f8611
feat(numeric-refinement-list): implement `transformItems`
francoischalifour Jul 23, 2018
63840dc
feat(numeric-selector): implement `transformItems`
francoischalifour Jul 23, 2018
01e3bb4
refactor(hits): use default identity function for `transformItems`
francoischalifour Jul 27, 2018
ca82ede
refactor(infinite-hits): use default identity function for `transform…
francoischalifour Jul 27, 2018
547f028
test(hits-per-page): migrate to Jest
francoischalifour Jul 30, 2018
b23df37
test(menu): migrate to Jest
francoischalifour Jul 30, 2018
7ffc09b
test(numeric-refinement-list): migrate to Jest
francoischalifour Jul 30, 2018
d74fe50
test(sort-by-selector): migrate to Jest
francoischalifour Jul 30, 2018
9dd9064
test(infinite-hits): migrate to Jest
francoischalifour Jul 30, 2018
54b30cf
test(refinement-list): migrate to Jest
francoischalifour Jul 30, 2018
80ad6e5
test(hits): migrate to Jest
francoischalifour Jul 30, 2018
a8e58b3
test(hierarchical-menu): migrate to Jest
francoischalifour Jul 30, 2018
dcaf3ca
test(current-refined-values): migrate to Jest and remove Lodash imports
francoischalifour Jul 30, 2018
4be30e9
Merge branch 'develop' into feat/transform-items
bobylito Jul 30, 2018
7c10a17
test(refinement-list): update snapshots
francoischalifour Jul 30, 2018
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
Prev Previous commit
Next Next commit
feat(sort-by): implement transformItems
  • Loading branch information
francoischalifour committed Jul 25, 2018
commit c898c4a1321c720504490e5340a42f5947630b42
51 changes: 36 additions & 15 deletions dev/app/builtin/stories/sort-by-selector.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,40 @@ import { wrapWithHits } from '../../utils/wrap-with-hits.js';
const stories = storiesOf('SortBySelector');

export default () => {
stories.add(
'default',
wrapWithHits(container => {
window.search.addWidget(
instantsearch.widgets.sortBySelector({
container,
indices: [
{ name: 'instant_search', label: 'Most relevant' },
{ name: 'instant_search_price_asc', label: 'Lowest price' },
{ name: 'instant_search_price_desc', label: 'Highest price' },
],
})
);
})
);
stories
.add(
'default',
wrapWithHits(container => {
window.search.addWidget(
instantsearch.widgets.sortBySelector({
container,
indices: [
{ name: 'instant_search', label: 'Most relevant' },
{ name: 'instant_search_price_asc', label: 'Lowest price' },
{ name: 'instant_search_price_desc', label: 'Highest price' },
],
})
);
})
)
.add(
'with transformed items',
wrapWithHits(container => {
window.search.addWidget(
instantsearch.widgets.sortBySelector({
container,
indices: [
{ name: 'instant_search', label: 'Most relevant' },
{ name: 'instant_search_price_asc', label: 'Lowest price' },
{ name: 'instant_search_price_desc', label: 'Highest price' },
],
transformItems: items =>
items.map(item => ({
...item,
label: `${item.label} (transformed)`,
})),
})
);
})
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,51 @@ describe('connectSortBySelector', () => {
}
});

it('Renders with transformed items', () => {
const rendering = sinon.stub();
const makeWidget = connectSortBySelector(rendering);
const instantSearchInstance = instantSearch({
indexName: 'defaultIndex',
searchClient: { search() {} },
});

const indices = [
{ label: 'Sort products by relevance', name: 'relevance' },
{ label: 'Sort products by price', name: 'priceASC' },
];
const widget = makeWidget({
indices,
transformItems: items =>
items.map(item => ({ ...item, label: 'transformed' })),
});

const helper = jsHelper({}, indices[0].name);
helper.search = sinon.stub();

widget.init({
helper,
state: helper.state,
instantSearchInstance,
});

expect(rendering.lastCall.args[0].options).toEqual([
{ label: 'transformed', value: 'relevance' },
{ label: 'transformed', value: 'priceASC' },
]);

widget.render({
results: new SearchResults(helper.state, [{}]),
helper,
state: helper.state,
instantSearchInstance,
});

expect(rendering.lastCall.args[0].options).toEqual([
{ label: 'transformed', value: 'relevance' },
{ label: 'transformed', value: 'priceASC' },
]);
});

it('Provides a function to update the index at each step', () => {
const rendering = sinon.stub();
const makeWidget = connectSortBySelector(rendering);
Expand Down
12 changes: 8 additions & 4 deletions src/connectors/sort-by-selector/connectSortBySelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ var customSortBySelector = connectSortBySelector(function render(params, isFirst
// }
});
search.addWidget(
customSortBySelector({ indices })
customSortBySelector({
indices,
[ transformItems ]
})
);
Full documentation available at https://community.algolia.com/instantsearch.js/v2/connectors/connectSortBySelector.html
`;
Expand All @@ -27,6 +30,7 @@ Full documentation available at https://community.algolia.com/instantsearch.js/v
/**
* @typedef {Object} CustomSortBySelectorWidgetOptions
* @property {SortBySelectorIndices[]} indices Array of objects defining the different indices to choose from.
* @property {function(object[]):object[]} [transformItems] Function to transform the items passed to the templates.
*/

/**
Expand Down Expand Up @@ -98,7 +102,7 @@ export default function connectSortBySelector(renderFn, unmountFn) {
checkRendering(renderFn, usage);

return (widgetParams = {}) => {
const { indices } = widgetParams;
const { indices, transformItems = items => items } = widgetParams;

if (!indices) {
throw new Error(usage);
Expand Down Expand Up @@ -129,7 +133,7 @@ export default function connectSortBySelector(renderFn, unmountFn) {
renderFn(
{
currentRefinement: currentIndex,
options: selectorOptions,
options: transformItems(selectorOptions),
refine: this.setIndex,
hasNoResults: true,
widgetParams,
Expand All @@ -143,7 +147,7 @@ export default function connectSortBySelector(renderFn, unmountFn) {
renderFn(
{
currentRefinement: helper.getIndex(),
options: selectorOptions,
options: transformItems(selectorOptions),
refine: this.setIndex,
hasNoResults: results.nbHits === 0,
widgetParams,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,32 @@ exports[`sortBySelector() calls twice ReactDOM.render(<Selector props />, contai
shouldAutoHideContainer={false}
/>
`;

exports[`sortBySelector() renders transformed items 1`] = `
<HeaderFooter-AutoHide
cssClasses={
Object {
"item": "ais-sort-by-selector--item",
"root": "ais-sort-by-selector",
"select": "ais-sort-by-selector",
}
}
currentValue="index-a"
options={
Array [
Object {
"label": "Index A",
"transformed": true,
"value": "index-a",
},
Object {
"label": "Index B",
"transformed": true,
"value": "index-b",
},
]
}
setValue={[Function]}
shouldAutoHideContainer={false}
/>
`;
14 changes: 14 additions & 0 deletions src/widgets/sort-by-selector/__tests__/sort-by-selector-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@ describe('sortBySelector()', () => {
expect(ReactDOM.render.secondCall.args[1]).toEqual(container);
});

it('renders transformed items', () => {
widget = sortBySelector({
container,
indices,
transformItems: items =>
items.map(item => ({ ...item, transformed: true })),
});

widget.init({ helper, instantSearchInstance: {} });
widget.render({ helper, results });

expect(ReactDOM.render.firstCall.args[0]).toMatchSnapshot();
});

it('sets the underlying index', () => {
widget.setIndex('index-b');
expect(helper.setIndex.calledOnce).toBe(true, 'setIndex called once');
Expand Down
7 changes: 5 additions & 2 deletions src/widgets/sort-by-selector/sort-by-selector.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ sortBySelector({
container,
indices,
[cssClasses.{root,select,item}={}],
[autoHideContainer=false]
[autoHideContainer=false],
[transformItems]
})`;

/**
Expand All @@ -54,6 +55,7 @@ sortBySelector({
* @property {SortByIndexDefinition[]} indices Array of objects defining the different indices to choose from.
* @property {boolean} [autoHideContainer=false] Hide the container when no results match.
* @property {SortByWidgetCssClasses} [cssClasses] CSS classes to be added.
* @property {function(object[]):object[]} [transformItems] Function to transform the items passed to the templates.
*/

/**
Expand Down Expand Up @@ -83,6 +85,7 @@ export default function sortBySelector({
indices,
cssClasses: userCssClasses = {},
autoHideContainer = false,
transformItems,
} = {}) {
if (!container) {
throw new Error(usage);
Expand All @@ -108,7 +111,7 @@ export default function sortBySelector({
const makeWidget = connectSortBySelector(specializedRenderer, () =>
unmountComponentAtNode(containerNode)
);
return makeWidget({ indices });
return makeWidget({ indices, transformItems });
} catch (e) {
throw new Error(usage);
}
Expand Down