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

Merge branch 'develop' into api-kafka

Browse Source
This commit is contained in:
Shivanshu Raj Shrivastava 2024-08-06 10:13:28 +05:30 committed by GitHub
commit 9f7b2542ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/container/NewWidget/utils.ts
View File

@ -268,6 +268,7 @@ export const panelTypeDataSourceFormValuesMap: Record<
'aggregateOperator',
'aggregateAttribute',
'groupBy',
'reduceTo',
'limit',
'having',
'orderBy',
@ -286,6 +287,7 @@ export const panelTypeDataSourceFormValuesMap: Record<
'aggregateOperator',
'aggregateAttribute',
'groupBy',
'reduceTo',
'limit',
'having',
'orderBy',
@ -305,6 +307,7 @@ export const panelTypeDataSourceFormValuesMap: Record<
'aggregateOperator',
'aggregateAttribute',
'groupBy',
'reduceTo',
'limit',
'having',
'orderBy',

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

@ -544,19 +544,21 @@ export const Query = memo(function Query({
)}
</Col>
{isVersionV4 && isMetricsDataSource && panelType === PANEL_TYPES.TABLE && (
<Col flex="1 1 12.5rem">
<Row>
<Col span={6}>
<FilterLabel label="Reduce to" />
</Col>
{isVersionV4 &&
isMetricsDataSource &&
(panelType === PANEL_TYPES.TABLE || panelType === PANEL_TYPES.PIE) && (
<Col flex="1 1 12.5rem">
<Row>
<Col span={6}>
<FilterLabel label="Reduce to" />
</Col>
<Col span={18}>
<ReduceToFilter query={query} onChange={handleChangeReduceTo} />
</Col>
</Row>
</Col>
)}
<Col span={18}>
<ReduceToFilter query={query} onChange={handleChangeReduceTo} />
</Col>
</Row>
</Col>
)}
</Row>
</Col>
)}