backend-plus 1.14.4 → 1.14.8

package/for-client/my-menu.js

@@ -209,52 +209,6 @@ myOwn.wScreens.path = function(addrParams){
     window.location.href='.'+addrParams.path;
 }
 
-myOwn.UriSearchToObject = function UriSearchToObject(locationSearch){
-    var parts=locationSearch.split('&');
-    var addrParams={}
-    parts.forEach(function(pair,i){
-        if(pair[0]==='#'){
-            pair=pair.substr(1);
-        }
-        if(pair[0]==='?'){
-            pair=pair.substr(1);
-        }
-        var eq = pair.indexOf('=');
-        if(eq !== -1){
-            var varName=pair.substr(0, eq);
-            var value = decodeURIComponent(pair.substr(eq+1));
-			var paramDef=myOwn.UriSearchToObjectParams[varName];
-			if(paramDef && paramDef.decode){
-				value = paramDef.decode(value);
-			}
-            addrParams[varName] = value;
-            if(!i){
-                Object.defineProperty(addrParams,'_firstParameterName',{value:varName, writable:false, enumerable:false});
-            }
-        }
-    });
-    return addrParams;
-}
-
-function noChange(x){ return x; }
-
-myOwn.UriSearchToObjectParams={
-	i                :{ showInMenu:true , encode:function(value,menu){ return menu.name?(menu.parents||[]).concat(menu.name).join(','):value }},
-	fc               :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
-	ff               :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
-	up               :{                   encode:function(x){ return json4all.stringify(x); }, decode:function(x){ return json4all.parse(x)}  },
-	pf               :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
-	today            :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return bestGlobals.date.iso((x+'').substr(0,10))}  },
-	section          :{ showInMenu:true , encode:noChange                                , decode:noChange          },
-	directUrl        :{ hide:true       },
-	selectedByDefault:{ hide:true       },
-	showParams       :{ hide:true       },
-    parents          :{ hide:true       },
-    button           :{ hide:true       },
-    fixedFields      :{ varName:'ff'    , encode:function(pairs){ return JSON.stringify(likeAr.toPlainObject(pairs, 'fieldName')); }},
-	detailing        :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
-}
-
 myOwn.preDisplayPage = function preDisplayPage(addrParams, wScreen, w){
     var my = this;
     var pageTitle = wScreen.pageTitle || addrParams.pageTitle || addrParams.title || addrParams.name || my.config.config.title;

package/for-client/my-tables.js

@@ -1056,7 +1056,7 @@ myOwn.DetailColumnGrid.prototype.td = function td(depot, iColumn, tr){
     detailControl.img = html.img({
         src:my.path.img+'detail-unknown.png',
         alt:'DETAIL',
-        title:my.messages.details
+        title:detailTableDef.label||my.messages.details
     }).create();
     var menuRef={w:'table', table:detailTableDef.table};
     var calculateFixedFields = function(){
@@ -1162,7 +1162,7 @@ myOwn.DetailColumnGrid.prototype.td = function td(depot, iColumn, tr){
         }else{
             detailControl.img.src=my.path.img+'detail-expand.png';
             detailControl.img.alt="[+]";
-            detailControl.img.title=my.messages.details;
+            detailControl.img.title=detailTableDef.label||my.messages.details;
             if(detailControl.tr){
                 grid.my.fade(detailControl.tr, {smooth:{spans:spansForSmooth, content:detailControl.divDetail}});
                 depot.detailRows = depot.detailRows.filter(function(tr){ return tr!==detailControl.tr;});
@@ -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/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/procedures-table.js

@@ -910,7 +910,7 @@ ProcedureTables = [
                                 return aux.fieldName === field.name;
                             });
                             if(prefilledField && prefilledField.value != value){
-                                throw new Error(be.messages.server.prefilledField1IsInConflictWithImportedField.replace('$1',prefilledField.fieldName);
+                                throw new Error(be.messages.server.prefilledField1IsInConflictWithImportedField.replace('$1',prefilledField.fieldName));
                             }
                             if(field.isPk){
                                 primaryKeyValues[field.isPk-1]=value;

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.4",
+  "version": "1.14.8",
   "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

@@ -563,6 +563,52 @@ myAjax.agregar_json=agregar_json;
 // require.paths=require.paths||{}
 // require.paths.vs = '../node_modules/monaco-editor/min/vs';
 
+function noChange(x){ return x; }
+
+myAjax.UriSearchToObjectParams={
+	i                :{ showInMenu:true , encode:function(value,menu){ return menu.name?(menu.parents||[]).concat(menu.name).join(','):value }},
+	fc               :{                   encode:function(x){ return JSON.stringify(x); }, U:function(x){ return JSON.parse(x)}  },
+	ff               :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
+	up               :{                   encode:function(x){ return json4all.stringify(x); }, decode:function(x){ return json4all.parse(x)}  },
+	pf               :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
+	today            :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return bestGlobals.date.iso((x+'').substr(0,10))}  },
+	section          :{ showInMenu:true , encode:noChange                                , decode:noChange          },
+	directUrl        :{ hide:true       },
+	selectedByDefault:{ hide:true       },
+	showParams       :{ hide:true       },
+    parents          :{ hide:true       },
+    button           :{ hide:true       },
+    fixedFields      :{ varName:'ff'    , encode:function(pairs){ return JSON.stringify(likeAr.toPlainObject(pairs, 'fieldName')); }},
+	detailing        :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
+}
+
+myAjax.UriSearchToObject = function UriSearchToObject(locationSearch){
+    var parts=locationSearch.split('&');
+    var addrParams={}
+    parts.forEach(function(pair,i){
+        if(pair[0]==='#'){
+            pair=pair.substr(1);
+        }
+        if(pair[0]==='?'){
+            pair=pair.substr(1);
+        }
+        var eq = pair.indexOf('=');
+        if(eq !== -1){
+            var varName=pair.substr(0, eq);
+            var value = decodeURIComponent(pair.substr(eq+1));
+			var paramDef=myOwn.UriSearchToObjectParams[varName];
+			if(paramDef && paramDef.decode){
+				value = paramDef.decode(value);
+			}
+            addrParams[varName] = value;
+            if(!i){
+                Object.defineProperty(addrParams,'_firstParameterName',{value:varName, writable:false, enumerable:false});
+            }
+        }
+    });
+    return addrParams;
+}
+
 return myAjax;
 
 });