Merge pull request #102 from jobready/NEP-10976

Fix "Older than" relative date inputs
rdytech · Apr 8, 2021 · ef2b258 · ef2b258
2 parents 402b3ae + 47b5975
commit ef2b258
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/dist/react-filterbar.js b/dist/react-filterbar.js
@@ -17483,23 +17483,23 @@ function relativeOptions() {
     },
     'Older than 7 days': {
       from: null,
-      to: moment().subtract(7, 'day')
+      to: moment().subtract(8, 'day')
     },
     'Older than 14 days': {
       from: null,
-      to: moment().subtract(14, 'day')
+      to: moment().subtract(15, 'day')
     },
     'Older than 20 days': {
       from: null,
-      to: moment().subtract(20, 'day')
+      to: moment().subtract(21, 'day')
     },
     'Older than 30 days': {
       from: null,
-      to: moment().subtract(30, 'day')
+      to: moment().subtract(31, 'day')
     },
     'Older than 42 days (6 weeks)': {
       from: null,
-      to: moment().subtract(42, 'day')
+      to: moment().subtract(43, 'day')
     }
   };
 }

diff --git a/dist/react-filterbar.min.js b/dist/react-filterbar.min.js
diff --git a/example/public/js/react-filterbar.js b/example/public/js/react-filterbar.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-filterbar",
-  "version": "1.24",
+  "version": "1.25",
   "description": "",
   "main": "dist/react-filterbar.js",
   "engines": {

diff --git a/src/components/FilterBar/FilterDisplay/Inputs/RelativeDateInput.react.js b/src/components/FilterBar/FilterDisplay/Inputs/RelativeDateInput.react.js
@@ -105,10 +105,10 @@ function relativeOptions() {
       'Today':                        { from: moment(), to: moment() },
       'Last Week':                    { from: lastWeek.clone().startOf('isoWeek'), to: lastWeek.clone().endOf('isoWeek') },
       'This Week':                    { from: moment().startOf('isoWeek'), to: moment().endOf('isoWeek') },
-      'Older than 7 days':            { from: null, to: moment().subtract(7, 'day') },
-      'Older than 14 days':           { from: null, to: moment().subtract(14, 'day') },
-      'Older than 20 days':           { from: null, to: moment().subtract(20, 'day') },
-      'Older than 30 days':           { from: null, to: moment().subtract(30, 'day') },
-      'Older than 42 days (6 weeks)': { from: null, to: moment().subtract(42, 'day') },
+      'Older than 7 days':            { from: null, to: moment().subtract(8, 'day') },
+      'Older than 14 days':           { from: null, to: moment().subtract(15, 'day') },
+      'Older than 20 days':           { from: null, to: moment().subtract(21, 'day') },
+      'Older than 30 days':           { from: null, to: moment().subtract(31, 'day') },
+      'Older than 42 days (6 weeks)': { from: null, to: moment().subtract(43, 'day') },
     }
 }