backend-plus 2.0.9 → 2.1.2

package/for-client/my-menu.js

@@ -436,19 +436,6 @@ myOwn.displayMenu = function displayMenu(layout, menu, addrParams, parents){
                     {underElement:this}
                 );
             }),
-            my.light('airplane', function(){
-                if(my.ldb && my.offline){
-                    if(my.offline.mode && !my.server.connected){
-                        promptPromise("Si desea salir del modo avión puede forzarlo").then(function(texto){
-                            if (texto == 'forzar') {
-                                my.changeOfflineMode();
-                            }
-                        });
-                    }else{
-                        my.changeOfflineMode();
-                    }
-                }
-            }, {hidden:true})
         ]));
         elements.push(status);
     }
@@ -501,9 +488,6 @@ myOwn.displayMainMenu = function(addrParams){
         }
     }
     setTimeout(my.doMenuRealigns,10);
-    setTimeout(function(){
-        my.offlineModeRefresh();
-    },10);
     return menu;
 };
 
@@ -547,84 +531,9 @@ myOwn.informDetectedStatus = function informDetectedStatus(statusCode, logged) {
     }
 }
 
-myOwn.setOnlineOfflineUrl = function setOnlineOfflineUrl(){
-    var actualHref=location.href;
-    var hrefSplit = actualHref.split(my.menuSeparator)
-    var newHref = my.offline.mode?'ext':my.menuName;
-    newHref = (hrefSplit.length > 1)?newHref+my.menuSeparator+hrefSplit[1]:newHref;
-    history.pushState(null, null, newHref);
-}
-
-myOwn.offlineModeRefresh = function offlineModeRefresh(){
-    var my=this;
-    /** @type {HTMLImageElement} */
-    // @ts-ignore
-    var imgLight = document.getElementById('light-airplane');
-    if (imgLight != null) {
-        var skin=((my.config||{}).config||{}).skin;
-        if(my.offline.mode){
-            imgLight.src=my.path.img+'airplane-on.png';
-        }else{
-            imgLight.src=my.path.img+'airplane-off.png';
-        }
-    }
-}
-
-myOwn.changeOfflineMode = function changeOfflineMode(){
-    my.offline.mode=!my.offline.mode;
-    my.offlineModeRefresh();
-    my.setOnlineOfflineUrl();
-    if(my.offline.mode){
-        var fkToStoreData = [];
-        var promiseArray1 = [];
-        var promiseChain = my.ldb.getAllStructures().then(function(tablesDef){
-            tablesDef.forEach(function(tableDef){
-                promiseArray1.push(
-                    my.ldb.isEmpty(tableDef.name).then(function(isEmpty){
-                        if(!isEmpty){
-                            var fkToStoreSearch = tableDef.foreignKeys.filter(function(fk){
-                                return fk.fields.find(function(field){
-                                    return !tableDef.primaryKey.includes(field.source)
-                                })
-                            });
-                            fkToStoreData = fkToStoreData.concat(fkToStoreSearch);
-                        }
-                    })
-                );
-            });
-        });
-        var promiseArray2 = [];
-        promiseChain = promiseChain.then(function(){
-            return Promise.all(promiseArray1).then(function(){
-                return fkToStoreData.forEach(function(fk){
-                    var conn = new my.TableConnector({tableName: fk.references, my:my});
-                    var opts = { registerInLocalDB: false };
-                    conn.getStructure(opts)
-                    promiseArray2.push(
-                        Promise.resolve().then(function(){
-                            return conn.getData().then(function(rows){
-                                return my.ldb.putMany(fk.references, rows)
-                            })
-                        })
-                    );
-                });
-            });
-        });
-        promiseChain = promiseChain.then(function(){
-            Promise.all(promiseArray2).then(function(){
-                location.reload();
-            })
-        });
-    }else{
-        my.showPage();
-        location.reload();
-    }
-}
-
 window.addEventListener('popstate', function(){
     if(!my.config){
         my.autoSetup().then(function(){
-            my.setOnlineOfflineUrl();
             my.showPage();
         })
     }else{
@@ -635,13 +544,9 @@ window.addEventListener('popstate', function(){
 window.addEventListener('load', function(){
     window.my = myOwn;
     my.autoSetup().then(function(){
-        my.setOnlineOfflineUrl();
         my.showPage();
     })
     document.body.appendChild(html.div({id:'cached-images'},[
-        html.img({src:my.path.img+'airplane-on.png'}),
-        html.img({src:my.path.img+'airplane-off.png'}),
-        html.img({src:my.path.img+'airplane.png'}),
         html.img({src:my.path.img+'server.png'}),
         html.img({src:my.path.img+'network-signal.png'}),
         html.img({src:my.path.img+'server-error.png'}),

package/lib/backend-plus.d.ts

@@ -367,6 +367,7 @@ export interface OptsClientPage {
     extraFiles?:ClientModuleDefinition[]
     icon?:string
     icons?:Record<string,string>
+    baseUrlForRelativePaths?:boolean
 }
 
 export type DumpOptions={complete?:boolean, skipEnance?:boolean, disableDBFunctions?:boolean}
@@ -479,6 +480,7 @@ export interface AppConfig {
         delay: number                      // msec avg random delay in API responses (to emulate slow nets)
         "cache-content": boolean           // if the cache header must be sent to the client (when no devel config the default is true)
         forceShowAsEditable: boolean       // force "editable" behavior in grids 
+        "tests-can-delete-db": boolean
     }
     mailer: {                              // config to send mails
         conn: string                       // connection string

package/lib/backend-plus.js

@@ -2240,11 +2240,13 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
     if(offlineMode){
         cssList.push('css/offline-mode.css');
     }
+    cssList = cssList.concat((opts.extraFiles ?? []).filter((extraFile)=>extraFile.type == 'css').map((extraFile)=>extraFile.file));
     return html.html(attr,[
         html.head([
             html.title(be.config["client-setup"]?.title),
             html.meta({charset:"utf-8"}),
             viewportAttrs?html.meta(viewportAttrs):null,
+            opts.baseUrlForRelativePaths?html.base({href:`${be.config.server["base-url"]}/`}):null,
             html.link({href: opts.icons.iconShortcut , rel: "shortcut icon", type: "image/png"}),
             html.link({href: opts.icons.icon         , rel: "icon", type: "image/png"}),
             html.link({href: opts.icons.iconApple    , rel: "apple-touch-icon"}),
@@ -2268,7 +2270,9 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
                 html.div(be.messages.unlogged.loading),
                 req.useragent.os=='iOS'&&req.useragent.version.split('.')[0]<9?html.div(`La versión del dispositivo ${req.useragent.version} no es compatible`):null
             ]),
-            html.div({id: "total-scripts"}, be.clientModules(req,opts).scripts.map(function(scriptDef){
+            html.div({id: "total-scripts"}, be.clientModules(req,opts).scripts.concat(
+                (opts?.extraFiles ?? []).filter((extraFile)=>be.esJavascript(extraFile.type)).map((extraFile)=>({...extraFile,type:null}))
+            ).map(function(scriptDef){
                 return html.script(scriptDef);
             }).concat([html.script({src:'client/menu.js'})]))
         ]),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.9",
+  "version": "2.1.2",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",

package/unlogged/my-ajax.js

@@ -527,7 +527,9 @@ function containsObjectsWithTheSameColumns(o){
     if (!keys.length) return false;
     var separator = Math.random();
     var colNamesFirstObject = Object.keys(o[keys[0]]).join(separator);
-    return !keys.find(k => o[k] == null || !(o[k] instanceof Object) || Object.keys(o[k]).join(separator) != colNamesFirstObject);
+    return !keys.find(k => 
+        o[k] == null || !(o[k] instanceof Object) || Object.keys(o[k]).join(separator) != colNamesFirstObject
+    );
 }
 /* test
 var cases = [
@@ -550,7 +552,7 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
         return ;
     }
     if(typeof o == "object" && !(o instanceof Date) && !o.isRealDateTime){
-        if((o instanceof Array && o[0] || containsObjectsWithTheSameColumns(o)) && o[0] instanceof Object && !(o[0] instanceof Array) && !(o[0].isRealDateTime)){
+        if((o instanceof Array && o[0] && o[0] instanceof Object && !(o[0] instanceof Array) && !(o[0].isRealDateTime) || containsObjectsWithTheSameColumns(o)) ){
             var table = document.createElement('table');
             div.appendChild(table);
             var titleRow = table.insertRow(-1);