aa-fleetfinder 2.2.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

fleetfinder/templates/fleetfinder/bundles/css/slim-select-css.html

@@ -1,3 +1,3 @@
-{% load static %}
+{% load fleetfinder %}
 
-<link rel="stylesheet" href="{% static 'fleetfinder/libs/slim-select/2.6.0/css/slimselect.min.css' %}">
+{% fleetfinder_static "libs/slim-select/2.6.0/css/slimselect.min.css" %}

fleetfinder/templates/fleetfinder/bundles/js/slim-select-js.html

@@ -1,3 +1,3 @@
-{% load static %}
+{% load fleetfinder %}
 
-<script src="{% static 'fleetfinder/libs/slim-select/2.6.0/js/slimselect.min.js' %}"></script>
+{% fleetfinder_static "libs/slim-select/2.6.0/js/slimselect.min.js" %}

fleetfinder/templates/fleetfinder/dashboard.html

@@ -1,5 +1,6 @@
 {% extends "fleetfinder/base.html" %}
 
+{% load aa_i18n %}
 {% load i18n %}
 
 {% block aa_fleetfinder_body %}
@@ -11,23 +12,25 @@
         </div>
 
         <div class="card-body">
-            <table class="table table-striped table-hover table-vertical-middle" id="table_available-fleets" style="width: 100%;">
-                <thead>
-                    <tr>
-                        <th>{% translate "Fleet commander" %}</th>
-                        <th>{% translate "Fleet name" %}</th>
-                        <th>{% translate "Created at" %}</th>
-                        <th>{% translate "Join" %}</th>
-
-                        {% if perms.fleetfinder.manage_fleets %}
-                            <th>{% translate "Details" %}</th>
-                            <th>{% translate "Edit" %}</th>
-                        {% endif %}
-                    </tr>
-                </thead>
-
-                <tbody></tbody>
-            </table>
+            <div class="table-responsive">
+                <table class="table table-striped table-hover table-vertical-middle" id="table_available-fleets" style="width: 100%;">
+                    <thead>
+                        <tr>
+                            <th>{% translate "Fleet commander" %}</th>
+                            <th>{% translate "Fleet name" %}</th>
+                            <th>{% translate "Created at" %}</th>
+                            <th>{% translate "Join" %}</th>
+
+                            {% if perms.fleetfinder.manage_fleets %}
+                                <th>{% translate "Details" %}</th>
+                                <th>{% translate "Edit" %}</th>
+                            {% endif %}
+                        </tr>
+                    </thead>
+
+                    <tbody></tbody>
+                </table>
+            </div>
         </div>
     </div>
 {% endblock %}
