From 7c66573d1ee8a39a84f20e29a7e0739cfe2116db Mon Sep 17 00:00:00 2001
From: David Whittaker <dwhittaker@netflix.com>
Date: Tue, 10 Sep 2024 09:24:07 -0700
Subject: [PATCH 1/3] Adding rule for enforcing severity

---
 .../static/dispatch/src/incident/DetailsTab.vue      |  2 +-
 .../src/incident/severity/IncidentSeveritySelect.vue | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/dispatch/static/dispatch/src/incident/DetailsTab.vue b/src/dispatch/static/dispatch/src/incident/DetailsTab.vue
index 86dd69202c3b..d98c362d30cc 100644
--- a/src/dispatch/static/dispatch/src/incident/DetailsTab.vue
+++ b/src/dispatch/static/dispatch/src/incident/DetailsTab.vue
@@ -62,7 +62,7 @@
         <incident-type-select v-model="incident_type" :project="project" />
       </v-col>
       <v-col cols="6">
-        <incident-severity-select v-model="incident_severity" :project="project" />
+        <incident-severity-select v-model="incident_severity" :project="project" :status="status" />
       </v-col>
       <v-col cols="6">
         <incident-priority-select v-model="incident_priority" :project="project" :status="status" />
diff --git a/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue b/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue
index 6ce141e71a5b..36a66bf0178f 100644
--- a/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue
+++ b/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue
@@ -7,6 +7,7 @@
     label="Severity"
     return-object
     :loading="loading"
+    :error-messages="show_error"
     :rules="[is_severity_in_project]"
   >
     <template #item="data">
@@ -40,6 +41,10 @@ export default {
       type: [Object],
       default: null,
     },
+    status: {
+      type: String,
+      default: "",
+    },
   },
 
   data() {
@@ -64,6 +69,13 @@ export default {
         this.validateSeverity()
       },
     },
