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

[Fix]: delete formula issue (#4526)

Browse Source
This commit is contained in:
Rajat Dabade 2024-02-12 21:42:56 +05:30 committed by GitHub
parent 3a20862d0c
commit 6bc5ceac3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/container/QueryBuilder/components/Formula/Formula.tsx
View File

@ -151,6 +151,7 @@ export function Formula({
onToggleVisibility={handleToggleDisableFormula} onToggleVisibility={handleToggleDisableFormula}
onDelete={handleDelete} onDelete={handleDelete}
onCollapseEntity={handleToggleCollapseFormula} onCollapseEntity={handleToggleCollapseFormula}
showDeleteButton
/> />
{!isCollapse && ( {!isCollapse && (

7
frontend/src/container/QueryBuilder/components/QBEntityOptions/QBEntityOptions.tsx
View File

@ -2,7 +2,6 @@ import './QBEntityOptions.styles.scss';
import { Button, Col } from 'antd'; import { Button, Col } from 'antd';
import cx from 'classnames'; import cx from 'classnames';
import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
import { ChevronDown, ChevronRight, Eye, EyeOff, Trash2 } from 'lucide-react'; import { ChevronDown, ChevronRight, Eye, EyeOff, Trash2 } from 'lucide-react';
interface QBEntityOptionsProps { interface QBEntityOptionsProps {
@ -12,6 +11,7 @@ interface QBEntityOptionsProps {
onDelete: () => void; onDelete: () => void;
onToggleVisibility: () => void; onToggleVisibility: () => void;
onCollapseEntity: () => void; onCollapseEntity: () => void;
showDeleteButton: boolean;
} }
export default function QBEntityOptions({ export default function QBEntityOptions({
@ -21,11 +21,8 @@ export default function QBEntityOptions({
onDelete, onDelete,
onToggleVisibility, onToggleVisibility,
onCollapseEntity, onCollapseEntity,
showDeleteButton,
}: QBEntityOptionsProps): JSX.Element { }: QBEntityOptionsProps): JSX.Element {
const { currentQuery } = useQueryBuilder();
const showDeleteButton = currentQuery.builder.queryData.length > 1;
return ( return (
<Col span={24}> <Col span={24}>
<div className="qb-entity-options"> <div className="qb-entity-options">

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

@ -47,7 +47,7 @@ export const Query = memo(function Query({
filterConfigs, filterConfigs,
queryComponents, queryComponents,
}: QueryProps): JSX.Element { }: QueryProps): JSX.Element {
const { panelType } = useQueryBuilder(); const { panelType, currentQuery } = useQueryBuilder();
const { pathname } = useLocation(); const { pathname } = useLocation();
const [isCollapse, setIsCollapsed] = useState(false); const [isCollapse, setIsCollapsed] = useState(false);
@ -288,6 +288,7 @@ export const Query = memo(function Query({
onToggleVisibility={handleToggleDisableQuery} onToggleVisibility={handleToggleDisableQuery}
onDelete={handleDeleteQuery} onDelete={handleDeleteQuery}
onCollapseEntity={handleToggleCollapsQuery} onCollapseEntity={handleToggleCollapsQuery}
showDeleteButton={currentQuery.builder.queryData.length > 1}
/> />
{!isCollapse && ( {!isCollapse && (