@@ -41,12 +44,17 @@
     {% include "bundles/datatables-js-bs5.html" %}
     {% include "bundles/moment-js.html" with locale=True %}
 
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
     <script>
         $(document).ready(() => {
             const DATETIME_FORMAT = 'YYYY-MM-DD, HH:mm';
             const table_fleet_overview = $('#table_available-fleets');
 
             const fleetfinderFleetsTable = table_fleet_overview.DataTable({
+                language: {
+                    url: '{{ DT_LANG_PATH }}'
+                },
                 ajax: {
                     url: "{% url 'fleetfinder:ajax_dashboard' %}",
                     dataSrc: '',

fleetfinder/templates/fleetfinder/fleet-details.html

@@ -1,5 +1,6 @@
 {% extends "fleetfinder/base.html" %}
 
+{% load aa_i18n %}
 {% load i18n %}
 
 {% block page_title %}
@@ -17,16 +18,18 @@
                 </div>
 
                 <div class="card-body">
-                    <table class="table table-striped table-hover table-vertical-middle" id="table_fleet_composition" style="width: 100%;">
-                        <thead>
-                            <tr>
-                                <th>{% translate "Ship class" %}</th>
-                                <th>{% translate "Count" %}</th>
-                            </tr>
-                        </thead>
-
-                        <tbody></tbody>
-                    </table>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-hover table-vertical-middle w-100" id="table_fleet_composition">
+                            <thead>
+                                <tr>
+                                    <th>{% translate "Ship class" %}</th>
+                                    <th>{% translate "Count" %}</th>
+                                </tr>
+                            </thead>
+
+                            <tbody></tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
@@ -40,17 +43,19 @@
                 </div>
 
                 <div class="card-body">
-                    <table class="table table-striped table-hover table-vertical-middle" id="table_fleet_members" style="width: 100%;">
-                        <thead>
-                            <tr>
-                                <th>{% translate "Name" %}</th>
-                                <th>{% translate "Ship class" %}</th>
-                                <th>{% translate "System" %}</th>
-                            </tr>
-                        </thead>
-
-                        <tbody></tbody>
-                    </table>
+                    <div class="table-responsive">
+                        <table class="table table-striped table-hover table-vertical-middle w-100" id="table_fleet_members">
+                            <thead>
+                                <tr>
+                                    <th>{% translate "Name" %}</th>
+                                    <th>{% translate "Ship class" %}</th>
+                                    <th>{% translate "System" %}</th>
+                                </tr>
+                            </thead>
+
+                            <tbody></tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
@@ -65,6 +70,8 @@
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
 
+    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
     <script>
         $(document).ready(() => {
             const table_fleet_members = $('#table_fleet_members');
@@ -73,6 +80,9 @@
             const populateDatatables = () => {
                 $.get('{% url "fleetfinder:ajax_fleet_details" fleet_id %}', (data) => {
                     table_fleet_members.DataTable({
+                        language: {
+                            url: '{{ DT_LANG_PATH }}'
+                        },
                         destroy: true,
                         paging: false,
                         data: data.fleet_member,
@@ -84,6 +94,9 @@
                     });
 
                     tabe_fleet_composition.DataTable({
+                        language: {
+                            url: '{{ DT_LANG_PATH }}'
+                        },
                         destroy: true,
                         paging: false,
                         data: data.fleet_composition,
@@ -98,14 +111,16 @@
 
             table_fleet_members.DataTable({
                 language: {
-                    emptyTable: 'No data / loading ...'
-                }
+                    url: '{{ DT_LANG_PATH }}'
+                },
+                paging: false,
             });
 
             tabe_fleet_composition.DataTable({
                 language: {
-                    emptyTable: 'No data / loading ...'
-                }
+                    url: '{{ DT_LANG_PATH }}'
+                },
+                paging: false,
             });
 
             populateDatatables();

fleetfinder/templatetags/fleetfinder.py

@@ -2,25 +2,73 @@
 Versioned static URLs to break browser caches when changing the app version
 """
 
+# Standard Library
+import os
+
 # Django
 from django.template.defaulttags import register
 from django.templatetags.static import static
+from django.utils.safestring import mark_safe
+
+# Alliance Auth
+from allianceauth.services.hooks import get_extension_logger
+
+# Alliance Auth (External Libs)
+from app_utils.logging import LoggerAddTag
 
 # AA Fleet Finder
-from fleetfinder import __version__
+from fleetfinder import __title__, __version__
+from fleetfinder.helper.static_files import calculate_integrity_hash
+
+logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__)
 
 
 @register.simple_tag
-def fleetfinder_static(path: str) -> str:
+def fleetfinder_static(relative_file_path: str) -> str | None:
     """
     Versioned static URL
-    :param path:
-    :type path:
-    :return:
-    :rtype:
+
+    :param relative_file_path: The file path relative to the `aa-fleetfinder/fleetfinder/static/fleetfinder` folder
+    :type relative_file_path: str
+    :return: Versioned static URL
+    :rtype: str
     """
 
-    static_url = static(path)
-    versioned_url = static_url + "?v=" + __version__
+    logger.debug(f"Getting versioned static URL for: {relative_file_path}")
+
+    file_type = os.path.splitext(relative_file_path)[1][1:]
+
+    logger.debug(f"File extension: {file_type}")
+
+    # Only support CSS and JS files
+    if file_type not in ["css", "js"]:
+        raise ValueError(f"Unsupported file type: {file_type}")
+
+    integrity_hash = calculate_integrity_hash(relative_file_path)
+    static_file_path = os.path.join("fleetfinder", relative_file_path)
+    static_url = static(static_file_path)
+
+    # Versioned URL for CSS and JS files
+    # Add version query parameter to break browser caches when changing the app version
+    # Do not add version query parameter for libs as they are already versioned through their file path
+    versioned_url = (
+        static_url
+        if relative_file_path.startswith("libs/")
+        else static_url + "?v=" + __version__
+    )
+
+    # Return the versioned URL with integrity hash for CSS
+    if file_type == "css":
+        logger.debug(f"Integrity hash for {relative_file_path}: {integrity_hash}")
+
+        return mark_safe(
+            f'<link rel="stylesheet" href="{versioned_url}" integrity="{integrity_hash}" crossorigin="anonymous">'
+        )
+
+    # Return the versioned URL with integrity hash for JS files
+    if file_type == "js":
+        return mark_safe(
+            f'<script src="{versioned_url}" integrity="{integrity_hash}" crossorigin="anonymous"></script>'
+        )
 
-    return versioned_url
+    return None

fleetfinder/tests/test_templatetags.py

@@ -8,16 +8,17 @@ from django.test import TestCase
 
 # AA Fleet Finder
 from fleetfinder import __version__
+from fleetfinder.helper.static_files import calculate_integrity_hash
 
 
 class TestVersionedStatic(TestCase):
     """
-    Test the fleetfinder_static template tag
+    Test the `fleetfinder_static` template tag
     """
 
     def test_versioned_static(self):
         """
-        Test should return a versioned static
+        Test should return the versioned static
 
         :return:
         :rtype:
@@ -27,13 +28,18 @@ class TestVersionedStatic(TestCase):
         template_to_render = Template(
             template_string=(
                 "{% load fleetfinder %}"
-                "{% fleetfinder_static 'fleetfinder/css/fleetfinder.min.css' %}"
+                "{% fleetfinder_static 'css/fleetfinder.min.css' %}"
             )
         )
 
         rendered_template = template_to_render.render(context)
 
-        self.assertInHTML(
-            needle=f'/static/fleetfinder/css/fleetfinder.min.css?v={context["version"]}',
-            haystack=rendered_template,
+        expected_static_src = (
+            f'/static/fleetfinder/css/fleetfinder.min.css?v={context["version"]}'
         )
+        expected_static_src_integrity = calculate_integrity_hash(
+            "css/fleetfinder.min.css"
+        )
+
+        self.assertIn(member=expected_static_src, container=rendered_template)
+        self.assertIn(member=expected_static_src_integrity, container=rendered_template)

fleetfinder/urls.py

@@ -12,13 +12,15 @@ app_name: str = "fleetfinder"
 
 urlpatterns = [
     path(route="", view=views.dashboard, name="dashboard"),
-    path(route="create/", view=views.create_fleet, name="create_fleet"),
-    path(route="save/", view=views.save_fleet, name="save_fleet"),
-    path(route="join/<int:fleet_id>/", view=views.join_fleet, name="join_fleet"),
+    path(route="fleet/create/", view=views.create_fleet, name="create_fleet"),
+    path(route="fleet/save/", view=views.save_fleet, name="save_fleet"),
+    path(route="fleet/<int:fleet_id>/join/", view=views.join_fleet, name="join_fleet"),
     path(
-        route="details/<int:fleet_id>/", view=views.fleet_details, name="fleet_details"
+        route="fleet/<int:fleet_id>/details/",
+        view=views.fleet_details,
+        name="fleet_details",
     ),
-    path(route="edit/<int:fleet_id>/", view=views.edit_fleet, name="edit_fleet"),
+    path(route="fleet/<int:fleet_id>/edit/", view=views.edit_fleet, name="edit_fleet"),
     # Ajax calls
     path(
         route="ajax/",
@@ -28,7 +30,7 @@ urlpatterns = [
                     route="dashboard/", view=views.ajax_dashboard, name="ajax_dashboard"
                 ),
                 path(
-                    route="details/<int:fleet_id>/",
+                    route="fleet/<int:fleet_id>/details/",
                     view=views.ajax_fleet_details,
                     name="ajax_fleet_details",
                 ),