django-unfold 0.41.0__py3-none-any.whl → 0.43.0__py3-none-any.whl

unfold/settings.py

@@ -12,6 +12,7 @@ CONFIG_DEFAULTS = {
     "SITE_FAVICONS": [],
     "SHOW_HISTORY": True,
     "SHOW_VIEW_ON_SITE": True,
+    "SHOW_LANGUAGES": False,
     "COLORS": {
         "font": {
             "subtle-light": "107 114 128",  # text-gray-500

unfold/sites.py

@@ -1,5 +1,6 @@
 from http import HTTPStatus
 from typing import Any, Callable, Dict, List, Optional, Union
+from urllib.parse import parse_qs, urlparse
 
 from django.contrib.admin import AdminSite
 from django.contrib.auth import REDIRECT_FIELD_NAME
@@ -84,6 +85,7 @@ class UnfoldAdminSite(AdminSite):
                 "show_view_on_site": get_config(self.settings_name)[
                     "SHOW_VIEW_ON_SITE"
                 ],
+                "show_languages": get_config(self.settings_name)["SHOW_LANGUAGES"],
                 "colors": self._process_colors(
                     get_config(self.settings_name)["COLORS"]
                 ),
@@ -234,6 +236,7 @@ class UnfoldAdminSite(AdminSite):
 
     def get_sidebar_list(self, request: HttpRequest) -> List[Dict[str, Any]]:
         navigation = get_config(self.settings_name)["SIDEBAR"].get("navigation", [])
+        tabs = get_config(self.settings_name)["TABS"]
         results = []
 
         for group in navigation:
@@ -245,7 +248,8 @@ class UnfoldAdminSite(AdminSite):
                     request, item.get("link_callback") or item["link"]
                 )
 
-                for tab in get_config(self.settings_name)["TABS"]:
+                # Checks if any tab item is active and then marks the sidebar link as active
+                for tab in tabs:
                     has_primary_link = False
                     has_tab_link_active = False
 
@@ -302,7 +306,7 @@ class UnfoldAdminSite(AdminSite):
                     item["link_callback"] = lazy(item["link"])(request)
 
                 item["active"] = self._get_is_active(
-                    request, item.get("link_callback") or item["link"]
+                    request, item.get("link_callback") or item["link"], True
                 )
                 allowed_items.append(item)
 
@@ -391,13 +395,29 @@ class UnfoldAdminSite(AdminSite):
 
         return colors
 
-    def _get_is_active(self, request: HttpRequest, link: str) -> bool:
+    def _get_is_active(
+        self, request: HttpRequest, link: str, is_tab: bool = False
+    ) -> bool:
         if not isinstance(link, str):
             link = str(link)
 
-        if link in request.path and link != reverse_lazy(f"{self.name}:index"):
+        index_path = reverse_lazy(f"{self.name}:index")
+        link_path = urlparse(link).path
+
+        # Dashboard
+        if link_path == request.path == index_path:
             return True
-        elif link == request.path == reverse_lazy(f"{self.name}:index"):
+
+        if link_path in request.path and link_path != index_path:
+            query_params = parse_qs(urlparse(link).query)
+            request_params = parse_qs(request.GET.urlencode())
+
+            # In case of tabs, we need to check if the query params are the same
+            if is_tab and not all(
+                request_params.get(k) == v for k, v in query_params.items()
+            ):
+                return False
+
             return True
 
         return False