@trudb/tru-common-lib 0.0.340 → 0.0.342
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/esm2020/lib/base-classes/tru-entity-base.mjs +2 -1
- package/esm2020/lib/classes/tru-merge-data-set.mjs +12 -0
- package/esm2020/lib/classes/tru-merge-data.mjs +17 -0
- package/esm2020/lib/components/validation-dialog/tru-validation-dialog-config.mjs +21 -0
- package/esm2020/lib/components/validation-dialog/tru-validation-dialog.mjs +44 -37
- package/esm2020/lib/directives/breeze-validator/tru-breeze-validator.mjs +18 -8
- package/fesm2015/trudb-tru-common-lib.mjs +80 -43
- package/fesm2015/trudb-tru-common-lib.mjs.map +1 -1
- package/fesm2020/trudb-tru-common-lib.mjs +80 -43
- package/fesm2020/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/base-classes/tru-entity-base.d.ts +2 -1
- package/lib/classes/tru-merge-data-set.d.ts +7 -0
- package/lib/classes/tru-merge-data.d.ts +9 -0
- package/lib/components/validation-dialog/tru-validation-dialog-config.d.ts +13 -0
- package/lib/components/validation-dialog/tru-validation-dialog.d.ts +11 -6
- package/lib/directives/breeze-validator/tru-breeze-validator.d.ts +3 -2
- package/package.json +1 -1
|
@@ -6,6 +6,7 @@ export class TruEntityBase {
|
|
|
6
6
|
this.CreatedRef = -1;
|
|
7
7
|
this.Updated = undefined;
|
|
8
8
|
this.UpdatedRef = undefined;
|
|
9
|
+
this.Merge_Data_Set = undefined;
|
|
9
10
|
}
|
|
10
11
|
}
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWVudGl0eS1iYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9iYXNlLWNsYXNzZXMvdHJ1LWVudGl0eS1iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBVSxZQUFZLEVBQWMsTUFBTSxlQUFlLENBQUM7QUFHakUsTUFBTSxPQUFPLGFBQWE7SUFDeEIsWUFBWSxHQUFHLElBQVc7UUFFMUIsaUJBQVksR0FBaUIsSUFBSSxZQUFZLEVBQUUsQ0FBQztRQUdoRCxZQUFPLEdBQVMsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUMzQixlQUFVLEdBQVcsQ0FBQyxDQUFDLENBQUM7UUFDeEIsWUFBTyxHQUFxQixTQUFTLENBQUM7UUFDdEMsZUFBVSxHQUF1QixTQUFTLENBQUM7UUFHM0MsbUJBQWMsR0FBZ0MsU0FBUyxDQUFDO0lBWDFCLENBQUM7Q0FZaEMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnRpdHksIEVudGl0eUFzcGVjdCwgRW50aXR5VHlwZSB9IGZyb20gJ2JyZWV6ZS1jbGllbnQnO1xyXG5pbXBvcnQgeyBUcnVNZXJnZURhdGFTZXQgfSBmcm9tICcuLi9jbGFzc2VzL3RydS1tZXJnZS1kYXRhLXNldCc7XHJcblxyXG5leHBvcnQgY2xhc3MgVHJ1RW50aXR5QmFzZSBpbXBsZW1lbnRzIEVudGl0eSB7XHJcbiAgY29uc3RydWN0b3IoLi4uYXJnczogYW55W10pIHsgfVxyXG5cclxuICBlbnRpdHlBc3BlY3Q6IEVudGl0eUFzcGVjdCA9IG5ldyBFbnRpdHlBc3BlY3QoKTtcclxuICBlbnRpdHlUeXBlITogRW50aXR5VHlwZTtcclxuXHJcbiAgQ3JlYXRlZDogRGF0ZSA9IG5ldyBEYXRlKCk7XHJcbiAgQ3JlYXRlZFJlZjogbnVtYmVyID0gLTE7XHJcbiAgVXBkYXRlZDogRGF0ZSB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcclxuICBVcGRhdGVkUmVmOiBudW1iZXIgfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XHJcbiAgcm93dmVyOiBhbnk7XHJcblxyXG4gIE1lcmdlX0RhdGFfU2V0OiBUcnVNZXJnZURhdGFTZXQgfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XHJcbn1cclxuIl19
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export class TruMergeDataSet {
|
|
2
|
+
constructor() {
|
|
3
|
+
this._data = {};
|
|
4
|
+
this.getData = (propertyName) => {
|
|
5
|
+
return this._data[propertyName];
|
|
6
|
+
};
|
|
7
|
+
this.setData = (propertyName, data) => {
|
|
8
|
+
this._data[propertyName] = data;
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LW1lcmdlLWRhdGEtc2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jbGFzc2VzL3RydS1tZXJnZS1kYXRhLXNldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQU8sZUFBZTtJQVcxQjtRQVZRLFVBQUssR0FBaUMsRUFBRSxDQUFDO1FBRWpELFlBQU8sR0FBRyxDQUFDLFlBQW9CLEVBQTRCLEVBQUU7WUFDM0QsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ2xDLENBQUMsQ0FBQTtRQUVELFlBQU8sR0FBRyxDQUFDLFlBQW9CLEVBQUUsSUFBa0IsRUFBRSxFQUFFO1lBQ3JELElBQUksQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFDLEdBQUcsSUFBSSxDQUFDO1FBQ2xDLENBQUMsQ0FBQTtJQUVjLENBQUM7Q0FDakIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUcnVNZXJnZURhdGEgfSBmcm9tIFwiLi90cnUtbWVyZ2UtZGF0YVwiO1xyXG5cclxuZXhwb3J0IGNsYXNzIFRydU1lcmdlRGF0YVNldCB7XHJcbiAgcHJpdmF0ZSBfZGF0YTogUmVjb3JkPHN0cmluZywgVHJ1TWVyZ2VEYXRhPiA9IHt9O1xyXG5cclxuICBnZXREYXRhID0gKHByb3BlcnR5TmFtZTogc3RyaW5nKTogVHJ1TWVyZ2VEYXRhIHwgdW5kZWZpbmVkID0+IHtcclxuICAgIHJldHVybiB0aGlzLl9kYXRhW3Byb3BlcnR5TmFtZV07XHJcbiAgfVxyXG5cclxuICBzZXREYXRhID0gKHByb3BlcnR5TmFtZTogc3RyaW5nLCBkYXRhOiBUcnVNZXJnZURhdGEpID0+IHtcclxuICAgIHRoaXMuX2RhdGFbcHJvcGVydHlOYW1lXSA9IGRhdGE7XHJcbiAgfVxyXG5cclxuICBjb25zdHJ1Y3RvcigpIHt9XHJcbn1cclxuIl19
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export class TruMergeData {
|
|
2
|
+
get value() {
|
|
3
|
+
return this._value;
|
|
4
|
+
}
|
|
5
|
+
get modifiedBy() {
|
|
6
|
+
return this._modifiedBy;
|
|
7
|
+
}
|
|
8
|
+
get hid() {
|
|
9
|
+
return this._hid;
|
|
10
|
+
}
|
|
11
|
+
constructor(value, modifiedBy, hid) {
|
|
12
|
+
this._value = value;
|
|
13
|
+
this._modifiedBy = modifiedBy;
|
|
14
|
+
this._hid = hid;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LW1lcmdlLWRhdGEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy90cnUtY29tbW9uLWxpYi9zcmMvbGliL2NsYXNzZXMvdHJ1LW1lcmdlLWRhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxPQUFPLFlBQVk7SUFNdkIsSUFBVyxLQUFLO1FBQ2QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDO0lBQ3JCLENBQUM7SUFFRCxJQUFXLFVBQVU7UUFDbkIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDO0lBQzFCLENBQUM7SUFFRCxJQUFXLEdBQUc7UUFDWixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDbkIsQ0FBQztJQUVELFlBQVksS0FBVSxFQUFFLFVBQWtCLEVBQUUsR0FBVztRQUNyRCxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQztRQUNwQixJQUFJLENBQUMsV0FBVyxHQUFHLFVBQVUsQ0FBQztRQUM5QixJQUFJLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztJQUNsQixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgY2xhc3MgVHJ1TWVyZ2VEYXRhIHtcclxuICBwcml2YXRlIF92YWx1ZTogYW55O1xyXG4gIHByaXZhdGUgX21vZGlmaWVkQnk6IHN0cmluZztcclxuICBwcml2YXRlIF9oaWQ6IHN0cmluZztcclxuXHJcblxyXG4gIHB1YmxpYyBnZXQgdmFsdWUoKTogc3RyaW5nIHtcclxuICAgIHJldHVybiB0aGlzLl92YWx1ZTtcclxuICB9XHJcblxyXG4gIHB1YmxpYyBnZXQgbW9kaWZpZWRCeSgpOiBzdHJpbmcge1xyXG4gICAgcmV0dXJuIHRoaXMuX21vZGlmaWVkQnk7XHJcbiAgfVxyXG5cclxuICBwdWJsaWMgZ2V0IGhpZCgpOiBzdHJpbmcge1xyXG4gICAgcmV0dXJuIHRoaXMuX2hpZDtcclxuICB9XHJcblxyXG4gIGNvbnN0cnVjdG9yKHZhbHVlOiBhbnksIG1vZGlmaWVkQnk6IHN0cmluZywgaGlkOiBzdHJpbmcpIHtcclxuICAgIHRoaXMuX3ZhbHVlID0gdmFsdWU7XHJcbiAgICB0aGlzLl9tb2RpZmllZEJ5ID0gbW9kaWZpZWRCeTtcclxuICAgIHRoaXMuX2hpZCA9IGhpZDtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
export class TruValidationDialogConfig {
|
|
2
|
+
get entity() {
|
|
3
|
+
return this._entity;
|
|
4
|
+
}
|
|
5
|
+
get propertyName() {
|
|
6
|
+
return this._propertyName;
|
|
7
|
+
}
|
|
8
|
+
get errorMsg() {
|
|
9
|
+
return this._errorMsg;
|
|
10
|
+
}
|
|
11
|
+
get mergeData() {
|
|
12
|
+
return this._mergeData;
|
|
13
|
+
}
|
|
14
|
+
constructor(entity, propertyName, errorMsg, mergeData = null) {
|
|
15
|
+
this._entity = entity;
|
|
16
|
+
this._propertyName = propertyName;
|
|
17
|
+
this._errorMsg = errorMsg;
|
|
18
|
+
this._mergeData = mergeData;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LXZhbGlkYXRpb24tZGlhbG9nLWNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3RydS1jb21tb24tbGliL3NyYy9saWIvY29tcG9uZW50cy92YWxpZGF0aW9uLWRpYWxvZy90cnUtdmFsaWRhdGlvbi1kaWFsb2ctY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUlBLE1BQU0sT0FBTyx5QkFBeUI7SUFNcEMsSUFBVyxNQUFNO1FBQ2YsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQ3RCLENBQUM7SUFFRCxJQUFXLFlBQVk7UUFDckIsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFRCxJQUFXLFFBQVE7UUFDakIsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDO0lBQ3hCLENBQUM7SUFFRCxJQUFXLFNBQVM7UUFDbEIsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDO0lBQ3pCLENBQUM7SUFFRCxZQUNFLE1BQXFCLEVBQ3JCLFlBQW9CLEVBQ3BCLFFBQWdCLEVBQ2hCLFlBQW9DLElBQUk7UUFDeEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7UUFDdEIsSUFBSSxDQUFDLGFBQWEsR0FBRyxZQUFZLENBQUE7UUFDakMsSUFBSSxDQUFDLFNBQVMsR0FBRyxRQUFRLENBQUM7UUFDMUIsSUFBSSxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUM7SUFDOUIsQ0FBQztDQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJ1RW50aXR5QmFzZSB9IGZyb20gXCIuLi8uLi9iYXNlLWNsYXNzZXMvdHJ1LWVudGl0eS1iYXNlXCI7XHJcbmltcG9ydCB7IFRydU1lcmdlRGF0YVNldCB9IGZyb20gXCIuLi8uLi9jbGFzc2VzL3RydS1tZXJnZS1kYXRhLXNldFwiO1xyXG5cclxuXHJcbmV4cG9ydCBjbGFzcyBUcnVWYWxpZGF0aW9uRGlhbG9nQ29uZmlnIHtcclxuICBwcml2YXRlIF9lbnRpdHk6IFRydUVudGl0eUJhc2U7XHJcbiAgcHJpdmF0ZSBfcHJvcGVydHlOYW1lOiBzdHJpbmc7XHJcbiAgcHJpdmF0ZSBfZXJyb3JNc2c6IHN0cmluZztcclxuICBwcml2YXRlIF9tZXJnZURhdGE6IFRydU1lcmdlRGF0YVNldCB8IG51bGw7XHJcbiAgXHJcbiAgcHVibGljIGdldCBlbnRpdHkoKTogVHJ1RW50aXR5QmFzZSB7XHJcbiAgICByZXR1cm4gdGhpcy5fZW50aXR5O1xyXG4gIH1cclxuXHJcbiAgcHVibGljIGdldCBwcm9wZXJ0eU5hbWUoKTogc3RyaW5nIHtcclxuICAgIHJldHVybiB0aGlzLl9wcm9wZXJ0eU5hbWU7XHJcbiAgfVxyXG5cclxuICBwdWJsaWMgZ2V0IGVycm9yTXNnKCk6IHN0cmluZyB7XHJcbiAgICByZXR1cm4gdGhpcy5fZXJyb3JNc2c7XHJcbiAgfVxyXG5cclxuICBwdWJsaWMgZ2V0IG1lcmdlRGF0YSgpOiBUcnVNZXJnZURhdGFTZXQgfCBudWxsIHtcclxuICAgIHJldHVybiB0aGlzLl9tZXJnZURhdGE7XHJcbiAgfVxyXG5cclxuICBjb25zdHJ1Y3RvcihcclxuICAgIGVudGl0eTogVHJ1RW50aXR5QmFzZSxcclxuICAgIHByb3BlcnR5TmFtZTogc3RyaW5nLFxyXG4gICAgZXJyb3JNc2c6IHN0cmluZyxcclxuICAgIG1lcmdlRGF0YTogVHJ1TWVyZ2VEYXRhU2V0IHwgbnVsbCA9IG51bGwpIHtcclxuICAgIHRoaXMuX2VudGl0eSA9IGVudGl0eTtcclxuICAgIHRoaXMuX3Byb3BlcnR5TmFtZSA9IHByb3BlcnR5TmFtZVxyXG4gICAgdGhpcy5fZXJyb3JNc2cgPSBlcnJvck1zZztcclxuICAgIHRoaXMuX21lcmdlRGF0YSA9IG1lcmdlRGF0YTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -1,60 +1,67 @@
|
|
|
1
1
|
import { Component, Input } from '@angular/core';
|
|
2
2
|
import * as i0 from "@angular/core";
|
|
3
|
+
import * as i1 from "../../services/tru-util";
|
|
3
4
|
export class TruValidationDialog {
|
|
4
|
-
constructor() {
|
|
5
|
+
constructor(elementRef, util) {
|
|
6
|
+
this.elementRef = elementRef;
|
|
7
|
+
this.util = util;
|
|
8
|
+
this.errorMsg = '';
|
|
5
9
|
this.onAcceptAll = () => {
|
|
6
|
-
let entity = this.entity;
|
|
10
|
+
let entity = this.config.entity;
|
|
7
11
|
let originalValues = entity.entityAspect.originalValues;
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
entity[key] = this.mergeData[propertyNameKey].value;
|
|
12
|
+
for (const key in this.config.mergeData) {
|
|
13
|
+
entity[key] = this.config.mergeData.getData(key).value;
|
|
11
14
|
if (originalValues.hasOwnProperty(key))
|
|
12
15
|
delete originalValues[key];
|
|
13
|
-
}
|
|
16
|
+
}
|
|
17
|
+
;
|
|
14
18
|
if (Object.keys(originalValues).length === 0 && originalValues.constructor === Object)
|
|
15
19
|
entity.entityAspect.setUnchanged();
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
propertiesToValidate.forEach(function (key) {
|
|
20
|
+
entity.Merge_Data_Set = JSON.stringify({});
|
|
21
|
+
for (const key in this.config.mergeData) {
|
|
19
22
|
entity.entityAspect.validateProperty(key);
|
|
20
|
-
}
|
|
23
|
+
}
|
|
24
|
+
;
|
|
21
25
|
};
|
|
22
26
|
this.onAccept = () => {
|
|
23
|
-
let entity = this.entity;
|
|
24
|
-
let originalValues = entity.entityAspect.originalValues;
|
|
25
|
-
let propertyName = '';
|
|
26
|
-
|
|
27
|
-
let propertyNameKey = propertyName;
|
|
28
|
-
entity[propertyName] = this.mergeData
|
|
29
|
-
delete this.mergeData[propertyNameKey];
|
|
30
|
-
if (originalValues.hasOwnProperty(propertyName) && (Object.keys(originalValues).length === 0 && originalValues.constructor === Object))
|
|
31
|
-
|
|
32
|
-
if (!Object.keys(this.mergeData).length)
|
|
33
|
-
|
|
34
|
-
entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
35
|
-
entity.entityAspect.validateProperty(propertyName);
|
|
27
|
+
//let entity = this.config.entity as any;
|
|
28
|
+
//let originalValues = entity.entityAspect.originalValues;
|
|
29
|
+
//let propertyName = '';
|
|
30
|
+
//let mergeData = JSON.parse(entity.Merge_Data_Set);
|
|
31
|
+
//let propertyNameKey = propertyName as keyof typeof this.mergeData;
|
|
32
|
+
//entity[propertyName] = this.config.mergeData?.getData(propertyNameKey)!.value;
|
|
33
|
+
//delete this.mergeData[propertyNameKey];
|
|
34
|
+
//if (originalValues.hasOwnProperty(propertyName) && (Object.keys(originalValues).length === 0 && originalValues.constructor === Object))
|
|
35
|
+
// delete originalValues[propertyName];
|
|
36
|
+
//if (!Object.keys(this.mergeData).length)
|
|
37
|
+
// entity.entityAspect.setUnchanged();
|
|
38
|
+
//entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
39
|
+
//entity.entityAspect.validateProperty(propertyName);
|
|
36
40
|
};
|
|
37
41
|
this.onDecline = () => {
|
|
38
|
-
let entity = this.entity;
|
|
39
|
-
let propertyName = '';
|
|
40
|
-
this.mergeData = JSON.parse(entity.Merge_Data);
|
|
41
|
-
let propertyNameKey = propertyName;
|
|
42
|
-
delete this.mergeData[propertyNameKey];
|
|
43
|
-
entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
44
|
-
entity.entityAspect.validateProperty(propertyName);
|
|
42
|
+
//let entity = this.entity as any;
|
|
43
|
+
//let propertyName = '';
|
|
44
|
+
//this.mergeData = JSON.parse(entity.Merge_Data);
|
|
45
|
+
//let propertyNameKey = propertyName as keyof typeof this.mergeData;
|
|
46
|
+
//delete this.mergeData[propertyNameKey];
|
|
47
|
+
//entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
48
|
+
//entity.entityAspect.validateProperty(propertyName);
|
|
45
49
|
};
|
|
46
50
|
}
|
|
47
51
|
ngOnInit() {
|
|
52
|
+
this.util.findClosestAncestorByClass(this.elementRef.nativeElement, '.mat-mdc-form-field-flex').classList.add('invalid');
|
|
53
|
+
this.errorMsg = this.config.errorMsg;
|
|
54
|
+
}
|
|
55
|
+
ngOnDestroy() {
|
|
56
|
+
this.util.findClosestAncestorByClass(this.elementRef.nativeElement, '.mat-mdc-form-field-flex').classList.remove('invalid');
|
|
48
57
|
}
|
|
49
58
|
}
|
|
50
|
-
TruValidationDialog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
51
|
-
TruValidationDialog.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.1", type: TruValidationDialog, selector: "tru-validation-dialog", inputs: {
|
|
59
|
+
TruValidationDialog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, deps: [{ token: i0.ElementRef }, { token: i1.TruUtil }], target: i0.ɵɵFactoryTarget.Component });
|
|
60
|
+
TruValidationDialog.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.1", type: TruValidationDialog, selector: "tru-validation-dialog", inputs: { config: "config" }, ngImport: i0, template: "<div class=\"invalid\">\r\n <i class=\"icon-warning-sign icon-white\"></i>{{config.errorMsg}}\r\n <div>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAcceptAll()\">Accept All</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAccept()\">Accept</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onDecline()\">Decline</button>\r\n </div>\r\n</div>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}.merge-button{margin:5px;background-color:#fff}\n"] });
|
|
52
61
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, decorators: [{
|
|
53
62
|
type: Component,
|
|
54
|
-
args: [{ selector: 'tru-validation-dialog', template: "<
|
|
55
|
-
}], ctorParameters: function () { return []; }, propDecorators: {
|
|
56
|
-
type: Input
|
|
57
|
-
}], mergeData: [{
|
|
63
|
+
args: [{ selector: 'tru-validation-dialog', template: "<div class=\"invalid\">\r\n <i class=\"icon-warning-sign icon-white\"></i>{{config.errorMsg}}\r\n <div>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAcceptAll()\">Accept All</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAccept()\">Accept</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onDecline()\">Decline</button>\r\n </div>\r\n</div>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}.merge-button{margin:5px;background-color:#fff}\n"] }]
|
|
64
|
+
}], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i1.TruUtil }]; }, propDecorators: { config: [{
|
|
58
65
|
type: Input
|
|
59
66
|
}] } });
|
|
60
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LXZhbGlkYXRpb24tZGlhbG9nLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jb21wb25lbnRzL3ZhbGlkYXRpb24tZGlhbG9nL3RydS12YWxpZGF0aW9uLWRpYWxvZy50cyIsIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3RydS1jb21tb24tbGliL3NyYy9saWIvY29tcG9uZW50cy92YWxpZGF0aW9uLWRpYWxvZy90cnUtdmFsaWRhdGlvbi1kaWFsb2cuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFjLEtBQUssRUFBcUIsTUFBTSxlQUFlLENBQUM7OztBQVNoRixNQUFNLE9BQU8sbUJBQW1CO0lBSzlCLFlBQ1UsVUFBc0IsRUFDdEIsSUFBYTtRQURiLGVBQVUsR0FBVixVQUFVLENBQVk7UUFDdEIsU0FBSSxHQUFKLElBQUksQ0FBUztRQUp2QixhQUFRLEdBQVcsRUFBRSxDQUFDO1FBTXRCLGdCQUFXLEdBQUcsR0FBRyxFQUFFO1lBQ2pCLElBQUksTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBYSxDQUFDO1lBQ3ZDLElBQUksY0FBYyxHQUFHLE1BQU0sQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDO1lBRXhELEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUU7Z0JBQ3ZDLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFFLENBQUMsS0FBSyxDQUFDO2dCQUN4RCxJQUFJLGNBQWMsQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDO29CQUNwQyxPQUFPLGNBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUM5QjtZQUFBLENBQUM7WUFFRixJQUFJLE1BQU0sQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsSUFBSSxjQUFjLENBQUMsV0FBVyxLQUFLLE1BQU07Z0JBQ25GLE1BQU0sQ0FBQyxZQUFZLENBQUMsWUFBWSxFQUFFLENBQUM7WUFFckMsTUFBTSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBRTNDLEtBQUssTUFBTSxHQUFHLElBQUksSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLEVBQUU7Z0JBQ3ZDLE1BQU0sQ0FBQyxZQUFZLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLENBQUM7YUFDM0M7WUFBQSxDQUFDO1FBQ0osQ0FBQyxDQUFBO1FBRUQsYUFBUSxHQUFHLEdBQUcsRUFBRTtZQUNkLHlDQUF5QztZQUN6QywwREFBMEQ7WUFDMUQsd0JBQXdCO1lBRXhCLG9EQUFvRDtZQUNwRCxvRUFBb0U7WUFDcEUsZ0ZBQWdGO1lBQ2hGLHlDQUF5QztZQUV6Qyx5SUFBeUk7WUFDekksd0NBQXdDO1lBRXhDLDBDQUEwQztZQUMxQyx1Q0FBdUM7WUFFdkMscURBQXFEO1lBQ3JELHFEQUFxRDtRQUN2RCxDQUFDLENBQUE7UUFFRCxjQUFTLEdBQUcsR0FBRyxFQUFFO1lBQ2Ysa0NBQWtDO1lBQ2xDLHdCQUF3QjtZQUV4QixpREFBaUQ7WUFDakQsb0VBQW9FO1lBQ3BFLHlDQUF5QztZQUN6QyxxREFBcUQ7WUFDckQscURBQXFEO1FBQ3ZELENBQUMsQ0FBQTtJQW5EMEIsQ0FBQztJQXFENUIsUUFBUTtRQUNOLElBQUksQ0FBQyxJQUFJLENBQUMsMEJBQTBCLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxhQUFhLEVBQUUsMEJBQTBCLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3pILElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUM7SUFDdkMsQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsSUFBSSxDQUFDLDBCQUEwQixDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsYUFBYSxFQUFFLDBCQUEwQixDQUFDLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUM5SCxDQUFDOztnSEFuRVUsbUJBQW1CO29HQUFuQixtQkFBbUIsMkZDVGhDLGtuQkFTQTsyRkRBYSxtQkFBbUI7a0JBTC9CLFNBQVM7K0JBQ0UsdUJBQXVCO3VIQUt4QixNQUFNO3NCQUFkLEtBQUsiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21wb25lbnQsIEVsZW1lbnRSZWYsIElucHV0LCBPbkRlc3Ryb3ksIE9uSW5pdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBUcnVVdGlsIH0gZnJvbSAnLi4vLi4vc2VydmljZXMvdHJ1LXV0aWwnO1xyXG5pbXBvcnQgeyBUcnVWYWxpZGF0aW9uRGlhbG9nQ29uZmlnIH0gZnJvbSAnLi90cnUtdmFsaWRhdGlvbi1kaWFsb2ctY29uZmlnJztcclxuXHJcbkBDb21wb25lbnQoe1xyXG4gIHNlbGVjdG9yOiAndHJ1LXZhbGlkYXRpb24tZGlhbG9nJyxcclxuICB0ZW1wbGF0ZVVybDogJy4vdHJ1LXZhbGlkYXRpb24tZGlhbG9nLmh0bWwnLFxyXG4gIHN0eWxlVXJsczogWycuL3RydS12YWxpZGF0aW9uLWRpYWxvZy5jc3MnXVxyXG59KVxyXG5leHBvcnQgY2xhc3MgVHJ1VmFsaWRhdGlvbkRpYWxvZyBpbXBsZW1lbnRzIE9uSW5pdCwgT25EZXN0cm95IHtcclxuICBASW5wdXQoKSBjb25maWchOiBUcnVWYWxpZGF0aW9uRGlhbG9nQ29uZmlnO1xyXG5cclxuICBlcnJvck1zZzogc3RyaW5nID0gJyc7XHJcblxyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHJpdmF0ZSBlbGVtZW50UmVmOiBFbGVtZW50UmVmLCBcclxuICAgIHByaXZhdGUgdXRpbDogVHJ1VXRpbCkgeyB9XHJcblxyXG4gIG9uQWNjZXB0QWxsID0gKCkgPT4ge1xyXG4gICAgbGV0IGVudGl0eSA9IHRoaXMuY29uZmlnLmVudGl0eSBhcyBhbnk7XHJcbiAgICBsZXQgb3JpZ2luYWxWYWx1ZXMgPSBlbnRpdHkuZW50aXR5QXNwZWN0Lm9yaWdpbmFsVmFsdWVzO1xyXG5cclxuICAgIGZvciAoY29uc3Qga2V5IGluIHRoaXMuY29uZmlnLm1lcmdlRGF0YSkge1xyXG4gICAgICBlbnRpdHlba2V5XSA9IHRoaXMuY29uZmlnLm1lcmdlRGF0YS5nZXREYXRhKGtleSkhLnZhbHVlO1xyXG4gICAgICBpZiAob3JpZ2luYWxWYWx1ZXMuaGFzT3duUHJvcGVydHkoa2V5KSlcclxuICAgICAgICBkZWxldGUgb3JpZ2luYWxWYWx1ZXNba2V5XTtcclxuICAgIH07XHJcblxyXG4gICAgaWYgKE9iamVjdC5rZXlzKG9yaWdpbmFsVmFsdWVzKS5sZW5ndGggPT09IDAgJiYgb3JpZ2luYWxWYWx1ZXMuY29uc3RydWN0b3IgPT09IE9iamVjdClcclxuICAgICAgZW50aXR5LmVudGl0eUFzcGVjdC5zZXRVbmNoYW5nZWQoKTtcclxuXHJcbiAgICBlbnRpdHkuTWVyZ2VfRGF0YV9TZXQgPSBKU09OLnN0cmluZ2lmeSh7fSk7XHJcblxyXG4gICAgZm9yIChjb25zdCBrZXkgaW4gdGhpcy5jb25maWcubWVyZ2VEYXRhKSB7XHJcbiAgICAgIGVudGl0eS5lbnRpdHlBc3BlY3QudmFsaWRhdGVQcm9wZXJ0eShrZXkpO1xyXG4gICAgfTtcclxuICB9XHJcblxyXG4gIG9uQWNjZXB0ID0gKCkgPT4ge1xyXG4gICAgLy9sZXQgZW50aXR5ID0gdGhpcy5jb25maWcuZW50aXR5IGFzIGFueTtcclxuICAgIC8vbGV0IG9yaWdpbmFsVmFsdWVzID0gZW50aXR5LmVudGl0eUFzcGVjdC5vcmlnaW5hbFZhbHVlcztcclxuICAgIC8vbGV0IHByb3BlcnR5TmFtZSA9ICcnO1xyXG5cclxuICAgIC8vbGV0IG1lcmdlRGF0YSA9IEpTT04ucGFyc2UoZW50aXR5Lk1lcmdlX0RhdGFfU2V0KTtcclxuICAgIC8vbGV0IHByb3BlcnR5TmFtZUtleSA9IHByb3BlcnR5TmFtZSBhcyBrZXlvZiB0eXBlb2YgdGhpcy5tZXJnZURhdGE7XHJcbiAgICAvL2VudGl0eVtwcm9wZXJ0eU5hbWVdID0gdGhpcy5jb25maWcubWVyZ2VEYXRhPy5nZXREYXRhKHByb3BlcnR5TmFtZUtleSkhLnZhbHVlO1xyXG4gICAgLy9kZWxldGUgdGhpcy5tZXJnZURhdGFbcHJvcGVydHlOYW1lS2V5XTtcclxuXHJcbiAgICAvL2lmIChvcmlnaW5hbFZhbHVlcy5oYXNPd25Qcm9wZXJ0eShwcm9wZXJ0eU5hbWUpICYmIChPYmplY3Qua2V5cyhvcmlnaW5hbFZhbHVlcykubGVuZ3RoID09PSAwICYmIG9yaWdpbmFsVmFsdWVzLmNvbnN0cnVjdG9yID09PSBPYmplY3QpKVxyXG4gICAgLy8gIGRlbGV0ZSBvcmlnaW5hbFZhbHVlc1twcm9wZXJ0eU5hbWVdO1xyXG5cclxuICAgIC8vaWYgKCFPYmplY3Qua2V5cyh0aGlzLm1lcmdlRGF0YSkubGVuZ3RoKVxyXG4gICAgLy8gIGVudGl0eS5lbnRpdHlBc3BlY3Quc2V0VW5jaGFuZ2VkKCk7XHJcblxyXG4gICAgLy9lbnRpdHkuTWVyZ2VfRGF0YSA9IEpTT04uc3RyaW5naWZ5KHRoaXMubWVyZ2VEYXRhKTtcclxuICAgIC8vZW50aXR5LmVudGl0eUFzcGVjdC52YWxpZGF0ZVByb3BlcnR5KHByb3BlcnR5TmFtZSk7XHJcbiAgfVxyXG5cclxuICBvbkRlY2xpbmUgPSAoKSA9PiB7XHJcbiAgICAvL2xldCBlbnRpdHkgPSB0aGlzLmVudGl0eSBhcyBhbnk7XHJcbiAgICAvL2xldCBwcm9wZXJ0eU5hbWUgPSAnJztcclxuXHJcbiAgICAvL3RoaXMubWVyZ2VEYXRhID0gSlNPTi5wYXJzZShlbnRpdHkuTWVyZ2VfRGF0YSk7XHJcbiAgICAvL2xldCBwcm9wZXJ0eU5hbWVLZXkgPSBwcm9wZXJ0eU5hbWUgYXMga2V5b2YgdHlwZW9mIHRoaXMubWVyZ2VEYXRhO1xyXG4gICAgLy9kZWxldGUgdGhpcy5tZXJnZURhdGFbcHJvcGVydHlOYW1lS2V5XTtcclxuICAgIC8vZW50aXR5Lk1lcmdlX0RhdGEgPSBKU09OLnN0cmluZ2lmeSh0aGlzLm1lcmdlRGF0YSk7XHJcbiAgICAvL2VudGl0eS5lbnRpdHlBc3BlY3QudmFsaWRhdGVQcm9wZXJ0eShwcm9wZXJ0eU5hbWUpO1xyXG4gIH1cclxuXHJcbiAgbmdPbkluaXQoKSB7XHJcbiAgICB0aGlzLnV0aWwuZmluZENsb3Nlc3RBbmNlc3RvckJ5Q2xhc3ModGhpcy5lbGVtZW50UmVmLm5hdGl2ZUVsZW1lbnQsICcubWF0LW1kYy1mb3JtLWZpZWxkLWZsZXgnKS5jbGFzc0xpc3QuYWRkKCdpbnZhbGlkJyk7XHJcbiAgICB0aGlzLmVycm9yTXNnID0gdGhpcy5jb25maWcuZXJyb3JNc2c7XHJcbiAgfVxyXG5cclxuICBuZ09uRGVzdHJveSgpOiB2b2lkIHtcclxuICAgIHRoaXMudXRpbC5maW5kQ2xvc2VzdEFuY2VzdG9yQnlDbGFzcyh0aGlzLmVsZW1lbnRSZWYubmF0aXZlRWxlbWVudCwgJy5tYXQtbWRjLWZvcm0tZmllbGQtZmxleCcpLmNsYXNzTGlzdC5yZW1vdmUoJ2ludmFsaWQnKTtcclxuICB9XHJcbn1cclxuXHJcbiIsIjxkaXYgY2xhc3M9XCJpbnZhbGlkXCI+XHJcbiAgPGkgY2xhc3M9XCJpY29uLXdhcm5pbmctc2lnbiBpY29uLXdoaXRlXCI+PC9pPnt7Y29uZmlnLmVycm9yTXNnfX1cclxuICA8ZGl2PlxyXG4gICAgPGJ1dHRvbiAqbmdpZj1cImNvbmZpZy5tZXJnZURhdGFcIiBjbGFzcz1cIm1kLXByaW1hcnkgbWQtYnV0dG9uIG5nLXNjb3BlIG1kLWluay1yaXBwbGUgbWVyZ2UtYnV0dG9uXCIgKGNsaWNrKT1cIm9uQWNjZXB0QWxsKClcIj5BY2NlcHQgQWxsPC9idXR0b24+XHJcbiAgICA8YnV0dG9uICpuZ2lmPVwiY29uZmlnLm1lcmdlRGF0YVwiIGNsYXNzPVwibWQtcHJpbWFyeSBtZC1idXR0b24gbmctc2NvcGUgbWQtaW5rLXJpcHBsZSBtZXJnZS1idXR0b25cIiAoY2xpY2spPVwib25BY2NlcHQoKVwiPkFjY2VwdDwvYnV0dG9uPlxyXG4gICAgPGJ1dHRvbiAqbmdpZj1cImNvbmZpZy5tZXJnZURhdGFcIiBjbGFzcz1cIm1kLXByaW1hcnkgbWQtYnV0dG9uIG5nLXNjb3BlIG1kLWluay1yaXBwbGUgbWVyZ2UtYnV0dG9uXCIgKGNsaWNrKT1cIm9uRGVjbGluZSgpXCI+RGVjbGluZTwvYnV0dG9uPlxyXG4gIDwvZGl2PlxyXG48L2Rpdj5cclxuPHNwYW4gY2xhc3M9XCJpbnZhbGlkLWZsYWdcIj48L3NwYW4+XHJcbiJdfQ==
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Directive, Input } from '@angular/core';
|
|
2
2
|
import { TruValidationDialog } from '../../components/validation-dialog/tru-validation-dialog';
|
|
3
|
+
import { TruValidationDialogConfig } from '../../components/validation-dialog/tru-validation-dialog-config';
|
|
3
4
|
import * as i0 from "@angular/core";
|
|
4
5
|
import * as i1 from "../../services/tru-data-context";
|
|
5
6
|
export class TruBreezeValidator {
|
|
@@ -27,19 +28,28 @@ export class TruBreezeValidator {
|
|
|
27
28
|
}
|
|
28
29
|
});
|
|
29
30
|
if (targetProperty && targetProperty.Merge_Data) {
|
|
30
|
-
return
|
|
31
|
+
return targetProperty.Merge_Data_Set;
|
|
31
32
|
}
|
|
33
|
+
return undefined;
|
|
32
34
|
}
|
|
33
35
|
else {
|
|
34
|
-
return
|
|
36
|
+
return this.entity.Merge_Data_Set;
|
|
35
37
|
}
|
|
36
38
|
};
|
|
37
|
-
this.
|
|
39
|
+
this.parseErrorMessages = (validationErrors) => {
|
|
40
|
+
let errorMsg = '';
|
|
41
|
+
validationErrors.forEach((error) => {
|
|
42
|
+
errorMsg += error.errorMessage + '; ';
|
|
43
|
+
});
|
|
44
|
+
return errorMsg;
|
|
45
|
+
};
|
|
46
|
+
this.addValidationDialog = (config) => {
|
|
38
47
|
const componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);
|
|
39
48
|
const component = this.viewContainerRef.createComponent(componentFactory, 0, this.viewContainerRef.injector);
|
|
49
|
+
component.instance.config = config;
|
|
40
50
|
this.dialogRef = component;
|
|
41
51
|
};
|
|
42
|
-
this.
|
|
52
|
+
this.removeValidationDialog = () => {
|
|
43
53
|
if (this.dialogRef) {
|
|
44
54
|
this.dialogRef.destroy();
|
|
45
55
|
this.dialogRef = null;
|
|
@@ -55,11 +65,11 @@ export class TruBreezeValidator {
|
|
|
55
65
|
let removedPropertyValdations = validationObject.removed.filter((v) => {
|
|
56
66
|
return v.propertyName === this.config.propertyName;
|
|
57
67
|
});
|
|
58
|
-
if (addedPropertyValdations.length) {
|
|
59
|
-
this.
|
|
68
|
+
if (addedPropertyValdations.length || this.mergeData) {
|
|
69
|
+
this.addValidationDialog(new TruValidationDialogConfig(this.entity, this.config.propertyName, this.parseErrorMessages(addedPropertyValdations), this.mergeData));
|
|
60
70
|
}
|
|
61
71
|
else if (!addedPropertyValdations.length && removedPropertyValdations.length) {
|
|
62
|
-
this.
|
|
72
|
+
this.removeValidationDialog();
|
|
63
73
|
}
|
|
64
74
|
}
|
|
65
75
|
};
|
|
@@ -87,4 +97,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
87
97
|
}], config: [{
|
|
88
98
|
type: Input
|
|
89
99
|
}] } });
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tru-breeze-validator.js","sourceRoot":"","sources":["../../../../../../projects/tru-common-lib/src/lib/directives/breeze-validator/tru-breeze-validator.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, OnDestroy, OnInit, ViewChild, ViewContainerRef } from '@angular/core';\r\nimport { Subscription } from 'rxjs';\r\nimport { TruEditControlBase } from '../../base-classes/tru-edit-control-base';\r\nimport { TruEditControlConfigBase } from '../../base-classes/tru-edit-control-config-base';\r\nimport { TruEntityBase } from '../../base-classes/tru-entity-base';\r\nimport { TruValidationDialog } from '../../components/validation-dialog/tru-validation-dialog';\r\nimport { TruDataContext } from '../../services/tru-data-context';\r\n\r\n@Directive({\r\n  selector: '[truBreezeValidator]'\r\n})\r\nexport class TruBreezeValidator implements OnInit, OnDestroy {\r\n  @Input('truBreezeValidator') entity!: TruEntityBase;\r\n  @Input() config!: TruEditControlConfigBase;\r\n\r\n  constructor(\r\n    private el: ElementRef,\r\n    private dataContext: TruDataContext,\r\n    private viewContainerRef: ViewContainerRef,\r\n    private componentFactoryResolver: ComponentFactoryResolver) {\r\n  }\r\n\r\n  configModel: any = {};\r\n  mergeData: any;\r\n\r\n  private dialogRef: ComponentRef<any> | null = null;\r\n  private subs: Array<Subscription> = [];\r\n\r\n  private getMergeData = (): any => {\r\n    if (this.config.propertyPath?.includes('/')) {\r\n      let propertyNameParts = this.config.propertyPath.split('/');\r\n      propertyNameParts.pop();\r\n      let targetProperty: any;\r\n      propertyNameParts.forEach((name) => {\r\n        if (!targetProperty) {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = this.entity[targetPropertyName];\r\n        } else {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = targetProperty[targetPropertyName];\r\n        }\r\n      });\r\n      if (targetProperty && targetProperty.Merge_Data) {\r\n        return JSON.parse(targetProperty.Merge_Data);\r\n      }\r\n    } else {\r\n      return JSON.parse(this.entity.Merge_Data);\r\n    }\r\n  }\r\n\r\n  private addValidation = (propertyValidations: any) => {\r\n    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);\r\n    const component = this.viewContainerRef.createComponent<any>(componentFactory, 0, this.viewContainerRef.injector);\r\n    this.dialogRef = component;\r\n  }\r\n\r\n  private removeValidation = () => {\r\n    if (this.dialogRef) {\r\n      this.dialogRef.destroy();\r\n      this.dialogRef = null;\r\n    }\r\n  }\r\n\r\n  valErrsChanged = (validationObject: any) => {\r\n    let validationTableName = validationObject.entity.constructor.name;\r\n    if (this.config.rootTable === validationTableName) {\r\n      this.mergeData = this.getMergeData();\r\n      let addedPropertyValdations = validationObject.added.filter((v: any) => {\r\n          return v.propertyName === this.config.propertyName\r\n      });\r\n\r\n      let removedPropertyValdations = validationObject.removed.filter((v: any) => {\r\n      return v.propertyName === this.config.propertyName\r\n      });\r\n\r\n      if (addedPropertyValdations.length) {\r\n        this.addValidation(addedPropertyValdations);\r\n      } else if (!addedPropertyValdations.length && removedPropertyValdations.length) {\r\n        this.removeValidation();\r\n      }\r\n    }\r\n  }\r\n\r\n  ngOnInit(): void {\r\n    this.subs.push(this.dataContext.validationChangeDetection.subscribe(entities => {\r\n      console.log(entities);\r\n      this.valErrsChanged(entities);\r\n    }));\r\n  }\r\n\r\n  ngOnDestroy(): void {\r\n    this.subs.forEach(s => s.unsubscribe());\r\n  }\r\n}\r\n"]}
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tru-breeze-validator.js","sourceRoot":"","sources":["../../../../../../projects/tru-common-lib/src/lib/directives/breeze-validator/tru-breeze-validator.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Input, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';\r\nimport { ValidationError } from 'breeze-client';\r\nimport { Subscription } from 'rxjs';\r\nimport { forEach } from 'underscore';\r\nimport { TruEditControlConfigBase } from '../../base-classes/tru-edit-control-config-base';\r\nimport { TruEntityBase } from '../../base-classes/tru-entity-base';\r\nimport { TruMergeDataSet } from '../../classes/tru-merge-data-set';\r\nimport { TruValidationDialog } from '../../components/validation-dialog/tru-validation-dialog';\r\nimport { TruValidationDialogConfig } from '../../components/validation-dialog/tru-validation-dialog-config';\r\nimport { TruDataContext } from '../../services/tru-data-context';\r\n\r\n@Directive({\r\n  selector: '[truBreezeValidator]'\r\n})\r\nexport class TruBreezeValidator implements OnInit, OnDestroy {\r\n  @Input('truBreezeValidator') entity!: TruEntityBase;\r\n  @Input() config!: TruEditControlConfigBase;\r\n\r\n  constructor(\r\n    private el: ElementRef,\r\n    private dataContext: TruDataContext,\r\n    private viewContainerRef: ViewContainerRef,\r\n    private componentFactoryResolver: ComponentFactoryResolver) {\r\n  }\r\n\r\n  configModel: any = {};\r\n  mergeData: any;\r\n\r\n  private dialogRef: ComponentRef<any> | null = null;\r\n  private subs: Array<Subscription> = [];\r\n\r\n  private getMergeData = (): TruMergeDataSet | undefined => {\r\n    if (this.config.propertyPath?.includes('/')) {\r\n      let propertyNameParts = this.config.propertyPath.split('/');\r\n      propertyNameParts.pop();\r\n      let targetProperty: any;\r\n      propertyNameParts.forEach((name) => {\r\n        if (!targetProperty) {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = this.entity[targetPropertyName];\r\n        } else {\r\n          let targetPropertyName = 'o' + name as keyof typeof this.entity;\r\n          targetProperty = targetProperty[targetPropertyName];\r\n        }\r\n      });\r\n      if (targetProperty && targetProperty.Merge_Data) {\r\n        return targetProperty.Merge_Data_Set;\r\n      }\r\n      return undefined;\r\n    } else {\r\n      return this.entity.Merge_Data_Set;\r\n    }\r\n  }\r\n\r\n  private parseErrorMessages = (validationErrors: Array<ValidationError>): string => {\r\n    let errorMsg: string = '';\r\n    validationErrors.forEach((error) => {\r\n      errorMsg += error.errorMessage + '; ';\r\n    });\r\n    return errorMsg;\r\n  }\r\n\r\n  private addValidationDialog = (config: TruValidationDialogConfig) => {\r\n    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);\r\n    const component = this.viewContainerRef.createComponent<TruValidationDialog>(componentFactory, 0, this.viewContainerRef.injector);\r\n    component.instance.config = config;\r\n    this.dialogRef = component;\r\n  }\r\n\r\n  private removeValidationDialog = () => {\r\n    if (this.dialogRef) {\r\n      this.dialogRef.destroy();\r\n      this.dialogRef = null;\r\n    }\r\n  }\r\n\r\n  valErrsChanged = (validationObject: any) => {\r\n    let validationTableName = validationObject.entity.constructor.name;\r\n    if (this.config.rootTable === validationTableName) {\r\n      this.mergeData = this.getMergeData();\r\n      let addedPropertyValdations = validationObject.added.filter((v: any) => {\r\n        return v.propertyName === this.config.propertyName\r\n      });\r\n\r\n      let removedPropertyValdations = validationObject.removed.filter((v: any) => {\r\n        return v.propertyName === this.config.propertyName\r\n      });\r\n\r\n      if (addedPropertyValdations.length || this.mergeData) {\r\n        this.addValidationDialog(new TruValidationDialogConfig(\r\n          this.entity,\r\n          this.config.propertyName as string,\r\n          this.parseErrorMessages(addedPropertyValdations),\r\n          this.mergeData\r\n        ));\r\n      } else if (!addedPropertyValdations.length && removedPropertyValdations.length) {\r\n        this.removeValidationDialog();\r\n      }\r\n    }\r\n  }\r\n\r\n  ngOnInit(): void {\r\n    this.subs.push(this.dataContext.validationChangeDetection.subscribe(entities => {\r\n      console.log(entities);\r\n      this.valErrsChanged(entities);\r\n    }));\r\n  }\r\n\r\n  ngOnDestroy(): void {\r\n    this.subs.forEach(s => s.unsubscribe());\r\n  }\r\n}\r\n"]}
|
|
@@ -106,6 +106,7 @@ class TruEntityBase {
|
|
|
106
106
|
this.CreatedRef = -1;
|
|
107
107
|
this.Updated = undefined;
|
|
108
108
|
this.UpdatedRef = undefined;
|
|
109
|
+
this.Merge_Data_Set = undefined;
|
|
109
110
|
}
|
|
110
111
|
}
|
|
111
112
|
|
|
@@ -4846,60 +4847,66 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
4846
4847
|
} });
|
|
4847
4848
|
|
|
4848
4849
|
class TruValidationDialog {
|
|
4849
|
-
constructor() {
|
|
4850
|
+
constructor(elementRef, util) {
|
|
4851
|
+
this.elementRef = elementRef;
|
|
4852
|
+
this.util = util;
|
|
4853
|
+
this.errorMsg = '';
|
|
4850
4854
|
this.onAcceptAll = () => {
|
|
4851
|
-
let entity = this.entity;
|
|
4855
|
+
let entity = this.config.entity;
|
|
4852
4856
|
let originalValues = entity.entityAspect.originalValues;
|
|
4853
|
-
|
|
4854
|
-
|
|
4855
|
-
entity[key] = this.mergeData[propertyNameKey].value;
|
|
4857
|
+
for (const key in this.config.mergeData) {
|
|
4858
|
+
entity[key] = this.config.mergeData.getData(key).value;
|
|
4856
4859
|
if (originalValues.hasOwnProperty(key))
|
|
4857
4860
|
delete originalValues[key];
|
|
4858
|
-
}
|
|
4861
|
+
}
|
|
4862
|
+
;
|
|
4859
4863
|
if (Object.keys(originalValues).length === 0 && originalValues.constructor === Object)
|
|
4860
4864
|
entity.entityAspect.setUnchanged();
|
|
4861
|
-
|
|
4862
|
-
|
|
4863
|
-
propertiesToValidate.forEach(function (key) {
|
|
4865
|
+
entity.Merge_Data_Set = JSON.stringify({});
|
|
4866
|
+
for (const key in this.config.mergeData) {
|
|
4864
4867
|
entity.entityAspect.validateProperty(key);
|
|
4865
|
-
}
|
|
4868
|
+
}
|
|
4869
|
+
;
|
|
4866
4870
|
};
|
|
4867
4871
|
this.onAccept = () => {
|
|
4868
|
-
let entity = this.entity;
|
|
4869
|
-
let originalValues = entity.entityAspect.originalValues;
|
|
4870
|
-
let propertyName = '';
|
|
4871
|
-
|
|
4872
|
-
let propertyNameKey = propertyName;
|
|
4873
|
-
entity[propertyName] = this.mergeData
|
|
4874
|
-
delete this.mergeData[propertyNameKey];
|
|
4875
|
-
if (originalValues.hasOwnProperty(propertyName) && (Object.keys(originalValues).length === 0 && originalValues.constructor === Object))
|
|
4876
|
-
|
|
4877
|
-
if (!Object.keys(this.mergeData).length)
|
|
4878
|
-
|
|
4879
|
-
entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
4880
|
-
entity.entityAspect.validateProperty(propertyName);
|
|
4872
|
+
//let entity = this.config.entity as any;
|
|
4873
|
+
//let originalValues = entity.entityAspect.originalValues;
|
|
4874
|
+
//let propertyName = '';
|
|
4875
|
+
//let mergeData = JSON.parse(entity.Merge_Data_Set);
|
|
4876
|
+
//let propertyNameKey = propertyName as keyof typeof this.mergeData;
|
|
4877
|
+
//entity[propertyName] = this.config.mergeData?.getData(propertyNameKey)!.value;
|
|
4878
|
+
//delete this.mergeData[propertyNameKey];
|
|
4879
|
+
//if (originalValues.hasOwnProperty(propertyName) && (Object.keys(originalValues).length === 0 && originalValues.constructor === Object))
|
|
4880
|
+
// delete originalValues[propertyName];
|
|
4881
|
+
//if (!Object.keys(this.mergeData).length)
|
|
4882
|
+
// entity.entityAspect.setUnchanged();
|
|
4883
|
+
//entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
4884
|
+
//entity.entityAspect.validateProperty(propertyName);
|
|
4881
4885
|
};
|
|
4882
4886
|
this.onDecline = () => {
|
|
4883
|
-
let entity = this.entity;
|
|
4884
|
-
let propertyName = '';
|
|
4885
|
-
this.mergeData = JSON.parse(entity.Merge_Data);
|
|
4886
|
-
let propertyNameKey = propertyName;
|
|
4887
|
-
delete this.mergeData[propertyNameKey];
|
|
4888
|
-
entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
4889
|
-
entity.entityAspect.validateProperty(propertyName);
|
|
4887
|
+
//let entity = this.entity as any;
|
|
4888
|
+
//let propertyName = '';
|
|
4889
|
+
//this.mergeData = JSON.parse(entity.Merge_Data);
|
|
4890
|
+
//let propertyNameKey = propertyName as keyof typeof this.mergeData;
|
|
4891
|
+
//delete this.mergeData[propertyNameKey];
|
|
4892
|
+
//entity.Merge_Data = JSON.stringify(this.mergeData);
|
|
4893
|
+
//entity.entityAspect.validateProperty(propertyName);
|
|
4890
4894
|
};
|
|
4891
4895
|
}
|
|
4892
4896
|
ngOnInit() {
|
|
4897
|
+
this.util.findClosestAncestorByClass(this.elementRef.nativeElement, '.mat-mdc-form-field-flex').classList.add('invalid');
|
|
4898
|
+
this.errorMsg = this.config.errorMsg;
|
|
4899
|
+
}
|
|
4900
|
+
ngOnDestroy() {
|
|
4901
|
+
this.util.findClosestAncestorByClass(this.elementRef.nativeElement, '.mat-mdc-form-field-flex').classList.remove('invalid');
|
|
4893
4902
|
}
|
|
4894
4903
|
}
|
|
4895
|
-
TruValidationDialog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
4896
|
-
TruValidationDialog.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.1", type: TruValidationDialog, selector: "tru-validation-dialog", inputs: {
|
|
4904
|
+
TruValidationDialog.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, deps: [{ token: i0.ElementRef }, { token: TruUtil }], target: i0.ɵɵFactoryTarget.Component });
|
|
4905
|
+
TruValidationDialog.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.1", type: TruValidationDialog, selector: "tru-validation-dialog", inputs: { config: "config" }, ngImport: i0, template: "<div class=\"invalid\">\r\n <i class=\"icon-warning-sign icon-white\"></i>{{config.errorMsg}}\r\n <div>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAcceptAll()\">Accept All</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAccept()\">Accept</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onDecline()\">Decline</button>\r\n </div>\r\n</div>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}.merge-button{margin:5px;background-color:#fff}\n"] });
|
|
4897
4906
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruValidationDialog, decorators: [{
|
|
4898
4907
|
type: Component,
|
|
4899
|
-
args: [{ selector: 'tru-validation-dialog', template: "<
|
|
4900
|
-
}], ctorParameters: function () { return []; }, propDecorators: {
|
|
4901
|
-
type: Input
|
|
4902
|
-
}], mergeData: [{
|
|
4908
|
+
args: [{ selector: 'tru-validation-dialog', template: "<div class=\"invalid\">\r\n <i class=\"icon-warning-sign icon-white\"></i>{{config.errorMsg}}\r\n <div>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAcceptAll()\">Accept All</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onAccept()\">Accept</button>\r\n <button *ngif=\"config.mergeData\" class=\"md-primary md-button ng-scope md-ink-ripple merge-button\" (click)=\"onDecline()\">Decline</button>\r\n </div>\r\n</div>\r\n<span class=\"invalid-flag\"></span>\r\n", styles: [".invalid{position:absolute;left:0;top:20px;display:none;-moz-min-width:200px;-ms-min-width:200px;-o-min-width:200px;-webkit-min-width:200px;min-width:200px;min-height:20px;max-width:500px;max-height:500px}.invalid-flag{box-sizing:border-box;position:absolute;left:0;top:0;width:8px;height:8px;border-bottom:solid 4px transparent;border-right:solid 4px transparent;border-left:solid 4px red;border-top:solid 4px red}.invalid-triangle:after{box-sizing:border-box}.invalid{background-color:#bd362f;margin:2px 0 0;padding:4px 10px;border-radius:3px!important;background-position:15px center;background-repeat:no-repeat;-ms-box-shadow:0 0 12px #999999;box-shadow:0 0 12px #999;color:#fff;-ms-opacity:.9;opacity:.9;z-index:1000}.merge-button{margin:5px;background-color:#fff}\n"] }]
|
|
4909
|
+
}], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: TruUtil }]; }, propDecorators: { config: [{
|
|
4903
4910
|
type: Input
|
|
4904
4911
|
}] } });
|
|
4905
4912
|
|
|
@@ -4917,6 +4924,27 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImpor
|
|
|
4917
4924
|
}]
|
|
4918
4925
|
}] });
|
|
4919
4926
|
|
|
4927
|
+
class TruValidationDialogConfig {
|
|
4928
|
+
get entity() {
|
|
4929
|
+
return this._entity;
|
|
4930
|
+
}
|
|
4931
|
+
get propertyName() {
|
|
4932
|
+
return this._propertyName;
|
|
4933
|
+
}
|
|
4934
|
+
get errorMsg() {
|
|
4935
|
+
return this._errorMsg;
|
|
4936
|
+
}
|
|
4937
|
+
get mergeData() {
|
|
4938
|
+
return this._mergeData;
|
|
4939
|
+
}
|
|
4940
|
+
constructor(entity, propertyName, errorMsg, mergeData = null) {
|
|
4941
|
+
this._entity = entity;
|
|
4942
|
+
this._propertyName = propertyName;
|
|
4943
|
+
this._errorMsg = errorMsg;
|
|
4944
|
+
this._mergeData = mergeData;
|
|
4945
|
+
}
|
|
4946
|
+
}
|
|
4947
|
+
|
|
4920
4948
|
class TruBreezeValidator {
|
|
4921
4949
|
constructor(el, dataContext, viewContainerRef, componentFactoryResolver) {
|
|
4922
4950
|
this.el = el;
|
|
@@ -4943,19 +4971,28 @@ class TruBreezeValidator {
|
|
|
4943
4971
|
}
|
|
4944
4972
|
});
|
|
4945
4973
|
if (targetProperty && targetProperty.Merge_Data) {
|
|
4946
|
-
return
|
|
4974
|
+
return targetProperty.Merge_Data_Set;
|
|
4947
4975
|
}
|
|
4976
|
+
return undefined;
|
|
4948
4977
|
}
|
|
4949
4978
|
else {
|
|
4950
|
-
return
|
|
4979
|
+
return this.entity.Merge_Data_Set;
|
|
4951
4980
|
}
|
|
4952
4981
|
};
|
|
4953
|
-
this.
|
|
4982
|
+
this.parseErrorMessages = (validationErrors) => {
|
|
4983
|
+
let errorMsg = '';
|
|
4984
|
+
validationErrors.forEach((error) => {
|
|
4985
|
+
errorMsg += error.errorMessage + '; ';
|
|
4986
|
+
});
|
|
4987
|
+
return errorMsg;
|
|
4988
|
+
};
|
|
4989
|
+
this.addValidationDialog = (config) => {
|
|
4954
4990
|
const componentFactory = this.componentFactoryResolver.resolveComponentFactory(TruValidationDialog);
|
|
4955
4991
|
const component = this.viewContainerRef.createComponent(componentFactory, 0, this.viewContainerRef.injector);
|
|
4992
|
+
component.instance.config = config;
|
|
4956
4993
|
this.dialogRef = component;
|
|
4957
4994
|
};
|
|
4958
|
-
this.
|
|
4995
|
+
this.removeValidationDialog = () => {
|
|
4959
4996
|
if (this.dialogRef) {
|
|
4960
4997
|
this.dialogRef.destroy();
|
|
4961
4998
|
this.dialogRef = null;
|
|
@@ -4971,11 +5008,11 @@ class TruBreezeValidator {
|
|
|
4971
5008
|
let removedPropertyValdations = validationObject.removed.filter((v) => {
|
|
4972
5009
|
return v.propertyName === this.config.propertyName;
|
|
4973
5010
|
});
|
|
4974
|
-
if (addedPropertyValdations.length) {
|
|
4975
|
-
this.
|
|
5011
|
+
if (addedPropertyValdations.length || this.mergeData) {
|
|
5012
|
+
this.addValidationDialog(new TruValidationDialogConfig(this.entity, this.config.propertyName, this.parseErrorMessages(addedPropertyValdations), this.mergeData));
|
|
4976
5013
|
}
|
|
4977
5014
|
else if (!addedPropertyValdations.length && removedPropertyValdations.length) {
|
|
4978
|
-
this.
|
|
5015
|
+
this.removeValidationDialog();
|
|
4979
5016
|
}
|
|
4980
5017
|
}
|
|
4981
5018
|
};
|