firefighter-incident 0.0.1rc1__py3-none-any.whl → 0.0.2__py3-none-any.whl

firefighter/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.1rc1'
-__version_tuple__ = version_tuple = (0, 0, 1)
+__version__ = version = '0.0.2'
+__version_tuple__ = version_tuple = (0, 0, 2)

firefighter/api/admin.py

@@ -29,7 +29,12 @@ class APITokenAdmin(TokenAdmin):
     Add supports for custom permissions.
     """
 
-    def formfield_for_foreignkey(self, db_field: ForeignKey[Any, Any], request: HttpRequest, **kwargs: Any) -> ModelChoiceField:  # type: ignore[override]
+    def formfield_for_foreignkey(
+        self,
+        db_field: ForeignKey[Any, Any],
+        request: HttpRequest,  # type: ignore[override]
+        **kwargs: Any,
+    ) -> ModelChoiceField:  # type: ignore[type-arg]
         """Show all or only current user depending on permissions."""
         if db_field.name == "user":
             if request.user.has_perm("api.can_add_any") or request.user.has_perm(
@@ -38,9 +43,15 @@ class APITokenAdmin(TokenAdmin):
                 kwargs["queryset"] = User.objects.all()
             elif request.user.has_perm("api.can_add_own"):
                 kwargs["queryset"] = User.objects.filter(id=request.user.id)
-        return super().formfield_for_foreignkey(db_field, request, **kwargs)
-
-    def get_form(self, request: HttpRequest, obj: APITokenProxy | None = None, change: bool = False, **kwargs: Any) -> type[ModelForm[APITokenProxy]]:  # type: ignore[override] # noqa: FBT001, FBT002
+        return super().formfield_for_foreignkey(db_field, request, **kwargs)  # type: ignore[return-value]
+
+    def get_form(
+        self,
+        request: HttpRequest,  # type: ignore[override]
+        obj: APITokenProxy | None = None,
+        change: bool = False,  # noqa: FBT001, FBT002
+        **kwargs: Any,
+    ) -> type[ModelForm[APITokenProxy]]:
         """Prefill the form with the current user."""
         form: type[ModelForm[APITokenProxy]] = super().get_form(
             request, obj, change, **kwargs
@@ -65,7 +76,11 @@ class APITokenAdmin(TokenAdmin):
             )
         return super().get_sortable_by(request)
 
-    def has_view_permission(self, request: HttpRequest, obj: APITokenProxy | None = None) -> bool:  # type: ignore[override]
+    def has_view_permission(
+        self,
+        request: HttpRequest,  # type: ignore[override]
+        obj: APITokenProxy | None = None,
+    ) -> bool:
         if obj is None:
             return request.user.has_perm("api.can_view_any") or request.user.has_perm(
                 "api.can_view_own"
@@ -81,7 +96,11 @@ class APITokenAdmin(TokenAdmin):
             "api.can_add_own"
         )
 
-    def has_delete_permission(self, request: HttpRequest, obj: APITokenProxy | None = None) -> bool:  # type: ignore[override]
+    def has_delete_permission(
+        self,
+        request: HttpRequest,  # type: ignore[override]
+        obj: APITokenProxy | None = None,
+    ) -> bool:
         if obj is None:
             return request.user.has_perm("api.can_delete_any") or request.user.has_perm(
                 "api.can_delete_own"
@@ -92,12 +111,12 @@ class APITokenAdmin(TokenAdmin):
             return bool(obj.user == request.user)
         return False
 
-    def has_change_permission(self, request: HttpRequest, obj: APITokenProxy | None = None) -> bool:  # type: ignore[override]
-        if obj is None:
-            return request.user.has_perm("api.can_edit_any")
-        if request.user.has_perm("api.can_edit_any"):
-            return True
-        return False
+    def has_change_permission(
+        self,
+        request: HttpRequest,  # type: ignore[override]
+        _obj: APITokenProxy | None = None,
+    ) -> bool:
+        return request.user.has_perm("api.can_edit_any")
 
 
 # Remove the default TokenAdmin created by DRF and replace it with our custom one.

firefighter/api/migrations/0003_alter_apitokenproxy_options.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.11 on 2024-04-30 15:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("api", "0002_alter_apitokenproxy_options"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="apitokenproxy",
+            options={
+                "default_permissions": [],
+                "permissions": [
+                    ("can_edit_any", "Can reassign token to any user"),
+                    ("can_add_any", "Can add token to any user"),
+                    ("can_view_any", "Can view token of all users"),
+                    ("can_delete_any", "Can delete token of any user"),
+                    ("can_add_own", "Can add own tokens"),
+                    ("can_view_own", "Can view own tokens"),
+                    ("can_delete_own", "Can delete own tokens"),
+                ],
+                "verbose_name": "API Token",
+                "verbose_name_plural": "API Tokens",
+            },
+        ),
+    ]

firefighter/api/models.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import uuid
 from typing import TYPE_CHECKING, ClassVar, Self, cast
 
 from django.conf import settings
@@ -9,6 +8,7 @@ from django_stubs_ext.db.models import TypedModelMeta
 from rest_framework.authtoken.models import Token
 
 if TYPE_CHECKING:
+    import uuid
     from collections.abc import Sequence
 
 
@@ -26,7 +26,7 @@ class APITokenProxy(APIToken):
 
     @property
     def pk(self: Self) -> uuid.UUID:
-        return cast(uuid.UUID, self.user_id)  # pyright: ignore[reportGeneralTypeIssues]
+        return cast("uuid.UUID", self.user_id)  # pyright: ignore[reportGeneralTypeIssues]
 
     class Meta(TypedModelMeta):
         permissions = [

firefighter/api/renderer.py

@@ -71,7 +71,7 @@ class CSVRenderer(BaseCSVRenderer):
             pass
 
     def _get_headers(
-        self, data: Iterable[Any], header: None | list[str]
+        self, data: Iterable[Any], header: list[str] | None
     ) -> tuple[Iterable[Any], list[str]]:
         # If we already have a header, and it does not contain any wildcards,
         # we can use it as-is.

firefighter/api/serializers.py

@@ -72,11 +72,13 @@ class GroupedModelSerializerOpenAPI(OpenApiSerializerExtension):  # type: ignore
         child_schema = auto_schema.resolve_serializer(
             self.target.child_serializer, direction
         )
-        child_schema_ref = child_schema.ref if child_schema.ref else child_schema
+        child_schema_ref = child_schema.ref or child_schema
         return {"type": "object", "additionalProperties": child_schema_ref}
 
     def get_name(
-        self, auto_schema: AutoSchema, direction: Direction  # noqa: ARG002
+        self,
+        auto_schema: AutoSchema,  # noqa: ARG002
+        direction: Direction,  # noqa: ARG002
     ) -> str:
         return f"GroupedModelSerializer_{self.target.child_serializer.__name__}"
 
@@ -217,12 +219,12 @@ class IncidentSerializer(TaggitSerializer, serializers.ModelSerializer[Incident]
     created_by = UserSerializer(read_only=True)
     slack_channel_name = serializers.SerializerMethodField()
 
-    created_by_email = CreatableSlugRelatedField[User](  # type: ignore[misc]
+    created_by_email = CreatableSlugRelatedField[User](
         source="created_by",
         write_only=True,
         slug_field="email",
         queryset=User.objects.all(),
-        validators=[EmailValidator()],
+        validators=[EmailValidator()],  # type: ignore[list-item]
     )
 
     tags = TagListSerializerField(read_only=True)

firefighter/api/urls.py

@@ -54,26 +54,20 @@ urlpatterns: list[URLPattern | URLResolver] = [
     path("", include(router.urls)),
     path(
         "incidents",
-        views.incidents.CreateIncidentViewSet.as_view(
-            {"post": "create"}
-        ),  # pyright: ignore[reportGeneralTypeIssues]
+        views.incidents.CreateIncidentViewSet.as_view({"post": "create"}),  # pyright: ignore[reportGeneralTypeIssues]
         name="incidents",
     ),
 ]
 if settings.FF_EXPOSE_API_DOCS:
-    urlpatterns.extend(
-        (
-            path(
-                "schema",
-                SpectacularAPIView.as_view(),  # pyright: ignore[reportGeneralTypeIssues]
-                name="schema",
-            ),
-            path(
-                "schema/swagger-ui",
-                SpectacularSwaggerView.as_view(
-                    url_name="api:schema"
-                ),  # pyright: ignore[reportGeneralTypeIssues]
-                name="swagger-ui",
-            ),
-        )
-    )
+    urlpatterns.extend((
+        path(
+            "schema",
+            SpectacularAPIView.as_view(),  # pyright: ignore[reportGeneralTypeIssues]
+            name="schema",
+        ),
+        path(
+            "schema/swagger-ui",
+            SpectacularSwaggerView.as_view(url_name="api:schema"),  # pyright: ignore[reportGeneralTypeIssues]
+            name="swagger-ui",
+        ),
+    ))

firefighter/components/avatar/avatar.py

@@ -1,20 +1,37 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any, NotRequired, Required, TypedDict
 
-from django_components import component
+from django_components import EmptyTuple, component
 
-if TYPE_CHECKING:
-    from firefighter.incidents.models.user import User
+from firefighter.incidents.models.user import User
 
 logger = logging.getLogger(__name__)
 
 
+class Data(TypedDict):
+    user: User
+    size_tailwind: int
+    size_px: int
+
+
+Args = tuple[User]
+
+
+class Kwargs(TypedDict, total=False):
+    user: Required[User]
+    size: NotRequired[str]
+
+
 @component.register("avatar")
-class Avatar(component.Component):
+class Avatar(component.Component[EmptyTuple, Kwargs, Data, Any]):  # type: ignore[type-var]
     template_name = "avatar/avatar.html"
 
-    def get_context_data(self, user: User, *args: Any, **kwargs: Any) -> dict[str, Any]:
+    def get_context_data(self, user: User, **kwargs: Any) -> Data:
         size_px, size_tailwind = (40, 10) if kwargs.get("size") == "md" else (80, 20)
-        return {"user": user, "size_tailwind": size_tailwind, "size_px": size_px}
+        return {
+            "user": user,
+            "size_tailwind": size_tailwind,
+            "size_px": size_px,
+        }

firefighter/components/card/card.py

@@ -1,16 +1,21 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import Any, NotRequired, Required, TypedDict, Unpack
 
-from django_components import component
+from django_components import EmptyTuple, component
 
 logger = logging.getLogger(__name__)
 
 
+class Data(TypedDict, total=False):
+    id: Required[str]
+    card_title: NotRequired[str]
+
+
 @component.register("card")
-class Card(component.Component):
+class Card(component.Component[EmptyTuple, Data, Data, Any]):  # type: ignore[type-var]
     template_name = "card/card.html"
 
-    def get_context_data(self, *args: Any, **kwargs: dict[str, Any]) -> dict[str, Any]:
+    def get_context_data(self, *args: Any, **kwargs: Unpack[Data]) -> Data:
         return kwargs

firefighter/components/export_button/export_button.html

@@ -24,8 +24,8 @@
       {% for format in formats %}
         <li>
           <button method="get" formtarget="_blank" type="submit"
-            name="fields" value="{{format.fields}}"
-            form="main-filter" formaction="{{format.url}}" class="" role="menuitem" tabindex="-1">{{format.label}}</button>
+                  name="fields" value="{{format.fields}}"
+                  form="main-filter" formaction="{{format.url}}" class="" role="menuitem" tabindex="-1">{{format.label}}</button>
         </li>
       {% endfor %}
     </ul>

firefighter/components/export_button/export_button.py

@@ -1,22 +1,41 @@
 from __future__ import annotations
 
-from typing import Any
+from collections.abc import Mapping, Sequence
+from typing import Any, NotRequired, Required, TypedDict
 
 from django.urls import reverse
-from django_components import component
+from django_components import EmptyTuple, component
+
+
+class _Format(TypedDict):
+    label: str
+    url: str
+    fields: str
+
+
+class Data(TypedDict):
+    default_format: Mapping[str, Any]  # _Format
+    formats: Sequence[Mapping[str, Any]]  # list[_Format]
+
+
+Args = tuple[str]
+
+
+class Kwargs(TypedDict, total=False):
+    base_url: Required[str]
+    default_fmt: NotRequired[tuple[str, str | None, str | None]]
 
 
 @component.register("export_button")
-class ExportButton(component.Component):
+class ExportButton(component.Component[EmptyTuple, Kwargs, Data, Any]):  # type: ignore[type-var]
     template_name = "export_button/export_button.html"
 
     def get_context_data(
         self,
         base_url: str,
-        *args: Any,
         default_fmt: tuple[str, str | None, str | None] | None = None,
         **kwargs: Any,
-    ) -> dict[str, Any]:
+    ) -> Data:
         default_fmt = default_fmt or ("csv", None, None)
         fmts: list[tuple[str, str | None, str | None]] = [
             ("json", None, None),
@@ -28,12 +47,12 @@ class ExportButton(component.Component):
         default_format = self.make_fmt(default_fmt, base_url)
         formats = [self.make_fmt(fmt, base_url) for fmt in fmts]
 
-        return {"default_format": default_format, "formats": formats}
+        return Data(default_format=default_format, formats=formats)
 
     @staticmethod
     def make_fmt(
         format_: tuple[str, str | None, str | None], base_reverse: str
-    ) -> dict[str, str]:
+    ) -> _Format:
         return {
             "label": f"Export {format_[0].upper()}{' ' + format_[2] if format_[2] else ''}",
             "url": f"{reverse(base_reverse, args=[format_[0]])}",

firefighter/components/form/form.html

@@ -5,7 +5,7 @@
 
 <div class="grid grid-cols-6 gap-1">
   {% for field in form %}
-    {% component "form_field" field=field%}
+    {% component "form_field" field=field%}{% endcomponent %}
   {% endfor %}
 </div>
 

firefighter/components/form/form.py

@@ -1,23 +1,26 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import Any, NotRequired, TypedDict
 
-from django_components import component
-
-if TYPE_CHECKING:
-    from django import forms
+from django import forms
+from django_components import EmptyTuple, component
+from django_components.slots import SlotContent
 
 logger = logging.getLogger(__name__)
 
 
+class Slots(TypedDict, total=False):
+    form_footer: NotRequired[SlotContent[Any]]
+
+
+class Data(TypedDict):
+    form: forms.Form
+
+
 @component.register("form")
-class Form(component.Component):
+class Form(component.Component[EmptyTuple, Data, Data, Slots]):  # type: ignore[type-var]  # type: ignore[override]
     template_name = "form/form.html"
 
-    def get_context_data(
-        self, form: forms.Form, *args: Any, **kwargs: Any
-    ) -> dict[str, Any]:
-        return {
-            "form": form,
-        }
+    def get_context_data(self, form: forms.Form, **kwargs: Any) -> Data:  # type: ignore[override]
+        return Data(form=form)

firefighter/components/form_field/form_field.html

@@ -10,9 +10,9 @@
 
     {% render_field field class=field_input_class class+="input input-bordered w-full" %}
     {% if field.help_text %}
-        <label class="label">
-          <span class="label-text-alt">{{field.help_text}}</span>
-        </label>
-      {% endif %}
+      <label class="label">
+        <span class="label-text-alt">{{field.help_text}}</span>
+      </label>
+    {% endif %}
   </div>
 </div>

firefighter/components/form_field/form_field.py

@@ -1,26 +1,34 @@
 from __future__ import annotations
 
 import logging
-from typing import TYPE_CHECKING, Any
+from typing import (
+    Any,
+    Never,
+    TypedDict,
+)
 
-from django_components import component
-
-if TYPE_CHECKING:
-    from django import forms
+from django import forms
+from django_components import EmptyTuple, component
 
 logger = logging.getLogger(__name__)
 
 
+class Data(TypedDict):
+    field: forms.Field | forms.BoundField
+    field_input_class: str
+
+
+class Kwargs(TypedDict, total=True):
+    field: forms.Field | forms.BoundField
+
+
 @component.register("form_field")
-class FormField(component.Component):
+class FormField(component.Component[EmptyTuple, Kwargs, Data, Any]):  # type: ignore[type-var]
     template_name = "form_field/form_field.html"
 
     def get_context_data(
-        self, field: forms.BoundField | forms.Field, *args: Any, **kwargs: Any
-    ) -> dict[str, Any]:
-        if field is None:
-            raise ValueError("Field not set!")
-
-        input_class = "input-ff"
+        self, field: forms.BoundField | forms.Field, **kwargs: Never
+    ) -> Data:
+        input_class = "input input-bordered input-md"
 
         return {"field": field, "field_input_class": input_class}

firefighter/components/messages/messages.html

@@ -1,52 +1,42 @@
 {% if messages %}
-<ul class="messages">
-    {% for message in messages %}
-        {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
-            <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
-                <div class="alert alert-error shadow-lg">
-                    <div>
-                    <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                    <span>   {{ message }}</span>
+    <ul class="messages">
+        {% for message in messages %}
+            {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
+                    <div class="alert alert-error shadow-lg">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+                        <span>   {{ message }}</span>
                     </div>
-                </div>
-            </li>
-        {% elif message.level == DEFAULT_MESSAGE_LEVELS.INFO %}
-        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
-            <div class="alert alert-info  shadow-lg">
-                <div>
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-current flex-shrink-0 w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
-                <span>   {{ message }}</span>
-                </div>
-            </div>
-        </li>
-        {% elif message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}
-        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
-            <div class="alert alert-success shadow-lg">
-                <div>
-                    <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                    <span>   {{ message }}</span>
-                </div>
-            </div>
-        </li>
-        {% elif message.level == DEFAULT_MESSAGE_LEVELS.WARNING %}
-        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
-            <div class="alert alert-warning shadow-lg">
-                <div>
-                    <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
-                    <span>   {{ message }}</span>
-                </div>
-            </div>
-        </li>
-        {% else %}
-        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
-            <div class="alert shadow-lg">
-                <div>
-                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info flex-shrink-0 w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
-                    <span>   {{ message }}</span>
-                </div>
-            </div>
-        </li>
-        {% endif %}
-    {% endfor %}
-</ul>
+                </li>
+            {% elif message.level == DEFAULT_MESSAGE_LEVELS.INFO %}
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
+                    <div class="alert alert-info  shadow-lg">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-current flex-shrink-0 w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
+                        <span>   {{ message }}</span>
+                    </div>
+                </li>
+            {% elif message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
+                    <div class="alert alert-success shadow-lg">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+                        <span>   {{ message }}</span>
+                    </div>
+                </li>
+            {% elif message.level == DEFAULT_MESSAGE_LEVELS.WARNING %}
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
+                    <div class="alert alert-warning shadow-lg">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
+                        <span>   {{ message }}</span>
+                    </div>
+                </li>
+            {% else %}
+                <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>
+                    <div class="alert shadow-lg">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-info flex-shrink-0 w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>
+                        <span>   {{ message }}</span>
+                    </div>
+                </li>
+            {% endif %}
+        {% endfor %}
+    </ul>
 {% endif %}

firefighter/components/messages/messages.py

@@ -1,16 +1,21 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import Any, TypedDict
 
-from django_components import component
+from django.contrib.messages.storage.base import BaseStorage
+from django_components import EmptyTuple, component
 
 logger = logging.getLogger(__name__)
 
 
+class Data(TypedDict):
+    messages: BaseStorage
+
+
 @component.register("messages")
-class Messages(component.Component):
+class Messages(component.Component[EmptyTuple, Data, Data, Any]):  # type: ignore[type-var]
     template_name = "messages/messages.html"
 
-    def get_context_data(self, *args: Any, **kwargs: Any) -> dict[str, Any]:
-        return kwargs
+    def get_context_data(self, messages: BaseStorage, **kwargs: Any) -> Data:
+        return Data(messages=messages)