simpledomcontrol 0.4.4__tar.gz → 0.4.6__tar.gz

{simpledomcontrol-0.4.4 → simpledomcontrol-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simpledomcontrol
-Version: 0.4.4
+Version: 0.4.6
 Summary: Simple DOM control -> a django MVC framework
 Home-page: https://github.com/StarmanMartin/sdc
 License: Apache-2.0

{simpledomcontrol-0.4.4 → simpledomcontrol-0.4.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SimpleDomControl"
-version = "0.4.4"
+version = "0.4.6"
 authors = [ "Martin Starman <private@martin-starman.com>", ]
 description = "Simple DOM control -> a django MVC framework"
 readme = "README.md"

{simpledomcontrol-0.4.4 → simpledomcontrol-0.4.6}/sdc_core/consumers.py

@@ -1,6 +1,6 @@
 import os
 import types
-
+import traceback
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.core.files.uploadhandler import TemporaryFileUploadHandler
@@ -182,8 +182,14 @@ class SDCConsumer(WebsocketConsumer):
             }, json_data.get('id'))
 
         except Exception as e:
+            if settings.DEBUG:
+                extracted_list = traceback.extract_tb(e.__traceback__)
+                traceback.print_tb(e.__traceback__)
+                e_text = e.__str__() + '\n'.join([item for item in traceback.StackSummary.from_list(extracted_list).format()])
+            else:
+                e_text = _f('Something went wrong')
             self.state_error({
-                'msg': _f('Something went wrong'),
+                'msg': e_text,
                 'header': _f('Upps!!')
             }, json_data.get('id'))
 
@@ -235,15 +241,15 @@ class SDCModelConsumer(WebsocketConsumer):
         }))
 
     def receive(self, text_data=None, bytes_data=None):
-        type = 'error'
+        msg_type = 'error'
         try:
             json_data = json.loads(text_data)
             self.scope['request'] = json_data
-            type = json_data.get('event_type', type)
-            self.scope['event_type'] = type
+            msg_type = json_data.get('event_type', msg_type)
+            self.scope['event_type'] = msg_type
             event_type = "%s_%s" % (json_data['event'], json_data['event_type'])
             self.queryset = json_data['args']['model_query']
-            if not self.model.is_authorised(self.scope['user'], type, self.queryset):
+            if not self.model.is_authorised(self.scope['user'], msg_type, self.queryset):
                 raise PermissionDenied
             if event_type == 'model_connect':
                 self._init_connection(json_data)
@@ -275,18 +281,22 @@ class SDCModelConsumer(WebsocketConsumer):
                     'is_error': False
                 }))
         except PermissionDenied as e:
-            if settings.DEBUG: raise e
             self.state_error({
-                'type': type,
+                'type': msg_type,
                 'msg': _f('403 Not allowed!'),
                 'header': _f('Upps!!')
             })
 
         except Exception as e:
-            if settings.DEBUG: raise e
+            if settings.DEBUG:
+                extracted_list = traceback.extract_tb(e.__traceback__)
+                traceback.print_tb(e.__traceback__)
+                e_text = e.__str__() + '\n'.join([item for item in traceback.StackSummary.from_list(extracted_list).format()])
+            else:
+                e_text = _f('Something went wrong')
             self.state_error({
-                'type': type,
-                'msg': _f('Something went wrong'),
+                'type': msg_type,
+                'msg': e_text,
                 'header': _f('Upps!!')
             })
 

{simpledomcontrol-0.4.4 → simpledomcontrol-0.4.6}/sdc_core/template_files/Assets/gulpfile.jsx

@@ -1,6 +1,6 @@
 'use strict'
 
-const {src, dest, series, watch, parallel} = require('gulp');
+const {src, dest, series, parallel} = require('gulp');
 const sass = require('gulp-sass')(require('sass'));
 const webpack = require('webpack-stream');
 const through = require('through2');
@@ -50,6 +50,7 @@ function collect_javascript() {
     return src('./src/**/*.js', {follow: true})
         .pipe(dest('./__tests__/src'));
 }
