@desynova-digital/components 8.13.2 → 8.13.5
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/atoms/popup/popup.js +0 -1
- package/molecules/filter/filter.js +23 -7
- package/package.json +2 -2
package/atoms/popup/popup.js
CHANGED
|
@@ -99,7 +99,7 @@ var Filter = function (_Component) {
|
|
|
99
99
|
{
|
|
100
100
|
if (groupItem.select_type === 'select') {
|
|
101
101
|
// single select
|
|
102
|
-
var selected = selectedFiltersObj[groupItem.field].value === optionItem.field;
|
|
102
|
+
var selected = selectedFiltersObj[groupItem.field] && selectedFiltersObj[groupItem.field].value === optionItem.field;
|
|
103
103
|
if (selected && groupItem.min_selection === 0) {
|
|
104
104
|
filters[groupItem.field].value = '';
|
|
105
105
|
filters.params[groupItem.field] = '';
|
|
@@ -366,6 +366,22 @@ var Filter = function (_Component) {
|
|
|
366
366
|
});
|
|
367
367
|
};
|
|
368
368
|
|
|
369
|
+
_this.getMaxDate = function (option, groupItem) {
|
|
370
|
+
var _this$state3 = _this.state,
|
|
371
|
+
selectedFiltersObj = _this$state3.selectedFiltersObj,
|
|
372
|
+
isSelectRangeSelected = _this$state3.isSelectRangeSelected;
|
|
373
|
+
|
|
374
|
+
|
|
375
|
+
var maxDate = _constants.CURRENT_DATE;
|
|
376
|
+
if (option.future_date_available) {
|
|
377
|
+
maxDate = new Date('12/31/2099').getTime() * _constants.CONVERT;
|
|
378
|
+
} else if (!isSelectRangeSelected && selectedFiltersObj[groupItem.field].value.fromDate + option.max_days * _constants.CONVERT < _constants.CURRENT_DATE) {
|
|
379
|
+
maxDate = selectedFiltersObj[groupItem.field].value.fromDate + option.max_days * _constants.CONVERT;
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
return maxDate;
|
|
383
|
+
};
|
|
384
|
+
|
|
369
385
|
_this.render = function () {
|
|
370
386
|
var _this$props2 = _this.props,
|
|
371
387
|
filtersStructure = _this$props2.filtersStructure,
|
|
@@ -373,11 +389,11 @@ var Filter = function (_Component) {
|
|
|
373
389
|
filterMessage = _this$props2.filterMessage,
|
|
374
390
|
width = _this$props2.width,
|
|
375
391
|
userIdsList = _this$props2.userIdsList;
|
|
376
|
-
var _this$
|
|
377
|
-
isMenuOpen = _this$
|
|
378
|
-
selectedFiltersObj = _this$
|
|
379
|
-
isSelectRangeSelected = _this$
|
|
380
|
-
showDropDownOptions = _this$
|
|
392
|
+
var _this$state4 = _this.state,
|
|
393
|
+
isMenuOpen = _this$state4.isMenuOpen,
|
|
394
|
+
selectedFiltersObj = _this$state4.selectedFiltersObj,
|
|
395
|
+
isSelectRangeSelected = _this$state4.isSelectRangeSelected,
|
|
396
|
+
showDropDownOptions = _this$state4.showDropDownOptions;
|
|
381
397
|
|
|
382
398
|
return _react2.default.createElement(
|
|
383
399
|
_react.Fragment,
|
|
@@ -568,7 +584,7 @@ var Filter = function (_Component) {
|
|
|
568
584
|
labelAsText: true,
|
|
569
585
|
rangePicker: true,
|
|
570
586
|
minDate: isSelectRangeSelected ? null : selectedFiltersObj[groupItem.field].value.fromDate - option.max_days * _constants.CONVERT,
|
|
571
|
-
maxDate:
|
|
587
|
+
maxDate: _this.getMaxDate(option, groupItem),
|
|
572
588
|
datepickerStep: 2,
|
|
573
589
|
selected:
|
|
574
590
|
// previousSelectedFilters && previousSelectedFilters[groupItem.field].value.key !='date_range' ? []:(
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@desynova-digital/components",
|
|
3
|
-
"version": "8.13.
|
|
3
|
+
"version": "8.13.5",
|
|
4
4
|
"description": "Components for Desynova Digital",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"author": "desynova-digital",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"repository": "desynova-digital",
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@desynova-digital/tokens": "8.13.
|
|
10
|
+
"@desynova-digital/tokens": "8.13.5",
|
|
11
11
|
"prop-types": "^15.7.2",
|
|
12
12
|
"styled-components": "^4.3.2"
|
|
13
13
|
},
|