@bento-core/facet-filter 1.0.1-ccdiintegrated.2 → 1.0.1-ccdiintegrated.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/NewFacetFilterView.js +3 -6
- package/dist/components/facet/NewFacetView.js +4 -7
- package/dist/components/facet/NewSearchFacetView.js +2 -3
- package/dist/components/inputs/FilterItems.js +35 -27
- package/dist/components/inputs/SearchFilterItems.js +1 -1
- package/dist/components/inputs/checkbox/CheckboxView.js +2 -3
- package/dist/components/inputs/slider/SliderView.js +6 -7
- package/package.json +1 -1
- package/src/NewFacetFilterView.js +0 -3
- package/src/components/facet/NewFacetView.js +1 -4
- package/src/components/facet/NewSearchFacetView.js +1 -2
- package/src/components/inputs/FilterItems.js +44 -28
- package/src/components/inputs/SearchFilterItems.js +5 -3
- package/src/components/inputs/checkbox/CheckboxView.js +1 -2
- package/src/components/inputs/slider/SliderView.js +5 -6
|
@@ -19,8 +19,7 @@ const BentoFacetFilter = _ref => {
|
|
|
19
19
|
facetSection,
|
|
20
20
|
CustomFacetSection,
|
|
21
21
|
CustomFacetView,
|
|
22
|
-
queryParams
|
|
23
|
-
basePath
|
|
22
|
+
queryParams
|
|
24
23
|
} = _ref;
|
|
25
24
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, CustomFacetSection && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(CustomFacetSection, {
|
|
26
25
|
section: facetSection,
|
|
@@ -30,15 +29,13 @@ const BentoFacetFilter = _ref => {
|
|
|
30
29
|
return /*#__PURE__*/_react.default.createElement(_ReduxNewSearchFacetView.default, {
|
|
31
30
|
facet: facet,
|
|
32
31
|
queryParams: queryParams,
|
|
33
|
-
CustomView: CustomFacetView
|
|
34
|
-
basePath: basePath
|
|
32
|
+
CustomView: CustomFacetView
|
|
35
33
|
});
|
|
36
34
|
}
|
|
37
35
|
return /*#__PURE__*/_react.default.createElement(_ReduxNewFacetView.default, {
|
|
38
36
|
facet: facet,
|
|
39
37
|
queryParams: queryParams,
|
|
40
|
-
CustomView: CustomFacetView
|
|
41
|
-
basePath: basePath
|
|
38
|
+
CustomView: CustomFacetView
|
|
42
39
|
}, /*#__PURE__*/_react.default.createElement(_core.List, {
|
|
43
40
|
className: "List_".concat(facet.label)
|
|
44
41
|
}, /*#__PURE__*/_react.default.createElement(_FilterItems.default, {
|
|
@@ -38,8 +38,7 @@ const NewFacetView = _ref => {
|
|
|
38
38
|
onTimeUnitChange,
|
|
39
39
|
unknownAgesState,
|
|
40
40
|
expandState,
|
|
41
|
-
onToggleFacetExpand
|
|
42
|
-
basePath
|
|
41
|
+
onToggleFacetExpand
|
|
43
42
|
} = _ref;
|
|
44
43
|
const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false;
|
|
45
44
|
const isUserInitiated = (0, _react.useRef)(false);
|
|
@@ -94,7 +93,7 @@ const NewFacetView = _ref => {
|
|
|
94
93
|
paramValue[unknownAgesField] = '';
|
|
95
94
|
}
|
|
96
95
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
97
|
-
navigate("".concat(
|
|
96
|
+
navigate("/exploreParticipants".concat(queryStr), {
|
|
98
97
|
replace: true
|
|
99
98
|
});
|
|
100
99
|
setSortBy(null);
|
|
@@ -204,14 +203,12 @@ const NewFacetView = _ref => {
|
|
|
204
203
|
facet: facet,
|
|
205
204
|
queryParams: queryParams,
|
|
206
205
|
sortBy: sortBy,
|
|
207
|
-
timeUnit: timeUnit
|
|
208
|
-
basePath: basePath
|
|
206
|
+
timeUnit: timeUnit
|
|
209
207
|
})), !expand && type === _Types.InputTypes.CHECKBOX && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.List, {
|
|
210
208
|
id: "filter_Items"
|
|
211
209
|
}, /*#__PURE__*/_react.default.createElement(_FilterItems.default, {
|
|
212
210
|
facet: displayFacet,
|
|
213
|
-
queryParams: queryParams
|
|
214
|
-
basePath: basePath
|
|
211
|
+
queryParams: queryParams
|
|
215
212
|
}))), !expand && selectedItems.length > limitCheckBoxCount && /*#__PURE__*/_react.default.createElement("div", {
|
|
216
213
|
className: classes.showMore,
|
|
217
214
|
onClick: onExpandFacet
|
|
@@ -60,8 +60,7 @@ const SearchFacetView = _ref => {
|
|
|
60
60
|
queryParams,
|
|
61
61
|
unknownAgesState,
|
|
62
62
|
expandState,
|
|
63
|
-
onToggleFacetExpand
|
|
64
|
-
basePath
|
|
63
|
+
onToggleFacetExpand
|
|
65
64
|
} = _ref;
|
|
66
65
|
const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false;
|
|
67
66
|
const isUserInitiated = (0, _react.useRef)(false);
|
|
@@ -94,7 +93,7 @@ const SearchFacetView = _ref => {
|
|
|
94
93
|
paramValue[unknownAgesField] = '';
|
|
95
94
|
}
|
|
96
95
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
97
|
-
navigate("".concat(
|
|
96
|
+
navigate("/exploreParticipants".concat(queryStr), {
|
|
98
97
|
replace: true
|
|
99
98
|
});
|
|
100
99
|
onSortChange(facet.datafield, null);
|
|
@@ -5,10 +5,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
var _react = _interopRequireDefault(require("react"));
|
|
8
|
+
var _core = require("@material-ui/core");
|
|
8
9
|
var _ReduxCheckbox = _interopRequireDefault(require("./checkbox/ReduxCheckbox"));
|
|
9
10
|
var _ReduxSlider = _interopRequireDefault(require("./slider/ReduxSlider"));
|
|
10
11
|
var _Types = require("./Types");
|
|
11
12
|
var _Sort = require("../../utils/Sort");
|
|
13
|
+
var _FilterItemStyle = _interopRequireDefault(require("./FilterItemStyle"));
|
|
12
14
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
13
15
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
14
16
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
@@ -21,7 +23,7 @@ const FilterItems = _ref => {
|
|
|
21
23
|
queryParams,
|
|
22
24
|
sortBy,
|
|
23
25
|
timeUnit,
|
|
24
|
-
|
|
26
|
+
classes
|
|
25
27
|
} = _ref;
|
|
26
28
|
const {
|
|
27
29
|
type,
|
|
@@ -31,31 +33,37 @@ const FilterItems = _ref => {
|
|
|
31
33
|
const sortFilters = (0, _Sort.sortBySection)(_objectSpread(_objectSpread({}, facet), {}, {
|
|
32
34
|
sortBy
|
|
33
35
|
}));
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
36
|
+
if (type === _Types.InputTypes.SLIDER) {
|
|
37
|
+
return /*#__PURE__*/_react.default.createElement(_ReduxSlider.default, {
|
|
38
|
+
facet: facet,
|
|
39
|
+
queryParams: queryParams,
|
|
40
|
+
timeUnit: timeUnit
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
if (type !== _Types.InputTypes.CHECKBOX) {
|
|
44
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
|
|
45
|
+
}
|
|
46
|
+
const checkedItems = sortFilters.filter(item => item.isChecked).map((item, index) => /*#__PURE__*/_react.default.createElement(_ReduxCheckbox.default, {
|
|
47
|
+
checkboxItem: _objectSpread(_objectSpread({}, item), {}, {
|
|
48
|
+
index,
|
|
49
|
+
section
|
|
50
|
+
}),
|
|
51
|
+
datafield: datafield,
|
|
52
|
+
facet: facet,
|
|
53
|
+
queryParams: queryParams
|
|
54
|
+
}));
|
|
55
|
+
const uncheckedItems = sortFilters.filter(item => !item.isChecked).map((item, index) => /*#__PURE__*/_react.default.createElement(_ReduxCheckbox.default, {
|
|
56
|
+
checkboxItem: _objectSpread(_objectSpread({}, item), {}, {
|
|
57
|
+
index,
|
|
58
|
+
section
|
|
59
|
+
}),
|
|
60
|
+
datafield: datafield,
|
|
61
|
+
facet: facet,
|
|
62
|
+
queryParams: queryParams
|
|
63
|
+
}));
|
|
64
|
+
return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", null, checkedItems), uncheckedItems.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
|
|
65
|
+
className: classes.itemsContainer
|
|
66
|
+
}, uncheckedItems));
|
|
59
67
|
};
|
|
60
|
-
var _default = FilterItems;
|
|
68
|
+
var _default = (0, _core.withStyles)(_FilterItemStyle.default)(FilterItems);
|
|
61
69
|
exports.default = _default;
|
|
@@ -90,7 +90,7 @@ const SearchFilterItems = _ref => {
|
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
92
|
};
|
|
93
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", null, checkedItems), /*#__PURE__*/_react.default.createElement("div", {
|
|
93
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", null, checkedItems), uncheckedItems.length > 0 && /*#__PURE__*/_react.default.createElement("div", {
|
|
94
94
|
ref: scrollableRef,
|
|
95
95
|
className: classes.itemsContainer,
|
|
96
96
|
onScroll: handleScroll
|
|
@@ -24,8 +24,7 @@ const CheckBoxView = _ref => {
|
|
|
24
24
|
datafield,
|
|
25
25
|
onToggle,
|
|
26
26
|
facet,
|
|
27
|
-
queryParams
|
|
28
|
-
basePath
|
|
27
|
+
queryParams
|
|
29
28
|
} = _ref;
|
|
30
29
|
const {
|
|
31
30
|
name,
|
|
@@ -72,7 +71,7 @@ const CheckBoxView = _ref => {
|
|
|
72
71
|
paramValue[datafield] = '';
|
|
73
72
|
}
|
|
74
73
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
75
|
-
navigate("".concat(
|
|
74
|
+
navigate("/exploreParticipants".concat(queryStr));
|
|
76
75
|
onToggle(toggleCheckBoxItem);
|
|
77
76
|
};
|
|
78
77
|
const LabelComponent = () => /*#__PURE__*/_react.default.createElement(_core.Box, {
|
|
@@ -28,8 +28,7 @@ const SliderView = _ref => {
|
|
|
28
28
|
queryParams,
|
|
29
29
|
timeUnit = 'days',
|
|
30
30
|
unknownAgesState,
|
|
31
|
-
onUnknownAgesChange
|
|
32
|
-
basePath
|
|
31
|
+
onUnknownAgesChange
|
|
33
32
|
} = _ref;
|
|
34
33
|
const {
|
|
35
34
|
minLowerBound,
|
|
@@ -103,7 +102,7 @@ const SliderView = _ref => {
|
|
|
103
102
|
const paramValue = {};
|
|
104
103
|
paramValue[datafield] = daysValue;
|
|
105
104
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
106
|
-
navigate("".concat(
|
|
105
|
+
navigate("/exploreParticipants".concat(queryStr));
|
|
107
106
|
onSliderToggle(_objectSpread({
|
|
108
107
|
sliderValue: daysValue
|
|
109
108
|
}, facet));
|
|
@@ -139,7 +138,7 @@ const SliderView = _ref => {
|
|
|
139
138
|
paramValue[datafield] = ''; // Clear the age range filter
|
|
140
139
|
paramValue["".concat(datafield, "_unknownAges")] = 'only'; // Set the unknownAges parameter to only
|
|
141
140
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
142
|
-
navigate("".concat(
|
|
141
|
+
navigate("/exploreParticipants".concat(queryStr));
|
|
143
142
|
|
|
144
143
|
// Keep the current slider values for display (don't reset to defaults)
|
|
145
144
|
// The slider will be disabled but show the user's previous selection
|
|
@@ -160,7 +159,7 @@ const SliderView = _ref => {
|
|
|
160
159
|
paramValue[datafield] = ''; // Clear the age range filter
|
|
161
160
|
paramValue["".concat(datafield, "_unknownAges")] = ''; // Clear the unknownAges parameter
|
|
162
161
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
163
|
-
navigate("".concat(
|
|
162
|
+
navigate("/exploreParticipants".concat(queryStr));
|
|
164
163
|
|
|
165
164
|
// Clear the slider state in the parent component
|
|
166
165
|
onSliderToggle(_objectSpread({
|
|
@@ -172,7 +171,7 @@ const SliderView = _ref => {
|
|
|
172
171
|
paramValue[datafield] = currentSliderValues;
|
|
173
172
|
paramValue["".concat(datafield, "_unknownAges")] = ''; // Clear the unknownAges parameter since "include" is default
|
|
174
173
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
175
|
-
navigate("".concat(
|
|
174
|
+
navigate("/exploreParticipants".concat(queryStr));
|
|
176
175
|
|
|
177
176
|
// Restore the slider state in the parent component
|
|
178
177
|
onSliderToggle(_objectSpread({
|
|
@@ -186,7 +185,7 @@ const SliderView = _ref => {
|
|
|
186
185
|
paramValue[datafield] = currentSliderValues;
|
|
187
186
|
paramValue["".concat(datafield, "_unknownAges")] = 'exclude'; // Set the unknownAges parameter to exclude
|
|
188
187
|
const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
|
|
189
|
-
navigate("".concat(
|
|
188
|
+
navigate("/exploreParticipants".concat(queryStr));
|
|
190
189
|
|
|
191
190
|
// Restore the slider state in the parent component
|
|
192
191
|
onSliderToggle(_objectSpread({
|
package/package.json
CHANGED
|
@@ -15,7 +15,6 @@ const BentoFacetFilter = ({
|
|
|
15
15
|
CustomFacetSection,
|
|
16
16
|
CustomFacetView,
|
|
17
17
|
queryParams,
|
|
18
|
-
basePath,
|
|
19
18
|
}) => {
|
|
20
19
|
return (
|
|
21
20
|
<>
|
|
@@ -31,7 +30,6 @@ const BentoFacetFilter = ({
|
|
|
31
30
|
facet={facet}
|
|
32
31
|
queryParams={queryParams}
|
|
33
32
|
CustomView={CustomFacetView}
|
|
34
|
-
basePath={basePath}
|
|
35
33
|
/>
|
|
36
34
|
);
|
|
37
35
|
}
|
|
@@ -40,7 +38,6 @@ const BentoFacetFilter = ({
|
|
|
40
38
|
facet={facet}
|
|
41
39
|
queryParams={queryParams}
|
|
42
40
|
CustomView={CustomFacetView}
|
|
43
|
-
basePath={basePath}
|
|
44
41
|
>
|
|
45
42
|
<List className={`List_${facet.label}`}>
|
|
46
43
|
<FilterItems
|
|
@@ -33,7 +33,6 @@ const NewFacetView = ({
|
|
|
33
33
|
unknownAgesState,
|
|
34
34
|
expandState,
|
|
35
35
|
onToggleFacetExpand,
|
|
36
|
-
basePath,
|
|
37
36
|
}) => {
|
|
38
37
|
const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : (facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false);
|
|
39
38
|
|
|
@@ -95,7 +94,7 @@ const NewFacetView = ({
|
|
|
95
94
|
}
|
|
96
95
|
|
|
97
96
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
98
|
-
navigate(
|
|
97
|
+
navigate(`/exploreParticipants${queryStr}`, { replace: true });
|
|
99
98
|
setSortBy(null);
|
|
100
99
|
|
|
101
100
|
// Reset the corresponding unknownAges parameter in Redux state
|
|
@@ -259,7 +258,6 @@ const NewFacetView = ({
|
|
|
259
258
|
queryParams={queryParams}
|
|
260
259
|
sortBy={sortBy}
|
|
261
260
|
timeUnit={timeUnit}
|
|
262
|
-
basePath={basePath}
|
|
263
261
|
/>
|
|
264
262
|
</Accordion>
|
|
265
263
|
{
|
|
@@ -269,7 +267,6 @@ const NewFacetView = ({
|
|
|
269
267
|
<FilterItems
|
|
270
268
|
facet={displayFacet}
|
|
271
269
|
queryParams={queryParams}
|
|
272
|
-
basePath={basePath}
|
|
273
270
|
/>
|
|
274
271
|
</List>
|
|
275
272
|
</>
|
|
@@ -58,7 +58,6 @@ const SearchFacetView = ({
|
|
|
58
58
|
unknownAgesState,
|
|
59
59
|
expandState,
|
|
60
60
|
onToggleFacetExpand,
|
|
61
|
-
basePath,
|
|
62
61
|
}) => {
|
|
63
62
|
const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : (facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false);
|
|
64
63
|
|
|
@@ -97,7 +96,7 @@ const SearchFacetView = ({
|
|
|
97
96
|
}
|
|
98
97
|
|
|
99
98
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
100
|
-
navigate(
|
|
99
|
+
navigate(`/exploreParticipants${queryStr}`, { replace: true });
|
|
101
100
|
onSortChange(facet.datafield, null);
|
|
102
101
|
|
|
103
102
|
// Reset the corresponding unknownAges parameter in Redux state
|
|
@@ -1,51 +1,67 @@
|
|
|
1
1
|
/* eslint-disable react/jsx-wrap-multilines */
|
|
2
2
|
/* eslint-disable react/jsx-indent */
|
|
3
3
|
import React from 'react';
|
|
4
|
+
import { withStyles } from '@material-ui/core';
|
|
4
5
|
import ReduxCheckbox from './checkbox/ReduxCheckbox';
|
|
5
6
|
import ReduxSlider from './slider/ReduxSlider';
|
|
6
7
|
import { InputTypes } from './Types';
|
|
7
8
|
import { sortBySection } from '../../utils/Sort';
|
|
9
|
+
import styles from './FilterItemStyle';
|
|
8
10
|
|
|
9
11
|
const FilterItems = ({
|
|
10
12
|
facet,
|
|
11
13
|
queryParams,
|
|
12
14
|
sortBy,
|
|
13
15
|
timeUnit,
|
|
14
|
-
|
|
16
|
+
classes,
|
|
15
17
|
}) => {
|
|
16
18
|
const {
|
|
17
19
|
type, datafield, section,
|
|
18
20
|
} = facet;
|
|
19
21
|
const sortFilters = sortBySection({ ...facet, sortBy });
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
22
|
+
|
|
23
|
+
if (type === InputTypes.SLIDER) {
|
|
24
|
+
return (
|
|
25
|
+
<ReduxSlider facet={facet} queryParams={queryParams} timeUnit={timeUnit} />
|
|
26
|
+
);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
if (type !== InputTypes.CHECKBOX) {
|
|
30
|
+
return (<></>);
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
const checkedItems = sortFilters.filter((item) => item.isChecked)
|
|
34
|
+
.map((item, index) => (
|
|
35
|
+
<ReduxCheckbox
|
|
36
|
+
checkboxItem={{ ...item, index, section }}
|
|
37
|
+
datafield={datafield}
|
|
38
|
+
facet={facet}
|
|
39
|
+
queryParams={queryParams}
|
|
40
|
+
/>
|
|
41
|
+
));
|
|
42
|
+
|
|
43
|
+
const uncheckedItems = sortFilters.filter((item) => !item.isChecked)
|
|
44
|
+
.map((item, index) => (
|
|
45
|
+
<ReduxCheckbox
|
|
46
|
+
checkboxItem={{ ...item, index, section }}
|
|
47
|
+
datafield={datafield}
|
|
48
|
+
facet={facet}
|
|
49
|
+
queryParams={queryParams}
|
|
50
|
+
/>
|
|
51
|
+
));
|
|
43
52
|
|
|
44
53
|
return (
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
54
|
+
<div>
|
|
55
|
+
<div>
|
|
56
|
+
{checkedItems}
|
|
57
|
+
</div>
|
|
58
|
+
{uncheckedItems.length > 0 && (
|
|
59
|
+
<div className={classes.itemsContainer}>
|
|
60
|
+
{uncheckedItems}
|
|
61
|
+
</div>
|
|
62
|
+
)}
|
|
63
|
+
</div>
|
|
48
64
|
);
|
|
49
65
|
};
|
|
50
66
|
|
|
51
|
-
export default FilterItems;
|
|
67
|
+
export default withStyles(styles)(FilterItems);
|
|
@@ -83,9 +83,11 @@ const SearchFilterItems = ({
|
|
|
83
83
|
<div>
|
|
84
84
|
{checkedItems}
|
|
85
85
|
</div>
|
|
86
|
-
|
|
87
|
-
{
|
|
88
|
-
|
|
86
|
+
{uncheckedItems.length > 0 && (
|
|
87
|
+
<div ref={scrollableRef} className={classes.itemsContainer} onScroll={handleScroll}>
|
|
88
|
+
{uncheckedItems}
|
|
89
|
+
</div>
|
|
90
|
+
)}
|
|
89
91
|
</div>
|
|
90
92
|
</>
|
|
91
93
|
);
|
|
@@ -39,7 +39,6 @@ const CheckBoxView = ({
|
|
|
39
39
|
onToggle,
|
|
40
40
|
facet,
|
|
41
41
|
queryParams,
|
|
42
|
-
basePath,
|
|
43
42
|
}) => {
|
|
44
43
|
const {
|
|
45
44
|
name,
|
|
@@ -84,7 +83,7 @@ const CheckBoxView = ({
|
|
|
84
83
|
paramValue[datafield] = '';
|
|
85
84
|
}
|
|
86
85
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
87
|
-
navigate(
|
|
86
|
+
navigate(`/exploreParticipants${queryStr}`);
|
|
88
87
|
onToggle(toggleCheckBoxItem);
|
|
89
88
|
};
|
|
90
89
|
|
|
@@ -31,7 +31,6 @@ const SliderView = ({
|
|
|
31
31
|
timeUnit = 'days',
|
|
32
32
|
unknownAgesState,
|
|
33
33
|
onUnknownAgesChange,
|
|
34
|
-
basePath,
|
|
35
34
|
}) => {
|
|
36
35
|
const { minLowerBound, maxUpperBound, quantifier, datafield, facetValues } = facet;
|
|
37
36
|
const lowerBoundValue = facetValues[0];
|
|
@@ -107,7 +106,7 @@ const SliderView = ({
|
|
|
107
106
|
const paramValue = {};
|
|
108
107
|
paramValue[datafield] = daysValue;
|
|
109
108
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
110
|
-
navigate(
|
|
109
|
+
navigate(`/exploreParticipants${queryStr}`);
|
|
111
110
|
onSliderToggle({ sliderValue: daysValue, ...facet });
|
|
112
111
|
}
|
|
113
112
|
};
|
|
@@ -150,7 +149,7 @@ const SliderView = ({
|
|
|
150
149
|
paramValue[datafield] = ''; // Clear the age range filter
|
|
151
150
|
paramValue[`${datafield}_unknownAges`] = 'only'; // Set the unknownAges parameter to only
|
|
152
151
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
153
|
-
navigate(
|
|
152
|
+
navigate(`/exploreParticipants${queryStr}`);
|
|
154
153
|
|
|
155
154
|
// Keep the current slider values for display (don't reset to defaults)
|
|
156
155
|
// The slider will be disabled but show the user's previous selection
|
|
@@ -171,7 +170,7 @@ const SliderView = ({
|
|
|
171
170
|
paramValue[datafield] = ''; // Clear the age range filter
|
|
172
171
|
paramValue[`${datafield}_unknownAges`] = ''; // Clear the unknownAges parameter
|
|
173
172
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
174
|
-
navigate(
|
|
173
|
+
navigate(`/exploreParticipants${queryStr}`);
|
|
175
174
|
|
|
176
175
|
// Clear the slider state in the parent component
|
|
177
176
|
onSliderToggle({ sliderValue: [], ...facet });
|
|
@@ -181,7 +180,7 @@ const SliderView = ({
|
|
|
181
180
|
paramValue[datafield] = currentSliderValues;
|
|
182
181
|
paramValue[`${datafield}_unknownAges`] = ''; // Clear the unknownAges parameter since "include" is default
|
|
183
182
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
184
|
-
navigate(
|
|
183
|
+
navigate(`/exploreParticipants${queryStr}`);
|
|
185
184
|
|
|
186
185
|
// Restore the slider state in the parent component
|
|
187
186
|
onSliderToggle({ sliderValue: currentSliderValues, ...facet });
|
|
@@ -193,7 +192,7 @@ const SliderView = ({
|
|
|
193
192
|
paramValue[datafield] = currentSliderValues;
|
|
194
193
|
paramValue[`${datafield}_unknownAges`] = 'exclude'; // Set the unknownAges parameter to exclude
|
|
195
194
|
const queryStr = generateQueryStr(query, queryParams, paramValue);
|
|
196
|
-
navigate(
|
|
195
|
+
navigate(`/exploreParticipants${queryStr}`);
|
|
197
196
|
|
|
198
197
|
// Restore the slider state in the parent component
|
|
199
198
|
onSliderToggle({ sliderValue: currentSliderValues, ...facet });
|