Moved time_srv to services folder, this should not belong to dashboard feature but it is too dependant on dashboard to move it out now, needs a bigger refactoring to isolate from dashboard

public/app/features/annotations/specs/annotations_srv.test.ts

@@ -1,5 +1,3 @@
-import '../annotations_srv';
-import 'app/features/dashboard/time_srv';
 import { AnnotationsSrv } from '../annotations_srv';
 
 describe('AnnotationsSrv', () => {

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

@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 import { AutoSizer } from 'react-virtualized';
 
 // Services
-import { getTimeSrv, TimeSrv } from '../time_srv';
+import { getTimeSrv, TimeSrv } from '../services/TimeSrv';
 
 // Components
 import { PanelHeader } from './PanelHeader/PanelHeader';

public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.tsx

@@ -4,7 +4,7 @@ import { Tooltip } from '@grafana/ui';
 import { PanelModel } from 'app/features/dashboard/panel_model';
 import templateSrv from 'app/features/templating/template_srv';
 import { LinkSrv } from 'app/features/panel/panellinks/link_srv';
-import { getTimeSrv, TimeSrv } from 'app/features/dashboard/time_srv';
+import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 enum InfoModes {
   Error = 'Error',

public/app/features/dashboard/index.ts

@@ -1,5 +1,4 @@
 import './containers/DashboardCtrl';
-import './time_srv';
 import './dashgrid/DashboardGridDirective';
 
 // Services

public/app/features/dashboard/specs/time_srv.test.ts → public/app/features/dashboard/services/TimeSrv.test.ts

@@ -1,5 +1,4 @@
-import { TimeSrv } from '../time_srv';
-import '../time_srv';
+import { TimeSrv } from './TimeSrv';
 import moment from 'moment';
 
 describe('timeSrv', () => {

public/app/features/explore/QueryEditor.tsx

@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 
 // Services
 import { getAngularLoader, AngularComponent } from 'app/core/services/AngularLoader';
-import { getTimeSrv } from 'app/features/dashboard/time_srv';
+import { getTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 // Types
 import { Emitter } from 'app/core/utils/emitter';

public/app/features/templating/variable_srv.ts

@@ -7,7 +7,7 @@ import coreModule from 'app/core/core_module';
 import { variableTypes } from './variable';
 import { Graph } from 'app/core/utils/dag';
 import { TemplateSrv } from 'app/features/templating/template_srv';
-import { TimeSrv } from 'app/features/dashboard/time_srv';
+import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { DashboardModel } from 'app/features/dashboard/dashboard_model';
 
 // Types

public/app/routes/GrafanaCtrl.ts

@@ -8,7 +8,7 @@ import coreModule from 'app/core/core_module';
 import { profiler } from 'app/core/profiler';
 import appEvents from 'app/core/app_events';
 import { BackendSrv, setBackendSrv } from 'app/core/services/backend_srv';
-import { TimeSrv, setTimeSrv } from 'app/features/dashboard/time_srv';
+import { TimeSrv, setTimeSrv } from 'app/features/dashboard/services/TimeSrv';
 import { DatasourceSrv, setDatasourceSrv } from 'app/features/plugins/datasource_srv';
 import { AngularLoader, setAngularLoader } from 'app/core/services/AngularLoader';
 import { configureStore } from 'app/store/configureStore';