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

fix: fixed incorrect label for orderBy clause when selected (#6177)

Browse Source
This commit is contained in:
SagarRajput-7 2024-10-14 14:04:27 +05:30 committed by GitHub
parent 701b8803ac
commit dd097821d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts
View File

@ -59,9 +59,10 @@ export const useOrderByFilter = ({
]; ];
}, [searchText]); }, [searchText]);
const selectedValue = useMemo(() => transformToOrderByStringValues(query), [ const selectedValue = useMemo(
query, () => transformToOrderByStringValues(query, entityVersion),
]); [query, entityVersion],
);
const generateOptions = useCallback( const generateOptions = useCallback(
(options: IOption[]): IOption[] => { (options: IOption[]): IOption[] => {

5
frontend/src/container/QueryBuilder/filters/OrderByFilter/utils.ts
View File

@ -13,11 +13,14 @@ export const orderByValueDelimiter = '|';
export const transformToOrderByStringValues = ( export const transformToOrderByStringValues = (
query: IBuilderQuery, query: IBuilderQuery,
entityVersion?: string,
): IOption[] => { ): IOption[] => {
const prepareSelectedValue: IOption[] = query.orderBy.map((item) => { const prepareSelectedValue: IOption[] = query.orderBy.map((item) => {
if (item.columnName === SIGNOZ_VALUE) { if (item.columnName === SIGNOZ_VALUE) {
return { return {
label: `${query.aggregateOperator}(${query.aggregateAttribute.key}) ${item.order}`, label: `${
entityVersion === 'v4' ? query.spaceAggregation : query.aggregateOperator
}(${query.aggregateAttribute.key}) ${item.order}`,
value: `${item.columnName}${orderByValueDelimiter}${item.order}`, value: `${item.columnName}${orderByValueDelimiter}${item.order}`,
}; };
} }