From e50050941a4ab555ce4f8307b43a6ee244f0f247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vachon?= <fredvac@gmail.com>
Date: Fri, 6 Mar 2015 17:22:06 -0500
Subject: [PATCH] Dashboard is now a template

---
 app/components/config/config.json   |  2 +-
 app/components/sidebar/sidebar.html |  2 +-
 app/dashboard/dashboard.js          | 28 +++++++++++++++++++++-------
 app/single_table/single_table.js    |  2 +-
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/components/config/config.json b/app/components/config/config.json
index a109953..e296de0 100644
--- a/app/components/config/config.json
+++ b/app/components/config/config.json
@@ -2,7 +2,7 @@
     "dashboardConfig": {
 		"title": "Unhandled service problems",
 		"refreshInterval": "10000",
-		"template": "",
+		"template": "dashboard",
 		"components" : [
 			{
 				"type": "tactical",
diff --git a/app/components/sidebar/sidebar.html b/app/components/sidebar/sidebar.html
index 4256acc..cc716f9 100644
--- a/app/components/sidebar/sidebar.html
+++ b/app/components/sidebar/sidebar.html
@@ -15,7 +15,7 @@
         <span class="sidebar__category">Shortcut</span>
         
         <ul class="sidebar__sublist" id="shortcutList">
-          <li class="sidebar__subitem"><a ng-class="getClass('/dashboard')" href="#/dashboard">Dashboard</a></li>
+          <li class="sidebar__subitem"><a ng-class="getClass('/dashboard?view=dashboardConfig')" href="#/dashboard?view=dashboardConfig">Dashboard</a></li>
           <li class="sidebar__subitem"><a ng-class="getClass('/singleTable?view=hostsConfig')" href="#/singleTable?view=hostsConfig">Hosts</a></li>
           <li class="sidebar__subitem"><a ng-class="getClass('/singleTable?view=servicesConfig')" href="#/singleTable?view=servicesConfig">Services</a></li>
           <li class="sidebar__subitem"><a href="#">Networks parents</a></li>
diff --git a/app/dashboard/dashboard.js b/app/dashboard/dashboard.js
index 901016f..eae2367 100644
--- a/app/dashboard/dashboard.js
+++ b/app/dashboard/dashboard.js
@@ -15,8 +15,8 @@ angular.module('adagios.view.dashboard', ['ngRoute',
         });
     }])
 
-    .controller('DashboardCtrl', ['$scope', 'dashboardConfig', 'getServices', 'tableConfig', 'TableConfigObj', 'TacticalConfigObj',
-        function ($scope, dashboardConfig, getServices, tableConfig, TableConfigObj, TacticalConfigObj) {
+    .controller('DashboardCtrl', ['$scope', '$routeParams', 'dashboardConfig', 'getServices', 'tableConfig', 'TableConfigObj', 'TacticalConfigObj',
+        function ($scope, $routeParams, dashboardConfig, getServices, tableConfig, TableConfigObj, TacticalConfigObj) {
 
             var fields = ['state'],
                 filters = {'isnot' : { 'state' : ['0'] }},
@@ -24,17 +24,25 @@ angular.module('adagios.view.dashboard', ['ngRoute',
                 components = [],
                 component,
                 config,
+                viewName,
                 i = 0;
 
             tableConfig.index = 0;
-            $scope.dashboardTitle = dashboardConfig.data.title;
-            $scope.dashboardTemplate = dashboardConfig.data.template;
-            $scope.dashboardRefreshInterval = dashboardConfig.data.refreshInterval;
+
+            if (!!$routeParams.view) {
+                viewName = $routeParams.view;
+            } else {
+                throw new Error("ERROR : 'view' GET parameter must be the custom view name");
+            }
+
+            $scope.dashboardTitle = dashboardConfig[viewName].title;
+            $scope.dashboardTemplate = dashboardConfig[viewName].template;
+            $scope.dashboardRefreshInterval = dashboardConfig[viewName].refreshInterval;
 
             $scope.dashboardTactical = [];
             $scope.dashboardTables = [];
 
-            components = dashboardConfig.data.components;
+            components = dashboardConfig[viewName].components;
 
             for (i = 0; i < components.length; i += 1) {
                 component = components[i];
@@ -54,5 +62,11 @@ angular.module('adagios.view.dashboard', ['ngRoute',
         }])
 
     .run(['readConfig', 'dashboardConfig', function (readConfig, dashboardConfig) {
-        dashboardConfig.data = readConfig.data.dashboardConfig;
+        var viewsConfig = readConfig.data;
+
+        angular.forEach(viewsConfig, function (config, view) {
+            if (config.template === 'dashboard') {
+                dashboardConfig[view] = config;
+            }
+        });
     }]);
diff --git a/app/single_table/single_table.js b/app/single_table/single_table.js
index ceae888..2799303 100644
--- a/app/single_table/single_table.js
+++ b/app/single_table/single_table.js
@@ -38,7 +38,7 @@ angular.module('adagios.view.singleTable', ['ngRoute',
         var viewsConfig = readConfig.data;
 
         angular.forEach(viewsConfig, function (config, view) {
-            if (config.template === "singleTable") {
+            if (config.template === 'singleTable') {
                 singleTableConfig[view] = config;
             }
         });