backend-plus 1.16.3 → 1.16.6

package/for-client/my-tables.js

@@ -178,17 +178,41 @@ myOwn.i18n.messages.es=changing(myOwn.i18n.messages.es, {
     zoom: "zoom",
 });
 
-var escapeRegExp = bestGlobals.escapeRegExp;
+/** @param {string} text */
+function regex4search(text){
+    return new RegExp(
+        text.trim().replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+        // .replace(/"/g,"\\b")
+        .replace(/[ñÑ]/g,'(?:gn|nn?i?|[ñÑ])')
+        .replace(/[cCçÇ]/g,'[cçÇ]')
+        .replace(/[áÁàÀäÄãÃ]/gi,'[AáÁàÀäÄãÃ]')
+        .replace(/[éÉèÈëË]/gi,'[EéÉèÈëË]')
+        .replace(/[íÍìÌïÏ]/gi,'[IíÍìÌïÏ]')
+        .replace(/[óÓòÒöÖõÕ]/gi,'[OóÓòÒöÖõÕ]')
+        .replace(/[úÚùÙüÜ]/gi,'[UúÚùÙüÜ]')
+        .replace(/a/gi,'[AáÁàÀäÄãÃ]')
+        .replace(/e/gi,'[EéÉèÈëË]')
+        .replace(/i/gi,'[IíÍìÌïÏ]')
+        .replace(/o/gi,'[OóÓòÒöÖõÕ]')
+        .replace(/u/gi,'[UúÚùÙüÜ]')
+        // .replace(/\s+/g,'.*\\s+.*') mas estricto, exige el espacio
+        .replace(/\s+/g,'.*')
+    , 'i');
+}
 
 myOwn.firstDisplayCount = 20;
 myOwn.firstDisplayOverLimit = 30;
 myOwn.displayCountBreaks = [100,250,1000];
 myOwn.displayCountBreaks = [50,100,500];
 myOwn.comparatorWidth = 16;
