Direct paging improvements (hotfix) (#3079)
# What this PR does Fixes https://github.com/grafana/oncall/pull/3064 ## Which issue(s) this PR fixes ## Checklist - [ ] Unit, integration, and e2e (if applicable) tests updated - [ ] Documentation added (or `pr:no public docs` PR label added if not required) - [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
This commit is contained in:
parent
51014735aa
commit
5768decdbf
2 changed files with 12 additions and 9 deletions
|
|
@ -72,10 +72,14 @@ class TeamManager(models.Manager["Team"]):
|
|||
)
|
||||
direct_paging_integrations_to_create.append(alert_receive_channel)
|
||||
AlertReceiveChannel.objects.bulk_create(direct_paging_integrations_to_create, batch_size=5000)
|
||||
created_direct_paging_integrations = AlertReceiveChannel.objects.filter(
|
||||
organization=organization,
|
||||
integration=AlertReceiveChannel.INTEGRATION_DIRECT_PAGING,
|
||||
).exclude(team__team_id__in=existing_team_ids)
|
||||
created_direct_paging_integrations = (
|
||||
AlertReceiveChannel.objects.filter(
|
||||
organization=organization,
|
||||
integration=AlertReceiveChannel.INTEGRATION_DIRECT_PAGING,
|
||||
)
|
||||
.exclude(team__team_id__in=existing_team_ids)
|
||||
.exclude(team__isnull=True)
|
||||
)
|
||||
default_channel_filters_to_create = []
|
||||
for integration in created_direct_paging_integrations:
|
||||
channel_filter = ChannelFilter(
|
||||
|
|
|
|||
|
|
@ -194,8 +194,8 @@ const ExpandedIntegrationRouteDisplay: React.FC<ExpandedIntegrationRouteDisplayP
|
|||
)}
|
||||
|
||||
<VerticalGroup>
|
||||
<HorizontalGroup spacing={'xs'}>
|
||||
<div data-testid="escalation-chain-select">
|
||||
<div data-testid="escalation-chain-select">
|
||||
<HorizontalGroup spacing={'xs'}>
|
||||
<InlineLabel
|
||||
width={20}
|
||||
tooltip="The escalation chain determines who and when to notify when an alert group starts."
|
||||
|
|
@ -258,9 +258,8 @@ const ExpandedIntegrationRouteDisplay: React.FC<ExpandedIntegrationRouteDisplayP
|
|||
</HorizontalGroup>
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</HorizontalGroup>
|
||||
|
||||
</HorizontalGroup>
|
||||
</div>
|
||||
{!isEscalationCollapsed && (
|
||||
<ReadOnlyEscalationChain escalationChainId={channelFilter.escalation_chain} />
|
||||
)}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue