simpledomcontrol 0.57.4__tar.gz → 0.57.7__tar.gz

{simpledomcontrol-0.57.4 → simpledomcontrol-0.57.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimpleDomControl
-Version: 0.57.4
+Version: 0.57.7
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0
@@ -15,6 +15,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: attrs (>=24.2.0,<25.0.0)

{simpledomcontrol-0.57.4 → simpledomcontrol-0.57.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.57.4"
+version = "0.57.7"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"
@@ -37,11 +37,12 @@ testpaths = [
 ]
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^7.2.2"
-pillow = "^10.1.0"
-sphinx-toolbox = "^3.6.0"
-sphinx-rtd-theme = "^2.0.0"
-sphinx-markdown-builder = "^0.6.6"
+pytest = "^8.3.4"
+pillow = "^11.0.0"
+sphinx = "^8.1.3"
+sphinx-toolbox = "^3.8.1"
+sphinx-markdown-builder = "^0.6.7"
+sphinx-rtd-theme = "^3.0.2"
 
 [build-system]
 requires = ["poetry-core"]

{simpledomcontrol-0.57.4 → simpledomcontrol-0.57.7}/sdc_core/consumers.py

@@ -129,7 +129,7 @@ class SDCConsumer(AsyncWebsocketConsumer):
                 controller = import_function("%s.sdc_views.%s" % (json_data['app'], controller_name))
                 c_instance = controller()
                 if isinstance(c_instance, SdcAccessMixin):
-                    if not c_instance.check_requirements(self.scope['user']):
+                    if not await c_instance.async_check_requirements(self.scope['user']):
                         raise PermissionDenied()
                 method = getattr(controller(), json_data['function'])
 

{simpledomcontrol-0.57.4 → simpledomcontrol-0.57.7}/sdc_core/management/commands/init_add/add_controller_manager.py

@@ -160,11 +160,11 @@ class AddControllerManager:
             if not os.path.exists(org_style_file_path):
                 org_file_path_root = os.path.join(options.PROJECT_ROOT, "Assets/src",
                                              "index.style.scss")
-                line = '@import "./%s/%s.style.scss";\n' % (self.app_name, self.app_name)
+                line = '@use "./%s/%s.style.scss";\n' % (self.app_name, self.app_name)
 
                 self._add_scss_to_src(org_file_path_root, line)
 
-            line = '@import "./controller/%s/%s.scss";\n' % (self.controller_name_sc, self.controller_name_sc)
+            line = '@use "./controller/%s/%s.scss";\n' % (self.controller_name_sc, self.controller_name_sc)
             self._add_scss_to_src(org_style_file_path, line)
 
         line = 'import {} from "./controller/%s/%s.js";\n' % (self.controller_name_sc, self.controller_name_sc)
@@ -206,7 +206,7 @@ class AddControllerManager:
             text = ''
             added = False
             for line in fin:
-                if not line.startswith('@import') and not added:
+                if not line.startswith('@use') and not added:
                     text += "%s" % new_line
                     added = True
                 text += line

{simpledomcontrol-0.57.4 → simpledomcontrol-0.57.7}/sdc_core/sdc_extentions/views.py

@@ -1,5 +1,6 @@
 import json
 
+from channels.db import database_sync_to_async
 from django.contrib.auth.mixins import AccessMixin
 from django.core.exceptions import PermissionDenied, ImproperlyConfigured
 from django.http import HttpResponse
@@ -9,6 +10,10 @@ from sdc_core.sdc_extentions.response import send_redirect, send_success
 from django.conf import settings
 
 class SdcAccessMixin(AccessMixin):
+
+    async def async_check_requirements(self, user):
+        return self.check_requirements(user)
+
     def check_requirements(self, user):
         return True
 
@@ -18,6 +23,10 @@ class SdcAccessMixin(AccessMixin):
 
 class SdcLoginRequiredMixin(SdcAccessMixin):
     """Verify that the current user is authenticated."""
+
+    async def async_check_requirements(self, user):
+        return self.check_requirements(user)
+
     def check_requirements(self, user):
         return user.is_authenticated
 
@@ -55,13 +64,30 @@ class SdcGroupRequiredMixin(SdcLoginRequiredMixin):
     group_required: list[str] = []
     staff_allowed: bool = True
 
+
+    def _get_groups(self, user):
+        user_groups = []
+        for group in user.groups.values_list('name', flat=True):
+            user_groups.append(group)
+        return user_groups
+
+    async def async_check_requirements(self, user):
+        if not super().async_check_requirements(user):
+            return False
+        user_groups = await database_sync_to_async(self._get_groups)(user)
+
+        return self._check_groups(user_groups, user)
+
     def check_requirements(self, user):
         if not super().check_requirements(user):
             return False
         user_groups = []
-        for group in user.groups.values_list('name', flat=True):
+        for group in  self._get_groups(user):
             user_groups.append(group)
 
+        return self._check_groups(user_groups, user)
+
+    def _check_groups(self, user_groups, user):
         return len(set(user_groups).intersection(self.group_required)) > 0 or user.is_superuser or (self.staff_allowed and user.is_staff)
 
     def dispatch(self, request, *args, **kwargs):
@@ -100,7 +126,7 @@ class SDCView(View):
             handler = getattr(
                 self, request.POST.get('_sdc_func_name'), self.http_method_not_allowed
             )
-            res = handler(request, **json.loads(request.POST.get('data', '{}')))
+            res = handler(request, **json.loads(request.POST.get('data')))
             if isinstance(res, HttpResponse):
                 return res
             return send_success(_return_data=res)

simpledomcontrol-0.57.7/sdc_core/template_files/Assets/src/index.style.scss

@@ -0,0 +1,11 @@
+@use "../../node_modules/bootstrap/dist/css/bootstrap";
+@use "sdc_user/sdc_user.style";
+@use "sdc_tools/sdc_tools.style";
+
+body {
+    background-color: cornflowerblue;
+
+    .navbar-dummy {
+        height: 70px;
+    }
+}

{simpledomcontrol-0.57.4 → simpledomcontrol-0.57.7}/sdc_core/template_files/package.json

@@ -40,30 +40,30 @@
   "license": "",
   "devDependencies": {
     "@babel/core": "^7.23.7",
-    "@babel/preset-react": "^7.23.3",
+    "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.23.7",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
-    "css-loader": "^6.9.0",
-    "dotenv": "^16.3.1",
+    "css-loader": "^7.1.2",
+    "dotenv": "^16.4.7",
     "glob-parent": "^6.0.2",
     "glob-watcher": "^6.0.0",
-    "gulp": "^4.0.2",
+    "gulp": "^5.0.0",
     "gulp-clean": "^0.4.0",
-    "gulp-copy": "^4.0.1",
+    "gulp-copy": "^5.0.0",
     "gulp-exec": "^5.0.0",
     "gulp-rename": "^2.0.0",
-    "gulp-sass": "^5.1.0",
+    "gulp-sass": "^6.0.0",
     "gulp-uglify": "^3.0.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "js-cookie": "^3.0.5",
     "micromatch": "^4.0.8",
-    "sass": "^1.69.7",
-    "sass-loader": "^13.3.3",
-    "style-loader": "^3.3.4",
+    "sass": "^1.82.0",
+    "sass-loader": "^16.0.4",
+    "style-loader": "^4.0.0",
     "terser-webpack-plugin": "^5.3.10",
-    "webpack": "^5.95.0",
+    "webpack": "^5.97.1",
     "webpack-stream": "^7.0.0"
   },
   "overrides": {
@@ -76,6 +76,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
-    "sdc_client": "^0.57.4"
+    "sdc_client": "^0.57.7"
   }
 }

simpledomcontrol-0.57.7/sdc_tools/Assets/src/sdc_tools/sdc_tools.style.scss

@@ -0,0 +1,8 @@
+@use "controller/sdc_alert_messenger/sdc_alert_messenger";
+@use "controller/sdc_detail_view/sdc_detail_view";
+@use "controller/sdc_error/sdc_error";
+@use "controller/sdc_list_view/sdc_list_view";
+@use "controller/sdc_model_form/sdc_model_form";
+@use "controller/sdc_navigator/sdc_navigator";
+@use "controller/sdc_search_view/sdc_search_view";
+@use "controller/sdc_dummy/sdc_dummy.scss";

simpledomcontrol-0.57.7/sdc_user/Assets/src/sdc_user/sdc_user.style.scss

@@ -0,0 +1,2 @@
+@use "controller/sdc_login/sdc_login.scss";
+@use "controller/sdc_user_nav_btn/sdc_user_nav_btn.scss";

simpledomcontrol-0.57.4/sdc_core/template_files/Assets/src/index.style.scss

@@ -1,17 +0,0 @@
-@import "../../node_modules/bootstrap/dist/css/bootstrap";
-@import "./sdc_user/sdc_user.style";
-@import "./sdc_tools/sdc_tools.style";
-
-body::before {
-    content: "SDC Works";
-    font-size: larger;
-    color: red;
-}
-
-body {
-    background-color: cornflowerblue;
-
-    .navbar-dummy {
-        height: 70px;
-    }
-}

simpledomcontrol-0.57.4/sdc_tools/Assets/src/sdc_tools/sdc_tools.style.scss

@@ -1,8 +0,0 @@
-@import "controller/sdc_alert_messenger/sdc_alert_messenger";
-@import "controller/sdc_detail_view/sdc_detail_view";
-@import "controller/sdc_error/sdc_error";
-@import "controller/sdc_list_view/sdc_list_view";
-@import "controller/sdc_model_form/sdc_model_form";
-@import "controller/sdc_navigator/sdc_navigator";
-@import "controller/sdc_search_view/sdc_search_view";
-@import "./controller/sdc_dummy/sdc_dummy.scss";

simpledomcontrol-0.57.4/sdc_user/Assets/src/sdc_user/sdc_user.style.scss

@@ -1,2 +0,0 @@
-@import "./controller/sdc_login/sdc_login.scss";
-@import "./controller/sdc_user_nav_btn/sdc_user_nav_btn.scss";