firefighter-incident 0.0.13__py3-none-any.whl → 0.0.14__py3-none-any.whl

firefighter/slack/migrations/0006_copy_components_to_incident_categories.py

@@ -0,0 +1,57 @@
+# Generated manually on 2025-08-19 - Copy component relationships to incident_categories
+
+from django.db import migrations
+
+
+def copy_components_to_incident_categories(apps, schema_editor):
+    """Copy all component M2M relationships to incident_categories M2M relationships"""
+    Conversation = apps.get_model("slack", "Conversation")
+    UserGroup = apps.get_model("slack", "UserGroup")
+
+    # Copy conversation components to incident_categories
+    conversations_updated = 0
+    for conversation in Conversation.objects.prefetch_related("components").all():
+        # Copy all component relationships to incident_categories (same UUIDs)
+        incident_category_ids = list(conversation.components.values_list("id", flat=True))
+        conversation.incident_categories.set(incident_category_ids)
+        if incident_category_ids:
+            conversations_updated += 1
+
+    # Copy usergroup components to incident_categories
+    usergroups_updated = 0
+    for usergroup in UserGroup.objects.prefetch_related("components").all():
+        incident_category_ids = list(usergroup.components.values_list("id", flat=True))
+        usergroup.incident_categories.set(incident_category_ids)
+        if incident_category_ids:
+            usergroups_updated += 1
+
+
+def reverse_copy_components_to_incident_categories(apps, schema_editor):
+    """Reverse: copy incident_categories relationships back to components"""
+    Conversation = apps.get_model("slack", "Conversation")
+    UserGroup = apps.get_model("slack", "UserGroup")
+
+    # Copy conversation incident_categories back to components
+    for conversation in Conversation.objects.prefetch_related("incident_categories").all():
+        component_ids = list(conversation.incident_categories.values_list("id", flat=True))
+        conversation.components.set(component_ids)
+
+    # Copy usergroup incident_categories back to components
+    for usergroup in UserGroup.objects.prefetch_related("incident_categories").all():
+        component_ids = list(usergroup.incident_categories.values_list("id", flat=True))
+        usergroup.components.set(component_ids)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("slack", "0005_add_incident_categories_fields"),
+        ("incidents", "0023_populate_incident_category_references"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            copy_components_to_incident_categories,
+            reverse_copy_components_to_incident_categories,
+        ),
+    ]

firefighter/slack/migrations/0007_remove_components_fields.py

@@ -0,0 +1,22 @@
+# Generated manually on 2025-08-19 - Remove components fields from Slack models
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("slack", "0006_copy_components_to_incident_categories"),
+        ("incidents", "0024_remove_component_fields_and_model"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="conversation",
+            name="components",
+        ),
+        migrations.RemoveField(
+            model_name="usergroup",
+            name="components",
+        ),
+    ]

firefighter/slack/migrations/0008_alter_conversation_incident_categories_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.23 on 2025-09-17 17:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("incidents", "0026_alter_incidentcategory_options_and_more"),
+        ("slack", "0007_remove_components_fields"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="conversation",
+            name="incident_categories",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="conversations",
+                to="incidents.incidentcategory",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="usergroup",
+            name="incident_categories",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Incident created with this usergroup automatically add the group members to these issue categories.",
+                related_name="usergroups",
+                to="incidents.incidentcategory",
+            ),
+        ),
+    ]

firefighter/slack/models/conversation.py

@@ -11,7 +11,7 @@ from django_stubs_ext.db.models import TypedModelMeta
 from slack_sdk.errors import SlackApiError
 
 from firefighter.firefighter.utils import get_in
-from firefighter.incidents.models import Component, User
+from firefighter.incidents.models import IncidentCategory, User
 from firefighter.slack.messages.base import SlackMessageStrategy, SlackMessageSurface
 from firefighter.slack.models.user import SlackUser
 from firefighter.slack.slack_app import DefaultWebClient, SlackApp, slack_client
