From 35855355bf110cf737aeb3fde22accabf9cbcac0 Mon Sep 17 00:00:00 2001 From: Vikrant Gupta Date: Tue, 21 May 2024 14:43:31 +0530 Subject: [PATCH 1/3] fix: respect the query labels array for ordering than labels object --- .../src/lib/query/createTableColumnsFromQuery.ts | 12 +++++++++--- frontend/src/types/api/widgets/getQuery.ts | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/src/lib/query/createTableColumnsFromQuery.ts b/frontend/src/lib/query/createTableColumnsFromQuery.ts index 1a7afbbc22e..9070967470c 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); + }); }); }); } @@ -478,6 +480,8 @@ export const createTableColumnsFromQuery: CreateTableDataFromQuery = ({ const dynamicColumns = getDynamicColumns(sortedQueryTableData, query); + console.log(dynamicColumns); + const { filledDynamicColumns, rowsLength } = fillColumnsData( sortedQueryTableData, dynamicColumns, @@ -487,6 +491,8 @@ export const createTableColumnsFromQuery: CreateTableDataFromQuery = ({ const columns = generateTableColumns(filledDynamicColumns, renderColumnCell); + console.log(columns); + const actionsCell: ColumnType | null = renderActionCell ? { key: 'actions', 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 }[]; } From b6b56e0ee9495f4654c89560cd6fba92649b1da1 Mon Sep 17 00:00:00 2001 From: Vikrant Gupta Date: Tue, 21 May 2024 14:44:43 +0530 Subject: [PATCH 2/3] fix: remove console log --- frontend/src/lib/query/createTableColumnsFromQuery.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/src/lib/query/createTableColumnsFromQuery.ts b/frontend/src/lib/query/createTableColumnsFromQuery.ts index 9070967470c..6249bcdf5e7 100644 --- a/frontend/src/lib/query/createTableColumnsFromQuery.ts +++ b/frontend/src/lib/query/createTableColumnsFromQuery.ts @@ -480,8 +480,6 @@ export const createTableColumnsFromQuery: CreateTableDataFromQuery = ({ const dynamicColumns = getDynamicColumns(sortedQueryTableData, query); - console.log(dynamicColumns); - const { filledDynamicColumns, rowsLength } = fillColumnsData( sortedQueryTableData, dynamicColumns, @@ -491,8 +489,6 @@ export const createTableColumnsFromQuery: CreateTableDataFromQuery = ({ const columns = generateTableColumns(filledDynamicColumns, renderColumnCell); - console.log(columns); - const actionsCell: ColumnType | null = renderActionCell ? { key: 'actions', From e4e49e995805a3a8a13f1dbfa67599a817c1c38f Mon Sep 17 00:00:00 2001 From: Vikrant Gupta Date: Tue, 21 May 2024 14:54:38 +0530 Subject: [PATCH 3/3] fix: type check --- frontend/src/lib/query/createTableColumnsFromQuery.ts | 2 +- frontend/src/lib/uPlotLib/utils/getYAxisScale.test.ts | 1 + .../src/lib/uPlotLib/utils/tests/__mocks__/seriesData.ts | 8 ++++---- .../utils/tests/__mocks__/uplotChartOptionsData.ts | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/src/lib/query/createTableColumnsFromQuery.ts b/frontend/src/lib/query/createTableColumnsFromQuery.ts index 6249bcdf5e7..988b5feae8d 100644 --- a/frontend/src/lib/query/createTableColumnsFromQuery.ts +++ b/frontend/src/lib/query/createTableColumnsFromQuery.ts @@ -215,7 +215,7 @@ const getDynamicColumns: GetDynamicColumns = (queryTableData, query) => { } series.forEach((seria) => { - seria.labelsArray.forEach((lab) => { + seria.labelsArray?.forEach((lab) => { Object.keys(lab).forEach((label) => { if (label === currentQuery?.queryName) return; 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,