Merge branch 'main' into feat/placeholder-order

Author: metaforx

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4

.github/workflows/lint.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
             requirements-file: dj60_cms50.txt
             os: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
@@ -66,7 +66,7 @@ jobs:
         coverage xml
 
     - name: Upload Coverage to Codecov
-      uses: codecov/codecov-action@v5.5.1
+      uses: codecov/codecov-action@v5.5.2
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         files: ./coverage.xml

README.md

@@ -65,6 +65,8 @@ def patch_page_menu(menu: type[CMSMenu]):
 class NavigationNodeMixin:
     """Mixin to add API endpoint and selection logic to NavigationNode."""
 
+    api_endpoint = None
+
     def get_api_endpoint(self):
         """Get the API endpoint for the navigation node."""
         return self.api_endpoint

djangocms_rest/cms_config.py

@@ -63,7 +63,7 @@ def to_representation(self, instance):
                     instance,
                     context=Context({"request": self.request}),
                     language=self.language,
-                    use_cache=True,
+                    use_cache=not getattr(self.request, "_preview_mode", False),
                 )
             if self.request.GET.get("html", False):
                 html = render_html(self.request, instance, self.language)

djangocms_rest/serializers/placeholders.py

@@ -22,15 +22,11 @@ def _get_placeholder_cache_version(placeholder, lang, site_id):
     else:
         version = int(time.time() * 1000000)
         vary_on_list = []
-        _set_placeholder_cache_version(
-            placeholder, lang, site_id, version, vary_on_list
-        )
+        _set_placeholder_cache_version(placeholder, lang, site_id, version, vary_on_list)
     return version, vary_on_list
 
 
-def _set_placeholder_cache_version(
-    placeholder, lang, site_id, version, vary_on_list=None, duration=None
-):
+def _set_placeholder_cache_version(placeholder, lang, site_id, version, vary_on_list=None, duration=None):
     """
     Sets the (placeholder x lang)'s version and vary-on header-names list.
     """
@@ -63,9 +59,7 @@ def set_placeholder_rest_cache(placeholder, lang, site_id, content, request):
 
     # "touch" the cache-version, so that it stays as fresh as this content.
     version, vary_on_list = _get_placeholder_cache_version(placeholder, lang, site_id)
-    _set_placeholder_cache_version(
-        placeholder, lang, site_id, version, vary_on_list, duration=duration
-    )
+    _set_placeholder_cache_version(placeholder, lang, site_id, version, vary_on_list, duration=duration)
 
 
 def get_placeholder_rest_cache(placeholder, lang, site_id, request):
@@ -75,9 +69,5 @@ def get_placeholder_rest_cache(placeholder, lang, site_id, request):
     """
     from django.core.cache import cache
 
-    key = (
-        _get_placeholder_cache_key(placeholder, lang, site_id, request, soft=True)
-        + ":rest"
-    )
-    content = cache.get(key)
-    return content
+    key = f"{_get_placeholder_cache_key(placeholder, lang, site_id, request, soft=True)}:rest"
+    return cache.get(key)

djangocms_rest/serializers/utils/cache.py

@@ -31,7 +31,7 @@
     get_object,
     get_site_filtered_queryset,
 )
-from djangocms_rest.views_base import BaseAPIView, BaseListAPIView
+from djangocms_rest.views_base import BaseAPIView, BaseListAPIView, preview_schema
 from djangocms_rest.schemas import extend_placeholder_schema, extend_page_search_schema, menu_schema_class
 
 # Generate the plugin definitions once at module load time
@@ -220,6 +220,7 @@ def get(self, request: Request) -> Response:
         return Response(definitions)
 
 
+@preview_schema
 @menu_schema_class
 class MenuView(BaseAPIView):
     permission_classes = [IsAllowedPublicLanguage]
@@ -298,7 +299,6 @@ def get_menu_structure(
         return result
 
 
-@menu_schema_class
 class SubMenuView(MenuView):
     tag = ShowSubMenu
 
@@ -308,7 +308,6 @@ def populate_defaults(self, kwargs: dict[str, Any]) -> None:
         kwargs.setdefault("nephews", 100)
 
 
-@menu_schema_class
 class BreadcrumbView(MenuView):
     tag = ShowBreadcrumb
     return_key = "ancestors"

djangocms_rest/views.py

@@ -20,7 +20,7 @@ dependencies = [
     "djangorestframework",
     "djangocms-link>=5.0.0",
     "djangocms-text>=0.8.0",
-    "djangocms-versioning>=2.1.0,<2.4.0",
+    "djangocms-versioning>=2.1.0",
     "pytest-cov>=6.0.0",
     "pytest-django>=4.10.0",
 ]

pyproject.toml

@@ -1,4 +1,4 @@
 -r base.txt
 
-Django>=6.0a1,<6.1
+Django>=6.0,<6.1
 django-cms>=5.0,<5.1