From 3808ea82c71e60a55ad851764ae87b161a2d4df5 Mon Sep 17 00:00:00 2001 From: Will Sheldon <114631109+wssheldon@users.noreply.github.com> Date: Wed, 20 Sep 2023 11:24:12 -0700 Subject: [PATCH 1/2] Do not run playwright with safar (#3797) --- .github/workflows/playwright.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index b78e644a785d..4fe00fbcd6e2 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -58,7 +58,7 @@ jobs: - name: Setup sample database run: dispatch database restore --dump-file data/dispatch-sample-data.dump && dispatch database upgrade - name: Run tests - run: npx playwright test + run: npx playwright test --project=chromium --project=firefox - uses: actions/upload-artifact@v3 if: always() with: From dea8180b58507e7ef2d824f51aef8a97df8e271c Mon Sep 17 00:00:00 2001 From: Avery Date: Wed, 20 Sep 2023 12:37:37 -0700 Subject: [PATCH 2/2] Appends outstanding incident tasks in tactical reports (#3798) * Appends outstanding incident tasks to the end of user input in tactical reports. * Update src/dispatch/plugins/dispatch_slack/incident/interactive.py Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> * Update src/dispatch/static/dispatch/src/incident/store.js Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> --------- Co-authored-by: Marc Vilanova <39573146+mvilanova@users.noreply.github.com> --- .../plugins/dispatch_slack/incident/interactive.py | 2 +- src/dispatch/static/dispatch/src/incident/store.js | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/dispatch/plugins/dispatch_slack/incident/interactive.py b/src/dispatch/plugins/dispatch_slack/incident/interactive.py index eb2553022f67..f8718e7097fa 100644 --- a/src/dispatch/plugins/dispatch_slack/incident/interactive.py +++ b/src/dispatch/plugins/dispatch_slack/incident/interactive.py @@ -1500,7 +1500,7 @@ def handle_report_tactical_command( incident = incident_service.get(db_session=db_session, incident_id=context["subject"].id) if incident.tasks: - actions = "\n".join( + actions += "\n\nOutstanding Incident Tasks:\n".join( [ "-" + task.description for task in incident.tasks diff --git a/src/dispatch/static/dispatch/src/incident/store.js b/src/dispatch/static/dispatch/src/incident/store.js index 8311fb67c639..bf57d004f858 100644 --- a/src/dispatch/static/dispatch/src/incident/store.js +++ b/src/dispatch/static/dispatch/src/incident/store.js @@ -207,12 +207,14 @@ const actions = { commit("SET_DIALOG_REPORT", true) commit("SET_SELECTED", incident) - state.report.tactical.actions = incident.tasks.reduce((result, task) => { - if (task.status == "Resolved") { - return result - } - return (result ? result + "\n" : "") + "- " + task.description - }, "") + state.report.tactical.actions += + "\n\nOutstanding Incident Tasks:\n" + + incident.tasks.reduce((result, task) => { + if (task.status == "Resolved") { + return result + } + return (result ? result + "\n" : "") + "- " + task.description + }, "") }, closeReportDialog({ commit }) { commit("SET_DIALOG_REPORT", false)