sdc_client 0.57.11 → 0.57.14

package/src/simpleDomControl/sdc_socket.js

@@ -71,7 +71,6 @@ const ModelProxyHandler = {
 }
 
 
-
 function parse_hidden_inputs(value) {
 
     let isFloatReg = /^-?\d+\.?\d+$/;
@@ -97,7 +96,6 @@ function parse_hidden_inputs(value) {
 }
 
 
-
 export class Model {
     /**
      *
@@ -105,6 +103,7 @@ export class Model {
      * @param model_query {json}
      */
     constructor(model_name, model_query = {}) {
+        this._onNoOpenRequests = [];
         this.values_list = [];
         this.values = {};
         this.model_name = model_name;
@@ -180,7 +179,7 @@ export class Model {
         });
     }
 
-    listView(filter = {}, cb_resolve = null, cb_reject = null) {
+    listView(filter = {}, cb_resolve = null, cb_reject = null, template_context = {}) {
         let $div_list = $('<div class="container-fluid">');
         this.isConnected().then(() => {
             const id = uuidv4();
@@ -191,7 +190,8 @@ export class Model {
                 args: {
                     model_name: this.model_name,
                     model_query: this.model_query,
-                    filter: filter
+                    filter,
+                    template_context
                 }
             }));
 
@@ -208,7 +208,8 @@ export class Model {
         return $div_list;
     }
 
-    detailView(pk = -1, cb_resolve = null, cb_reject = null) {
+    detailView(pk = null, cb_resolve = null, cb_reject = null, template_context = {}) {
+        pk = pk ?? -1;
         pk = parseInt(pk);
         if (isNaN(pk)) {
             pk = -1;
@@ -234,7 +235,8 @@ export class Model {
                 args: {
                     model_name: this.model_name,
                     model_query: this.model_query,
-                    pk: pk
+                    pk,
+                    template_context
                 }
             }));
 
@@ -623,7 +625,7 @@ export class Model {
         if (data.is_error) {
             if (this.open_request.hasOwnProperty(data.event_id)) {
                 this.open_request[data.event_id][1](data);
-                delete this.open_request[data.event_id];
+                this._closeOpenRequest(data.event_id);
             }
             if (data.msg || data.header) {
                 trigger('pushErrorMsg', data.header || '', data.msg || '');
@@ -631,7 +633,7 @@ export class Model {
 
             if (data.type === 'connect') {
                 this.open_request['_connecting_process'][1](data);
-                delete this.open_request['_connecting_process'];
+                this._closeOpenRequest('_connecting_process');
                 this._auto_reconnect = false;
                 this.socket.close();
             }
@@ -645,7 +647,7 @@ export class Model {
                 this._is_connected = true;
                 this._is_conneting_process = false;
                 this.open_request['_connecting_process'][0](data);
-                delete this.open_request['_connecting_process'];
+                this._closeOpenRequest('_connecting_process');
             } else if (data.type === 'load') {
                 const json_res = JSON.parse(data.args.data);
                 this.values_list = [];
@@ -675,11 +677,30 @@ export class Model {
 
             if (this.open_request.hasOwnProperty(data.event_id)) {
                 this.open_request[data.event_id][0](data);
-                delete this.open_request[data.event_id];
+                this._closeOpenRequest(data.event_id);
             }
         }
     }
 
+    noOpenRequests() {
+        return new Promise(resolve => {
+            if (Object.keys(this.open_request).length === 0) {
+                return resolve();
+            }
+
+            this._onNoOpenRequests.push(resolve);
+        });
+    }
+
+    _closeOpenRequest(event_id) {
+        delete this.open_request[event_id];
+        if (Object.keys(this.open_request).length === 0) {
+            this._onNoOpenRequests.forEach(x => x());
+            this._onNoOpenRequests = [];
+        }
+
+    }
+
     _connectToServer() {
         return new Promise((resolve) => {
 

package/src/simpleDomControl/sdc_test_utils.js

@@ -1,20 +1,22 @@
 /**
  * @jest-environment jsdom
  */
+;
 
-import {app} from './sdc_main.js';
-let spy, _originAjax;
+import {app} from './sdc_main.js'
+
+let spy = [], _originAjax;
 
 function setDefaults() {
-    if(!jest) throw new Error("JEST is not defined");
-    if(!spy) {
+    if (!jest) throw new Error("JEST is not defined");
+    if (spy.length === 0) {
         _originAjax = $.ajax.bind($);
 
-        spy = jest.spyOn(
+        spy.push(jest.spyOn(
             $,
             'ajax'
-        );
-        spy.mockImplementation(function (a) {
+        ));
+        spy[0].mockImplementation(function (a) {
             return _originAjax(a).then((html) => {
                 return html;
             }).catch((html) => {
@@ -50,9 +52,10 @@ export function getCsrfToken() {
 /**
  *
  * @param html{string} HTML: .
+ * @param afterLifecycle{bool} Lifecycle Methode -> Reruns the controller after the root controller has run the "onRefresh" methode. This is optional.
  * @returns {Promise<Array<{AbstractSDC}>>}
  */
-export async function controllerFromTestHtml(html) {
+export async function controllerFromTestHtml(html, afterLifecycle = null) {
     setDefaults();
     const $body = $('body');
     app.updateJquery();
@@ -61,7 +64,28 @@ export async function controllerFromTestHtml(html) {
     app.cleanCache();
     await app.init_sdc();
 
-    return app.rootController.iterateAllChildren();
+
+    let children = app.rootController.iterateAllChildren();
+
+    if (!afterLifecycle) {
+        return children
+    }
+
+    const origenRefresh = children[0].onRefresh;
+
+    const refreshSpy = jest.spyOn(
+        children[0],
+        'onRefresh'
+    );
+
+    return new Promise((resolve) => {
+        refreshSpy.mockImplementation(function () {
+            refreshSpy.mockRestore();
+            const res = origenRefresh.apply(children[0], arguments);
+            resolve(children);
+            return res;
+        });
+    });
 }
 
 /**
@@ -72,7 +96,7 @@ export async function controllerFromTestHtml(html) {
  * @param origen_html{string} HTML: Mocked content of the content in your target HTML container.
  * @returns {Promise<{AbstractSDC}>}
  */
-export async function get_controller( tag_name, init_arguments = {}, origen_html = '') {
+export async function get_controller(tag_name, init_arguments = {}, origen_html = '') {
     setDefaults();
     const $body = $('body');
     app.updateJquery();

package/src/simpleDomControl/sdc_utils.js

@@ -56,6 +56,7 @@ export function tagNameToCamelCase(str) {
     str = str.replace(/-./g, letter => `${letter[1].toUpperCase()}`);
     return str;
 }
+
 export function tagNameToReadableName(str) {
     str = str.replace(/-./g, letter => ` ${letter[1].toUpperCase()}`).replace(/^./g, letter => `${letter.toUpperCase()}`);
     return str;
@@ -83,31 +84,42 @@ const copyProps = (targetClass, sourceClass) => {
 
 /**
  *
- * @param {AbstractSDC} baseClass
- * @param {AbstractSDC} mixins
- * @returns {AbstractSDC}
+ * @param {typeof AbstractSDC} baseClass
+ * @param {typeof AbstractSDC} mixins
+ * @returns {typeof AbstractSDC}
  */
 export function agileAggregation(baseClass, ...mixins) {
 
-    let base = class _Combined {
-        constructor(..._args) {
-            let _mixins = {};
-            mixins.forEach((mixin) => {
-                let newMixin;
-                Object.assign(this, (newMixin = new mixin()));
-                newMixin._tagName = mixin.prototype._tagName;
-                newMixin._isMixin = true;
-                _mixins[mixin.name] = newMixin;
-            });
+    let base = {
+        [baseClass.name]: class {
+            constructor(..._args) {
+                let _mixins = {};
+                mixins.forEach((mixin) => {
+                    let newMixin;
+                    Object.assign(this, (newMixin = new mixin()));
+                    newMixin._tagName = mixin.prototype._tagName;
+                    newMixin._isMixin = true;
+                    _mixins[mixin.name] = newMixin;
+                });
+
+                Object.assign(this, new baseClass());
+                this._mixins = _mixins;
+            }
 
-            Object.assign(this, new baseClass());
-            this._mixins = _mixins;
-        }
 
-        get mixins() {
-            return this._mixins;
+            static get name() {
+                return baseClass.name;
+            }
+
+            static className() {
+                return this.name
+            }
+
+            get mixins() {
+                return this._mixins;
+            }
         }
-    };
+    }[baseClass.name];
 
     copyProps(base, baseClass);
 
@@ -141,7 +153,7 @@ export function uploadFileFormData(formData, url, method) {
         cache: false,
         contentType: false,
         processData: false,
-        beforeSend: function(xhr, settings) {
+        beforeSend: function (xhr, settings) {
             if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
                 xhr.setRequestHeader("X-CSRFToken", window.CSRF_TOKEN);
             }
@@ -171,8 +183,8 @@ export function checkIfParamNumberBoolOrString(paramElement, controller = null)
         return paramElement;
     }
 
-    if(controller && typeof controller[paramElement] !== 'undefined') {
-        if(typeof controller[paramElement] === 'function') {
+    if (controller && typeof controller[paramElement] !== 'undefined') {
+        if (typeof controller[paramElement] === 'function') {
             return controller[paramElement].bind(controller);
         }
         return controller[paramElement];
@@ -213,7 +225,7 @@ export function clearErrorsInForm($form) {
 }
 
 export function setErrorsInForm($form, $resForm) {
-    $resForm  = $('<div>').append($resForm);
+    $resForm = $('<div>').append($resForm);
 
     $form.find('.has-error').removeClass('has-error').find('.alert-danger').safeRemove();
     $form.find('.non-field-errors').safeRemove();
@@ -233,4 +245,14 @@ export function setErrorsInForm($form, $resForm) {
     });
 
     return hasNoError;
-}
+}
+
+export function jqueryInsertAt($container, index, $newElement) {
+    let lastIndex = $container.children().size();
+    if (index < lastIndex) {
+        $container.children().eq(index).before($newElement);
+    } else {
+        $container.append($newElement);
+    }
+    return this;
+}