Merge branch 'master' into bugfix/truncate-group-key

src/dispatch/plugins/dispatch_slack/case/interactive.py

@@ -2511,28 +2511,49 @@ def ack_mfa_required_submission_event(
 ) -> None:
     """Handles the add engagement submission event acknowledgement."""
 
+    blocks = []
+
     if mfa_enabled:
-        mfa_text = (
-            "🔐 To complete this action, you need to verify your identity through Multi-Factor Authentication (MFA).\n\n"
-            f"Please <{challenge_url}|*click here*> to open the MFA verification page."
+        blocks.extend(
+            [
+                Section(
+                    text="To complete this action, you need to verify your identity through Multi-Factor Authentication (MFA).\n\n"
+                    "Please click the verify button to open the MFA verification page."
+                ),
+                Actions(
+                    elements=[
+                        Button(
+                            text="🔐   Verify",
+                            action_id="button-link",
+                            style="primary",
+                            url=challenge_url,
+                        )
+                    ]
+                ),
+            ]
         )
     else:
-        mfa_text = "✅ No additional verification required. You can proceed with the confirmation."
+        blocks.append(
+            Section(
+                text="✅ No additional verification required. You can proceed with the confirmation."
+            )
+        )
 
-    blocks = [
-        Section(text=mfa_text),
-        Divider(),
-        Context(
-            elements=[
-                MarkdownText(
-                    text="💡 This step protects against unauthorized confirmation if your account is compromised."
-                )
-            ]
-        ),
-    ]
+    blocks.extend(
+        [
+            Divider(),
+            Context(
+                elements=[
+                    MarkdownText(
+                        text="💡 This step protects against unauthorized confirmation if your account is compromised."
+                    )
+                ]
+            ),
+        ]
+    )
 
     modal = Modal(
-        title="Confirm Your Identity",
+        title="Verify Your Identity",
         close="Cancel",
         blocks=blocks,
     ).build()

src/dispatch/static/dispatch/src/case/type/NewEditSheet.vue

@@ -163,6 +163,7 @@ import PluginMetadataInput from "@/plugin/PluginMetadataInput.vue"
 import ServiceSelect from "@/service/ServiceSelect.vue"
 import ProjectSelect from "@/project/ProjectSelect.vue"
 import TemplateSelect from "@/document/template/TemplateSelect.vue"
+import ProjectApi from "@/project/api"
 
 export default {
   setup() {
@@ -220,8 +221,12 @@ export default {
   },
   created() {
     if (this.$route.query.project) {
+      // required for plugin metadata
       this.project = { name: this.$route.query.project }
-      this.incidentProject = this.project
+      ProjectApi.getAll({ q: this.$route.query.project }).then((response) => {
+        this.incidentProject = response.data.items[0]
+        this.project = response.data.items[0]
+      })
     }
   },
 }

src/dispatch/static/dispatch/src/incident/type/IncidentTypeSelect.vue

@@ -124,7 +124,7 @@ export default {
 
       if (this.project) {
         filterOptions.filters = {
-          project: [this.project],
+          project_id: this.project_id,
           enabled: ["true"],
         }
       }

src/dispatch/static/dispatch/src/plugin/store.js

@@ -183,6 +183,22 @@ function convertToFormkit(json_schema) {
           help: value.description,
         },
       }
+    } else if (value.allOf) {
+      const ref = value.allOf[0].$ref
+      // will be something like "#/definitions/HostingType"
+      const ref_name = ref.split("/").pop()
+      const ref_obj = json_schema.definitions[ref_name]["enum"]
+      obj = {
+        $formkit: "select",
+        name: key,
+        label: value.title,
+        help: value.description,
+        options: ref_obj.map((item) => {
+          return { label: item, value: item }
+        }),
+        default: value.default,
+        validation: "required",
+      }
     }
     formkit_schema.push(obj)
   }

src/dispatch/static/dispatch/src/service/ServiceSelect.vue

@@ -113,14 +113,14 @@ export default {
       }
 
       if (this.project) {
-        filterOptions.filters.project_id = this.project.map((p) => p.id)
+        filterOptions.filters.project_id = this.project.id
       }
 
       if (this.healthMetrics) {
         filterOptions.filters.health_metrics = ["true"]
       }
 
-      filterOptions = SearchUtils.createParametersFromTableOptions({ ...filterOptions })
+      filterOptions = SearchUtils.createParametersFromTableOptions({ ...filterOptions }, "Service")
 
       ServiceApi.getAll(filterOptions).then((response) => {
         this.items = response.data.items

src/dispatch/task/service.py

@@ -79,6 +79,12 @@ def create(*, db_session, task_in: TaskCreate) -> Task:
             db_session=db_session, incident_id=incident.id, email=i.individual.email
         )
 
+        assignee = incident_flows.incident_add_or_reactivate_participant_flow(
+            db_session=db_session,
+            incident_id=incident.id,
+            user_email=i.individual.email,
+        )
+
         if not participant or not participant.active_roles:
             # send emphemeral message to user about why they are being added to the incident
             send_task_add_ephemeral_message(
@@ -88,12 +94,6 @@ def create(*, db_session, task_in: TaskCreate) -> Task:
                 task=task_in,
             )
 
-        assignee = incident_flows.incident_add_or_reactivate_participant_flow(
-            db_session=db_session,
-            incident_id=incident.id,
-            user_email=i.individual.email,
-        )
-
         # due to the freeform nature of task assignment, we can sometimes pick up other emails
         # e.g. a google group that we cannot resolve to an individual assignee
         if assignee: