backend-plus 1.17.0 → 1.17.1

package/for-client/my-tables.js

@@ -596,6 +596,7 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                         return row[fieldName]
                     })
                 };
+                var tick = Math.random();
                 rows.forEach(function(row){
                     var primaryKeyValuesForRow = getPrimaryKeyValues(primaryKey, row);
                     var depot = grid.depots.find(function(depot){
@@ -603,16 +604,41 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                         return sameValue(JSON.stringify(primaryKeyValuesForRow),JSON.stringify(primaryKeyValuesForDepotRow))
                     });
                     //chequeo que exista depot por las dudas
-                    if(depot && !sameValue(JSON.stringify(row),JSON.stringify(depot.row))){
-                        //grid.retrieveRowAndRefresh(depot); 
-                        grid.depotRefresh(depot,{updatedRow:row, sendedForUpdate:{}},{noDispatchEvents:true});
+                    if (depot) { 
+                        if (!sameValue(JSON.stringify(row),JSON.stringify(depot.row))) {
+                            //grid.retrieveRowAndRefresh(depot); 
+                            grid.depotRefresh(depot,{updatedRow:row, sendedForUpdate:{}},{noDispatchEvents:true});
+                        }
+                        depot.tick = tick
+                    } else if (!depot) {
+                        var depot = grid.createDepotFromRow(row);
+                        grid.depots.push(depot);
+                        grid.createRowElements(-1, depot);
+                        grid.updateRowData(depot);
+                        depot.tick = tick
                     }
                 })
+                var i = 0;
+                while (i < grid.depots.length) {
+                    var depot = grid.depots[i];
+                    if (depot.tick != tick) {
+                        depot.manager.displayAsDeleted(depot);
+                    } else {
+                        i++;
+                    }
+                }
             })
         }
         if(grid.def.refrescable){
             window.currentAutofrefresh = setInterval(grid.refreshAllRows,8000);
         }
+        if (grid.def.selfRefresh) {
+            var refresh = function refresh(){
+                grid.refreshAllRows();
+            }
+            grid.dom.main.addEventListener('deletedRowOk', refresh);
+            grid.dom.main.addEventListener('savedRowOk', refresh);
+        }
     });
     grid.waitForReady = function waitForReady(fun){
         return preparing.then(function(){

package/lib/backend-plus.d.ts

@@ -307,6 +307,8 @@ export type TableDefinition = EditableDbDefinition & {
     exportJsonFieldAsColumns?:string
     importCuidado?:boolean
     specialValidator?:string
+    saveAfter?:boolean
+    selfRefresh?: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/procedures-table.js

@@ -209,12 +209,15 @@ ProcedureTables = [
             }
             var fieldNames=updateTarget.fieldNames;
             var values=updateTarget.values;
-            var updates=likeAr(otherUpdates.tables).map(function(data,name){
+            var updatesOthers=likeAr(otherUpdates.tables).map(function(data,name){
                 var tableDef=be.tableStructures[name](context);
                 return {defTable:changing(tableDef, ((mainDefTable.sql.otherTableDefs||{})[name])||{}), ...data};
             }).array().concat(likeAr(otherUpdates.tableNames).map(function(data,name){
                 return {defTable:mainDefTable.otherTableDefs[name], ...data};
-            }).array()).concat(plainUpdate.values.length?[changing({defTable:mainDefTable,main:true},plainUpdate)]:[]);
+            }).array());
+            var updates = updatesOthers.filter(u => !u.defTable.saveAfter)
+                .concat(plainUpdate.values.length?[changing({defTable:mainDefTable,main:true},plainUpdate)]:[])
+                .concat(updatesOthers.filter(u => u.defTable.saveAfter));
             var globalPrimaryKeyValue={}
             mainDefTable.primaryKey.forEach(function(name,i){
                 globalPrimaryKeyValue[name]=parameters.primaryKeyValues[i];
@@ -249,13 +252,18 @@ ProcedureTables = [
                 var primaryKeyValuesForUpdate=[]
                 var primaryKeyValueObject={};
                 defTable.primaryKey.forEach(function(name,i){
-                    var value = main?parameters.primaryKeyValues[i]:coalesce(parameters.newRow[name],parameters.oldRow[name]);
+                    var value = main?parameters.primaryKeyValues[i]:coalesce(parameters.newRow[name],parameters.oldRow[name],undefined);
                     if(value===undefined){
                         var defField = defTable.field[name];
-                        value = 'defaultValue' in defField?defField.defaultValue:(
-                            'specialDefaultValue' in defField?new Error("my.specialDefaultValue[defField.specialDefaultValue](name, {row:{}}, {row:previousRow})"):null
-                        )
+                        value = defTable.prefilledField && name in defTable.prefilledField ? defTable.prefilledField[name] : (
+                            'defaultValue' in defField?defField.defaultValue:(
+                            'specialDefaultValue' in defField?new Error("my.specialDefaultValue[defField.specialDefaultValue](name, {row:{}}, {row:previousRow})"):undefined
+                        ))
+                        if(value===undefined){
+                            value = mainResult?.row?.[name]
+                        }
                     }
+                    value = value ?? null
                     primaryKeyValues[i]=value;
                     primaryKeyValueObject[name]=value;
                     if(globalPrimaryKeyValue[name]!==undefined){
@@ -263,6 +271,10 @@ ProcedureTables = [
                     }else{
                         primaryKeyValuesForUpdate[i]=value;
                     }
+                    if(!fieldNames4Insert.includes(name) && value != null){
+                        fieldNames4Insert.push(name); 
+                        values4Insert.push(value);
+                    }
                 });
                 if(main){
                     expectedMainPrimaryKeyValues=primaryKeyValues;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -56,7 +56,7 @@
     "multiparty": "^4.2.3",
     "nodemailer": "^6.9.1",
     "numeral": "^2.0.6",
-    "pg-promise-strict": "^1.3.1",
+    "pg-promise-strict": "^1.3.2",
     "pikaday": "^1.8.2",
     "pug": "^3.0.2",
     "read-yaml-promise": "^1.0.2",
@@ -68,7 +68,7 @@
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
     "stylus": "0.59.0",
-    "type-store": "^0.3.0",
+    "type-store": "^0.3.1",
     "typed-controls": "^0.11.0",
     "xlsx": "^0.18.5",
     "xlsx-style": "^0.8.13"
@@ -76,13 +76,13 @@
   "devDependencies": {
     "@types/big.js": "^6.1.6",
     "@types/expect.js": "~0.3.29",
-    "@types/express": "^4.17.16",
+    "@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": "^18.11.18",
+    "@types/node": "^18.13.0",
     "@types/nodemailer": "^6.4.7",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",