From 6ecff9731fbc67a17e743d5f52c79d7e1b63e157 Mon Sep 17 00:00:00 2001
From: Krist Wongsuphasawat <krist.wongz@gmail.com>
Date: Wed, 19 Jun 2019 15:46:38 -0700
Subject: [PATCH] fix: remove annotation layer from query package

---
 .../src/clients/ChartClient.ts                | 31 ++++++++++++-------
 .../src/types/Annotation.ts                   |  0
 packages/superset-ui-query/src/index.ts       |  1 -
 .../src/types/QueryFormData.ts                |  3 --
 4 files changed, 19 insertions(+), 16 deletions(-)
 rename packages/{superset-ui-query => superset-ui-chart}/src/types/Annotation.ts (100%)

diff --git a/packages/superset-ui-chart/src/clients/ChartClient.ts b/packages/superset-ui-chart/src/clients/ChartClient.ts
index 6d74e4dd57..e703fd831e 100644
--- a/packages/superset-ui-chart/src/clients/ChartClient.ts
+++ b/packages/superset-ui-chart/src/clients/ChartClient.ts
@@ -6,10 +6,11 @@ import {
   Json,
   SupersetClientClass,
 } from '@superset-ui/connection';
-import { AnnotationLayerMetadata, QueryFormData, Datasource } from '@superset-ui/query';
+import { QueryFormData, Datasource } from '@superset-ui/query';
 import getChartBuildQueryRegistry from '../registries/ChartBuildQueryRegistrySingleton';
 import getChartMetadataRegistry from '../registries/ChartMetadataRegistrySingleton';
 import { QueryData } from '../models/ChartProps';
+import { AnnotationLayerMetadata } from '../types/Annotation';
 
 // This expands to Partial<All> & (union of all possible single-property types)
 type AtLeastOne<All, Each = { [K in keyof All]: Pick<All, K> }> = Partial<All> & Each[keyof Each];
@@ -130,17 +131,23 @@ export default class ChartClient {
   }
 
   loadChartData(input: SliceIdAndOrFormData): Promise<ChartData> {
-    return this.loadFormData(input).then(formData =>
-      Promise.all([
-        this.loadAnnotations(formData.annotation_layers),
-        this.loadDatasource(formData.datasource),
-        this.loadQueryData(formData),
-      ]).then(([annotationData, datasource, queryData]) => ({
-        annotationData,
-        datasource,
-        formData,
-        queryData,
-      })),
+    return this.loadFormData(input).then(
+      (
+        formData: QueryFormData & {
+          // eslint-disable-next-line camelcase
+          annotation_layers?: AnnotationLayerMetadata[];
+        },
+      ) =>
+        Promise.all([
+          this.loadAnnotations(formData.annotation_layers),
+          this.loadDatasource(formData.datasource),
+          this.loadQueryData(formData),
+        ]).then(([annotationData, datasource, queryData]) => ({
+          annotationData,
+          datasource,
+          formData,
+          queryData,
+        })),
     );
   }
 }
diff --git a/packages/superset-ui-query/src/types/Annotation.ts b/packages/superset-ui-chart/src/types/Annotation.ts
similarity index 100%
rename from packages/superset-ui-query/src/types/Annotation.ts
rename to packages/superset-ui-chart/src/types/Annotation.ts
diff --git a/packages/superset-ui-query/src/index.ts b/packages/superset-ui-query/src/index.ts
index f872404b5b..9357f1dc1d 100644
--- a/packages/superset-ui-query/src/index.ts
+++ b/packages/superset-ui-query/src/index.ts
@@ -4,7 +4,6 @@ export { default as convertFilter } from './convertFilter';
 export { default as convertMetric } from './convertMetric';
 export { default as DatasourceKey } from './DatasourceKey';
 
-export * from './types/Annotation';
 export * from './types/QueryFormData';
 export * from './types/Column';
 export * from './types/Datasource';
diff --git a/packages/superset-ui-query/src/types/QueryFormData.ts b/packages/superset-ui-query/src/types/QueryFormData.ts
index 40cf1ace31..1a97cf99ab 100644
--- a/packages/superset-ui-query/src/types/QueryFormData.ts
+++ b/packages/superset-ui-query/src/types/QueryFormData.ts
@@ -2,7 +2,6 @@
 /* eslint-disable import/prefer-default-export */
 // FormData uses snake_cased keys.
 import { MetricKey, AdhocMetric } from './Metric';
-import { AnnotationLayerMetadata } from './Annotation';
 import { TimeRange } from './Time';
 import { AdhocFilter } from './Filter';
 
@@ -47,8 +46,6 @@ export type BaseFormData = {
   row_limit?: number;
   /** The metric used to order timeseries for limiting */
   timeseries_limit_metric?: QueryFormDataMetric;
-
-  annotation_layers?: AnnotationLayerMetadata[];
 } & TimeRange &
   QueryFormDataMetrics;