Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert linter changes #4347

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Revert linter changes #4347

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6da4fb
Fixes faulty linting. The was interpreted as a tuple rather than an …
metroid-samus Feb 5, 2024
520b0dc
Merge branch 'master' into bugfix/slack-no-cost-model
metroid-samus Feb 5, 2024
2007b05
Merge branch 'master' into bugfix/slack-no-cost-model
metroid-samus Feb 6, 2024
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
44 changes: 27 additions & 17 deletions src/dispatch/plugins/dispatch_slack/incident/interactive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,11 @@ def handle_update_incident_project_select_action(
]
cost_model_block = cost_model_select(
db_session=db_session,
initial_option={"text": incident.cost_model.name, "value": incident.cost_model.id}
if incident.cost_model
else None,
initial_option=(
{"text": incident.cost_model.name, "value": incident.cost_model.id}
if incident.cost_model
else None
),
project_id=incident.project.id,
optional=True,
)
Expand Down Expand Up @@ -513,12 +515,16 @@ def handle_list_participants_command(
f"*Team*\n {participant_team}, {participant_department}",
f"*Location* \n{participant_location}",
f"*Incident Role(s)* \n{(', ').join(participant_roles)}",
f"*Added By* \n{participant.added_by.individual.name}"
if participant.added_by
else "*Added By* \nUnknown",
f"*Added Reason* \n{participant.added_reason}"
if participant.added_reason
else "*Added Reason* \nUnknown",
(
f"*Added By* \n{participant.added_by.individual.name}"
if participant.added_by
else "*Added By* \nUnknown"
),
(
f"*Added Reason* \n{participant.added_reason}"
if participant.added_reason
else "*Added Reason* \nUnknown"
),
],
accessory=accessory,
),
Expand Down Expand Up @@ -630,9 +636,11 @@ def draw_task_modal(
blocks.append(
Section(
fields=[
f"*Description:* \n <{task.weblink}|{task.description}>"
if task.weblink
else f"*Description:* \n {task.description}",
(
f"*Description:* \n <{task.weblink}|{task.description}>"
if task.weblink
else f"*Description:* \n {task.description}"
),
f"*Creator:* \n <{task.creator.individual.weblink}|{task.creator.individual.name}>",
f"*Assignees:* \n {', '.join(assignees)}",
],
Expand Down Expand Up @@ -1831,9 +1839,11 @@ def handle_update_incident_command(

cost_model_block = cost_model_select(
db_session=db_session,
initial_option={"text": incident.cost_model.name, "value": incident.cost_model.id}
if incident.cost_model
else None,
initial_option=(
{"text": incident.cost_model.name, "value": incident.cost_model.id}
if incident.cost_model
else None
),
project_id=incident.project.id,
optional=True,
)
Expand Down Expand Up @@ -2170,8 +2180,8 @@ def handle_report_incident_project_select_action(
tag_multi_select(optional=True),
]

cost_model_block = (
cost_model_select(db_session=db_session, project_id=project.id, optional=True),
cost_model_block = cost_model_select(
db_session=db_session, project_id=project.id, optional=True
)

if cost_model_block:
Expand Down
Loading