Skip to content

Commit

Permalink
Addressed some code climate warnings.
Browse files Browse the repository at this point in the history 
https://www.pivotaltracker.com/story/show/147962059
  • Loading branch information
@h-kataria
h-kataria committed Nov 10, 2017
1 parent 6c99339 commit 4db9581
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 84 deletions.
24 changes: 12 additions & 12 deletions app/assets/javascripts/components/pf_charts/trends-chart.component.js
View file
Expand Up @@ -4,48 +4,48 @@ angular.module( 'patternfly.charts' ).component('pfTrendsChart', {
chartData: '<',
chartHeight: '<?',
showXAxis: '<?',
showYAxis: '<?'
showYAxis: '<?',
},
templateUrl: '/static/pf_charts/trends-chart.html.haml',
controller: trendsChartController,
});
trendsChartController.$inject = ['pfUtils'];
trendsChartController.$inject = [];

function trendsChartController(pfUtils) {
function trendsChartController() {
'use strict';
var vm = this;
var prevChartData;
var prevConfig;
var SMALL = 30;
var LARGE = 60;

vm.updateAll = function () {
vm.updateAll = function() {
// Need to deep watch changes
prevChartData = angular.copy(vm.chartData);
prevConfig = angular.copy(vm.config);

vm.showLargeCardLayout = (!vm.config.layout || vm.config.layout === 'large');
vm.showLargeCardLayout = (! vm.config.layout || vm.config.layout === 'large');
vm.showSmallCardLayout = (vm.config.layout === 'small');
vm.showActualValue = (!vm.config.valueType || vm.config.valueType === 'actual');
vm.showActualValue = (! vm.config.valueType || vm.config.valueType === 'actual');
vm.showPercentageValue = (vm.config.valueType === 'percentage');
};

vm.getPercentageValue = function () {
vm.getPercentageValue = function() {
var pctValue = 0;

if (vm.chartData.dataAvailable !== false && vm.chartData.total > 0) {
pctValue = Math.round(vm.getLatestValue() / vm.chartData.total * 100.0);
}
return pctValue;
};
vm.getLatestValue = function () {
vm.getLatestValue = function() {
var latestValue = 0;
if (vm.chartData.yData && vm.chartData.yData.length > 0) {
latestValue = vm.chartData.yData[vm.chartData.yData.length - 1];
}
return latestValue;
};
vm.getChartHeight = function () {
vm.getChartHeight = function() {
var retValue = LARGE;
if (vm.chartHeight) {
retValue = vm.chartHeight;
Expand All @@ -55,13 +55,13 @@ function trendsChartController(pfUtils) {
return retValue;
};

vm.$onChanges = function (changesObj) {
vm.$onChanges = function() {
vm.updateAll();
};

vm.$doCheck = function () {
vm.$doCheck = function() {
// do a deep compare on chartData and config
if (!angular.equals(vm.chartData, prevChartData) || !angular.equals(vm.config, prevConfig)) {
if (! angular.equals(vm.chartData, prevChartData) || ! angular.equals(vm.config, prevConfig)) {
vm.updateAll();
}
};
Expand Down
25 changes: 7 additions & 18 deletions ...ssets/javascripts/controllers/ems_container_dashboard/aggregate_status_card_controller.js
View file
Expand Up @@ -24,17 +24,6 @@ angular.module( 'patternfly.card' ).controller('aggregateStatusCardContainerCont
"images": "pficon pficon-image",
"routes": "pficon pficon-route",
};
//
// var attrUrl = {
// "nodes": "container_node",
// "containers": "container",
// "registries": "container_image_registry",
// "projects": "container_project",
// "pods": "container_group",
// "services": "container_service",
// "images": "container_image",
// "routes": "container_route",
// };

var init = function() {
ManageIQ.angular.scope = vm;
Expand All @@ -47,7 +36,7 @@ angular.module( 'patternfly.card' ).controller('aggregateStatusCardContainerCont
.catch(miqService.handleFailure);

$q.all([promiseProviderData]).then(function() {
data = vm.provider.data.data
var data = vm.provider.data.data

vm.status = {
"iconImage": data.providers[0].iconImage,
Expand All @@ -56,27 +45,27 @@ angular.module( 'patternfly.card' ).controller('aggregateStatusCardContainerCont
{
"iconImage": data.providers[0].statusIcon,
},
]
],
};

vm.alertStatus = {
"title": "Alerts",
"notifications":[
"notifications": [
{
"iconClass": data.alerts.notifications[0].iconClass,
},
]
],
};

vm.AggStatus = [];
for (var i = 0; i < attributes.length; i++) {
data_status = data.status[attributes[i]];
var dataStatus = data.status[attributes[i]];
vm.AggStatus.push({
"id": attributes[i] + '_' + providerId,
"iconClass": attrIconHsh[attributes[i]],
"title": attrHsh[attributes[i]],
"count": data_status.count,
"href": data_status.href,
"count": dataStatus.count,
"href": dataStatus.href,
"notification": {
"iconClass": "pficon pficon-error-circle-o",
"count": 0,
Expand Down
3 changes: 1 addition & 2 deletions ...sets/javascripts/controllers/ems_container_dashboard/recent_pods_line_chart_controller.js
View file
@@ -1,12 +1,11 @@
/* global miqHttpInject */
angular.module( 'patternfly.charts' ).controller( 'recentPodsLineChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', 'dashboardUtilsFactory', function($q, providerId, $http, chartsMixin, miqService, dashboardUtilsFactory) {
angular.module( 'patternfly.charts' ).controller( 'recentPodsLineChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', function($q, providerId, $http, chartsMixin, miqService) {
var vm = this;
vm.id = "recentPodsLineChart_" + providerId;
vm.lineChartId = vm.id
var init = function() {
ManageIQ.angular.scope = vm;
vm.loadingDone = false;
//vm.config = chartsMixin.chartConfig.hourlyPodUsageConfig;
vm.timeframeLabel = __('Last 30 Days');
var url = '/container_dashboard/pod_metrics_data/' + providerId;
var podsDataPromise = $http.get(url)
Expand Down
3 changes: 1 addition & 2 deletions app/assets/javascripts/controllers/ems_container_dashboard/trends_chart_controller.js
View file
@@ -1,6 +1,5 @@
/* global miqHttpInject */
angular.module( 'patternfly.card' ).controller('trendsChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', function($q, providerId, $http, chartsMixin, miqService) {
//angular.module('trendChartController', ['patternfly.charts', 'patternfly.card', 'ui.bootstrap'] ).controller('trendChartController', ['$q', 'providerId', '$http', 'chartsMixin', 'miqService', function($q, providerId, $http, chartsMixin, miqService) {
var vm = this;
vm.id = "trendsChart_" + providerId;
var init = function() {
Expand Down Expand Up @@ -29,7 +28,7 @@ angular.module( 'patternfly.card' ).controller('trendsChartController', ['$q', '
vm.data.dataAvailable = false;
} else {
if (data.xy_data != null) {
data.xy_data.xData = data.xy_data.xData.map(function (date) {
data.xy_data.xData = data.xy_data.xData.map(function(date) {
return chartsMixin.parseDate(date);
});
}
Expand Down
18 changes: 9 additions & 9 deletions ...ets/javascripts/controllers/ems_container_dashboard/utilization_trend_chart_controller.js
View file
@@ -1,4 +1,4 @@
angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainerController', ['$q', 'providerId', 'chartsMixin', '$http', 'miqService', 'dashboardUtilsFactory', function($q, providerId, chartsMixin, $http, miqService, dashboardUtilsFactory) {
angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainerController', ['$q', 'providerId', 'chartsMixin', '$http', 'miqService', function($q, providerId, chartsMixin, $http, miqService) {
var vm = this;

var init = function() {
Expand Down Expand Up @@ -34,22 +34,22 @@ angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainer
};
};

var processMetricsData = function(metricsDataStruct, all_data) {
var data = all_data.xy_data;
var processMetricsData = function(metricsDataStruct, allData) {
var data = allData.xy_data;

if (all_data.interval_name === 'hourly') {
if (allData.interval_name === 'hourly') {
vm.timeframeLabel = __('Last 24 hours');
} else if (all_data.interval_name === 'realtime') {
} else if (allData.interval_name === 'realtime') {
vm.timeframeLabel = __('Last 10 minutes');
} else {
vm.timeframeLabel = __('Last 30 Days');
}

if (all_data.xy_data.cpu != null) {
all_data.xy_data.cpu.xData = all_data.xy_data.cpu.xData.map(function(date) {
if (allData.xy_data.cpu != null) {
allData.xy_data.cpu.xData = allData.xy_data.cpu.xData.map(function(date) {
return chartsMixin.parseDate(date);
});
all_data.xy_data.memory.xData = all_data.xy_data.memory.xData.map(function(date) {
allData.xy_data.memory.xData = allData.xy_data.memory.xData.map(function(date) {
return chartsMixin.parseDate(date);
});
}
Expand All @@ -66,7 +66,7 @@ angular.module( 'patternfly.charts' ).controller('utilizationTrendChartContainer
},
};
} else {
if (all_data.interval_name !== 'daily') {
if (allData.interval_name !== 'daily') {
vm.cpuUsageSparklineConfig.tooltipFn = chartsMixin.hourlyTimeTooltip;
vm.memoryUsageSparklineConfig.tooltipFn = chartsMixin.hourlyTimeTooltip;
}
Expand Down
74 changes: 37 additions & 37 deletions app/assets/javascripts/controllers/mixins/charts-mixin.js
View file
Expand Up @@ -119,79 +119,79 @@ angular.module('miq.util').factory('chartsMixin', ['$document', 'pfUtils', funct
setAreaChart: true,
},
dailyNetworkUsageConfig: {
chartId : 'networkUsageDailyChart',
chartId: 'networkUsageDailyChart',
headTitle: __('Network Utilization Trend'),
timeFrame: __('Last 30 Days'),
units : __('KBps'),
dataName : __('KBps'),
tooltipFn : dailyTimeTooltip,
units: __('KBps'),
dataName: __('KBps'),
tooltipFn: dailyTimeTooltip,
},
hourlyNetworkUsageConfig: {
chartId : 'networkUsageHourlyChart',
chartId: 'networkUsageHourlyChart',
headTitle: __('Network Utilization Trend'),
timeFrame: __('Last 24 Hours'),
units : __('KBps'),
dataName : __('KBps'),
tooltipFn : hourlyTimeTooltip,
units: __('KBps'),
dataName: __('KBps'),
tooltipFn: hourlyTimeTooltip,
},
dailyPodUsageConfig: {
chartId : 'podUsageDailyChart',
headTitle : __('Pod Creation and Deletion Trends'),
timeFrame : __('Last 30 days'),
chartId: 'podUsageDailyChart',
headTitle: __('Pod Creation and Deletion Trends'),
timeFrame: __('Last 30 days'),
createdLabel: __('Created'),
deletedLabel: __('Deleted'),
tooltip : {
tooltip: {
contents: dailyPodTimeTooltip,
position: lineChartTooltipPositionFactory('podUsageDailyChart'),
},
point : {r: 1},
size : {height: 145},
color : {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
grid : {y: {show: false}},
point: {r: 1},
size: {height: 145},
color: {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
grid: {y: {show: false}},
setAreaChart: true,
},
hourlyPodUsageConfig: {
chartId : 'podUsageHourlyChart',
headTitle : __('Pod Creation and Deletion Trends'),
timeFrame : __('Last 24 hours'),
chartId: 'podUsageHourlyChart',
headTitle: __('Pod Creation and Deletion Trends'),
timeFrame: __('Last 24 hours'),
createdLabel: __('Created'),
deletedLabel: __('Deleted'),
tooltip : {
tooltip: {
contents: hourlyPodTimeTooltip,
position: lineChartTooltipPositionFactory('podUsageHourlyChart'),
},
point : {r: 1},
size : {height: 145},
color : {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
grid : {y: {show: false}},
point: {r: 1},
size: {height: 145},
color: {pattern: [pfUtils.colorPalette.blue, pfUtils.colorPalette.green]},
grid: {y: {show: false}},
setAreaChart: true,
},
dailyImageUsageConfig: {
chartId : 'imageUsageDailyChart',
headTitle : __('New Image Usage Trend'),
timeFrame : __('Last 30 days'),
chartId: 'imageUsageDailyChart',
headTitle: __('New Image Usage Trend'),
timeFrame: __('Last 30 days'),
createdLabel: __('Images'),
tooltip : {
tooltip: {
contents: dailyTimeTooltip,
position: lineChartTooltipPositionFactory('imageUsageDailyChart'),
},
point : {r: 1},
size : {height: 93},
grid : {y: {show: false}},
point: {r: 1},
size: {height: 93},
grid: {y: {show: false}},
setAreaChart: true,
},
hourlyImageUsageConfig: {
chartId : 'imageUsageHourlyChart',
headTitle : __('New Image Usage Trend'),
timeFrame : __('Last 24 hours'),
chartId: 'imageUsageHourlyChart',
headTitle: __('New Image Usage Trend'),
timeFrame: __('Last 24 hours'),
createdLabel: __('Images'),
tooltip : {
contents: hourlyTimeTooltip,
position: lineChartTooltipPositionFactory('imageUsageHourlyChart'),
},
point : {r: 1},
size : {height: 93},
grid : {y: {show: false}},
point: {r: 1},
size: {height: 93},
grid: {y: {show: false}},
setAreaChart: true,
},
};
Expand Down
4 changes: 0 additions & 4 deletions app/controllers/container_dashboard_controller.rb
View file
Expand Up @@ -89,10 +89,6 @@ def collect_image_metrics_data(provider_id)
ContainerDashboardService.new(provider_id, self).image_metrics_data
end

def collect_network_metrics_data(provider_id)
ContainerDashboardService.new(provider_id, self).network_metrics_data
end

def collect_live_data(provider_id, query)
ems = ExtManagementSystem.find(provider_id)

Expand Down

0 comments on commit 4db9581

Please sign in to comment.