backend-plus 2.0.0-beta.9 → 2.0.0-rc.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/README.md +6 -6
  2. package/for-client/css/my-menu.styl +1 -0
  3. package/for-client/my-localdb.js.map +1 -1
  4. package/for-client/my-menu.js +23 -11
  5. package/for-client/my-tables.js +55 -18
  6. package/for-client/my-websqldb.js.map +1 -1
  7. package/install/get_app_user-fun.sql +6 -0
  8. package/lib/backend-plus.d.ts +14 -10
  9. package/lib/backend-plus.js +125 -29
  10. package/lib/procedures-table.js +90 -7
  11. package/lib/table-def-adapt.js +1 -1
  12. package/package.json +37 -36
  13. package/unlogged/my-ajax.js +1 -0
package/README.md CHANGED
@@ -6,11 +6,11 @@ Backend for the anti Pareto rule.
6
6
 
7
7
 
8
8
  ![stable](https://img.shields.io/badge/stability-stable-blue.svg)
9
- [![npm-version](https://img.shields.io/npm/v/backend-star.svg)](https://npmjs.org/package/backend-star)
10
- [![downloads](https://img.shields.io/npm/dm/backend-star.svg)](https://npmjs.org/package/backend-star)
11
- [![build](https://img.shields.io/travis/codenautas/backend-star/master.svg)](https://travis-ci.org/codenautas/backend-star)
12
- [![coverage](https://img.shields.io/coveralls/codenautas/backend-star/master.svg)](https://coveralls.io/r/codenautas/backend-star)
13
- [![dependencies](https://img.shields.io/david/codenautas/backend-star.svg)](https://david-dm.org/codenautas/backend-star)
9
+ [![npm-version](https://img.shields.io/npm/v/backend-plus.svg)](https://npmjs.org/package/backend-plus)
10
+ [![downloads](https://img.shields.io/npm/dm/backend-plus.svg)](https://npmjs.org/package/backend-plus)
11
+ [![build](https://img.shields.io/travis/codenautas/backend-plus/master.svg)](https://travis-ci.org/codenautas/backend-plus)
12
+ [![coverage](https://img.shields.io/coveralls/codenautas/backend-plus/master.svg)](https://coveralls.io/r/codenautas/backend-plus)
13
+ [![dependencies](https://img.shields.io/david/codenautas/backend-plus.svg)](https://david-dm.org/codenautas/backend-plus)
14
14
 
15
15
 
16
16
  language: ![English](https://raw.githubusercontent.com/codenautas/multilang/master/img/lang-en.png)
@@ -205,7 +205,7 @@ entry | usage
205
205
  -----------------------------|---------------
206
206
  server |
207
207
  .port | port where is listening
208
- .base-rul | base url added to domain name
208
+ .base-url | base url added to domain name
209
209
  .module-store |
210
210
  install | (see Spanish)
211
211
  .dump | (see Spanish)
package/for-client/css/my-menu.styl CHANGED
@@ -95,6 +95,7 @@ img.light
95
95
 
96
96
  .result-div
97
97
  min-height 40px
98
+ padding 4px
98
99
 
99
100
  .result-pre
100
101
  white-space pre
package/for-client/my-localdb.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"my-localdb.js","sourceRoot":"","sources":["../src/for-client/my-localdb.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"my-localdb.js","sourceRoot":"","sources":["../src/for-client/my-localdb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAA,iDAAiD;IACjD,YAAY,CAAC;;;IACb,uFAAuF;IACvF,kEAAkE;IAClE,+EAA+E;IAC/E,0DAA0D;IAC1D,uDAAuD;IACvD,uDAAuD;IACvD,oDAAoD;IACpD,oDAAoD;IACpD,iDAAiD;IACjD,iDAAiD;IACjD,8CAA8C;IAE9C;;;;;;;;;;;;;;;;;;;;OAoBG;IAGH,gCAAkC;IA6BvB,QAAA,gBAAgB,GAAgB;QACvC,qBAAqB,EAAC,IAAI;KAC7B,CAAA;IAED;QAGI,iBAAmB,IAAW;YAAX,SAAI,GAAJ,IAAI,CAAO;YAC1B,IAAI,GAAG,GAAC,IAAI,CAAC;YACb,IAAI,aAAa,GAAW;gBACxB,WAAW,EAAC,MAAM;gBAClB,UAAU,EAAC,KAAK;gBAChB,OAAO,EAAC,CAAC,WAAW,CAAC;aACxB,CAAC;YACF,IAAI,kBAAkB,GAAa;gBAC/B,GAAG,EAAC,SAAS;gBACb,GAAG,EAAC,CAAC;gBACL,SAAS,EAAC,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE;gBAC7B,MAAM,EAAC,aAAa;aACvB,CAAA;YACD,IAAI,SAAS,GAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxC,SAAS,CAAC,eAAe,GAAG;gBACxB,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC;gBAC1B,IAAG,CAAC,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAC,CAAC;oBAC5C,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,UAAS,OAAe,EAAE,SAAiB;wBACrE,IAAI,KAAK,GAAG,EAAE,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,CAAC,CAAC;wBAChE,IAAG,SAAS,IAAE,YAAY,EAAC,CAAC;4BACxB,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;wBAClC,CAAC;wBACD,IAAG,SAAS,IAAE,SAAS,EAAC,CAAC;4BACrB,GAAG,CAAC,qBAAqB,GAAG,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;wBAC1D,CAAC;oBACL,CAAC,CAAC,CAAA;gBACN,CAAC;YACL,CAAC,CAAA;YACD,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QACa,sBAAc,GAA5B,UAA6B,IAAW;YACpC,IAAI,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC7C,OAAO,IAAI,OAAO,CAAC,UAAS,OAAO,EAAC,MAAM;gBACtC,OAAO,CAAC,SAAS,GAAC;oBACd,OAAO,EAAE,CAAA;gBACb,CAAC,CAAA;gBACD,OAAO,CAAC,OAAO,GAAC,UAAS,KAAK;oBAC1B,MAAM,EAAE,CAAA;gBACZ,CAAC,CAAA;YACL,CAAC,CAAC,CAAA;QACN,CAAC;QAIa,sBAAI,GAAlB,UAAmB,OAAmD;;;oBAClE,sBAAO,IAAI,OAAO,CAAC,UAAS,OAAO,EAAE,MAAM;4BACvC,IAAG,WAAW,IAAI,OAAO,EAAC,CAAC;gCACvB,OAAO,CAAC,SAAS,GAAC;oCACd,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gCAC5B,CAAC,CAAA;4BACL,CAAC;iCAAI,CAAC;gCACF,OAAO,CAAC,UAAU,GAAC;oCACf,OAAO,EAAE,CAAC;gCACd,CAAC,CAAA;4BACL,CAAC;4BACD,OAAO,CAAC,OAAO,GAAC;gCACZ,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gCAC1D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;4BAC1B,CAAC,CAAA;wBACL,CAAC,CAAC,EAAA;;;SACL;QACK,mCAAiB,GAAvB,UAAwB,QAAwB;;;;;;4BACxC,GAAG,GAAG,IAAI,CAAC;4BACX,cAAc,GAAC,IAAI,CAAC,OAAO,CAAC;4BAC5B,YAAY,GAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;4BACxE,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,UAAA,MAAM,IAAE,OAAA,MAAM,CAAC,OAAO,EAAd,CAAc,CAAC,CAAC;4BAC9C,qBAAM,YAAY,EAAA;;4BAAzB,MAAM,GAAC,SAAkB;4BAC7B,sBAAO,MAAM,CAAC,MAAM,EAAC;;;;SACxB;QACK,gCAAc,GAApB,UAAqB,KAAoB;;;oBACrC,sBAAO,IAAI,OAAO,CAAiB,UAAC,OAAO;4BACvC,IAAG,CAAC;gCACA,aAAa;gCACb,IAAI,EAAE,GAAW,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gCAClD,aAAa;gCACb,IAAI,OAAO,GAAW,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BACxF,CAAC;4BAAA,OAAM,GAAG,EAAC,CAAC;gCACR,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAC;4BAC1C,CAAC;4BACD,IAAG,EAAE,KAAK,MAAM,IAAI,OAAO,GAAG,EAAE,EAAC,CAAC;gCAC9B,wBAAgB,CAAC,qBAAqB,GAAC,IAAI,CAAA;gCAC3C,OAAO,CAAE,wBAAgB,CAAC,CAAA;4BAC9B,CAAC;iCAAI,CAAC;gCACF,IAAI,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,EAAC,SAAS,EAAC,KAAK,EAAC,CAAC,CAAC;gCAC3C,OAAO,CAAC,SAAS,GAAC;oCACd,IAAI,GAAG,GAAC,OAAO,CAAC,MAAM,CAAC;oCACvB,IAAG,OAAO,GAAG,KAAK,QAAQ,EAAC,CAAC;wCACxB,wBAAgB,CAAC,qBAAqB,GAAC,IAAI,CAAC;oCAChD,CAAC;yCAAI,CAAC;wCACF,wBAAgB,CAAC,qBAAqB,GAAC,KAAK,CAAC;oCACjD,CAAC;oCACD,OAAO,CAAE,wBAAgB,CAAC,CAAA;gCAC9B,CAAC,CAAC;gCACF,OAAO,CAAC,OAAO,GAAC;oCACZ,wBAAgB,CAAC,qBAAqB,GAAC,IAAI,CAAC;oCAC5C,OAAO,CAAE,wBAAgB,CAAC,CAAA;gCAC9B,CAAC,CAAC;4BACN,CAAC;wBACL,CAAC,CAAC,EAAC;;;SACN;QACa,yCAAuB,GAArC,UAAsC,QAAwB,EAAE,OAA4B;;;;;;4BAIpF,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,OAAO,EAAA;;4BAAhB,EAAE,GAAC,SAAa;4BAChB,MAAM,GAAsD,EAAC,OAAO,SAAA,EAAE,MAAM,EAAC,EAAC,OAAO,EAAC,IAAI,EAAC,EAAC,CAAC;4BAClF,qBAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,aAAa,EAAC,UAAU,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAA;;4BAAlH,QAAQ,GAAG,SAAuG;4BACtH,IAAG,CAAC,QAAQ,EAAC,CAAC;gCACV,MAAM,CAAC,MAAM,CAAC,GAAG,GAAC,IAAI,CAAC;4BAC3B,CAAC;4BACD,qBAAM,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,aAAa,EAAC,WAAW,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAA;;4BAAlG,SAAkG,CAAC;4BACnG,MAAM,CAAC,MAAM,CAAC,OAAO,GAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;4BACzE,IAAG,CAAC,GAAG,CAAC,qBAAqB,EAAC,CAAC;gCAC3B,GAAG,CAAC,qBAAqB,GAAG,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,WAAW,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;4BACjH,CAAC;4BACD,qBAAM,GAAG,CAAC,qBAAqB,EAAA;;4BAA/B,SAA+B,CAAC;4BAC5B,SAAS,GAAC,wBAAgB,CAAC,qBAAqB,CAAA,CAAC,CAAA,IAAI,CAAA,CAAC,CAAA,QAAQ,CAAC,UAAU,CAAC;4BAC5D,qBAAM,IAAI,CAAC,IAAI,CAAc,EAAE,CAAC,WAAW,CAAC,YAAY,EAAC,UAAU,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAA;;4BAA5H,WAAW,GAAG,SAA8G;iCAC7H,CAAA,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA,EAA5E,wBAA4E;4BAC3E,EAAE,CAAC,KAAK,EAAE,CAAC;4BACX,WAAW,CAAC,GAAG,EAAE,CAAC;4BACd,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAC,WAAW,CAAC,GAAG,CAAC,CAAC;4BAC1D,SAAS,CAAC,eAAe,GAAG;gCACxB,IAAI,EAAE,GAAC,SAAS,CAAC,MAAM,CAAC;gCACxB,IAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,CAAC;oCAClC,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gCACxC,CAAC;gCACD,IAAG,SAAS,IAAE,IAAI,EAAC,CAAC;oCAChB,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,EAAC,EAAC,OAAO,EAAC,SAAS,EAAC,CAAC,CAAA;gCAC3D,CAAC;qCAAI,CAAC;oCACF,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gCACvC,CAAC;4BACL,CAAC,CAAA;4BACD,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BAChC,qBAAM,MAAM,CAAC,OAAO,EAAA;;4BAAzB,EAAE,GAAG,SAAoB,CAAC;4BAC1B,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAC,SAAS,CAAC;4BAC5C,qBAAM,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,YAAY,EAAC,WAAW,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAA;;4BAAnG,SAAmG,CAAC;;gCAExG,sBAAO,MAAM,EAAC;;;;SACjB;QACK,8BAAY,GAAlB,UAAmB,SAAgB;;;;;;4BAC3B,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,GAAG,CAAC,OAAO,EAAA;;4BAApB,EAAE,GAAC,SAAiB;4BACxB,IAAG,CAAC,GAAG,CAAC,qBAAqB,EAAC,CAAC;gCAC3B,GAAG,CAAC,qBAAqB,GAAG,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,WAAW,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;4BACjH,CAAC;4BACD,qBAAM,GAAG,CAAC,qBAAqB,EAAA;;4BAA/B,SAA+B,CAAC;4BACjB,qBAAM,GAAG,CAAC,IAAI,CACzB,EAAE,CAAC,WAAW,CAAC,aAAa,EAAC,UAAU,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CACrF,EAAA;;4BAFG,QAAQ,GAAG,SAEd;4BACD,sBAAO,QAAQ,EAAC;;;;SACnB;QACK,iCAAe,GAArB,UAAsB,SAAgB;;;;;gCACnB,qBAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA7C,QAAQ,GAAG,SAAkC;4BACjD,sBAAO,QAAQ,CAAA,CAAC,CAAA,IAAI,CAAA,CAAC,CAAA,KAAK,EAAC;;;;SAC9B;QACK,gCAAc,GAApB,UAAwB,SAAgB,EAAE,GAAO;;;;;;4BACzC,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,GAAG,CAAC,OAAO,EAAA;;4BAApB,EAAE,GAAC,SAAiB;4BAExB,IAAG,wBAAgB,CAAC,qBAAqB,EAAC,CAAC;gCACvC,WAAW,GAAC,SAAS,GAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;4BAC9C,CAAC;iCAAI,CAAC;gCACF,WAAW,GAAC,GAAG,CAAC;4BACpB,CAAC;4BACY,qBAAM,GAAG,CAAC,IAAI,CAAI,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,UAAU,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,EAAA;;4BAAxG,MAAM,GAAG,SAA+F;4BAC5G,sBAAO,MAAM,EAAC;;;;SACjB;QACK,wBAAM,GAAZ,UAAgB,SAAgB,EAAE,GAAO;;;;;gCACxB,qBAAM,IAAI,CAAC,cAAc,CAAI,SAAS,EAAE,GAAG,CAAC,EAAA;;4BAArD,MAAM,GAAG,SAA4C;4BACzD,IAAG,CAAC,MAAM,EAAC,CAAC;gCACR,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;4BACjC,CAAC;4BACD,sBAAO,MAAM,EAAC;;;;SACjB;QACK,0BAAQ,GAAd,UAAkB,SAAgB,EAAE,SAAa;;;;;;4BACzC,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,GAAG,CAAC,OAAO,EAAA;;4BAApB,EAAE,GAAC,SAAiB;4BACpB,IAAI,GAAK,EAAE,CAAC;4BAGhB,IAAG,wBAAgB,CAAC,qBAAqB,EAAC,CAAC;gCACvC,WAAW,GAAC,SAAS,GAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gCAChD,WAAW,GAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAC,WAAW,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;4BAC3D,CAAC;iCAAI,CAAC;gCACF,WAAW,GAAC,SAAS,CAAA,CAAC,CAAA,SAAS,CAAA,CAAC,CAAA,EAAE,CAAC;4BACvC,CAAC;4BACG,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,EAAC,UAAU,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,SAAS,IAAE,IAAI,CAAA,CAAC,CAAA,IAAI,CAAA,CAAC,CAAA,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;4BAChJ,sBAAO,IAAI,OAAO,CAAM,UAAS,OAAO,EAAE,MAAM;oCAC5C,MAAM,CAAC,SAAS,GAAC,UAAS,KAAK;wCAC3B,wGAAwG;wCACxG,IAAI,MAAM,GAAsB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;wCACpD,IAAG,MAAM,IAAI,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CACjC,wBAAgB,CAAC,qBAAqB,CAAC,CAAC;4CACpC,WAAW,IAAK,MAAM,CAAC,GAAc,CAAC,KAAK,CAAC,CAAC,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;4CACnE,CAAE,SAAS,CAAC,IAAI,CAAC,UAAS,aAAa,EAAC,CAAC;gDACrC,IAAI,WAAW,GAAI,MAAM,CAAC,GAAa,CAAC,CAAC,CAAC,CAAA;gDAC1C,OAAO,aAAa,IAAI,WAAW,CAAA;4CACvC,CAAC,CAAC,CACL,CAAC,EACL,CAAC;4CACE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;4CACxB,MAAM,CAAC,QAAQ,EAAE,CAAC;wCACtB,CAAC;6CAAI,CAAC;4CACF,OAAO,CAAC,IAAI,CAAC,CAAC;wCAClB,CAAC;oCACL,CAAC,CAAA;oCACD,MAAM,CAAC,OAAO,GAAC;wCACX,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCACzB,CAAC,CAAA;gCACL,CAAC,CAAC,EAAC;;;;SACN;QACK,wBAAM,GAAZ,UAAgB,SAAgB;;;oBAC5B,sBAAO,IAAI,CAAC,QAAQ,CAAI,SAAS,EAAC,SAAS,CAAC,CAAC,CAAC,IAAE,GAAG,CAAA,CAAC,CAAA,IAAI,CAAA,CAAC,CAAA,EAAE,CAAC,EAAC;;;SAChE;QACK,kCAAgB,GAAtB;;;oBACI,sBAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAC;;;SACrC;QACK,yBAAO,GAAb,UAAc,SAAgB;;;;;;4BACtB,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,GAAG,CAAC,OAAO,EAAA;;4BAApB,EAAE,GAAC,SAAiB;4BACL,qBAAM,GAAG,CAAC,IAAI,CAAS,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,UAAU,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,EAAA;;4BAA1G,KAAK,GAAU,SAA2F;4BAC9G,sBAAO,KAAK,IAAI,CAAC,EAAC;;;;SACrB;QAGa,sCAAoB,GAAlC,UAAqD,SAAgB,EAAE,OAAS,EAAE,MAAc;;;;;;4BACxF,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,GAAG,CAAC,OAAO,EAAA;;4BAApB,EAAE,GAAC,SAAiB;4BACX,qBAAM,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA1C,QAAQ,GAAC,SAAiC;4BAC1C,kBAAkB,GAAG,SAAS,kBAAkB,CAAC,EAAa;gCAC9D,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;;;;;wDACX,qBAAM,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,UAAU,CAAC,EAAA;;oDAAhD,UAAU,GAAC,SAAqC;yDACjD,UAAU,EAAV,wBAAU;oDACL,EAAE,GAAY,EAAE,CAAC;oDACrB,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,UAAS,KAAmC;wDAC1D,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;oDACnC,CAAC,CAAC,CAAA;oDACE,oBAAoB,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,UAAS,KAAmC;wDACpF,OAAO,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,CAAA;oDACxC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAA;yDACX,oBAAoB,EAApB,wBAAoB;oDACA,qBAAM,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,EAAA;;oDAA1D,QAAQ,GAAO,SAA2C;oDAC9D,IAAG,QAAQ,EAAC,CAAC;wDACT,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,UAAS,KAAK;4DACnC,OAAO,CAAC,EAAE,CAAC,KAAK,GAAG,IAAI,GAAG,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;wDACvD,CAAC,CAAC,CAAA;oDACN,CAAC;;;;;;iCAGZ,CAAC,CAAA;4BACN,CAAC,CAAA;4BACG,aAAa,GAAoB,EAAE,CAAC;4BACxC,IAAG,QAAQ,CAAC,WAAW,EAAC,CAAC;gCACrB,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,UAAe,EAAE;;;4CAC1C,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;;;;iCAC9C,CAAC,CAAC;4BACP,CAAC;4BACD,IAAG,QAAQ,CAAC,eAAe,EAAC,CAAC;gCACzB,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,UAAe,EAAE;;;4CAC9C,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;;;;iCAC9C,CAAC,CAAC;4BACP,CAAC;4BACD,sBAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC;;;;;;oDACnC,IAAG,wBAAgB,CAAC,qBAAqB,EAAC,CAAC;wDACnC,MAAM,GAAC,SAAS,GAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,UAAS,IAAI;4DACrE,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;wDACzB,CAAC,CAAC,CAAC,CAAC;wDACA,SAAS,GAAC,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,WAAW,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,OAAO,EAAC,MAAM,CAAC,CAAC;oDACnG,CAAC;yDAAI,CAAC;wDACE,SAAS,GAAC,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,WAAW,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;oDAC5F,CAAC;yDACE,MAAM,EAAN,wBAAM;oDACG,qBAAM,GAAG,CAAC,IAAI,CAAM,SAAS,CAAC,EAAA;;oDAAlC,GAAG,GAAC,SAA8B;oDAC/B,qBAAM,GAAG,CAAC,IAAI,CAAI,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,UAAU,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAA;wDAA9F,sBAAO,SAAuF,EAAA;wDAE9F,sBAAO,IAAI,EAAC;;;;iCAEnB,CAAC,EAAC;;;;SACN;QACK,wBAAM,GAAZ,UAAgB,SAAgB,EAAE,OAAS;;;oBACvC,sBAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,EAAC;;;SAC9D;QACK,yBAAO,GAAb,UAAiB,SAAgB,EAAE,QAAY;;gBAS3C,SAAS,OAAO;oBACZ,IAAG,CAAC,GAAC,QAAQ,CAAC,MAAM,EAAC,CAAC;wBAClB,IAAG,wBAAgB,CAAC,qBAAqB,EAAC,CAAC;4BACvC,IAAI,MAAM,GAAC,SAAS,GAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,UAAS,IAAI;gCACrE,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;4BAC7B,CAAC,CAAC,CAAC,CAAC;4BACJ,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAC,MAAM,CAAC,CAAC,SAAS,GAAC,OAAO,CAAC;wBAC1D,CAAC;6BAAI,CAAC;4BACF,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,GAAC,OAAO,CAAC;wBACnD,CAAC;wBACD,EAAE,CAAC,CAAC;oBACR,CAAC;yBAAI,CAAC;wBACF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;oBAC7B,CAAC;gBACL,CAAC;;;;;4BAtBG,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,GAAG,CAAC,OAAO,EAAA;;4BAApB,EAAE,GAAC,SAAiB;4BACX,qBAAM,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,EAAA;;4BAA1C,QAAQ,GAAC,SAAiC;4BAE1C,WAAW,GAAC,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,WAAW,CAAC,CAAC;4BAClD,WAAW,GAAC,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;4BAC/C,CAAC,GAAG,CAAC,CAAC;4BACV,OAAO,EAAE,CAAC;;;;;SAgBb;QACK,uBAAK,GAAX;;;;;gCACW,qBAAM,IAAI,CAAC,OAAO,EAAA;;4BAArB,EAAE,GAAC,SAAkB;4BACzB,EAAE,CAAC,KAAK,EAAE,CAAC;4BACX,IAAI,CAAC,OAAO,GAAC;gCACT,IAAI,EAAC;oCACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;gCAC7C,CAAC;gCACD,KAAK,EAAC;oCACF,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;gCAC7C,CAAC;6BACJ,CAAA;;;;;SACJ;QACK,uBAAK,GAAX,UAAY,SAAgB;;;;;;4BACpB,GAAG,GAAC,IAAI,CAAC;4BACN,qBAAM,GAAG,CAAC,OAAO,EAAA;;4BAApB,EAAE,GAAC,SAAiB;4BACxB,qBAAM,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,SAAS,EAAC,WAAW,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC,EAAA;;4BAApF,SAAoF,CAAC;;;;;SACxF;QACL,cAAC;IAAD,CAAC,AAzUD,IAyUC;IAzUY,0BAAO;IA2UpB;QAEI,4BAAmB,WAAmB;YAAnB,gBAAW,GAAX,WAAW,CAAQ;YAD9B,kBAAa,GAAc,OAAO,CAAC,OAAO,EAAE,CAAC;YAEjD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3C,CAAC;QACK,0CAAa,GAAnB,UAAuB,QAAkC;;;;oBACjD,IAAI,GAAC,IAAI,CAAC,WAAW,CAAC;oBAC1B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;;4BAIzC,SAAe,QAAQ,CAAC,aAAoB;;;;;;;gDAEpC,qBAAM,GAAG,CAAC,KAAK,EAAE,EAAA;;gDAAjB,SAAiB,CAAC;gDAClB,IAAG,aAAa,EAAC,CAAC;oDACd,cAAc;oDACd,aAAa,CAAC,YAAY,GAAC,IAAI,CAAC;gDACpC,CAAC;;;;gDAED,IAAG,aAAa,EAAC,CAAC;oDACd,cAAc;oDACd,aAAa,CAAC,sBAAsB,GAAC,UAAQ,CAAC;gDAClD,CAAC;qDAAI,CAAC;oDACF,MAAM,UAAQ,CAAC;gDACnB,CAAC;;;;;;6BAER;;;;;wCAlBG,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;;;;wCAoBb,qBAAM,QAAQ,CAAC,GAAG,CAAC,EAAA;;wCAA1B,MAAM,GAAC,SAAmB;;;;wCAE9B,qBAAM,QAAQ,CAAC,KAAG,CAAC,EAAA;;wCAAnB,SAAmB,CAAC;wCACpB,MAAM,KAAG,CAAC;;oCAEd,mBAAmB;oCACnB,sBAAO,MAAM,EAAC;;;;qBACrB,CAAC,CAAC;oBACC,sBAAO,IAAI,CAAC,aAAa,EAAC;;;SAC7B;QACD,mDAAsB,GAAtB;YACI,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,OAAO,UAAS,GAAG;gBACf,OAAO,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC,CAAA;QACL,CAAC;QACL,yBAAC;IAAD,CAAC,AA5CD,IA4CC;IA5CY,gDAAkB"}
package/for-client/my-menu.js CHANGED
@@ -56,6 +56,9 @@ myOwn.wScreens.table = function(addrParams){
56
56
  if(addrParams.detailing){
57
57
  opts.detailing=addrParams.detailing;
58
58
  }
59
+ if(addrParams.pick){
60
+ opts.pick=addrParams.pick;
61
+ }
59
62
  opts.detailingForUrl=opts.detailing||{};
60
63
  opts.detailingPath = [];
61
64
  var pageTitle = addrParams.label || addrParams.name || addrParams.table || my.config.config.title;
@@ -67,19 +70,26 @@ myOwn.wScreens.table = function(addrParams){
67
70
  myOwn.wScreens.procAux = {
68
71
  showParams:function(formDef, main_layout, addrParams, mainAction){
69
72
  var autoproced = addrParams.autoproced || false
70
- addrParams.up=addrParams.up||{};
73
+ addrParams.up=addrParams.up||addrParams.ff||{};
71
74
  var params=addrParams.up;
72
75
  // var button = html.button(formDef.proceedLabel||my.messages.proceed).create();
73
76
  var label = formDef.proceedLabel||my.messages.proceed;
74
- var button = my.createForkeableButton({}, label);
77
+ var refresUrl = formDef.method != 'post' || formDef.autoproced !== false
78
+ var buttonOptions = {label}
79
+ if (formDef.method == 'post') {
80
+ buttonOptions.onclick = function(event){ event.preventDefault(); proceed(); }
81
+ }
82
+ var button = my.createForkeableButton({}, buttonOptions);
75
83
  var setHref = function(){
76
- button.setForkeableHref({
77
- ...addrParams,
78
- autoproced:true,
79
- directUrl:true,
80
- ...(formDef && formDef.proceedLabel ? {label} : {}),
81
- ...params
82
- })
84
+ if (refresUrl) {
85
+ button.setForkeableHref({
86
+ ...addrParams,
87
+ autoproced:true,
88
+ directUrl:true,
89
+ ...(formDef && formDef.proceedLabel ? {label} : {}),
90
+ // ...params
91
+ })
92
+ }
83
93
  }
84
94
  var divResult = html.div({class:formDef.resultClass||'result-pre'}).create();
85
95
  var id='progress'+Math.random();
@@ -111,7 +121,9 @@ myOwn.wScreens.procAux = {
111
121
  }
112
122
  control.addEventListener('update', function(){
113
123
  params[parameterDef.name] = control.getTypedValue();
114
- myOwn.replaceAddrParams(addrParams);
124
+ if (refresUrl) {
125
+ myOwn.replaceAddrParams(addrParams);
126
+ }
115
127
  setHref();
116
128
  });
117
129
  controls.push(control);
@@ -140,7 +152,7 @@ myOwn.wScreens.procAux = {
140
152
  button.disabled=false;
141
153
  divProgressOutside.style.opacity=0.33;
142
154
  toggleProgress.disabled=false;
143
- labelProgress.textContent=resultOk?my.messages.completed:'error';
155
+ labelProgress.textContent=typeof resultOk == "string" ? resultOk : resultOk !== false ? my.messages.completed : 'error';
144
156
  }).catch(function(err){
145
157
  my.log(err);
146
158
  divProgress.textContent=err.message;
package/for-client/my-tables.js CHANGED
@@ -294,9 +294,14 @@ myOwn.TableConnector = function(context, opts){
294
294
  connector.opts = opts||{};
295
295
  connector.fixedFields = connector.opts.fixedFields || [];
296
296
  connector.fixedField = {};
297
+ connector.pick = connector.opts.pick;
298
+ connector.hideBecauseRelated = {};
297
299
  connector.fixedFields.forEach(function(pair){
298
300
  if(!pair.range && pair.value != myOwn.skipInFixedFields){
299
301
  connector.fixedField[pair.fieldName] = pair.value;
302
+ if (!pair.show) {
303
+ connector.hideBecauseRelated[pair.fieldName] = true;
304
+ }
300
305
  }
301
306
  });
302
307
  connector.parameterFunctions=connector.opts.parameterFunctions||{};
@@ -356,7 +361,8 @@ myOwn.TableConnector.prototype.getData = function getData(){
356
361
  return connector.my.ajax.table_data({
357
362
  table:connector.tableName,
358
363
  fixedFields:connector.fixedFields,
359
- paramfun:connector.parameterFunctions||{}
364
+ paramfun:connector.parameterFunctions||{},
365
+ pick:connector.pick
360
366
  }).then(function(rows){
361
367
  return connector.whenStructureReady.then(function(){
362
368
  if(connector.getElementToDisplayCount){
@@ -443,9 +449,14 @@ myOwn.TableConnectorLocal = function(context, opts){
443
449
  connector.opts = opts||{};
444
450
  connector.fixedFields = connector.opts.fixedFields || [];
445
451
  connector.fixedField = {};
452
+ connector.pick = connector.opts.pick;
453
+ connector.hideBecauseRelated = {};
446
454
  connector.fixedFields.forEach(function(pair){
447
455
  if(!pair.range && pair.value != myOwn.skipInFixedFields){
448
456
  connector.fixedField[pair.fieldName] = pair.value;
457
+ if (!pair.show) {
458
+ connector.hideBecauseRelated[pair.fieldName] = true;
459
+ }
449
460
  }
450
461
  });
451
462
  connector.parameterFunctions=connector.opts.parameterFunctions||{};
@@ -607,7 +618,8 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
607
618
  await grid.connector.my.ajax.table_data({
608
619
  table:grid.connector.tableName,
609
620
  fixedFields:grid.connector.fixedFields,
610
- paramfun:grid.connector.parameterFunctions||{}
621
+ paramfun:grid.connector.parameterFunctions||{},
622
+ pick:grid.connector.pick
611
623
  }).then(function(rows){
612
624
  var primaryKey = grid.def.primaryKey;
613
625
  var getPrimaryKeyValues=function getPrimaryKeyValues(primaryKey, row){
@@ -624,19 +636,27 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
624
636
  var primaryKeyValuesForDepotRow = getPrimaryKeyValues(primaryKey, depot.row);
625
637
  return sameValue(JSON.stringify(primaryKeyValuesForRow),JSON.stringify(primaryKeyValuesForDepotRow))
626
638
  });
639
+ if (!depot) {
640
+ var depot = grid.createDepotFromRow(row);
641
+ var needToAddInGrid = true;
642
+ }
643
+ var needToDisplayDepot = !!grid.filterDepots([depot])[0];
644
+ if (!needToDisplayDepot) return;
627
645
  //chequeo que exista depot por las dudas
628
646
  if ((!depot || !depot.tr || !depot.tr.parentNode) && !thereIsANewRecord && !grid.vertical) {
629
- if (!depot) {
647
+ var depotsToDisplay = grid.filterDepots(grid.depots);
648
+ if (needToAddInGrid) {
630
649
  var depot = grid.createDepotFromRow(row);
631
650
  grid.depots.push(depot);
632
- grid.sortDepotsToDisplay(grid.depots);
651
+ var depotsToDisplay = grid.filterDepots(grid.depots);
652
+ grid.sortDepotsToDisplay(depotsToDisplay);
633
653
  } else if (depot.tr && !depot.tr.parentNode) {
634
654
  depot.tr = null
635
655
  }
636
656
  var iRow = -1;
637
657
  var i = 0;
638
- while (i < grid.depots.length){
639
- var aDepot = grid.depots[i];
658
+ while (i < depotsToDisplay.length){
659
+ var aDepot = depotsToDisplay[i];
640
660
  if (depot == aDepot) break;
641
661
  if (aDepot && aDepot.tr && aDepot.tr.parentNode && aDepot.tr.rowIndex != null) {
642
662
  iRow = aDepot.tr.sectionRowIndex
@@ -664,24 +684,33 @@ myOwn.tableGrid = function tableGrid(tableName, mainElement, opts){
664
684
  })
665
685
  if(!thereIsANewRecord){
666
686
  var i = 0;
667
- var depotsToDelete = grid.depots.filter(depot => depot.tick != tick);
687
+ var depotsToDisplay = grid.filterDepots(grid.depots);
688
+ var depotsToDelete = depotsToDisplay.filter(depot => depot.tick != tick);
668
689
  var depot;
669
690
  if (myOwn.config.config['grid-row-retain-moved-or-deleted'] && !force) {
670
691
  var depotsToRetain = grid.depots.filter(depot => depot.tick == tick);
671
692
  for (depot of depotsToRetain) {
693
+ depot['$refreshed'] = false
672
694
  if (depot.tr && depot.tr.getAttribute('not-here')) depot.tr.removeAttribute('not-here')
673
695
  }
674
696
  }
675
697
  while (depot = depotsToDelete.pop()) {
676
698
  depot.manager.displayAsDeleted(depot, force ? 'change-ff' : 'unknown');
699
+ if (myOwn.config.config['grid-row-retain-moved-or-deleted']) {
700
+ if(!depot['$refreshed']){
701
+ grid.retrieveRowAndRefresh(depot,{retrieveIgnoringWhere:true})
702
+ depot['$refreshed'] = true
703
+ }
704
+ }
677
705
  }
678
706
  }
679
707
  })
680
708
  }
681
- if(grid.def.refrescable){
709
+ if(grid.def.refrescable && !grid.def.forInsertOnlyMode){
710
+ if (window.currentAutofrefresh) clearInterval(window.currentAutofrefresh);
682
711
  window.currentAutofrefresh = setInterval(grid.refreshAllRows,8000);
683
712
  }
684
- if (grid.def.selfRefresh) {
713
+ if (grid.def.selfRefresh && !grid.def.forInsertOnlyMode) {
685
714
  var refresh = function refresh(){
686
715
  grid.refreshAllRows();
687
716
  }
@@ -921,11 +950,11 @@ myOwn.DataColumnGrid.prototype.cellAttributes = function cellAttributes(specific
921
950
  attr["my-mandatory"]="normal";
922
951
  }
923
952
  }
924
- if(grid.connector.fixedField[fieldDef.name] != null){
953
+ if(grid.connector.hideBecauseRelated[fieldDef.name] && !fieldDef.alwaysShow){
925
954
  attr["inherited-pk-column"]="yes";
926
955
  }
927
956
  if(fieldDef.referencesField){
928
- if(grid.connector.fixedField[fieldDef.referencesField] != null){
957
+ if(grid.connector.hideBecauseRelated[fieldDef.referencesField] && !fieldDef.alwaysShow){
929
958
  attr["inherited-pk-column"]="yes";
930
959
  }
931
960
  if(grid.def.field[fieldDef.referencesField].isPk){
@@ -1157,7 +1186,7 @@ myOwn.DetailColumnGrid.prototype.td = function td(depot, iColumn, tr){
1157
1186
  alt:'DETAIL',
1158
1187
  title:detailTableDef.label||my.messages.details
1159
1188
  }).create();
1160
- var menuRef={w:'table', table:detailTableDef.table};
1189
+ var menuRef = detailTableDef.table ? {table:detailTableDef.table} : {w:detailTableDef.wScreen, autoproced:true};
1161
1190
  var calculateFixedFields = function(){
1162
1191
  return detailTableDef.fields
1163
1192
  .filter(function(pair){
@@ -1593,7 +1622,7 @@ myOwn.dialogDownload = function dialogDownload(grid){
1593
1622
  }else{
1594
1623
  separator='|';
1595
1624
  var trans={
1596
- '|':'\\|',
1625
+ '|':'\\x7C',
1597
1626
  '\\':'\\\\',
1598
1627
  '\r':'\\r',
1599
1628
  '\n':'\\n',
@@ -2362,7 +2391,9 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
2362
2391
  table:depot.def.name,
2363
2392
  fixedFields:grid.def.primaryKey.map(function(fieldName, i){
2364
2393
  return {fieldName:fieldName, value:depot.primaryKeyValues[i]};
2365
- })
2394
+ }),
2395
+ pick:grid.def.pick,
2396
+ retrieveIgnoringWhere: opts?opts.retrieveIgnoringWhere:false
2366
2397
  }).then(function(result){
2367
2398
  grid.depotRefresh(depot,{updatedRow:result[0], sendedForUpdate:{}}, opts);
2368
2399
  })
@@ -2605,18 +2636,19 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
2605
2636
  }
2606
2637
  return depot;
2607
2638
  };
2608
- grid.displayBody=function displayBody(){
2639
+ grid.filterDepots = function filterDepots(depotsToFilter){
2609
2640
  var grid = this;
2610
- var depotsToDisplay;
2611
2641
  var filterRows = grid.view.filter;
2642
+ var depotsToDisplay;
2612
2643
  if(filterRows && filterRows.length){
2613
- depotsToDisplay = grid.depots.filter(function(depot,i){
2644
+ depotsToDisplay = depotsToFilter.filter(function(depot,i){
2614
2645
  var iFilter=0;
2615
2646
  while(iFilter<filterRows.length){
2616
2647
  var filterData=filterRows[iFilter];
2617
2648
  var partialOk=true;
2618
2649
  var columnsCompared = 0;
2619
2650
  for(var column in depot.row){
2651
+ // var compSymb = filterData.rowSymbols && filterData.rowSymbols[column] || filterData[column].operator;
2620
2652
  var compSymb = filterData.rowSymbols[column];
2621
2653
  if(compSymb && my.comparator[compSymb] && (my.comparatorParameterNull[compSymb] || filterData.row[column] != null)){
2622
2654
  var isSatisfied=my.comparator[compSymb](depot.row[column],filterData.row[column]);
@@ -2634,8 +2666,13 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
2634
2666
  return false;
2635
2667
  });
2636
2668
  }else{
2637
- depotsToDisplay = grid.depots;
2669
+ depotsToDisplay = depotsToFilter;
2638
2670
  }
2671
+ return depotsToDisplay;
2672
+ }
2673
+ grid.displayBody=function displayBody(){
2674
+ var grid = this;
2675
+ var depotsToDisplay = grid.filterDepots(grid.depots);
2639
2676
  grid.sortDepotsToDisplay = function sortDepotsToDisplay(depotsToDisplay){
2640
2677
  if(grid.view.sortColumns.length>0){
2641
2678
  return depotsToDisplay.sort(function(depot1, depot2){
package/for-client/my-websqldb.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"my-websqldb.js","sourceRoot":"","sources":["../src/for-client/my-websqldb.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"my-websqldb.js","sourceRoot":"","sources":["../src/for-client/my-websqldb.ts"],"names":[],"mappings":"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"}
package/install/get_app_user-fun.sql ADDED
@@ -0,0 +1,6 @@
1
+ create or replace function get_app_user() returns text
2
+ stable language sql
3
+ as
4
+ $sql$
5
+ select split_part(current_setting('application_name'),' ',1);
6
+ $sql$;
package/lib/backend-plus.d.ts CHANGED
@@ -35,7 +35,7 @@ export type UploadedFileInfo={
35
35
 
36
36
  }
37
37
  export type CoreFunction = ((context: ProcedureContext, parameters: CoreFunctionParameters) => Promise<any>)
38
- | ((context: ProcedureContext, parameters: CoreFunctionParameters, files?:UploadedFileInfo[]) => Promise<any>);
38
+ | ((context: ProcedureContext, parameters: CoreFunctionParameters, files?:UploadedFileInfo[]) => Promise<any>);
39
39
 
40
40
  export interface ProcedureDef {
41
41
  action: string
@@ -120,7 +120,7 @@ export type MenuInfoMenu = {
120
120
  export type MenuInfoTable = {
121
121
  menuType:'table'
122
122
  table?:string
123
- ff?:{fieldName:string, value:any}[]
123
+ ff?:{fieldName:string, value:any, show?:boolean}[]
124
124
  fc?:{fieldName:string, operator:string, value:any}[]
125
125
  pf?:any
126
126
  td?:TableDefinition
@@ -211,6 +211,7 @@ export type FieldDefinition = EditableDbDefinition & {
211
211
  table?:string
212
212
  inherited?:boolean
213
213
  nameForUpsert?:string
214
+ alwaysShow?:boolean /* show when appears in fixed fields */
214
215
  } & ({} | {
215
216
  sequence:SequenceDefinition
216
217
  nullable:true
@@ -251,6 +252,7 @@ export type Constraint = {constraintType:string, consName?:string} & (
251
252
  {constraintType:'unique', fields:string[], where?:string} |
252
253
  {constraintType:'check', expr?:string}
253
254
  )
255
+ export type OtherTableDefs = Record<string,Partial<TableDefinition & {prefilledField:Record<string,any>}>>
254
256
  export type TableDefinition = EditableDbDefinition & {
255
257
  name:string
256
258
  elementName?:string
@@ -284,15 +286,15 @@ export type TableDefinition = EditableDbDefinition & {
284
286
  viewBody?:string
285
287
  insertIfNotUpdate?:boolean
286
288
  policies?:{
287
- all ?:{using?:string, check?:string}
288
- select?:{using?:string}
289
- insert?:{ check?:string}
290
- update?:{using?:string, check?:string}
291
- delete?:{using?:string}
289
+ all ?:{name?:string, using?:string, check?:string}
290
+ select?:{name?:string, using?:string}
291
+ insert?:{name?:string, check?:string}
292
+ update?:{name?:string, using?:string, check?:string}
293
+ delete?:{name?:string, using?:string}
292
294
  }
293
295
  join?:string
294
296
  constraintsDeferred?:boolean
295
- otherTableDefs?:Record<string,Partial<TableDefinition & {prefilledField:Record<string,any>}>>
297
+ otherTableDefs?:OtherTableDefs
296
298
  }
297
299
  foreignKeys?:ForeignKey[]
298
300
  softForeignKeys?:ForeignKey[]
@@ -318,9 +320,9 @@ export type TableDefinition = EditableDbDefinition & {
318
320
  specialValidator?:string
319
321
  saveAfter?:boolean
320
322
  selfRefresh?:boolean
321
- filterColumns?:{column:string, operator:string, value:any}[]
323
+ filterColumns?:{column:string, operator:string, value:any}[],
324
+ gridAlias?:string /* front-end css my-table = gridAlias */
322
325
  }
323
- export type OtherTableDefs = TableDefinition['sql']['otherTableDefs']
324
326
  export interface DetailTable { table?: string, fields: FieldsForConnectDetailTable, abr: string, label?: string, refreshParent?:boolean, refreshFromParent?:boolean, wScreen?:string, condition?:string }
325
327
  export type TableDefinitionFunction = (context: ContextForDump, opts?:any) => TableDefinition;
326
328
  export type TableItemDef=string|{name:string, path?:string, tableGenerator?:(context:TableContext)=>TableDefinition}
@@ -419,6 +421,8 @@ export class AppBackend{
419
421
  messages:Record<LangId,Record<string, string>>
420
422
  }
421
423
  shootDownBackend():Promise<void>
424
+ setLog(opts:{until:string, results?:boolean}):void
425
+ getDataDumpTransformations(rawData:string):Promise<{rawData:string, prepareTransformationSql:string[], endTransformationSql:string[]}>
422
426
  }
423
427
 
424
428
  }
package/lib/backend-plus.js CHANGED
@@ -54,6 +54,7 @@ var bestGlobals = require('best-globals');
54
54
  var coalesce = bestGlobals.coalesce;
55
55
  var changing = bestGlobals.changing;
56
56
  var datetime = bestGlobals.datetime;
57
+ var splitRawRowIntoRow = bestGlobals.splitRawRowIntoRow;
57
58
  const escapeRegExp = bestGlobals.escapeRegExp;
58
59
  var isLowerIdent = bestGlobals.isLowerIdent;
59
60
 
@@ -163,6 +164,7 @@ AppBackend.prototype.configStaticConfig = function configStaticConfig(){
163
164
  skins:
164
165
  "":
165
166
  local-path: for-client
167
+ bin: {}
166
168
  client-setup:
167
169
  skin: ""
168
170
  lang: en
@@ -235,7 +237,11 @@ AppBackend.prototype.i18n.messages.en={
235
237
  fileUploaded:'file uploaded',
236
238
  unkownExt:'unkown file extension'
237
239
  },
238
- server:{
240
+ server:{
241
+ backupNotAvailable: 'Backup not available',
242
+ backupReady: 'Backup ready to download',
243
+ backupZipping: 'Zipping backup file',
244
+ badBackupEncryptKey: 'encrypt key not present or less than 10 characters',
239
245
  cantDelete_TLDR:'Can\'t delete. May be rights problems, locked records or internal problems',
240
246
  cantInsert_TLDR:'Can\'t insert. May be rights problems, locked records or internal problems',
241
247
  cantUpdate_TLDR:'Can\'t update. May be rights problems, locked records or internal problems',
@@ -314,6 +320,10 @@ AppBackend.prototype.i18n.messages.es={
314
320
  unkownExt:'extensión de archivo desconocida'
315
321
  },
316
322
  server:{
323
+ backupNotAvailable: 'Backup no disponible',
324
+ backupReady: 'Archivo listo para bajar',
325
+ backupZipping: 'Compactando el backup',
326
+ badBackupEncryptKey: 'Debe proveer una clave de encriptacion de 10 caracteres o mas para encriptar el archivo de destino',
317
327
  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',
318
328
  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',
319
329
  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',
@@ -447,7 +457,7 @@ AppBackend.prototype.setStaticConfig = function setStaticConfig(defConfigYamlStr
447
457
 
448
458
  AppBackend.prototype.configList = function configList(){
449
459
  var list=[this.staticConfig];
450
- if(!this.staticConfig["client-setup"].title && fs.existsSync(this.rootPath+'/def-config.yaml')){
460
+ if(!this.staticConfig["client-setup"]?.title && fs.existsSync(this.rootPath+'/def-config.yaml')){
451
461
  console.log('DEPRECATED!!!!!!')
452
462
  console.error('ERROR el def-config hay que ponerlo dentro de staticConfig');
453
463
  console.log('DEPRECATED!!!!!!')
@@ -457,7 +467,7 @@ AppBackend.prototype.configList = function configList(){
457
467
  list.push(this.rootPath+'/def-config.yaml')
458
468
  };
459
469
  list.push(this.rootPath+'/local-config');
460
- list.push(process.env.BACKEND_PLUS_LOCAL_CONFIG||{});
470
+ list.push(process.env.BACKEND_PLUS_LOCAL_CONFIG?.trim()||{});
461
471
  return list;
462
472
  };
463
473
 
@@ -483,6 +493,12 @@ AppBackend.prototype.isAdmin = function isAdmin(reqOrContext){
483
493
  return reqOrContext && (reqOrContext.forDump || reqOrContext.user && reqOrContext.user[be.config.login.rolFieldName] == 'admin');
484
494
  }
485
495
 
496
+ AppBackend.prototype.can = function can(reqOrContext, what){
497
+ var be = this;
498
+ if (be.isAdmin(reqOrContext)) return true;
499
+ return reqOrContext?.user?.['can' + what];
500
+ }
501
+
486
502
  AppBackend.prototype.canChangePass = async function canChangePass(reqOrContext, _userToChangePass){
487
503
  var be = this;
488
504
  return be.isAdmin(reqOrContext);
@@ -689,7 +705,7 @@ AppBackend.prototype.start = function start(opts){
689
705
  throw new Error("backend-plus: Motor not recongnized: "+be.config.db.motor);
690
706
  }
691
707
  be.db = pg;
692
- be.dbUserNameExpr="split_part(current_setting('application_name'),' ',1)";
708
+ be.dbUserNameExpr="get_app_user()";
693
709
  be.dbUserRolExpr=`(select ${be.db.quoteIdent(be.config.login.rolFieldName)}
694
710
  from ${be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':''}${be.db.quoteIdent(be.config.login.table)}
695
711
  where ${be.db.quoteIdent(be.config.login.userFieldName)} = ${be.dbUserNameExpr})`
@@ -745,6 +761,7 @@ AppBackend.prototype.start = function start(opts){
745
761
  pg.log.inFileName = 'last-pg-error-local.sql'
746
762
  pg.logLastError.inFileName = 'last-pg-error-local.sql'
747
763
  }
764
+ be.config.db.search_path = be.config.db.search_path ?? [be.config.db.schema, 'public'];
748
765
  be.getDbClient = function getDbClient(req){
749
766
  var paramsDb = be.DoubleDragon?.dbParams?.[req?.user?.[be.config.login.userFieldName]] ?? be.config.db;
750
767
  return pg.connect(paramsDb).then(function(client){
@@ -756,7 +773,7 @@ AppBackend.prototype.start = function start(opts){
756
773
  return client.query(
757
774
  "SET application_name = "+be.db.quoteLiteral(dbAppName)
758
775
  ).execute().then(function(){
759
- var search_path = be.config.db.search_path || [be.config.db.schema, 'public'];
776
+ var search_path = be.config.db.search_path;
760
777
  if(search_path.length>0){
761
778
  return client.query("set SEARCH_PATH TO "+be.db.quoteIdentList(search_path)).execute().then(function(){
762
779
  return client;
@@ -1115,7 +1132,7 @@ AppBackend.prototype.start = function start(opts){
1115
1132
  }
1116
1133
  return be.sendMail({
1117
1134
  to: be.config.mailer?.supervise?.to,
1118
- subject: `npm start ${be.config["client-setup"].title || packagejson.name} ok ✔️`,
1135
+ subject: `npm start ${be.config["client-setup"]?.title || packagejson.name} ok ✔️`,
1119
1136
  text:`Inicio del servicio: ${new Date().toJSON()}
1120
1137
 
1121
1138
  Contexto: ${os.userInfo().username} ${process.cwd()}
@@ -1137,7 +1154,7 @@ AppBackend.prototype.start = function start(opts){
1137
1154
  }
1138
1155
  var mailDeAvisoDeFalla = be.sendMail({
1139
1156
  to: be.config.mailer?.supervise?.to,
1140
- subject: `npm start ${be.config["client-setup"].title || packagejson.name} fallido 🛑`,
1157
+ subject: `npm start ${be.config["client-setup"]?.title || packagejson.name} fallido 🛑`,
1141
1158
  text:`Falla en el inicio del servicio: ${new Date().toJSON()}
1142
1159
 
1143
1160
  Contexto: ${os.userInfo().username} ${process.cwd()}
@@ -1194,13 +1211,14 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
1194
1211
  }
1195
1212
  if(be.config.login?.forget){
1196
1213
  try{
1197
- await client.query(`select tokentype, info, due from tokens limit 1`).fetchOneRowIfExists();
1214
+ await client.query(`select tokentype, info, due from his.tokens limit 1`).fetchOneRowIfExists();
1198
1215
  }catch(err){
1199
1216
  var mensaje = `
1200
1217
  --------quizas falten los campos en la tabla tokens:
1201
1218
  alter table tokens add column tokentype text;
1202
1219
  alter table tokens add column info jsonb;
1203
1220
  alter table tokens add column due timestamp;
1221
+ --------quizas falte moverla al esquema his.
1204
1222
  `;
1205
1223
  err.message += mensaje;
1206
1224
  console.log(mensaje)
@@ -1221,22 +1239,38 @@ AppBackend.prototype.checkDatabaseStructure = async function checkDatabaseStruct
1221
1239
  }
1222
1240
  }
1223
1241
  }
1242
+ var bitacoraTableName = be.config.server.bitacoraTableName || 'bitacora';
1224
1243
  var bitacoraId = await client.query(`SELECT data_type
1225
1244
  FROM information_schema.columns
1226
- WHERE /*table_schema = 'his' AND*/ table_name = 'bitacora' AND column_name = 'id'
1245
+ WHERE /*table_schema = 'his' AND*/ table_name = '${bitacoraTableName}' AND column_name = 'id'
1227
1246
  `).fetchOneRowIfExists();
1228
1247
  if (bitacoraId.row?.data_type != 'bigint') {
1229
1248
  var message = `
1230
- ------- hay que cambiar la bitacora de lugar (a his) y agrandar el id (a bigint)
1231
- alter table ${be.config.db.schema}.bitacora set schema his;
1249
+ ------- hay que cambiar la bitacora (${bitacoraTableName})de lugar (a his) y agrandar el id (a bigint)
1250
+ alter table ${be.config.db.schema}.${bitacoraTableName} set schema his;
1232
1251
  alter table ${be.config.db.schema}.tokens set schema his;
1233
- alter table his.bitacora alter column id type bigint;
1252
+ alter table his.${bitacoraTableName} alter column id type bigint;
1234
1253
  grant usage on schema his to ${be.config.db.user};
1235
- grant select, insert, update on his.bitacora to ${be.config.db.user};
1236
- alter table his.bitacora alter column parameters_definition drop not null;
1254
+ grant select, insert, update on his.${bitacoraTableName} to ${be.config.db.user};
1255
+ alter table his.${bitacoraTableName} alter column parameters_definition drop not null;
1237
1256
  `;
1238
1257
  throw new Error(message);
1239
1258
  }
1259
+ var {rows: sql_routines} = await client.query(`SELECT routine_name, routine_schema, routine_definition
1260
+ FROM information_schema.routines
1261
+ WHERE routine_schema in (${be.config.db.search_path.map(path => be.db.quoteLiteral(path)).join(', ')})
1262
+ `).fetchAll();
1263
+ var sqlRoutines = likeAr.toPlainObject(sql_routines, 'routine_name');
1264
+ var message = ''
1265
+ likeAr(AppBackend.prototype.sql_routines).forEach((routine_name, def) => {
1266
+ if (sqlRoutines[routine_name] && def.dump.includes(sqlRoutines[routine_name].routine_definition)) {
1267
+ message += `
1268
+ ----- hay que crear o actualizar la rutina ${routine_name}:
1269
+ ${dump}
1270
+ `;
1271
+ }
1272
+ })
1273
+ if (message) throw new Error(message);
1240
1274
  };
1241
1275
 
1242
1276
  AppBackend.prototype.postConfig = function postConfig(){
@@ -1286,6 +1320,7 @@ AppBackend.prototype.generateInsertSQL = function generateInsertSQL(schemaName,
1286
1320
  }
1287
1321
 
1288
1322
  AppBackend.prototype.updateUpdateSQL = function updateUpdateSQL(schemaName, tableName, updateElement, updateConditions){
1323
+ var be = this;
1289
1324
  var {db} = this;
1290
1325
  var setPairs = [];
1291
1326
  for (var key in updateElement) {
@@ -2164,7 +2199,7 @@ AppBackend.prototype.mainPage = function mainPage(req, offlineMode, opts){
2164
2199
  }
2165
2200
  return html.html(attr,[
2166
2201
  html.head([
2167
- html.title(be.config["client-setup"].title),
2202
+ html.title(be.config["client-setup"]?.title),
2168
2203
  html.meta({charset:"utf-8"}),
2169
2204
  viewportAttrs?html.meta(viewportAttrs):null,
2170
2205
  html.link({href: opts.icons.iconShortcut , rel: "shortcut icon", type: "image/png"}),
@@ -2381,6 +2416,13 @@ AppBackend.prototype.addLoggedServices = function addLoggedServices(){
2381
2416
  }).catch(MiniTools.serveErr(req,res,next));
2382
2417
  });
2383
2418
  }
2419
+ if(be.config.db['downloadable-backup-path']){
2420
+ be.app.get('/backup-db.zip', function(req,res,next){
2421
+ if (be.can(req, 'DownloadBackup')) {
2422
+ MiniTools.serveFile('./local-private/backup-db.zip')(req,res,next);
2423
+ }
2424
+ })
2425
+ }
2384
2426
  be.app.use(function(req,res,next){
2385
2427
  // req != '/keep-alive.json'
2386
2428
  req.session.lastNonKeepAlive = new Date().getTime();
@@ -2780,10 +2822,11 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
2780
2822
  lines.push('');
2781
2823
  if(tableDef.sql.policies.enabled){
2782
2824
  policyLines.push(`ALTER TABLE ${cualQuoteTableName} ENABLE ROW LEVEL SECURITY;`);
2783
- ['all', 'select', 'insert', 'update', 'delete'].forEach((command)=>{
2784
- var polcom=tableDef.sql.policies[command];
2785
- if(polcom.using || polcom.check){
2786
- policyLines.push(`CREATE POLICY bp_pol_${command} ON ${cualQuoteTableName} AS PERMISSIVE FOR ${command}`+
2825
+ [null, 'all', 'select', 'insert', 'update', 'delete'].forEach((command)=>{
2826
+ var polcom=tableDef.sql.policies[command] ?? {using: `true`, permissive:true};
2827
+ if(polcom?.using || polcom?.check){
2828
+ policyLines.push(`CREATE POLICY ${be.db.quoteIdent(polcom.name ?? `bp ${command ?? `base`}`)} ON ${cualQuoteTableName} `+
2829
+ `AS ${polcom.permissive ? `PERMISSIVE` : `RESTRICTIVE`} FOR ${command ?? `all`} TO ${be.config.db.user}`+
2787
2830
  (polcom.using? ` USING ( ${polcom.using} )`:'')+
2788
2831
  (polcom.check?` WITH CHECK ( ${polcom.check} )`:'')+';'
2789
2832
  );
@@ -2816,9 +2859,25 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
2816
2859
  var allTableData = await fs.readFile('install/local-data-dump.psql','utf-8');
2817
2860
  } catch(err) {
2818
2861
  if (err.code != 'ENOENT') throw err;
2862
+ try {
2863
+ var allTableContent = await fs.readFile('install/local-dump.psql','utf-8');
2864
+ var startIndex = allTableContent.search(/\n-- Data for Name: /);
2865
+ var lastIndex = allTableContent.search(/\nSELECT pg_catalog.setval/);
2866
+ allTableData = allTableContent.slice(startIndex, lastIndex);
2867
+ } catch(err) {
2868
+ if (err.code != 'ENOENT') throw err;
2869
+ //throw err;
2870
+ }
2819
2871
  }
2820
2872
  if (allTableData) {
2821
- dataText = [allTableData]
2873
+ var prepa = await be.getDataDumpTransformations(allTableData)
2874
+ dataText = [
2875
+ '-- BEGIN DATA FROM DUMP',
2876
+ ...prepa.prepareTransformationSql,
2877
+ prepa.rawData,
2878
+ ...prepa.endTransformationSql,
2879
+ '-- END DATA FROM DUMP'
2880
+ ]
2822
2881
  } else {
2823
2882
  await Promise.all(likeAr(partialTableStructures).map(function(tableDef, tableName, _, i){
2824
2883
  if(tableDef?.sql?.isTable === false) return;
@@ -2880,7 +2939,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
2880
2939
  }else{
2881
2940
  var lines=content.split(/\r?\n/)
2882
2941
  .filter(line => !(/^[-| ]*$/.test(line)) )
2883
- .map(line => line.split(/(?<!(?:^|[^\\])(?:\\\\)*\\)\|/).map(item => item.trimRight().replace(/\\(.)/g,(_,l)=>(l=='t'?'\t':l=='r'?'\r':l=='n'?'\n':l=='s'?' ':l))) )
2942
+ .map(line => splitRawRowIntoRow(line))
2884
2943
  .filter(line => line.length>1 || line.length==1 && line[0].trim() );
2885
2944
  if(lines.length>1){
2886
2945
  if(lines[0][0].startsWith('\ufeff')){
@@ -2925,26 +2984,57 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
2925
2984
  console.log('silence "skipping content" messages in "local-config.yaml".install.dump.skip-content=true');
2926
2985
  }
2927
2986
  }
2987
+ let installFolders = be.config.install.dump.folders ?? ['install']
2928
2988
  let texts = await Promise.all(
2929
2989
  ['prepare.sql','pre-adapt.sql','adapt.sql']
2930
2990
  .concat(be.config.install.dump.scripts['prepare'])
2931
2991
  .concat(be.config.install.dump.scripts['post-adapt'])
2932
- .map(function(fileName){
2933
- return fs.readFile(be.rootPath+'/install/'+fileName, {encoding:'UTF8'}).catch(function(err){
2934
- if(err.code!='ENOENT'){
2935
- throw err;
2992
+ .map(async function(fileName){
2993
+ if (!fileName) return '';
2994
+ var i = 0;
2995
+ var content;
2996
+ do {
2997
+ var folder = installFolders[i];
2998
+ try{
2999
+ content = await fs.readFile(be.rootPath+'/'+folder+'/'+fileName, {encoding:'UTF8'});
3000
+ } catch (err) {
3001
+ if(err.code!='ENOENT') throw err;
2936
3002
  }
2937
- console.log("err:",err);
3003
+ i++;
3004
+ } while (i < installFolders.length && !content);
3005
+ if (!content) {
2938
3006
  return '-- no '+fileName+'\n';
2939
- }).then(function(content){
2940
- return '-- '+fileName+'\n'+content;
2941
- });
3007
+ } else {
3008
+ return '-- '+folder+'/'+fileName+'\n'+content;
3009
+ };
2942
3010
  })
2943
3011
  );
3012
+
3013
+ var common = (await Promise.all(be.appStack.map(async function(stackNode){
3014
+ var common = [];
3015
+ for (var prefix of ['../', '../../']) {
3016
+ try {
3017
+ var dirName = Path.join(stackNode.path,prefix+'install').replace(regexpDistReplacer,'$1$2')
3018
+ var list = await fs.readdir(dirName);
3019
+ } catch (err) {
3020
+ if (err.code != 'ENOENT') throw err;
3021
+ var list = [];
3022
+ }
3023
+ for(var fileName of list){
3024
+ if (fileName.endsWith('-fun.sql')) {
3025
+ common.push(await fs.readFile(Path.join(dirName,fileName), 'utf-8'));
3026
+ }
3027
+ }
3028
+ }
3029
+ return common.join('\n');
3030
+ }))).join('\n');
3031
+
2944
3032
  var prepareList=(be.config.install.dump.scripts['prepare']||[]);
2945
3033
  var mainSql=(
2946
3034
  (complete? linesCreate.join('\n'): '')+
2947
3035
  (complete||opts.forDump? searchPathline.join('\n'): '')+
3036
+ '\n-- common'+
3037
+ common+'\n'+
2948
3038
  (complete? '\n\n--prepare.sql\n'+ texts[0]+'\n\n' :'' )+
2949
3039
  (complete? texts.slice(3,3+prepareList.length).join('\n\n')+'\n\n' : '' )+
2950
3040
  '\n-- functions\n' + functionLines.join('\n')+
@@ -2996,6 +3086,10 @@ AppBackend.prototype.dumpDbSchema = async function dumpDbSchema(opts){
2996
3086
  }
2997
3087
  };
2998
3088
 
3089
+ AppBackend.prototype.getDataDumpTransformations = function getDataDumpTransformations(rawData){
3090
+ return Promise.resolve({rawData, prepareTransformationSql:[], endTransformationSql:[]});
3091
+ }
3092
+
2999
3093
  AppBackend.prototype.queryValuesOfUniqueRow = function queryValuesOfUniqueRow(context, defTable, pkValues){
3000
3094
  var be=this;
3001
3095
  return context.client.query(
@@ -3073,6 +3167,8 @@ AppBackend.prototype.exportacionesGenerico = async function exportacionesGeneric
3073
3167
  if (typeof result[0].title !== "string" || typeof result[0].rows !== "object" && !(result[0].rows instanceof Array) ) {
3074
3168
  throw new Error ("exportacionesGenerico debe recibir {title:string, rows:Record<string, any>[]}")
3075
3169
  }
3170
+ csvFileName = result[0].csvFileName ?? csvFileName;
3171
+ fileName = result[0].fileName ?? fileName;
3076
3172
  await bestGlobals.sleep(100);
3077
3173
  context.informProgress({message:`buscando archivos recién generados`})
3078
3174
  /** @type {{url:string, label:string}[]} */
package/lib/procedures-table.js CHANGED
@@ -1,12 +1,15 @@
1
1
  // @ts-check
2
2
  "use strict";
3
3
 
4
- var {datetime, changing, coalesce} = require('best-globals');
4
+ var {datetime, changing, coalesce, splitRawRowIntoRow} = require('best-globals');
5
5
  var XLSX = require('xlsx');
6
6
  var fs = require('fs/promises')
7
+ var fsSync = require('fs');
7
8
  var typeStore=require('type-store');
8
9
  var likeAr=require('like-ar');
9
10
  const f = require('session-file-store');
11
+ const { expected } = require('cast-error');
12
+ const bestGlobals = require('best-globals');
10
13
 
11
14
  const PANIC_IMPORT = true;
12
15
 
@@ -74,13 +77,15 @@ ProcedureTables = [
74
77
  parameters:[
75
78
  {name: 'table', encoding:'plain'},
76
79
  {name: 'fixedFields', defaultValue:[]},
77
- {name: 'paramfun', defaultValue:[]}
80
+ {name: 'paramfun', defaultValue:[]},
81
+ {name: 'pick', defaultValue:'', encoding:'plain'},
82
+ {name: 'retrieveIgnoringWhere', defaultValue:false}
78
83
  ],
79
84
  coreFunction:
80
85
  /**
81
86
  *
82
87
  * @param {*} context
83
- * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[]}} parameters
88
+ * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string, retrieveIgnoringWhere:boolean}} parameters * @param {{table:string, fixedFields:{fieldName:string, value:any, range:string}[], paramfun:string[], pick:string}} parameters
84
89
  */
85
90
  async function tableDatum(context, parameters){
86
91
  var be=context.be;
@@ -144,7 +149,7 @@ ProcedureTables = [
144
149
  /** @type {string} */
145
150
  var sql="SELECT "+[...defTable.sql.select].join(', ')+
146
151
  "\n FROM "+defTable.sql.from+
147
- "\n WHERE "+(defTable.sql.where||(defTable.allow.select && !defTable.forInsertOnlyMode?'true':'false'))+fixedClausule.join("")+
152
+ "\n WHERE "+((parameters.retrieveIgnoringWhere?'true':defTable.sql.where)||(defTable.allow.select && !defTable.forInsertOnlyMode?'true':'false'))+fixedClausule.join("")+
148
153
  // " ORDER BY "+defTable.primaryKey.map(be.db.quoteIdent.bind(be.db)).join(',')
149
154
  "\n ORDER BY "+(defTable.sql.orderBy||defTable.primaryKey).map(function(fieldName){ return be.db.quoteIdent(fieldName); }).join(',')
150
155
  if(specialFixedClause.length){
@@ -153,6 +158,19 @@ ProcedureTables = [
153
158
  return context.client.query(sql,
154
159
  queryValues
155
160
  ).fetchAll().then(function(result){
161
+ if (parameters.pick) {
162
+ var pickParts = bestGlobals.hyperSimplifyText(parameters.pick).split(/\s+/).filter(p => p);
163
+ return result.rows.filter(row => {
164
+ var line = likeAr(row).join(' ').trim().split(/\s+/);
165
+ return pickParts.every(palabraBuscada =>
166
+ line.map(p => bestGlobals.hyperSimplifyText(p)).filter(palabra =>
167
+ palabraBuscada.length <= 3
168
+ ? palabra == palabraBuscada
169
+ : palabra.includes(palabraBuscada)
170
+ ).length
171
+ )
172
+ });
173
+ }
156
174
  return result.rows;
157
175
  }).catch(function(err){
158
176
  throw err;
@@ -787,7 +805,8 @@ ProcedureTables = [
787
805
  var rowsForUpsert=lines.slice(1).map(function(line){
788
806
  var othersArray = [];
789
807
  if(separator=='|'){
790
- var row = line.split(/(?<!(?:^|[^\\])(?:\\\\)*\\)\|/).map(item => item.trimRight().replace(/\\(.)/g,(_,l)=>(l=='t'?'\t':l=='r'?'\r':l=='n'?'\n':l=='s'?' ':l)));
808
+ var row = splitRawRowIntoRow(line);
809
+
791
810
  }else{
792
811
  var row=line.split(separator);
793
812
  }
@@ -970,7 +989,7 @@ ProcedureTables = [
970
989
  }
971
990
  if(field.isPk){
972
991
  primaryKeyValues[field.isPk-1]=value;
973
- if(value==null && !defField.specialValueWhenInsert){
992
+ if(value==null && !field.specialValueWhenInsert){
974
993
  throw new Error(be.messages.server.primarKeyCantBeNull4.replace('$1',lineNumber).replace('$2',field.name));
975
994
  }
976
995
  }
@@ -1190,7 +1209,7 @@ ProcedureTables = [
1190
1209
  resultOk:'showGrid',
1191
1210
  coreFunction:async function(context,parameters){
1192
1211
  var {be,client} = context;
1193
- if(context.user[be.config.login.rolFieldName] != 'admin'){
1212
+ if(!be.can(context,'SeeHistoryChanges')){
1194
1213
  throw new Error('Forbiden history')
1195
1214
  }
1196
1215
  var tableDef = be.tableStructures[parameters.tableName](context);
@@ -1207,6 +1226,70 @@ ProcedureTables = [
1207
1226
  `,[parameters.tableName, parameters.fieldName]).fetchAll();
1208
1227
  return result.rows;
1209
1228
  }
1229
+ },
1230
+ {
1231
+ action:'download_dump',
1232
+ parameters:[
1233
+ {name:'encrypt', typeName:'text'}
1234
+ ],
1235
+ bitacora:{always: true, error: true},
1236
+ method:'post',
1237
+ autoproced:false,
1238
+ progress:true,
1239
+ resultOk:'showDownloadUrl',
1240
+ coreFunction:async function(context, parameters){
1241
+ context.informProgress({message:"start"});
1242
+ var {be,client} = context;
1243
+ if (!be.can(context,'DownloadBackup')) {
1244
+ throw new Error('Forbiden backup')
1245
+ }
1246
+ if (parameters.encrypt?.length < 10) {
1247
+ throw new Error(be.messages.server.badBackupEncryptKey)
1248
+ }
1249
+ var path = be.config.db['downloadable-backup-path']
1250
+ if (!path) {
1251
+ throw new Error(be.messages.server.backupNotAvailable)
1252
+ }
1253
+ context.informProgress({message:be.messages.server.backupZipping});
1254
+ var spawn = require('child_process').spawn;
1255
+ try {
1256
+ await fs.mkdir('./local-private');
1257
+ } catch (error) {
1258
+ if (expected(error).code !== 'EEXIST') throw error;
1259
+ try {
1260
+ await fs.unlink('./local-private/backup-db.zip');
1261
+ } catch (error) {
1262
+ if (expected(error).code !== 'ENOENT') throw error;
1263
+ }
1264
+ }
1265
+ var out = fsSync.createWriteStream('./local-private/backup-db.log');
1266
+ await new Promise((resolve, reject) => {
1267
+ out.on('error', reject);
1268
+ out.on('open', resolve);
1269
+ })
1270
+ var zip = spawn(be.config.server.bin.zip ?? 'zip',[
1271
+ ...(be.config.server.bin["zip-fixed-parameters"] ?? []),
1272
+ ...(be.config.server.bin["zip-password-parameter-flag"] === false ? [] : [be.config.server.bin["zip-password-parameter-flag"] ?? '--password']),
1273
+ `${be.config.server.bin["zip-password-prefix"] ?? ''}${parameters.encrypt}` ,
1274
+ './local-private/backup-db.zip',
1275
+ path
1276
+ ], {stdio: [out, out, out]});
1277
+ var code = await new Promise((resolve, reject) => {
1278
+ zip.on('data', chunk => out.write(chunk));
1279
+ zip.on('error', err => {
1280
+ context.informProgress(err);
1281
+ out.end();
1282
+ reject(err);
1283
+ });
1284
+ zip.on('exit', any => {
1285
+ out.end();
1286
+ if (any) reject(new Error("ZIP Error: " + any));
1287
+ resolve(any);
1288
+ });
1289
+ })
1290
+ context.informProgress({message:be.messages.server.backupReady});
1291
+ return [{url: './backup-db.zip', label:'backup-db.zip'}];
1292
+ }
1210
1293
  }
1211
1294
  ];
1212
1295
 
package/lib/table-def-adapt.js CHANGED
@@ -317,7 +317,7 @@ function tableDefAdapt(tableDef, context){
317
317
  resultFieldDef.referencesFields=fkDef.fields;
318
318
  resultFieldDef.skipReferenceLookup=fkDef.skipReferenceLookup || fkTableDef.skipReferenceLookup;
319
319
  }catch(err){
320
- console.log('ERROR',fkDef.fields,'in',resultTableDef.field);
320
+ console.log('ERROR',fkDef.fields,'in',resultTableDef.field.name);
321
321
  err.context=(err.context||'')+'referencing '+fkDef.fields[lastPos].source+' in '+resultTableDef.name+' to '+fkDef.references+' \n ';
322
322
  throw err;
323
323
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "backend-plus",
3
3
  "description": "Backend for the anti Pareto rule",
4
- "version": "2.0.0-beta.9",
4
+ "version": "2.0.0-rc.10",
5
5
  "author": "Codenautas <codenautas@googlegroups.com>",
6
6
  "license": "MIT",
7
7
  "repository": "codenautas/backend-plus",
@@ -11,7 +11,8 @@
11
11
  "lib",
12
12
  "for-client",
13
13
  "unlogged",
14
- "src"
14
+ "src",
15
+ "install"
15
16
  ],
16
17
  "contributors": [
17
18
  {
@@ -31,32 +32,32 @@
31
32
  "@upgraded/locate-path": "^6.0.0-alfa.1",
32
33
  "ajax-best-promise": "^0.4.0",
33
34
  "backend-skins": "^0.1.15",
34
- "best-globals": "^1.1.2",
35
+ "best-globals": "^1.1.4",
35
36
  "big.js": "^6.2.1",
36
37
  "body-parser": "^1.20.2",
37
- "cast-error": "^0.1.0",
38
+ "cast-error": "^0.1.1",
38
39
  "castellano": "^0.1.3",
39
- "connect-pg-simple": "^9.0.0",
40
+ "connect-pg-simple": "^9.0.1",
40
41
  "cookie-parser": "^1.4.6",
41
42
  "dialog-promise": "^0.9.15",
42
43
  "discrepances": "^0.2.8",
43
- "express": "^4.18.2",
44
- "express-session": "^1.17.3",
44
+ "express": "^4.19.2",
45
+ "express-session": "^1.18.0",
45
46
  "express-useragent": "^1.0.15",
46
- "fs-extra": "^11.1.1",
47
+ "fs-extra": "^11.2.0",
47
48
  "js-to-html": "^1.3.2",
48
49
  "js-yaml": "^4.1.0",
49
50
  "json4all": "^1.3.0-beta.1",
50
51
  "lazy-some": "^0.1.0",
51
- "like-ar": "^0.3.9",
52
+ "like-ar": "^0.4.0",
52
53
  "login-plus": "^1.7.1",
53
54
  "memorystore": "^1.6.7",
54
55
  "mini-tools": "^1.12.1",
55
- "moment": "^2.29.4",
56
+ "moment": "^2.30.1",
56
57
  "multiparty": "^4.2.3",
57
- "nodemailer": "^6.9.4",
58
+ "nodemailer": "^6.9.13",
58
59
  "numeral": "^2.0.6",
59
- "pg-promise-strict": "^1.3.3",
60
+ "pg-promise-strict": "^1.4.0",
60
61
  "pikaday": "^1.8.2",
61
62
  "pug": "^3.0.2",
62
63
  "read-yaml-promise": "^1.0.2",
@@ -67,42 +68,42 @@
67
68
  "session-file-store": "^1.5.0",
68
69
  "sql-tools": "^0.1.2",
69
70
  "stack-trace": "^0.0.10",
70
- "stylus": "0.59.0",
71
- "type-store": "^0.4.0",
71
+ "stylus": "0.63.0",
72
+ "type-store": "^0.4.1",
72
73
  "typed-controls": "^0.12.0",
73
74
  "xlsx": "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"
74
75
  },
75
76
  "devDependencies": {
76
- "@types/big.js": "^6.2.0",
77
- "@types/expect.js": "~0.3.29",
78
- "@types/express": "^4.17.17",
79
- "@types/express-useragent": "^1.0.2",
80
- "@types/fs-extra": "^11.0.1",
81
- "@types/js-yaml": "^4.0.5",
82
- "@types/mocha": "^10.0.1",
83
- "@types/multiparty": "~0.0.33",
84
- "@types/node": "^20.5.1",
85
- "@types/nodemailer": "^6.4.9",
86
- "@types/numeral": "~2.0.2",
87
- "@types/session-file-store": "^1.2.2",
88
- "@types/stack-trace": "~0.0.30",
89
- "@types/websql": "~0.0.27",
77
+ "@types/big.js": "^6.2.2",
78
+ "@types/expect.js": "~0.3.32",
79
+ "@types/express": "^4.17.21",
80
+ "@types/express-useragent": "^1.0.5",
81
+ "@types/fs-extra": "^11.0.4",
82
+ "@types/js-yaml": "^4.0.9",
83
+ "@types/mocha": "^10.0.6",
84
+ "@types/multiparty": "~0.0.36",
85
+ "@types/node": "^20.12.2",
86
+ "@types/nodemailer": "^6.4.14",
87
+ "@types/numeral": "~2.0.5",
88
+ "@types/session-file-store": "^1.2.5",
89
+ "@types/stack-trace": "~0.0.33",
90
+ "@types/websql": "~0.0.30",
90
91
  "esprima": "^4.0.1",
91
92
  "expect.js": "~0.3.1",
92
- "karma": "6.4.2",
93
+ "karma": "6.4.3",
93
94
  "karma-chrome-launcher": "^3.2.0",
94
95
  "karma-expect": "^1.1.3",
95
- "karma-firefox-launcher": "^2.1.2",
96
+ "karma-firefox-launcher": "^2.1.3",
96
97
  "karma-ie-launcher": "^1.0.0",
97
98
  "karma-mocha": "^2.0.1",
98
99
  "kill-9": "~0.4.3",
99
- "mocha": "^10.2.0",
100
+ "mocha": "^10.4.0",
100
101
  "nyc": "^15.1.0",
101
- "puppeteer": "^21.1.0",
102
- "sinon": "^15.2.0",
103
- "supertest": "^6.3.3",
104
- "types.d.ts": "~0.6.18",
105
- "typescript": "^5.1.6",
102
+ "puppeteer": "^22.6.1",
103
+ "sinon": "^17.0.1",
104
+ "supertest": "^6.3.4",
105
+ "types.d.ts": "~0.6.21",
106
+ "typescript": "^5.4.3",
106
107
  "why-is-node-running": "^2.2.2"
107
108
  },
108
109
  "engines": {
package/unlogged/my-ajax.js CHANGED
@@ -593,6 +593,7 @@ myAjax.UriSearchToObjectParams={
593
593
  td :{ encode:function(x){ return json4all.toUrl(x); }, decode:function(x){ return json4all.parse(x)} },
594
594
  today :{ encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return bestGlobals.date.iso((x+'').substr(0,10))} },
595
595
  section :{ showInMenu:true , encode:noChange , decode:noChange },
596
+ pick :{ encode:noChange , decode:noChange },
596
597
  directUrl :{ hide:true },
597
598
  selectedByDefault:{ hide:true },
598
599
  showParams :{ hide:true },