backend-plus 1.17.6 → 1.17.7

package/for-client/my-localdb.d.ts

@@ -1,12 +1,12 @@
 import { ForeignKey, FieldDefinition } from "backend-plus";
-export declare type Key = string[];
-export declare type Stores = {
+export type Key = string[];
+export type Stores = {
     [key: string]: IDBObjectStore;
 };
-export declare type StoreDefs = {
+export type StoreDefs = {
     [key: string]: Key | string;
 };
-export declare type Record = {
+export type Record = {
     [key: string]: any;
 };
 export interface TableDefinition {
@@ -16,12 +16,12 @@ export interface TableDefinition {
     softForeignKeys?: ForeignKey[];
     fields: FieldDefinition[];
 }
-declare type RegisterResult = {
+type RegisterResult = {
     new?: true;
     dataErased?: true;
     changed: boolean;
 };
-declare type DetectFeatures = {
+type DetectFeatures = {
     needToUnwrapArrayKeys: boolean;
 };
 export declare var detectedFeatures: DetectFeatures;

package/for-client/my-localdb.js

@@ -13,7 +13,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/for-client/my-tables.js

@@ -75,6 +75,7 @@ myOwn.i18n.messages.en=changing(myOwn.i18n.messages.en, {
     lessDetails: "hide details",
     lessEqualThan:'less equal than',
     loading: "loading",
+    mandatoryFieldOmited:'mandatory fields omited: ',
     newUnsavedRow: "new unsaved row",
     notEmpty:'not empty',
     notSimilarTo:'not similar to',
@@ -144,6 +145,7 @@ myOwn.i18n.messages.es=changing(myOwn.i18n.messages.es, {
     lessDetails: "dejar de mostrar los detalles asocialdos al registro",
     lessEqualThan:'menor igual que',
     loading: "cargando",
+    mandatoryFieldOmited:'faltan campos obligatorios: ',
     newUnsavedRow: "el nuevo registro (aun no grabado)",
     notEmpty:'no vacío',
     notSimilarTo:'no contiene',
@@ -613,7 +615,7 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                     } else if (!depot) {
                         var depot = grid.createDepotFromRow(row);
                         grid.depots.push(depot);
-                        grid.sortColumns(grid.depots);
+                        grid.sortDepotsToDisplay(grid.depots);
                         grid.createRowElements(grid.depots.findIndex((myDepot)=>myDepot===depot), depot);
                         grid.updateRowData(depot);
                         depot.tick = tick
@@ -1030,13 +1032,15 @@ myOwn.DataColumnGrid.prototype.td = function td(depot, iColumn, tr, saveRow){
                 }
                 var promiseChain = Promise.resolve();
                 if (fieldDef.references) {
-                    promiseChain.then(grid.setInheritedFields(depot, function(fkDef){
-                        return fkDef.references == fieldDef.references && 
-                        fkDef.fields.find(function(field){
-                            return field.source == fieldDef.name
-                        }) &&
-                        fkDef.displayFields.length >= 0 
-                    }));
+                    promiseChain = promiseChain.then(
+                        grid.setInheritedFields(depot, function(fkDef){
+                            return fkDef.references == fieldDef.references && 
+                            fkDef.fields.find(function(field){
+                                return field.source == fieldDef.name
+                            }) &&
+                            fkDef.displayFields.length >= 0 
+                        }
+                    ));
                 }
                 promiseChain.then(function(){
                     grid.updateRowData(depot,true);
@@ -2063,7 +2067,7 @@ myOwn.TableGrid.prototype.prepareGrid = function prepareGrid(){
     grid.setInheritedFields = function(depot, filterFun){
         var promiseArray = [];
         grid.def.foreignKeys.concat(grid.def.softForeignKeys).filter(filterFun||(x=>x))
-        .filter(x=>x.noInherit && my.config.config['enhableFieldInherit']).forEach(function(fkDef){
+        .filter(x=>(x.inheritFieldsMode ?? my.config.config['inherit-fields-mode']) != 'no-inherit' ).forEach(function(fkDef){
             var fixedFields = fkDef.fields.map(function(field){
                 return {fieldName: field.target, value: depot.row[field.source]};
             })
@@ -2079,18 +2083,12 @@ myOwn.TableGrid.prototype.prepareGrid = function prepareGrid(){
             promiseArray.push(
                 myConnector.getData().then(function(data){
                     var referencedRow = data[0];
-                    grid.def.fields.forEach(function(fieldDef){
-                        var foreignFieldName =  fieldDef.references == fkDef.references ? fieldDef.referencedName : fieldDef.inherited ? fieldDef.name : null;
-                        if (referencedRow && foreignFieldName in referencedRow) {
-                            var lookupValue = referencedRow[foreignFieldName];
-                            var fieldName = fieldDef.name;
-                            if(fieldDef.inherited && !sameValue(depot.row[fieldName], lookupValue)){
-                                depot.rowPendingForUpdate[fieldName] = lookupValue;
-                            }
-                            depot.row[fieldName]=lookupValue;
-                            if(depot.rowControls[fieldName]){
-                                depot.rowControls[fieldName].setTypedValue(lookupValue);
-                            }
+                    fkDef.displayFields.forEach(function(displayFieldName){
+                        var lookupValue=referencedRow?referencedRow[displayFieldName]:null;
+                        var fieldName = fkDef.alias + '__' + displayFieldName;
+                        depot.row[fieldName]=lookupValue;
+                        if(depot.rowControls[fieldName]){
+                            depot.rowControls[fieldName].setTypedValue(lookupValue);
                         }
                     })
                 })
@@ -2281,6 +2279,10 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
                 }
                 //var cual=grid.def.fields.filter(mandatoryOmitted)
                 if(grid.def.fields.some(mandatoryOmitted)){
+                    var where = depot.actionButton.insert ?? depot.tr ?? document.getElementById('main-logo') ?? document.body;
+                    if(where){
+                        where.title = myOwn.messages.mandatoryFieldOmited + grid.def.fields.filter(mandatoryOmitted).map(f=>f.name).join(', ');
+                    }
                     return Promise.resolve(); // no grabo todavía
                 };
             }
@@ -2571,7 +2573,7 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
         }else{
             depotsToDisplay = grid.depots;
         }
-        grid.sortColumns = function sortColumns(depotsToDisplay){
+        grid.sortDepotsToDisplay = function sortDepotsToDisplay(depotsToDisplay){
             if(grid.view.sortColumns.length>0){
                 return depotsToDisplay.sort(function(depot1, depot2){ 
                     grid.view.sortColumns.forEach(function(orderColumn){
@@ -2584,7 +2586,7 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
                 });
             }
         }
-        grid.sortColumns(depotsToDisplay);
+        grid.sortDepotsToDisplay(depotsToDisplay);
         grid.displayRows = function displayRows(fromRowNumber, toRowNumber, adding){
             var grid = this;
             if(!adding){

package/for-client/my-websqldb.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="websql" />
 import { TableDefinition } from "backend-plus";
-export declare type Key = string[];
-declare type DetectFeatures = {
+export type Key = string[];
+type DetectFeatures = {
     needToCopyResults: boolean;
 };
 export declare var detectedFeatures: DetectFeatures;

package/for-client/my-websqldb.js

@@ -13,7 +13,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/lib/backend-plus.d.ts

@@ -318,7 +318,8 @@ export type TableItemDef=string|{name:string, path?:string, tableGenerator?:(con
 export interface TableDefinitions {
     [k: string]: TableDefinitionFunction
 }
-export type ClientSetup= {
+export interface ClientSetup {
+    setup:Record<string, any>
     procedures:ProcedureDef[]
 }
 export type StartOptions={
@@ -381,13 +382,14 @@ export class AppBackend{
     getMenu(context?:Context):MenuDefinition
     inDbClient<T>(req:Request|null, doThisWithDbClient:(client:Client)=>Promise<T>):Promise<T>
     inTransaction<T>(req:Request|null, doThisWithDbTransaction:(client:Client)=>Promise<T>):Promise<T>
+    inTransactionProcedureContext<T>(req:Request|null, coreFunction:(context:ProcedureContext)=>Promise<T>):Promise<T>
     procedureDefCompleter(procedureDef:ProcedureDef):ProcedureDef
     tableDefAdapt(tableDef:TableDefinition, context:Context):TableDefinition
     pushApp(dirname:string):void
     dumpDbTableFields(tableDefinition:TableDefinition):string[]
     dumpDbSchemaPartial(partialTableStructures:TableDefinitions, opts?:DumpOptions):Promise<{mainSql:string; enancePart:string}> 
     getContextForDump(): ContextForDump
-    getClientSetupForSendToFrontEnd(req:Request):ClientSetup
+    getClientSetupForSendToFrontEnd(req:Request):Promise<ClientSetup>
     configList(): (object|string)[]
     configStaticConfig():void
     setStaticConfig(defConfigYamlString:string):void

package/lib/backend-plus.js

@@ -165,6 +165,7 @@ AppBackend.prototype.configStaticConfig = function configStaticConfig(){
           skin: ""
           lang: en
           version: 1.0
+          inherit-fields-mode: display-fk
         install:
           dump:
             db:
@@ -1213,6 +1214,21 @@ AppBackend.prototype.isThisProcedureAllowed = async function(){
     return true;
 }
 
+AppBackend.prototype.inTransactionProcedureContext = function inTransactionProcedureContext(req, coreFunction, context){
+    var be = this;
+    context = context ?? be.getContext(req);
+    if(be.config.nodb){
+        return coreFunction(context);
+    }
+    if (!context.informProgress) {
+        context.informProgress = function informProgress(){}
+    }
+    return be.inTransaction(req, function(client){
+        context.client=client;
+        return coreFunction(context);
+    });
+}
+
 /** @param {boolean} forUnlogged */
 AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnlogged){ 
     var be = this;
@@ -1231,12 +1247,12 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
         be.procedure = be.procedure||{};
         be.procedures = defs;
         be.clientSetup.procedure = be.procedure;
-        app.get('/client-setup',function(req, res, next){
+        app.get('/client-setup',async function(req, res, next){
             if(forUnlogged && req.user){ 
                 // este pedido es para unlogged y está logueado, va al próximo
                 next();
             }else{
-                var clientSetup = be.getClientSetupForSendToFrontEnd(req);
+                var clientSetup = await be.getClientSetupForSendToFrontEnd(req);
                 MiniTools.serveJson(clientSetup)(req, res, next);
             }
         });
@@ -1420,7 +1436,7 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                             }
                         }
                         var context=be.getContext(req);
-                        if(true || procedureDef.progress!==false){
+                        if(procedureDef.progress!==false){
                             context.informProgress=function informProgress(progressInfo){
                                 var progress2send={};
                                 if(progressInfo instanceof Error){
@@ -1507,13 +1523,9 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                                         res.write(JSON.stringify({progress:{keepAlive:true, ts:new Date().getTime()}})+"\n")
                                     },5000)
                                 }
-                                if(be.config.nodb){
-                                    return procedureDef.coreFunction(context, params, files);
-                                }
-                                return be.inTransaction(req, function(client){
-                                    context.client=client;
+                                return be.inTransactionProcedureContext(req, function(context){
                                     return procedureDef.coreFunction(context, params, files);
-                                });
+                                }, context);
                             }).then(function(result){
                                 if (procedureDef.forExport) {
                                     return be.exportacionesGenerico(result, procedureDef, context, params, files);
@@ -2401,7 +2413,7 @@ AppBackend.prototype.procedureDefCompleter = function procedureDefCompleter(proc
     procedureDef.method=procedureDef.method||this.defaultMethod;
     procedureDef.encoding=procedureDef.encoding||'JSON4all';
     procedureDef.resultOk=procedureDef.resultOk ?? (procedureDef.forExport ? 'showDownloadUrl' : 'showText');
-    procedureDef.progress = procedureDef.progress ?? !!procedureDef.forExport;
+    procedureDef.progress = procedureDef.progress ?? (procedureDef.forExport && true);
     procedureDef.uniqueUse = procedureDef.uniqueUse ?? !!procedureDef.forExport;
     procedureDef.resultErr=procedureDef.resultErr||'showError';
     procedureDef.resultClass=procedureDef.resultClass||'result-div';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.17.6",
+  "version": "1.17.7",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -33,7 +33,7 @@
     "backend-skins": "^0.1.15",
     "best-globals": "^1.1.0",
     "big.js": "^6.2.1",
-    "body-parser": "^1.20.1",
+    "body-parser": "^1.20.2",
     "cast-error": "^0.1.0",
     "castellano": "^0.1.3",
     "connect-pg-simple": "^8.0.0",
@@ -48,7 +48,7 @@
     "js-yaml": "^4.1.0",
     "json4all": "^1.2.1",
     "lazy-some": "^0.1.0",
-    "like-ar": "^0.3.6",
+    "like-ar": "^0.3.7",
     "login-plus": "^1.7.0",
     "memorystore": "^1.6.7",
     "mini-tools": "^1.11.2",
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^10.0.1",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^18.13.0",
+    "@types/node": "^18.14.1",
     "@types/nodemailer": "^6.4.7",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
@@ -99,7 +99,7 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^19.6.3",
+    "puppeteer": "^19.7.2",
     "sinon": "^15.0.1",
     "supertest": "^6.3.3",
     "types.d.ts": "~0.6.11",