@puca/puca-core 9.9.5 → 9.10.0

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.
@@ -93,7 +93,7 @@ class CrudFrontBaseService extends crud_base_service_1.CrudBaseService {
93
93
  });
94
94
  }
95
95
  async update(originalArgs) {
96
- var _a;
96
+ var _a, _b;
97
97
  let mode;
98
98
  if (this.crudControllerEspecification.useAccessControlEachRow) {
99
99
  if (!originalArgs.entity.puca_pid) {
@@ -119,7 +119,9 @@ class CrudFrontBaseService extends crud_base_service_1.CrudBaseService {
119
119
  fields: ['puca_pid', ...incrementalSearchConfigFields],
120
120
  pucaPid: e.puca_pid,
121
121
  user: { username: 'puca-user' }
122
- }));
122
+ }), {
123
+ '_table_label': ((_b = crudEspecification === null || crudEspecification === void 0 ? void 0 : crudEspecification.table) === null || _b === void 0 ? void 0 : _b.defaultLabel) || this.getTableName(),
124
+ });
123
125
  }
124
126
  return e;
125
127
  }
@@ -1 +1 @@
1
- {"version":3,"file":"crud-front-base.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-front-base.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"crud-front-base.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-front-base.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAE5B,2DAK6B;AAG7B,iDAAuD;AAEvD,wBAAqG;AACrG,oFAA8E;AAE9E,qCAAkC;AAClC,8DAA2E;AAC3E,8DAAkF;AAClF,+CAAsD;AAW/C,MAAM,qEAAqE,GAAG,KAAK,EACxF,CAA0C,EAC1C,IAAuC,EACA,EAAE;IACzC,MAAM,MAAM,GAAG,MAAM,+BAAmB,CAAC,eAAe,EAAE,CAAC;IAC3D,qDACK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,GACzB,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,IAAI,SAAS,CAAC,CAAC,KACvE,MAAM,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;SACxB,IACD;AACJ,CAAC,CAAC;AAbW,QAAA,qEAAqE,yEAahF;AAEK,MAAM,yEAAyE,GAAG,KAAK,EAC5F,OAA2C,EACF,EAAE;IAC3C,MAAM,uCAAuC,GAAG,MAAM,OAAO,CAAC,0CAA0C,EAAE,CAAC;IAC3G,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,CAAC,uCAAuC,CAAC,YAAY,IAAI,EAAE,CAAC;SACzD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACtB,GAAG,CAAC,WAAW,CAAC,EAAE,CACjB,6EAAqE,CACnE,uCAAuC,EACvC;QACE,WAAW;KACZ,CACF,CACF,CACJ,CAAC;IACF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAjBW,QAAA,yEAAyE,6EAiBpF;AAEW,QAAA,SAAS,GAAyC,EAAE,CAAC;AAE3D,MAAM,QAAQ,GAAG,CAAC,QAA4C,EAAE,EAAE;IACvE,iBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AAC3B,CAAC,CAAC;AAFW,QAAA,QAAQ,YAEnB;AAEK,MAAM,qFAAqF,GAChG,KAAK,IAA6C,EAAE;IAClD,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CACvB,iBAAS,CAAC,GAAG,CACX,iFAAyE,CAC1E,CACF,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACvC,CAAC,CAAA;AAPU,QAAA,qFAAqF,yFAO/F;AAiBH,MAAa,oBAA4D,SAAQ,mCAAkB;IAKjG,YAAY,EACV,SAAS,EACT,4BAA4B,EAC5B,UAAU,GAKX;QACC,KAAK,CAAC;YACJ,SAAS;YACT,UAAU;SACX,CAAC,CAAC;QAdY,+BAA0B,GAAG,IAAI,eAAM,CAAC,sBAAsB,CAAC,CAAA;QAe9E,IAAI,CAAC,4BAA4B,mCAC5B,4BAA4B,KAC/B,YAAY,EAAE,4BAA4B,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAChE,MAAM,aAAa,GAAG;oCAElB,IAAI,EAAE,iBAAiB,EACvB,YAAY,EAAE,6BAA6B,EAC3C,QAAQ,EAAE,MAAM,IACb,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,CAAC;oCAG7D,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,gBAAgB,EAC9B,QAAQ,EAAE,MAAM,IACb,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;oCAGtD,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,aAAa,EAC3B,QAAQ,EAAE,MAAM,IACb,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC;oCAGtD,IAAI,EAAE,kBAAkB,EACxB,YAAY,EAAE,+BAA+B,EAC7C,QAAQ,EAAE,MAAM,IACb,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC;iBAYjE,CAAC;gBACF,MAAM,MAAM,GAAG;oBACb,GAAG,aAAa;oBAChB,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAClB,CAAC,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CACtD;iBACF,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBAEjB,OAAO;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM;oBAEN,MAAM,kBACJ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE;4BACN,KAAK,EAAE,MAAM;iCACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;iCAChB,MAAM,CACL,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,iBAAiB,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAClF;yBACqB,EAC1B,WAAW,kBACT,MAAM,EAAE,IAAI,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,IAAI,IACN,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,KAEvC,GAAG,CAAC,MAAM,CACd;oBACD,IAAI,kBACF,cAAc,EAAE,IAAI,EACpB,aAAa,EAAE,IAAI,IAChB,GAAG,CAAC,IAAI,CACZ;oBACD,UAAU,EAAE,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU;oBAChE,SAAS,EAAE,GAAG,CAAC,SAAS;iBACzB,CAAC;YACJ,CAAC,CAAC,EACF,QAAQ,kCACH,4BAA4B,CAAC,QAAQ,KACxC,MAAM,kBACJ,MAAM,EAAE,IAAI,EACZ,MAAM,EAAE,IAAI,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,IAAI,IACN,CAAC,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,GAEhE,IAAI,kBACF,MAAM,EAAE,IAAI,EACZ,QAAQ,EAAE,IAAI,EACd,YAAY,EAAE,IAAI,EAClB,IAAI,EAAE,IAAI,EACV,oBAAoB,EAAE,IAAI,IACvB,CAAC,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,GAE9D,UAAU,kBACR,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,IAAI,EAClB,UAAU,EAAE,IAAI,IACb,CAAC,CAAC,GAAG,CAAC,4BAA4B,EAAE,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,MAGtE,gBAAgB,kBACd,MAAM,EAAE,gDAAqB,CAAC,QAAQ,EACtC,MAAM,EAAE,gDAAqB,CAAC,QAAQ,EACtC,MAAM,EAAE,gDAAqB,CAAC,QAAQ,IACnC,4BAA4B,CAAC,gBAAgB,IAEnD,CAAC;QACF,gBAAQ,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,0CAA0C;QAG9C,OAAO,IAAI,CAAC,4BAA4B,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAoB;QACzD,MAAM,UAAU,GAAG,4BAAiB,CAAC,WAAW,CAAkB;YAChE,SAAS,EAAE,kBAAkB;YAC7B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC;YAC9C,MAAM,EAAE,CAAC,UAAU,CAAC;YACpB,GAAG,EAAE,MAAM;YACX,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC1B,IAAI;SAEL,CAAC,CAAC;QACH,MAAM,UAAU,CAAC,IAAI,CAAC;YACpB,MAAM,EAAE;gBACN,QAAQ;gBACR,WAAW,EAAE,MAAM;aACpB;YACD,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,YAA2B;;QACtC,IAAI,IAAoB,CAAA;QACxB,IAAI,IAAI,CAAC,4BAA4B,CAAC,uBAAuB,EAAE;YAC7D,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACjC,IAAI,GAAG,KAAK,CAAA;aACb;iBAAM;gBACL,IAAI,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC;oBAChC,MAAM,EAAE,CAAC,UAAU,CAAC;oBACpB,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,QAAQ;oBACrC,IAAI,EAAE,YAAY,CAAC,IAAI;oBACvB,WAAW,EAAE,YAAY,CAAC,WAAW;iBACtC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAA;aACpB;SACF;QAED,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAE1C,IAAI,IAAI,CAAC,4BAA4B,CAAC,uBAAuB,IAAI,IAAI,KAAK,KAAK,EAAE;YAC/E,MAAM,IAAI,CAAC,wBAAwB,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;SAC3F;QAED,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,0CAA0C,EAAE,CAAA;QAClF,MAAM,6BAA6B,GAAG,CAAA,MAAA,kBAAkB,CAAC,uBAAuB,0CAAE,MAAM,KAAI,EAAE,CAAA;QAE9F,IAAI,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;YACjD,MAAM,2BAAwB,CAAC,MAAM,CACnC,IAAI,CAAC,YAAY,EAAE,EACnB,MAAM,IAAI,CAAC,aAAa,CAAC;gBACvB,MAAM,EAAE,CAAC,UAAU,EAAE,GAAG,6BAA6B,CAAC;gBACtD,OAAO,EAAE,CAAC,CAAC,QAAQ;gBACnB,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;aAChC,CAAC,EACF;gBACE,cAAc,EAAE,CAAA,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,KAAK,0CAAE,YAAY,KAAI,IAAI,CAAC,YAAY,EAAE;aAC/E,CACF,CAAA;SACF;QAED,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,EAAE,IAAI,EAAE,YAAY,EAAgC;QACzF,MAAM,UAAU,GAAG,4BAAiB,CAAC,WAAW,CAAC;YAC/C,SAAS,EAAE,0BAA0B;YACrC,WAAW,EAAE,IAAI;SAClB,CAAC,CAAA;QAEF,MAAM,UAAU,CAAC,IAAI,CAAC;YACpB,IAAI,EAAE,IAAI;YACV,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,SAAS;gBAC7D,GAAG,EAAE,YAAY;gBACjB,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,IAAI,CAAC,QAAQ;aAC3B;SACF,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,MAAM,4BAAiB,CAAC,WAAW,CAAO;YAC1D,SAAS,EAAE,2BAA2B;YACtC,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC,SAAS,CAAC;YACX,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;YAChC,GAAG,EAAE,UAAU;YACf,KAAK,EAAE,WAAW;YAClB,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QAEF,IAAI,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,EAAE;YACxC,OAAM;SACP;QAED,MAAM,UAAU,CAAC,IAAI,CAAC;YACpB,IAAI;YACJ,MAAM,EAAE;gBACN,UAAU,EAAE,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC,SAAS;gBAC7D,GAAG,EAAE,YAAY;gBACjB,IAAI,EAAE,OAAO;gBACb,WAAW,EAAE,SAAS,CAAC,QAAQ;aAChC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,UAAU;QACR,iBAAS,CAAC,MAAM,CAAC,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;QACzD,KAAK,CAAC,UAAU,EAAE,CAAA;IACpB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EACf,IAAI,EACJ,OAAO,EACP,MAAM,EAAE,OAAO,EACf,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,aAAa,GACW;QAC/B,YAAY,CAAC,KAAK,IAAI,EAAE;YACtB,IAAI;gBACF,MAAM,IAAI,GAAG,QAAQ,IAAI,EAAE,CAAA;gBAC3B,MAAM,KAAK,GAAG,aAAa,IAAI,IAAI,CAAC,YAAY,EAAE,CAAA;gBAElD,MAAM,UAAU,GAAG,4BAAiB,CAAC,WAAW,CAAkB;oBAChE,SAAS,EAAE,kBAAkB;oBAC7B,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAA;gBAEF,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAA;gBAC9E,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC;oBACvD,MAAM,EAAE,gBAAgB;oBACxB,GAAG,EAAE,QAAQ;oBACb,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE;oBAC1B,IAAI;iBACL,CAAC,CAAA;gBAEF,MAAM,cAAc,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC;oBAC/C,MAAM,EAAE,gBAAgB;oBACxB,GAAG,EAAE,QAAQ;oBACb,MAAM,EAAE,IAAI;yBACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;oBACxB,IAAI;iBACL,CAAC,CAAA;gBAEF,MAAM,eAAe,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,cAAc,CAAC,CAAA;gBAM9D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;oBACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;wBAC7B,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE;4BACxD,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gCACzB,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gCAClD,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,CAAA;gCACnH,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAAA;gCAC/F,IAAI,UAAU,CAAC,IAAI,KAAK,+BAAkB,CAAC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,KAAK,EAAE;oCAChF,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;iCACxC;qCAAM;oCACL,OAAO,KAAK,CAAA;iCACb;6BACF;wBACH,CAAC,CAAA;wBACD,OAAO,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,gBAAgB,CAAC,GAAG,KAAK,IAAI,KAAK,EAAE,EAAE,GAAG,CAAC,CAAA;qBACnH;oBAED,OAAO,KAAK,CAAA;gBACd,CAAC,CAAC,CAAA;gBAEF,IAAI,kBAAkB,GAAG,KAAK,CAAA;gBAC9B,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;oBACtB,kBAAkB,GAAG,IAAI,CAAA;oBACzB,IAAI,GAAG,CAAC,CAAA;oBACR,QAAQ,GAAG,EAAE,CAAA;iBACd;gBAED,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;oBAC/B,OAAO,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,oBAAO,CAAC,GAAG,EAAE,CAAC,CAAA;iBAC9E;gBAED,MAAM,QAAQ,GAAG;oBACf,KAAK;oBACL,MAAM;oBACN,IAAI;oBACJ,KAAK;oBACL,IAAI,kBACF,MAAM,EAAE,IAAI,IACT,IAAI,CACR;oBACD,QAAQ;oBACR,OAAO;oBACP,IAAI;oBACJ,OAAO;oBACP,WAAW,EAAE,IAAI;iBACN,CAAA;gBAEb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,iCAC3B,QAAQ,KACX,IAAI,IACJ,CAAA;gBAEF,IAAI,QAAQ,CAAC,UAAU,GAAG,IAAI,EAAE;oBAC9B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;iBACjC;gBAED,IAAI,kBAAkB,EAAE;oBACtB,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,QAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;wBACtD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,iCAC3B,QAAQ,KACX,IAAI,EACJ,YAAY,EAAE,yBAAY,CAAC,KAAK,IAChC,CAAA;wBACF,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;qBAC5B;oBAED,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAA;oBACpB,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAA;oBACxB,QAAQ,CAAC,UAAU,GAAG,IAAI,CAAA;iBAC3B;gBAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CACrD,QAAQ,EACR,cAAc,EACd,cAAc,EACd,IAAI,EACJ,KAAK,EACL,IAAI,CACL,CAAC;gBAEF,MAAM,IAAI,mBACR,UAAU,IACP,QAAQ,CACZ,CAAA;gBAED,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;gBAE7C,MAAM,gBAAa,CAAC,UAAU,CAAC;oBAC7B,IAAI,EAAE;wBACJ,OAAO;qBACR;oBACD,IAAI;oBACJ,IAAI;iBACL,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACxC,MAAM,sBAAmB,CAAC,IAAI,CAAC;oBAC7B,MAAM,EAAE,OAAO;oBACf,OAAO,EAAE,6FAA6F;oBACtG,WAAW,EAAE,IAAI,CAAC,QAAQ;oBAC1B,IAAI;iBACL,CAAC,CAAA;aACH;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,yBAAyB,CACrC,QAAyB,EACzB,cAAiC,EACjC,cAAiC,EACjC,IAAU,EACV,KAAa,EACb,IAAY;QAEZ,MAAM,UAAU,GAAsB,EAAE,CAAC;QACzC,MAAM,gBAAgB,GAAG,CAAC,CAAkB,EAAE,KAAa,EAAE,EAAE;YAC7D,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE;gBACxC,OAAO;aACR;YACD,UAAU,CAAC,IAAI,iCACV,CAAC,KACJ,IAAI,EAAE,KAAK,IACX,CAAC;QACL,CAAC,CAAC;QAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAE5B,MAAM,WAAW,GAAG,qBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE;gBACrD,KAAK,EAAE,GAAG;gBACV,IAAI;aACL,CAAC,CAAC;YAEH,CAAC,CAAC,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAExD,gBAAgB,CAAC,CAAC,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;SAC5C;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;YACtE,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,SAAS,CAAC;YACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACtC,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAErB,MAAM,WAAW,GAAG,qBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE;oBACrD,KAAK,EAAE,GAAG;oBACV,IAAI;iBACL,CAAC,CAAC;gBAEH,EAAE,CAAC,aAAa,GAAG,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC;gBAE1D,gBAAgB,CAAC,EAAE,EAAE,GAAG,KAAK,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;aAC9C;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AA7bD,oDA6bC"}
@@ -14,13 +14,14 @@ export interface IncrementalSearchService {
14
14
  data: T;
15
15
  tableName: string;
16
16
  }[]>;
17
- update(tableName: string, data: any): Promise<void>;
17
+ update(tableName: string, entity: any, extraData?: any): Promise<void>;
18
18
  enforceFields(fields: string[]): Promise<void>;
19
19
  }
