aa-fleetfinder 2.6.1__py3-none-any.whl → 2.7.1__py3-none-any.whl

fleetfinder/templates/fleetfinder/base.html

@@ -1,6 +1,7 @@
 {% extends "allianceauth/base-bs5.html" %}
 
 {% load i18n %}
+{% load aa_i18n %}
 
 {% block page_title %}
     {% translate "Fleet Finder" %}
@@ -22,6 +23,16 @@
 {% block content %}
     <div class="aa-fleetfinder">
         <div class="aa-fleetfinder-body">
+            {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+
+            <script>
+                const aaFleetFinderSettings = {
+                    dataTables: {
+                        languageUrl: "{{ DT_LANG_PATH }}",
+                        datetimeFormat: 'YYYY-MM-DD, HH:mm',
+                    }
+                }
+            </script>
             {% block aa_fleetfinder_body %}{% endblock %}
         </div>
 

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

@@ -0,0 +1,9 @@
+{% load sri %}
+
+{% sri_static "fleetfinder/js/fleetfinder.min.js" %}
+
+{% if view %}
+    {% with "fleetfinder/js/fleetfinder-"|add:view|add:".min.js" as script_path %}
+        {% sri_static script_path %}
+    {% endwith %}
+{% endif %}

fleetfinder/templates/fleetfinder/dashboard.html

@@ -19,12 +19,7 @@
                             <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 %}
+                            <th class="text-end"><!-- {% translate "Join" %} --></th>
                         </tr>
                     </thead>
 
@@ -44,110 +39,15 @@
     {% 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');
-
-            /**
-             * Initialize the datatable for fleet overview
-             */
-            fetchGet({url: '{% url "fleetfinder:ajax_dashboard" %}'})
-                .then((data) => {
-                    table_fleet_overview.DataTable({
-                        language: {
-                            url: '{{ DT_LANG_PATH }}'
-                        },
-                        data: data,
-                        columns: [
-                            {
-                                data: 'fleet_commander',
-                                render: {
-                                    _: 'html',
-                                    sort: 'sort'
-                                }
-                            },
-                            {data: 'fleet_name'},
-                            {
-                                data: 'created_at',
-                            },
-                            {data: 'join'},
-                            {% if perms.fleetfinder.manage_fleets %}
-                                {data: 'details'},
-                                {data: 'edit'},
-                            {% endif %}
-                        ],
-                        columnDefs: [
-                            {
-                                targets: 2,
-                                render: DataTable.render.date(DATETIME_FORMAT)
-                            },
-                            {
-                                orderable: false,
-                                targets: [3]
-                            },
-                            {% if perms.fleetfinder.manage_fleets %}
-                                {
-                                    orderable: false,
-                                    targets: [4, 5]
-                                },
-                            {% endif %}
-                        ],
-                        order: [[0, 'asc']],
-                        paging: false
-                    });
-                })
-                .catch((error) => {
-                    console.error('Error fetching fleet data:', error);
-                });
-
-            /**
-             * Refresh the datatable information every 30 seconds
-             */
-            const intervalReloadDatatable = 30000; // ms
-            let expectedReloadDatatable = Date.now() + intervalReloadDatatable;
-
-            /**
-             * reload datatable "fleetfinderFleetsTable"
-             */
-            const reloadDataTable = () => {
-                const dt = Date.now() - expectedReloadDatatable; // The drift (positive for overshooting)
-
-                if (dt > intervalReloadDatatable) {
-                    // Something awful happened. Maybe the browser (tab) was inactive?
-                    // Possibly special handling to avoid futile "catch up" run
-                    console.log('Something went wrong, reloading page ...');
-
-                    window.location.replace(
-                        window.location.pathname + window.location.search + window.location.hash
-                    );
+        const aaFleetFinderSettingsOverride = {
+            dataTables: {
+                url: {
+                    dashboard: '{% url "fleetfinder:ajax_dashboard" %}'
                 }
-
-                fetchGet({url: '{% url "fleetfinder:ajax_dashboard" %}'})
-                    .then((newData) => {
-                        const dataTable = table_fleet_overview.DataTable();
-
-                        dataTable.clear().rows.add(newData).draw();
-                    })
-                    .catch((error) => {
-                        console.error('Error fetching updated data:', error);
-                    });
-
-                expectedReloadDatatable += intervalReloadDatatable;
-
-                // Take drift into account
-                setTimeout(
-                    reloadDataTable,
-                    Math.max(0, intervalReloadDatatable - dt)
-                );
-            };
-
-            setTimeout(
-                reloadDataTable,
-                intervalReloadDatatable
-            );
-        });
+            }
+        };
     </script>
