refactor: pull naming logic into a method

This commit is contained in:
Jeremy Wall 2024-02-19 19:53:31 -05:00
parent 847413f4f5
commit 49e27a9184

View File

@ -122,6 +122,21 @@ class TimeseriesGraph extends HTMLElement {
return data; return data;
} }
formatName(meta, labels) {
var name = "";
const formatter = meta.name_format
if (formatter) {
name = eval(formatter);
} else {
var names = [];
for (const value of labels) {
names.push(value);
}
name = names.join(" ");
}
return name;
}
async updateGraph() { async updateGraph() {
const data = await this.fetchData(); const data = await this.fetchData();
const config = { const config = {
@ -160,17 +175,7 @@ class TimeseriesGraph extends HTMLElement {
yaxis: yaxis, yaxis: yaxis,
yhoverformat: meta["d3_tick_format"], yhoverformat: meta["d3_tick_format"],
}; };
var name = ""; var name = this.formatName(meta, labels);
const formatter = meta.name_format
if (formatter) {
name = eval(formatter);
} else {
var names = [];
for (const value of labels) {
names.push(value);
}
name = names.join(" ");
}
if (name) { trace.name = name; } if (name) { trace.name = name; }
for (const point of series) { for (const point of series) {
trace.x.push(new Date(point.timestamp * 1000)); trace.x.push(new Date(point.timestamp * 1000));
@ -190,17 +195,7 @@ class TimeseriesGraph extends HTMLElement {
y: [], y: [],
yhoverformat: meta["d3_tick_format"], yhoverformat: meta["d3_tick_format"],
}; };
const formatter = meta.name_format; var name = this.formatName(meta, labels);
var name = "";
if (formatter) {
name = eval(formatter);
} else {
var names = [];
for (const value of labels) {
names.push(value);
}
name = names.join(" ");
}
if (name) { trace.name = name; } if (name) { trace.name = name; }
trace.y.push(series.value); trace.y.push(series.value);
trace.x.push(trace.name); trace.x.push(trace.name);