aa-fleetfinder 2.7.0__py3-none-any.whl → 2.7.2__py3-none-any.whl

fleetfinder/tasks.py

@@ -306,10 +306,10 @@ def get_fleet_composition(  # pylint: disable=too-many-locals
 
     try:
         fleet = Fleet.objects.get(fleet_id=fleet_id)
-    except Fleet.DoesNotExist:
+    except Fleet.DoesNotExist as exc:
         logger.error(f"Fleet with ID {fleet_id} not found")
 
-        return None
+        raise Fleet.DoesNotExist(f"Fleet with ID {fleet_id} not found.") from exc
 
     logger.info(
         f'Getting fleet composition for fleet "{fleet.name}" '
@@ -342,8 +342,14 @@ def get_fleet_composition(  # pylint: disable=too-many-locals
             f"Found {len(all_ids)} unique IDs to fetch names for in fleet {fleet_id}"
         )
 
-        # Process IDs in chunks to avoid ESI limits
-        chunk_size = 500
+        # Process IDs in chunks of 1000 to avoid ESI limits.
+        # ESI has a limit of 1000 IDs per request, so we will chunk the requests,
+        # even though there is a theoretical limit of 768 unique IDs per fleet,
+        # so we never should hit the ESI limit.
+        # But to be on the safe side, we will chunk the requests in case CCP decides
+        # to change the fleet limit in the future, we will use a chunk size of 1000,
+        # which is the maximum allowed by ESI for the `post_universe_names` endpoint.
+        chunk_size = 1000
         ids_to_name = []
         all_ids_list = list(all_ids)
 
@@ -376,4 +382,6 @@ def get_fleet_composition(  # pylint: disable=too-many-locals
     except Exception as e:  # pylint: disable=broad-exception-caught
         logger.error(f"Failed to get fleet composition for fleet {fleet_id}: {e}")
 
-        return None
+        raise RuntimeError(
+            f"Failed to get fleet composition for fleet {fleet_id} : {str(e)}"
+        ) from e

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

@@ -1,3 +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

@@ -38,91 +38,16 @@
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
     {% include "bundles/moment-js.html" with locale=True %}
-    {% include "fleetfinder/bundles/js/fleetfinder-js.html" %}
-
-    {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
 
     <script>
-        /* global fetchGet, fleetfinderBootstrapTooltip, DataTable */
-        'use strict';
-
-        $(document).ready(() => {
-            const DATETIME_FORMAT = 'YYYY-MM-DD, HH:mm';
-            const table_fleet_overview = $('#table_available-fleets');
-            let dataTable = null;
-
-            /**
-             * Initialize or update the datatable.
-             * If the table already exists, it will be updated with new data.
-             * If it does not exist, a new DataTable will be created.
-             *
-             * @param {Object} data - The fleet data to populate the table.
-             */
-            const initializeOrUpdateTable = (data) => {
-                if (dataTable) {
-                    // Update existing table
-                    dataTable.clear().rows.add(data).draw();
-                } else {
-                    // Initialize new table
-                    dataTable = 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: 'actions',
-                                className: 'text-end',
-                            },
-                        ],
-                        columnDefs: [
-                            {
-                                targets: 2,
-                                render: DataTable.render.date(DATETIME_FORMAT)
-                            },
-                            {
-                                orderable: false,
-                                targets: [3]
-                            },
-                        ],
-                        order: [[0, 'asc']],
-                        paging: false
-                    });
+        const aaFleetFinderSettingsOverride = {
+            dataTables: {
+                url: {
+                    dashboard: '{% url "fleetfinder:ajax_dashboard" %}'
                 }
-
-                // Initialize Bootstrap tooltips
-                fleetfinderBootstrapTooltip({selector: '#table_available-fleets'});
-            };
-
-            /**
-             * Fetch and update fleet data
-             */
-            const fetchFleetData = () => {
-                fetchGet({url: '{% url "fleetfinder:ajax_dashboard" %}'})
-                    .then(initializeOrUpdateTable)
-                    .catch((error) => {
-                        console.error('Error fetching fleet data:', error);
-                    });
-            };
-
-            // Initial load
-            fetchFleetData();
-
-            // Refresh every 30 seconds
-            setInterval(fetchFleetData, 30000);
-        });
+            }
+        };
     </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,7 +48,7 @@
 
                 <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>
@@ -72,159 +76,27 @@
 
 {% block extra_javascript %}
     {% include "bundles/datatables-js-bs5.html" %}
-    {% include "fleetfinder/bundles/js/fleetfinder-js.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(() => {
-            /* DataTables
-            ------------------------------------------------------------------------- */
-            const table_fleet_members = $('#table_fleet_members');
-            const table_fleet_composition = $('#table_fleet_composition');
-            const url = {
-                kickFleetMember: '{% url "fleetfinder:ajax_fleet_kick_member" fleet_id %}',
-                fleetDetails: '{% url "fleetfinder:ajax_fleet_details" fleet_id %}'
-            };
-            const dataTableConfig = {
-                language: {
-                    url: '{{ DT_LANG_PATH }}'
-                },
-                paging: false,
-                destroy: true
-            };
-
-            const populateDatatables = () => {
-                fetchGet({
-                    url: url.fleetDetails,
-                })
-                .then((data) => {
-                    table_fleet_members.DataTable({
-                        ...dataTableConfig,
-                        data: data.fleet_member,
-                        columns: [
-                            {
-                                render: (data, type, row) => {
-                                    const fwIcon = '<i class="fa-solid fa-star"></i>';
-
-                                    return row.is_fleet_boss
-                                        ? `${row.character_name} <sup data-bs-tooltip="aa-fleetfinder" title="{{ l10nFleetBoss|escapejs }}"><small>${fwIcon}</small></sup>`
-                                        : row.character_name;
-                                }
-                            },
-                            {data: 'ship_type_name'},
-                            {data: 'solar_system_name'},
-                            {
-                                render: (data, type, row) => {
-                                    const fwIcon = '<i class="fa-solid fa-user-minus"></i>';
-                                    const dataAttributes = Object.entries({
-                                        'data-character-id': row.character_id,
-                                        'data-character-name': row.character_name,
-                                        'data-bs-toggle': 'modal',
-                                        'data-bs-target': '#kick-fleet-member',
-                                        'data-bs-tooltip': 'aa-fleetfinder'
-                                    }).map(([key, value]) => {
-                                        return `${key}="${value}"`;
-                                    }).join(' ');
-
-                                    return row.is_fleet_boss
-                                        ? ''
-                                        : `<button type="button" class="btn btn-sm btn-danger" ${dataAttributes} title="{{ l10nKickMemberFromFleet|escapejs }}">${fwIcon}</button>`;
-                                },
-                                orderable: false,
-                                searchable: false,
-                                width: '50px',
-                                className: 'text-end'
-                            }
-                        ],
-                        createdRow: (row, data, rowIndex) => {
-                            $(row).attr('data-row-id', rowIndex);
-                            $(row).attr('data-character-id', data.character_id);
-                        }
-                    });
-
-                    table_fleet_composition.DataTable({
-                        ...dataTableConfig,
-                        data: data.fleet_composition,
-                        columns: [
-                            {data: 'ship_type_name'},
-                            {data: 'number', className: 'text-right', width: '100px'}
-                        ],
-                        order: [[1, 'desc']]
-                    });
-                })
-                .then(() => {
-                    // Initialize tooltips for the kick buttons
-                    fleetfinderBootstrapTooltip({selector: '#table_fleet_members'});
-                })
-                .catch((error) => {
-                    console.error('Error fetching fleet details:', error);
-                });
-            };
-
-            populateDatatables();
-
-            setInterval(populateDatatables, 30000);
-
-            /* Modals
-            ------------------------------------------------------------------------- */
-            // Handle the kick fleet member modal
-            $('#kick-fleet-member')
-                .on('show.bs.modal', (event) => {
-                    const button = $(event.relatedTarget);
-                    const characterId = button.data('character-id');
-                    const characterName = button.data('character-name');
-                    const link = url.kickFleetMember;
-                    const csrfToken = '{{ csrf_token }}';
-
-                    // Populate the modal content
-                    $('#kick-fleet-member-character-name').text(characterName);
-
-                    $('#modal-button-confirm-kick-fleet-member')
-                        // Remove any previous click handlers to avoid multiple bindings
-                        .off('click.kickMember')
-                        // Bind the click event for the confirmation button
-                        .on('click.kickMember', () => {
-                        fetchPost({
-                            url: link,
-                            csrfToken: csrfToken,
-                            payload: {
-                                memberId: characterId
-                            },
-                            responseIsJson: true
-                        })
-                        .then((data) => {
-                            if (data.success) {
-                                populateDatatables();
-
-                                $('#kick-fleet-member').modal('hide');
-                            } else {
-                                $('#kick-fleet-member .modal-kick-fleet-member-error')
-                                    .removeClass('d-none')
-                                    .find('.modal-kick-fleet-member-error-message')
-                                    .text(data.error || '{{ l10nUnknownError|escapejs }}');
-                            }
-                        })
-                        .catch((error) => {
-                            console.error('Error kicking fleet member:', error);
-                        });
-                    });
-                })
-                .on('hide.bs.modal', () => {
-                    // Reset modal content
-                    $('#kick-fleet-member-character-name').empty();
-                    $('#kick-fleet-member .modal-kick-fleet-member-error')
-                        .addClass('d-none')
-                        .find('.modal-kick-fleet-member-error-message')
-                        .empty();
-
-                    // Clean up event handler
-                    $('#modal-button-confirm-kick-fleet-member').off('click.kickMember');
-                });
-        });
+        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/tests/test_views.py

