From ec37f8472709a5cdc3dbef782df67cce0d090ec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Wed, 23 Jan 2019 11:55:52 +0100
Subject: [PATCH] Moved timepicker to components

---
 .../TimePicker/TimePickerCtrl.ts}                           | 6 +++---
 .../app/features/dashboard/components/TimePicker/index.ts   | 1 +
 .../{timepicker => components/TimePicker}/settings.html     | 0
 .../timepicker.html => components/TimePicker/template.html} | 0
 .../input_date.ts => components/TimePicker/validation.ts}   | 0
 public/app/features/dashboard/index.ts                      | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename public/app/features/dashboard/{timepicker/timepicker.ts => components/TimePicker/TimePickerCtrl.ts} (95%)
 create mode 100644 public/app/features/dashboard/components/TimePicker/index.ts
 rename public/app/features/dashboard/{timepicker => components/TimePicker}/settings.html (100%)
 rename public/app/features/dashboard/{timepicker/timepicker.html => components/TimePicker/template.html} (100%)
 rename public/app/features/dashboard/{timepicker/input_date.ts => components/TimePicker/validation.ts} (100%)

diff --git a/public/app/features/dashboard/timepicker/timepicker.ts b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
similarity index 95%
rename from public/app/features/dashboard/timepicker/timepicker.ts
rename to public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
index c89e49b54b3..0c388c27f8d 100644
--- a/public/app/features/dashboard/timepicker/timepicker.ts
+++ b/public/app/features/dashboard/components/TimePicker/TimePickerCtrl.ts
@@ -159,7 +159,7 @@ export class TimePickerCtrl {
 export function settingsDirective() {
   return {
     restrict: 'E',
-    templateUrl: 'public/app/features/dashboard/timepicker/settings.html',
+    templateUrl: 'public/app/features/dashboard/components/TimePicker/settings.html',
     controller: TimePickerCtrl,
     bindToController: true,
     controllerAs: 'ctrl',
@@ -172,7 +172,7 @@ export function settingsDirective() {
 export function timePickerDirective() {
   return {
     restrict: 'E',
-    templateUrl: 'public/app/features/dashboard/timepicker/timepicker.html',
+    templateUrl: 'public/app/features/dashboard/components/TimePicker/template.html',
     controller: TimePickerCtrl,
     bindToController: true,
     controllerAs: 'ctrl',
@@ -185,5 +185,5 @@ export function timePickerDirective() {
 angular.module('grafana.directives').directive('gfTimePickerSettings', settingsDirective);
 angular.module('grafana.directives').directive('gfTimePicker', timePickerDirective);
 
-import { inputDateDirective } from './input_date';
+import { inputDateDirective } from './validation';
 angular.module('grafana.directives').directive('inputDatetime', inputDateDirective);
diff --git a/public/app/features/dashboard/components/TimePicker/index.ts b/public/app/features/dashboard/components/TimePicker/index.ts
new file mode 100644
index 00000000000..ca6e2792c43
--- /dev/null
+++ b/public/app/features/dashboard/components/TimePicker/index.ts
@@ -0,0 +1 @@
+export { TimePickerCtrl } from './TimePickerCtrl';
diff --git a/public/app/features/dashboard/timepicker/settings.html b/public/app/features/dashboard/components/TimePicker/settings.html
similarity index 100%
rename from public/app/features/dashboard/timepicker/settings.html
rename to public/app/features/dashboard/components/TimePicker/settings.html
diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/components/TimePicker/template.html
similarity index 100%
rename from public/app/features/dashboard/timepicker/timepicker.html
rename to public/app/features/dashboard/components/TimePicker/template.html
diff --git a/public/app/features/dashboard/timepicker/input_date.ts b/public/app/features/dashboard/components/TimePicker/validation.ts
similarity index 100%
rename from public/app/features/dashboard/timepicker/input_date.ts
rename to public/app/features/dashboard/components/TimePicker/validation.ts
diff --git a/public/app/features/dashboard/index.ts b/public/app/features/dashboard/index.ts
index a5f352bcdd8..692fe50c765 100644
--- a/public/app/features/dashboard/index.ts
+++ b/public/app/features/dashboard/index.ts
@@ -12,7 +12,6 @@ import './validation_srv';
 import './time_srv';
 import './unsaved_changes_srv';
 import './unsaved_changes_modal';
-import './timepicker/timepicker';
 import './upload';
 import './ad_hoc_filters';
 import './repeat_option/repeat_option';
@@ -27,6 +26,7 @@ import './components/FolderPicker';
 import './components/VersionHistory';
 import './components/DashboardSettings';
 import './components/SubMenu';
+import './components/TimePicker';
 import DashboardPermissions from './components/DashboardPermissions/DashboardPermissions';
 
 // angular wrappers