Merge branch 'main' into feat/search

Author: fsbraun

.github/workflows/codeql.yml

@@ -27,16 +27,16 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
         if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{ matrix.language }}"

djangocms_rest/serializers/menus.py

@@ -9,6 +9,7 @@ class NavigationNodeSerializer(serializers.Serializer):
     namespace = serializers.CharField(allow_null=True)
     title = serializers.CharField()
     url = serializers.URLField(allow_null=True)
+    path = serializers.CharField(allow_null=True)
     api_endpoint = serializers.URLField(allow_null=True)
     visible = serializers.BooleanField()
     selected = serializers.BooleanField()
@@ -22,24 +23,19 @@ def __init__(self, *args, **kwargs):
 
     def get_children(self, obj: NavigationNode) -> list[dict]:
         # Assuming obj.children is a list of NavigationNode-like objects
-        serializer = NavigationNodeSerializer(
-            obj.children or [], many=True, context=self.context
-        )
+        serializer = NavigationNodeSerializer(obj.children or [], many=True, context=self.context)
         return serializer.data
 
     def to_representation(self, obj: NavigationNode) -> dict:
         """Customize the base representation of the NavigationNode."""
         return {
             "namespace": getattr(obj, "namespace", None),
             "title": obj.title,
-            "url": get_absolute_frontend_url(self.request, obj.url),
-            "api_endpoint": get_absolute_frontend_url(
-                self.request, getattr(obj, "api_endpoint", None)
-            ),
+            "url": get_absolute_frontend_url(self.request, obj.url) or "",
+            "api_endpoint": get_absolute_frontend_url(self.request, getattr(obj, "api_endpoint", None)) or "",
+            "path": getattr(obj, "api_endpoint", ""),
             "visible": obj.visible,
-            "selected": obj.selected
-            or obj.attr.get("is_home", False)
-            and getattr(self.request, "is_home", False),
+            "selected": obj.selected or obj.attr.get("is_home", False) and getattr(self.request, "is_home", False),
             "attr": obj.attr,
             "level": obj.level,
             "children": self.get_children(obj),

djangocms_rest/views.py

@@ -341,7 +341,7 @@ def get_menu_structure(
 
         request.api_endpoint = api_endpoint
         request.LANGUAGE_CODE = language
-        request.current_page = get_object(self.site, path)
+        request.current_page = get_object(self.site, path)  # Used to identify the current page in menus
         self.check_object_permissions(request, request.current_page)
         menu_renderer = menu_pool.get_renderer(request)
         menu_renderer.site = self.site

djangocms_rest/views_base.py

@@ -24,7 +24,8 @@
             )
         ]
     )
-except ImportError: # pragma: no cover
+except ImportError:  # pragma: no cover
+
     class OpenApiTypes:
         BOOL = "boolean"
 
@@ -40,11 +41,13 @@ def __init__(self, *args, **kwargs):
     def extend_schema(*_args, **_kwargs):  # pragma: no cover
         def _decorator(obj: T) -> T:
             return obj
+
         return _decorator
 
-    def preview_schema(obj: T) -> T: # pragma: no cover
+    def preview_schema(obj: T) -> T:  # pragma: no cover
         return obj
 
+
 @preview_schema
 class BaseAPIMixin:
     """
@@ -62,9 +65,12 @@ def site(self):
         return site if site is not None else get_current_site(self.request)
 
     def _preview_requested(self):
-        return "preview" in self.request.GET and self.request.GET.get(
-            "preview", ""
-        ).lower() not in ("0", "false")
+        preview_mode = "preview" in self.request.GET and self.request.GET.get("preview", "").lower() not in (
+            "0",
+            "false",
+        )
+        self.request.toolbar.preview_mode_active = preview_mode
+        return preview_mode
 
     @property
     def content_getter(self):