@trudb/tru-common-lib 0.0.821 → 0.0.823
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/esm2022/lib/base-classes/tru-entity-base.mjs +3 -2
- package/esm2022/lib/classes/tru-merge-data-set.mjs +4 -1
- package/esm2022/lib/classes/tru-validator-factory.mjs +7 -6
- package/fesm2022/trudb-tru-common-lib.mjs +27 -6
- package/fesm2022/trudb-tru-common-lib.mjs.map +1 -1
- package/lib/base-classes/tru-entity-base.d.ts +1 -1
- package/lib/classes/tru-merge-data-set.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EntityAspect } from 'breeze-client';
|
|
2
|
+
import { TruMergeDataSet } from '../classes/tru-merge-data-set';
|
|
2
3
|
export class TruEntityBase {
|
|
3
4
|
constructor(...args) { }
|
|
4
5
|
entityAspect = new EntityAspect();
|
|
@@ -8,7 +9,7 @@ export class TruEntityBase {
|
|
|
8
9
|
Updated = undefined;
|
|
9
10
|
UpdatedRef = undefined;
|
|
10
11
|
rowver;
|
|
11
|
-
Merge_Data_Set =
|
|
12
|
+
Merge_Data_Set = new TruMergeDataSet();
|
|
12
13
|
Is_Invalid = undefined;
|
|
13
14
|
}
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LWVudGl0eS1iYXNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9iYXNlLWNsYXNzZXMvdHJ1LWVudGl0eS1iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBVSxZQUFZLEVBQWMsTUFBTSxlQUFlLENBQUM7QUFDakUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRWhFLE1BQU0sT0FBTyxhQUFhO0lBQ3hCLFlBQVksR0FBRyxJQUFXLElBQUksQ0FBQztJQUUvQixZQUFZLEdBQWlCLElBQUksWUFBWSxFQUFFLENBQUM7SUFDaEQsVUFBVSxDQUFjO0lBRXhCLE9BQU8sR0FBUyxJQUFJLElBQUksRUFBRSxDQUFDO0lBQzNCLFVBQVUsR0FBVyxDQUFDLENBQUMsQ0FBQztJQUN4QixPQUFPLEdBQXFCLFNBQVMsQ0FBQztJQUN0QyxVQUFVLEdBQXVCLFNBQVMsQ0FBQztJQUMzQyxNQUFNLENBQU07SUFFWixjQUFjLEdBQW9CLElBQUksZUFBZSxFQUFFLENBQUM7SUFDeEQsVUFBVSxHQUF3QixTQUFTLENBQUM7Q0FDN0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbnRpdHksIEVudGl0eUFzcGVjdCwgRW50aXR5VHlwZSB9IGZyb20gJ2JyZWV6ZS1jbGllbnQnO1xyXG5pbXBvcnQgeyBUcnVNZXJnZURhdGFTZXQgfSBmcm9tICcuLi9jbGFzc2VzL3RydS1tZXJnZS1kYXRhLXNldCc7XHJcblxyXG5leHBvcnQgY2xhc3MgVHJ1RW50aXR5QmFzZSBpbXBsZW1lbnRzIEVudGl0eSB7XHJcbiAgY29uc3RydWN0b3IoLi4uYXJnczogYW55W10pIHsgfVxyXG5cclxuICBlbnRpdHlBc3BlY3Q6IEVudGl0eUFzcGVjdCA9IG5ldyBFbnRpdHlBc3BlY3QoKTtcclxuICBlbnRpdHlUeXBlITogRW50aXR5VHlwZTtcclxuXHJcbiAgQ3JlYXRlZDogRGF0ZSA9IG5ldyBEYXRlKCk7XHJcbiAgQ3JlYXRlZFJlZjogbnVtYmVyID0gLTE7XHJcbiAgVXBkYXRlZDogRGF0ZSB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcclxuICBVcGRhdGVkUmVmOiBudW1iZXIgfCB1bmRlZmluZWQgPSB1bmRlZmluZWQ7XHJcbiAgcm93dmVyOiBhbnk7XHJcblxyXG4gIE1lcmdlX0RhdGFfU2V0OiBUcnVNZXJnZURhdGFTZXQgPSBuZXcgVHJ1TWVyZ2VEYXRhU2V0KCk7XHJcbiAgSXNfSW52YWxpZDogYm9vbGVhbiB8IHVuZGVmaW5lZCA9IHVuZGVmaW5lZDtcclxufVxyXG4iXX0=
|
|
@@ -12,6 +12,9 @@ export class TruMergeDataSet {
|
|
|
12
12
|
clearAll = () => {
|
|
13
13
|
this._data = {};
|
|
14
14
|
};
|
|
15
|
+
isEmpty = () => {
|
|
16
|
+
return Object.keys(this._data).length === 0;
|
|
17
|
+
};
|
|
15
18
|
constructor() { }
|
|
16
19
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
20
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHJ1LW1lcmdlLWRhdGEtc2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdHJ1LWNvbW1vbi1saWIvc3JjL2xpYi9jbGFzc2VzL3RydS1tZXJnZS1kYXRhLXNldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLE9BQU8sZUFBZTtJQUNsQixLQUFLLEdBQWlDLEVBQUUsQ0FBQztJQUVqRCxHQUFHLEdBQUcsQ0FBQyxZQUFvQixFQUE0QixFQUFFO1FBQ3ZELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUNsQyxDQUFDLENBQUE7SUFFRCxHQUFHLEdBQUcsQ0FBQyxZQUFvQixFQUFFLElBQWtCLEVBQUUsRUFBRTtRQUNqRCxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxHQUFHLElBQUksQ0FBQztJQUNsQyxDQUFDLENBQUE7SUFFRCxLQUFLLEdBQUcsQ0FBQyxZQUFvQixFQUFFLEVBQUU7UUFDL0IsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQ2xDLENBQUMsQ0FBQTtJQUVELFFBQVEsR0FBRyxHQUFHLEVBQUU7UUFDZCxJQUFJLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztJQUNsQixDQUFDLENBQUE7SUFFRCxPQUFPLEdBQUcsR0FBWSxFQUFFO1FBQ3RCLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQztJQUM5QyxDQUFDLENBQUE7SUFFRCxnQkFBZSxDQUFDO0NBQ2pCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgVHJ1TWVyZ2VEYXRhIH0gZnJvbSBcIi4vdHJ1LW1lcmdlLWRhdGFcIjtcclxuXHJcbmV4cG9ydCBjbGFzcyBUcnVNZXJnZURhdGFTZXQge1xyXG4gIHByaXZhdGUgX2RhdGE6IFJlY29yZDxzdHJpbmcsIFRydU1lcmdlRGF0YT4gPSB7fTtcclxuXHJcbiAgZ2V0ID0gKHByb3BlcnR5TmFtZTogc3RyaW5nKTogVHJ1TWVyZ2VEYXRhIHwgdW5kZWZpbmVkID0+IHtcclxuICAgIHJldHVybiB0aGlzLl9kYXRhW3Byb3BlcnR5TmFtZV07XHJcbiAgfVxyXG5cclxuICBzZXQgPSAocHJvcGVydHlOYW1lOiBzdHJpbmcsIGRhdGE6IFRydU1lcmdlRGF0YSkgPT4ge1xyXG4gICAgdGhpcy5fZGF0YVtwcm9wZXJ0eU5hbWVdID0gZGF0YTtcclxuICB9XHJcblxyXG4gIGNsZWFyID0gKHByb3BlcnR5TmFtZTogc3RyaW5nKSA9PiB7XHJcbiAgICBkZWxldGUgdGhpcy5fZGF0YVtwcm9wZXJ0eU5hbWVdO1xyXG4gIH1cclxuXHJcbiAgY2xlYXJBbGwgPSAoKSA9PiB7XHJcbiAgICB0aGlzLl9kYXRhID0ge307XHJcbiAgfVxyXG5cclxuICBpc0VtcHR5ID0gKCk6IGJvb2xlYW4gPT4ge1xyXG4gICAgcmV0dXJuIE9iamVjdC5rZXlzKHRoaXMuX2RhdGEpLmxlbmd0aCA9PT0gMDtcclxuICB9XHJcblxyXG4gIGNvbnN0cnVjdG9yKCkge31cclxufVxyXG4iXX0=
|
|
@@ -42,12 +42,13 @@ export class TruValidatorFactory {
|
|
|
42
42
|
return true;
|
|
43
43
|
}
|
|
44
44
|
satisfiesMergeValidation = (value, context) => {
|
|
45
|
-
var mergeData =
|
|
46
|
-
if (
|
|
45
|
+
var mergeData = context.entity.Merge_Data_Set;
|
|
46
|
+
if (mergeData.isEmpty())
|
|
47
47
|
return true;
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
let targetProperty = mergeData.get(context.propertyName);
|
|
49
|
+
if (targetProperty) {
|
|
50
|
+
var mergeValue = targetProperty.hid ? targetProperty.hid : targetProperty.value;
|
|
51
|
+
context.error = targetProperty.modifiedBy + ' changed ' + context.propertyName + ' to ' + mergeValue + '.';
|
|
51
52
|
return false;
|
|
52
53
|
}
|
|
53
54
|
return true;
|
|
@@ -93,4 +94,4 @@ export class TruValidatorFactory {
|
|
|
93
94
|
});
|
|
94
95
|
};
|
|
95
96
|
}
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tru-validator-factory.js","sourceRoot":"","sources":["../../../../../projects/tru-common-lib/src/lib/classes/tru-validator-factory.ts"],"names":[],"mappings":"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","sourcesContent":["import { breeze, Validator } from \"breeze-client\";\r\nimport _ from \"underscore\";\r\nimport { TruMergeDataSet } from \"./tru-merge-data-set\";\r\n\r\nexport class TruValidatorFactory {\r\n  private satisfiesEntityMessageValidation = (entity: any, context: any) => {\r\n    var messages = _.values(entity._customValidationErrors);\r\n    if (!messages.length)\r\n      return true;\r\n    context.messageTemplate = messages.join('...');\r\n    return false;\r\n  }\r\n\r\n  private satisfiesRequiredValidation(value: any) {\r\n    if (value === null || value === '') return false;\r\n    return true;\r\n  }\r\n\r\n  private satisfiesMaxLengthValidation = (value: any, context: any) => {\r\n    if (!value)\r\n      return true;\r\n    return typeof value === 'string' && value.length <= context.maxLength;\r\n  }\r\n\r\n  private satisfiesFloatValidation = (value: any) => {\r\n    if (value === null)\r\n      return true;\r\n    return typeof value === 'number' && isFinite(value);\r\n  }\r\n\r\n  private satisfiesIntegerValidation = (value: any) => {\r\n    if (value === null)\r\n      return true;\r\n    //NOTE: Number.isInteger() would work, but is not implemented in all supported browsers\r\n    return typeof value === 'number' && isFinite(value) && Math.floor(value) === value;\r\n  }\r\n\r\n  private satisfiesDateValidation(value: any) {\r\n    if (Object.prototype.toString.call(value) !== '[object Date]')\r\n      return false;\r\n    return isFinite(value.getTime());\r\n  }\r\n\r\n  private satisfiesInvalidChoiceValidation(value: any, context: any) {\r\n    if (context.entity.Is_Invalid === 'true') {\r\n      context.error = context.propertyName + '\\' invalid choice'\r\n      return false;\r\n    }\r\n    return true;\r\n  }\r\n\r\n  private satisfiesMergeValidation = (value: any, context: any) => {\r\n    var mergeData = context.entity.Merge_Data_Set as TruMergeDataSet;\r\n    if (mergeData.isEmpty())\r\n      return true;\r\n    let targetProperty = mergeData.get(context.propertyName);\r\n    if (targetProperty) {\r\n      var mergeValue = targetProperty.hid ? targetProperty.hid : targetProperty.value;\r\n      context.error = targetProperty.modifiedBy + ' changed ' + context.propertyName + ' to ' + mergeValue + '.';\r\n      return false;\r\n    }\r\n    return true;\r\n  }\r\n\r\n  createEntityMessageValidator = (): Validator => {\r\n    return new breeze.Validator('entityMessage', this.satisfiesEntityMessageValidation);\r\n  }\r\n\r\n  createRequiredValidator = (): Validator => {\r\n    return new breeze.Validator('required', this.satisfiesRequiredValidation, {\r\n      messageTemplate: '\\'%displayName%\\' is required'\r\n    });\r\n  }\r\n\r\n  createMaxLengthValidator = (maxLength: any): Validator => {\r\n    var context = {\r\n      messageTemplate: '\\'%displayName%\\' exceeds maximum character length of %maxLength%',\r\n      maxLength: maxLength\r\n    };\r\n    return new breeze.Validator('maxLength', this.satisfiesMaxLengthValidation, context);\r\n  };\r\n\r\n  createIntegerValidator = (): Validator => {\r\n    return new breeze.Validator('integer', this.satisfiesIntegerValidation, {\r\n      messageTemplate: '\\'%displayName%\\' must be an integer'\r\n    });\r\n  }\r\n\r\n  createFloatValidator = (): Validator => {\r\n    return new breeze.Validator('float', this.satisfiesFloatValidation, {\r\n      messageTemplate: '\\'%displayName%\\' must be a number'\r\n    });\r\n  }\r\n\r\n  createDateValidator = (): Validator => {\r\n    return new breeze.Validator('date', this.satisfiesDateValidation, {\r\n      messageTemplate: '\\'%displayName%\\' must be a date'\r\n    });\r\n  }\r\n\r\n  createInvalidChoiceValidator = (): Validator => {\r\n    return new breeze.Validator('invalid', this.satisfiesInvalidChoiceValidation, {\r\n      messageTemplate: '\\'%error%'\r\n    });\r\n  }\r\n\r\n  createMergeValidator = (): Validator => {\r\n    return new breeze.Validator('merge', this.satisfiesMergeValidation, {\r\n      messageTemplate: '\\'%error%\\''\r\n    });\r\n  }\r\n}\r\n"]}
|
|
@@ -117,6 +117,26 @@ class TruEditPkeyControlConfigBase {
|
|
|
117
117
|
constructor() { }
|
|
118
118
|
}
|
|
119
119
|
|
|
120
|
+
class TruMergeDataSet {
|
|
121
|
+
_data = {};
|
|
122
|
+
get = (propertyName) => {
|
|
123
|
+
return this._data[propertyName];
|
|
124
|
+
};
|
|
125
|
+
set = (propertyName, data) => {
|
|
126
|
+
this._data[propertyName] = data;
|
|
127
|
+
};
|
|
128
|
+
clear = (propertyName) => {
|
|
129
|
+
delete this._data[propertyName];
|
|
130
|
+
};
|
|
131
|
+
clearAll = () => {
|
|
132
|
+
this._data = {};
|
|
133
|
+
};
|
|
134
|
+
isEmpty = () => {
|
|
135
|
+
return Object.keys(this._data).length === 0;
|
|
136
|
+
};
|
|
137
|
+
constructor() { }
|
|
138
|
+
}
|
|
139
|
+
|
|
120
140
|
class TruEntityBase {
|
|
121
141
|
constructor(...args) { }
|
|
122
142
|
entityAspect = new EntityAspect();
|
|
@@ -126,7 +146,7 @@ class TruEntityBase {
|
|
|
126
146
|
Updated = undefined;
|
|
127
147
|
UpdatedRef = undefined;
|
|
128
148
|
rowver;
|
|
129
|
-
Merge_Data_Set =
|
|
149
|
+
Merge_Data_Set = new TruMergeDataSet();
|
|
130
150
|
Is_Invalid = undefined;
|
|
131
151
|
}
|
|
132
152
|
|
|
@@ -2403,12 +2423,13 @@ class TruValidatorFactory {
|
|
|
2403
2423
|
return true;
|
|
2404
2424
|
}
|
|
2405
2425
|
satisfiesMergeValidation = (value, context) => {
|
|
2406
|
-
var mergeData =
|
|
2407
|
-
if (
|
|
2426
|
+
var mergeData = context.entity.Merge_Data_Set;
|
|
2427
|
+
if (mergeData.isEmpty())
|
|
2408
2428
|
return true;
|
|
2409
|
-
|
|
2410
|
-
|
|
2411
|
-
|
|
2429
|
+
let targetProperty = mergeData.get(context.propertyName);
|
|
2430
|
+
if (targetProperty) {
|
|
2431
|
+
var mergeValue = targetProperty.hid ? targetProperty.hid : targetProperty.value;
|
|
2432
|
+
context.error = targetProperty.modifiedBy + ' changed ' + context.propertyName + ' to ' + mergeValue + '.';
|
|
2412
2433
|
return false;
|
|
2413
2434
|
}
|
|
2414
2435
|
return true;
|