Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oxlint-suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@
},
"static/app/views/explore/releases/list/releaseCard/index.tsx": {
"@sentry/scraps/prefer-primitives": {
"count": 5
"count": 4
}
},
"static/app/views/explore/releases/list/releaseCard/releaseCardCommits.tsx": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {getTraceLinkForIssue} from 'sentry/views/performance/traceDetails/issues
import {useIssuesTraceTree} from 'sentry/views/performance/traceDetails/traceApi/useIssuesTraceTree';
import {useTrace} from 'sentry/views/performance/traceDetails/traceApi/useTrace';
import {useTraceRootEvent} from 'sentry/views/performance/traceDetails/traceApi/useTraceRootEvent';
import {TraceViewSources} from 'sentry/views/performance/traceDetails/traceHeader/breadcrumbs';
import {TraceViewSources} from 'sentry/views/performance/traceDetails/traceHeader/traceViewSources';
import {
getInitialTracePreferences,
type TracePreferencesState,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import {Rect} from 'sentry/utils/profiling/speedscope';
import {useLocation} from 'sentry/utils/useLocation';
import {useOrganization} from 'sentry/utils/useOrganization';
import {SpanFields} from 'sentry/views/insights/types';
import {TraceViewSources} from 'sentry/views/performance/traceDetails/traceHeader/breadcrumbs';
import {TraceViewSources} from 'sentry/views/performance/traceDetails/traceHeader/traceViewSources';
import {getTraceDetailsUrl} from 'sentry/views/performance/traceDetails/traceUrl';

import {useCanvasScroll} from './interactions/useCanvasScroll';
Expand Down
6 changes: 3 additions & 3 deletions static/app/components/searchQueryBuilder/formattedQuery.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import {
SearchQueryBuilderProvider,
useSearchQueryBuilderConfig,
} from 'sentry/components/searchQueryBuilder/context';
import {AggregateKeyVisual} from 'sentry/components/searchQueryBuilder/tokens/filter/aggregateKey';
import {FilterValueText} from 'sentry/components/searchQueryBuilder/tokens/filter/filter';
import {getOperatorInfo} from 'sentry/components/searchQueryBuilder/tokens/filter/filterOperator';
import {AggregateKeyVisual} from 'sentry/components/searchQueryBuilder/tokens/filter/aggregateKeyVisual';
import {FilterValueText} from 'sentry/components/searchQueryBuilder/tokens/filter/filterValueText';
import {getOperatorInfo} from 'sentry/components/searchQueryBuilder/tokens/filter/getOperatorInfo';
import {isAggregateFilterToken} from 'sentry/components/searchQueryBuilder/tokens/filter/utils';
import {SearchQueryBuilderParenIcon} from 'sentry/components/searchQueryBuilder/tokens/paren';
import type {FieldDefinitionGetter} from 'sentry/components/searchQueryBuilder/types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Fragment, useLayoutEffect, useRef, useState} from 'react';
import {useLayoutEffect, useRef, useState} from 'react';
import styled from '@emotion/styled';
import {useFocusWithin} from '@react-aria/interactions';
import {mergeProps} from '@react-aria/utils';
Expand All @@ -11,15 +11,18 @@ import {
useSearchQueryBuilderConfig,
useSearchQueryBuilderState,
} from 'sentry/components/searchQueryBuilder/context';
import {
AggregateKeyVisual,
Parameters,
} from 'sentry/components/searchQueryBuilder/tokens/filter/aggregateKeyVisual';
import {SearchQueryBuilderParametersCombobox} from 'sentry/components/searchQueryBuilder/tokens/filter/parametersCombobox';
import {UnstyledButton} from 'sentry/components/searchQueryBuilder/tokens/filter/unstyledButton';
import {useAggregateParamVisual} from 'sentry/components/searchQueryBuilder/tokens/filter/useAggregateParamVisual';
import {useFilterButtonProps} from 'sentry/components/searchQueryBuilder/tokens/filter/useFilterButtonProps';
import type {
AggregateFilter,
ParseResultToken,
} from 'sentry/components/searchSyntax/parser';
import {getKeyLabel, getKeyName} from 'sentry/components/searchSyntax/utils';
import {getKeyLabel} from 'sentry/components/searchSyntax/utils';
import {t} from 'sentry/locale';

type AggregateKeyProps = {
Expand All @@ -30,20 +33,6 @@ type AggregateKeyProps = {
token: AggregateFilter;
};

export function AggregateKeyVisual({token}: {token: AggregateFilter}) {
const fnName = getKeyName(token.key);
const fnParams = useAggregateParamVisual({token});

return (
<Fragment>
<FnName>{fnName}</FnName>
{'('}
<Parameters>{fnParams}</Parameters>
{')'}
</Fragment>
);
}

export function AggregateKey({
item,
state,
Expand Down Expand Up @@ -151,18 +140,10 @@ const KeyButton = styled(UnstyledButton)`
}
`;

const FnName = styled('span')`
color: ${p => p.theme.colors.green500};
`;

const UnfocusedText = styled('span')`
color: ${p => p.theme.tokens.content.secondary};
`;

const Parameters = styled('span')`
height: 100%;
`;

const KeyEditing = styled('div')`
padding: 0 ${p => p.theme.space['2xs']} 0 ${p => p.theme.space.xs};
max-width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import {Fragment} from 'react';
import styled from '@emotion/styled';

import {useAggregateParamVisual} from 'sentry/components/searchQueryBuilder/tokens/filter/useAggregateParamVisual';
import type {AggregateFilter} from 'sentry/components/searchSyntax/parser';
import {getKeyName} from 'sentry/components/searchSyntax/utils';

export function AggregateKeyVisual({token}: {token: AggregateFilter}) {
const fnName = getKeyName(token.key);
const fnParams = useAggregateParamVisual({token});

return (
<Fragment>
<FnName>{fnName}</FnName>
{'('}
<Parameters>{fnParams}</Parameters>
{')'}
</Fragment>
);
}

const FnName = styled('span')`
color: ${p => p.theme.colors.green500};
`;

export const Parameters = styled('span')`
height: 100%;
`;
Loading
Loading