GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-14 13:06:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: respect the query labels array for ordering than labels object (#5041)

Browse Source 
* fix: respect the query labels array for ordering than labels object

* fix: remove console log

* fix: type check

---------

Co-authored-by: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
This commit is contained in:
Vikrant Gupta 2024-05-27 15:06:54 +05:30 committed by GitHub
parent 1d1d85efa3
commit 749fba67cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/lib/query/createTableColumnsFromQuery.ts
View File

@ -215,10 +215,12 @@ const getDynamicColumns: GetDynamicColumns = (queryTableData, query) => {
} }
series.forEach((seria) => { series.forEach((seria) => {
Object.keys(seria.labels).forEach((label) => { seria.labelsArray?.forEach((lab) => {
if (label === currentQuery?.queryName) return; Object.keys(lab).forEach((label) => {
if (label === currentQuery?.queryName) return;
addLabels(currentStagedQuery, label, dynamicColumns); addLabels(currentStagedQuery, label, dynamicColumns);
});
}); });
}); });
} }

1
frontend/src/lib/uPlotLib/utils/getYAxisScale.test.ts
View File

@ -35,6 +35,7 @@ describe('getYAxisScale', () => {
series: [ series: [
{ {
labels: {}, labels: {},
labelsArray: [],
values: [ values: [
{ timestamp: 1, value: '15' }, { timestamp: 1, value: '15' },
{ timestamp: 2, value: '25' }, { timestamp: 2, value: '25' },

8
frontend/src/lib/uPlotLib/utils/tests/__mocks__/seriesData.ts
View File

@ -100,7 +100,7 @@ export const seriesBarChartData = {
series: [ series: [
{ {
labels: {}, labels: {},
labelsArray: null, labelsArray: [],
values: [ values: [
{ {
timestamp: 1708683240000, timestamp: 1708683240000,
@ -164,7 +164,7 @@ export const seriesBarChartData = {
series: [ series: [
{ {
labels: {}, labels: {},
labelsArray: null, labelsArray: [],
values: [ values: [
{ {
timestamp: 1708683840000, timestamp: 1708683840000,
@ -543,7 +543,7 @@ export const seriesLineChartData = {
series: [ series: [
{ {
labels: {}, labels: {},
labelsArray: null, labelsArray: [],
values: [ values: [
{ {
timestamp: 1708683240000, timestamp: 1708683240000,
@ -607,7 +607,7 @@ export const seriesLineChartData = {
series: [ series: [
{ {
labels: {}, labels: {},
labelsArray: null, labelsArray: [],
values: [ values: [
{ {
timestamp: 1708683840000, timestamp: 1708683840000,

2
frontend/src/lib/uPlotLib/utils/tests/__mocks__/uplotChartOptionsData.ts
View File

@ -64,6 +64,7 @@ export const inputPropsTimeSeries = {
labels: { labels: {
A: 'A', A: 'A',
}, },
labelsArray: [{ A: 'A' }],
values: [ values: [
{ {
timestamp: 1708623120000, timestamp: 1708623120000,
@ -268,6 +269,7 @@ export const inputPropsBar = {
labels: { labels: {
A: 'A', A: 'A',
}, },
labelsArray: [{ A: 'A' }],
values: [ values: [
{ {
timestamp: 1708623120000, timestamp: 1708623120000,

1
frontend/src/types/api/widgets/getQuery.ts
View File

@ -22,6 +22,7 @@ export interface SeriesItem {
labels: { labels: {
[key: string]: string; [key: string]: string;
}; };
labelsArray: { [key: string]: string }[];
values: { timestamp: number; value: string }[]; values: { timestamp: number; value: string }[];
} }