Testing moving out one type to grafana/ui

jest.config.js

@@ -8,7 +8,7 @@ module.exports = {
   "roots": [
     "<rootDir>/public/app",
     "<rootDir>/public/test",
-    "<rootDir>packages"
+    "<rootDir>/packages"
   ],
   "testRegex": "(\\.|/)(test)\\.(jsx?|tsx?)$",
   "moduleFileExtensions": [

packages/grafana-ui/package.json

@@ -16,6 +16,7 @@
     "react-highlight-words": "0.11.0",
     "@torkelo/react-select": "2.1.1",
     "react-transition-group": "^2.2.1",
+    "moment": "^2.22.2",
     "react-virtualized": "^9.21.0"
   },
   "devDependencies": {

packages/grafana-ui/src/index.ts

@@ -1 +1,2 @@
 export * from './components';
+export * from './types';

packages/grafana-ui/src/types/index.ts

@@ -0,0 +1 @@
+export * from './series';

packages/grafana-ui/src/types/series.ts

@@ -0,0 +1,13 @@
+import { Moment } from 'moment';
+
+export enum LoadingState {
+  NotStarted = 'NotStarted',
+  Loading = 'Loading',
+  Done = 'Done',
+  Error = 'Error',
+}
+
+export interface RawTimeRange {
+  from: Moment | string;
+  to: Moment | string;
+}

public/app/features/dashboard/dashgrid/DataPanel.tsx

@@ -8,7 +8,8 @@ import { getDatasourceSrv, DatasourceSrv } from 'app/features/plugins/datasource
 import kbn from 'app/core/utils/kbn';
 
 // Types
-import { TimeRange, LoadingState, DataQueryOptions, DataQueryResponse, TimeSeries } from 'app/types';
+import { TimeRange, DataQueryOptions, DataQueryResponse, TimeSeries } from 'app/types';
+import { LoadingState } from '@grafana/ui';
 
 interface RenderProps {
   loading: LoadingState;

public/app/types/index.ts

@@ -10,7 +10,6 @@ import { Invitee, OrgUser, User, UsersState, UserState } from './user';
 import { DataSource, DataSourceSelectItem, DataSourcesState } from './datasources';
 import {
   TimeRange,
-  LoadingState,
   TimeSeries,
   TimeSeriesVM,
   TimeSeriesVMs,
@@ -69,7 +68,6 @@ export {
   User,
   UsersState,
   TimeRange,
-  LoadingState,
   PanelPlugin,
   PanelProps,
   PanelOptionsProps,

public/app/types/panel.ts

@@ -1,4 +1,5 @@
-import { LoadingState, TimeSeries, TimeRange } from './series';
+import { TimeSeries, TimeRange } from './series';
+import { LoadingState } from '@grafana/ui';
 
 export interface PanelProps<T = any> {
   timeSeries: TimeSeries[];

public/app/types/series.ts

@@ -1,13 +1,6 @@
 import { Moment } from 'moment';
 import { PluginMeta } from './plugins';
 
-export enum LoadingState {
-  NotStarted = 'NotStarted',
-  Loading = 'Loading',
-  Done = 'Done',
-  Error = 'Error',
-}
-
 export interface RawTimeRange {
   from: Moment | string;
   to: Moment | string;