+
+    {% include "fleetfinder/bundles/js/fleetfinder-js.html" with view="dashboard" %}
 {% endblock %}

fleetfinder/templates/fleetfinder/fleet-details.html

@@ -8,6 +8,10 @@
 {% endblock %}
 
 {% block aa_fleetfinder_body %}
+    {% include "framework/header/page-header.html" with title=fleet.name subtitle=fleet.fleet_commander.character_name %}
+
+    <div class="alert alert-warning d-none" id="fleetfinder-fleet-details-warning"></div>
+
     <div class="row">
         <div class="col-lg-6 col-lg-push-6">
             <div class="card card-primary">
@@ -19,7 +23,7 @@
 
                 <div class="card-body">
                     <div class="table-responsive">
-                        <table class="table table-striped table-hover table-vertical-middle w-100" id="table_fleet_composition">
+                        <table class="table table-striped table-hover table-vertical-middle w-100" id="table-fleet-composition">
                             <thead>
                                 <tr>
                                     <th>{% translate "Ship class" %}</th>
@@ -44,12 +48,13 @@
 
                 <div class="card-body">
                     <div class="table-responsive">
-                        <table class="table table-striped table-hover table-vertical-middle w-100" id="table_fleet_members">
+                        <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>
+                                    <th><!-- {% translate "Action" %} --></th>
                                 </tr>
                             </thead>
 
@@ -60,6 +65,8 @@
             </div>
         </div>
     </div>
+
+    {% include "fleetfinder/modals/kick-fleet-member.html" %}
 {% endblock %}
 
 {% block extra_css %}
@@ -70,70 +77,26 @@
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
 
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
+    {% translate "Fleet boss" as l10nFleetBoss %}
+    {% translate "Kick member from fleet" as l10nKickMemberFromFleet %}
+    {% translate "An unknown error occurred." as l10nUnknownError %}
 
     <script>
-        $(document).ready(() => {
-            const table_fleet_members = $('#table_fleet_members');
-            const tabe_fleet_composition = $('#table_fleet_composition');
-
-            const populateDatatables = () => {
-                fetchGet({
-                    url: '{% url "fleetfinder:ajax_fleet_details" fleet_id %}'
-                })
-                .then((data) => {
-                    table_fleet_members.DataTable({
-                        language: {
-                            url: '{{ DT_LANG_PATH }}'
-                        },
-                        destroy: true,
-                        paging: false,
-                        data: data.fleet_member,
-                        columns: [
-                            {data: 'character_name'},
-                            {data: 'ship_type_name'},
-                            {data: 'solar_system_name'}
-                        ]
-                    });
-
-                    tabe_fleet_composition.DataTable({
-                        language: {
-                            url: '{{ DT_LANG_PATH }}'
-                        },
-                        destroy: true,
-                        paging: false,
-                        data: data.fleet_composition,
-                        columns: [
-                            {data: 'ship_type_name'},
-                            {data: 'number', className: 'text-right', width: '100px'}
-                        ],
-                        order: [[1, 'desc']]
-                    });
-                })
-                .catch((error) => {
-                    console.error('Error fetching fleet details:', error);
-                });
-            };
-
-            table_fleet_members.DataTable({
-                language: {
-                    url: '{{ DT_LANG_PATH }}'
-                },
-                paging: false,
-            });
-
-            tabe_fleet_composition.DataTable({
-                language: {
-                    url: '{{ DT_LANG_PATH }}'
-                },
-                paging: false,
-            });
-
-            populateDatatables();
-
-            setInterval(function () {
-                populateDatatables();
-            }, 30000);
-        });
+        const aaFleetFinderSettingsOverride = {
+            dataTables: {
+                url: {
+                    fleetDetails: '{% url "fleetfinder:ajax_fleet_details" fleet.fleet_id %}',
+                    kickFleetMember: '{% url "fleetfinder:ajax_fleet_kick_member" fleet.fleet_id %}'
+                }
+            },
+            l10n: {
+                fleetBoss: '{{ l10nFleetBoss|escapejs }}',
+                kickMemberFromFleet: '{{ l10nKickMemberFromFleet|escapejs }}',
+                unknownError: '{{ l10nUnknownError|escapejs }}'
+            },
+            csrfToken: '{{ csrf_token }}'
+        };
     </script>
