refactoring types

elastic · Jun 23, 2020 · e04f6f4 · e04f6f4
1 parent d9e63c5
commit e04f6f4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/x-pack/plugins/observability/public/data_handler.ts b/x-pack/plugins/observability/public/data_handler.ts
@@ -4,9 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { FetchData, HasData, ObservabilityFetchDataResponse } from './typings/data_handler';
+import { ObservabilityFetchDataResponse, FetchDataResponse } from './typings/fetch_data_response';
 import { ObservabilityApp } from '../typings/common';
 
+interface FetchDataParams {
+  // The start timestamp in milliseconds of the queried time interval
+  startTime: string;
+  // The end timestamp in milliseconds of the queried time interval
+  endTime: string;
+  // The aggregation bucket size in milliseconds if applicable to the data source
+  bucketSize: string;
+}
+
+export type FetchData<T extends FetchDataResponse = FetchDataResponse> = (
+  fetchDataParams: FetchDataParams
+) => Promise<T>;
+export type HasData = () => Promise<boolean>;
+
 interface DataHandler {
   fetchData: FetchData;
   hasData: HasData;

diff --git a/...ty/public/typings/data_handler/index.d.ts → ...ic/typings/fetch_data_response/index.d.ts b/...ty/public/typings/data_handler/index.d.ts → ...ic/typings/fetch_data_response/index.d.ts
@@ -31,7 +31,7 @@ interface Series {
   color?: string;
 }
 
-interface FetchDataResponse {
+export interface FetchDataResponse {
   title: string;
   appLink: string;
 }
@@ -84,17 +84,3 @@ export interface ObservabilityFetchDataResponse {
   infra_logs: LogsFetchDataResponse;
   uptime: UptimeFetchDataResponse;
 }
-
-interface FetchDataParams {
-  // The start timestamp in milliseconds of the queried time interval
-  startTime: string;
-  // The end timestamp in milliseconds of the queried time interval
-  endTime: string;
-  // The aggregation bucket size in milliseconds if applicable to the data source
-  bucketSize: string;
-}
-
-export type FetchData<T extends FetchDataResponse = FetchDataResponse> = (
-  fetchDataParams: FetchDataParams
-) => Promise<T>;
-type HasData = () => Promise<boolean>;