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

fix: Table visualization shows total for duration, percentage and bytes field formatters #54240

Merged
merged 9 commits into from
Jan 9, 2020
Merged

fix: Table visualization shows total for duration, percentage and bytes field formatters #54240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7f17c8
fix: allow duration and bytes to display total
mbondyra Jan 8, 2020
c9411b6
Merge branch 'master' into IS-50036_show-sum-for-a-field-with-formatter
elasticmachine Jan 8, 2020
4870bdd
fix: added percent formatter
mbondyra Jan 8, 2020
33515b0
Merge branch 'IS-50036_show-sum-for-a-field-with-formatter' of github…
mbondyra Jan 8, 2020
7382668
refactor: add property to the formatters instead of array of eligible…
mbondyra Jan 9, 2020
ee0e620
refactor: numeric to numeralFormatter
mbondyra Jan 9, 2020
7f77d30
fix: change variable name
mbondyra Jan 9, 2020
bba991c
fix: allowsNumericalAggregations doesn't have to be static
mbondyra Jan 9, 2020
36a2140
Update percent.ts
mbondyra Jan 9, 2020
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: 3 additions & 7 deletions src/legacy/core_plugins/vis_type_table/public/agg_table/agg_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,15 @@ export function KbnAggTable(config, RecursionHelper) {
}

const isDate =
_.get(dimension, 'format.id') === 'date' ||
_.get(dimension, 'format.params.id') === 'date';
const isNumeric =
_.get(dimension, 'format.id') === 'number' ||
_.get(dimension, 'format.params.id') === 'number';
dimension.format?.id === 'date' || dimension.format?.params?.id === 'date';
const allowsNumericalAggregations = formatter?.allowsNumericalAggregations;

let { totalFunc } = $scope;
if (typeof totalFunc === 'undefined' && showPercentage) {
totalFunc = 'sum';
}

if (isNumeric || isDate || totalFunc === 'count') {
if (allowsNumericalAggregations || isDate || totalFunc === 'count') {
const sum = tableRows => {
return _.reduce(
tableRows,
Expand All @@ -161,7 +158,6 @@ export function KbnAggTable(config, RecursionHelper) {
};

formattedColumn.sumTotal = sum(table.rows);

switch (totalFunc) {
case 'sum': {
if (!isDate) {
Expand Down
1 change: 1 addition & 0 deletions src/plugins/data/common/field_formats/converters/bytes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ export class BytesFormat extends NumeralFormat {

id = BytesFormat.id;
title = BytesFormat.title;
allowsNumericalAggregations = true;
}
1 change: 1 addition & 0 deletions src/plugins/data/common/field_formats/converters/duration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ export class DurationFormat extends FieldFormat {
static fieldType = KBN_FIELD_TYPES.NUMBER;
static inputFormats = inputFormats;
static outputFormats = outputFormats;
allowsNumericalAggregations = true;

isHuman() {
return this.param('outputFormat') === HUMAN_FRIENDLY;
Expand Down
1 change: 1 addition & 0 deletions src/plugins/data/common/field_formats/converters/number.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ export class NumberFormat extends NumeralFormat {

id = NumberFormat.id;
title = NumberFormat.title;
allowsNumericalAggregations = true;
}
1 change: 1 addition & 0 deletions src/plugins/data/common/field_formats/converters/percent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class PercentFormat extends NumeralFormat {

id = PercentFormat.id;
title = PercentFormat.title;
allowsNumericalAggregations = true;

getParamDefaults = () => ({
pattern: this.getConfig!('format:percent:defaultPattern'),
Expand Down