@@ -402,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):
     """
@@ -471,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/views.py

@@ -462,9 +462,25 @@ def fleet_details(request, fleet_id):
     :return:
     """
 
-    context = {"fleet_id": fleet_id}
+    try:
+        fleet = Fleet.objects.get(fleet_id=fleet_id)
+    except Fleet.DoesNotExist:
+        logger.debug(f"Fleet with ID {fleet_id} does not exist.")
 
-    logger.info(msg=f"Fleet {fleet_id} details view called by {request.user}")
+        messages.error(
+            request,
+            mark_safe(
+                _(
+                    "<h4>Error!</h4><p>Fleet does not exist or is no longer available.</p>"
+                )
+            ),
+        )
+
+        return redirect("fleetfinder:dashboard")
+
+    context = {"fleet": fleet}
+
+    logger.info(msg=f"Fleet {fleet.fleet_id} details view called by {request.user}")
 
     return render(
         request=request,
@@ -485,7 +501,20 @@ def ajax_fleet_details(
     :param fleet_id:
     """
 
-    fleet = get_fleet_composition(fleet_id)
+    try:
+        fleet = get_fleet_composition(fleet_id)
+    except Fleet.DoesNotExist:
+        logger.debug(f"Fleet with ID {fleet_id} does not exist.")
+
+        return JsonResponse(
+            data={"error": _(f"Fleet with ID {fleet_id} does not exist.")}, safe=False
+        )
+    except RuntimeError as ex:
+        logger.debug(f"Error retrieving fleet composition: {ex}", exc_info=True)
+
+        return JsonResponse(
+            data={"error": _(f"Error retrieving fleet composition: {ex}")}, safe=False
+        )
 
     data = {
         "fleet_member": list(fleet.fleet),