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
1 change: 1 addition & 0 deletions static/app/types/workflowEngine/dataConditions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export enum DataConditionType {
EXISTING_HIGH_PRIORITY_ISSUE = 'existing_high_priority_issue',
FIRST_SEEN_EVENT = 'first_seen_event',
ISSUE_CATEGORY = 'issue_category',
ISSUE_TYPE = 'issue_type',
ISSUE_OCCURRENCES = 'issue_occurrences',
LATEST_ADOPTED_RELEASE = 'latest_adopted_release',
LATEST_RELEASE = 'latest_release',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import {AutomationBuilderSelect} from 'sentry/components/workflowEngine/form/automationBuilderSelect';
import {t, tct} from 'sentry/locale';
import type {SelectValue} from 'sentry/types/core';
import {getIssueTitleFromType, VISIBLE_ISSUE_TYPES} from 'sentry/types/group';
import type {DataCondition} from 'sentry/types/workflowEngine/dataConditions';
import {useAutomationBuilderErrorContext} from 'sentry/views/automations/components/automationBuilderErrorContext';
import type {ValidateDataConditionProps} from 'sentry/views/automations/components/automationFormData';
import {useDataConditionNodeContext} from 'sentry/views/automations/components/dataConditionNodes';

const INCLUDE_CHOICES = [
{value: true, label: t('equal to')},
{value: false, label: t('not equal to')},
];

type IssueTypeChoice = {
label: string;
value: string;
};

const ISSUE_TYPE_CHOICES: IssueTypeChoice[] = VISIBLE_ISSUE_TYPES.map(value => ({
value,
label: getIssueTitleFromType(value) ?? value,
}));

export function IssueTypeDetails({condition}: {condition: DataCondition}) {
const include = condition.comparison.include ?? true;
const includeLabel =
INCLUDE_CHOICES.find(choice => choice.value === include)?.label ?? '';

return tct('Issue type is [include] [type]', {
include: includeLabel,
type:
ISSUE_TYPE_CHOICES.find(choice => choice.value === condition.comparison.value)
?.label || condition.comparison.value,
});
}

export function IssueTypeNode() {
return tct('Issue type is [include] [type]', {
include: <IncludeField />,
type: <TypeField />,
});
}

function IncludeField() {
const {condition, condition_id, onUpdate} = useDataConditionNodeContext();
const {removeError} = useAutomationBuilderErrorContext();

return (
<AutomationBuilderSelect
name={`${condition_id}.comparison.include`}
aria-label={t('Include or exclude')}
value={condition.comparison.include ?? true}
options={INCLUDE_CHOICES}
onChange={(option: SelectValue<boolean>) => {
onUpdate({comparison: {...condition.comparison, include: option.value}});
removeError(condition.id);
}}
/>
);
}

function TypeField() {
const {condition, condition_id, onUpdate} = useDataConditionNodeContext();
const {removeError} = useAutomationBuilderErrorContext();

return (
<AutomationBuilderSelect
name={`${condition_id}.comparison.value`}
aria-label={t('Issue type')}
value={condition.comparison.value}
options={ISSUE_TYPE_CHOICES}
onChange={(option: SelectValue<string>) => {
onUpdate({comparison: {...condition.comparison, value: option.value}});
removeError(condition.id);
}}
/>
);
}

export function validateIssueTypeCondition({
condition,
}: ValidateDataConditionProps): string | undefined {
if (condition.comparison.value === undefined || condition.comparison.value === null) {
return t('You must select an issue type.');
}
return undefined;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {DataConditionHandlerFixture} from 'sentry-fixture/workflowEngine';

import {render, screen, userEvent, within} from 'sentry-test/reactTestingLibrary';

import {IssueType} from 'sentry/types/group';
import type {DataConditionHandler} from 'sentry/types/workflowEngine/dataConditions';
import {
DataConditionGroupLogicType,
Expand All @@ -25,6 +26,9 @@ const dataConditionHandlers: DataConditionHandler[] = [
DataConditionHandlerFixture({
type: DataConditionType.ISSUE_PRIORITY_DEESCALATING,
}),
DataConditionHandlerFixture({
type: DataConditionType.ISSUE_TYPE,
}),
DataConditionHandlerFixture({
type: DataConditionType.EVENT_FREQUENCY,
handlerSubgroup: DataConditionHandlerSubgroupType.EVENT_ATTRIBUTES,
Expand Down Expand Up @@ -115,11 +119,12 @@ describe('DataConditionNodeList', () => {
);
await userEvent.click(screen.getByRole('textbox', {name: 'Add condition'}));

expect(screen.getAllByRole('menuitemradio')).toHaveLength(4);
expect(screen.getAllByRole('menuitemradio')).toHaveLength(5);
expect(screen.getByRole('menuitemradio', {name: 'Issue age'})).toBeInTheDocument();
expect(
screen.getByRole('menuitemradio', {name: 'Issue priority'})
).toBeInTheDocument();
expect(screen.getByRole('menuitemradio', {name: 'Issue type'})).toBeInTheDocument();
expect(
screen.getByRole('menuitemradio', {name: 'Number of events'})
).toBeInTheDocument();
Expand Down Expand Up @@ -349,5 +354,38 @@ describe('DataConditionNodeList', () => {
comparison: {value: 11, include: false},
});
});

it('issue type node', async () => {
const condition = DataConditionFixture({
id: 'issue-type',
type: DataConditionType.ISSUE_TYPE,
comparison: {
value: IssueType.ERROR,
include: true,
},
});

render(
<AutomationBuilderContext.Provider value={defaultContextProps}>
<AutomationBuilderErrorContext.Provider value={defaultErrorContextProps}>
<AutomationBuilderConflictContext.Provider
value={defaultConflictContextProps}
>
<DataConditionNodeList {...defaultProps} conditions={[condition]} />
</AutomationBuilderConflictContext.Provider>
</AutomationBuilderErrorContext.Provider>
</AutomationBuilderContext.Provider>,
{organization}
);

await userEvent.click(await screen.findByLabelText('Issue type'));
await userEvent.click(
screen.getByRole('menuitemradio', {name: 'Issue Detected by Metric Monitor'})
);

expect(mockUpdateCondition).toHaveBeenLastCalledWith('issue-type', {
comparison: {value: IssueType.METRIC_ISSUE, include: true},
});
});
});
});
14 changes: 14 additions & 0 deletions static/app/views/automations/components/dataConditionNodes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ import {
validateIssuePriorityCondition,
} from 'sentry/views/automations/components/actionFilters/issuePriority';
import {IssuePriorityDeescalating} from 'sentry/views/automations/components/actionFilters/issuePriorityDeescalating';
import {
IssueTypeDetails,
IssueTypeNode,
validateIssueTypeCondition,
} from 'sentry/views/automations/components/actionFilters/issueType';
import {
LatestAdoptedReleaseDetails,
LatestAdoptedReleaseNode,
Expand Down Expand Up @@ -202,6 +207,15 @@ export const dataConditionNodesMap = new Map<DataConditionType, DataConditionNod
validate: validateIssueCategoryCondition,
},
],
[
DataConditionType.ISSUE_TYPE,
{
label: t('Issue type'),
dataCondition: IssueTypeNode,
details: IssueTypeDetails,
validate: validateIssueTypeCondition,
},
],
[
DataConditionType.ISSUE_PRIORITY_GREATER_OR_EQUAL,
{
Expand Down
Loading