Merge branch 'master' into dependabot/pip/ruff-0.0.290

Netflix · Sep 20, 2023 · f2ba8b8 · f2ba8b8
2 parents df38b02 + dea8180
commit f2ba8b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git 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:

diff --git 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
@@ -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)