Skip to content
Open
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 src/sentry/rules/actions/sentry_apps/notify_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def _get_alert_rule_component(
return component

raise ValidationError(
f"Alert Rule Actions are not enabled for the {sentry_app_name} integration."
f"Alert Actions are not enabled for the {sentry_app_name} integration."
)

def get_custom_actions(self, project: Project) -> Sequence[Mapping[str, Any]]:
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/sentry_apps/api/parsers/sentry_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def validate(self, attrs):
# also check that we don't have the alert rule enabled
if get_current_value("isAlertable"):
raise ValidationError(
{"webhookUrl": "webhookUrl required if alert rule action is enabled"}
{"webhookUrl": "webhookUrl required if alert action is enabled"}
)
else:
raise ValidationError({"webhookUrl": "webhookUrl required for public integrations"})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ describe('Sentry Application Details', () => {

await userEvent.click(screen.getByRole('textbox', {name: 'Schema'}));
await userEvent.paste('{}');
await userEvent.click(screen.getByRole('checkbox', {name: 'Alert Rule Action'}));
await userEvent.click(screen.getByRole('checkbox', {name: 'Alert Action'}));

await selectEvent.select(screen.getByRole('textbox', {name: 'Member'}), 'Admin');
await selectEvent.select(
Expand Down Expand Up @@ -485,9 +485,9 @@ describe('Sentry Application Details', () => {
it('removing webhookURL unsets isAlertable and changes webhookDisabled to true', async () => {
renderComponent();
await screen.findByRole('button', {name: 'Save Changes'});
expect(screen.getByRole('checkbox', {name: 'Alert Rule Action'})).toBeChecked();
expect(screen.getByRole('checkbox', {name: 'Alert Action'})).toBeChecked();
await userEvent.clear(screen.getByRole('textbox', {name: 'Webhook URL'}));
expect(screen.getByRole('checkbox', {name: 'Alert Rule Action'})).not.toBeChecked();
expect(screen.getByRole('checkbox', {name: 'Alert Action'})).not.toBeChecked();
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -750,9 +750,9 @@ function SentryApplicationForm({
<form.AppField name="isAlertable">
{field => (
<field.Layout.Row
label={t('Alert Rule Action')}
label={t('Alert Action')}
hintText={tct(
'If enabled, this integration will be available in Issue Alert rules and Metric Alert rules in Sentry. The notification destination is the Webhook URL specified above. More on actions [learnMore:here].',
'If enabled, this integration will be available as an action in alerts in Sentry. The notification destination is the Webhook URL specified above. More on actions [learnMore:here].',
{
learnMore: (
<ExternalLink href="https://docs.sentry.io/product/alerts-notifications/notifications/" />
Expand All @@ -767,7 +767,7 @@ function SentryApplicationForm({
onChange={field.handleChange}
disabled={
webhookDisabled
? t('Cannot enable alert rule action without a webhook url')
? t('Cannot enable alert action without a webhook url')
: false
}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -723,9 +723,7 @@ def test_no_webhook_has_alerts(self) -> None:
response = self.get_error_response(
self.internal_integration.slug, isAlertable=True, status_code=400
)
assert response.data == {
"webhookUrl": ["webhookUrl required if alert rule action is enabled"]
}
assert response.data == {"webhookUrl": ["webhookUrl required if alert action is enabled"]}

@override_options({"staff.ga-rollout": True})
def test_set_allowed_origins(self) -> None:
Expand Down
Loading