@trudb/tru-common-lib 0.0.822 → 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.
|
@@ -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":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,eAAe,CAAC;AAClD,OAAO,CAAC,MAAM,YAAY,CAAC;AAG3B,MAAM,OAAO,mBAAmB;IACtB,gCAAgC,GAAG,CAAC,MAAW,EAAE,OAAY,EAAE,EAAE;QACvE,IAAI,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,MAAM;YAClB,OAAO,IAAI,CAAC;QACd,OAAO,CAAC,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC,CAAA;IAEO,2BAA2B,CAAC,KAAU;QAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,EAAE;YAAE,OAAO,KAAK,CAAC;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,4BAA4B,GAAG,CAAC,KAAU,EAAE,OAAY,EAAE,EAAE;QAClE,IAAI,CAAC,KAAK;YACR,OAAO,IAAI,CAAC;QACd,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IACxE,CAAC,CAAA;IAEO,wBAAwB,GAAG,CAAC,KAAU,EAAE,EAAE;QAChD,IAAI,KAAK,KAAK,IAAI;YAChB,OAAO,IAAI,CAAC;QACd,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC,CAAA;IAEO,0BAA0B,GAAG,CAAC,KAAU,EAAE,EAAE;QAClD,IAAI,KAAK,KAAK,IAAI;YAChB,OAAO,IAAI,CAAC;QACd,uFAAuF;QACvF,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC;IACrF,CAAC,CAAA;IAEO,uBAAuB,CAAC,KAAU;QACxC,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,eAAe;YAC3D,OAAO,KAAK,CAAC;QACf,OAAO,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACnC,CAAC;IAEO,gCAAgC,CAAC,KAAU,EAAE,OAAY;QAC/D,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,KAAK,MAAM,EAAE;YACxC,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,YAAY,GAAG,mBAAmB,CAAA;YAC1D,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,wBAAwB,GAAG,CAAC,KAAU,EAAE,OAAY,EAAE,EAAE;QAC9D,IAAI,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,cAAiC,CAAC;QACjE,IAAI,SAAS,CAAC,OAAO,EAAE;YACrB,OAAO,IAAI,CAAC;QACd,IAAI,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACzD,IAAI,cAAc,EAAE;YAClB,IAAI,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC;YAChF,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC,UAAU,GAAG,WAAW,GAAG,OAAO,CAAC,YAAY,GAAG,MAAM,GAAG,UAAU,GAAG,GAAG,CAAC;YAC3G,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;IAED,4BAA4B,GAAG,GAAc,EAAE;QAC7C,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACtF,CAAC,CAAA;IAED,uBAAuB,GAAG,GAAc,EAAE;QACxC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,2BAA2B,EAAE;YACxE,eAAe,EAAE,+BAA+B;SACjD,CAAC,CAAC;IACL,CAAC,CAAA;IAED,wBAAwB,GAAG,CAAC,SAAc,EAAa,EAAE;QACvD,IAAI,OAAO,GAAG;YACZ,eAAe,EAAE,mEAAmE;YACpF,SAAS,EAAE,SAAS;SACrB,CAAC;QACF,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC,CAAC;IAEF,sBAAsB,GAAG,GAAc,EAAE;QACvC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,0BAA0B,EAAE;YACtE,eAAe,EAAE,sCAAsC;SACxD,CAAC,CAAC;IACL,CAAC,CAAA;IAED,oBAAoB,GAAG,GAAc,EAAE;QACrC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,wBAAwB,EAAE;YAClE,eAAe,EAAE,oCAAoC;SACtD,CAAC,CAAC;IACL,CAAC,CAAA;IAED,mBAAmB,GAAG,GAAc,EAAE;QACpC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,uBAAuB,EAAE;YAChE,eAAe,EAAE,kCAAkC;SACpD,CAAC,CAAC;IACL,CAAC,CAAA;IAED,4BAA4B,GAAG,GAAc,EAAE;QAC7C,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,gCAAgC,EAAE;YAC5E,eAAe,EAAE,WAAW;SAC7B,CAAC,CAAC;IACL,CAAC,CAAA;IAED,oBAAoB,GAAG,GAAc,EAAE;QACrC,OAAO,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,wBAAwB,EAAE;YAClE,eAAe,EAAE,aAAa;SAC/B,CAAC,CAAC;IACL,CAAC,CAAA;CACF","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"]}
|
|
@@ -131,6 +131,9 @@ class TruMergeDataSet {
|
|
|
131
131
|
clearAll = () => {
|
|
132
132
|
this._data = {};
|
|
133
133
|
};
|
|
134
|
+
isEmpty = () => {
|
|
135
|
+
return Object.keys(this._data).length === 0;
|
|
136
|
+
};
|
|
134
137
|
constructor() { }
|
|
135
138
|
}
|
|
136
139
|
|
|
@@ -2420,12 +2423,13 @@ class TruValidatorFactory {
|
|
|
2420
2423
|
return true;
|
|
2421
2424
|
}
|
|
2422
2425
|
satisfiesMergeValidation = (value, context) => {
|
|
2423
|
-
var mergeData =
|
|
2424
|
-
if (
|
|
2426
|
+
var mergeData = context.entity.Merge_Data_Set;
|
|
2427
|
+
if (mergeData.isEmpty())
|
|
2425
2428
|
return true;
|
|
2426
|
-
|
|
2427
|
-
|
|
2428
|
-
|
|
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 + '.';
|
|
2429
2433
|
return false;
|
|
2430
2434
|
}
|
|
2431
2435
|
return true;
|