From 691dd3b20c4a421269246dc7dbc7fa223b21b1b3 Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Mon, 21 Jun 2021 11:22:20 +0200
Subject: [PATCH] fix time shift ux issues

---
 .../search/aggs/utils/parse_time_shift.ts     |  2 +-
 .../dimension_panel/time_shift.tsx            |  2 +-
 .../time_shift_utils.tsx                      | 22 +++++++++----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/plugins/data/common/search/aggs/utils/parse_time_shift.ts b/src/plugins/data/common/search/aggs/utils/parse_time_shift.ts
index 4d8ee0f889173..91379ea054de3 100644
--- a/src/plugins/data/common/search/aggs/utils/parse_time_shift.ts
+++ b/src/plugins/data/common/search/aggs/utils/parse_time_shift.ts
@@ -20,7 +20,7 @@ export const parseTimeShift = (val: string): moment.Duration | 'previous' | 'inv
   if (trimmedVal === 'previous') {
     return 'previous';
   }
-  const [, amount, unit] = trimmedVal.match(/^(\d+)(\w)$/) || [];
+  const [, amount, unit] = trimmedVal.match(/^(\d+)\s*(\w)$/) || [];
   const parsedAmount = Number(amount);
   if (Number.isNaN(parsedAmount) || !allowedUnits.includes(unit as AllowedUnit)) {
     return 'invalid';
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
index ba9525ac53fc5..c2415c9c9a75a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
@@ -157,7 +157,7 @@ export function TimeShift({
               isClearable={false}
               data-test-subj="indexPattern-dimension-time-shift"
               placeholder={i18n.translate('xpack.lens.indexPattern.timeShiftPlaceholder', {
-                defaultMessage: 'Time shift (e.g. 1d)',
+                defaultMessage: 'Type custom values (e.g. 8w)',
               })}
               options={timeShiftOptions.filter(({ value }) => {
                 const parsedValue = parseTimeShift(value);
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
index 14ba6b9189e6b..a1bc643c3bd93 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/time_shift_utils.tsx
@@ -23,67 +23,67 @@ import { FramePublicAPI } from '../types';
 export const timeShiftOptions = [
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.hour', {
-      defaultMessage: '1 hour (1h)',
+      defaultMessage: '1 hour ago (1h)',
     }),
     value: '1h',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.3hours', {
-      defaultMessage: '3 hours (3h)',
+      defaultMessage: '3 hours ago (3h)',
     }),
     value: '3h',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.6hours', {
-      defaultMessage: '6 hours (6h)',
+      defaultMessage: '6 hours ago (6h)',
     }),
     value: '6h',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.12hours', {
-      defaultMessage: '12 hours (12h)',
+      defaultMessage: '12 hours ago (12h)',
     }),
     value: '12h',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.day', {
-      defaultMessage: '1 day (1d)',
+      defaultMessage: '1 day ago (1d)',
     }),
     value: '1d',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.week', {
-      defaultMessage: '1 week (1w)',
+      defaultMessage: '1 week ago (1w)',
     }),
     value: '1w',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.month', {
-      defaultMessage: '1 month (1M)',
+      defaultMessage: '1 month ago (1M)',
     }),
     value: '1M',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.3months', {
-      defaultMessage: '3 months (3M)',
+      defaultMessage: '3 months ago (3M)',
     }),
     value: '3M',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.6months', {
-      defaultMessage: '6 months (6M)',
+      defaultMessage: '6 months ago (6M)',
     }),
     value: '6M',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.year', {
-      defaultMessage: '1 year (1y)',
+      defaultMessage: '1 year ago (1y)',
     }),
     value: '1y',
   },
   {
     label: i18n.translate('xpack.lens.indexPattern.timeShift.previous', {
-      defaultMessage: 'Previous',
+      defaultMessage: 'Previous time range',
     }),
     value: 'previous',
   },