[Lens] Show generic error for invalid time shift string (#120077)

* 🐛 Show generic error for invalid string * ✅ add unit test
elastic · Dec 2, 2021 · 9814a81 · 9814a81
1 parent acbee9b
commit 9814a81
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -1485,6 +1485,23 @@ describe('IndexPatternDimensionEditorPanel', () => {
         },
       });
     });
+
+    it('should report a generic error for invalid shift string', () => {
+      const props = getProps({
+        timeShift: '5 months',
+      });
+      wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
+
+      expect(wrapper.find(TimeShift).find(EuiComboBox).prop('isInvalid')).toBeTruthy();
+
+      expect(
+        wrapper
+          .find(TimeShift)
+          .find('[data-test-subj="indexPattern-dimension-time-shift-row"]')
+          .first()
+          .prop('error')
+      ).toBe('Time shift value is not valid.');
+    });
   });
 
   describe('filtering', () => {

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
@@ -129,6 +129,7 @@ export function TimeShift({
       <EuiFormRow
         display="columnCompressed"
         fullWidth
+        data-test-subj="indexPattern-dimension-time-shift-row"
         label={i18n.translate('xpack.lens.indexPattern.timeShift.label', {
           defaultMessage: 'Time shift',
         })}
@@ -145,6 +146,10 @@ export function TimeShift({
             i18n.translate('xpack.lens.indexPattern.timeShift.noMultipleHelp', {
               defaultMessage:
                 'Time shift should be a multiple of the date histogram interval. Either adjust time shift or date histogram interval',
+            })) ||
+          (isLocalValueInvalid &&
+            i18n.translate('xpack.lens.indexPattern.timeShift.genericInvalidHelp', {
+              defaultMessage: 'Time shift value is not valid.',
             }))
         }
         isInvalid={Boolean(isLocalValueInvalid || localValueTooSmall || localValueNotMultiple)}