Merge remote-tracking branch 'origin/feature/modernize-python-django-support' into feature/modernize-python-django-support

Author: vinitkumar

.babelrc

@@ -1,8 +1,8 @@
 {
     "presets": [
-        ["env", {
+        ["@babel/preset-env", {
             "modules": false
         }]
     ],
-    "plugins": ["transform-runtime", "syntax-dynamic-import"]
+    "plugins": ["@babel/plugin-syntax-dynamic-import"]
 }

.eslintrc.js

@@ -0,0 +1,39 @@
+name: Frontend E2E Tests
+
+on:
+  push:
+    branches:
+      - main
+      - 'release/**'
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v5
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '24'
+        cache: 'npm'
+
+    - name: Install dependencies
+      run: npm ci
+
+    - name: Install Playwright Chromium browser
+      run: npx playwright install --with-deps chromium
+
+    - name: Run linter
+      run: npx gulp lint
+
+    - name: Run E2E tests with coverage
+      run: |
+        npm run e2e
+        npm run e2e:coverage:report

.github/workflows/frontend.yml

@@ -16,3 +16,7 @@ htmlcov/
 !djangocms_versioning/static/djangocms_versioning/js/dist
 docs/_build/
 node_modules
+coverage-e2e/
+.nyc_output/
+playwright-report/
+test-results/

.gitignore

@@ -1 +1 @@
-16
+24

.nvmrc

@@ -53,13 +53,15 @@ Testing
 To run all the tests the only thing you need to do is run::
 
     pip install -r tests/requirements.txt
-    python setup.py test
+    python test_settings.py
 
 
 Documentation
 =============
 
-We maintain documentation under the ``docs`` folder using rst format.
+The documentation is online on `readthedocs <https://djangocms-versioning.readthedocs.io>`_.
+
+We maintain documentation in this repository under the ``docs`` folder using rst format.
 
 To generate the HTML documentation you will need to install ``sphinx`` (``pip install sphinx``) and ``graphviz`` (as per your operating system's package management system). You can then generate the docs using the following command:
 

README.rst

@@ -0,0 +1,12 @@
+module.exports = {
+    presets: [
+        ['@babel/preset-env', {
+            targets: {
+                browsers: ['last 2 versions', '> 1%']
+            }
+        }]
+    ],
+    plugins: [
+        '@babel/plugin-syntax-dynamic-import'
+    ]
+};

babel.config.js

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import warnings
 from collections import OrderedDict
@@ -1365,7 +1367,7 @@ def unlock_view(self, request, object_id):
             raise Http404
 
         # Check that the user has unlock permission
-        if not request.user.has_perm("djangocms_versioning.delete_versionlock"):
+        if not request.user.has_perm(f"{self.model._meta.app_label}.delete_versionlock"):
             return HttpResponseForbidden(force_str(_("You do not have permission to remove the version lock")))
 
         # Unlock the version

djangocms_versioning/admin.py

@@ -136,7 +136,7 @@ def _add_unlock_button(self):
                     f"admin:{proxy_model._meta.app_label}_{proxy_model.__name__.lower()}_unlock",
                     args=(version.pk,),
                 )
-                can_unlock = self.request.user.has_perm("djangocms_versioning.delete_versionlock")
+                can_unlock = self.request.user.has_perm(f"{version._meta.app_label}.delete_versionlock")
                 if can_unlock:
                     extra_classes = [
                         "cms-btn-action",

djangocms_versioning/cms_toolbars.py

@@ -79,7 +79,12 @@ def inner(version, user):
 
 def user_can_unlock(message: str) -> callable:
     def inner(version, user):
-        if not user.has_perm("djangocms_versioning.delete_versionlock"):
+        if conf.LOCK_VERSIONS:
+            if user.has_perm(f"{version._meta.app_label}.delete_versionlock"):
+                return
+            draft_version = get_latest_draft_version(version)
+            if draft_version and (draft_version.locked_by == user or draft_version.locked_by is  None):
+                return
             raise ConditionFailed(message)
     return inner