Test if time_range uses uiSettings to get commonlyUsedRanges

opendistro-for-elasticsearch · Apr 5, 2021 · 4c9a549 · 4c9a549
1 parent 193846b
commit 4c9a549
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 4 deletions.
diff --git a/...s/public/components/report_definitions/report_settings/__tests__/report_settings.test.tsx b/...s/public/components/report_definitions/report_settings/__tests__/report_settings.test.tsx
@@ -19,6 +19,7 @@ import { ReportSettings } from '../report_settings';
 import 'babel-polyfill';
 import 'regenerator-runtime';
 import httpClientMock from '../../../../../test/httpMockClient';
+import uiSettingsMock from '../../../../../test/uiSettingsMock';
 import { configure, mount, shallow } from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 import { act } from 'react-dom/test-utils';
@@ -103,6 +104,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -147,6 +149,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={true}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -192,6 +195,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={true}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -240,6 +244,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={true}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -288,6 +293,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={true}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -336,6 +342,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={true}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -347,7 +354,7 @@ describe('<ReportSettings /> panel', () => {
     expect(container.firstChild).toMatchSnapshot();
     await act(() => promise);
   });
-  
+
 
   test('dashboard create from in-context', async () => {
     window = Object.create(window);
@@ -392,6 +399,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -450,6 +458,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -510,6 +519,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -558,6 +568,7 @@ describe('<ReportSettings /> panel', () => {
     const component = shallow(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -606,6 +617,7 @@ describe('<ReportSettings /> panel', () => {
     const component = mount(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -624,7 +636,7 @@ describe('<ReportSettings /> panel', () => {
 
     act(() => {
       comboBox.props().onChange([{ value: 'test', label: 'test' }]);
-    }); 
+    });
     component.update();
 
     await act(() => promise);
@@ -663,6 +675,7 @@ describe('<ReportSettings /> panel', () => {
     const component = mount(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -692,6 +705,7 @@ describe('<ReportSettings /> panel', () => {
     const { container } = render(
       <ReportSettings
         edit={false}
+        uiSettings={uiSettingsMock}
         reportDefinitionRequest={emptyRequest}
         httpClientProps={httpClientMock}
         timeRange={timeRange}
@@ -703,4 +717,45 @@ describe('<ReportSettings /> panel', () => {
     expect(container.firstChild).toMatchSnapshot();
     await act(() => promise);
   });
+
+  test('load commonlyUsedRanges from uiSettings service', async () => {
+    const promise = Promise.resolve();
+    uiSettingsMock.get = jest.fn((key) => [
+      {
+        from: 'now/d',
+        to: 'now/d',
+        display: 'Foo'
+      }
+    ]);
+
+    const component = mount(
+      <ReportSettings
+        edit={false}
+        uiSettings={uiSettingsMock}
+        reportDefinitionRequest={emptyRequest}
+        httpClientProps={httpClientMock}
+        timeRange={timeRange}
+        showSettingsReportNameError={true}
+        showTimeRangeError={true}
+      />
+    );
+    await act(() => promise);
+
+    const superDatePicker =  component.find('EuiSuperDatePicker').at(0);
+
+    expect(superDatePicker.prop('commonlyUsedRanges')).toEqual(
+      [
+        {
+          start: 'now/d',
+          end: 'now/d',
+          label: 'Foo'
+        }
+      ]
+    );
+
+    expect(uiSettingsMock.get.mock.calls.length).toBeGreaterThan(0);
+    expect(uiSettingsMock.get.mock.calls[0][0]).toBe('timepicker:quickRanges');
+
+    await act(() => promise);
+  });
 });
diff --git a/kibana-reports/public/components/report_definitions/report_settings/time_range.tsx b/kibana-reports/public/components/report_definitions/report_settings/time_range.tsx
@@ -22,7 +22,6 @@ import {
   EuiGlobalToastList,
   EuiSuperDatePicker,
 } from '@elastic/eui';
-import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
 
 export function TimeRangeSelect(props) {
   const {
@@ -194,7 +193,7 @@ export function TimeRangeSelect(props) {
   };
 
   const commonlyUsedRanges = uiSettings!
-    .get(UI_SETTINGS.TIMEPICKER_QUICK_RANGES)
+    .get('timepicker:quickRanges')
     .map(({ from, to, display }: { from: string; to: string; display: string }) => {
       return {
         start: from,

diff --git a/kibana-reports/test/uiSettingsMock.js b/kibana-reports/test/uiSettingsMock.js
@@ -0,0 +1,20 @@
+/*
+ *   Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+const uiSettingsMock = jest.fn();
+
+uiSettingsMock.get = jest.fn((key) => ([]));
+
+export default uiSettingsMock;