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

fix: [SIG-574]: support __ in the groupBy clause (#4747)

Browse Source
This commit is contained in:
Vikrant Gupta 2024-03-26 23:54:31 +05:30 committed by GitHub
parent 2b3d1c8ee5
commit 9e02147d4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/src/container/QueryBuilder/filters/GroupByFilter/GroupByFilter.tsx
View File

@ -1,11 +1,7 @@
import { Select, Spin } from 'antd'; import { Select, Spin } from 'antd';
import { getAggregateKeys } from 'api/queryBuilder/getAttributeKeys'; import { getAggregateKeys } from 'api/queryBuilder/getAttributeKeys';
// ** Constants // ** Constants
import { import { idDivider, QueryBuilderKeys } from 'constants/queryBuilder';
idDivider,
QueryBuilderKeys,
selectValueDivider,
} from 'constants/queryBuilder';
import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig'; import { DEBOUNCE_DELAY } from 'constants/queryBuilderFilterConfig';
import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys'; import { useGetAggregateKeys } from 'hooks/queryBuilder/useGetAggregateKeys';
import useDebounce from 'hooks/useDebounce'; import useDebounce from 'hooks/useDebounce';
@ -83,11 +79,7 @@ export const GroupByFilter = memo(function GroupByFilter({
dataType={item.dataType || ''} dataType={item.dataType || ''}
/> />
), ),
value: `${transformStringWithPrefix({ value: `${item.id}`,
str: item.key,
prefix: item.type || '',
condition: !item.isColumn,
})}${selectValueDivider}${item.id}`,
})) || []; })) || [];
setOptionsData(options); setOptionsData(options);
@ -135,7 +127,8 @@ export const GroupByFilter = memo(function GroupByFilter({
const keys = await getAttributeKeys(); const keys = await getAttributeKeys();
const groupByValues: BaseAutocompleteData[] = values.map((item) => { const groupByValues: BaseAutocompleteData[] = values.map((item) => {
const [currentValue, id] = item.value.split(selectValueDivider); const id = item.value;
const currentValue = item.value.split(idDivider)[0];
if (id && id.includes(idDivider)) { if (id && id.includes(idDivider)) {
const attribute = keys.find((item) => item.id === id); const attribute = keys.find((item) => item.id === id);
@ -174,11 +167,7 @@ export const GroupByFilter = memo(function GroupByFilter({
condition: !item.isColumn, condition: !item.isColumn,
}), }),
)}`, )}`,
value: `${transformStringWithPrefix({ value: `${item.id}`,
str: item.key,
prefix: item.type || '',
condition: !item.isColumn,
})}${selectValueDivider}${item.id}`,
}), }),
); );