+
+    {% include "fleetfinder/bundles/js/fleetfinder-js.html" with view="fleet-details" %}
 {% endblock %}

fleetfinder/templates/fleetfinder/join-fleet.html

@@ -18,11 +18,21 @@
         <div class="card-body container">
             <div class="row">
                 <div class="align-self-center">
+                    <p>
+                        {% translate "Please ensure you don't have any CSPA charges set on your characters, as this will prevent fleet invites from being sent." %}
+                        <br>
+                        {% translate "You can select multiple characters to invite them all at once." %}
+                    </p>
+
+                    <p>
+                        {% translate "The selected characters will receive a fleet invite in-game, which they can accept to join the fleet." %}
+                    </p>
+
                     <form class="form-signin" role="form" action="" method="POST">
                         {% csrf_token %}
 
                         <div class="mb-3">
-                            <label for="character_ids">{% translate "Select the characters to invite" %}</label>
+                            <label for="character_ids" class="mb-1">{% translate "Please select the characters you want to invite:" %}</label>
 
                             <select class="multiselect-ui" multiple="multiple" name="character_ids" id="character_ids">
                                 {% for character in characters %}

fleetfinder/templates/fleetfinder/modals/kick-fleet-member.html

@@ -0,0 +1,46 @@
+{% load bootstrap %}
+{% load i18n %}
+
+<!-- kick fleet member modal -->
+<div class="modal fade" id="kick-fleet-member" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="modal-title fs-5">
+                    {% translate "Kick member from fleet" %}
+                </div>
+
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% translate 'Close' %}"></button>
+            </div>
+
+            <div class="modal-body">
+                <p>
+                    {% translate "Are you sure you want to kick this member from the fleet?" %}
+                </p>
+
+                <p>
+                    <strong id="kick-fleet-member-character-name"></strong>
+                </p>
+
+                <p class="aa-callout aa-callout-danger modal-kick-fleet-member-error d-none">
+                    <i class="fa-solid fa-triangle-exclamation"></i>
+                    {% translate "Error" %}
+                    <br>
+                    <span class="modal-kick-fleet-member-error-message"></span>
+                </p>
+            </div>
+
+            <div class="modal-footer">
+                <button id="modal-button-cancel-kick-fleet-member" type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">
+                    <i class="fa-regular fa-hand"></i>
+                    {% translate "Cancel" %}
+                </button>
+
+                <button id="modal-button-confirm-kick-fleet-member" type="button" class="btn btn-success btn-sm">
+                    <i class="fa-solid fa-check"></i>
+                    {% translate "Confirm" %}
+                </button>
+            </div>
+        </div>
+    </div>
+</div>

fleetfinder/tests/test_views.py

@@ -101,14 +101,14 @@ class TestAjaxDashboardView(FleetfinderTestViews):
     It should also filter fleets based on the user's groups.
     """
 
-    # python
     @patch("fleetfinder.views.get_all_characters_from_user")
-    def test_renders_dashboard_with_fleet_data(self, mock_get_characters):
+    def test_renders_dashboard_with_fleet_data_with_basic_access(
+        self, mock_get_characters
+    ):
         """
