backend-plus 2.0.0-beta.1 → 2.0.0-beta.10

package/for-client/my-menu.js

@@ -67,7 +67,7 @@ myOwn.wScreens.table = function(addrParams){
 myOwn.wScreens.procAux = {
     showParams:function(formDef, main_layout, addrParams, mainAction){
         var autoproced = addrParams.autoproced || false
-        addrParams.up=addrParams.up||{};
+        addrParams.up=addrParams.up||addrParams.ff||{};
         var params=addrParams.up;
         // var button = html.button(formDef.proceedLabel||my.messages.proceed).create();
         var label = formDef.proceedLabel||my.messages.proceed;

package/for-client/my-tables.js

@@ -284,6 +284,8 @@ myOwn.getStructuresToRegisterInLdb = function getStructuresToRegisterInLdb(paren
     return promiseChain;
 }
 
+myOwn.skipInFixedFields = Symbol("skipInFixedFields");
+
 myOwn.TableConnector = function(context, opts){
     var connector = this;
     for(var attr in context){
@@ -293,7 +295,7 @@ myOwn.TableConnector = function(context, opts){
     connector.fixedFields = connector.opts.fixedFields || [];
     connector.fixedField = {};
     connector.fixedFields.forEach(function(pair){
-        if(!pair.range){
+        if(!pair.range && pair.value != myOwn.skipInFixedFields){
             connector.fixedField[pair.fieldName] = pair.value;
         }
     });
@@ -442,7 +444,7 @@ myOwn.TableConnectorLocal = function(context, opts){
     connector.fixedFields = connector.opts.fixedFields || [];
     connector.fixedField = {};
     connector.fixedFields.forEach(function(pair){
-        if(!pair.range){
+        if(!pair.range && pair.value != myOwn.skipInFixedFields){
             connector.fixedField[pair.fieldName] = pair.value;
         }
     });
@@ -573,7 +575,6 @@ myOwn.setTimeStamp = function setTimeStamp(row){
 
 myOwn.skipTimeStamp = function skipTimeStamp(row, timeStamp){
     var skip = (row[TIME_STAMP_PROP] || 0) > timeStamp;
-    console.log(skip ? 'SKIP' : 'PASS', timeStamp, row[TIME_STAMP_PROP], JSON4all.toUrl(row))
     if (!skip) row[TIME_STAMP_PROP] = timeStamp;
     return skip;
 }
@@ -601,9 +602,9 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                 }
             })
         }
-        grid.refreshAllRows = function(){
+        grid.refreshAllRows = async function(force){
             var timeStamp = new Date().getTime();
-            grid.connector.my.ajax.table_data({
+            await grid.connector.my.ajax.table_data({
                 table:grid.connector.tableName,
                 fixedFields:grid.connector.fixedFields,
                 paramfun:grid.connector.parameterFunctions||{}
@@ -624,7 +625,34 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                         return sameValue(JSON.stringify(primaryKeyValuesForRow),JSON.stringify(primaryKeyValuesForDepotRow))
                     });
                     //chequeo que exista depot por las dudas
-                    if (depot) { 
+                    if ((!depot || !depot.tr || !depot.tr.parentNode) && !thereIsANewRecord && !grid.vertical) {
+                        if (!depot) {
+                            var depot = grid.createDepotFromRow(row);
+                            grid.depots.push(depot);
+                            grid.sortDepotsToDisplay(grid.depots);
+                        } else if (depot.tr && !depot.tr.parentNode) {
+                            depot.tr = null
+                        }
+                        var iRow = -1;
+                        var i = 0;
+                        while (i < grid.depots.length){
+                            var aDepot = grid.depots[i];
+                            if (depot == aDepot) break;
+                            if (aDepot && aDepot.tr && aDepot.tr.parentNode && aDepot.tr.rowIndex != null) {
+                                iRow = aDepot.tr.sectionRowIndex
+                            }
+                            i++;
+                        }
+                        grid.createRowElements(iRow + 1, depot);
+                        grid.updateRowData(depot);
+                        depot.tick = tick
+                        if (!force) {
+                            changeIoStatus(depot,'background-change', depot.row);
+                            setTimeout(function(){
+                                changeIoStatus(depot,'ok', depot.row);
+                            },3000);
+                        }
+                    } else if (depot) { 
                         if (!sameValue(JSON.stringify(row),JSON.stringify(depot.row))) {
                             //grid.retrieveRowAndRefresh(depot); 
                             if(depot.tr){
@@ -632,31 +660,20 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                             }
                         }
                         depot.tick = tick
-                    } else if (!depot && !thereIsANewRecord && !grid.vertical) {
-                        var depot = grid.createDepotFromRow(row);
-                        grid.depots.push(depot);
-                        grid.sortDepotsToDisplay(grid.depots);
-                        grid.createRowElements(grid.depots.findIndex((myDepot)=>myDepot===depot), depot);
-                        grid.updateRowData(depot);
-                        depot.tick = tick
-                        changeIoStatus(depot,'background-change', depot.row);
-                        setTimeout(function(){
-                            changeIoStatus(depot,'ok', depot.row);
-                        },3000);
                     }
                 })
                 if(!thereIsANewRecord){
                     var i = 0;
                     var depotsToDelete = grid.depots.filter(depot => depot.tick != tick);
                     var depot;
-                    if (myOwn.config.config['grid-row-retain-moved-or-deleted']) { 
+                    if (myOwn.config.config['grid-row-retain-moved-or-deleted'] && !force) { 
                         var depotsToRetain = grid.depots.filter(depot => depot.tick == tick);
                         for (depot of depotsToRetain) {
-                            if (depot.tr.getAttribute('not-here')) depot.tr.removeAttribute('not-here')
+                            if (depot.tr && depot.tr.getAttribute('not-here')) depot.tr.removeAttribute('not-here')
                         }
                     }
                     while (depot = depotsToDelete.pop()) {
-                        depot.manager.displayAsDeleted(depot, 'unknown'); 
+                        depot.manager.displayAsDeleted(depot, force ? 'change-ff' : 'unknown'); 
                     }
                 }
             })
@@ -1140,9 +1157,13 @@ myOwn.DetailColumnGrid.prototype.td = function td(depot, iColumn, tr){
         alt:'DETAIL',
         title:detailTableDef.label||my.messages.details
     }).create();
-    var menuRef={w:'table', table:detailTableDef.table};
+    var menuRef = detailTableDef.table ? {table:detailTableDef.table} : {w:detailTableDef.wScreen, autoproced:true};
     var calculateFixedFields = function(){
-        return detailTableDef.fields.map(function(pair){
+        return detailTableDef.fields
+        .filter(function(pair){
+            return !pair.nullMeansAll || depot.row[pair.source] != null;
+        })
+        .map(function(pair){
             var fieldCondition={fieldName: pair.target, value:'value' in pair ? pair.value : depot.row[pair.source]}
             if(pair.range){
                 fieldCondition.range=pair.range;
@@ -1225,9 +1246,17 @@ myOwn.DetailColumnGrid.prototype.td = function td(depot, iColumn, tr){
                             g.dom.main.addEventListener('deletedRowOk', refresh);
                             g.dom.main.addEventListener('savedRowOk', refresh);
                         }
-                        detailControl.refreshAllRowsInGrid=function(){
-                            if(detailTableDef.refreshFromParent){
-                                g.refreshAllRows();
+                        detailControl.refreshAllRowsInGrid=function(force){
+                            if(detailTableDef.refreshFromParent || force){
+                                if (force) {
+                                    g.dom.main.style.opacity=0.5;
+                                    fixedFields = calculateFixedFields()
+                                    g.connector.fixedFields = fixedFields
+                                }
+                                setTimeout(async ()=>{
+                                    await g.refreshAllRows(force);
+                                    g.dom.main.style.opacity=1;
+                                },1)
                             }
                         }
                         return g;
@@ -2195,7 +2224,7 @@ myOwn.TableGrid.prototype.createRowInsertElements = function createRowInsertElem
     }
     var depotForInsert = grid.createDepotFromRow({$allow:{delete:true, update:true}}, 'new');
     grid.connector.fixedFields.forEach(function(pair){
-        if(!pair.range){
+        if(!pair.range && grid.def.field[pair.fieldName].inTable !== false){
             depotForInsert.row[pair.fieldName] = pair.value;
             depotForInsert.rowPendingForUpdate[pair.fieldName] = pair.value;
         }
@@ -2701,10 +2730,11 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
 
 myOwn.TableGrid.prototype.displayAsDeleted = function displayAsDeleted(depot, mode){
     var grid = this;
+    var fast = mode == 'change-ff'
     if (mode == 'unknown' && myOwn.config.config['grid-row-retain-moved-or-deleted']) {
         depot.tr.setAttribute('not-here', 'yes'); 
     } else {
-        var position = Math.min(grid.depots.length,Math.max(0,depot.tr.sectionRowIndex));
+        var position = depot.tr ? Math.min(grid.depots.length,Math.max(0,depot.tr.sectionRowIndex)) : 0;
         if(grid.depots[position] !== depot){
             position = grid.depots.indexOf(depot);
         }
@@ -2729,12 +2759,14 @@ myOwn.TableGrid.prototype.displayAsDeleted = function displayAsDeleted(depot, mo
                 depots[j-1].colNumber = j;
             }
         }else{
-            depot.my.fade(depot.tr);
-            for(var detailControl in depot.detailControls){
-                if(depot.detailControls[detailControl].tr){
-                    depot.my.fade(depot.detailControls[detailControl].tr);
-                }
-            };
+            if(depot.tr){
+                depot.my.fade(depot.tr, {fast});
+                for(var detailControl in depot.detailControls){
+                    if(depot.detailControls[detailControl].tr){
+                        depot.my.fade(depot.detailControls[detailControl].tr, {fast});
+                    }
+                };
+            }
         }
     }
     grid.updateTotals(grid.depots.length?1:0, grid.depots.length);

package/for-client/my-things.js

@@ -252,11 +252,12 @@ myOwn.log = function log(severity, message){
 };
 
 myOwn.fade = function fade(element, options){
-    if(element.tagName.toUpperCase()==='TR' && element.parentNode.replaceChild){
+    options=options||{};
+    if (!element.parentNode) return
+    if(element.tagName.toUpperCase()==='TR' && element.parentNode.replaceChild && !options.fast){
         var parent=element.parentNode;
         var dummyTr=document.createElement(element.tagName);
         dummyTr.className=element.className;
-        options=options||{};
         options.smooth=options.smooth||{};
         var spans=options.smooth.spans;
         var sourceRow;

package/lib/backend-plus.d.ts

@@ -230,7 +230,7 @@ export type EditableDbDefinition = {
     }
 }
 export type FieldsForConnect = (string | {source:string, target:string})[]
-export type FieldsForConnectDetailTable = (string | {source:string, target:string} | {value:any, target:string})[]
+export type FieldsForConnectDetailTable = (string | {source:string, target:string, nullMeansAll?:boolean} | {value:any, target:string})[]
 
 export type FkActions = 'no action'|'restrict'|'cascade'|'set null'|'set default';
 export type ForeignKey = {
@@ -418,6 +418,7 @@ export class AppBackend{
     i18n:{
         messages:Record<LangId,Record<string, string>>
     }
+    shootDownBackend():Promise<void>
 }
 
 }

package/lib/backend-plus.js

@@ -616,6 +616,7 @@ AppBackend.prototype.start = function start(opts){
             console.log('*','express server');
             be.server.close(/** @param {Error} err */function(err){
                 if(err){
+                    console.log('*', err)
                     reject(err);
                 }else{
                     resolve();
@@ -989,21 +990,20 @@ AppBackend.prototype.start = function start(opts){
                             done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
                         }
                     }).then(async function(userInfo){
+                        if (!userInfo) return;
                         if (!be.config.login.skipBitacora) {
                             var context = be.getContext(req);
-                            var sessionInfo = client.query(be.generateInsertSQL(be.config.server.bitacoraSchema, be.config.server.bitacoraTableName,{
+                            var sessionInfo = await client.query(be.generateInsertSQL(be.config.server.bitacoraSchema, be.config.server.bitacoraTableName,{
                                 procedure_name: '@login',
-                                parameters: {
-                                    user:username,
-                                    machine_id: context.machineId,
-                                    navigator: context.navigator,
-                                    init_date: bestGlobals.datetime.now(),
-                                }
+                                username,
+                                machine_id: context.machineId,
+                                navigator: context.navigator,
+                                init_date: bestGlobals.datetime.now(),
+                                parameters: {}
                             })).fetchUniqueValue();
                             userInfo.bitacoraId = sessionInfo.value;
                         }
                         done(null, userInfo);
-                        return userInfo;
                     }).then(function(){
                         client.done();
                     }).catch(function(err){
@@ -1233,6 +1233,7 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
             alter table his.bitacora alter column id type bigint;
             grant usage on schema his to ${be.config.db.user};
             grant select, insert, update on his.bitacora to ${be.config.db.user};
+            alter table his.bitacora alter column parameters_definition drop not null;
         `;
         throw new Error(message);
     }
@@ -1376,6 +1377,7 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                     var params={};
                     procedureDef.parameters.forEach(function(paramDef){
                         var undecodedValue = req[source][paramDef.name];
+                        undecodedValue = paramDef.encoding == 'plain' || undecodedValue === undefined ? undecodedValue : undecodedValue + '';
                         var value = undecodedValue===undefined?undecodedValue:myOwn.encoders[paramDef.encoding].parse(undecodedValue);
                         if(undecodedValue===undefined){
                             if(paramDef.defaultSpecial === 'currentYear'){
@@ -2596,8 +2598,13 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
     var schema=db.quoteIdent(be.config.db.schema);
     linesCreate.push("set role to "+owner+";");
     linesCreate.push("drop schema if exists "+schema+' cascade;');
+    if (be.config.install.dump["drop-his"]) {
+        linesCreate.push("drop schema if exists his cascade;");
+    }
     linesCreate.push("create schema "+schema+';');
     linesCreate.push("grant usage on schema "+schema+' to '+user+';');
+    linesCreate.push("create schema if not exists his;");
+    linesCreate.push("grant usage on schema his to "+user+';');
     if(be.config.install.dump["admin-can-create-tables"]){
         linesCreate.push("grant create on schema "+schema+' to '+user+';');
     }

package/lib/procedures-table.js

@@ -189,6 +189,9 @@ ProcedureTables = [
             var updateTarget = {}
             for(var name in parameters.newRow){
                 var defField=mainDefTable.field[name];
+                if (!defField) {
+                    throw new Error("field "+name+" does not exist in "+mainDefTable.name);
+                }
                 if(!defField.allow[action] && (!opts || !opts.forImport) && (
                     !defField.isPk || 
                     parameters.primaryKeyValues[defField.isPk-1]!=parameters.newRow[name]

package/lib/table-def-adapt.js

@@ -317,7 +317,7 @@ function tableDefAdapt(tableDef, context){
                         resultFieldDef.referencesFields=fkDef.fields;
                         resultFieldDef.skipReferenceLookup=fkDef.skipReferenceLookup || fkTableDef.skipReferenceLookup;
                     }catch(err){
-                        console.log('ERROR',fkDef.fields,'in',resultTableDef.field);
+                        console.log('ERROR',fkDef.fields,'in',resultTableDef.field.name);
                         err.context=(err.context||'')+'referencing '+fkDef.fields[lastPos].source+' in '+resultTableDef.name+' to '+fkDef.references+' \n ';
                         throw err;
                     }

package/lib/tables/table-bitacora.js

@@ -2,15 +2,16 @@
 
 module.exports = function(context){
     const BITACORA_TABLENAME = context.be.config.server.bitacoraTableName;
+    const BITACORA_SCHEMA = context.be.config.server.bitacoraSchema;
     return context.be.tableDefAdapt({
         name:'bitacora',
         title:'Bitacora',
         tableName: BITACORA_TABLENAME,
+        schema: BITACORA_SCHEMA,
         editable:context.forDump,
         fields:[
             {name:'id'                    , typeName:'bigint'     , nullable:false, sequence:{name: 'secuencia_bitacora', firstValue: 1}},
             {name:'procedure_name'        , typeName:'text'       , nullable:false                                                      },
-            {name:'parameters_definition' , typeName:'text'       , nullable:false                                                      },
             {name:'parameters'            , typeName:'text'       , nullable:false                                                      },
             {name:'username'              , typeName:'text'       , nullable:false                                                      },
             {name:'machine_id'            , typeName:'text'       , nullable:false                                                      },
@@ -21,6 +22,7 @@ module.exports = function(context){
             {name:'end_status'            , typeName:'text'                                                                             },
         ],
         primaryKey:['id'],
+        sql:{skipEnance:true},
         sortColumns:[{column:'id', order:-1}]
     }, context);
 }

package/lib/tables/table-locks.js

@@ -3,6 +3,7 @@
 module.exports = function(context){
     return context.be.tableDefAdapt({
         name:'locks',
+        schema:'his',
         allow:{
             insert:true,
             delete:false,

package/lib/tables/table-summary.js

@@ -4,6 +4,7 @@ module.exports = function(context){
     var $1_is_num=`$1 ~ '^\\s*(\\d+(\\.\\d*)?|\\.\\d+)\\s*$'`
     return context.be.tableDefAdapt({
         name:'summary',
+        schema:'his',
         editable:context.forDump,
         fields:[
             {name:'table_name'            , typeName:'text'       , visible:false},
@@ -32,6 +33,7 @@ module.exports = function(context){
         ],
         primaryKey:['table_name', 'name'],
         // hiddenColunns:['typeName', 'nullable', 'label', 'title', 'description'],
+        sql:{skipEnance:true},
         sortColumns:[{column:'ordinal_position', order:1}]
     }, context);
 }

package/lib/tables/table-tokens.js

@@ -5,6 +5,7 @@ module.exports = function(context){
     return context.be.tableDefAdapt({
         name:'tokens',
         elementName:'token',
+        schema:'his',
         editable:admin,
         fields:[
             {name:'token'      , typeName:'text'      , nullable:false },
@@ -21,7 +22,8 @@ module.exports = function(context){
         ],
         sql:{
             isTable: true,
-            from: `(select * from tokens order by date desc)`
+            from: `(select * from tokens order by date desc)`,
+            skipEnance:true,
         },
     }, context);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.10",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -54,7 +54,7 @@
     "mini-tools": "^1.12.1",
     "moment": "^2.29.4",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.9.3",
+    "nodemailer": "^6.9.4",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.3.3",
     "pikaday": "^1.8.2",
@@ -73,7 +73,7 @@
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "devDependencies": {
-    "@types/big.js": "^6.1.6",
+    "@types/big.js": "^6.2.0",
     "@types/expect.js": "~0.3.29",
     "@types/express": "^4.17.17",
     "@types/express-useragent": "^1.0.2",
@@ -81,8 +81,8 @@
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^10.0.1",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^20.3.3",
-    "@types/nodemailer": "^6.4.8",
+    "@types/node": "^20.5.1",
+    "@types/nodemailer": "^6.4.9",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
     "@types/stack-trace": "~0.0.30",
@@ -98,10 +98,10 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^20.7.4",
+    "puppeteer": "^21.1.0",
     "sinon": "^15.2.0",
     "supertest": "^6.3.3",
-    "types.d.ts": "~0.6.15",
+    "types.d.ts": "~0.6.18",
     "typescript": "^5.1.6",
     "why-is-node-running": "^2.2.2"
   },