diff --git a/app/app.js b/app/app.js index 69e1ec7..eff8a10 100644 --- a/app/app.js +++ b/app/app.js @@ -5,9 +5,7 @@ angular.element(document).ready(function () { $.get('components/config/config.json', function (data) { angular.module('adagios.config').config(['readConfigProvider', function (readConfigProvider) { - readConfigProvider.setDashboardConfig(data.dashboardConfig); - readConfigProvider.setHostsConfig(data.hostsConfig); - readConfigProvider.setServicesConfig(data.servicesConfig); + readConfigProvider.loadJSON(data); }]); angular.bootstrap(document, ['adagios']); diff --git a/app/components/config/config.js b/app/components/config/config.js index ddaea3c..e389051 100644 --- a/app/components/config/config.js +++ b/app/components/config/config.js @@ -1,33 +1,21 @@ 'use strict'; -function AdagiosConfig(dashboardConfig, hostsConfig, servicesConfig) { - this.dashboardConfig = dashboardConfig; - this.hostsConfig = hostsConfig; - this.servicesConfig = servicesConfig; +function AdagiosConfig(data) { + this.data = data; } angular.module('adagios.config', []) .provider('readConfig', function ReadConfigProvider() { - var dashboardConfig = {}, - hostsConfig = {}, - servicesConfig = {}; + var data = {}; - this.setDashboardConfig = function (value) { - dashboardConfig = value; - }; - - this.setHostsConfig = function (value) { - hostsConfig = value; - }; - - this.setServicesConfig = function (value) { - servicesConfig = value; + this.loadJSON = function (value) { + data = value; }; this.$get = [function getConfigFactory() { - return new AdagiosConfig(dashboardConfig, hostsConfig, servicesConfig); + return new AdagiosConfig(data); }]; }); diff --git a/app/dashboard/dashboard.js b/app/dashboard/dashboard.js index 834c5ec..e2b1764 100644 --- a/app/dashboard/dashboard.js +++ b/app/dashboard/dashboard.js @@ -23,7 +23,7 @@ angular.module('adagios.tactical', ['ngRoute', }]) .run(['readConfig', 'dashboardConfig', function (readConfig, dashboardConfig) { - dashboardConfig.cells = readConfig.dashboardConfig.cells; - dashboardConfig.apiName = readConfig.dashboardConfig.apiName; - dashboardConfig.filters = readConfig.dashboardConfig.filters; + dashboardConfig.cells = readConfig.data.dashboardConfig.cells; + dashboardConfig.apiName = readConfig.data.dashboardConfig.apiName; + dashboardConfig.filters = readConfig.data.dashboardConfig.filters; }]); diff --git a/app/hosts/hosts.js b/app/hosts/hosts.js index 4b9a616..07294ef 100644 --- a/app/hosts/hosts.js +++ b/app/hosts/hosts.js @@ -20,7 +20,7 @@ angular.module('adagios.view.hosts', ['ngRoute', }]) .run(['readConfig', 'hostsConfig', function (readConfig, hostsConfig) { - hostsConfig.cells = readConfig.hostsConfig.cells; - hostsConfig.apiName = readConfig.hostsConfig.apiName; - hostsConfig.filters = readConfig.hostsConfig.filters; + hostsConfig.cells = readConfig.data.hostsConfig.cells; + hostsConfig.apiName = readConfig.data.hostsConfig.apiName; + hostsConfig.filters = readConfig.data.hostsConfig.filters; }]); diff --git a/app/services/services.js b/app/services/services.js index a5a5f90..33efb99 100644 --- a/app/services/services.js +++ b/app/services/services.js @@ -20,7 +20,7 @@ angular.module('adagios.view.services', ['ngRoute', }]) .run(['readConfig', 'servicesConfig', function (readConfig, servicesConfig) { - servicesConfig.cells = readConfig.servicesConfig.cells; - servicesConfig.apiName = readConfig.servicesConfig.apiName; - servicesConfig.filters = readConfig.servicesConfig.filters; + servicesConfig.cells = readConfig.data.servicesConfig.cells; + servicesConfig.apiName = readConfig.data.servicesConfig.apiName; + servicesConfig.filters = readConfig.data.servicesConfig.filters; }]);