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

Remove having filter (#3219)

Browse Source
This commit is contained in:
vasukapil 2023-07-28 14:33:07 +05:30 committed by GitHub
parent 203eef8cde
commit 4753868298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/container/LogExplorerQuerySection/index.tsx
View File

@ -32,8 +32,10 @@ function LogExplorerQuerySection(): JSX.Element {
const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => { const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => {
const isTable = panelTypes === PANEL_TYPES.TABLE; const isTable = panelTypes === PANEL_TYPES.TABLE;
const isList = panelTypes === PANEL_TYPES.LIST;
const config: QueryBuilderProps['filterConfigs'] = { const config: QueryBuilderProps['filterConfigs'] = {
stepInterval: { isHidden: isTable, isDisabled: true }, stepInterval: { isHidden: isTable, isDisabled: true },
having: { isHidden: isList, isDisabled: true },
filters: { filters: {
customKey: 'body', customKey: 'body',
customOp: OPERATORS.CONTAINS, customOp: OPERATORS.CONTAINS,

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

@ -220,6 +220,7 @@ export const Query = memo(function Query({
</Col> </Col>
</Row> </Row>
</Col> </Col>
{!filterConfigs?.having?.isHidden && (
<Col span={11}> <Col span={11}>
<Row gutter={[11, 5]}> <Row gutter={[11, 5]}>
<Col flex="5.93rem"> <Col flex="5.93rem">
@ -230,6 +231,8 @@ export const Query = memo(function Query({
</Col> </Col>
</Row> </Row>
</Col> </Col>
)}
<Col span={11}> <Col span={11}>
<Row gutter={[11, 5]}> <Row gutter={[11, 5]}>
<Col flex="5.93rem"> <Col flex="5.93rem">
@ -248,6 +251,7 @@ export const Query = memo(function Query({
panelType, panelType,
isMetricsDataSource, isMetricsDataSource,
query, query,
filterConfigs?.having?.isHidden,
handleChangeLimit, handleChangeLimit,
handleChangeHavingFilter, handleChangeHavingFilter,
renderOrderByFilter, renderOrderByFilter,

4
frontend/src/container/TracesExplorer/QuerySection/index.tsx
View File

@ -17,12 +17,14 @@ function QuerySection(): JSX.Element {
const panelTypes = useGetPanelTypesQueryParam(PANEL_TYPES.LIST); const panelTypes = useGetPanelTypesQueryParam(PANEL_TYPES.LIST);
const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => { const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(() => {
const isList = panelTypes === PANEL_TYPES.LIST;
const config: QueryBuilderProps['filterConfigs'] = { const config: QueryBuilderProps['filterConfigs'] = {
stepInterval: { isHidden: false, isDisabled: true }, stepInterval: { isHidden: false, isDisabled: true },
having: { isHidden: isList, isDisabled: true },
}; };
return config; return config;
}, []); }, [panelTypes]);
const renderOrderBy = useCallback( const renderOrderBy = useCallback(
({ query, onChange }: OrderByFilterProps) => ( ({ query, onChange }: OrderByFilterProps) => (