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

fix: remove the checks for aggregate operator in case of metrics v3/v4 (#5775)

Browse Source
This commit is contained in:
Vikrant Gupta 2024-08-27 17:00:51 +05:30 committed by GitHub
parent c2f607ab6b
commit 4b861b2169
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/container/QueryBuilder/filters/AggregatorFilter/AggregatorFilter.tsx
View File

@ -62,7 +62,9 @@ export const AggregatorFilter = memo(function AggregatorFilter({
dataSource: query.dataSource, dataSource: query.dataSource,
}), }),
{ {
enabled: !!query.aggregateOperator && !!query.dataSource, enabled:
query.dataSource === DataSource.METRICS ||
(!!query.aggregateOperator && !!query.dataSource),
onSuccess: (data) => { onSuccess: (data) => {
const options: ExtendedSelectOption[] = const options: ExtendedSelectOption[] =
data?.payload?.attributeKeys?.map(({ id: _, ...item }) => ({ data?.payload?.attributeKeys?.map(({ id: _, ...item }) => ({

10
frontend/src/hooks/queryBuilder/useFetchKeysAndValues.ts
View File

@ -92,15 +92,9 @@ export const useFetchKeysAndValues = (
const isQueryEnabled = useMemo( const isQueryEnabled = useMemo(
() => () =>
query.dataSource === DataSource.METRICS query.dataSource === DataSource.METRICS
? !!query.aggregateOperator && ? !!query.dataSource && !!query.aggregateAttribute.dataType
!!query.dataSource &&
!!query.aggregateAttribute.dataType
: true, : true,
[ [query.aggregateAttribute.dataType, query.dataSource],
query.aggregateAttribute.dataType,
query.aggregateOperator,
query.dataSource,
],
); );
const { data, isFetching, status } = useGetAggregateKeys( const { data, isFetching, status } = useGetAggregateKeys(