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

package/for-client/my-tables.js

@@ -652,7 +652,7 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                     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')
+                            if (depot.tr && depot.tr.getAttribute('not-here')) depot.tr.removeAttribute('not-here')
                         }
                     }
                     while (depot = depotsToDelete.pop()) {

package/lib/backend-plus.d.ts

@@ -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);
     }
@@ -2596,8 +2597,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/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                                                      },

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 the anti Pareto rule",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.4",
   "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",
@@ -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.4.5",
+    "@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": "^20.9.0",
     "sinon": "^15.2.0",
     "supertest": "^6.3.3",
-    "types.d.ts": "~0.6.15",
+    "types.d.ts": "~0.6.16",
     "typescript": "^5.1.6",
     "why-is-node-running": "^2.2.2"
   },