firefighter-incident 0.0.8__py3-none-any.whl → 0.0.10__py3-none-any.whl

firefighter/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.8'
-__version_tuple__ = version_tuple = (0, 0, 8)
+__version__ = version = '0.0.10'
+__version_tuple__ = version_tuple = (0, 0, 10)

firefighter/components/avatar/avatar.py

@@ -25,7 +25,7 @@ class Kwargs(TypedDict, total=False):
 
 
 @component.register("avatar")
-class Avatar(component.Component[tuple[()], Kwargs, Data, Any]):  # type: ignore[type-var]
+class Avatar(component.Component):
     template_name = "avatar/avatar.html"
 
     def get_context_data(self, user: User, **kwargs: Any) -> Data:

firefighter/components/card/card.py

@@ -14,7 +14,7 @@ class Data(TypedDict, total=False):
 
 
 @component.register("card")
-class Card(component.Component[tuple[()], Data, Data, Any]):  # type: ignore[type-var]
+class Card(component.Component):
     template_name = "card/card.html"
 
     def get_context_data(self, *args: Any, **kwargs: Unpack[Data]) -> Data:

firefighter/components/export_button/export_button.py

@@ -27,7 +27,7 @@ class Kwargs(TypedDict, total=False):
 
 
 @component.register("export_button")
