Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make route services pie chart responsive #1275

Merged
merged 1 commit into from
Feb 22, 2017
Merged

Make route services pie chart responsive #1275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions app/scripts/directives/routeServicePie.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ angular.module('openshiftConsole')
template: '<div ng-show="totalWeight" ng-attr-id="{{chartId}}"></div>',
link: function($scope) {
var chart, config;
var mobile = window.matchMedia("(max-width: 400px)").matches;

$scope.chartId = _.uniqueId('route-service-chart-');

Expand All @@ -20,16 +21,23 @@ angular.module('openshiftConsole')
},
legend: {
show: true,
position: 'right'
position: mobile ? 'bottom' : 'right'
},
pie: {
label: {
show: false
}
},
size: {
height: 115,
width: 260
height: mobile ? 150 : 115
},
tooltip: {
format: {
name: function(name, ratio, id) {
// Show the full name on hover, even if name is truncated for the legend.
return id;
}
}
},
data: {
type: "pie",
Expand Down Expand Up @@ -69,14 +77,17 @@ angular.module('openshiftConsole')

function updateChart() {
var data = {
columns: []
columns: [],
names: {}
};

if ($scope.route) {
data.columns.push(getData($scope.route.spec.to));
data.names[$scope.route.spec.to.name] = _.trunc($scope.route.spec.to.name, { length: 30 });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so the full name isn't available on hover either?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated with a fix

$scope.totalWeight = $scope.route.spec.to.weight;
_.each($scope.route.spec.alternateBackends, function(routeTarget) {
data.columns.push(getData(routeTarget));
data.names[routeTarget.name] = _.trunc(routeTarget.name, { length: 30 });
$scope.totalWeight += routeTarget.weight;
});
}
Expand Down
4 changes: 2 additions & 2 deletions app/views/browse/route.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ <h4>Traffic</h4>
This route splits traffic across multiple services.
</div>
</div>
<div class="col-sm-5 col-sm-push-7 mar-bottom-lg">
<div class="col-sm-12 col-md-5 col-md-push-7 mar-bottom-lg">
<route-service-pie route="route"></route-service-pie>
</div>
<div class="col-sm-7 col-sm-pull-5">
<div class="cold-sm-12 col-md-7 col-md-pull-5">
<table class="table table-bordered">
<thead>
<tr>
Expand Down
45 changes: 28 additions & 17 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12389,30 +12389,41 @@ template:'<div ng-show="totalWeight" ng-attr-id="{{chartId}}"></div>',
link:function(a) {
function b() {
var b = {
columns:[]
};
a.route && (b.columns.push(f(a.route.spec.to)), a.totalWeight = a.route.spec.to.weight, _.each(a.route.spec.alternateBackends, function(c) {
b.columns.push(f(c)), a.totalWeight += c.weight;
})), a.totalWeight && (c ? (h(b), c.load(b)) :(d.data.columns = b.columns, c = c3.generate(d)), e = b);
}
var c, d;
columns:[],
names:{}
};
a.route && (b.columns.push(g(a.route.spec.to)), b.names[a.route.spec.to.name] = _.trunc(a.route.spec.to.name, {
length:30
}), a.totalWeight = a.route.spec.to.weight, _.each(a.route.spec.alternateBackends, function(c) {
b.columns.push(g(c)), b.names[c.name] = _.trunc(c.name, {
length:30
}), a.totalWeight += c.weight;
})), a.totalWeight && (c ? (i(b), c.load(b)) :(d.data.columns = b.columns, c = c3.generate(d)), f = b);
}
var c, d, e = window.matchMedia("(max-width: 400px)").matches;
a.chartId = _.uniqueId("route-service-chart-"), d = {
bindto:"#" + a.chartId,
color:{
pattern:[ $.pfPaletteColors.blue, $.pfPaletteColors.orange, $.pfPaletteColors.green, $.pfPaletteColors.red ]
},
legend:{
show:!0,
position:"right"
position:e ? "bottom" :"right"
},
pie:{
label:{
show:!1
}
},
size:{
height:115,
width:260
height:e ? 150 :115
},
tooltip:{
format:{
name:function(a, b, c) {
return c;
}
}
},
data:{
type:"pie",
Expand All @@ -12422,21 +12433,21 @@ enabled:!1
}
}
};
var e, f = function(a) {
var f, g = function(a) {
return [ a.name, a.weight ];
}, g = function(a) {
return _.head(a);
}, h = function(a) {
return _.head(a);
}, i = function(a) {
var b = {};
_.each(a.columns, function(a) {
var c = g(a);
var c = h(a);
b[c] = !0;
});
var c = _.get(e, "columns", []);
var c = _.get(f, "columns", []);
a.unload = _.chain(c).reject(function(a) {
var c = g(a);
var c = h(a);
return _.has(b, [ c ]);
}).map(g).value();
}).map(h).value();
};
a.$watch("route", b), a.$on("destroy", function() {
c && (c = c.destroy());
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3708,10 +3708,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"This route splits traffic across multiple services.\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"col-sm-5 col-sm-push-7 mar-bottom-lg\">\n" +
"<div class=\"col-sm-12 col-md-5 col-md-push-7 mar-bottom-lg\">\n" +
"<route-service-pie route=\"route\"></route-service-pie>\n" +
"</div>\n" +
"<div class=\"col-sm-7 col-sm-pull-5\">\n" +
"<div class=\"cold-sm-12 col-md-7 col-md-pull-5\">\n" +
"<table class=\"table table-bordered\">\n" +
"<thead>\n" +
"<tr>\n" +
Expand Down