diff --git a/frontend/src/container/QueryBuilder/components/Query/Query.tsx b/frontend/src/container/QueryBuilder/components/Query/Query.tsx
index 82bbb17b19..78892759a4 100644
--- a/frontend/src/container/QueryBuilder/components/Query/Query.tsx
+++ b/frontend/src/container/QueryBuilder/components/Query/Query.tsx
@@ -155,12 +155,19 @@ export const Query = memo(function Query({
return (
);
- }, [queryComponents, query, handleChangeOrderByKeys, isListViewPanel]);
+ }, [
+ queryComponents,
+ query,
+ version,
+ handleChangeOrderByKeys,
+ isListViewPanel,
+ ]);
const renderAggregateEveryFilter = useCallback(
(): JSX.Element | null =>
diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts
index 154fdb8b10..323531f6f1 100644
--- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts
+++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts
@@ -7,6 +7,7 @@ export type OrderByFilterProps = {
query: IBuilderQuery;
onChange: (values: OrderByPayload[]) => void;
isListViewPanel?: boolean;
+ entityVersion?: string;
};
export type OrderByFilterValue = {
diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx
index dc6fb964fa..32aefe490a 100644
--- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx
+++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx
@@ -12,6 +12,7 @@ export function OrderByFilter({
query,
onChange,
isListViewPanel = false,
+ entityVersion,
}: OrderByFilterProps): JSX.Element {
const {
debouncedSearchText,
@@ -21,7 +22,7 @@ export function OrderByFilter({
createOptions,
handleChange,
handleSearchKeys,
- } = useOrderByFilter({ query, onChange });
+ } = useOrderByFilter({ query, onChange, entityVersion });
const { data, isFetching } = useGetAggregateKeys(
{
diff --git a/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts b/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts
index 2ddda6c31b..2576b2e01c 100644
--- a/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts
+++ b/frontend/src/container/QueryBuilder/filters/OrderByFilter/useOrderByFilter.ts
@@ -33,6 +33,7 @@ export type UseOrderByFilterResult = {
export const useOrderByFilter = ({
query,
onChange,
+ entityVersion,
}: OrderByFilterProps): UseOrderByFilterResult => {
const [searchText, setSearchText] = useState('');
@@ -124,15 +125,19 @@ export const useOrderByFilter = ({
const aggregationOptions = useMemo(
() => [
{
- label: `${query.aggregateOperator}(${query.aggregateAttribute.key}) ${ORDERBY_FILTERS.ASC}`,
+ label: `${
+ entityVersion === 'v4' ? query.spaceAggregation : query.aggregateOperator
+ }(${query.aggregateAttribute.key}) ${ORDERBY_FILTERS.ASC}`,
value: `${SIGNOZ_VALUE}${orderByValueDelimiter}${ORDERBY_FILTERS.ASC}`,
},
{
- label: `${query.aggregateOperator}(${query.aggregateAttribute.key}) ${ORDERBY_FILTERS.DESC}`,
+ label: `${
+ entityVersion === 'v4' ? query.spaceAggregation : query.aggregateOperator
+ }(${query.aggregateAttribute.key}) ${ORDERBY_FILTERS.DESC}`,
value: `${SIGNOZ_VALUE}${orderByValueDelimiter}${ORDERBY_FILTERS.DESC}`,
},
],
- [query],
+ [query, entityVersion],
);
return {