diff --git a/frontend/src/lib/query/createTableColumnsFromQuery.ts b/frontend/src/lib/query/createTableColumnsFromQuery.ts index 1a7afbbc22e..988b5feae8d 100644 --- a/frontend/src/lib/query/createTableColumnsFromQuery.ts +++ b/frontend/src/lib/query/createTableColumnsFromQuery.ts @@ -215,10 +215,12 @@ const getDynamicColumns: GetDynamicColumns = (queryTableData, query) => { } series.forEach((seria) => { - Object.keys(seria.labels).forEach((label) => { - if (label === currentQuery?.queryName) return; + seria.labelsArray?.forEach((lab) => { + Object.keys(lab).forEach((label) => { + if (label === currentQuery?.queryName) return; - addLabels(currentStagedQuery, label, dynamicColumns); + addLabels(currentStagedQuery, label, dynamicColumns); + }); }); }); } diff --git a/frontend/src/lib/uPlotLib/utils/getYAxisScale.test.ts b/frontend/src/lib/uPlotLib/utils/getYAxisScale.test.ts index ecd70084e85..708357ab480 100644 --- a/frontend/src/lib/uPlotLib/utils/getYAxisScale.test.ts +++ b/frontend/src/lib/uPlotLib/utils/getYAxisScale.test.ts @@ -35,6 +35,7 @@ describe('getYAxisScale', () => { series: [ { labels: {}, + labelsArray: [], values: [ { timestamp: 1, value: '15' }, { timestamp: 2, value: '25' }, diff --git a/frontend/src/lib/uPlotLib/utils/tests/__mocks__/seriesData.ts b/frontend/src/lib/uPlotLib/utils/tests/__mocks__/seriesData.ts index 6986625bf8f..2ff063e2ab9 100644 --- a/frontend/src/lib/uPlotLib/utils/tests/__mocks__/seriesData.ts +++ b/frontend/src/lib/uPlotLib/utils/tests/__mocks__/seriesData.ts @@ -100,7 +100,7 @@ export const seriesBarChartData = { series: [ { labels: {}, - labelsArray: null, + labelsArray: [], values: [ { timestamp: 1708683240000, @@ -164,7 +164,7 @@ export const seriesBarChartData = { series: [ { labels: {}, - labelsArray: null, + labelsArray: [], values: [ { timestamp: 1708683840000, @@ -543,7 +543,7 @@ export const seriesLineChartData = { series: [ { labels: {}, - labelsArray: null, + labelsArray: [], values: [ { timestamp: 1708683240000, @@ -607,7 +607,7 @@ export const seriesLineChartData = { series: [ { labels: {}, - labelsArray: null, + labelsArray: [], values: [ { timestamp: 1708683840000, diff --git a/frontend/src/lib/uPlotLib/utils/tests/__mocks__/uplotChartOptionsData.ts b/frontend/src/lib/uPlotLib/utils/tests/__mocks__/uplotChartOptionsData.ts index d3682939a4c..e9757d371bc 100644 --- a/frontend/src/lib/uPlotLib/utils/tests/__mocks__/uplotChartOptionsData.ts +++ b/frontend/src/lib/uPlotLib/utils/tests/__mocks__/uplotChartOptionsData.ts @@ -64,6 +64,7 @@ export const inputPropsTimeSeries = { labels: { A: 'A', }, + labelsArray: [{ A: 'A' }], values: [ { timestamp: 1708623120000, @@ -268,6 +269,7 @@ export const inputPropsBar = { labels: { A: 'A', }, + labelsArray: [{ A: 'A' }], values: [ { timestamp: 1708623120000, diff --git a/frontend/src/types/api/widgets/getQuery.ts b/frontend/src/types/api/widgets/getQuery.ts index 5f455698dd8..52d2f18d80c 100644 --- a/frontend/src/types/api/widgets/getQuery.ts +++ b/frontend/src/types/api/widgets/getQuery.ts @@ -22,6 +22,7 @@ export interface SeriesItem { labels: { [key: string]: string; }; + labelsArray: { [key: string]: string }[]; values: { timestamp: number; value: string }[]; }