backend-plus 1.19.5 → 2.0.0-beta.2

package/README.md

@@ -2,15 +2,15 @@
 
 # backend-plus
 
-Backend for typed-controls
+Backend for the anti Pareto rule.
 
 
 ![stable](https://img.shields.io/badge/stability-stable-blue.svg)
-[![npm-version](https://img.shields.io/npm/v/backend-plus.svg)](https://npmjs.org/package/backend-plus)
-[![downloads](https://img.shields.io/npm/dm/backend-plus.svg)](https://npmjs.org/package/backend-plus)
-[![build](https://img.shields.io/travis/codenautas/backend-plus/master.svg)](https://travis-ci.org/codenautas/backend-plus)
-[![coverage](https://img.shields.io/coveralls/codenautas/backend-plus/master.svg)](https://coveralls.io/r/codenautas/backend-plus)
-[![dependencies](https://img.shields.io/david/codenautas/backend-plus.svg)](https://david-dm.org/codenautas/backend-plus)
+[![npm-version](https://img.shields.io/npm/v/backend-star.svg)](https://npmjs.org/package/backend-star)
+[![downloads](https://img.shields.io/npm/dm/backend-star.svg)](https://npmjs.org/package/backend-star)
+[![build](https://img.shields.io/travis/codenautas/backend-star/master.svg)](https://travis-ci.org/codenautas/backend-star)
+[![coverage](https://img.shields.io/coveralls/codenautas/backend-star/master.svg)](https://coveralls.io/r/codenautas/backend-star)
+[![dependencies](https://img.shields.io/david/codenautas/backend-star.svg)](https://david-dm.org/codenautas/backend-star)
 
 
 language: ![English](https://raw.githubusercontent.com/codenautas/multilang/master/img/lang-en.png)
@@ -60,6 +60,7 @@ menuContent | A    |                | menu     | menu content
 table       | T    | `name`         | table    | table name
 label       | T    | `name`         |          | if you don't want to use default value to display in menu
 selectedByDefault | B |             |          | is the selected by default option
+autoproced  | B    | `false`        | proc     | if yo want to execute the procedure without clicking the proced button
 
 Integrating example:
 

package/for-client/css/my-tables.styl

@@ -338,4 +338,8 @@ th.th-agg
     outline 1px solid #997
     left 0
 
-/* background-clip: padding-box; outline:2px solid black; */
+/* background-clip: padding-box; outline:2px solid black; */
+
+.my-grid > tbody > [not-here=yes] > td
+  background-color #ccc
+  color #888

package/for-client/my-tables.js

@@ -647,14 +647,17 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                 })
                 if(!thereIsANewRecord){
                     var i = 0;
-                    while (i < grid.depots.length) {
-                        var depot = grid.depots[i];
-                        if (depot.tick != tick) {
-                            depot.manager.displayAsDeleted(depot);
-                        } else {
-                            i++;
+                    var depotsToDelete = grid.depots.filter(depot => depot.tick != tick);
+                    var depot;
+                    if (myOwn.config.config['grid-row-retain-moved-or-deleted']) { 
+                        var depotsToRetain = grid.depots.filter(depot => depot.tick == tick);
+                        for (depot of depotsToRetain) {
+                            if (depot.tr.getAttribute('not-here')) depot.tr.removeAttribute('not-here')
                         }
                     }
+                    while (depot = depotsToDelete.pop()) {
+                        depot.manager.displayAsDeleted(depot, 'unknown'); 
+                    }
                 }
             })
         }
@@ -1014,7 +1017,7 @@ myOwn.DataColumnGrid.prototype.td = function td(depot, iColumn, tr, saveRow){
     var grid = this.grid;
     var fieldDef = this.fieldDef;
     var forInsert = false; // TODO: Verificar que esto está en desuso
-    var enabledInput=depot.allow.update !== false && grid.def.allow.update && !grid.connector.fixedField[fieldDef.name] && (forInsert?fieldDef.allow.insert:fieldDef.allow.update);
+    var enabledInput=depot.allow.update !== false && grid.def.allow.update /* && !grid.connector.fixedField[fieldDef.name] */ && (forInsert?fieldDef.allow.insert:fieldDef.allow.update);
     var directInput=true;
     var control;
     var td;
@@ -2261,7 +2264,7 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
             return fieldDef.visible;
         }).forEach(function(fieldDef){
             var td = depot.rowControls[fieldDef.name];
-            var editable=depot.allow.update !== false && grid.connector.def.allow.update && !grid.connector.fixedField[fieldDef.name] && (forInsert?fieldDef.allow.insert:fieldDef.allow.update && grid.connector.def.field[fieldDef.name].allow.update);
+            var editable=depot.allow.update !== false && grid.connector.def.allow.update /* && !grid.connector.fixedField[fieldDef.name]*/ && (forInsert?fieldDef.allow.insert:fieldDef.allow.update && grid.connector.def.field[fieldDef.name].allow.update);
             td.disable(!editable);
             if(fieldDef.clientSide){
                 if(!td.clientSidePrepared){
@@ -2696,39 +2699,43 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
     grid.displayBody();
 };
 
-myOwn.TableGrid.prototype.displayAsDeleted = function displayAsDeleted(depot){
+myOwn.TableGrid.prototype.displayAsDeleted = function displayAsDeleted(depot, mode){
     var grid = this;
-    var position = Math.min(grid.depots.length,Math.max(0,depot.tr.sectionRowIndex));
-    if(grid.depots[position] !== depot){
-        position = grid.depots.indexOf(depot);
-    }
-    if(position>=0){
-        grid.depots.splice(position,1);
-    }
-    if(grid.vertical){
-        var compareColNumberFun = function compareColNumberFun(a, b) {
-            var colNumberA = a.colNumber;
-            var colNumberB = b.colNumber;
-            return(colNumberA > colNumberB)?1:((colNumberA < colNumberB)?-1:0)
-        }
-        var i = 0;
-        Array.prototype.forEach.call(grid.dom.table.rows,function(tr){
-            if(i < grid.dom.table.rows.length-1 && tr.childNodes[depot.colNumber]){
-                depot.my.fade(tr.childNodes[depot.colNumber]);
-            }
-            i++;
-        });
-        var depots = grid.depots.sort(compareColNumberFun);
-        for(var j = depot.colNumber; j <= depots.length; j++){
-            depots[j-1].colNumber = j;
+    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));
+        if(grid.depots[position] !== depot){
+            position = grid.depots.indexOf(depot);
         }
-    }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(position>=0){
+            grid.depots.splice(position,1);
+        }
+        if(grid.vertical){
+            var compareColNumberFun = function compareColNumberFun(a, b) {
+                var colNumberA = a.colNumber;
+                var colNumberB = b.colNumber;
+                return(colNumberA > colNumberB)?1:((colNumberA < colNumberB)?-1:0)
             }
-        };
+            var i = 0;
+            Array.prototype.forEach.call(grid.dom.table.rows,function(tr){
+                if(i < grid.dom.table.rows.length-1 && tr.childNodes[depot.colNumber]){
+                    depot.my.fade(tr.childNodes[depot.colNumber]);
+                }
+                i++;
+            });
+            var depots = grid.depots.sort(compareColNumberFun);
+            for(var j = depot.colNumber; j <= depots.length; j++){
+                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);
+                }
+            };
+        }
     }
     grid.updateTotals(grid.depots.length?1:0, grid.depots.length);
 };
@@ -2757,7 +2764,7 @@ myOwn.tableAction={
             return depot.my.confirmDelete(depot, opts).then(function(result){
                 if(result){
                     return depot.connector.deleteRecord(depot, changing({reject:false},opts)).then(function(){
-                        depot.manager.displayAsDeleted(depot);
+                        depot.manager.displayAsDeleted(depot, 'deleted');
                         depot.manager.refreshAggregates();
                     }).catch(depot.my.alertError);
                 }

package/lib/backend-plus.d.ts

@@ -318,7 +318,7 @@ export type TableDefinition = EditableDbDefinition & {
     specialValidator?:string
     saveAfter?:boolean
     selfRefresh?:boolean
-    filterColumns?:{column:string, operatior:string, value:any}[]
+    filterColumns?:{column:string, operator:string, value:any}[]
 }
 export type OtherTableDefs = TableDefinition['sql']['otherTableDefs']
 export interface DetailTable { table?: string, fields: FieldsForConnectDetailTable, abr: string, label?: string, refreshParent?:boolean, refreshFromParent?:boolean, wScreen?:string, condition?:string }

package/lib/backend-plus.js

@@ -158,6 +158,8 @@ AppBackend.prototype.configStaticConfig = function configStaticConfig(){
             on-demand: false
         server:
           base-url: ''
+          bitacoraSchema: his
+          bitacoraTableName: bitacora
           skins:
             "":
               local-path: for-client
@@ -953,7 +955,7 @@ AppBackend.prototype.start = function start(opts){
                 function(req, username, password, done) {
                     var client;
                     if(!be.config.login["preserve-case"]){
-                        username = username.toLowerCase();
+                        username = username.toLowerCase().trim();
                     }
                     be.getDbClient(req).then(function(cli){
                         client = cli;
@@ -981,11 +983,26 @@ AppBackend.prototype.start = function start(opts){
                                 if(be.config.login["double-dragon"]){
                                     be.DoubleDragon.dbParams[username] = changing(be.config.db, {user:username, password});
                                 }
-                                done(null, data.row);
+                                return data.row;
                             }
                         }else{
                             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 = await client.query(be.generateInsertSQL(be.config.server.bitacoraSchema, be.config.server.bitacoraTableName,{
+                                procedure_name: '@login',
+                                username,
+                                machine_id: context.machineId,
+                                navigator: context.navigator,
+                                init_date: bestGlobals.datetime.now(),
+                                parameters: {}
+                            })).fetchUniqueValue();
+                            userInfo.bitacoraId = sessionInfo.value;
+                        }
+                        done(null, userInfo);
                     }).then(function(){
                         client.done();
                     }).catch(function(err){
@@ -1095,7 +1112,7 @@ AppBackend.prototype.start = function start(opts){
             console.log("Resolved modules from: " + process.cwd())
             likeAr(resolved_modules_log).forEach((c,l)=>console.log(`   ${c} ${l}`));
         }
-    return be.sendMail({
+        return be.sendMail({
             to: be.config.mailer?.supervise?.to,
             subject: `npm start ${be.config["client-setup"].title || packagejson.name} ok ✔️`,
             text:`Inicio del servicio: ${new Date().toJSON()}
@@ -1193,7 +1210,7 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
                     from ${be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':''}${be.config.login.table} limit 1`).fetchOneRowIfExists();
             }catch(err){
                 var mensaje = `
-                    --------quizas falten los campos en la tabla usuarios:
+                    -------- quizas falten los campos en la tabla usuarios:
                     ${be.config.login.forget.mailFields.map(name=>`
                     alter table ${be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':''}${be.config.login.table} add column ${name} text;`).join('')}
                 `;
@@ -1203,6 +1220,21 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
             }
         }
     }
+    var bitacoraId = await client.query(`SELECT data_type 
+        FROM information_schema.columns
+        WHERE /*table_schema = 'his' AND*/ table_name = 'bitacora' AND column_name = 'id'
+    `).fetchOneRowIfExists();
+    if (bitacoraId.row?.data_type != 'bigint') {
+        var message = `
+            ------- hay que cambiar la bitacora de lugar (a his) y agrandar el id (a bigint)
+            alter table ${be.config.db.schema}.bitacora set schema his;
+            alter table ${be.config.db.schema}.tokens set schema his;
+            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};
+        `;
+        throw new Error(message);
+    }
 };
 
 AppBackend.prototype.postConfig = function postConfig(){
@@ -1238,6 +1270,36 @@ AppBackend.prototype.inTransactionProcedureContext = function inTransactionProce
     });
 }
 
+AppBackend.prototype.generateInsertSQL = function generateInsertSQL(schemaName, tableName, insertElement){
+    var {db} = this;
+    var cleanKeys = [];
+    var cleanValues = [];
+    for (var key in insertElement) {
+        cleanKeys.push(db.quoteIdent(key));
+        cleanValues.push(db.quoteNullable(insertElement[key]));    
+    }
+    var sql =  `INSERT INTO ${db.quoteIdent(schemaName)}.${db.quoteIdent(tableName)}
+        (${cleanKeys.join(',')}) VALUES (${cleanValues.join(',')}) returning id`;
+    return sql;
+}
+
+AppBackend.prototype.updateUpdateSQL = function updateUpdateSQL(schemaName, tableName, updateElement, updateConditions){
+    var {db} = this;
+    var setPairs = [];
+    for (var key in updateElement) {
+        setPairs.push(db.quoteIdent(key) + " = " + db.quoteNullable(updateElement[key]));
+    }
+    var filterPairs = [];
+    for (var key in updateConditions) {
+        filterPairs.push(be.db.quoteIdent(key) + " = " + be.db.quoteLiteral(updateConditions[key]));
+    };
+    var sql =  `UPDATE ${db.quoteIdent(schemaName)}.${db.quoteIdent(tableName)} 
+        SET ${setPairs.join(',')}
+        WHERE ${filterPairs.join(' AND ')}`;
+    return sql;
+}
+
+
 /** @param {boolean} forUnlogged */
 AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnlogged){ 
     var be = this;
@@ -1295,7 +1357,8 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
              * @param {import('express').NextFunction} next 
              */
             async function(req, res, next){
-                const BITACORA_TABLENAME = be.config.server.bitacoraTableName || 'bitacora';
+                const BITACORA_SCHEMA = be.config.server.bitacoraSchema;
+                const BITACORA_TABLENAME = be.config.server.bitacoraTableName;
                 var getDatetimeString = function getDatetimeString(){
                     return datetime.now().toPlainString()
                 }
@@ -1332,43 +1395,10 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                     });
                     return params;
                 }
-                var generateInsertSQL = function(insertElement){
-                    var cleanKeys = [];
-                    var cleanValues = [];
-                    for (var key in insertElement) {
-                        cleanKeys.push(be.db.quoteIdent(key));
-                        // if(typeof(insertElement[key]) !== 'string'){ //TODO: revisar si hace falta ahora que ponesmo quoteLiteral
-                        //     insertElement[key] = insertElement[key].toString();    
-                        // }
-                        cleanValues.push(be.db.quoteLiteral(insertElement[key] || "null"));    
-                    }
-                    var sql =  "INSERT INTO " + be.db.quoteIdent(BITACORA_TABLENAME) + " ("+cleanKeys.join(',')+") VALUES ("+ cleanValues.join(',')+") returning id";
-                    return sql;
-                }
-                var updateUpdateSQL = function(updateElement, tableName, updateConditions){
-                    var keyValues = [];
-                    for (var key in updateElement) {
-                        // if(typeof(updateElement[key]) !== 'string'){ //TODO: revisar si hace falta ahora que ponesmo quoteLiteral
-                        //     updateElement[key] = updateElement[key].toString();    
-                        // }
-                        keyValues.push(be.db.quoteIdent(key) + " = " + be.db.quoteLiteral(updateElement[key]));
-                    }
-                    var sql =  "UPDATE " + be.db.quoteIdent(tableName) + " SET " + keyValues.join(',') + " WHERE ";
-                    var keyValues = [];
-                    for (var key in updateConditions) {
-                        // if(typeof(updateConditions[key]) !== 'string'){ //TODO: revisar si hace falta ahora que ponesmo quoteLiteral
-                        //     updateConditions[key] = updateConditions[key].toString();    
-                        // }
-                        keyValues.push(be.db.quoteIdent(key) + " = " + be.db.quoteLiteral(updateConditions[key]));
-                    };
-                    sql =  sql + keyValues.join(' AND ');
-                    return sql;
-                }
                 var processBitacora = async function(hasError, status){
                     var params = getParams();
                     var defInsertBitacoraElement = {
                         procedure_name : procedureDef.action,
-                        parameters_definition: JSON.stringify(procedureDef.parameters),
                         parameters: JSON.stringify(params),
                         username: context.username,
                         machine_id: context.machineId,
@@ -1386,18 +1416,18 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                         if(lastBitacoraInsertedId){
                             await be.inTransaction(req, async function(client){
                                 var updateConditions = { id: lastBitacoraInsertedId };
-                                await client.query(updateUpdateSQL(getFinalStatusBitacoraElement(), BITACORA_TABLENAME, updateConditions)).execute();
+                                await client.query(be.updateUpdateSQL(BITACORA_SCHEMA, BITACORA_TABLENAME, getFinalStatusBitacoraElement(), updateConditions)).execute();
                             });
                         }else{
                             await be.inTransaction(req, async function(client){
-                                var result = await client.query(generateInsertSQL(defInsertBitacoraElement)).fetchUniqueRow();
+                                var result = await client.query(be.generateInsertSQL(BITACORA_SCHEMA, BITACORA_TABLENAME, defInsertBitacoraElement)).fetchUniqueRow();
                                 lastBitacoraInsertedId = result.row.id;
                             });
                         }
                     }else if(hasError && procedureDef.bitacora.error){
                         await be.inTransaction(req,async function(client){
                             var insertElement = changing(defInsertBitacoraElement, getFinalStatusBitacoraElement());
-                            await client.query(generateInsertSQL(insertElement)).execute();
+                            await client.query(be.generateInsertSQL(BITACORA_SCHEMA, BITACORA_TABLENAME, insertElement)).execute();
                         });
                     }
                     //tengo configurada otra tabla para guardar el resultado de la bitacora y tengo la pk de esa tabla
@@ -1419,7 +1449,7 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                             targetTableUpdateFieldsCondition.forEach(function(field){
                                 updateConditions[field] = params[field];
                             });
-                            await client.query(updateUpdateSQL(updateElement, procedureDef.bitacora.targetTable, updateConditions)).execute();
+                            await client.query(be.updateUpdateSQL(BITACORA_SCHEMA, procedureDef.bitacora.targetTable, updateElement, updateConditions)).execute();
                         })
                     }
                 }
@@ -2567,6 +2597,8 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
     linesCreate.push("drop schema if exists "+schema+' 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/tables/table-bitacora.js

@@ -1,16 +1,17 @@
 "use strict";
 
 module.exports = function(context){
-    const BITACORA_TABLENAME = context.be.config.server.bitacoraTableName || 'bitacora';
+    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:'integer'    , nullable:false, sequence:{name: 'secuencia_bitacora', firstValue: 1}},
+            {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                                                      },

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},

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 },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
-  "description": "Backend for typed controls",
-  "version": "1.19.5",
+  "description": "Backend for the anti Pareto rule",
+  "version": "2.0.0-beta.2",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -46,7 +46,7 @@
     "fs-extra": "^11.1.1",
     "js-to-html": "^1.3.2",
     "js-yaml": "^4.1.0",
-    "json4all": "^1.2.1",
+    "json4all": "^1.3.0-beta.1",
     "lazy-some": "^0.1.0",
     "like-ar": "^0.3.9",
     "login-plus": "^1.7.1",
@@ -81,7 +81,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^10.0.1",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^20.3.0",
+    "@types/node": "^20.4.1",
     "@types/nodemailer": "^6.4.8",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
@@ -98,11 +98,11 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^20.5.0",
-    "sinon": "^15.1.0",
+    "puppeteer": "^20.8.0",
+    "sinon": "^15.2.0",
     "supertest": "^6.3.3",
     "types.d.ts": "~0.6.15",
-    "typescript": "^5.1.3",
+    "typescript": "^5.1.6",
     "why-is-node-running": "^2.2.2"
   },
   "engines": {