-        Test that the ajax_dashboard view renders the dashboard with fleet data.
+        Test that the ajax_dashboard view renders the dashboard with fleet data
+        when the user has basic access permissions.
 
-        :param mock_portrait_url:
-        :type mock_portrait_url:
         :param mock_get_characters:
         :type mock_get_characters:
         :return:
@@ -124,9 +124,10 @@ class TestAjaxDashboardView(FleetfinderTestViews):
 
         self.client.force_login(self.user_with_basic_acces_perms)
         url = reverse("fleetfinder:ajax_dashboard")
+        join_url = reverse("fleetfinder:join_fleet", args=[self.fleet_id])
         response = self.client.get(url)
 
-        expected_resonse = [
+        expected_response = [
             {
                 "fleet_commander": {
                     "html": '<img class="rounded eve-character-portrait" src="https://images.evetech.net/characters/1000/portrait?size=32" alt="Jean Luc Picard" loading="lazy">Jean Luc Picard',
@@ -134,16 +135,63 @@ class TestAjaxDashboardView(FleetfinderTestViews):
                 },
                 "fleet_name": "Starfleet",
                 "created_at": dt_to_iso(self.fleet_created_at),
-                "join": '<a href="/fleetfinder/fleet/12345/join/" class="btn btn-sm btn-primary">Join fleet</a>',
-                "details": "",
-                "edit": "",
+                "actions": f'<a href="{join_url}" class="btn btn-sm btn-success ms-1" data-bs-tooltip="aa-fleetfinder" title="Join fleet"><i class="fa-solid fa-right-to-bracket"></i></a>',
             }
         ]
 
         self.assertEqual(response.status_code, HTTPStatus.OK)
         self.assertIn("Starfleet", response.json()[0]["fleet_name"])
         self.assertIn("Jean Luc Picard", response.json()[0]["fleet_commander"]["html"])
-        self.assertEqual(response.json(), expected_resonse)
+        self.assertEqual(response.json(), expected_response)
+
+    @patch("fleetfinder.views.get_all_characters_from_user")
+    def test_renders_dashboard_with_fleet_data_with_manage_access(
+        self, mock_get_characters
+    ):
+        """
+        Test that the ajax_dashboard view renders the dashboard with fleet data
+        when the user has manage access permissions.
+
+        :param mock_get_characters:
+        :type mock_get_characters:
+        :return:
+        :rtype:
+        """
+
+        mock_get_characters.return_value = [
+            self.user_with_manage_perms.profile.main_character
+        ]
+
+        fleet = self.fleet
+        fleet.groups.set([])
+
+        self.client.force_login(self.user_with_manage_perms)
+        url = reverse("fleetfinder:ajax_dashboard")
+        join_url = reverse("fleetfinder:join_fleet", args=[self.fleet_id])
+        details_url = reverse("fleetfinder:fleet_details", args=[self.fleet_id])
+        edit_url = reverse("fleetfinder:edit_fleet", args=[self.fleet_id])
+        response = self.client.get(url)
+
+        expected_response = [
+            {
+                "fleet_commander": {
+                    "html": '<img class="rounded eve-character-portrait" src="https://images.evetech.net/characters/1000/portrait?size=32" alt="Jean Luc Picard" loading="lazy">Jean Luc Picard',
+                    "sort": "Jean Luc Picard",
+                },
+                "fleet_name": "Starfleet",
+                "created_at": dt_to_iso(self.fleet_created_at),
+                "actions": (
+                    f'<a href="{join_url}" class="btn btn-sm btn-success ms-1" data-bs-tooltip="aa-fleetfinder" title="Join fleet"><i class="fa-solid fa-right-to-bracket"></i></a>'
+                    f'<a href="{details_url}" class="btn btn-sm btn-info ms-1" data-bs-tooltip="aa-fleetfinder" title="View fleet details"><i class="fa-solid fa-eye"></i></a>'
+                    f'<a href="{edit_url}" class="btn btn-sm btn-warning ms-1" data-bs-tooltip="aa-fleetfinder" title="Edit fleet advert"><i class="fa-solid fa-pen-to-square"></i></a>'
+                ),
+            }
+        ]
+
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertIn("Starfleet", response.json()[0]["fleet_name"])
+        self.assertIn("Jean Luc Picard", response.json()[0]["fleet_commander"]["html"])
+        self.assertEqual(response.json(), expected_response)
 
     @patch("fleetfinder.views.get_all_characters_from_user")
     def test_returns_empty_data_when_no_fleets_available(self, mock_get_characters):
@@ -171,6 +219,15 @@ class TestAjaxDashboardView(FleetfinderTestViews):
 
     @patch("fleetfinder.views.get_all_characters_from_user")
     def test_filters_fleets_by_user_groups(self, mock_get_characters):
+        """
+        Test that the ajax_dashboard view filters fleets based on the user's groups.
+
+        :param mock_get_characters:
+        :type mock_get_characters:
+        :return:
+        :rtype:
+        """
+
         mock_get_characters.return_value = [
             self.user_with_manage_perms.profile.main_character
         ]
@@ -345,6 +402,21 @@ class TestFleetDetailsView(FleetfinderTestViews):
 
         self.assertEqual(response.status_code, HTTPStatus.FOUND)
 
+    def test_fleet_redirects_to_dashboard_if_not_found(self):
+        """
+        Test that the fleet_details view redirects to the dashboard if the fleet does not exist.
+
+        :return:
+        :rtype:
+        """
+
+        self.client.force_login(self.user_with_manage_perms)
+
+        response = self.client.get(reverse("fleetfinder:fleet_details", args=[123]))
+
+        self.assertEqual(response.status_code, HTTPStatus.FOUND)
+        self.assertEqual(response.url, reverse("fleetfinder:dashboard"))
+
 
 class TestAjaxFleetDetailsView(FleetfinderTestViews):
     """
@@ -414,3 +486,51 @@ class TestAjaxFleetDetailsView(FleetfinderTestViews):
 
         self.assertEqual(response.status_code, HTTPStatus.OK)
         self.assertEqual(json.loads(response.content), expected_fleet_composition)
+
+    @patch("fleetfinder.views.get_fleet_composition")
+    def test_returns_error_when_fleet_does_not_exist(self, mock_get_fleet_composition):
+        """
+        Test that the ajax_fleet_details view returns an error when the fleet does not exist.
+
+        :param mock_get_fleet_composition:
+        :type mock_get_fleet_composition:
+        :return:
+        :rtype:
+        """
+
+        mock_get_fleet_composition.side_effect = Fleet.DoesNotExist
+
+        self.client.force_login(user=self.user_with_manage_perms)
+
+        url = reverse("fleetfinder:ajax_fleet_details", args=[123])
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertJSONEqual(
+            response.content,
+            {"error": "Fleet with ID 123 does not exist."},
+        )
+
+    @patch("fleetfinder.views.get_fleet_composition")
+    def test_returns_error_when_runtime_error_occurs(self, mock_get_fleet_composition):
+        """
+        Test that the ajax_fleet_details view returns an error when a runtime error occurs.
+
+        :param mock_get_fleet_composition:
+        :type mock_get_fleet_composition:
+        :return:
+        :rtype:
+        """
+
+        mock_get_fleet_composition.side_effect = RuntimeError("Unexpected error")
+
+        self.client.force_login(user=self.user_with_manage_perms)
+
+        url = reverse("fleetfinder:ajax_fleet_details", args=[123])
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertJSONEqual(
+            response.content,
+            {"error": "Error retrieving fleet composition: Unexpected error"},
+        )

fleetfinder/urls.py

@@ -34,6 +34,11 @@ urlpatterns = [
                     view=views.ajax_fleet_details,
                     name="ajax_fleet_details",
                 ),
+                path(
+                    route="fleet/<int:fleet_id>/member/kick/",
+                    view=views.ajax_fleet_kick_member,
+                    name="ajax_fleet_kick_member",
+                ),
             ]
         ),
     ),