simpledomcontrol 0.4.12__tar.gz → 0.4.13__tar.gz

{simpledomcontrol-0.4.12 → simpledomcontrol-0.4.13}/PKG-INFO

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

{simpledomcontrol-0.4.12 → simpledomcontrol-0.4.13}/pyproject.toml

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

{simpledomcontrol-0.4.12 → simpledomcontrol-0.4.13}/sdc_core/template_files/package.json

@@ -75,6 +75,6 @@
     "esm": "^3.2.25",
     "jquery": "^3.7.0",
     "lodash": "^4.17.21",
-    "sdc_client": "^0.4.12"
+    "sdc_client": "^0.4.13"
   }
 }

{simpledomcontrol-0.4.12 → simpledomcontrol-0.4.13}/sdc_tools/Assets/src/sdc_tools/controller/sdc_navigator/sdc_navigator.js

@@ -21,6 +21,7 @@ export class SdcNavigatorController extends AbstractSDC {
         this._is_processing = false;
         this._process_queue = [];
         this._current_process = null;
+        this._redirectAfterCurrentProcess = null;
 
         this._non_controller_path_prefix = '/';
         this._menu_id = 0;
@@ -58,6 +59,7 @@ export class SdcNavigatorController extends AbstractSDC {
     onLoad($html) {
         on('onNavLink', this);
         on('onNavigateToController', this);
+        on('_RedirectOnView', this);
         on('goTo', this);
         on('changeMenu', this);
         on('navigateToPage', this);
@@ -186,9 +188,7 @@ export class SdcNavigatorController extends AbstractSDC {
             }
             this._is_processing = false;
             this._updateBreadcrumb();
-            this._current_process = null;
-            let next = this._process_queue.shift();
-            if (next) this._pushState(next);
+            this._checkProcessQueue();
             this.refresh();
             return;
         }
@@ -225,6 +225,7 @@ export class SdcNavigatorController extends AbstractSDC {
 
 
     navLoaded(controller) {
+        console.log(this._current_process, controller.controller_name(), this._previous_args);
         let idx = this._history_path.length - 1;
         let last_view_array = this._preparedLastViewContainer(idx);
         last_view_array.active_container.removeClass('active loading').addClass('empty');
@@ -240,9 +241,7 @@ export class SdcNavigatorController extends AbstractSDC {
         } else {
             this._updateBreadcrumb();
             if (!this._manageDefault(last_view_array.empty_container)) {
-                let next = this._process_queue.shift();
-                this._current_process = null;
-                if (next) this._pushState(next, false);
+                this._checkProcessQueue();
             }
             setTimeout(() => {
                 this.$container.find('.header-loading').removeClass('active');
@@ -250,6 +249,23 @@ export class SdcNavigatorController extends AbstractSDC {
         }
     }
 
+    _checkProcessQueue() {
+        let next = this._process_queue.shift();
+        this._current_process = null;
+        if (next) {
+            this._pushState(next[0], next[1]);
+        } else if (this._redirectAfterCurrentProcess) {
+            const temp = this._redirectAfterCurrentProcess;
+            this._redirectAfterCurrentProcess=null;
+            this.goTo(temp);
+        }
+
+    }
+
+    _RedirectOnView($btn) {
+        this._redirectAfterCurrentProcess = $($btn).attr('href');
+    }
+
     _updateBreadcrumb() {
         this._breadcrumb.splice(this._history_path.length);
         const $breadcrumps = this.find('.breadcrumb');
@@ -508,7 +524,7 @@ export class SdcNavigatorController extends AbstractSDC {
         const $sub_container = container.find(`.${SDC_DETAIL_CONTROLLER}`);
         const df = $sub_container.data('default-controller');
         if (df) {
-            this._pushState(`.~${df}`);
+            this._pushState(`.~${df}`, false);
             return true;
         }
 
@@ -517,7 +533,7 @@ export class SdcNavigatorController extends AbstractSDC {
 
     _pushState(url, commit= true) {
         if(this._is_processing) {
-            this._process_queue.push(url);
+            this._process_queue.push([url, commit]);
             return;
         }
 

{simpledomcontrol-0.4.12 → simpledomcontrol-0.4.13}/sdc_tools/Assets/tests/sdc_tools.test.js

@@ -63,7 +63,8 @@ describe('SdcNavigator', () => {
     test('Navigate next level [A.2]', async () => {
         trigger('goTo', './sdc-dummy', {text: 'SUB DUMMY A.2'});
         await new Promise(resolve => setTimeout(resolve, 100));
-        expect(controller.find('.1_sdc_sub_detail_container.active').text().trim()).toBe('SUB DUMMY A.2');
+        let idx = controller._origin_target.length - 1
+        expect(controller.find(`.${idx}_sdc_sub_detail_container.active`).text().trim()).toBe('SUB DUMMY A.2');
     });
 
     test('Navigate next level [B]', async () => {
@@ -94,7 +95,8 @@ describe('SdcNavigator', () => {
         trigger('goTo', ['/', 'sdc-dummy'], {text: 'DUMMY B'});
         trigger('goTo', ['', 'sdc-dummy', 'sdc-dummy'], {text: 'SUB DUMMY B'});
         trigger('goTo', ['..']);
-        await new Promise(resolve => setTimeout(resolve, 100));
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        console.log(controller);
         expect(controller.find('.0_sdc_sub_detail_container.active').text().trim()).toBe('DUMMY B');
         expect(controller.find('.1_sdc_sub_detail_container.active').text().trim()).toBe('');
     });