Feature/last x days parameter (#4333)

* Add last 14, 30, 60, and 90 days to DRP.js Date Range Parameter (DRP) * Add last 14, 30, 60, and 60 day params to DRP.jsx DateRangeParameters (DRP)
getredash · Nov 5, 2019 · cce6546 · cce6546
1 parent 5fd78fd
commit cce6546
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/client/app/components/dynamic-parameters/DateRangeParameter.jsx b/client/app/components/dynamic-parameters/DateRangeParameter.jsx
@@ -34,6 +34,18 @@ const DYNAMIC_DATE_OPTIONS = [
   { name: 'Last 7 days',
     value: getDynamicDateRangeFromString('d_last_7_days'),
     label: () => getDynamicDateRangeFromString('d_last_7_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 14 days',
+    value: getDynamicDateRangeFromString('d_last_14_days'),
+    label: () => getDynamicDateRangeFromString('d_last_14_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 30 days',
+    value: getDynamicDateRangeFromString('d_last_30_days'),
+    label: () => getDynamicDateRangeFromString('d_last_30_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 60 days',
+    value: getDynamicDateRangeFromString('d_last_60_days'),
+    label: () => getDynamicDateRangeFromString('d_last_60_days').value()[0].format('MMM D') + ' - Today' },
+  { name: 'Last 90 days',
+    value: getDynamicDateRangeFromString('d_last_90_days'),
+    label: () => getDynamicDateRangeFromString('d_last_90_days').value()[0].format('MMM D') + ' - Today' },
 ];
 
 const DYNAMIC_DATETIME_OPTIONS = [

diff --git a/client/app/services/parameters/DateRangeParameter.js b/client/app/services/parameters/DateRangeParameter.js
@@ -48,6 +48,22 @@ const DYNAMIC_DATE_RANGES = {
     name: 'Last 7 days',
     value: () => [moment().subtract(7, 'days'), moment()],
   },
+  last_14_days: {
+    name: 'Last 14 days',
+    value: () => [moment().subtract(14, 'days'), moment()],
+  },
+  last_30_days: {
+    name: 'Last 30 days',
+    value: () => [moment().subtract(30, 'days'), moment()],
+  },
+  last_60_days: {
+    name: 'Last 60 days',
+    value: () => [moment().subtract(60, 'days'), moment()],
+  },
+  last_90_days: {
+    name: 'Last 90 days',
+    value: () => [moment().subtract(90, 'days'), moment()],
+  },
 };
 
 export const DynamicDateRangeType = PropTypes.oneOf(values(DYNAMIC_DATE_RANGES));