move annotation to data package

ryantxu · Jun 19, 2019 · 36ada2b · 36ada2b
1 parent 9cd4dc7
commit 36ada2b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/packages/grafana-ui/src/types/annotations.ts → ...ges/grafana-data/src/types/annotations.ts b/packages/grafana-ui/src/types/annotations.ts → ...ges/grafana-data/src/types/annotations.ts
diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts
@@ -1 +1,2 @@
 export * from './navModel';
+export * from './annotations';
diff --git a/packages/grafana-ui/src/types/index.ts b/packages/grafana-ui/src/types/index.ts
@@ -1,7 +1,6 @@
 export * from './data';
 export * from './time';
 export * from './panel';
-export * from './annotations';
 export * from './plugin';
 export * from './app';
 export * from './datasource';

diff --git a/public/app/plugins/panel/annolist/AnnoListEditor.tsx b/public/app/plugins/panel/annolist/AnnoListEditor.tsx
@@ -2,16 +2,9 @@
 import React, { PureComponent, ChangeEvent } from 'react';
 
 // Components
-import {
-  PanelEditorProps,
-  PanelOptionsGroup,
-  PanelOptionsGrid,
-  Switch,
-  FormField,
-  toIntegerOrUndefined,
-  toNumberString,
-  FormLabel,
-} from '@grafana/ui';
+import { PanelEditorProps, PanelOptionsGroup, PanelOptionsGrid, Switch, FormField, FormLabel } from '@grafana/ui';
+
+import { toIntegerOrUndefined, toNumberString } from '@grafana/data';
 
 // Types
 import { AnnoOptions } from './types';

diff --git a/public/app/plugins/panel/annolist/AnnoListPanel.tsx b/public/app/plugins/panel/annolist/AnnoListPanel.tsx
@@ -6,7 +6,8 @@ import React, { PureComponent } from 'react';
 
 // Types
 import { AnnoOptions } from './types';
-import { PanelProps, Annotation, Tooltip, dateTime, DurationUnit } from '@grafana/ui';
+import { Annotation } from '@grafana/data';
+import { PanelProps, Tooltip, dateTime, DurationUnit } from '@grafana/ui';
 import { getBackendSrv } from 'app/core/services/backend_srv';
 import { AbstractList } from '@grafana/ui/src/components/List/AbstractList';
 import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from './navModel';
		export * from './annotations';