@algotech-ce/interpretor 2.0.12 → 2.0.14
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/@utils/skills-utils.d.ts +2 -2
- package/dist/@utils/skills-utils.js +21 -9
- package/dist/@utils/skills-utils.js.map +1 -1
- package/dist/dto/tasks/task-assign-object.dto.d.ts +1 -0
- package/dist/dto/tasks/task-assign-object.dto.js +4 -0
- package/dist/dto/tasks/task-assign-object.dto.js.map +1 -1
- package/dist/interpretor-tasks/task-assign-object.d.ts +1 -0
- package/dist/interpretor-tasks/task-assign-object.js +3 -2
- package/dist/interpretor-tasks/task-assign-object.js.map +1 -1
- package/package.json +1 -1
|
@@ -6,8 +6,8 @@ export declare abstract class SkillsUtils {
|
|
|
6
6
|
protected soUtils: SoUtils;
|
|
7
7
|
constructor(soUtils: SoUtils);
|
|
8
8
|
abstract getMagnets(appKey: string, boardInstance: string, zoneKey: string, context?: WorkflowInstanceContextDto): Observable<SmartObjectDto[]>;
|
|
9
|
-
createSkills(smartObject: SmartObjectDto, skills: PairDto[], instance: WorkflowInstanceDto): Observable<InterpretorTransferTransitionDto[]>;
|
|
10
|
-
_createDocument(smartObject: SmartObjectDto, prop: PairDto): Observable<InterpretorTransferTransitionDto>[];
|
|
9
|
+
createSkills(smartObject: SmartObjectDto, skills: PairDto[], instance: WorkflowInstanceDto, cumul?: boolean): Observable<InterpretorTransferTransitionDto[]>;
|
|
10
|
+
_createDocument(smartObject: SmartObjectDto, prop: PairDto, cumul: boolean): Observable<InterpretorTransferTransitionDto>[];
|
|
11
11
|
private _createSignature;
|
|
12
12
|
private _createLocalisation;
|
|
13
13
|
private _createTags;
|
|
@@ -37,26 +37,26 @@ class SkillsUtils {
|
|
|
37
37
|
constructor(soUtils) {
|
|
38
38
|
this.soUtils = soUtils;
|
|
39
39
|
}
|
|
40
|
-
createSkills(smartObject, skills, instance) {
|
|
40
|
+
createSkills(smartObject, skills, instance, cumul = true) {
|
|
41
41
|
let transfers = _.map(skills, (prop) => {
|
|
42
42
|
if (this.soUtils.isReset(prop.value)) {
|
|
43
43
|
smartObject.skills[prop.key] = this.soUtils.createSkill(prop.key);
|
|
44
44
|
}
|
|
45
45
|
else {
|
|
46
46
|
if (prop.key === 'atDocument' && prop.value) {
|
|
47
|
-
return this._createDocument(smartObject, prop);
|
|
47
|
+
return this._createDocument(smartObject, prop, cumul);
|
|
48
48
|
}
|
|
49
49
|
if (prop.key === 'atSignature' && prop.value) {
|
|
50
50
|
return this._createSignature(smartObject, prop);
|
|
51
51
|
}
|
|
52
52
|
if (prop.key === 'atGeolocation' && prop.value) {
|
|
53
|
-
return this._createLocalisation(smartObject, prop);
|
|
53
|
+
return this._createLocalisation(smartObject, prop, cumul);
|
|
54
54
|
}
|
|
55
55
|
if (prop.key === 'atTag' && prop.value) {
|
|
56
|
-
return this._createTags(smartObject, prop);
|
|
56
|
+
return this._createTags(smartObject, prop, cumul);
|
|
57
57
|
}
|
|
58
58
|
if (prop.key === 'atMagnet' && prop.value) {
|
|
59
|
-
return this._createMagnet(smartObject, prop, instance);
|
|
59
|
+
return this._createMagnet(smartObject, prop, instance, cumul);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
});
|
|
@@ -64,7 +64,7 @@ class SkillsUtils {
|
|
|
64
64
|
return transfers.length === 0 ? (0, rxjs_1.of)([]) : (0, rxjs_1.zip)(...transfers);
|
|
65
65
|
}
|
|
66
66
|
//private deleted for unit testing
|
|
67
|
-
_createDocument(smartObject, prop) {
|
|
67
|
+
_createDocument(smartObject, prop, cumul) {
|
|
68
68
|
if ((_.isArray(prop.value) && prop.value.length > 0 && prop.value[0] instanceof core_1.SmartObjectDto) ||
|
|
69
69
|
(prop.value instanceof core_1.SmartObjectDto)) {
|
|
70
70
|
smartObject.skills.atDocument.documents = _.uniq(_.flatten(_.map(_.isArray(prop.value) ? prop.value : [prop.value], val => val.skills.atDocument.documents)));
|
|
@@ -77,6 +77,9 @@ class SkillsUtils {
|
|
|
77
77
|
}
|
|
78
78
|
return results;
|
|
79
79
|
}, []);
|
|
80
|
+
if (!cumul) {
|
|
81
|
+
smartObject.skills.atDocument.documents = [];
|
|
82
|
+
}
|
|
80
83
|
smartObject.skills.atDocument.documents.push(..._.reduce(files, (results, file) => {
|
|
81
84
|
if (file?.size > 0 && file?.documentID !== undefined && file?.documentID !== null) {
|
|
82
85
|
results.push(file.documentID);
|
|
@@ -139,7 +142,7 @@ class SkillsUtils {
|
|
|
139
142
|
}
|
|
140
143
|
return null;
|
|
141
144
|
}
|
|
142
|
-
_createLocalisation(smartObject, prop) {
|
|
145
|
+
_createLocalisation(smartObject, prop, cumul) {
|
|
143
146
|
if (prop.value instanceof core_1.SmartObjectDto) {
|
|
144
147
|
smartObject.skills.atGeolocation = prop.value.skills.atGeolocation;
|
|
145
148
|
}
|
|
@@ -149,20 +152,26 @@ class SkillsUtils {
|
|
|
149
152
|
layerKey: prop.value.layerKey,
|
|
150
153
|
geometries: [{ type: prop.value.type, coordinates: prop.value.coordinates }]
|
|
151
154
|
};
|
|
155
|
+
if (!cumul) {
|
|
156
|
+
smartObject.skills.atGeolocation.geo = [];
|
|
157
|
+
}
|
|
152
158
|
smartObject.skills.atGeolocation.geo.push(geo);
|
|
153
159
|
}
|
|
154
160
|
return null;
|
|
155
161
|
}
|
|
156
|
-
_createTags(smartObject, prop) {
|
|
162
|
+
_createTags(smartObject, prop, cumul) {
|
|
157
163
|
if (prop.value instanceof core_1.SmartObjectDto) {
|
|
158
164
|
smartObject.skills.atTag = prop.value.skills.atTag;
|
|
159
165
|
}
|
|
160
166
|
else {
|
|
161
167
|
const tag = prop.value;
|
|
168
|
+
if (!cumul) {
|
|
169
|
+
smartObject.skills.atTag.tags = [];
|
|
170
|
+
}
|
|
162
171
|
smartObject.skills.atTag.tags.push(tag);
|
|
163
172
|
}
|
|
164
173
|
}
|
|
165
|
-
_createMagnet(smartObject, prop, instance) {
|
|
174
|
+
_createMagnet(smartObject, prop, instance, cumul) {
|
|
166
175
|
if (prop.value instanceof core_1.SmartObjectDto) {
|
|
167
176
|
smartObject.skills.atMagnet = prop.value.skills.atMagnet;
|
|
168
177
|
}
|
|
@@ -186,6 +195,9 @@ class SkillsUtils {
|
|
|
186
195
|
boardInstance: prop.value.boardInstance,
|
|
187
196
|
};
|
|
188
197
|
_.remove(smartObject.skills.atMagnet.zones, (z) => utils.predicateZone(z, prop.value.appKey, prop.value.boardInstance));
|
|
198
|
+
if (!cumul) {
|
|
199
|
+
smartObject.skills.atMagnet.zones = [];
|
|
200
|
+
}
|
|
189
201
|
smartObject.skills.atMagnet.zones.push(zone);
|
|
190
202
|
return [];
|
|
191
203
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills-utils.js","sourceRoot":"","sources":["../../src/@utils/skills-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4CAAsK;AACtK,iDAAqC;AACrC,0CAA4B;AAC5B,+BAAuD;AACvD,8CAAiD;AAEjD,kEAAiE;AACjE,iDAA6C;AAG7C,MAAM,cAAc,GAAG,eAAe,CAAC;AACvC,MAAM,cAAc,GAAG,WAAW,CAAC;AAEnC,MAAsB,WAAW;IAE7B,YAAsB,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;IAAI,CAAC;IAK3C,YAAY,CAAC,WAA2B,EAAE,MAAiB,EAAE,QAA6B;
|
|
1
|
+
{"version":3,"file":"skills-utils.js","sourceRoot":"","sources":["../../src/@utils/skills-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,5 +29,9 @@ __decorate([
|
|
|
29
29
|
(0, class_validator_1.IsOptional)(),
|
|
30
30
|
__metadata("design:type", Function)
|
|
31
31
|
], TaskAssignObjectDto.prototype, "cumul", void 0);
|
|
32
|
+
__decorate([
|
|
33
|
+
(0, class_validator_1.IsOptional)(),
|
|
34
|
+
__metadata("design:type", Function)
|
|
35
|
+
], TaskAssignObjectDto.prototype, "cumulSkills", void 0);
|
|
32
36
|
exports.TaskAssignObjectDto = TaskAssignObjectDto;
|
|
33
37
|
//# sourceMappingURL=task-assign-object.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-assign-object.dto.js","sourceRoot":"","sources":["../../../src/dto/tasks/task-assign-object.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAwD;AAIxD,MAAa,mBAAmB;
|
|
1
|
+
{"version":3,"file":"task-assign-object.dto.js","sourceRoot":"","sources":["../../../src/dto/tasks/task-assign-object.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAwD;AAIxD,MAAa,mBAAmB;CAW/B;AAVG;IAAC,IAAA,2BAAS,GAAE;;mDAC4C;AACxD;IAAC,IAAA,2BAAS,GAAE;;uDAC0B;AACtC;IAAC,IAAA,2BAAS,GAAE;;mDACsB;AAClC;IAAC,IAAA,4BAAU,GAAE;;kDACkB;AAC/B;IAAC,IAAA,4BAAU,GAAE;;wDACwB;AAVzC,kDAWC"}
|
|
@@ -7,6 +7,7 @@ export declare class TaskAssignObject extends TaskBase {
|
|
|
7
7
|
properties: PairDto[];
|
|
8
8
|
skills: PairDto[];
|
|
9
9
|
cumul: boolean;
|
|
10
|
+
cumulSkills: boolean;
|
|
10
11
|
execute(task: InterpretorTaskDto): Observable<InterpretorValidateDto>;
|
|
11
12
|
_createObject(smartObject: SmartObjectDto, smartmodels: SmartModelDto[]): void;
|
|
12
13
|
_loadSOTransfer(smartObject: SmartObjectDto): InterpretorTransferTransitionDto;
|
|
@@ -43,7 +43,7 @@ class TaskAssignObject extends task_base_1.TaskBase {
|
|
|
43
43
|
this.properties = [];
|
|
44
44
|
this.skills = [];
|
|
45
45
|
const customData = task.custom;
|
|
46
|
-
return (0, rxjs_1.zip)(customData.object(), customData.properties ? customData.properties({ formatted: true }) : (0, rxjs_1.of)([]), customData.skills ? customData.skills() : (0, rxjs_1.of)([]), customData.cumul ? customData.cumul() : (0, rxjs_1.of)(true)).pipe((0, operators_1.catchError)((err) => {
|
|
46
|
+
return (0, rxjs_1.zip)(customData.object(), customData.properties ? customData.properties({ formatted: true }) : (0, rxjs_1.of)([]), customData.skills ? customData.skills() : (0, rxjs_1.of)([]), customData.cumul ? customData.cumul() : (0, rxjs_1.of)(true), customData.cumulSkills ? customData.cumulSkills() : (0, rxjs_1.of)(true)).pipe((0, operators_1.catchError)((err) => {
|
|
47
47
|
throw this.taskUtils.handleError('ERR-001', err, tasks_error_1.TaskAssignObjectError);
|
|
48
48
|
}), (0, operators_1.mergeMap)((values) => {
|
|
49
49
|
this.smartObjects = _.isArray(values[0]) ? values[0] : [values[0]];
|
|
@@ -66,10 +66,11 @@ class TaskAssignObject extends task_base_1.TaskBase {
|
|
|
66
66
|
}, []);
|
|
67
67
|
this.skills = values[2];
|
|
68
68
|
this.cumul = values[3];
|
|
69
|
+
this.cumulSkills = values[4];
|
|
69
70
|
const transfers = [];
|
|
70
71
|
const transfers$ = (0, rxjs_1.concat)(...this.smartObjects.map((smartObject) => {
|
|
71
72
|
this._createObject(smartObject, task.instance.context.smartmodels);
|
|
72
|
-
return this.skillsUtils.createSkills(smartObject, this.skills, task.instance).pipe((0, operators_1.map)((skTransfers) => {
|
|
73
|
+
return this.skillsUtils.createSkills(smartObject, this.skills, task.instance, this.cumulSkills).pipe((0, operators_1.map)((skTransfers) => {
|
|
73
74
|
transfers.push(this._loadSOTransfer(smartObject), ...skTransfers);
|
|
74
75
|
}), (0, operators_1.first)());
|
|
75
76
|
})).pipe((0, operators_1.toArray)());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-assign-object.js","sourceRoot":"","sources":["../../src/interpretor-tasks/task-assign-object.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAuC;AACvC,+BAAmD;AACnD,8CAA2E;AAE3E,0CAA4B;AAE5B,sDAA6D;AAC7D,oGAA+F;AAE/F,MAAa,gBAAiB,SAAQ,oBAAQ;IAA9C;;QAGI,eAAU,GAAc,EAAE,CAAC;QAC3B,WAAM,GAAc,EAAE,CAAC;QACvB,UAAK,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"task-assign-object.js","sourceRoot":"","sources":["../../src/interpretor-tasks/task-assign-object.ts"],"names":[],"mappings":"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"}
|