Skip to content

Commit

Permalink
[TSVB] Wrong x-axis formatting if "dateFormat" configuration property…
Browse files Browse the repository at this point in the history
… is not specified (elastic#84899)

* [TSVB] Wrong x-axis formatting if "dateFormat" configuration property is not specified

* Update create_xaxis_formatter.js

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
# Conflicts:
#	src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/vis.js
  • Loading branch information
alexwizp committed Dec 4, 2020
1 parent d86faf4 commit 799e90c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
*/

import moment from 'moment';
export function getFormat(interval, rules, dateFormat) {

function getFormat(interval, rules = []) {
for (let i = rules.length - 1; i >= 0; i--) {
const rule = rules[i];
if (!rule[0] || interval >= moment.duration(rule[0])) {
return rule[1];
}
}
return dateFormat;
}

export function createXaxisFormatter(interval, rules, dateFormat) {
return (val) => {
return moment(val).format(getFormat(interval, rules, dateFormat));
return moment(val).format(getFormat(interval, rules) ?? dateFormat);
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ export class TimeseriesVisualization extends Component {

xAxisFormatter = (interval) => (val) => {
const { scaledDataFormat, dateFormat } = this.props.visData;

if (!scaledDataFormat || !dateFormat) {
return val;
}

const formatter = createXaxisFormatter(interval, scaledDataFormat, dateFormat);

return formatter(val);
Expand Down

0 comments on commit 799e90c

Please sign in to comment.