+    show_error() {
+      // TODO: add new column to severities that indicate if can be used for stable & closed incidents
+      if (this.status != "Active" && this.modelValue?.name == "Undetermined") {
+        return `Severity cannot be Undetermined for ${this.status} incidents`
+      }
+      return null
+    },
   },
 
   methods: {

From 1a7872989dd47086d1ac5eca4afa3a13e507826c Mon Sep 17 00:00:00 2001
From: David Whittaker <dwhittaker@netflix.com>
Date: Tue, 10 Sep 2024 12:38:08 -0700
Subject: [PATCH 2/3] Adding Slack validation to update incident

---
 .../versions/2024-09-10_0a6702319f6a.py       | 31 +++++++++++++++++++
 src/dispatch/incident/severity/models.py      |  3 ++
 .../dispatch_slack/incident/interactive.py    | 23 ++++++++++++--
 .../src/case/priority/NewEditSheet.vue        |  2 +-
 .../src/case/severity/NewEditSheet.vue        |  2 +-
 .../dispatch/src/case/type/NewEditSheet.vue   |  2 +-
 .../src/incident/priority/NewEditSheet.vue    |  2 +-
 .../severity/IncidentSeveritySelect.vue       |  5 ++-
 .../src/incident/severity/NewEditSheet.vue    | 10 +++++-
 .../dispatch/src/incident/severity/Table.vue  |  4 +++
 .../src/incident/type/NewEditSheet.vue        |  2 +-
 11 files changed, 75 insertions(+), 11 deletions(-)
 create mode 100644 src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py

diff --git a/src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py b/src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py
new file mode 100644
index 000000000000..52ad19c76757
--- /dev/null
+++ b/src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py
@@ -0,0 +1,31 @@
+"""Adds restriction ability to incident severity
+
+Revision ID: 0a6702319f6a
+Revises: d6b3853be8e4
+Create Date: 2024-09-10 10:13:04.192475
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = "0a6702319f6a"
+down_revision = "d6b3853be8e4"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "incident_severity",
+        sa.Column("allowed_for_stable_incidents", sa.Boolean(), server_default="t", nullable=True),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("incident_severity", "allowed_for_stable_incidents")
+    # ### end Alembic commands ###
diff --git a/src/dispatch/incident/severity/models.py b/src/dispatch/incident/severity/models.py
index 8944a443d06c..94adad99f8ad 100644
--- a/src/dispatch/incident/severity/models.py
+++ b/src/dispatch/incident/severity/models.py
@@ -20,6 +20,7 @@ class IncidentSeverity(Base, ProjectMixin):
     color = Column(String)
     enabled = Column(Boolean, default=True)
     default = Column(Boolean, default=False)
+    allowed_for_stable_incidents = Column(Boolean, default=True, server_default="t")
 
     # This column is used to control how severities should be displayed
     # Lower numbers will be shown first.
@@ -46,6 +47,7 @@ class IncidentSeverityBase(DispatchBase):
     name: NameStr
     project: Optional[ProjectRead]
     view_order: Optional[int]
+    allowed_for_stable_incidents: Optional[bool]
 
 
 class IncidentSeverityCreate(IncidentSeverityBase):
@@ -67,6 +69,7 @@ class IncidentSeverityReadMinimal(DispatchBase):
     description: Optional[str] = Field(None, nullable=True)
     enabled: Optional[bool]
     name: NameStr
+    allowed_for_stable_incidents: Optional[bool]
 
 
 class IncidentSeverityPagination(Pagination):
diff --git a/src/dispatch/plugins/dispatch_slack/incident/interactive.py b/src/dispatch/plugins/dispatch_slack/incident/interactive.py
index a72d8331ef67..866a316421f5 100644
--- a/src/dispatch/plugins/dispatch_slack/incident/interactive.py
+++ b/src/dispatch/plugins/dispatch_slack/incident/interactive.py
@@ -48,6 +48,7 @@
 from dispatch.participant import service as participant_service
 from dispatch.participant.models import ParticipantUpdate
 from dispatch.participant_role import service as participant_role_service
+from dispatch.incident.severity import service as incident_severity_service
 from dispatch.participant_role.enums import ParticipantRoleType
 from dispatch.plugin import service as plugin_service
 from dispatch.plugins.dispatch_slack import service as dispatch_slack_service
@@ -1011,7 +1012,9 @@ def handle_member_joined_channel(
 
         if participant.added_by:
             # Message text when someone @'s a user is not available in body, use generic added by reason
-            participant.added_reason = f"Participant added by {participant.added_by.individual.name}"
+            participant.added_reason = (
+                f"Participant added by {participant.added_by.individual.name}"
+            )
         else:
             # We couldn't find a user to attribute the addition to, add generic reason
             participant.added_reason = "Participant added by Dispatch"
@@ -1061,7 +1064,9 @@ def handle_member_joined_channel(
 
         if participant.added_by:
             # Message text when someone @'s a user is not available in body, use generic added by reason
-            participant.added_reason = f"Participant added by {participant.added_by.individual.name}"
+            participant.added_reason = (
+                f"Participant added by {participant.added_by.individual.name}"
+            )
         else:
             # We couldn't find a user to attribute the addition to, add generic reason
             participant.added_reason = "Participant added by Dispatch"
@@ -1980,6 +1985,20 @@ def handle_update_incident_submission_event(
     user: DispatchUser,
 ) -> None:
     """Handles the update incident submission"""
+    incident_severity_id = form_data[DefaultBlockIds.incident_severity_select]["value"]
+    incident_severity = incident_severity_service.get(
+        db_session=db_session, incident_severity_id=incident_severity_id
+    )
+    status = form_data[DefaultBlockIds.incident_status_select]["name"]
+    if not incident_severity.allowed_for_stable_incidents and (
+        status == IncidentStatus.stable or status == IncidentStatus.closed
+    ):
+        errors = {
+            DefaultBlockIds.incident_severity_select: f"Severity cannot be {incident_severity.name} for {status} incidents"
+        }
+        ack(response_action="errors", errors=errors)
+        return
+
     ack_incident_update_submission_event(ack=ack)
     incident = incident_service.get(db_session=db_session, incident_id=context["subject"].id)
 
diff --git a/src/dispatch/static/dispatch/src/case/priority/NewEditSheet.vue b/src/dispatch/static/dispatch/src/case/priority/NewEditSheet.vue
index d7939cca557d..7e76b5289521 100644
--- a/src/dispatch/static/dispatch/src/case/priority/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/case/priority/NewEditSheet.vue
@@ -86,7 +86,7 @@
                 <v-checkbox
                   v-model="enabled"
                   label="Enabled"
-                  hint="Determines whether this case priority is availible for new cases."
+                  hint="Determines whether this case priority is available for new cases."
                 />
               </v-col>
             </v-row>
diff --git a/src/dispatch/static/dispatch/src/case/severity/NewEditSheet.vue b/src/dispatch/static/dispatch/src/case/severity/NewEditSheet.vue
index 764126294af8..58a3481c4d3d 100644
--- a/src/dispatch/static/dispatch/src/case/severity/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/case/severity/NewEditSheet.vue
@@ -79,7 +79,7 @@
                 <v-checkbox
                   v-model="enabled"
                   label="Enabled"
-                  hint="Determines whether this case severity is availible for new cases."
+                  hint="Determines whether this case severity is available for new cases."
                 />
               </v-col>
             </v-row>
diff --git a/src/dispatch/static/dispatch/src/case/type/NewEditSheet.vue b/src/dispatch/static/dispatch/src/case/type/NewEditSheet.vue
index 1da007fa37c0..bc9b75150613 100644
--- a/src/dispatch/static/dispatch/src/case/type/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/case/type/NewEditSheet.vue
@@ -130,7 +130,7 @@
                 <v-checkbox
                   v-model="enabled"
                   label="Enabled"
-                  hint="Determines whether this case type is availible for new cases."
+                  hint="Determines whether this case type is available for new cases."
                 />
               </v-col>
               <v-col cols="12">
diff --git a/src/dispatch/static/dispatch/src/incident/priority/NewEditSheet.vue b/src/dispatch/static/dispatch/src/incident/priority/NewEditSheet.vue
index 7bc67abb43bc..e397bdc0865b 100644
--- a/src/dispatch/static/dispatch/src/incident/priority/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/incident/priority/NewEditSheet.vue
@@ -112,7 +112,7 @@
                 <v-checkbox
                   v-model="enabled"
                   label="Enabled"
-                  hint="Determines whether this incident priority is availible for new incidents."
+                  hint="Determines whether this incident priority is available for new incidents."
                 />
               </v-col>
             </v-row>
diff --git a/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue b/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue
index 36a66bf0178f..9ba3775d18bf 100644
--- a/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue
+++ b/src/dispatch/static/dispatch/src/incident/severity/IncidentSeveritySelect.vue
@@ -70,9 +70,8 @@ export default {
       },
     },
     show_error() {
-      // TODO: add new column to severities that indicate if can be used for stable & closed incidents
-      if (this.status != "Active" && this.modelValue?.name == "Undetermined") {
-        return `Severity cannot be Undetermined for ${this.status} incidents`
+      if (this.status != "Active" && this.modelValue?.allowed_for_stable_incidents === false) {
+        return `Severity cannot be ${this.modelValue?.name} for ${this.status} incidents`
       }
       return null
     },
diff --git a/src/dispatch/static/dispatch/src/incident/severity/NewEditSheet.vue b/src/dispatch/static/dispatch/src/incident/severity/NewEditSheet.vue
index 3c3ae211cdd4..c9aed34e980f 100644
--- a/src/dispatch/static/dispatch/src/incident/severity/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/incident/severity/NewEditSheet.vue
@@ -79,7 +79,14 @@
                 <v-checkbox
                   v-model="enabled"
                   label="Enabled"
-                  hint="Determines whether this incident severity is availible for new incidents."
+                  hint="Determines whether this incident severity is available for new incidents."
+                />
+              </v-col>
+              <v-col cols="12">
+                <v-checkbox
+                  v-model="allowed_for_stable_incidents"
+                  label="Allowed for stable incidents"
+                  hint="Determines whether this incident severity is available for stable (and closed) incidents."
                 />
               </v-col>
             </v-row>
@@ -126,6 +133,7 @@ export default {
       "selected.name",
       "selected.project",
       "selected.view_order",
+      "selected.allowed_for_stable_incidents",
     ]),
     ...mapFields("incident_severity", {
       default_incident_severity: "selected.default",
diff --git a/src/dispatch/static/dispatch/src/incident/severity/Table.vue b/src/dispatch/static/dispatch/src/incident/severity/Table.vue
index 11ad3d680cb2..df56e421dd27 100644
--- a/src/dispatch/static/dispatch/src/incident/severity/Table.vue
+++ b/src/dispatch/static/dispatch/src/incident/severity/Table.vue
@@ -47,6 +47,9 @@
             <template #item.enabled="{ value }">
               <v-checkbox-btn :model-value="value" disabled />
             </template>
+            <template #item.allowed_for_stable_incidents="{ value }">
+              <v-checkbox-btn :model-value="value" disabled />
+            </template>
             <template #item.data-table-actions="{ item }">
               <v-menu location="right" origin="overlap">
                 <template #activator="{ props }">
@@ -90,6 +93,7 @@ export default {
         { title: "Description", value: "description", sortable: false },
         { title: "Default", value: "default", sortable: true },
         { title: "Enabled", value: "enabled", sortable: true },
+        { title: "Allowed for Stable", value: "allowed_for_stable_incidents", sortable: true },
         { title: "View Order", value: "view_order", sortable: true },
         { title: "", key: "data-table-actions", sortable: false, align: "end" },
       ],
diff --git a/src/dispatch/static/dispatch/src/incident/type/NewEditSheet.vue b/src/dispatch/static/dispatch/src/incident/type/NewEditSheet.vue
index bd7dfedffd96..35e5cb251b15 100644
--- a/src/dispatch/static/dispatch/src/incident/type/NewEditSheet.vue
+++ b/src/dispatch/static/dispatch/src/incident/type/NewEditSheet.vue
@@ -129,7 +129,7 @@
                 <v-checkbox
                   v-model="enabled"
                   label="Enabled"
-                  hint="Determines whether this incident type is availible for new incidents."
+                  hint="Determines whether this incident type is available for new incidents."
                 />
               </v-col>
               <v-col cols="12">

From c76178674372ea7a8d5a36d9dffe578044b9caef Mon Sep 17 00:00:00 2001
From: David Whittaker <dwhittaker@netflix.com>
Date: Tue, 10 Sep 2024 12:51:36 -0700
Subject: [PATCH 3/3] Resyncing database migration ids

---
 .../revisions/tenant/versions/2024-09-10_0a6702319f6a.py      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py b/src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py
index 52ad19c76757..bd0a32a7d410 100644
--- a/src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py
+++ b/src/dispatch/database/revisions/tenant/versions/2024-09-10_0a6702319f6a.py
@@ -1,7 +1,7 @@
 """Adds restriction ability to incident severity
 
 Revision ID: 0a6702319f6a
-Revises: d6b3853be8e4
+Revises: 51eacaf1f62c
 Create Date: 2024-09-10 10:13:04.192475
 
 """
@@ -11,7 +11,7 @@
 
 # revision identifiers, used by Alembic.
 revision = "0a6702319f6a"
-down_revision = "d6b3853be8e4"
+down_revision = "51eacaf1f62c"
 branch_labels = None
 depends_on = None