kibana-app-arch suggestions

Kerry350 · Kerry350 · commit a0be0c475c14 · 2020-10-08T15:42:12.000+01:00
- Move decision of using defaults to the solution consumer
- Add unit tests
diff --git a/src/plugins/data/public/query/timefilter/timefilter.test.ts b/src/plugins/data/public/query/timefilter/timefilter.test.ts
@@ -54,6 +54,10 @@ function clearNowTimeStub() {
   delete global.nowTime;
 }
 
+test('isTimeTouched is initially set to false', () => {
+  expect(timefilter.isTimeTouched()).toBe(false);
+});
+
 describe('setTime', () => {
   let update: sinon.SinonSpy;
   let fetch: sinon.SinonSpy;
@@ -84,6 +88,10 @@ describe('setTime', () => {
     });
   });
 
+  test('should update isTimeTouched', () => {
+    expect(timefilter.isTimeTouched()).toBe(true);
+  });
+
   test('should not add unexpected object keys to time state', () => {
     const unexpectedKey = 'unexpectedKey';
     timefilter.setTime({
diff --git a/src/plugins/data/public/query/timefilter/timefilter.ts b/src/plugins/data/public/query/timefilter/timefilter.ts
@@ -70,6 +70,10 @@ export class Timefilter {
     return this._isAutoRefreshSelectorEnabled;
   }
 
+  public isTimeTouched() {
+    return this._isTimeTouched;
+  }
+
   public getEnabledUpdated$ = () => {
     return this.enabledUpdated$.asObservable();
   };
@@ -90,8 +94,8 @@ export class Timefilter {
     return this.fetch$.asObservable();
   };
 
-  public getTime = (defaults?: TimeRange): TimeRange => {
-    const { from, to } = this._isTimeTouched || !defaults ? this._time : defaults;
+  public getTime = (): TimeRange => {
+    const { from, to } = this._time;
     return {
       ...this._time,
       from: moment.isMoment(from) ? from.toISOString() : from,
diff --git a/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
@@ -26,6 +26,7 @@ const createSetupContractMock = () => {
   const timefilterMock: jest.Mocked<TimefilterContract> = {
     isAutoRefreshSelectorEnabled: jest.fn(),
     isTimeRangeSelectorEnabled: jest.fn(),
+    isTimeTouched: jest.fn(),
     getEnabledUpdated$: jest.fn(),
     getTimeUpdate$: jest.fn(),
     getRefreshIntervalUpdate$: jest.fn(),
diff --git a/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx b/x-pack/plugins/infra/public/hooks/use_kibana_timefilter_time.tsx
@@ -16,7 +16,10 @@ export const useKibanaTimefilterTime = ({
   const { services } = useKibanaContextForPlugin();
 
   const getTime = useCallback(() => {
-    return services.data.query.timefilter.timefilter.getTime({ from: fromDefault, to: toDefault });
+    const timefilterService = services.data.query.timefilter.timefilter;
+    return timefilterService.isTimeTouched()
+      ? timefilterService.getTime()
+      : { from: fromDefault, to: toDefault };
   }, [services.data.query.timefilter.timefilter, fromDefault, toDefault]);
 
   return [getTime, services.data.query.timefilter.timefilter.setTime];