-class ExportButton(component.Component[tuple[()], Kwargs, Data, Any]):  # type: ignore[type-var]
+class ExportButton(component.Component):
     template_name = "export_button/export_button.html"
 
     def get_context_data(

firefighter/components/form/form.py

@@ -19,8 +19,8 @@ class Data(TypedDict):
 
 
 @component.register("form")
-class Form(component.Component[tuple[()], Data, Data, Slots]):  # type: ignore[type-var]  # type: ignore[override]
+class FormComponent(component.Component):
     template_name = "form/form.html"
 
-    def get_context_data(self, form: forms.Form, **kwargs: Any) -> Data:  # type: ignore[override]
+    def get_context_data(self, form: forms.Form, **kwargs: Any) -> Data:
         return Data(form=form)

firefighter/components/form_field/form_field.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import logging
 from typing import (
-    Any,
     Never,
     TypedDict,
 )
@@ -23,7 +22,7 @@ class Kwargs(TypedDict, total=True):
 
 
 @component.register("form_field")
-class FormField(component.Component[tuple[()], Kwargs, Data, Any]):  # type: ignore[type-var]
+class FormField(component.Component):
     template_name = "form_field/form_field.html"
 
     def get_context_data(

firefighter/components/messages/messages.py

@@ -14,7 +14,7 @@ class Data(TypedDict):
 
 
 @component.register("messages")
-class Messages(component.Component[tuple[()], Data, Data, Any]):  # type: ignore[type-var]
+class MessagesComponent(component.Component):
     template_name = "messages/messages.html"
 
     def get_context_data(self, messages: BaseStorage, **kwargs: Any) -> Data:

firefighter/components/modal/modal.py

@@ -28,7 +28,7 @@ class Slots(TypedDict):
 
 
 @component.register("modal")
-class Modal(component.Component[tuple[()], Kwargs, Data, Any]):  # type: ignore[type-var]
+class Modal(component.Component):
     template_name = "modal/modal.html"
 
     def get_context_data(self, *args: Any, **kwargs: Unpack[Kwargs]) -> Data:

firefighter/incidents/forms/select_impact.py

@@ -39,7 +39,7 @@ class SelectImpactForm(forms.Form):
 
         super().__init__(*args, **kwargs)
 
-        for impact_type in ImpactType.objects.all().order_by("-order"):
+        for impact_type in ImpactType.objects.all().order_by("order"):
             field_name = f"set_impact_type_{impact_type.value}"
             self.fields[field_name] = forms.ModelChoiceField(
                 label=impact_type.emoji + " " + impact_type.name,

firefighter/incidents/migrations/0017_reorder_impact_types.py

@@ -0,0 +1,28 @@
+# Generated by ChatGPT on 2024-06-24
+from django.db import migrations
+
+
+def reorder_impact_types(apps, schema_editor):
+    ImpactType = apps.get_model("incidents", "ImpactType")
+    # On suppose que les valeurs sont :
+    # business_impact, customers_impact, sellers_impact, employees_impact
+    order_map = {
+        "business_impact": 1,
+        "customers_impact": 2,
+        "sellers_impact": 3,
+        "employees_impact": 4,
+    }
+    for value, order in order_map.items():
+        impact_type = ImpactType.objects.filter(value=value).first()
+        if impact_type:
+            impact_type.order = order
+            impact_type.save(update_fields=["order"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("incidents", "0016_update_business_incidents_and_level"),
+    ]
+    operations = [
+        migrations.RunPython(reorder_impact_types),
+    ]

firefighter/incidents/migrations/0018_update_impactlevel_names.py

@@ -0,0 +1,48 @@
+# Generated by ChatGPT on 2024-06-24
+from django.db import migrations
+
+
+def update_impactlevel_names(apps, schema_editor):
+    ImpactType = apps.get_model("incidents", "ImpactType")
+    ImpactLevel = apps.get_model("incidents", "ImpactLevel")
+
+    # Map: (impact_type.value, impact_level.value) -> new name
+    updates = {
+        ("business_impact", "HT"): "Critical Impact (>5% BV loss)",
+        ("business_impact", "HI"): "Major Impact (<5% BV loss)",
+        ("business_impact", "MD"): "Uncertain Business Impact",
+        ("business_impact", "LO"): "Low Impact not measurable",
+        ("business_impact", "LT"): "Very Low Impact not measurable",
+        ("customers_impact", "HT"): "Critical issue for many customers",
+        ("customers_impact", "HI"): "Major issue for many customers",
+        ("customers_impact", "MD"): "Major issue for few customers",
+        ("customers_impact", "LO"): "Minor issue for customers",
+        ("customers_impact", "LT"): "Cosmetic minor issue for customers",
+        ("sellers_impact", "HT"): "Critical issue for many sellers",
+        ("sellers_impact", "HI"): "Major issue for many sellers",
+        ("sellers_impact", "MD"): "Major issue for few sellers",
+        ("sellers_impact", "LO"): "Minor issue for sellers",
+        ("sellers_impact", "LT"): "Cosmetic minor issue for sellers",
+        ("employees_impact", "MD"): "Departments fully blocked",
+        ("employees_impact", "LO"): "Some employees affected",
+        ("employees_impact", "LT"): "Degraded service for employees",
+        ("employees_impact", "NO"): "No impact for employees",
+    }
+
+    for (impact_type_value, level_value), new_name in updates.items():
+        impact_type = ImpactType.objects.filter(value=impact_type_value).first()
+        if not impact_type:
+            continue
+        impact_level = ImpactLevel.objects.filter(impact_type=impact_type, value=level_value).first()
+        if impact_level:
+            impact_level.name = new_name
+            impact_level.save(update_fields=["name"])
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("incidents", "0017_reorder_impact_types"),
+    ]
+    operations = [
+        migrations.RunPython(update_impactlevel_names),
+    ]

firefighter/slack/views/modals/open.py

@@ -23,6 +23,7 @@ from slack_sdk.models.views import View
 from firefighter.firefighter.utils import is_during_office_hours
 from firefighter.incidents.enums import IncidentStatus
 from firefighter.incidents.forms.select_impact import SelectImpactForm
+from firefighter.incidents.models.impact import ImpactType
 from firefighter.incidents.models.incident import Incident
 from firefighter.incidents.models.priority import Priority
 from firefighter.slack.slack_app import SlackApp
@@ -410,18 +411,25 @@ class OpenModal(SlackModal):
                 priority: Priority = Priority.objects.get(
                     value=impact_form.suggest_priority_from_impact()
                 )
+                process = ":slack: Slack :jira_new: Jira ticket" if open_incident_context.get("response_type") == "critical" else ":jira_new: Jira ticket"
+
+                impact_descriptions = OpenModal._get_impact_descriptions(open_incident_context)
                 blocks.append(
                     ContextBlock(
                         elements=[
                             MarkdownTextObject(
-                                text=f"> {priority.emoji} Selected priority: {priority}"
+                                text=f"> {priority.emoji} Selected priority: *{priority} - {priority.description}*\n"
+                                f"> ⏱️ SLA: {priority.sla}\n"
+                                f"> :gear: Process: {process}\n"
+                                f"> :pushpin: Selected impacts:\n"
+                                f"{impact_descriptions}\n"
                                 + (
                                     (
                                         "\n> Critical incidents are for *emergency* only"
                                         + (
-                                            f"<{SLACK_SEVERITY_HELP_GUIDE_URL}|learn more>"
+                                            f" <{SLACK_SEVERITY_HELP_GUIDE_URL}|learn more>"
                                             if SLACK_SEVERITY_HELP_GUIDE_URL
-                                            else "" + "."
+                                            else "."
                                         )
                                     )
                                     if selected_response_type == "critical"
@@ -448,6 +456,21 @@ class OpenModal(SlackModal):
 
         return blocks
 
+    @staticmethod
+    def _get_impact_descriptions(open_incident_context: OpeningData) -> str:
+        impact_form_data = open_incident_context.get("impact_form_data", {})
+        impact_descriptions = ""
+        if impact_form_data:
+            for value in impact_form_data.values():
+                if value.name != "NO" and 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"
+        return impact_descriptions
+
     @staticmethod
     def get_details_modal_form_class(
         open_incident_context: OpeningData,

{firefighter_incident-0.0.8.dist-info → firefighter_incident-0.0.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: firefighter-incident
-Version: 0.0.8
+Version: 0.0.10
 Summary: Incident Management tool made for Slack using Django
 Project-URL: Repository, https://github.com/ManoManoTech/firefighter-incident
 Project-URL: Documentation, https://manomanotech.github.io/firefighter-incident/latest/

{firefighter_incident-0.0.8.dist-info → firefighter_incident-0.0.10.dist-info}/RECORD

@@ -6,7 +6,7 @@ gunicorn.conf.py,sha256=vHsTGjaKOr8FDMp6fTKYTX4AtokmPgYvvt5Mr0Q6APc,273
 main.py,sha256=CsbprHoOYhjCLpTJmq9Z_aRYFoFgWxoz2pDLuwm8Eqg,1558
 manage.py,sha256=5ivHGD13C6nJ8QvltKsJ9T9akA5he8da70HLWaEP3k8,689
 firefighter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-firefighter/_version.py,sha256=SbamvXnLxfCU9pL5KMng4JCEwFYPcZcxEC7yaD9HbZ4,511
+firefighter/_version.py,sha256=Gdu8ebkoRvvSp8uMsCgaPOF73AAzSJAhOOfRVCoJCTk,513
 firefighter/api/__init__.py,sha256=JQW0Bv6xwGqy7ioxx3h6UGMzkkJ4DntDpbvV1Ncgi8k,136
 firefighter/api/admin.py,sha256=x9Ysy-GiYjb0rynmFdS9g56e6n24fkN0ouGy5QD9Yrc,4629
 firefighter/api/apps.py,sha256=P5uU1_gMrDfzurdMbfqw1Bnb2uNKKcMq17WBPg2sLhc,204
@@ -32,25 +32,25 @@ firefighter/api/views/severities.py,sha256=mdkR4GjZibydC1Dx-Sglm-f35GZxWbjmqStAx
 firefighter/components/__init__.py,sha256=Vd_Uk5Uq7Mqp6NOFp5QiniWZAyzmYLqNSFEEw1x7COk,167
 firefighter/components/avatar/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/components/avatar/avatar.html,sha256=oleFPTy1qs9X6hZx3iWppBteHummFvSxoNzPOOl5aeA,773
-firefighter/components/avatar/avatar.py,sha256=lNRZ7Z-LvqAJ6V9gljsBPNjB_oW1XMVgSGUgmpyP110,879
+firefighter/components/avatar/avatar.py,sha256=AIqffX8I_sJ7oEpuyIswJkB6KuW51FuEa4tBn9eSths,823
 firefighter/components/card/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/components/card/card.html,sha256=ziahql8X7WiQdprMktzy7sx0gVXNIxqtAsh_Rc5Iy0g,725
-firefighter/components/card/card.py,sha256=VwPNNkSOmRbwoDEGKKXOo78xpOBc9USV05eOMNbieCM,541
+firefighter/components/card/card.py,sha256=yB4veoRQ3zfdJPCsAGIYtmLCDz3G2kmcYFg12jzkNks,487
 firefighter/components/export_button/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/components/export_button/export_button.html,sha256=XTA9FbDxho8aIqnfTcsDUm7swGWfn2JSw5WndDaThYY,1989
-firefighter/components/export_button/export_button.py,sha256=prc-f9Jx8okciSaEZvC_WDfEJDGSw632EcgsvZuBPUU,1759
+firefighter/components/export_button/export_button.py,sha256=AqkkaZFGVzuLKpIxcPZ-vcXG9VXf9jqpfyxYePiGe4E,1703
 firefighter/components/form/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/components/form/form.html,sha256=LtW07AxFsR-MI-iGVq0CsUVsUN3af5rS2R4SbAlfI5s,312
-firefighter/components/form/form.py,sha256=OrvsiOtwfD1DtFk0Cx_I9cMv542vzMAJGZ1S2szMpNM,695
+firefighter/components/form/form.py,sha256=92qb1HTO3YvYlQMsw6uN8QUQZpbRbyGaCnPGuGX7VDs,596
 firefighter/components/form_field/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/components/form_field/form_field.html,sha256=k5yyxvETqJSt5jHb8Z2v5o9oJRDLwWBKhISy0j0184Y,450
-firefighter/components/form_field/form_field.py,sha256=_mGNF5B820Obhp-7aDDQsnvGDJp7s2jwIRudAhYsC4Y,799
+firefighter/components/form_field/form_field.py,sha256=QZrmEh-3wN8TUdx6db9_8rSpKuTfbyQ-1K0N7st4CYg,734
 firefighter/components/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/components/messages/messages.html,sha256=P0V6Wsz7lTZL0xNPu_5w-J6Dc_aPkP0wqbHjMJ1D4qs,3157
-firefighter/components/messages/messages.py,sha256=9Ra04QApmstH-oLlBiIF8OBJQBwy7kO0iN5-LUfNJZA,564
+firefighter/components/messages/messages.py,sha256=vQ1aaIkRo9T9xtIfYneelrUbBw0cf9BOoaphEznmWS4,519
 firefighter/components/modal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/components/modal/modal.html,sha256=PrOtS8eJHvzTHqILlXmjE4KsGVdbubSCexHiPa_I3Yk,2391
-firefighter/components/modal/modal.py,sha256=OCbQojZ5fhivCUUy1rwzDBOrb1jLhbK8faRFKEgPzCI,925
+firefighter/components/modal/modal.py,sha256=rpleZPmOWNCSQAEXTsQRfETwbyodjT3o7ni-pIqMWiI,869
 firefighter/confluence/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/confluence/admin.py,sha256=aDXghuuLc7G_TLt-655M31smx-H6vkIgLtEmmNCA3lg,1490
 firefighter/confluence/apps.py,sha256=vKswBwQL7L9e2JQwvRb7xy3myyE_GRldYX78jSY3XCM,406
@@ -140,7 +140,7 @@ firefighter/incidents/forms/__init__.py,sha256=OU0r5eZc2A0UJNsL83n8AI5EvwUvg4Yx0
 firefighter/incidents/forms/close_incident.py,sha256=syT5Lpr_WXNFT3KGCe1oy-FzOqMt98S7YEzovdnp7To,940
 firefighter/incidents/forms/create_incident.py,sha256=Wpp0qqUJQs5-5BXrS-P5-dGvM5zgr9XqaEEl6tpNZi4,2739
 firefighter/incidents/forms/edit.py,sha256=2rQkiKak-vac-K3cIsqlGv4R5nhI7JLxw3DhFMXbWms,956
-firefighter/incidents/forms/select_impact.py,sha256=0cnV2DFHuO1In6CgRATjg0zNLd9YN_LbQnPL7Fm9pAU,4631
+firefighter/incidents/forms/select_impact.py,sha256=jLbzVj4UeUGwOYYa5P92PXkEu1J_6H43UATZYzDgSLY,4630
 firefighter/incidents/forms/update_key_events.py,sha256=1Xmnxe5OgZqLFS2HmMzQm3VGFPQipsdrLgKSwdh-fKc,4441
 firefighter/incidents/forms/update_roles.py,sha256=Q26UPfwAj-8N23RNZLQkvmHGnS1_j_X5KQWjJmPjMKY,3635
 firefighter/incidents/forms/update_status.py,sha256=QCRKfDhSYZhVsJ6oofQxOXGMWMDRQEDnH29y8YnFn_Y,1034
@@ -161,6 +161,8 @@ firefighter/incidents/migrations/0013_add_missing_component.py,sha256=qVLQEl-riF
 firefighter/incidents/migrations/0014_update_components_slack_groups.py,sha256=5tiQnrtOpYVUztFdvZ6xTUReuJfpDX0cOvqIvDZpBv0,8700
 firefighter/incidents/migrations/0015_update_impact_level.py,sha256=OQVTVrWvQ1orxqdrqwrhBMjxKY5qzqN2ZRobHc_tGDc,5451
 firefighter/incidents/migrations/0016_update_business_incidents_and_level.py,sha256=O5AL9twmjstSw44ndJ2-Og6dpKreReXVw_brpQb-t0w,3600
+firefighter/incidents/migrations/0017_reorder_impact_types.py,sha256=7NN2KjcDRHNInXyEh8YKZli2LWT_i0UHXBbI21dXB6w,877
+firefighter/incidents/migrations/0018_update_impactlevel_names.py,sha256=E37png_LiXABzuXk-vmxTgikw8YmULODkiytE2mkxT0,2227
 firefighter/incidents/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 firefighter/incidents/models/__init__.py,sha256=dCNP-zRYNNDOZB3JDDWp7vCl084Jh6RgDT_iP57RkOY,862
 firefighter/incidents/models/component.py,sha256=7GyXKNFk1MZns6RUGLpkNw5u6He7H9N1LexzXbG4sBM,7445
@@ -383,7 +385,7 @@ firefighter/slack/views/modals/close.py,sha256=ur1SSRWk9NYFfL24gjOqoIiXKquDy6qeE
 firefighter/slack/views/modals/downgrade_workflow.py,sha256=S0y0_GYH4q7ewZUr_eA9Ly2c1FQueZzNCTiuIiWYUoY,3109
 firefighter/slack/views/modals/edit.py,sha256=60xav4XG4KGS9KknqsQNCQjl3qQzk7OtmHiEYTQ9pUk,3861
 firefighter/slack/views/modals/key_event_message.py,sha256=ga3-ITZyzJExwzctX-GfgnDqyQaxTfcqpqnOwY2E38M,5620
-firefighter/slack/views/modals/open.py,sha256=mAjOkvejCciUP7-QQmVfPKmljuEowNdGybAhwyKlfUI,21548
+firefighter/slack/views/modals/open.py,sha256=qA8lN8pAAdK7j1qa8zEwe-Fvu5Tu18UG3Bcwxpg6Ymk,23012
 firefighter/slack/views/modals/postmortem.py,sha256=AeEtmiam_XgCRxDmltKluNT2VN1gcuCB2VbYeeATVcA,2525
 firefighter/slack/views/modals/select.py,sha256=Y-Ji_ALnzhYkXDBAyi497UL1Xn2vCGqXCtj8eog75Jk,3312
 firefighter/slack/views/modals/send_sos.py,sha256=bP6HgYyDwPrIcTq7n_sQz6UQsxhYbvBDS4HjM0uRccA,4838
@@ -446,8 +448,8 @@ firefighter_tests/test_slack/views/modals/test_open.py,sha256=Iatphd7vnrEMrv8ysK
 firefighter_tests/test_slack/views/modals/test_send_sos.py,sha256=_rE6jD-gOzcGyhlY0R9GzlGtPx65oOOguJYdENgxtLc,1289
 firefighter_tests/test_slack/views/modals/test_status.py,sha256=oQzPfwdg2tkbo9nfkO1GfS3WydxqSC6vy1AZjZDKT30,2226
 firefighter_tests/test_slack/views/modals/test_update_status.py,sha256=Y8Oa_fraj1vtaGig9Y28_6tOWvMrRPS-wyg3rY-DHBk,39380
-firefighter_incident-0.0.8.dist-info/METADATA,sha256=PPkrT4PwwSus6I-j9FTlg0w8wiP9fpti41s3BpS7LJM,5487
-firefighter_incident-0.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-firefighter_incident-0.0.8.dist-info/entry_points.txt,sha256=c13meJbv7YNmYz7MipMOQwzQ5IeFOPXUBYAJ44XMQsM,61
-firefighter_incident-0.0.8.dist-info/licenses/LICENSE,sha256=krRiGp-a9-1nH1bWpBEdxyTKLhjLmn6DMVVoIb0zF90,1087
-firefighter_incident-0.0.8.dist-info/RECORD,,
+firefighter_incident-0.0.10.dist-info/METADATA,sha256=hXTBfaxg9pA1hQgk54ZjQnhxRjQm3aZ6zbRiwUu2-pA,5488
+firefighter_incident-0.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+firefighter_incident-0.0.10.dist-info/entry_points.txt,sha256=c13meJbv7YNmYz7MipMOQwzQ5IeFOPXUBYAJ44XMQsM,61
+firefighter_incident-0.0.10.dist-info/licenses/LICENSE,sha256=krRiGp-a9-1nH1bWpBEdxyTKLhjLmn6DMVVoIb0zF90,1087
+firefighter_incident-0.0.10.dist-info/RECORD,,