20
20
  export declare class TypeSenseService implements IncrementalSearchService {
21
21
  private readonly configService;
22
22
  private readonly jobExecutorFactory;
23
23
  private readonly COLLECTION_NAME;
24
+ private readonly DEFAULT_FIELDS;
24
25
  private readonly logger;
25
26
  private client;
26
27
  private jobExecutorUpinsert;
@@ -36,5 +37,5 @@ export declare class TypeSenseService implements IncrementalSearchService {
36
37
  }[]>;
37
38
  update<T extends {
38
39
  puca_pid: any;
39
- }>(tableName: string, data: T): Promise<void>;
40
+ }>(tableName: string, entity: T, extraData?: any): Promise<void>;
40
41
  }
@@ -12,6 +12,20 @@ class TypeSenseService {
12
12
  this.configService = configService;
13
13
  this.jobExecutorFactory = jobExecutorFactory;
14
14
  this.COLLECTION_NAME = 'incremental-search';
15
+ this.DEFAULT_FIELDS = [
16
+ {
17
+ name: '_table_name',
18
+ type: 'string',
19
+ },
20
+ {
21
+ name: '_table_label',
22
+ type: 'string',
23
+ },
24
+ {
25
+ name: 'id',
26
+ type: 'string',
27
+ }
28
+ ];
15
29
  this.logger = new logger_1.Logger('TypeSenseService');
16
30
  }
