aa-fleetfinder 2.3.2__py3-none-any.whl → 2.3.4__py3-none-any.whl

fleetfinder/templatetags/fleetfinder.py

@@ -84,3 +84,19 @@ def fleetfinder_static(relative_file_path: str, script_type: str = None) -> str
         )
 
     return return_value
+
+
+@register.filter
+def get_item(dictionary: dict | None, key: str) -> str | None:
+    """
+    Little helper: get a key from a dictionary
+
+    :param dictionary:
+    :param key:
+    :return:
+    """
+
+    if dictionary is None:
+        return None
+
+    return dictionary.get(key, None)

fleetfinder/tests/test_templatetags.py

@@ -10,6 +10,7 @@ from django.test import TestCase, override_settings
 from fleetfinder import __version__
 from fleetfinder.constants import PACKAGE_NAME
 from fleetfinder.helper.static_files import calculate_integrity_hash
+from fleetfinder.templatetags.fleetfinder import get_item
 
 
 class TestVersionedStatic(TestCase):
@@ -93,3 +94,61 @@ class TestVersionedStatic(TestCase):
 
         with self.assertRaises(ValueError):
             template_to_render.render(context=context)
+
+
+class TestGetItem(TestCase):
+    """
+    Test the `get_item` template tag
+    """
+
+    def test_returns_value_for_existing_key(self):
+        """
+        Test should return the value for an existing key
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = {"key1": "value1", "key2": "value2"}
+        result = get_item(dictionary, "key1")
+
+        self.assertEqual(result, "value1")
+
+    def test_returns_none_for_non_existing_key(self):
+        """
+        Test should return None for a non-existing key
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = {"key1": "value1", "key2": "value2"}
+        result = get_item(dictionary, "key3")
+
+        self.assertIsNone(result)
+
+    def test_returns_none_for_empty_dictionary(self):
+        """
+        Test should return None for an empty dictionary
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = {}
+        result = get_item(dictionary, "key1")
+
+        self.assertIsNone(result)
+
+    def test_returns_none_for_none_dictionary(self):
+        """
+        Test should return None for a None dictionary
+
+        :return:
+        :rtype:
+        """
+
+        dictionary = None
+        result = get_item(dictionary, "key1")
+
+        self.assertIsNone(result)

fleetfinder/views.py

@@ -11,7 +11,6 @@ from django.contrib.auth.decorators import login_required, permission_required
 from django.db.models import Q
 from django.http import JsonResponse
 from django.shortcuts import redirect, render
-from django.template.defaulttags import register
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -341,16 +340,3 @@ def ajax_fleet_details(
         data["fleet_composition"].append({"ship_type_name": ship, "number": number})
 
     return JsonResponse(data=data, safe=False)
-
-
-@register.filter
-def get_item(dictionary, key):
-    """
-    Little helper: get a key from a dictionary
-
-    :param dictionary:
-    :param key:
-    :return:
-    """
-
-    return dictionary.get(key=key, default=None)

fleetfinder/templates/fleetfinder/partials/header/header-navigation.html

@@ -1,35 +0,0 @@
-{% load i18n %}
-
-<nav class="navbar navbar-expand-lg bg-primary navbar-dark mb-3 rounded">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="{% url 'fleetfinder:dashboard' %}">
-            {% translate "Available fleets" as navigation_item %}
-            {{ navigation_item|title }}
-        </a>
-
-        <button
-            class="navbar-toggler collapsed"
-            type="button"
-            data-bs-toggle="collapse"
-            data-bs-target="#fleetfinder-header-navbar"
-            aria-controls="fleetfinder-header-navbar"
-            aria-expanded="false"
-            aria-label="{% translate 'Toggle navigation' %}"
-        >
-            <span class="navbar-toggler-icon"></span>
-        </button>
-
-        <div class="collapse navbar-collapse" id="fleetfinder-header-navbar">
-            <ul class="navbar-nav">
-                {% if perms.fleetfinder.manage_fleets %}
-                    <li class="nav-item">
-                        <a class="nav-link" href="{% url 'fleetfinder:create_fleet' %}">
-                            {% translate "Create fleet" as navigation_item %}
-                            {{ navigation_item|title }}
-                        </a>
-                    </li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-</nav>