Merge pull request #369 from PagerDuty/today

PagerDuty · Dec 5, 2023 · 4ce162e · 4ce162e
2 parents 62b3ff2 + 433694b
commit 4ce162e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/QuerySettings/subcomponents/DatePickerComponent.jsx b/src/components/QuerySettings/subcomponents/DatePickerComponent.jsx
@@ -62,9 +62,14 @@ const DatePickerComponent = () => {
 
   // Generate since date based on configured default and dispatch action for query.
   const today = moment();
-  const [sinceDateNum, sinceDateTenor] = defaultSinceDateTenor
+  let [sinceDateNum, sinceDateTenor] = defaultSinceDateTenor
     ? defaultSinceDateTenor.split(' ')
     : ['1', 'Day'];
+
+  if (defaultSinceDateTenor === 'Today') {
+    sinceDateNum = '0';
+    sinceDateTenor = 'Day';
+  }
   const sinceDateCalc = DEBUG_SINCE_DATE
     ? new Date(DEBUG_SINCE_DATE)
     : today

diff --git a/src/util/settings.js b/src/util/settings.js
@@ -5,6 +5,7 @@ import {
 
 /* eslint-disable import/prefer-default-export */
 export const defaultSinceDateTenors = [
+  'Today',
   '1 Day',
   '3 Days',
   '1 Week',
@@ -23,6 +24,7 @@ export const defaultSinceDateTenorsLabels = () => {
     t,
   } = useTranslation();
   return {
+    Today: t('Today'),
     '1 Day': t('1 Day'),
     '3 Days': t('3 Days'),
     '1 Week': t('1 Week'),