Changed ngXosLib CI tests to include builded views
diff --git a/views/ngXosViews/ceilometerDashboard/src/js/dashboard.directive.js b/views/ngXosViews/ceilometerDashboard/src/js/dashboard.directive.js
index a051350..6a65732 100644
--- a/views/ngXosViews/ceilometerDashboard/src/js/dashboard.directive.js
+++ b/views/ngXosViews/ceilometerDashboard/src/js/dashboard.directive.js
@@ -10,7 +10,7 @@
'use strict';
angular.module('xos.ceilometerDashboard')
- .directive('ceilometerDashboard', function(lodash){
+ .directive('ceilometerDashboard', function(_){
return {
restrict: 'E',
scope: {},
@@ -120,7 +120,7 @@
});
// end rename things in UI
- this.selectedResources = lodash.groupBy(sliceMeters, 'resource_name');
+ this.selectedResources = _.groupBy(sliceMeters, 'resource_name');
// hacky
if(Ceilometer.selectedResource){
diff --git a/views/ngXosViews/ceilometerDashboard/src/js/main.js b/views/ngXosViews/ceilometerDashboard/src/js/main.js
index 26cdcbc..43a8a14 100644
--- a/views/ngXosViews/ceilometerDashboard/src/js/main.js
+++ b/views/ngXosViews/ceilometerDashboard/src/js/main.js
@@ -3,7 +3,6 @@
angular.module('xos.ceilometerDashboard', [
'ngResource',
'ngCookies',
- 'ngLodash',
'ui.router',
'xos.helpers',
'ngAnimate',
diff --git a/views/ngXosViews/ceilometerDashboard/src/js/samples.directive.js b/views/ngXosViews/ceilometerDashboard/src/js/samples.directive.js
index 42b08e5..9f2dcea 100644
--- a/views/ngXosViews/ceilometerDashboard/src/js/samples.directive.js
+++ b/views/ngXosViews/ceilometerDashboard/src/js/samples.directive.js
@@ -10,7 +10,7 @@
'use strict';
angular.module('xos.ceilometerDashboard')
- .directive('ceilometerSamples', function(lodash, $stateParams){
+ .directive('ceilometerSamples', function(_, $stateParams){
return {
restrict: 'E',
scope: {},
@@ -19,8 +19,6 @@
templateUrl: 'templates/ceilometer-samples.tpl.html',
controller: function(Ceilometer) {
- // console.log(Ceilometer.selectResource);
-
this.chartColors = [
'#286090',
'#F7464A',
@@ -86,17 +84,17 @@
*/
this.chartMeters = [];
this.addMeterToChart = (resource_id) => {
- this.chart['labels'] = this.getLabels(lodash.sortBy(this.samplesList[resource_id], 'timestamp'));
+ this.chart['labels'] = this.getLabels(_.sortBy(this.samplesList[resource_id], 'timestamp'));
this.chart['series'].push(resource_id);
- this.chart['data'].push(this.getData(lodash.sortBy(this.samplesList[resource_id], 'timestamp')));
+ this.chart['data'].push(this.getData(_.sortBy(this.samplesList[resource_id], 'timestamp')));
this.chartMeters.push(this.samplesList[resource_id][0]); //use the 0 as are all samples for the same resource and I need the name
- lodash.remove(this.sampleLabels, {id: resource_id});
+ _.remove(this.sampleLabels, {id: resource_id});
}
this.removeFromChart = (meter) => {
this.chart.data.splice(this.chart.series.indexOf(meter.resource_id), 1);
this.chart.series.splice(this.chart.series.indexOf(meter.resource_id), 1);
- this.chartMeters.splice(lodash.findIndex(this.chartMeters, {resource_id: meter.resource_id}), 1);
+ this.chartMeters.splice(_.findIndex(this.chartMeters, {resource_id: meter.resource_id}), 1);
this.sampleLabels.push({
id: meter.resource_id,
name: meter.resource_name || meter.resource_id
@@ -109,7 +107,7 @@
this.formatSamplesLabels = (samples) => {
- return lodash.uniq(samples, 'resource_id')
+ return _.uniq(samples, 'resource_id')
.reduce((labels, item) => {
labels.push({
id: item.resource_id,
@@ -141,7 +139,7 @@
// end rename things in UI
// setup data for visualization
- this.samplesList = lodash.groupBy(res, 'resource_id');
+ this.samplesList = _.groupBy(res, 'resource_id');
this.sampleLabels = this.formatSamplesLabels(res);
// add current meter to chart