From 720fa87b89dc80b6a0ee16f471529406c89a477e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 23 Jan 2019 13:00:05 +0100
Subject: [PATCH] Moved dashboard save modals to components folder

---
 .../SaveModals/SaveDashboardAsModalCtrl.test.ts}             | 2 +-
 .../SaveModals/SaveDashboardAsModalCtrl.ts}                  | 0
 .../SaveModals/SaveDashboardModalCtrl.test.ts}               | 2 +-
 .../SaveModals/SaveDashboardModalCtrl.ts}                    | 0
 public/app/features/dashboard/components/SaveModals/index.ts | 2 ++
 public/app/features/dashboard/index.ts                       | 5 ++---
 .../DashboardLoaderSrv.ts}                                   | 0
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename public/app/features/dashboard/{specs/save_as_modal.test.ts => components/SaveModals/SaveDashboardAsModalCtrl.test.ts} (95%)
 rename public/app/features/dashboard/{save_as_modal.ts => components/SaveModals/SaveDashboardAsModalCtrl.ts} (100%)
 rename public/app/features/dashboard/{specs/save_modal.test.ts => components/SaveModals/SaveDashboardModalCtrl.test.ts} (97%)
 rename public/app/features/dashboard/{save_modal.ts => components/SaveModals/SaveDashboardModalCtrl.ts} (100%)
 create mode 100644 public/app/features/dashboard/components/SaveModals/index.ts
 rename public/app/features/dashboard/{dashboard_loader_srv.ts => services/DashboardLoaderSrv.ts} (100%)

diff --git a/public/app/features/dashboard/specs/save_as_modal.test.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.test.ts
similarity index 95%
rename from public/app/features/dashboard/specs/save_as_modal.test.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.test.ts
index ceb7e49c550..91b9097b626 100644
--- a/public/app/features/dashboard/specs/save_as_modal.test.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.test.ts
@@ -1,4 +1,4 @@
-import { SaveDashboardAsModalCtrl } from '../save_as_modal';
+import { SaveDashboardAsModalCtrl } from './SaveDashboardAsModalCtrl';
 import { describe, it, expect } from 'test/lib/common';
 
 describe('saving dashboard as', () => {
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/save_as_modal.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardAsModalCtrl.ts
diff --git a/public/app/features/dashboard/specs/save_modal.test.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
similarity index 97%
rename from public/app/features/dashboard/specs/save_modal.test.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
index 669ae43a0ff..f973c1b8e63 100644
--- a/public/app/features/dashboard/specs/save_modal.test.ts
+++ b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.test.ts
@@ -1,4 +1,4 @@
-import { SaveDashboardModalCtrl } from '../save_modal';
+import { SaveDashboardModalCtrl } from './SaveDashboardModalCtrl';
 
 const setup = (timeChanged, variableValuesChanged, cb) => {
   const dash = {
diff --git a/public/app/features/dashboard/save_modal.ts b/public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/save_modal.ts
rename to public/app/features/dashboard/components/SaveModals/SaveDashboardModalCtrl.ts
diff --git a/public/app/features/dashboard/components/SaveModals/index.ts b/public/app/features/dashboard/components/SaveModals/index.ts
new file mode 100644
index 00000000000..afab0796d28
--- /dev/null
+++ b/public/app/features/dashboard/components/SaveModals/index.ts
@@ -0,0 +1,2 @@
+export { SaveDashboardAsModalCtrl } from './SaveDashboardAsModalCtrl';
+export { SaveDashboardModalCtrl } from './SaveDashboardModalCtrl';
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index a4224ccc5e6..3183b0d8959 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -1,7 +1,4 @@
 import './dashboard_ctrl';
-import './dashboard_loader_srv';
-import './save_as_modal';
-import './save_modal';
 import './save_provisioned_modal';
 import './shareModalCtrl';
 import './share_snapshot_ctrl';
@@ -18,6 +15,7 @@ import './panellinks/module';
 // Services
 import './services/DashboardViewStateSrv';
 import './services/UnsavedChangesSrv';
+import './services/DashboardLoaderSrv';
 
 // Components
 import './components/DashLinks';
@@ -30,6 +28,7 @@ import './components/DashboardSettings';
 import './components/SubMenu';
 import './components/TimePicker';
 import './components/UnsavedChangesModal';
+import './components/SaveModals';
 
 import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
 
diff --git a/public/app/features/dashboard/dashboard_loader_srv.ts b/public/app/features/dashboard/services/DashboardLoaderSrv.ts
similarity index 100%
rename from public/app/features/dashboard/dashboard_loader_srv.ts
rename to public/app/features/dashboard/services/DashboardLoaderSrv.ts