backend-plus 1.14.6 → 1.14.10

package/for-client/my-menu.js

@@ -286,15 +286,6 @@ myOwn.showPage = function showPage(pageDef){
     }
 };
 
-myOwn.menuName = 'menu';
-myOwn.menuSeparator = '#';
-Object.defineProperty(myOwn, 'menup', {
-    get:function(){
-        var menuName = my.offline.mode?'ext':this.menuName;
-        return menuName+this.menuSeparator; 
-    }
-});
-
 myOwn.getHRef = function getHRef(menu){
     var href;
     if(!menu.w && menu.menuType){
@@ -363,33 +354,6 @@ myOwn.createForkeableButton = function createForkeableButton(menu, opts){
     return button;
 };
 
-function encodeMinimalURIComponent(text){
-    return (text+'')
-        .replace(/\=/g, '%3D')
-        .replace(/\?/g, '%3F')
-        .replace(/\#/g, '%23')
-        .replace(/&/g, '%26')
-        .replace(/%/g, '%25');
-}
-
-myOwn.paramsToUriPart = function paramsToUriPart(params, inMenu){
-    var paramStr=likeAr(params).map(function(value, name){
-		var paramDef=myOwn.UriSearchToObjectParams[name] || { encode:function(x){return x}, varName:name };
-		if((paramDef.showInMenu || !inMenu) && !paramDef.hide || (params.showParams && params.showParams.includes(name))){
-			if(value!=null){
-                value=paramDef.encode(value, params);
-				return (paramDef.varName||name)+'='+encodeMinimalURIComponent(value);
-			}
-		}
-    }).filter(function(expr){return expr;}).join('&');
-	return paramStr;
-}
-
-myOwn.replaceAddrParams = function replaceAddrParams(params){
-    var my=this;
-    history.replaceState(null, null, my.menup+my.paramsToUriPart(params));
-}
-
 myOwn.light = function light(name, onclick, opts){
     var skin=((this.config||{}).config||{}).skin;
     var skinUrl=(skin?skin+'/':'');

package/for-client/my-tables.js

@@ -2717,6 +2717,9 @@ myOwn.getReference = function getReference(referenceName, opts){
         getLabel: function getLabel(row){
             return this.getLabels(row).join(', ');
         },
+        getImage: function getImage(row){
+            return row.image?'img/'+row.image:'';
+        },
         fixedFields:[]
     },opts||{});
     var reference={};
@@ -2742,6 +2745,7 @@ myOwn.getReference = function getReference(referenceName, opts){
             reference.getValue = opts.getValue;
             reference.getLabels = opts.getLabels;
             reference.getLabel = opts.getLabel;
+            reference.getImage = opts.getImage;
             return rows;
         });
         reference=my.references[referenceName]={
@@ -2854,7 +2858,8 @@ myOwn.ExpanderReferences={
             var menu=rows.map(function(row){
                 return {
                     value:reference.getValue(row),
-                    labels:reference.getLabels(row,true)
+                    labels:reference.getLabels(row,true),
+                    img:reference.getImage(row)
                 };
             });
             if(typeInfo.nullable){

package/for-client/my-things.js

@@ -804,16 +804,6 @@ myOwn.captureKeys = function captureKeys() {
     });
 };
 
-myOwn.getRect = function getRect(element){
-    var rect = {top:0, left:0, width:element.offsetWidth, height:element.offsetHeight};
-    while( element != null ) {
-        rect.top += element.offsetTop;
-        rect.left += element.offsetLeft;
-        element = element.offsetParent;
-    }
-    return rect;
-}
-
 // myOwn.quitarLupa = function quitarLupa(){
 //     if(document.buttonLupa){
 //         document.body.removeChild(document.buttonLupa);

package/lib/backend-plus.js

@@ -581,7 +581,7 @@ AppBackend.prototype.start = function start(opts){
             console.log("==============================================");
             console.log("ERROR controling not index.* in privates paths");
             console.log(err);
-            process.exit();
+            process.exit(1);
         });
     });
     /** @type {Express.Application} */
