From 4358732d21b859e47c7dbab6db9bc10422eb10fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 23 Jan 2019 12:52:46 +0100
Subject: [PATCH] Moved unsaved changes service and modal

---
 .../UnsavedChangesModal/UnsavedChangesModalCtrl.ts}        | 0
 .../dashboard/components/UnsavedChangesModal/index.ts      | 1 +
 public/app/features/dashboard/index.ts                     | 7 ++++---
 .../ChangeTracker.test.ts}                                 | 2 +-
 .../{change_tracker.ts => services/ChangeTracker.ts}       | 2 +-
 .../UnsavedChangesSrv.ts}                                  | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
 rename public/app/features/dashboard/{unsaved_changes_modal.ts => components/UnsavedChangesModal/UnsavedChangesModalCtrl.ts} (100%)
 create mode 100644 public/app/features/dashboard/components/UnsavedChangesModal/index.ts
 rename public/app/features/dashboard/{specs/change_tracker.test.ts => services/ChangeTracker.test.ts} (97%)
 rename public/app/features/dashboard/{change_tracker.ts => services/ChangeTracker.ts} (98%)
 rename public/app/features/dashboard/{unsaved_changes_srv.ts => services/UnsavedChangesSrv.ts} (89%)

diff --git a/public/app/features/dashboard/unsaved_changes_modal.ts b/public/app/features/dashboard/components/UnsavedChangesModal/UnsavedChangesModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/unsaved_changes_modal.ts
rename to public/app/features/dashboard/components/UnsavedChangesModal/UnsavedChangesModalCtrl.ts
diff --git a/public/app/features/dashboard/components/UnsavedChangesModal/index.ts b/public/app/features/dashboard/components/UnsavedChangesModal/index.ts
new file mode 100644
index 00000000000..43943f06694
--- /dev/null
+++ b/public/app/features/dashboard/components/UnsavedChangesModal/index.ts
@@ -0,0 +1 @@
+export { UnsavedChangesModalCtrl } from './UnsavedChangesModalCtrl';
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index 9f319e4900e..a4224ccc5e6 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -8,10 +8,8 @@ import './share_snapshot_ctrl';
 import './dashboard_srv';
 import './validation_srv';
 import './time_srv';
-import './unsaved_changes_srv';
-import './unsaved_changes_modal';
-import './upload';
 import './ad_hoc_filters';
+import './upload';
 import './repeat_option/repeat_option';
 import './dashgrid/DashboardGridDirective';
 import './dashgrid/RowOptions';
@@ -19,6 +17,7 @@ import './panellinks/module';
 
 // Services
 import './services/DashboardViewStateSrv';
+import './services/UnsavedChangesSrv';
 
 // Components
 import './components/DashLinks';
@@ -30,6 +29,8 @@ import './components/VersionHistory';
 import './components/DashboardSettings';
 import './components/SubMenu';
 import './components/TimePicker';
+import './components/UnsavedChangesModal';
+
 import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
 
 // angular wrappers
diff --git a/public/app/features/dashboard/specs/change_tracker.test.ts b/public/app/features/dashboard/services/ChangeTracker.test.ts
similarity index 97%
rename from public/app/features/dashboard/specs/change_tracker.test.ts
rename to public/app/features/dashboard/services/ChangeTracker.test.ts
index e7f8ce977b1..dfc9b3fa03f 100644
--- a/public/app/features/dashboard/specs/change_tracker.test.ts
+++ b/public/app/features/dashboard/services/ChangeTracker.test.ts
@@ -1,4 +1,4 @@
-import { ChangeTracker } from 'app/features/dashboard/change_tracker';
+import { ChangeTracker } from './ChangeTracker';
 import { contextSrv } from 'app/core/services/context_srv';
 import { DashboardModel } from '../dashboard_model';
 import { PanelModel } from '../panel_model';
diff --git a/public/app/features/dashboard/change_tracker.ts b/public/app/features/dashboard/services/ChangeTracker.ts
similarity index 98%
rename from public/app/features/dashboard/change_tracker.ts
rename to public/app/features/dashboard/services/ChangeTracker.ts
index aa71ac2e306..ef3d456db48 100644
--- a/public/app/features/dashboard/change_tracker.ts
+++ b/public/app/features/dashboard/services/ChangeTracker.ts
@@ -1,6 +1,6 @@
 import angular from 'angular';
 import _ from 'lodash';
-import { DashboardModel } from './dashboard_model';
+import { DashboardModel } from '../dashboard_model';
 
 export class ChangeTracker {
   current: any;
diff --git a/public/app/features/dashboard/unsaved_changes_srv.ts b/public/app/features/dashboard/services/UnsavedChangesSrv.ts
similarity index 89%
rename from public/app/features/dashboard/unsaved_changes_srv.ts
rename to public/app/features/dashboard/services/UnsavedChangesSrv.ts
index f0a8bf40501..2691cc6ebf8 100644
--- a/public/app/features/dashboard/unsaved_changes_srv.ts
+++ b/public/app/features/dashboard/services/UnsavedChangesSrv.ts
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import { ChangeTracker } from './change_tracker';
+import { ChangeTracker } from './ChangeTracker';
 
 /** @ngInject */
 export function unsavedChangesSrv(this: any, $rootScope, $q, $location, $timeout, contextSrv, dashboardSrv, $window) {