+
 function javascript() {
     const webpack_config = (process.env.NODE_ENV === 'development' ? './webpack.config/webpack.development.config.jsx' : './webpack.config/webpack.production.config.jsx');
 
@@ -67,11 +68,9 @@ function clean(done) {
 }
 
 function link_files(cb) {
-    const python = process.env.PYTHON
+    let python = process.env.PYTHON
     if (!python) {
-        console.error(`The environment variable PYTHON (Path to python interpreter) is not set. In this case link_files cannot be executed`);
-        cb();
-        return;
+        python = 'python';
     }
 
     process.chdir('..');
@@ -79,14 +78,20 @@ function link_files(cb) {
         continueOnError: true, // default = false, true means don't emit error event
         pipeStdout: true, // default = false, true means stdout is written to file.contents
     };
-    return src(python)
-        .pipe(exec(file => `${file.path} manage.py sdc_update_links`, options).on('error', function (err) {
-            console.error('Error:', err.message);
-            this.emit('end'); // Continue with the next task
-        })).on('end', () => {
-            process.chdir('./Assets');
-            cb();
-        });
+    try {
+        return src('./manage.py')
+            .pipe(exec(file => `${python} ${file.path} sdc_update_links`, options).on('error', function (err) {
+                console.error('Error:', err.message);
+                console.error(`The environment variable PYTHON (Path to python interpreter) is not set. In this case link_files cannot be executed`);
+                this.emit('end'); // Continue with the next task
+            })).on('end', () => {
+                process.chdir('./Assets');
+            });
+    } catch {
+        console.error(`The environment variable PYTHON (Path to python interpreter) is not set. In this case link_files cannot be executed`);
+        process.chdir('./Assets');
+        cb();
+    }
 
 }
 
@@ -104,7 +109,7 @@ function watch_scss() {
     const watcher = chokidar.watch('./src/**/*.scss', {followSymlinks: true});
     watcher.on('change', (a) => {
         console.log(`${a} has changed! SCSS is recompiling...`);
-        scss().on('end', ()=>{
+        scss().on('end', () => {
             console.log(`... recompiling done!`);
         });
     });
@@ -126,6 +131,7 @@ exports.watch_webpack = watch_webpack;
 
 exports.develop = series(function (done) {
     process.env.NODE_ENV = 'development'
+    process.env.BABEL_ENV = 'development'
     done();
 }, defaultBuild, parallel(
     watch_scss,

{simpledomcontrol-0.4.4 → simpledomcontrol-0.4.6}/sdc_tools/Assets/src/sdc_tools/controller/sdc_list_view/sdc_list_view.js

@@ -70,7 +70,10 @@ export class SdcListViewController extends AbstractSDC {
     }
 
     onRefresh() {
-        this.find('[data-toggle="tooltip"]').tooltip();
+        const $tooltip = this.find('[data-toggle="tooltip"]');
+        if($tooltip.length > 0 && $tooltip.tooltip) {
+            $tooltip.tooltip();
+        }
         return super.onRefresh();
     }
 

{simpledomcontrol-0.4.4 → simpledomcontrol-0.4.6}/sdc_tools/Assets/src/sdc_tools/controller/sdc_navigator/sdc_navigator.js

@@ -1,6 +1,6 @@
 import {AbstractSDC, app, on, trigger, checkIfParamNumberBoolOrString} from 'sdc_client';
 
-
+import {isMatch} from 'lodash';
 
 const SDC_SUB_DETAIL_CONTROLLER = 'sdc_sub_detail_container';
 const SDC_DETAIL_CONTROLLER = 'sdc_detail_view';
@@ -36,6 +36,7 @@ export class SdcNavigatorController extends AbstractSDC {
             'click': {
                 '.navigation-links': function (btn, ev) {
                     ev.preventDefault();
+                    // noinspection JSPotentiallyInvalidUsageOfClassThis
                     this.onNavLink(btn, ev);
                 }
             }
@@ -142,9 +143,9 @@ export class SdcNavigatorController extends AbstractSDC {
         this.state && this._updateButton(this.state.buttonSelector);
         this._is_processing = true;
         this._origin_target = target;
-        this._previous_args = args;
 
-        let viewObj = this._getSubViewObj(this._origin_target);
+        let viewObj = this._getSubViewObj(args);
+        this._previous_args = args;
 
         if (viewObj.container.container.data('modal')) {
             if (!this._currentModal) {
@@ -249,9 +250,9 @@ export class SdcNavigatorController extends AbstractSDC {
         const $breadcrumps = this.find('.breadcrumb');
         const self = this;
         $breadcrumps.each(function () {
-            const $breadcrump = $(this);
-            $breadcrump.safeEmpty();
-            let idx = $breadcrump.data('offset');
+            const $breadcrumb = $(this);
+            $breadcrumb.safeEmpty();
+            let idx = $breadcrumb.data('offset');
             idx = idx ? parseInt(idx) : 0;
             const b_length = self._breadcrumb.length - idx - 1;
             let href = [];
@@ -259,11 +260,11 @@ export class SdcNavigatorController extends AbstractSDC {
                 href = Array(self._breadcrumb.length - idx - 1).fill('..');
             }
             for (let i = idx; i < self._breadcrumb.length-1; ++i) {
-                $breadcrump.append(`<li class="breadcrumb-item"><a class="navigation-links" href="${href.join('~')}">${self._breadcrumb[i]}</a></li>`);
+                $breadcrumb.append(`<li class="breadcrumb-item"><a class="navigation-links" href="${href.join('~')}">${self._breadcrumb[i]}</a></li>`);
                 href.pop();
             }
 
-            self.find('.breadcrumb').append(`<li class="breadcrumb-item active">${self._breadcrumb.at(-1)}</li>`);
+            $breadcrumb.append(`<li class="breadcrumb-item active">${self._breadcrumb.at(-1)}</li>`);
         });
     }
 
@@ -322,7 +323,8 @@ export class SdcNavigatorController extends AbstractSDC {
         return $last_detail_container;
     }
 
-    _getSubViewObj(target) {
+    _getSubViewObj(args) {
+        const target = this._origin_target;
         let idx = 0;
         let isBack = false;
         while (idx < Math.min(target.length, this._history_path.length)
@@ -332,7 +334,7 @@ export class SdcNavigatorController extends AbstractSDC {
 
         if (idx >= target.length && target[idx - 1] === this._history_path[idx - 1]) {
             idx = target.length - 1;
-            isBack = target.length < this._history_path.length;
+            isBack = target.length < this._history_path.length && isMatch(this._previous_args, args);
             this._history_path = [...target];
         } else if (idx >= target.length) {
             idx = target.length - 1;
@@ -501,7 +503,7 @@ export class SdcNavigatorController extends AbstractSDC {
         return false;
     }
 
-    login(pk) {
+    login() {
         app.cleanCache();
         this.onNavigateToController(window.location.pathname);
     }