@@ -1092,7 +1092,7 @@ AppBackend.prototype.start = function start(opts){
         }
         if(err.dumping){
             console.log('error dumping db');
-            process.exit(0);
+            process.exit(1);
         }
         var mailDeAvisoDeFalla = be.sendMail({
             to: be.config.mailer?.supervise?.to,
@@ -1114,7 +1114,7 @@ AppBackend.prototype.start = function start(opts){
         },function(){
             console.log('no pudo avisarse por mail')
         }).finally(function(){
-            process.exit(-1);
+            process.exit(1);
         });
     });
 };
@@ -2699,7 +2699,8 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
     }
     var enancePart= 'do $SQL_ENANCE$\n begin\n' + enanceLines.join('\n')+'\n' + 'end\n$SQL_ENANCE$;';
     var someNotFound=false;
-    return Promise.all(Object.keys(partialTableStructures).map(function(tableName,i){
+    return Promise.all(likeAr(partialTableStructures).map(function(tableDef, tableName, _, i){
+        if(tableDef?.sql?.isTable === false) return;
         // TODO: buscar
         var buscarEn=[Path.join('local-install',tableName+'.tab')].concat(
             be.appStack.map(function(stackNode){
@@ -2798,7 +2799,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 throw err;
             }
         });
-    })).then(function(){
+    }).array()).then(function(){
         if(someNotFound){
             console.log('silence "skipping content" messages in "local-config.yaml".install.dump.skip-content=true');
         }

package/lib/table-def-adapt.js

@@ -264,7 +264,7 @@ function tableDefAdapt(tableDef, context){
             fkDef.displayFields = fkDef.displayAllFields?
                 (fkTableDef.fields.filter(fd=>fd.visible && !fd.clientSide && !resultTableDef.field[fd.name] && !fd.inJoin && !fkTableDef.sql.fields[fd.name]).map(fd=>fd.name)): //EVALUAR SI ESTÁ BIEN COMENTARLO
                 fkDef.displayFields || fkTableDef.nameFields;
-            resultTableDef.sql.from += '\n    left join ' + fkTableDef.sql.fromWoAs + ' as ' + fkDef.alias + ' on ' +
+            resultTableDef.sql.from += '\n    left join ' + fkTableDef.sql.fromWoAs + ' as ' + be.db.quoteIdent(fkDef.alias) + ' on ' +
                 fkDef.fields.map(function(pair){
                     lastSourceField = pair.source;
                     return be.db.quoteIdent(resultTableDef.alias)+'.'+be.db.quoteIdent(pair.source)
@@ -345,11 +345,11 @@ tableDefAdapt.forInsertOnly = function forInsertOnly(tableDef){
         tableDef.fields.sort(bestGlobals.compareForOrder([{column:'orderForInsertOnly'}]))
         tableDef.sql.select = tableDef.fields.map(function(fieldDef){
             var typer=TypeStore.typerFrom(fieldDef);
-            return (fieldDef.inTable===false || fieldDef.inJoin) && tableDef.sql.fields[fieldDef.name] ?"null::"+typer.typeDbPg+" as "+JSON.stringify(fieldDef.name):(
+            return (fieldDef.inTable===false || fieldDef.inJoin) && tableDef.sql.fields[fieldDef.name] ?"null::"+typer.typeDbPg+" as "+be.db.quoteIdent(fieldDef.name):(
                 fieldDef.referencedName?(
-                    JSON.stringify(fieldDef.referencedAlias)+"."+JSON.stringify(fieldDef.referencedName)+" as "+JSON.stringify(fieldDef.name)
+                    be.db.quoteIdent(fieldDef.referencedAlias)+"."+be.db.quoteIdent(fieldDef.referencedName)+" as "+be.db.quoteIdent(fieldDef.name)
                 ):(
-                    JSON.stringify(tableDef.alias)+"."+JSON.stringify(fieldDef.name)
+                    be.db.quoteIdent(tableDef.alias)+"."+be.db.quoteIdent(fieldDef.name)
                 )
             );
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.14.6",
+  "version": "1.14.10",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -30,7 +30,7 @@
   "dependencies": {
     "ajax-best-promise": "^0.3.7",
     "backend-skins": "^0.1.15",
-    "best-globals": "^1.0.1",
+    "best-globals": "^1.0.2",
     "big.js": "^6.1.1",
     "body-parser": "^1.19.1",
     "cast-error": "^0.1.0",
@@ -70,27 +70,27 @@
     "stylus": "^0.56.0",
     "type-store": "^0.2.41",
     "typed-controls": "^0.10.0",
-    "xlsx": "^0.17.4",
+    "xlsx": "^0.17.5",
     "xlsx-style": "^0.8.13"
   },
   "devDependencies": {
     "@types/big.js": "^6.1.2",
     "@types/expect.js": "~0.3.29",
     "@types/express": "^4.17.13",
-    "@types/express-useragent": "^1.0.1",
+    "@types/express-useragent": "^1.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^9.0.0",
     "@types/nodemailer": "^6.4.4",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^17.0.6",
+    "@types/node": "^17.0.8",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
     "@types/stack-trace": "~0.0.29",
     "@types/websql": "~0.0.27",
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
-    "karma": "6.3.9",
+    "karma": "6.3.11",
     "karma-chrome-launcher": "^3.1.0",
     "karma-expect": "^1.1.3",
     "karma-firefox-launcher": "^2.1.2",
@@ -101,7 +101,7 @@
     "nyc": "^15.1.0",
     "puppeteer": "^13.0.1",
     "sinon": "^12.0.1",
-    "supertest": "^6.1.6",
+    "supertest": "^6.2.1",
     "types.d.ts": "~0.6.6",
     "typescript": "^4.5.4",
     "why-is-node-running": "^2.2.0"

package/unlogged/my-ajax.js

@@ -609,6 +609,52 @@ myAjax.UriSearchToObject = function UriSearchToObject(locationSearch){
     return addrParams;
 }
 
+myAjax.replaceAddrParams = function replaceAddrParams(params){
+    var my=this;
+    history.replaceState(null, null, my.menup+my.paramsToUriPart(params));
+}
+
+function encodeMinimalURIComponent(text){
+    return (text+'')
+        .replace(/\=/g, '%3D')
+        .replace(/\?/g, '%3F')
+        .replace(/\#/g, '%23')
+        .replace(/&/g, '%26')
+        .replace(/%/g, '%25');
+}
+
+myAjax.paramsToUriPart = function paramsToUriPart(params, inMenu){
+    var paramStr=likeAr(params).map(function(value, name){
+		var paramDef=myOwn.UriSearchToObjectParams[name] || { encode:function(x){return x}, varName:name };
+		if((paramDef.showInMenu || !inMenu) && !paramDef.hide || (params.showParams && params.showParams.includes(name))){
+			if(value!=null){
+                value=paramDef.encode(value, params);
+				return (paramDef.varName||name)+'='+encodeMinimalURIComponent(value);
+			}
+		}
+    }).filter(function(expr){return expr;}).join('&');
+	return paramStr;
+}
+
+myAjax.getRect = function getRect(element){
+    var rect = {top:0, left:0, width:element.offsetWidth, height:element.offsetHeight};
+    while( element != null ) {
+        rect.top += element.offsetTop;
+        rect.left += element.offsetLeft;
+        element = element.offsetParent;
+    }
+    return rect;
+}
+
+myAjax.menuName = 'menu';
+myAjax.menuSeparator = '#';
+Object.defineProperty(myOwn, 'menup', {
+    get:function(){
+        var menuName = my.offline.mode?'ext':this.menuName;
+        return menuName+this.menuSeparator; 
+    }
+});
+
 return myAjax;
 
 });