Skip to content

Add Legend by Default #2456

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

Merged
rashidkpc merged 4 commits into from
Dec 29, 2014
Merged

Add Legend by Default #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a848153
Removing isLegendShown function
stormpython Dec 11, 2014
7717706
Merge branch 'master' into feature/#2151
stormpython Dec 11, 2014
7b86e79
Closes #2151. Adds legend to visualizations by default. Default legen…
stormpython Dec 11, 2014
fe99c3b
Merge branch 'master' into feature/#2151
stormpython Dec 23, 2014
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
10 changes: 7 additions & 3 deletions src/kibana/components/vislib/lib/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,17 @@ define(function (require) {
this.labels;

if (this.type === 'series') {
this.labels = getLabels(data);
if (getLabels(data).length === 1 && getLabels(data)[0] === '') {
this.labels = [(this.get('yAxisLabel'))];
} else {
this.labels = getLabels(data);
}
} else if (this.type === 'slices') {
this.labels = this.pieNames();
}

this.color = this.labels ? color(this.labels) : undefined;

this._normalizeOrdered();

this._attr = _.defaults(attr || {}, {
Expand Down Expand Up @@ -459,7 +463,7 @@ define(function (require) {
* series.rows is an array of arrays
* each row is an array of values
* last value in row array is bucket count
*
*
* @method mapDataExtents
* @param series {Array} Array of data objects
* @returns {Array} min and max values
Expand Down
2 changes: 1 addition & 1 deletion src/kibana/components/vislib/lib/handler/handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ define(function (require) {
this.chartTitle = opts.chartTitle;
this.axisTitle = opts.axisTitle;

if (this._attr.addLegend && this.data.isLegendShown()) {
if (this._attr.addLegend) {
this.legend = opts.legend;
}

Expand Down
2 changes: 1 addition & 1 deletion src/kibana/components/vislib/lib/handler/types/column.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ define(function (require) {

return new Handler(vis, {
data: data,
legend: new Legend(vis, vis.el, data.getLabels(), data.getColorFunc(), vis._attr),
legend: new Legend(vis, vis.el, data.labels, data.color, vis._attr),
axisTitle: new AxisTitle(vis.el, data.get('xAxisLabel'), data.get('yAxisLabel')),
chartTitle: new ChartTitle(vis.el),
xAxis: new XAxis({
Expand Down
2 changes: 1 addition & 1 deletion src/kibana/plugins/discover/controllers/discover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ define(function (require) {
// TODO: a legit way to update the index pattern
$scope.vis = new Vis($scope.searchSource.get('index'), {
type: 'histogram',
vislibParams: {
params: {
addLegend: false,
},
listeners: {
Expand Down