Commit 0ff572ef by Torkel Ödegaard

Testing moving out one type to grafana/ui

parent 7268f16c
...@@ -8,7 +8,7 @@ module.exports = { ...@@ -8,7 +8,7 @@ module.exports = {
"roots": [ "roots": [
"<rootDir>/public/app", "<rootDir>/public/app",
"<rootDir>/public/test", "<rootDir>/public/test",
"<rootDir>packages" "<rootDir>/packages"
], ],
"testRegex": "(\\.|/)(test)\\.(jsx?|tsx?)$", "testRegex": "(\\.|/)(test)\\.(jsx?|tsx?)$",
"moduleFileExtensions": [ "moduleFileExtensions": [
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
"react-highlight-words": "0.11.0", "react-highlight-words": "0.11.0",
"@torkelo/react-select": "2.1.1", "@torkelo/react-select": "2.1.1",
"react-transition-group": "^2.2.1", "react-transition-group": "^2.2.1",
"moment": "^2.22.2",
"react-virtualized": "^9.21.0" "react-virtualized": "^9.21.0"
}, },
"devDependencies": { "devDependencies": {
......
export * from './components'; export * from './components';
export * from './types';
import { Moment } from 'moment';
export enum LoadingState {
NotStarted = 'NotStarted',
Loading = 'Loading',
Done = 'Done',
Error = 'Error',
}
export interface RawTimeRange {
from: Moment | string;
to: Moment | string;
}
...@@ -8,7 +8,8 @@ import { getDatasourceSrv, DatasourceSrv } from 'app/features/plugins/datasource ...@@ -8,7 +8,8 @@ import { getDatasourceSrv, DatasourceSrv } from 'app/features/plugins/datasource
import kbn from 'app/core/utils/kbn'; import kbn from 'app/core/utils/kbn';
// Types // 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 { interface RenderProps {
loading: LoadingState; loading: LoadingState;
......
...@@ -10,7 +10,6 @@ import { Invitee, OrgUser, User, UsersState, UserState } from './user'; ...@@ -10,7 +10,6 @@ import { Invitee, OrgUser, User, UsersState, UserState } from './user';
import { DataSource, DataSourceSelectItem, DataSourcesState } from './datasources'; import { DataSource, DataSourceSelectItem, DataSourcesState } from './datasources';
import { import {
TimeRange, TimeRange,
LoadingState,
TimeSeries, TimeSeries,
TimeSeriesVM, TimeSeriesVM,
TimeSeriesVMs, TimeSeriesVMs,
...@@ -69,7 +68,6 @@ export { ...@@ -69,7 +68,6 @@ export {
User, User,
UsersState, UsersState,
TimeRange, TimeRange,
LoadingState,
PanelPlugin, PanelPlugin,
PanelProps, PanelProps,
PanelOptionsProps, PanelOptionsProps,
......
import { LoadingState, TimeSeries, TimeRange } from './series'; import { TimeSeries, TimeRange } from './series';
import { LoadingState } from '@grafana/ui';
export interface PanelProps<T = any> { export interface PanelProps<T = any> {
timeSeries: TimeSeries[]; timeSeries: TimeSeries[];
......
import { Moment } from 'moment'; import { Moment } from 'moment';
import { PluginMeta } from './plugins'; import { PluginMeta } from './plugins';
export enum LoadingState {
NotStarted = 'NotStarted',
Loading = 'Loading',
Done = 'Done',
Error = 'Error',
}
export interface RawTimeRange { export interface RawTimeRange {
from: Moment | string; from: Moment | string;
to: Moment | string; to: Moment | string;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment