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

package/for-client/my-tables.js

@@ -294,9 +294,13 @@ myOwn.TableConnector = function(context, opts){
     connector.opts = opts||{};
     connector.fixedFields = connector.opts.fixedFields || [];
     connector.fixedField = {};
+    connector.hideBecauseRelated = {};
     connector.fixedFields.forEach(function(pair){
         if(!pair.range && pair.value != myOwn.skipInFixedFields){
             connector.fixedField[pair.fieldName] = pair.value;
+            if (!pair.show) {
+                connector.hideBecauseRelated[pair.fieldName] = true;
+            }
         }
     });
     connector.parameterFunctions=connector.opts.parameterFunctions||{};
@@ -443,9 +447,13 @@ myOwn.TableConnectorLocal = function(context, opts){
     connector.opts = opts||{};
     connector.fixedFields = connector.opts.fixedFields || [];
     connector.fixedField = {};
+    connector.hideBecauseRelated = {};
     connector.fixedFields.forEach(function(pair){
         if(!pair.range && pair.value != myOwn.skipInFixedFields){
             connector.fixedField[pair.fieldName] = pair.value;
+            if (!pair.show) {
+                connector.hideBecauseRelated[pair.fieldName] = true;
+            }
         }
     });
     connector.parameterFunctions=connector.opts.parameterFunctions||{};
@@ -624,19 +632,27 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                         var primaryKeyValuesForDepotRow = getPrimaryKeyValues(primaryKey, depot.row);
                         return sameValue(JSON.stringify(primaryKeyValuesForRow),JSON.stringify(primaryKeyValuesForDepotRow))
                     });
+                    if (!depot) {
+                        var depot = grid.createDepotFromRow(row);
+                        var needToAddInGrid = true;
+                    }
+                    var needToDisplayDepot = !!grid.filterDepots([depot])[0];
+                    if (!needToDisplayDepot) return;
                     //chequeo que exista depot por las dudas
                     if ((!depot || !depot.tr || !depot.tr.parentNode) && !thereIsANewRecord && !grid.vertical) {
-                        if (!depot) {
+                        var depotsToDisplay = grid.filterDepots(grid.depots);
+                        if (needToAddInGrid) {
                             var depot = grid.createDepotFromRow(row);
                             grid.depots.push(depot);
-                            grid.sortDepotsToDisplay(grid.depots);
+                            var depotsToDisplay = grid.filterDepots(grid.depots);
+                            grid.sortDepotsToDisplay(depotsToDisplay);
                         } 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];
+                        while (i < depotsToDisplay.length){
+                            var aDepot = depotsToDisplay[i];
                             if (depot == aDepot) break;
                             if (aDepot && aDepot.tr && aDepot.tr.parentNode && aDepot.tr.rowIndex != null) {
                                 iRow = aDepot.tr.sectionRowIndex
@@ -664,7 +680,8 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                 })
                 if(!thereIsANewRecord){
                     var i = 0;
-                    var depotsToDelete = grid.depots.filter(depot => depot.tick != tick);
+                    var depotsToDisplay = grid.filterDepots(grid.depots);
+                    var depotsToDelete = depotsToDisplay.filter(depot => depot.tick != tick);
                     var depot;
                     if (myOwn.config.config['grid-row-retain-moved-or-deleted'] && !force) { 
                         var depotsToRetain = grid.depots.filter(depot => depot.tick == tick);
@@ -921,11 +938,11 @@ myOwn.DataColumnGrid.prototype.cellAttributes = function cellAttributes(specific
             attr["my-mandatory"]="normal";
         }
     }
-    if(grid.connector.fixedField[fieldDef.name] != null){
+    if(grid.connector.hideBecauseRelated[fieldDef.name] && !fieldDef.alwaysShow){
         attr["inherited-pk-column"]="yes";
     }
     if(fieldDef.referencesField){
-        if(grid.connector.fixedField[fieldDef.referencesField] != null){
+        if(grid.connector.hideBecauseRelated[fieldDef.referencesField] && !fieldDef.alwaysShow){
             attr["inherited-pk-column"]="yes";
         }
         if(grid.def.field[fieldDef.referencesField].isPk){
@@ -2605,18 +2622,19 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
         }
         return depot;
     };
-    grid.displayBody=function displayBody(){
+    grid.filterDepots = function filterDepots(depotsToFilter){
         var grid = this;
-        var depotsToDisplay;
         var filterRows = grid.view.filter;
+        var depotsToDisplay;
         if(filterRows && filterRows.length){
-            depotsToDisplay = grid.depots.filter(function(depot,i){
+            depotsToDisplay = depotsToFilter.filter(function(depot,i){
                 var iFilter=0;
                 while(iFilter<filterRows.length){
                     var filterData=filterRows[iFilter];
                     var partialOk=true;
                     var columnsCompared = 0;
                     for(var column in depot.row){
+                        // var compSymb = filterData.rowSymbols && filterData.rowSymbols[column] || filterData[column].operator;
                         var compSymb = filterData.rowSymbols[column];
                         if(compSymb && my.comparator[compSymb] && (my.comparatorParameterNull[compSymb] || filterData.row[column] != null)){
                             var isSatisfied=my.comparator[compSymb](depot.row[column],filterData.row[column]);
@@ -2634,8 +2652,13 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
                 return false;
             });
         }else{
-            depotsToDisplay = grid.depots;
+            depotsToDisplay = depotsToFilter;
         }
+        return depotsToDisplay;
+    }
+    grid.displayBody=function displayBody(){
+        var grid = this;
+        var depotsToDisplay = grid.filterDepots(grid.depots);
         grid.sortDepotsToDisplay = function sortDepotsToDisplay(depotsToDisplay){
             if(grid.view.sortColumns.length>0){
                 return depotsToDisplay.sort(function(depot1, depot2){ 

package/lib/backend-plus.d.ts

@@ -120,7 +120,7 @@ export type MenuInfoMenu = {
 export type MenuInfoTable = {
     menuType:'table'
     table?:string
-    ff?:{fieldName:string, value:any}[]
+    ff?:{fieldName:string, value:any, show?:boolean}[]
     fc?:{fieldName:string, operator:string, value:any}[]
     pf?:any
     td?:TableDefinition
@@ -211,6 +211,7 @@ export type FieldDefinition = EditableDbDefinition & {
     table?:string
     inherited?:boolean
     nameForUpsert?:string
+    alwaysShow?:boolean /* show when appears in fixed fields */
 } & ({} | {
     sequence:SequenceDefinition
     nullable:true
@@ -419,6 +420,7 @@ export class AppBackend{
         messages:Record<LangId,Record<string, string>>
     }
     shootDownBackend():Promise<void>
+    setLog(opts:{until:string, results?:boolean})
 }
 
 }

package/lib/backend-plus.js

@@ -163,6 +163,7 @@ AppBackend.prototype.configStaticConfig = function configStaticConfig(){
           skins:
             "":
               local-path: for-client
+          bin: {}
         client-setup: 
           skin: ""
           lang: en
@@ -235,7 +236,11 @@ AppBackend.prototype.i18n.messages.en={
         fileUploaded:'file uploaded',
         unkownExt:'unkown file extension'
     },
-    server:{  
+    server:{
+        backupNotAvailable: 'Backup not available',
+        backupReady: 'Backup ready to download',
+        backupZipping: 'Zipping backup file',
+        badBackupEncryptKey: 'encrypt key not present or less than 10 characters',
         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',
@@ -314,6 +319,10 @@ AppBackend.prototype.i18n.messages.es={
         unkownExt:'extensión de archivo desconocida'
     },
     server:{
+        backupNotAvailable: 'Backup no disponible',
+        backupReady: 'Archivo listo para bajar',
+        backupZipping: 'Compactando el backup',
+        badBackupEncryptKey: 'Debe proveer una clave de encriptacion de 10 caracteres o mas para encriptar el archivo de destino',
         cantDelete_TLDR:'no se pudo eliminar el registro. Podrían haber problemas de persmisos, bloqueo de registros o problemas internos en la definición de la PK',
         cantInsert_TLDR:'no se pudo insertar el registro. Podrían haber problemas de persmisos, bloqueo de registros o problemas internos en la definición de la PK',
         cantUpdate_TLDR:'no se pudo modificar el registro. Podrían haber problemas de persmisos, bloqueo de registros o problemas internos en la definición de la PK',
@@ -483,6 +492,12 @@ AppBackend.prototype.isAdmin = function isAdmin(reqOrContext){
     return reqOrContext && (reqOrContext.forDump || reqOrContext.user && reqOrContext.user[be.config.login.rolFieldName] == 'admin');
 }
 
+AppBackend.prototype.can = function can(reqOrContext, what){
+    var be = this;
+    if (be.isAdmin(reqOrContext)) return true;
+    return reqOrContext?.user?.['can' + what];
+}
+
 AppBackend.prototype.canChangePass = async function canChangePass(reqOrContext, _userToChangePass){
     var be = this;
     return be.isAdmin(reqOrContext);
@@ -1286,6 +1301,7 @@ AppBackend.prototype.generateInsertSQL = function generateInsertSQL(schemaName,
 }
 
 AppBackend.prototype.updateUpdateSQL = function updateUpdateSQL(schemaName, tableName, updateElement, updateConditions){
+    var be = this;
     var {db} = this;
     var setPairs = [];
     for (var key in updateElement) {
@@ -2381,6 +2397,13 @@ AppBackend.prototype.addLoggedServices = function addLoggedServices(){
             }).catch(MiniTools.serveErr(req,res,next));
         });
     }
+    if(be.config.db['downloadable-backup-path']){
+        be.app.get('/backup-db.zip', function(req,res,next){
+            if (be.can(req, 'DownloadBackup')) {
+                MiniTools.serveFile('./local-private/backup-db.zip')(req,res,next);
+            }
+        })
+    }
     be.app.use(function(req,res,next){
         // req != '/keep-alive.json'
         req.session.lastNonKeepAlive = new Date().getTime();

package/lib/procedures-table.js

@@ -4,9 +4,11 @@
 var {datetime, changing, coalesce} = require('best-globals');
 var XLSX = require('xlsx');
 var fs = require('fs/promises')
+var fsSync = require('fs');
 var typeStore=require('type-store');
 var likeAr=require('like-ar');
 const f = require('session-file-store');
+const { expected } = require('cast-error');
 
 const PANIC_IMPORT = true;
 
@@ -1190,7 +1192,7 @@ ProcedureTables = [
         resultOk:'showGrid',
         coreFunction:async function(context,parameters){
             var {be,client} = context;
-            if(context.user[be.config.login.rolFieldName] != 'admin'){
+            if(!be.can(context,'SeeHistoryChanges')){
                 throw new Error('Forbiden history')
             }
             var tableDef = be.tableStructures[parameters.tableName](context);
@@ -1207,6 +1209,68 @@ ProcedureTables = [
             `,[parameters.tableName, parameters.fieldName]).fetchAll();
             return result.rows;
         }
+    },
+    {
+        action:'download_dump',
+        parameters:[
+            {name:'encrypt', typeName:'text'}
+        ],
+        bitacora:{always: true, error: true},
+        progress:true,
+        resultOk:'showDownloadUrl',
+        coreFunction:async function(context, parameters){
+            context.informProgress({message:"tart"});
+            var {be,client} = context;
+            if (!be.can(context,'DownloadBackup')) {
+                throw new Error('Forbiden backup')
+            }
+            if (parameters.encript?.length < 10) {
+                throw new Error(be.messages.server.badBackupEncryptKey)
+            }
+            var path = be.config.db['downloadable-backup-path']
+            if (!path) {
+                throw new Error(be.messages.server.backupNotAvailable)
+            }
+            context.informProgress({message:be.messages.server.backupZipping});
+            var spawn = require('child_process').spawn;
+            try {
+                await fs.mkdir('./local-private');
+            } catch (error) {
+                if (expected(error).code !== 'EEXIST') throw error;
+                try {
+                    await fs.unlink('./local-private/backup-db.zip');
+                } catch (error) {
+                    if (expected(error).code !== 'ENOENT') throw error;
+                }
+            }
+            var out = fsSync.createWriteStream('./local-private/backup-db.log');
+            await new Promise((resolve, reject) => {
+                out.on('error', reject);
+                out.on('open', resolve);
+            })
+            var zip = spawn(be.config.server.bin.zip ?? 'zip',[
+                ...(be.config.server.bin["zip-fixed-parameters"] ?? []),
+                ...(be.config.server.bin["zip-password-parameter-flag"] === false ? [] : [be.config.server.bin["zip-password-parameter-flag"] ?? '--password']), 
+                `${be.config.server.bin["zip-password-prefix"] ?? ''}${parameters.encrypt}` , 
+                './local-private/backup-db.zip', 
+                path                
+            ], {stdio: [out, out, out]});
+            var code = await new Promise((resolve, reject) => {
+                zip.on('data', chunk => out.write(chunk));
+                zip.on('error', err => {
+                    context.informProgress(err);
+                    out.end();
+                    reject(err);
+                });
+                zip.on('exit', any => {
+                    out.end();
+                    if (any) reject(new Error("ZIP Error: " + any));
+                    resolve(any);
+                });
+            })
+            context.informProgress({message:be.messages.server.backupReady});
+            return [{url: './backup-db.zip', label:'backup-db.zip'}];
+        }
     }
 ];
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.12",
   "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.4",
+    "nodemailer": "^6.9.6",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.3.3",
     "pikaday": "^1.8.2",
@@ -67,26 +67,26 @@
     "session-file-store": "^1.5.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
-    "stylus": "0.59.0",
+    "stylus": "0.60.0",
     "type-store": "^0.4.0",
     "typed-controls": "^0.12.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
   },
   "devDependencies": {
-    "@types/big.js": "^6.2.0",
-    "@types/expect.js": "~0.3.29",
-    "@types/express": "^4.17.17",
-    "@types/express-useragent": "^1.0.2",
-    "@types/fs-extra": "^11.0.1",
-    "@types/js-yaml": "^4.0.5",
-    "@types/mocha": "^10.0.1",
-    "@types/multiparty": "~0.0.33",
-    "@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",
-    "@types/websql": "~0.0.27",
+    "@types/big.js": "^6.2.1",
+    "@types/expect.js": "~0.3.31",
+    "@types/express": "^4.17.20",
+    "@types/express-useragent": "^1.0.4",
+    "@types/fs-extra": "^11.0.3",
+    "@types/js-yaml": "^4.0.8",
+    "@types/mocha": "^10.0.3",
+    "@types/multiparty": "~0.0.35",
+    "@types/node": "^20.8.7",
+    "@types/nodemailer": "^6.4.13",
+    "@types/numeral": "~2.0.4",
+    "@types/session-file-store": "^1.2.4",
+    "@types/stack-trace": "~0.0.32",
+    "@types/websql": "~0.0.29",
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
     "karma": "6.4.2",
@@ -98,11 +98,11 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^21.1.0",
-    "sinon": "^15.2.0",
+    "puppeteer": "^21.4.0",
+    "sinon": "^17.0.0",
     "supertest": "^6.3.3",
     "types.d.ts": "~0.6.18",
-    "typescript": "^5.1.6",
+    "typescript": "^5.2.2",
     "why-is-node-running": "^2.2.2"
   },
   "engines": {