@@ -188,8 +188,8 @@ class Conversation(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     members = models.ManyToManyField(User, blank=True)
-    components = models.ManyToManyField["Component", "Component"](
-        Component, related_name="conversations", blank=True
+    incident_categories = models.ManyToManyField["IncidentCategory", "IncidentCategory"](
+        IncidentCategory, related_name="conversations", blank=True
     )
     tag = models.CharField(
         max_length=80,

firefighter/slack/models/incident_channel.py

@@ -100,7 +100,7 @@ class IncidentChannel(Conversation):
         self, client: WebClient = DefaultWebClient
     ) -> SlackResponse | None:
         incident: Incident = self.incident
-        topic = f"Incident - {incident.priority.emoji} {incident.priority.name}  - {incident.status.label} - {incident.component.group.name} - {incident.component.name} - {SLACK_APP_EMOJI} <{incident.status_page_url + '?utm_medium=FireFighter+Slack&utm_source=Slack+Topic&utm_campaign=Slack+Topic+Link'}| {APP_DISPLAY_NAME} Status>"
+        topic = f"Incident - {incident.priority.emoji} {incident.priority.name}  - {incident.status.label} - {incident.incident_category.group.name} - {incident.incident_category.name} - {SLACK_APP_EMOJI} <{incident.status_page_url + '?utm_medium=FireFighter+Slack&utm_source=Slack+Topic&utm_campaign=Slack+Topic+Link'}| {APP_DISPLAY_NAME} Status>"
 
         if len(topic) > 250:
             logger.warning(

firefighter/slack/models/user.py

@@ -147,7 +147,7 @@ class SlackUserManager(models.Manager["SlackUser"]):
         # If we have no Slack User, let's go ahead and create a User and its associated SlackUser
         user, _created = User.objects.get_or_create(
             email=email,
-            username=email.split("@")[0],
+            username=email.split("@", maxsplit=1)[0],
             defaults={
                 "name": clean_user_info["name"],
             },

firefighter/slack/models/user_group.py

@@ -8,7 +8,7 @@ from django.db import models
 from django_stubs_ext.db.models import TypedModelMeta
 
 from firefighter.firefighter.utils import get_first_in, get_in
-from firefighter.incidents.models import Component, User
+from firefighter.incidents.models import IncidentCategory, User
 from firefighter.slack.slack_app import DefaultWebClient, SlackApp, slack_client
 
 if TYPE_CHECKING:
@@ -167,8 +167,8 @@ class UserGroup(models.Model):
         help_text="Is this an external group, from an external Slack Workspace? Corresponds to the `is_external` field in the Slack API.",
     )
 
-    components = models.ManyToManyField["Component", "Component"](
-        Component,
+    incident_categories = models.ManyToManyField["IncidentCategory", "IncidentCategory"](
+        IncidentCategory,
         related_name="usergroups",
         blank=True,
         help_text="Incident created with this usergroup automatically add the group members to these issue categories.",

firefighter/slack/rules.py

@@ -50,5 +50,5 @@ def should_publish_in_it_deploy_channel(incident: Incident) -> bool:
         incident.environment.value == "PRD"
         and incident.priority.value <= 1
         and not incident.private
-        and incident.component.deploy_warning
+        and incident.incident_category.deploy_warning
     )

firefighter/slack/signals/get_users.py

@@ -26,8 +26,8 @@ logger = logging.getLogger(__name__)
 def get_invites_from_slack(incident: Incident, **_kwargs: Any) -> Iterable[User]:
     """New version using cached users instead of querying Slack API."""
     # Prepare sub-queries
-    slack_usergroups: QuerySet[UserGroup] = incident.component.usergroups.all()
-    slack_conversations: QuerySet[Conversation] = incident.component.conversations.all()
+    slack_usergroups: QuerySet[UserGroup] = incident.incident_category.usergroups.all()
+    slack_conversations: QuerySet[Conversation] = incident.incident_category.conversations.all()
 
     # We make sure to exclude the bot user, and avoid duplicates with distinct()
     # Also make sure that all users have related SlackUser and a slack_id

firefighter/slack/signals/incident_updated.py

@@ -44,7 +44,7 @@ def incident_updated_update_status_handler(
     # Update topic if needed
     if (
         "priority_id" in updated_fields
-        or "component_id" in updated_fields
+        or "incident_category_id" in updated_fields
         or "_status" in updated_fields
     ):
         incident.conversation.set_incident_channel_topic()

firefighter/slack/utils.py

@@ -97,9 +97,9 @@ def channel_name_from_incident(incident: Incident) -> str:
         )
     date_formatted = localtime(incident.created_at).strftime("%Y%m%d")
     if incident.environment is not None and incident.environment.value != "PRD":
-        topic = f"{date_formatted}-{str(incident.id)[:8]}-{incident.environment.value}-{incident.component.name}"
+        topic = f"{date_formatted}-{str(incident.id)[:8]}-{incident.environment.value}-{incident.incident_category.name}"
     else:
-        topic = f"{date_formatted}-{str(incident.id)[:8]}-{incident.component.name}"
+        topic = f"{date_formatted}-{str(incident.id)[:8]}-{incident.incident_category.name}"
 
     # Strip non-alphanumeric characters, cut at 80 chars
     # XXX django.utils.text.slugify should be used instead

firefighter/slack/views/events/home.py

@@ -57,7 +57,7 @@ def update_home_tab(
         Incident.objects.filter(_status__lt=IncidentStatus.CLOSED.value)
         .order_by("-id")
         .select_related(
-            "priority", "component", "environment", "component__group", "conversation"
+            "priority", "incident_category", "environment", "incident_category__group", "conversation"
         )[:30]
     )
     blocks: list[Block] = [
@@ -148,7 +148,7 @@ def _home_incident_element(
                     text=f":rotating_light: *Priority:* {incident.priority.emoji} {incident.priority.name}"
                 ),
                 MarkdownTextObject(
-                    text=f":package: *Issue category:* {incident.component.group.name} - {incident.component.name}"
+                    text=f":package: *Incident category:* {incident.incident_category.group.name} - {incident.incident_category.name}"
                 ),
                 MarkdownTextObject(
                     text=f":speaking_head_in_silhouette: *Last update:* {date_time(incident.updated_at)}"

firefighter/slack/views/modals/base_modal/form_utils.py

@@ -336,6 +336,12 @@ class SlackForm(Generic[T]):
         ):
             slack_input_kwargs["options"].append(slack_input_kwargs["initial_option"])
 
+        # Ensure we have at least one option for Slack API
+        if not slack_input_kwargs["options"]:
+            slack_input_kwargs["options"] = [
+                SafeOption(label="Please select an option", value="__placeholder__")
+            ]
+
         field_name = f"{field_name}___{f.initial}{datetime.now().timestamp()}"  # noqa: DTZ005
         field_name = field_name[:254]
         return SelectElement(action_id=field_name, **slack_input_kwargs)
@@ -401,6 +407,15 @@ class SlackForm(Generic[T]):
                     OptionGroup(label=str(group_name), options=subgroup)
                 )
 
+        # Ensure we have at least one option group for Slack API
+        if not slack_input_kwargs["option_groups"]:
+            slack_input_kwargs["option_groups"] = [
+                OptionGroup(
+                    label="No options available",
+                    options=[SafeOption(label="Please select an option", value="__placeholder__")]
+                )
+            ]
+
         return SelectElement(action_id=field_name, **slack_input_kwargs)
 
     @classmethod

firefighter/slack/views/modals/close.py

@@ -229,8 +229,8 @@ class CloseModal(
         # If fields haven't changed, don't include them in the update.
         update_kwargs = {}
         for changed_key in form.changed_data:
-            if changed_key == "component":
-                update_kwargs["component_id"] = form.cleaned_data[changed_key].id
+            if changed_key == "incident_category":
+                update_kwargs["incident_category_id"] = form.cleaned_data[changed_key].id
             if changed_key in {"description", "title", "message"}:
                 update_kwargs[changed_key] = form.cleaned_data[changed_key]
         # Check can close
@@ -258,7 +258,7 @@ class CloseModal(
         return {
             "title": incident.title,
             "description": incident.description,
-            "component": incident.component,
+            "incident_category": incident.incident_category,
         }
 
     @staticmethod

firefighter/slack/views/modals/open.py

@@ -56,6 +56,12 @@ INCIDENT_TYPES: dict[ResponseType, dict[str, dict[str, Any]]] = {
             "slack_form": OpeningCriticalModal,
         },
     },
+    "normal": {
+        "normal": {
+            "label": "Normal",
+            "slack_form": OpeningCriticalModal,
+        },
+    },
 }
 
 
@@ -224,6 +230,20 @@ class OpenModal(SlackModal):
     ) -> list[Block]:
         if details_form_modal_class is None:
             return []
+
+        # Check if we need incident type selection and if it's been done
+        response_type = open_incident_context.get("response_type")
+        incident_type_value = open_incident_context.get("incident_type")
+
+        # If there are multiple incident types and none is selected, don't show details button yet
+        if (
+            response_type
+            and response_type in INCIDENT_TYPES
+            and len(INCIDENT_TYPES[response_type]) > 1
+            and incident_type_value is None
+        ):
+            return []
+
         return [
             SectionBlock(
                 text=f"{'✅' if details_form_done else '📝'} Finally, add incident details",
@@ -510,7 +530,8 @@ class OpenModal(SlackModal):
         """Format a single impact value into description text."""
         # Handle object with name and description attributes (impact levels)
         if hasattr(value, "name") and hasattr(value, "description"):
-            if value.name == "NO" or not value.description:
+            # Filter out "no impact" levels using the value field instead of name
+            if (hasattr(value, "value") and value.value == "NO") or value.name == "NO" or not value.description:
                 return ""
 
             description = ""
@@ -548,6 +569,9 @@ class OpenModal(SlackModal):
             return incident_types[next(iter(incident_types.keys()))].get("slack_form")
         if incident_types and incident_type_value is not None:
             return incident_types[incident_type_value].get("slack_form")
+        # Fallback for "normal" response type when no specific incident type is selected
+        if response_type == "normal" and incident_types:
+            return incident_types[next(iter(incident_types.keys()))].get("slack_form")
         logger.debug(
             f"No incident type found for {open_incident_context}. No fallback."
         )

firefighter/slack/views/modals/opening/check_current_incidents.py

@@ -44,9 +44,9 @@ class CheckCurrentIncidentsModal(
             .order_by("-created_at")
             .select_related(
                 "priority",
-                "component",
+                "incident_category",
                 "environment",
-                "component__group",
+                "incident_category__group",
                 "conversation",
             )[:30]
         )

firefighter/slack/views/modals/opening/details/critical.py

@@ -58,7 +58,7 @@ class CreateIncidentFormSlack(CreateIncidentForm):
                 "label_from_instance": lambda obj: f"{obj.emoji}  {obj.name} - {obj.description}",
             },
         },
-        "component": {
+        "incident_category": {
             "input": {
                 "placeholder": "Select affected issue category",
             },

firefighter/slack/views/modals/opening/select_impact.py

@@ -139,13 +139,16 @@ class SelectImpactModal(
         impact_descriptions = ""
         if impact_form_data:
             for value in impact_form_data.values():
-                if value.name != "NO" and value.description:
+                # Filter out "no impact" levels using the value field instead of name
+                if not ((hasattr(value, "value") and value.value == "NO") or value.name == "NO" or not value.description):
                     if hasattr(value, "impact_type_id") and value.impact_type_id:
                         impact_type = ImpactType.objects.get(pk=value.impact_type_id)
                         if impact_type:
                             impact_descriptions += f"\u00A0\u00A0 :exclamation: {impact_type} - {value}\n"
                     for line in str(value.description).splitlines():
-                        impact_descriptions += f"\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0 • {line}\n"
+                        # Skip empty lines or lines with only dashes/whitespace
+                        if line.strip() and line.strip() != "-":
+                            impact_descriptions += f"\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0 • {line}\n"
         return impact_descriptions
 
     def handle_modal_fn(  # type: ignore

firefighter/slack/views/modals/update_status.py

@@ -51,7 +51,7 @@ class UpdateStatusFormSlack(UpdateStatusForm):
                 "label_from_instance": priority_label,
             },
         },
-        "component": {
+        "incident_category": {
             "input": {
                 "placeholder": "Select affected issue category",
             }
@@ -73,7 +73,7 @@ class UpdateStatusModal(ModalForm[UpdateStatusFormSlack]):
             initial={
                 "status": incident.status,
                 "priority": incident.priority,
-                "component": incident.component,
+                "incident_category": incident.incident_category,
             }
         ).slack_blocks()
         blocks.append(slack_block_separator())
@@ -97,7 +97,7 @@ class UpdateStatusModal(ModalForm[UpdateStatusFormSlack]):
                 "initial": {
                     "status": incident.status,
                     "priority": incident.priority,
-                    "component": incident.component,
+                    "incident_category": incident.incident_category,
                 }
             },
         )
@@ -109,7 +109,7 @@ class UpdateStatusModal(ModalForm[UpdateStatusFormSlack]):
             return
         update_kwargs: dict[str, Any] = {}
         for changed_key in form.changed_data:
-            if changed_key in {"component", "priority"}:
+            if changed_key in {"incident_category", "priority"}:
                 update_kwargs[f"{changed_key}_id"] = form.cleaned_data[changed_key].id
             if changed_key in {"description", "title", "message", "status"}:
                 update_kwargs[changed_key] = form.cleaned_data[changed_key]