backend-plus 1.15.2 → 1.16.2

package/for-client/my-tables.js

@@ -79,10 +79,14 @@ myOwn.i18n.messages.en=changing(myOwn.i18n.messages.en, {
     notSimilarTo:'not similar to',
     numberExportedRows:"Rows exported",
     oldValue: "old value",
+    oneRowDeleted: "one row deleted.",
+    xRowsDeleted: "{$x} rows deleted.",
     oneRowInserted: "one row inserted.",
     xRowsInserted: "{$x} rows inserted.",
     oneRowUpdated: "one row updated.",
     xRowsUpdated: "{$x} rows updated.",
+    oneRowSkipped: "one skipped row",
+    xRowsSkipped: "{$x} skipped row",
     optionsForThisTable: "options for this table",
     orientationToggle: "toggle orientation (vertical vs horizontal)",
     prepare: "prepare",
@@ -143,10 +147,14 @@ myOwn.i18n.messages.es=changing(myOwn.i18n.messages.es, {
     notSimilarTo:'no contiene',
     numberExportedRows:"Filas exportadas",
     oldValue: "valor anterior",
+    oneRowDeleted: "un registro borrado",
+    xRowsDeleted: "{$x} registros borrados",
     oneRowInserted: "un registro insertado.",
     xRowsInserted: "{$x} registros insertados.",
     oneRowUpdated: "un registro modificados.",
     xRowsUpdated: "{$x} registros modificados.",
+    oneRowSkipped: "un registro salteado",
+    xRowsSkipped: "{$x} registros salteados",
     optionsForThisTable: "opciones para esta tabla",
     orientationToggle: "cambiar la orientación de la tabla (por fila o por columna)",
     prepare: "preparar",
@@ -1336,6 +1344,16 @@ myOwn.TableGrid.prototype.prepareMenu = function prepareMenu(button){
                         }else if(result.uploaded.updated>1){
                             messages.push(my.messages.xRowsUpdated.replace('{$x}',result.uploaded.updated));
                         }
+                        if(result.uploaded.skipped==1){
+                            messages.push(my.messages.oneRowSkipped);
+                        }else if(result.uploaded.skipped>1){
+                            messages.push(my.messages.xRowsSkipped.replace('{$x}',result.uploaded.skipped));
+                        }
+                        if(result.uploaded.deleted==1){
+                            messages.push(my.messages.oneRowDeleted);
+                        }else if(result.uploaded.deleted>1){
+                            messages.push(my.messages.xRowsDeleted.replace('{$x}',result.uploaded.deleted));
+                        }
                         if(result.uploaded.skippedColumns.length==1){
                             messages.push(my.messages.skippedColumn+": "+result.uploaded.skippedColumns.join(', '));
                         }else if(result.uploaded.skippedColumns.length>1){

package/lib/backend-plus.d.ts

@@ -294,6 +294,7 @@ export type TableDefinition = EditableDbDefinition & {
     firstDisplayOverLimit?:number
     description?:MarkdownDoc
     exportJsonFieldAsColumns?:string
+    importCuidado?:boolean
 }
 export interface DetailTable { table?: string, fields: FieldsForConnectDetailTable, abr: string, label?: string, refreshParent?:boolean, refreshFromParent?:boolean, wScreen?:string, condition?:string }
 export type TableDefinitionFunction = (context: ContextForDump, opts?:any) => TableDefinition;

package/lib/backend-plus.js

@@ -230,7 +230,7 @@ AppBackend.prototype.i18n.messages.en={
         fileUploaded:'file uploaded',
         unkownExt:'unkown file extension'
     },
-    server:{    
+    server:{  
         cantDelete_TLDR:'Can\'t delete. May be rights problems, locked records or internal problems',
         cantInsert_TLDR:'Can\'t insert. May be rights problems, locked records or internal problems',
         cantUpdate_TLDR:'Can\'t update. May be rights problems, locked records or internal problems',
@@ -250,6 +250,7 @@ AppBackend.prototype.i18n.messages.en={
         line:'line',
         missingPrimaryKeyValues:'missing primary key values',
         noMailerConfig:'not mailer configurated',
+        notInputCuidado:'The uploaded file is not a "#cuidado" file',
         notLoggedIn:'not logged in',
         oldPassDontMatch:'old password does not matchs or username is not longer valid or token is invalid',
         passChangedSuccesfully: 'password was changed successfully',
@@ -327,6 +328,7 @@ AppBackend.prototype.i18n.messages.es={
         line:'linea',
         missingPrimaryKeyValues:'faltan valores en los campos de la clave principal',
         noMailerConfig:'falta la configuración del mailer',
+        notInputCuidado:'El archivo no es un archivo "#cuidado"',
         notLoggedIn:'sin inicio de sesión',
         oldPassDontMatch:'la clave anterior no coincide o el usuario es inválido o el token está vencido',
         passChangedSuccesfully: 'password was changed successfully',
@@ -1127,6 +1129,9 @@ AppBackend.prototype.rootPath = process.cwd();
 AppBackend.prototype.specialValueWhenInsert = {
     currentUsername:function(context){
         return context.username;
+    },
+    lineNumberWhenImported:function(_context, _defField, parameters){
+        return parameters.lineNumber
     }
 }
 

package/lib/procedures-table.js

@@ -9,6 +9,8 @@ var typeStore=require('type-store');
 var likeAr=require('like-ar');
 const f = require('session-file-store');
 
+const PANIC_IMPORT = true;
+
 var ProcedureTables;
 
 function inlineLog(mmm){ console.log(mmm); return mmm; }
@@ -437,9 +439,9 @@ ProcedureTables = [
                 return context.client.query(
                     inlineLog(
                     "DELETE FROM "+be.db.quoteIdent(defTable.sql.tableName)+
-                    " WHERE "+whereParts.join(" AND ")),
+                    " WHERE "+whereParts.join(" AND ")+" RETURNING 1"),
                     dataParams
-                ).execute().then(function(){
+                ).fetchUniqueRow().then(function(){
                     deleteCounter++;
                     context.informProgress({lengthComputable:true, loaded:deleteCounter, total:parameters.rowsToDelete.length});
                 });
@@ -675,9 +677,12 @@ ProcedureTables = [
                 // console.log('xxxxxxxxxxxxxxx ',files[0].originalFilename);
                 var fields=[];
                 var otherFieldNames=[];
+                var inputCuidado = false;
                 var testCandidateColumnAndAddIt=function testCandidateColumnAndAddIt(fieldName, iColumn, cellAddress){
                     cellAddress=cellAddress||iColumn;
-                    if(fieldName && fieldName!='#ignore'){
+                    if(fieldName == "#cuidado"){
+                        inputCuidado = true;
+                    }else if(fieldName && fieldName!='#ignore'){
                         var fieldName=fieldName.trim();
                         if(tableDef.prefix){
                             fieldName=tableDef.prefix+'_'+fieldName;
@@ -737,6 +742,11 @@ ProcedureTables = [
                     "#null":null,
                     "#''":''
                 };
+                var controlCuidado = function(){
+                    if(tableDef.importCuidado && !inputCuidado){
+                        throw new Error(be.messages.server.notInputCuidado);
+                    }
+                }
                 if(files[0].originalFilename.match(/\.(tab|txt)$/)){
                     readerFunction=fs.readFile(files[0].path,{encoding:'UTF8'}).then(function(content){
                         context.informProgress({message:be.messages.server.fileReaded});
@@ -751,6 +761,7 @@ ProcedureTables = [
                             heading=lines[0].split(separator);
                         }
                         heading.forEach(function(col,i){ return testCandidateColumnAndAddIt(col,i); });
+                        controlCuidado();
                         doing="retrieving rows";
                         var rowsForUpsert=lines.slice(1).map(function(line){
                             var othersArray = [];
@@ -775,6 +786,9 @@ ProcedureTables = [
                                     newRow[field.name]=value;
                                 }
                             });
+                            if(inputCuidado){
+                                newRow['#cuidado'] = row[0];
+                            }
                             newRow = addOtherColumnsToNewRow(newRow, othersArray);
                             return newRow;
                         });
@@ -810,6 +824,7 @@ ProcedureTables = [
                                 testCandidateColumnAndAddIt(cellOfFieldName.v,iColumn,cellAddress);
                             }
                         }
+                        controlCuidado();
                         doing="retrieving rows";
                         var rowsForUpsert=[];
                         for(var iRow=fieldNameRowNum+1; iRow<=range.e.r; iRow++){
@@ -854,6 +869,9 @@ ProcedureTables = [
                                     }
                                 }
                             };
+                            if(inputCuidado){
+                                newRow['#cuidado'] = (ws[XLSX.utils.encode_cell({r:iRow, c:0})]||{}).v;
+                            }
                             newRow = addOtherColumnsToNewRow(newRow, othersArray);
                             rowsForUpsert.push(newRow);
                         }
@@ -865,7 +883,9 @@ ProcedureTables = [
                 };
                 var inserted=0;
                 var updated=0;
+                var deleted=0;
                 var readed=0;
+                var skipped=0;
                 var total=1;
                 var origin=new Date();
                 if(tableDef.sql.constraintsDeferred){
@@ -873,6 +893,7 @@ ProcedureTables = [
                     await context.client.query("SET CONSTRAINTS ALL DEFERRED").execute();
                 }
                 return readerFunction.then(async function(rowsAndOtherFieldsNames){
+                    var importErrors = [];
                     var rowsForUpsert = rowsAndOtherFieldsNames.rowsForUpsert;
                     total = rowsForUpsert.length;
                     var otherFieldNames = rowsAndOtherFieldsNames.otherFieldNames;
@@ -881,6 +902,19 @@ ProcedureTables = [
                     var previousRow={};
                     let lineNumber = 1;
                     for(let newRow of rowsForUpsert){
+                        var { procedure, insertIfNotUpdate, status } = ({
+                            false      :{procedure:'table_record_save'  , status:'update', insertIfNotUpdate: true },
+                            ['#nuevo' ]:{procedure:'table_record_save'  , status:'new'   , insertIfNotUpdate: false},
+                            ['#cambio']:{procedure:'table_record_save'  , status:'update', insertIfNotUpdate: false},
+                            ['#borrar']:{procedure:'table_record_delete', status:'update', insertIfNotUpdate: false},
+                        })[ inputCuidado && newRow['#cuidado'] ] || {}
+                        if(inputCuidado){
+                            delete newRow['#cuidado'];
+                        }
+                        if(procedure == null){
+                            skipped++;
+                            continue;
+                        }
                         var skip=false;
                         var hasOneValue=false;
                         var primaryKeyValues=[];
@@ -915,7 +949,7 @@ ProcedureTables = [
                             }
                             if(field.isPk){
                                 primaryKeyValues[field.isPk-1]=value;
-                                if(value==null){
+                                if(value==null && !defField.specialValueWhenInsert){
                                     throw new Error(be.messages.server.primarKeyCantBeNull4.replace('$1',lineNumber).replace('$2',field.name));
                                 }
                             }
@@ -944,16 +978,17 @@ ProcedureTables = [
                             readed++;
                             context.informProgress({lengthComputable:true, loaded:readed, total:total});
                             try{
-                                var result = await be.procedure.table_record_save.coreFunction(
+                                var result = await be.procedure[procedure].coreFunction(
                                     context,
                                     {
                                         table: parameters.table, 
                                         primaryKeyValues,
                                         newRow,
                                         oldRow:[],
-                                        status:'update',
-                                        insertIfNotUpdate:true,
-                                        masive:true
+                                        status,
+                                        insertIfNotUpdate,
+                                        masive:true,
+                                        lineNumber
                                     },
                                     null,
                                     {forImport:true}
@@ -962,10 +997,28 @@ ProcedureTables = [
                                     inserted++;
                                 }else if(result.command==='UPDATE'){
                                     updated++;
+                                }else if(procedure=='table_record_delete'){
+                                    deleted++;
                                 }
                             }catch(err){
                                 err.detail=be.messages.server.line+' '+lineNumber+' / '+tableDef.primaryKey+' = '+JSON.stringify(primaryKeyValues);
-                                throw err;
+                                if(PANIC_IMPORT){
+                                    throw err;
+                                }else{
+                                    importErrors.push(err);
+                                    try{
+                                        await context.client.query('ROLLBACK').execute();
+                                    }catch(err2){
+                                        err.detail+=' *** in ROLLBACK ' + err2.message;
+                                        throw err
+                                    }
+                                    try{
+                                        await context.client.query("BEGIN TRANSACTION").execute();
+                                    }catch(err2){
+                                        err.detail+=' *** in BEGIN TRANSACTION ' + err2.message;
+                                        throw err
+                                    }
+                                }
                             };
                         }
                         previousRow=newRow;
@@ -987,28 +1040,32 @@ ProcedureTables = [
                             for(let pkOtherField of otherFieldsTableDef.primaryKey){
                                 primaryKeyValues.push(newRow[pkOtherField]);
                             };
-                            await be.procedure.table_record_save.coreFunction(
+                            await be.procedure[procedure].coreFunction(
                                 context,{
                                     table: otherFieldsTableDef.name, 
                                     primaryKeyValues,
                                     newRow,
                                     oldRow:[],
-                                    status:'update',
-                                    insertIfNotUpdate:true,
+                                    status,
+                                    insertIfNotUpdate,
                                     masive:true
                                 }
                             );
                         };
                     }
+                    if(importErrors.length){
+                        await context.client.query('ROLLBACK').execute();
+                        return {json:{importErrors}};
+                    }
                     context.informProgress({message:be.messages.insertingRows});
-                }).then(async function(){
+                }).then(async function(other){
                     context.informProgress({message:be.messages.checkingConstraints});
                     if(tableDef.sql.constraintsDeferred){
                         await context.client.query("SET CONSTRAINTS ALL IMMEDIATE").execute();
                         await recreateConstraints(tableDef, true);
                     }
                     context.informProgress({lengthComputable:true, loaded:readed, total:total, force:true});
-                    return {uploaded:{inserted,updated,skippedColumns}};
+                    return other || {uploaded:{inserted,updated,skipped,deleted,skippedColumns}};
                 });
             }).catch(function(err){
                 console.log('ERROR',err.message);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.15.2",
+  "version": "1.16.2",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -32,7 +32,7 @@
     "backend-skins": "^0.1.15",
     "best-globals": "^1.0.3",
     "big.js": "^6.1.1",
-    "body-parser": "^1.19.2",
+    "body-parser": "^1.20.0",
     "cast-error": "^0.1.0",
     "castellano": "^0.1.3",
     "connect-pg-simple": "^7.0.0",
@@ -52,8 +52,8 @@
     "login-plus": "^1.6.2",
     "memorystore": "^1.6.7",
     "mini-tools": "^1.11.2",
-    "nodemailer": "^6.7.2",
-    "moment": "^2.29.1",
+    "nodemailer": "^6.7.3",
+    "moment": "^2.29.2",
     "multiparty": "^4.2.3",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.2.6",
@@ -65,12 +65,12 @@
     "self-explain": "^0.10.22",
     "serve-content": "^0.3.17",
     "session-file-store": "^1.5.0",
-    "sql-tools": "^0.1.0",
+    "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
-    "stylus": "^0.56.0",
+    "stylus": "^0.57.0",
     "type-store": "^0.2.41",
     "typed-controls": "^0.10.0",
-    "xlsx": "^0.18.3",
+    "xlsx": "^0.18.5",
     "xlsx-style": "^0.8.13"
   },
   "devDependencies": {
@@ -83,7 +83,7 @@
     "@types/mocha": "^9.1.0",
     "@types/nodemailer": "^6.4.4",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^17.0.21",
+    "@types/node": "^17.0.23",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
     "@types/stack-trace": "~0.0.29",
@@ -91,19 +91,19 @@
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
     "karma": "6.3.17",
-    "karma-chrome-launcher": "^3.1.0",
+    "karma-chrome-launcher": "^3.1.1",
     "karma-expect": "^1.1.3",
     "karma-firefox-launcher": "^2.1.2",
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
-    "mocha": "^9.2.1",
+    "mocha": "^9.2.2",
     "nyc": "^15.1.0",
-    "puppeteer": "^13.4.1",
+    "puppeteer": "^13.5.2",
     "sinon": "^13.0.1",
     "supertest": "^6.2.2",
     "types.d.ts": "~0.6.7",
-    "typescript": "^4.6.2",
+    "typescript": "^4.6.3",
     "why-is-node-running": "^2.2.1"
   },
   "engines": {
@@ -117,6 +117,7 @@
     "test-good": "mocha --reporter spec --bail --check-leaks test/test*.js",
     "example-pu": "node test/puppeteer/first-step.js",
     "test-pu": "mocha --reporter spec --bail --check-leaks --globals cptable --globals QUOTE --globals __core-js_shared__ test/test-pu.js",
+    "test-server": "mocha --reporter spec --single-run --bail  test/test.js",
     "server-test": "node test/run-simple-backend.js",
     "example-tables": "node examples/tables/server/server-tables.js --dir-x examples/tables",
     "example-fichas": "node examples/fichero/server/server-fichas.js",

package/for-client/local-prueba.js

@@ -1,15 +0,0 @@
-/**
- * @function
- * @template T extends {}
- * @param {T & {name?:string|null|undefined}} obj
- * @param {string} n
- * @return {obj is T}
- */
- function addName(obj, n) {
-    obj.name = n;
-}
-
-let thing = {size: "medium"};
-addName(thing, "product");
-var other = thing;
-console.log(thing.name);