centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix /escalate predefined org (#4723)

Browse source 
Related to https://github.com/grafana/oncall-gateway/issues/276

Co-authored-by: Innokentii Konstantinov <innokenty.konstantinov@grafana.com>
This commit is contained in:
Vadim Stepanov 2024-07-24 11:44:47 +01:00 • committed by GitHub
parent 9da5b94455
commit b27a158eb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
engine/apps/slack/scenarios/paging.py
View file

@ -312,19 +312,20 @@ class OnPagingUserChange(scenario_step.ScenarioStep):
if not user_is_oncall(selected_user):
# display additional confirmation modal
metadata = json.loads(payload["view"]["private_metadata"])
private_metadata = make_private_metadata(
{
"state": payload["view"]["state"],
"input_id_prefix": metadata["input_id_prefix"],
"channel_id": metadata["channel_id"],
"submit_routing_uid": metadata["submit_routing_uid"],
DataKey.USERS: metadata[DataKey.USERS],
},
selected_user.organization,
)
private_metadata = {
"state": payload["view"]["state"],
"input_id_prefix": metadata["input_id_prefix"],
"channel_id": metadata["channel_id"],
"submit_routing_uid": metadata["submit_routing_uid"],
DataKey.USERS: metadata[DataKey.USERS],
}
# keep predefined organization in private metadata
if "organization_id" in metadata:
private_metadata["organization_id"] = metadata["organization_id"]
view = _display_confirm_participant_invitation_view(
OnPagingConfirmUserChange.routing_uid(), private_metadata
OnPagingConfirmUserChange.routing_uid(),
make_private_metadata(private_metadata, selected_user.organization),
)
self._slack_client.views_push(trigger_id=payload["trigger_id"], view=view)
else:
@ -392,6 +393,10 @@ class OnPagingConfirmUserChange(scenario_step.ScenarioStep):
"submit_routing_uid": metadata["submit_routing_uid"],
DataKey.USERS: metadata[DataKey.USERS],
}
# keep predefined organization in private metadata
if "organization_id" in metadata:
private_metadata["organization_id"] = metadata["organization_id"]
previous_view_payload = {
"view": {
"state": metadata["state"],