diff --git a/web/src/components/Graph/Graph/index.tsx b/web/src/components/Graph/Graph/index.tsx index 0a6956f17f2bb68ab42f98b2295f73a772c242b0..f6862396a7a1b48df598c7025f468c4a167a1aef 100644 --- a/web/src/components/Graph/Graph/index.tsx +++ b/web/src/components/Graph/Graph/index.tsx @@ -60,7 +60,7 @@ export default class Graph extends Component { chartOptions = config.chart; headerHeight = 35; counterList = []; - series = []; + series = [] as any[]; state = { spinning: false, errorText: '', diff --git a/web/src/components/Graph/util/normalizeSeries.tsx b/web/src/components/Graph/util/normalizeSeries.tsx index 62873d293d150b0dbab729cebf657a00671c577e..c087c426b7d32bbeb1ff161fd87fca1a76c7bfea 100644 --- a/web/src/components/Graph/util/normalizeSeries.tsx +++ b/web/src/components/Graph/util/normalizeSeries.tsx @@ -1,12 +1,14 @@ import _ from 'lodash'; import { hexPalette } from '../config'; -import { SerieInterface } from '../interface'; +import { SerieInterface, GraphDataInterface } from '../interface'; -export default function normalizeSeries(data: any[]) { +export default function normalizeSeries(data: any[], graphConfig: GraphDataInterface): SerieInterface[] { + const { comparison } = graphConfig; + const isComparison = !!_.get(comparison, 'length', 0); const series = [] as SerieInterface[]; _.each(_.sortBy(data, ['counter', 'endpoint']), (o, i) => { const { endpoint, comparison } = o; - const color = getSerieColor(o, i); + const color = getSerieColor(o, i, isComparison); const separatorIdx = o.counter.indexOf('/'); let counter = endpoint ? '' : o.counter;