+myOwn.comparatorParameterNull={
+    '\u2205':true,
+    '!=\u2205':true,
+}
 myOwn.comparator={
     '=':function(valueToCheck,condition){return valueToCheck == condition;},
-    '~':function(valueToCheck,condition){return condition==null || RegExp(escapeRegExp(condition.toString()),'i').test(valueToCheck);},
-    '!~':function(valueToCheck,condition){return condition==null || !RegExp(escapeRegExp(condition.toString()),'i').test(valueToCheck);},
+    '~':function(valueToCheck,condition){return condition==null || regex4search(condition.toString()).test(valueToCheck);},
+    '!~':function(valueToCheck,condition){return condition==null || !regex4search(condition.toString()).test(valueToCheck);},
     '/R/i':function(valueToCheck,condition){return condition==null || RegExp(condition,'i').test(valueToCheck);},
     '\u2205':function(valueToCheck,condition){return valueToCheck == null;},//\u2205 = conjunto vacío
     '!=\u2205':function(valueToCheck,condition){return valueToCheck != null;},//\u2205 = conjunto vacío
@@ -749,12 +773,28 @@ myOwn.ActionColumnGrid.prototype.th = function th(){
 };
 
 myOwn.ActionColumnGrid.prototype.thFilter = function thFilter(depot){
-    var buttonFilter=html.button({id:'button-filter'},myOwn.messages.Filter+"!").create();
     var grid = this.grid;
-    buttonFilter.addEventListener('click',function(){
-        grid.updateFilterInfo(' (F) ');
-        grid.displayBody();
-    });
+    if(depot.firstFilter){
+        var buttonFilter=html.button({id:'button-filter'},myOwn.messages.Filter+"!").create();
+        buttonFilter.addEventListener('click',function(){
+            grid.updateFilterInfo(' (F) ');
+            grid.displayBody();
+        });
+    }else{
+        var buttonFilter=html.button({class:'table-button', 'when-filter':'yes', "skip-enter":true}, [
+            html.img({
+                src:my.path.img+'destroy-filter.png',
+                alt:'FILTER OFF',
+                title:my.messages.filterOff
+            })
+        ]).create();
+        buttonFilter.addEventListener('click',function(){
+            // HACIENDO
+            grid.view.filter = grid.view.filter.filter(d=>d!=depot);
+            var info = my.tableInfo(this);
+            info.tr.parentNode.removeChild(info.tr);
+        });
+    }
     return html.th([buttonFilter]);
 };
 
@@ -2400,6 +2440,7 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
         grid.sizesForFilters=Array.prototype.map.call(grid.dom.table.rows[0].cells,function(cell){
             return cell.offsetWidth;
         });
+        // HACIENDO
         var depot = {
             special: 'filter',
             my: grid.my,
@@ -2411,7 +2452,8 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
             rowSymbols: {},
             isFilterPending:false,
             tr: tr,
-            actionButton:{}
+            actionButton:{},
+            firstFilter: !otherRow
         };
         if(!grid.hasFilterRow){
             grid.hasFilterRow=[];
@@ -2424,11 +2466,8 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
         }
         var tr=html.tr({'class':'filter-line'}, grid.columns.map(function(column, iColumn){
             return column.thFilter(depot, iColumn);
-        }).filter(function(th,iColumn){
-           return iColumn || !grid.hasFilterRow.length;
         })).create();
         grid.hasFilterRow.push(tr);
-        grid.hasFilterRow[0].cells[0].rowSpan=grid.hasFilterRow.length;
         grid.dom.table.setAttribute('has-filter',1);
         if(grid.dom.table.tHead){ //TODO: el filtro para verticales debe organizarse sin tr
             grid.dom.table.tHead.appendChild(tr);
@@ -2445,15 +2484,18 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
                 while(iFilter<filterRows.length){
                     var filterData=filterRows[iFilter];
                     var partialOk=true;
+                    var columnsCompared = 0;
                     for(var column in depot.row){
-                        if(filterData.rowSymbols[column] && my.comparator[filterData.rowSymbols[column]]){
-                            var isSatisfied=my.comparator[filterData.rowSymbols[column]](depot.row[column],filterData.row[column]);
+                        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]);
                             if(!isSatisfied){
                                 partialOk=false;
                             }
+                            columnsCompared++;
                         }
                     }
-                    if(partialOk){
+                    if(partialOk && columnsCompared){
                         return true;
                     }
                     iFilter++;

package/for-client/my-things.js

@@ -602,6 +602,8 @@ function tableInfo(element){
     return info;
 }
 
+myOwn.tableInfo = tableInfo
+
 function getCaretPosition(element) {
     // https://stackoverflow.com/questions/4811822/get-a-ranges-start-and-end-offsets-relative-to-its-parent-container/4812022#4812022
     var caretOffset = 0;
@@ -911,7 +913,6 @@ myOwn.createSmartButton = function createSmartButton(opts){
     return button;
 };
 
-
 return myOwn;
 
 });

package/lib/backend-plus.d.ts

@@ -8,6 +8,8 @@ import * as pg from "pg-promise-strict";
 export * from "pg-promise-strict";
 export type MotorDb = typeof pg;
 
+export type LangId = 'en'|'es'|'etc...';
+
 export type Server=net.Server;
 
 export interface CoreFunctionParameters{
@@ -381,6 +383,9 @@ export class AppBackend{
     isThisProcedureAllowed<T>(context:Context, procedureDef:ProcedureDef, params:{[key:string]:T}):Promise<boolean>
     checkDatabaseStructure(client:Client):Promise<void>
     getDbFunctions(opts:DumpOptions):Promise<{dumpText:string}[]>
+    i18n:{
+        messages:Record<LangId,Record<string, string>>
+    }
 }
 
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.16.3",
+  "version": "1.16.6",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -28,6 +28,7 @@
     }
   ],
   "dependencies": {
+    "@upgraded/locate-path": "^6.0.0-alfa.1",
     "ajax-best-promise": "^0.3.7",
     "backend-skins": "^0.1.15",
     "best-globals": "^1.0.3",
@@ -48,13 +49,12 @@
     "json4all": "^1.1.0",
     "lazy-some": "^0.1.0",
     "like-ar": "^0.3.6",
-    "@upgraded/locate-path": "^6.0.0-alfa.1",
     "login-plus": "^1.6.2",
     "memorystore": "^1.6.7",
     "mini-tools": "^1.11.2",
-    "nodemailer": "^6.7.5",
     "moment": "^2.29.3",
     "multiparty": "^4.2.3",
+    "nodemailer": "^6.7.5",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.2.6",
     "pikaday": "^1.8.2",
@@ -67,7 +67,7 @@
     "session-file-store": "^1.5.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
-    "stylus": "^0.57.0",
+    "stylus": "0.56.0",
     "type-store": "^0.2.41",
     "typed-controls": "^0.10.0",
     "xlsx": "^0.18.5",
@@ -81,9 +81,9 @@
     "@types/fs-extra": "^9.0.13",
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^9.1.1",
-    "@types/nodemailer": "^6.4.4",
     "@types/multiparty": "~0.0.33",
     "@types/node": "^17.0.31",
+    "@types/nodemailer": "^6.4.4",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
     "@types/stack-trace": "~0.0.30",
@@ -116,7 +116,7 @@
     "test-ci": "(npm run prepublish || echo \"continue w/error\") && mocha --reporter spec --bail  test/test*.js",
     "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-pu": "node ./test/download_puppeteer && 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",