backend-plus 1.18.10 → 1.18.12

package/for-client/my-tables.js

@@ -563,6 +563,21 @@ function upadteNumberOfRows(depot,grid){
     depot.manager.dom.footInfo.displayTo.textContent=grid.depotsToDisplay.length;
 }
 
+var TIME_STAMP_PROP = Symbol('TIME_STAMP_PROP');
+myOwn.setTimeStamp = function setTimeStamp(row){
+    var timeStamp = new Date().getTime();
+    row[TIME_STAMP_PROP] = timeStamp;
+    console.log('SET=', timeStamp, row[TIME_STAMP_PROP], JSON4all.toUrl(row))
+    return timeStamp;
+}
+
+myOwn.skipTimeStamp = function skipTimeStamp(row, timeStamp){
+    var skip = (row[TIME_STAMP_PROP] || 0) > timeStamp;
+    console.log(skip ? 'SKIP' : 'PASS', timeStamp, row[TIME_STAMP_PROP], JSON4all.toUrl(row))
+    if (!skip) row[TIME_STAMP_PROP] = timeStamp;
+    return skip;
+}
+
 myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
     var my = this;
     var grid = new my.TableGrid({my: this}, mainElement);
@@ -587,6 +602,7 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
             })
         }
         grid.refreshAllRows = function(){
+            var timeStamp = new Date().getTime();
             grid.connector.my.ajax.table_data({
                 table:grid.connector.tableName,
                 fixedFields:grid.connector.fixedFields,
@@ -599,7 +615,9 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                     })
                 };
                 var tick = Math.random();
+                var thereIsANewRecord = grid.depots.filter(depot => depot.status == 'new').length;
                 rows.forEach(function(row){
+                    if (my.skipTimeStamp(row, timeStamp)) return;
                     var primaryKeyValuesForRow = getPrimaryKeyValues(primaryKey, row);
                     var depot = grid.depots.find(function(depot){
                         var primaryKeyValuesForDepotRow = getPrimaryKeyValues(primaryKey, depot.row);
@@ -614,7 +632,7 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                             }
                         }
                         depot.tick = tick
-                    } else if (!depot) {
+                    } else if (!depot && !thereIsANewRecord) {
                         var depot = grid.createDepotFromRow(row);
                         grid.depots.push(depot);
                         grid.sortDepotsToDisplay(grid.depots);
@@ -627,13 +645,15 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
                         },3000);
                     }
                 })
-                var i = 0;
-                while (i < grid.depots.length) {
-                    var depot = grid.depots[i];
-                    if (depot.tick != tick) {
-                        depot.manager.displayAsDeleted(depot);
-                    } else {
-                        i++;
+                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++;
+                        }
                     }
                 }
             })
@@ -2295,7 +2315,9 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
                     return Promise.resolve(); // no grabo todavía
                 };
             }
+            var timeStamp = my.setTimeStamp(depot.row);
             return grid.connector.saveRecord(depot, opts).then(function(result){
+                if (my.skipTimeStamp(depot.row, timeStamp)) return;
                 grid.depotRefresh(depot,result);
             }).catch(function(err){
                 changeIoStatus(depot,'error',depot.rowPendingForUpdate,err.message);

package/lib/backend-plus.js

@@ -1282,7 +1282,14 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
             if(!isLowerIdent(procedureDef.action)){
                 console.error('**** DEPRECATED ***** procedureDef action '+JSON.stringify(procedureDef.action)+' must be a Lower Ident');
             }
-            app[procedureDef.method]('/'+procedureDef.action, async function(req, res, next){
+            app[procedureDef.method]('/'+procedureDef.action, 
+            /**
+             * 
+             * @param {Request} req 
+             * @param {Response} res 
+             * @param {import('express').NextFunction} next 
+             */
+            async function(req, res, next){
                 const BITACORA_TABLENAME = be.config.server.bitacoraTableName || 'bitacora';
                 var getDatetimeString = function getDatetimeString(){
                     return datetime.now().toPlainString()
@@ -1498,6 +1505,10 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                                 })
                             })
                         }
+                        var bpClientTs = req.get('BP-Client-TS');
+                        if(bpClientTs){
+                            res.append('BP-Client-TS', bpClientTs);
+                        }
                         res.append('Content-Type', 'application/octet-stream');
                         return Promise.resolve().then(function(){
                             var thisCache;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.18.10",
+  "version": "1.18.12",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -29,7 +29,7 @@
   ],
   "dependencies": {
     "@upgraded/locate-path": "^6.0.0-alfa.1",
-    "ajax-best-promise": "^0.3.7",
+    "ajax-best-promise": "^0.4.0",
     "backend-skins": "^0.1.15",
     "best-globals": "^1.1.0",
     "big.js": "^6.2.1",
@@ -81,7 +81,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^10.0.1",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^20.2.3",
+    "@types/node": "^20.2.5",
     "@types/nodemailer": "^6.4.8",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
@@ -98,7 +98,7 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^20.2.1",
+    "puppeteer": "^20.4.0",
     "sinon": "^15.1.0",
     "supertest": "^6.3.3",
     "types.d.ts": "~0.6.14",

package/unlogged/my-ajax.js

@@ -315,12 +315,17 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
                 informProgress({start:true})
             }
         }, 500)
-        return AjaxBestPromise[procedureDef.method]({
+        var ajaxCall = AjaxBestPromise[procedureDef.method]({
             multipart:procedureDef.files,
             url:procedureDef.action,
             data:params,
-            uploading:opts.uploading
-        }).onLine(function(line,ender){
+            uploading:opts.uploading,
+            headers:opts.headers
+        });
+        if (opts.headersConsumer) {
+            ajaxCall = ajaxCall.onHeaders(opts.headersConsumer);
+        }
+        return ajaxCall.onLine(function(line,ender){
             controlLoggedIn(line);
             if(progress){
                 if(line.substr(0,2)=='--'){