rez_core 4.0.86 → 4.0.88
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.
- package/dist/module/mapper/service/field-mapper.service.js +9 -3
- package/dist/module/mapper/service/field-mapper.service.js.map +1 -1
- package/dist/module/meta/service/entity-list.service.js +1 -1
- package/dist/module/workflow/service/comm-template.service.js +1 -1
- package/dist/module/workflow/service/comm-template.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/mapper/service/field-mapper.service.ts +16 -4
- package/src/module/meta/service/entity-list.service.ts +1 -1
- package/src/module/workflow/service/comm-template.service.ts +1 -1
|
@@ -100,8 +100,11 @@ let FieldMapperService = class FieldMapperService extends entity_service_impl_se
|
|
|
100
100
|
await super.getResolvedEntityDataByDataSource(entityType, parent_id, userData);
|
|
101
101
|
}
|
|
102
102
|
else {
|
|
103
|
-
if (overwrite &&
|
|
104
|
-
|
|
103
|
+
if (overwrite &&
|
|
104
|
+
entity_data &&
|
|
105
|
+
entity_data[field.mapped_entity_type]) {
|
|
106
|
+
inMemory[entityType][filterCode] =
|
|
107
|
+
entity_data[field.mapped_entity_type];
|
|
105
108
|
}
|
|
106
109
|
else {
|
|
107
110
|
const relations = await this.datasource.query(`SELECT target_entity_id
|
|
@@ -134,8 +137,11 @@ let FieldMapperService = class FieldMapperService extends entity_service_impl_se
|
|
|
134
137
|
}
|
|
135
138
|
else {
|
|
136
139
|
let firstId = targetEntityIds[0];
|
|
137
|
-
if (mappedEntities &&
|
|
140
|
+
if (mappedEntities &&
|
|
141
|
+
entityType in mappedEntities &&
|
|
142
|
+
mappedEntities[entityType]) {
|
|
138
143
|
firstId = mappedEntities[entityType];
|
|
144
|
+
}
|
|
139
145
|
inMemory[entityType][filterCode] =
|
|
140
146
|
await super.getResolvedEntityData(entityType, firstId, userData);
|
|
141
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-mapper.service.js","sourceRoot":"","sources":["../../../../src/module/mapper/service/field-mapper.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA2E;AAC3E,mFAA8E;AAE9E,gGAAmF;AAEnF,+EAA0E;AAC1E,qCAAqC;AACrC,wEAAyE;AAEzE,oFAAuE;AAGhE,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,+CAAiB;IACvD,YACmB,qBAA4C,EAC5C,mBAAwC,EACxC,UAAsB,EACtB,aAA4B,EAChB,cAA8B;QAE3D,KAAK,EAAE,CAAC;QANS,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,eAAU,GAAV,UAAU,CAAY;QACtB,kBAAa,GAAb,aAAa,CAAe;QAChB,mBAAc,GAAd,cAAc,CAAgB;IAG7D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAmB,EAAE,YAAsB;QAC5D,IAAI,WAAW,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAE9D,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;YACnB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACjC,GAAG,CAAC,eAAe,GAAG,WAAW,CAAC,EAAE,CAAC;gBACrC,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;YAC3B,CAAC;YACD,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAmB,EAAE,YAAsB;QAC5D,OAAO,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAsB,EAAE,YAAsB;QACrE,IAAI,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEjC,IAAI,eAAe,GACjB,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAE5D,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAE5D,IAAI,MAAM,GAAiB,EAAE,CAAC;QAC9B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YAC/D,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAsB,EAAE,YAAsB;QACrE,IAAI,MAAM,GAAiB,EAAE,CAAC;QAC9B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;YAChE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAgB,EAAE,kBAA0B;QAChE,IAAI,YAAY,GACd,MAAM,IAAI,CAAC,qBAAqB,CAAC,iCAAiC,CAChE,QAAQ,EACR,kBAAkB,CACnB,CAAC;QACJ,MAAM,eAAe,GAAG,YAA2C,CAAC;QACpE,KAAK,MAAM,WAAW,IAAI,eAAe,EAAE,CAAC;YAC1C,WAAW,CAAC,UAAU;gBACpB,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,aAAqB;QACtC,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,WAAW,CACf,SAAiB,EACjB,MAAyB,EACzB,WAAmB,EACnB,SAAiB,EACjB,QAAkB,EAClB,SAA+B,EAC/B,cAAoC,EACpC,SAAmB,EACnB,WAAiB;QAGjB,MAAM,YAAY,GAChB,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAG7D,IAAI,MAAW,CAAC;QAEhB,IAAI,MAAM,KAAK,QAAQ;YAAE,MAAM,GAAG,IAAI,GAAG,EAAe,CAAC;aACpD,IAAI,MAAM,KAAK,MAAM;YACxB,MAAM,GAAG;gBACP,WAAW,EAAE,WAAW;gBACxB,cAAc,EAAE,EAAE;aACnB,CAAC;QAEJ,MAAM,QAAQ,GAAwC,EAAE,CAAC;QAEzD,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB,CAAC;YACxE,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,IAAI,SAAS,CAAC;YAKlD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;gBAErD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC;oBACtC,IAAI,KAAK,CAAC,kBAAkB,KAAK,KAAK,CAAC,kBAAkB,EAAE,CAAC;wBAC1D,QAAQ,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC;4BAC9B,MAAM,KAAK,CAAC,iCAAiC,CAC3C,UAAU,EACV,SAAS,EACT,QAAQ,CACT,CAAC;oBACN,CAAC;yBAAM,CAAC;wBACN,
|
|
1
|
+
{"version":3,"file":"field-mapper.service.js","sourceRoot":"","sources":["../../../../src/module/mapper/service/field-mapper.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,7 +123,7 @@ let EntityListService = class EntityListService {
|
|
|
123
123
|
return { query, argumentList: argsObjectList };
|
|
124
124
|
}
|
|
125
125
|
async getMaxSequenceNumber(tableName, parentType, parentId) {
|
|
126
|
-
const query = `SELECT
|
|
126
|
+
const query = `SELECT max(id) as seq_no
|
|
127
127
|
FROM ${tableName} WHERE 1=1 `;
|
|
128
128
|
const argsObjectList = [];
|
|
129
129
|
const result = await this.entityManager.query(query, argsObjectList);
|
|
@@ -96,7 +96,7 @@ let CommTemplateService = class CommTemplateService extends entity_service_impl_
|
|
|
96
96
|
if (commTemplate.mapper_id) {
|
|
97
97
|
variables = await this.fieldMapperService.resolveData(commTemplate.mapper_id, 'LOOKUP', payload.entity_type, payload.entity_id, loggedInUser, undefined, undefined, payload.overwrite || false, payload.entity_data || null);
|
|
98
98
|
}
|
|
99
|
-
if (!commTemplate.template_id) {
|
|
99
|
+
if (!commTemplate.template_id && !commTemplate.markup_id) {
|
|
100
100
|
let richText = commTemplate.rich_text;
|
|
101
101
|
if (!richText) {
|
|
102
102
|
if (commTemplate.markup_id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comm-template.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/comm-template.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"comm-template.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/comm-template.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AAChF,gGAAwF;AAExF,iCAA0B;AAC1B,8EAAyE;AACzE,oFAA+E;AAGxE,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,+CAAiB;IACxD,YAA6B,sBAA8C,EAC9C,YAA8B,EAE9B,kBAAsC;QAEjE,KAAK,EAAE,CAAC;QALmB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,iBAAY,GAAZ,YAAY,CAAkB;QAE9B,uBAAkB,GAAlB,kBAAkB,CAAoB;IAGnE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAe,EAAE,YAAiB;QACnD,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC;QAEpD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,CACvC,EAAE,GAAG,YAAY,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,SAAS,EAAE,EACzD,YAAY,CACb,CAAC;QAGF,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAC1D,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,WAAW,EAAE,QAAQ,CAAC,EAAE;gBACxB,QAAQ,EAAE,UAAU;gBACpB,eAAe,EAAE,YAAY,CAAC,eAAe;gBAC7C,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,kBAAkB,EAAE,MAAM;gBAC1B,UAAU,EAAE,YAAY,CAAC,UAAU;aACpC,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAe,EAAE,YAAsB;QACxD,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC;QACpD,IACE,YAAY,CAAC,UAAU,KAAK,KAAK;YACjC,YAAY,CAAC,UAAU,KAAK,KAAK,EACjC,CAAC;YACD,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,eAAe,EAAE,GAAG,UAAU,CAAC;YACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CACpC;gBACE,GAAG,eAAe;gBAClB,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,IAAI,EAAE,QAAQ;aACf,EACD,YAAY,CACb,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAGtE,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;YACvC,WAAW,EAAE,QAAQ,CAAC,EAAE;SACzB,CAAC,CAAC;QAGH,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAC1D,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,WAAW,EAAE,QAAQ,CAAC,EAAE;gBACxB,QAAQ,EAAE,UAAU;gBACpB,eAAe,EAAE,YAAY,CAAC,eAAe;gBAC7C,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,UAAU,EAAE,YAAY,CAAC,UAAU;aACpC,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,UAAkB,EAClB,EAAU,EACV,YAAY;QAIZ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CACrE,UAAU,EACV,EAAE,EACF,YAAY,CACb,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,WAAmB,EACnB,SAAkB,EAClB,YAAa;QAEb,MAAM,gBAAgB,GACpB,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAClD,WAAW,EACX,SAAS,EACT,YAAY,CACb,CAAC;QAEJ,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/C,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,WAAW;SAC3B,CAAC,CAAC,CAAC;QAEJ,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,OAAY,EAAE,YAAsB;QAC/D,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,0CAA0C,CAC7F,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,OAAO,CAChB,CAAC;QAEF,IAAI,SAAS,CAAC;QACd,IAAI,YAAY,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;YAE9C,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;gBAC3B,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CACnD,YAAY,CAAC,SAAS,EACtB,QAAQ,EACR,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,SAAS,EACjB,YAAY,EACZ,SAAS,EACT,SAAS,EACT,OAAO,CAAC,SAAS,IAAI,KAAK,EAC1B,OAAO,CAAC,WAAW,IAAI,IAAI,CAC5B,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,YAAY,CAAC,WAAW,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC;gBACzD,IAAI,QAAQ,GAAG,YAAY,CAAC,SAAS,CAAC;gBAEtC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,IAAI,YAAY,CAAC,SAAS,EAAE,CAAC;wBAC3B,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;wBACzF,IAAI,GAAG,EAAE,CAAC;4BACR,IAAI,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;4BACxE,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;wBAC3B,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;oBAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;oBAC7B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;gBACrD,CAAC,CAAC,CAAC;gBAEH,OAAO;oBACL,SAAS,EAAE,QAAQ;oBACnB,OAAO,EAAE,YAAY,CAAC,OAAO;iBAC9B,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,4BAAmB,CAAC,4CAA4C,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;CACF,CAAA;AA1KY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAIE,WAAA,IAAA,eAAM,EAAC,oBAAoB,CAAC,CAAA;qCAFY,iDAAsB;QAChC,qCAAgB;QAEV,yCAAkB;GAJxD,mBAAmB,CA0K/B"}
|