17
31
  async prepare() {
@@ -37,14 +51,7 @@ class TypeSenseService {
37
51
  await this.client.collections().create({
38
52
  name: this.COLLECTION_NAME,
39
53
  fields: [
40
- {
41
- name: '_table_name',
42
- type: 'string',
43
- },
44
- {
45
- name: 'id',
46
- type: 'string',
47
- },
54
+ ...this.DEFAULT_FIELDS,
48
55
  {
49
56
  name: '.*',
50
57
  type: 'string',
@@ -59,7 +66,11 @@ class TypeSenseService {
59
66
  }
60
67
  const collection = await this.client.collections(this.COLLECTION_NAME).retrieve();
61
68
  const collectionFields = collection.fields.map(f => f.name);
62
- const newFields = job.data.filter(f => !collectionFields.includes(f));
69
+ const fields = [
70
+ ...this.DEFAULT_FIELDS.map(f => f.name),
71
+ ...job.data
72
+ ];
73
+ const newFields = fields.filter(f => !collectionFields.includes(f) && f !== 'id');
63
74
  if (newFields.length === 0) {
64
75
  return;
65
76
  }
@@ -113,8 +124,11 @@ class TypeSenseService {
113
124
  return [];
114
125
  }
115
126
  }
116
- async update(tableName, data) {
117
- await this.jobExecutorUpinsert.add({ tableName, data });
127
+ async update(tableName, entity, extraData) {
128
+ await this.jobExecutorUpinsert.add({
129
+ tableName,
130
+ data: Object.assign(Object.assign({}, entity), extraData)
131
+ });
118
132
  }
119
133
  }
120
134
  exports.TypeSenseService = TypeSenseService;
@@ -1 +1 @@
1
- {"version":3,"file":"incremental-search.service.js","sourceRoot":"","sources":["../../../src/core/services/incremental-search.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"incremental-search.service.js","sourceRoot":"","sources":["../../../src/core/services/incremental-search.service.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,7 @@ export declare class Database {
19
19
  error: Error;
20
20
  }>;
21
21
  private query;
22
+ private addLog;
22
23
  exec<T>(sqlCommand: SqlCommand, opt: {
23
24
  transaction: Transaction;
24
25
  }): Promise<T[]>;
@@ -39,56 +39,72 @@ class Database {
39
39
  if (!sqlCommandList.length) {
40
40
  return [];
41
41
  }
42
- sqlCommandList.forEach(sqlCommand => {
43
- this.logger.verbose(() => {
44
- let sql = sqlCommand.sql;
45
- const args = sqlCommand.args || [];
46
- args.map((arg, i) => {
47
- return { arg, i: i + 1 };
48
- }).reverse().forEach(({ arg, i }) => {
49
- const text = `$${i}`;
50
- while (sql.includes(text)) {
51
- const e = [
52
- {
53
- apply: () => !arg,
54
- exec: () => arg
55
- },
56
- {
57
- apply: () => (typeof arg === 'boolean'),
58
- exec: () => arg
59
- },
60
- {
61
- apply: () => _.isArray(arg),
62
- exec: () => arg.length ? `'{${arg.reduce((a, b) => `${a},${b}`)}}'` : `'{}'`
63
- },
64
- {
65
- apply: () => typeof arg === 'object',
66
- exec: () => arg
67
- },
68
- {
69
- apply: () => true,
70
- exec: () => `'${arg}'`
71
- }
72
- ];
73
- sql = sql.replace(text, e.find(e => e.apply()).exec());
74
- }
75
- });
76
- return sql;
77
- });
78
- });
42
+ this.addLog('verbose', sqlCommandList);
79
43
  const transactinID = opt.transaction ? opt.transaction.getID() : '';
80
44
  const transactionStatus = opt.transaction ? opt.transaction.getStatus() : '';
81
- return await this.pucaOrmClient.query({
82
- commandList: sqlCommandList.map(sqlCommand => ({
83
- name: sqlCommand.commandName,
84
- text: sqlCommand.sql,
85
- values: sqlCommand.args
86
- })), opt: {
87
- transaction: {
88
- id: transactinID,
89
- status: `${transactionStatus}`
45
+ const start = Date.now();
46
+ const longQueryWarn = setInterval(() => {
47
+ this.addLog('warn', sqlCommandList, 'query muito longa ' + (Date.now() - start) + 'ms');
48
+ }, 10000);
49
+ try {
50
+ return await this.pucaOrmClient.query({
51
+ commandList: sqlCommandList.map(sqlCommand => ({
52
+ name: sqlCommand.commandName,
53
+ text: sqlCommand.sql,
54
+ values: sqlCommand.args
55
+ })), opt: {
56
+ transaction: {
57
+ id: transactinID,
58
+ status: `${transactionStatus}`
59
+ }
90
60
  }
61
+ });
62
+ }
63
+ finally {
64
+ clearInterval(longQueryWarn);
65
+ }
66
+ }
67
+ addLog(level, sqlCommandList, message) {
68
+ sqlCommandList.forEach(sqlCommand => {
69
+ const logs = [() => {
70
+ let sql = sqlCommand.sql;
71
+ const args = sqlCommand.args || [];
72
+ args.map((arg, i) => {
73
+ return { arg, i: i + 1 };
74
+ }).reverse().forEach(({ arg, i }) => {
75
+ const text = `$${i}`;
76
+ while (sql.includes(text)) {
77
+ const e = [
78
+ {
79
+ apply: () => !arg,
80
+ exec: () => arg
81
+ },
82
+ {
83
+ apply: () => (typeof arg === 'boolean'),
84
+ exec: () => arg
85
+ },
86
+ {
87
+ apply: () => _.isArray(arg),
88
+ exec: () => arg.length ? `'{${arg.reduce((a, b) => `${a},${b}`)}}'` : `'{}'`
89
+ },
90
+ {
91
+ apply: () => typeof arg === 'object',
92
+ exec: () => arg
93
+ },
94
+ {
95
+ apply: () => true,
96
+ exec: () => `'${arg}'`
97
+ }
98
+ ];
99
+ sql = sql.replace(text, e.find(e => e.apply()).exec());
100
+ }
101
+ });
102
+ return sql;
103
+ }];
104
+ if (message) {
105
+ logs.push(message);
91
106
  }
107
+ this.logger[level](...logs);
92
108
  });
93
109
  }
94
110
  async exec(sqlCommand, opt) {
@@ -1 +1 @@
1
- {"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"database-manager.service.js","sourceRoot":"","sources":["../../../../src/orm/services/managers/database-manager.service.ts"],"names":[],"mappings":"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"}