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

fix: incorrect order by label in query builder (#5148)

Browse Source
This commit is contained in:
Yunus M 2024-06-05 18:28:58 +05:30 committed by GitHub
parent c703f5290a
commit bc8a235915
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/container/QueryBuilder/components/Query/Query.tsx
View File

@ -155,12 +155,19 @@ export const Query = memo(function Query({
return ( return (
<OrderByFilter <OrderByFilter
entityVersion={version}
query={query} query={query}
onChange={handleChangeOrderByKeys} onChange={handleChangeOrderByKeys}
isListViewPanel={isListViewPanel} isListViewPanel={isListViewPanel}
/> />
); );
}, [queryComponents, query, handleChangeOrderByKeys, isListViewPanel]); }, [
queryComponents,
query,
version,
handleChangeOrderByKeys,
isListViewPanel,
]);
const renderAggregateEveryFilter = useCallback( const renderAggregateEveryFilter = useCallback(
(): JSX.Element | null => (): JSX.Element | null =>

1
frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.interfaces.ts
View File

@ -7,6 +7,7 @@ export type OrderByFilterProps = {
query: IBuilderQuery; query: IBuilderQuery;
onChange: (values: OrderByPayload[]) => void; onChange: (values: OrderByPayload[]) => void;
isListViewPanel?: boolean; isListViewPanel?: boolean;
entityVersion?: string;
}; };
export type OrderByFilterValue = { export type OrderByFilterValue = {

3
frontend/src/container/QueryBuilder/filters/OrderByFilter/OrderByFilter.tsx
View File

@ -12,6 +12,7 @@ export function OrderByFilter({
query, query,
onChange, onChange,
isListViewPanel = false, isListViewPanel = false,
entityVersion,
}: OrderByFilterProps): JSX.Element { }: OrderByFilterProps): JSX.Element {
const { const {
debouncedSearchText, debouncedSearchText,
@ -21,7 +22,7 @@ export function OrderByFilter({
createOptions, createOptions,
handleChange, handleChange,
handleSearchKeys, handleSearchKeys,
} = useOrderByFilter({ query, onChange }); } = useOrderByFilter({ query, onChange, entityVersion });
const { data, isFetching } = useGetAggregateKeys( const { data, isFetching } = useGetAggregateKeys(
{ {

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

@ -33,6 +33,7 @@ export type UseOrderByFilterResult = {
export const useOrderByFilter = ({ export const useOrderByFilter = ({
query, query,
onChange, onChange,
entityVersion,
}: OrderByFilterProps): UseOrderByFilterResult => { }: OrderByFilterProps): UseOrderByFilterResult => {
const [searchText, setSearchText] = useState<string>(''); const [searchText, setSearchText] = useState<string>('');
@ -124,15 +125,19 @@ export const useOrderByFilter = ({
const aggregationOptions = useMemo( 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}`, 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}`, value: `${SIGNOZ_VALUE}${orderByValueDelimiter}${ORDERBY_FILTERS.DESC}`,
}, },
], ],
[query], [query, entityVersion],
); );
return { return {