diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts b/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts index 2576b2e01c..dbd1909a48 100644 --- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts +++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts @@ -59,9 +59,10 @@ export const useOrderByFilter = ({ ]; }, [searchText]); - const selectedValue = useMemo(() => transformToOrderByStringValues(query), [ - query, - ]); + const selectedValue = useMemo( + () => transformToOrderByStringValues(query, entityVersion), + [query, entityVersion], + ); const generateOptions = useCallback( (options: IOption[]): IOption[] => { diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/utils.ts b/frontend/src/container/QueryBuilder/filters/OrderByFilter/utils.ts index a3b385291c..4523a07eff 100644 --- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/utils.ts +++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/utils.ts @@ -13,11 +13,14 @@ export const orderByValueDelimiter = '|'; export const transformToOrderByStringValues = ( query: IBuilderQuery, + entityVersion?: string, ): IOption[] => { const prepareSelectedValue: IOption[] = query.orderBy.map((item) => { if (item.columnName === SIGNOZ_VALUE) { 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}`, }; }