From f0eef79c1a7c29209392bfcf54441f53dbac56e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 23 Jan 2019 13:31:45 +0100
Subject: [PATCH] Moved ad hoc filters and upload directive

---
 .../AdHocFilters/AdHocFiltersCtrl.ts}                     | 0
 .../features/dashboard/components/AdHocFilters/index.ts   | 1 +
 public/app/features/dashboard/index.ts                    | 4 +---
 .../manage-dashboards/components/UploadDashboard/index.ts | 1 +
 .../UploadDashboard/uploadDashboardDirective.ts}          | 2 +-
 public/app/features/manage-dashboards/index.ts            | 8 +++++++-
 .../services/ValidationSrv.ts}                            | 0
 7 files changed, 11 insertions(+), 5 deletions(-)
 rename public/app/features/dashboard/{ad_hoc_filters.ts => components/AdHocFilters/AdHocFiltersCtrl.ts} (100%)
 create mode 100644 public/app/features/dashboard/components/AdHocFilters/index.ts
 create mode 100644 public/app/features/manage-dashboards/components/UploadDashboard/index.ts
 rename public/app/features/{dashboard/upload.ts => manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts} (96%)
 rename public/app/features/{dashboard/validation_srv.ts => manage-dashboards/services/ValidationSrv.ts} (100%)

diff --git a/public/app/features/dashboard/ad_hoc_filters.ts b/public/app/features/dashboard/components/AdHocFilters/AdHocFiltersCtrl.ts
similarity index 100%
rename from public/app/features/dashboard/ad_hoc_filters.ts
rename to public/app/features/dashboard/components/AdHocFilters/AdHocFiltersCtrl.ts
diff --git a/public/app/features/dashboard/components/AdHocFilters/index.ts b/public/app/features/dashboard/components/AdHocFilters/index.ts
new file mode 100644
index 00000000000..522b564d004
--- /dev/null
+++ b/public/app/features/dashboard/components/AdHocFilters/index.ts
@@ -0,0 +1 @@
+export { AdHocFiltersCtrl } from './AdHocFiltersCtrl';
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index fab23d4641f..79831cd4015 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -1,8 +1,5 @@
 import './dashboard_ctrl';
-import './validation_srv';
 import './time_srv';
-import './ad_hoc_filters';
-import './upload';
 import './repeat_option/repeat_option';
 import './dashgrid/DashboardGridDirective';
 import './dashgrid/RowOptions';
@@ -27,6 +24,7 @@ import './components/TimePicker';
 import './components/UnsavedChangesModal';
 import './components/SaveModals';
 import './components/ShareModal';
+import './components/AdHocFilters';
 
 import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
 
diff --git a/public/app/features/manage-dashboards/components/UploadDashboard/index.ts b/public/app/features/manage-dashboards/components/UploadDashboard/index.ts
new file mode 100644
index 00000000000..828b4f76982
--- /dev/null
+++ b/public/app/features/manage-dashboards/components/UploadDashboard/index.ts
@@ -0,0 +1 @@
+export { uploadDashboardDirective } from './uploadDashboardDirective';
diff --git a/public/app/features/dashboard/upload.ts b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
similarity index 96%
rename from public/app/features/dashboard/upload.ts
rename to public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
index ec4ad9a03cb..0c38a1247f1 100644
--- a/public/app/features/dashboard/upload.ts
+++ b/public/app/features/manage-dashboards/components/UploadDashboard/uploadDashboardDirective.ts
@@ -11,7 +11,7 @@ const template = `
 `;
 
 /** @ngInject */
-function uploadDashboardDirective(timer, $location) {
+export function uploadDashboardDirective(timer, $location) {
   return {
     restrict: 'E',
     template: template,
diff --git a/public/app/features/manage-dashboards/index.ts b/public/app/features/manage-dashboards/index.ts
index b8c53b3137b..c3830ee6546 100644
--- a/public/app/features/manage-dashboards/index.ts
+++ b/public/app/features/manage-dashboards/index.ts
@@ -1,5 +1,11 @@
-export * from './components/MoveToFolderModal';
+// Services
+export { ValidationSrv } from './services/ValidationSrv';
 
+// Components
+export * from './components/MoveToFolderModal';
+export * from './components/UploadDashboard';
+
+// Controllers
 import { DashboardListCtrl } from './DashboardListCtrl';
 import { SnapshotListCtrl } from './SnapshotListCtrl';
 import { FolderDashboardsCtrl } from './FolderDashboardsCtrl';
diff --git a/public/app/features/dashboard/validation_srv.ts b/public/app/features/manage-dashboards/services/ValidationSrv.ts
similarity index 100%
rename from public/app/features/dashboard/validation_srv.ts
rename to public/app/features/manage-dashboards/services/ValidationSrv.ts