From 0fb7ee05d1bada722d1cd961afcd999e00844c74 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Thu, 20 Aug 2020 14:37:49 -0700
Subject: [PATCH] Chore: Minor cleanup (#27112)

---
 docs/sources/developers/plugins/plugin.schema.json | 4 ++--
 packages/grafana-data/src/types/datasource.ts      | 3 +++
 packages/grafana-e2e/src/flows/addDashboard.ts     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/sources/developers/plugins/plugin.schema.json b/docs/sources/developers/plugins/plugin.schema.json
index 84c332056a3..2e443c797a6 100644
--- a/docs/sources/developers/plugins/plugin.schema.json
+++ b/docs/sources/developers/plugins/plugin.schema.json
@@ -8,8 +8,8 @@
   "additionalProperties": false,
   "properties": {
     "$schema": {
-        "type": "string",
-        "description": "Schema definition for the plugin.json file"
+      "type": "string",
+      "description": "Schema definition for the plugin.json file"
     },
     "id": {
       "type": "string",
diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index e01ef0653e5..26ae515bd43 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -538,8 +538,11 @@ export interface DataSourceSelectItem {
 export interface AnnotationQueryRequest<MoreOptions = {}> {
   range: TimeRange;
   rangeRaw: RawTimeRange;
+
   // Should be DataModel but cannot import that here from the main app. Needs to be moved to package first.
   dashboard: any;
+
+  // The annotation query, typically extends DataQuery
   annotation: {
     datasource: string;
     enable: boolean;
diff --git a/packages/grafana-e2e/src/flows/addDashboard.ts b/packages/grafana-e2e/src/flows/addDashboard.ts
index a1625993c92..3ca93e35c30 100644
--- a/packages/grafana-e2e/src/flows/addDashboard.ts
+++ b/packages/grafana-e2e/src/flows/addDashboard.ts
@@ -8,7 +8,7 @@ export interface AddDashboardConfig {
   timeRange: DashboardTimeRangeConfig;
   timezone: string;
   title: string;
-  variables: Partial<AddVariableConfig>[];
+  variables: Array<Partial<AddVariableConfig>>;
 }
 
 export interface AddVariableConfig {
@@ -145,7 +145,7 @@ const addVariable = (config: Partial<AddVariableConfig>, isFirst: boolean): any
   return fullConfig;
 };
 
-const addVariables = (configs: Partial<AddVariableConfig>[]): any => {
+const addVariables = (configs: Array<Partial<AddVariableConfig>>): any => {
   if (configs.length > 0) {
     e2e.pages.Dashboard.Settings.General.sectionItems('Variables').click();
   }