@colijnit/ioneconnector 3.1.6 → 3.1.7
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/build/enum/message-type.enum.d.ts +6 -0
- package/build/enum/message-type.enum.js +11 -0
- package/build/enum/message-type.enum.js.map +1 -0
- package/build/enum/screen-config-subcategory.enum.d.ts +2 -0
- package/build/enum/screen-config-subcategory.enum.js +3 -0
- package/build/enum/screen-config-subcategory.enum.js.map +1 -0
- package/build/model/default-all-scr-cfg-subcategory.d.ts +2 -0
- package/build/model/default-all-scr-cfg-subcategory.js +5 -0
- package/build/model/default-all-scr-cfg-subcategory.js.map +1 -0
- package/build/model/default-get-object-configurations-params.d.ts +2 -0
- package/build/model/default-get-object-configurations-params.js +6 -0
- package/build/model/default-get-object-configurations-params.js.map +1 -0
- package/build/model/field-validation.d.ts +3 -0
- package/build/model/field-validation.js +49 -0
- package/build/model/field-validation.js.map +1 -1
- package/build/model/object-configuration.d.ts +3 -0
- package/build/model/object-configuration.js +12 -1
- package/build/model/object-configuration.js.map +1 -1
- package/build/model/validation-message.d.ts +1 -0
- package/build/model/validation-message.js +5 -0
- package/build/model/validation-message.js.map +1 -1
- package/build/model/validation-result.d.ts +18 -0
- package/build/model/validation-result.js +154 -0
- package/build/model/validation-result.js.map +1 -1
- package/build/provider/base-backend-connection.service.js +2 -1
- package/build/provider/base-backend-connection.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MessageType = void 0;
|
|
4
|
+
var MessageType;
|
|
5
|
+
(function (MessageType) {
|
|
6
|
+
MessageType["Error"] = "E";
|
|
7
|
+
MessageType["Warning"] = "W";
|
|
8
|
+
MessageType["Information"] = "I";
|
|
9
|
+
MessageType["NoMessage"] = "N";
|
|
10
|
+
})(MessageType = exports.MessageType || (exports.MessageType = {}));
|
|
11
|
+
//# sourceMappingURL=message-type.enum.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"message-type.enum.js","sourceRoot":"","sources":["../../src/enum/message-type.enum.ts"],"names":[],"mappings":";;;AACA,IAAY,WAKX;AALD,WAAY,WAAW;IACnB,0BAAW,CAAA;IACX,4BAAa,CAAA;IACb,gCAAiB,CAAA;IACjB,8BAAe,CAAA;AACnB,CAAC,EALW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAKtB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"screen-config-subcategory.enum.js","sourceRoot":"","sources":["../../src/enum/screen-config-subcategory.enum.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"default-all-scr-cfg-subcategory.js","sourceRoot":"","sources":["../../src/model/default-all-scr-cfg-subcategory.ts"],"names":[],"mappings":";;;AAGa,QAAA,+BAA+B,GAAgC,KAAK,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_GET_OBJECT_CONFIGURATION_PARAMS = void 0;
|
|
4
|
+
const default_all_scr_cfg_subcategory_1 = require("./default-all-scr-cfg-subcategory");
|
|
5
|
+
exports.DEFAULT_GET_OBJECT_CONFIGURATION_PARAMS = [default_all_scr_cfg_subcategory_1.DEFAULT_ALL_SCR_CFG_SUBCATEGORY];
|
|
6
|
+
//# sourceMappingURL=default-get-object-configurations-params.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"default-get-object-configurations-params.js","sourceRoot":"","sources":["../../src/model/default-get-object-configurations-params.ts"],"names":[],"mappings":";;;AACA,uFAAkF;AAErE,QAAA,uCAAuC,GAA8B,CAAC,iEAA+B,CAAC,CAAC"}
|
|
@@ -4,5 +4,8 @@ export declare class FieldValidation {
|
|
|
4
4
|
messages: ValidationMessage[];
|
|
5
5
|
subValidations: ValidationResult[];
|
|
6
6
|
constructor(rawData?: any);
|
|
7
|
+
getErrorString(): string;
|
|
8
|
+
getAllErrorMessages(messages?: ValidationMessage[]): ValidationMessage[];
|
|
9
|
+
getAllFieldIds(): string[];
|
|
7
10
|
private _setData;
|
|
8
11
|
}
|
|
@@ -9,6 +9,55 @@ class FieldValidation {
|
|
|
9
9
|
this.subValidations = [];
|
|
10
10
|
this._setData(rawData);
|
|
11
11
|
}
|
|
12
|
+
getErrorString() {
|
|
13
|
+
let errors = "";
|
|
14
|
+
if (this.messages) {
|
|
15
|
+
for (let i = 0, len = this.messages.length; i < len; i++) {
|
|
16
|
+
const message = this.messages[i];
|
|
17
|
+
if (message) {
|
|
18
|
+
if (!!message.code) {
|
|
19
|
+
errors += message.code + ": ";
|
|
20
|
+
}
|
|
21
|
+
errors += message.message + "\n";
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
if (this.subValidations) {
|
|
26
|
+
for (let i = 0, len = this.subValidations.length; i < len; i++) {
|
|
27
|
+
const subValidation = this.subValidations[i];
|
|
28
|
+
errors += subValidation.getFullErrorString();
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return errors;
|
|
32
|
+
}
|
|
33
|
+
getAllErrorMessages(messages = null) {
|
|
34
|
+
if (messages === null) {
|
|
35
|
+
messages = [];
|
|
36
|
+
}
|
|
37
|
+
messages = messages.concat(this.messages);
|
|
38
|
+
if (this.subValidations) {
|
|
39
|
+
const len = this.subValidations.length;
|
|
40
|
+
for (let i = 0; i < len; i++) {
|
|
41
|
+
const subValidation = this.subValidations[i];
|
|
42
|
+
messages = subValidation.getAllErrorMessages(messages);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return messages;
|
|
46
|
+
}
|
|
47
|
+
getAllFieldIds() {
|
|
48
|
+
const allFieldIds = [];
|
|
49
|
+
if (this.messages) {
|
|
50
|
+
this.messages.forEach((message) => {
|
|
51
|
+
allFieldIds.push(message.fieldId);
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
if (this.subValidations) {
|
|
55
|
+
this.subValidations.forEach((subValidation) => {
|
|
56
|
+
allFieldIds.push(...subValidation.getAllFieldIds());
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
return allFieldIds;
|
|
60
|
+
}
|
|
12
61
|
_setData(rawData) {
|
|
13
62
|
if (rawData) {
|
|
14
63
|
if (rawData.messages) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-validation.js","sourceRoot":"","sources":["../../src/model/field-validation.ts"],"names":[],"mappings":";;;AAAA,2DAAqD;AACrD,6DAAuD;AAEvD,MAAa,eAAe;IAKxB,YAAY,OAAa;QAHlB,aAAQ,GAAwB,EAAE,CAAC;QACnC,mBAAc,GAAuB,EAAE,CAAC;QAG3C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;
|
|
1
|
+
{"version":3,"file":"field-validation.js","sourceRoot":"","sources":["../../src/model/field-validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,9 +24,12 @@ export declare class ObjectConfiguration extends BusinessObject {
|
|
|
24
24
|
static DeepConfigNameDelimiter: string;
|
|
25
25
|
static IdSeparator: string;
|
|
26
26
|
static DefaultValueListSplitChar: string;
|
|
27
|
+
variableReadOnly: boolean;
|
|
28
|
+
redErrorBackground: boolean;
|
|
27
29
|
constructor();
|
|
28
30
|
getId(): string;
|
|
29
31
|
isFieldKind(): boolean;
|
|
32
|
+
isKind(kind: ObjectConfigKind): boolean;
|
|
30
33
|
isRequired(): boolean;
|
|
31
34
|
mayRead(): boolean;
|
|
32
35
|
mayWrite(): boolean;
|
|
@@ -32,6 +32,9 @@ class ObjectConfiguration extends business_object_1.BusinessObject {
|
|
|
32
32
|
isFieldKind() {
|
|
33
33
|
return this.kind === object_config_kind_1.ObjectConfigKind.Field;
|
|
34
34
|
}
|
|
35
|
+
isKind(kind) {
|
|
36
|
+
return this.kind === kind;
|
|
37
|
+
}
|
|
35
38
|
isRequired() {
|
|
36
39
|
return !this.nullable;
|
|
37
40
|
}
|
|
@@ -88,7 +91,7 @@ class ObjectConfiguration extends business_object_1.BusinessObject {
|
|
|
88
91
|
}
|
|
89
92
|
}
|
|
90
93
|
getDefaultStringValue() {
|
|
91
|
-
return string_utils_1.StringUtils.ToStringOrDefault(this.defaultValue
|
|
94
|
+
return string_utils_1.StringUtils.ToStringOrDefault(this.defaultValue);
|
|
92
95
|
}
|
|
93
96
|
getDefaultNumberValue() {
|
|
94
97
|
return number_utils_1.NumberUtils.ParseFloatKeepPrecision(this.defaultValue);
|
|
@@ -174,6 +177,14 @@ __decorate([
|
|
|
174
177
|
(0, string_number_decorator_1.StringNumber)(),
|
|
175
178
|
__metadata("design:type", Number)
|
|
176
179
|
], ObjectConfiguration.prototype, "rights", void 0);
|
|
180
|
+
__decorate([
|
|
181
|
+
(0, no_db_field_decorator_1.NoDbField)(),
|
|
182
|
+
__metadata("design:type", Boolean)
|
|
183
|
+
], ObjectConfiguration.prototype, "variableReadOnly", void 0);
|
|
184
|
+
__decorate([
|
|
185
|
+
(0, no_db_field_decorator_1.NoDbField)(),
|
|
186
|
+
__metadata("design:type", Boolean)
|
|
187
|
+
], ObjectConfiguration.prototype, "redErrorBackground", void 0);
|
|
177
188
|
__decorate([
|
|
178
189
|
(0, no_db_field_decorator_1.NoDbField)(),
|
|
179
190
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-configuration.js","sourceRoot":"","sources":["../../src/model/object-configuration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+EAA0F;AAC1F,uFAAsE;AACtE,2FAA2E;AAC3E,2EAA4D;AAC5D,wDAAkD;AAClD,wDAAkD;AAClD,oDAA8C;AAC9C,uDAAiD;AACjD,mEAA4D;AAC5D,uEAA2D;AAC3D,qGAAwF;AACxF,uGAA0F;
|
|
1
|
+
{"version":3,"file":"object-configuration.js","sourceRoot":"","sources":["../../src/model/object-configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ exports.ValidationMessage = void 0;
|
|
|
13
13
|
const business_object_id_type_1 = require("../type/business-object-id-type");
|
|
14
14
|
const no_db_field_decorator_1 = require("../factory/decorators/no-db-field.decorator");
|
|
15
15
|
const not_nill_function_1 = require("../utils/function/not-nill.function");
|
|
16
|
+
const string_utils_1 = require("../utils/string-utils");
|
|
17
|
+
const object_configuration_1 = require("./object-configuration");
|
|
16
18
|
class ValidationMessage {
|
|
17
19
|
constructor(rawData) {
|
|
18
20
|
this.setData(rawData);
|
|
@@ -31,6 +33,9 @@ class ValidationMessage {
|
|
|
31
33
|
this.fieldId = rawData.fieldId;
|
|
32
34
|
}
|
|
33
35
|
}
|
|
36
|
+
getParentFieldId() {
|
|
37
|
+
return string_utils_1.StringUtils.LeftString(this.fieldId, object_configuration_1.ObjectConfiguration.DeepConfigNameDelimiter);
|
|
38
|
+
}
|
|
34
39
|
}
|
|
35
40
|
__decorate([
|
|
36
41
|
(0, no_db_field_decorator_1.NoDbField)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation-message.js","sourceRoot":"","sources":["../../src/model/validation-message.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAqE;AACrE,uFAAsE;AACtE,2EAA4D;
|
|
1
|
+
{"version":3,"file":"validation-message.js","sourceRoot":"","sources":["../../src/model/validation-message.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAqE;AACrE,uFAAsE;AACtE,2EAA4D;AAE5D,wDAAkD;AAClD,iEAA2D;AAG3D,MAAa,iBAAiB;IAiB1B,YAAY,OAAa;QACrB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1B,CAAC;IAMM,OAAO,CAAC,OAAY;QACvB,IAAI,CAAC,OAAO,EAAE;YACV,OAAO;SACV;QACD,IAAI,IAAA,2BAAO,EAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;SAC5B;QACD,IAAI,IAAA,2BAAO,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;SAClC;QACD,IAAI,IAAA,2BAAO,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;SAClC;IACL,CAAC;IAGM,gBAAgB;QACnB,OAAO,0BAAW,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,0CAAmB,CAAC,uBAAuB,CAAC,CAAC;IAC7F,CAAC;CACJ;AAlCG;IAAC,IAAA,iCAAS,GAAE;;+CACsB;AAGlC;IAAC,IAAA,iCAAS,GAAE;;qDACc;AAf9B,8CA4CC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { ValidationMessage } from "./validation-message";
|
|
2
2
|
import { FieldValidationsObject } from "./field-validations-object";
|
|
3
|
+
import { FieldValidation } from "./field-validation";
|
|
4
|
+
import { BusinessObjectIDType } from '../type/business-object-id-type';
|
|
3
5
|
export declare class ValidationResult {
|
|
4
6
|
messages: ValidationMessage[];
|
|
5
7
|
objectId: any;
|
|
@@ -13,4 +15,20 @@ export declare class ValidationResult {
|
|
|
13
15
|
validationId: number;
|
|
14
16
|
constructor(rawData?: any);
|
|
15
17
|
setData(rawData: any): void;
|
|
18
|
+
merge(otherValidation: ValidationResult): void;
|
|
19
|
+
addValidationResultField(key: string, value: FieldValidation): void;
|
|
20
|
+
makeAndAddValidationResultField(key: string, plainErrorMssg: string): void;
|
|
21
|
+
getAllErrorMessagesOfMyValidationFields(): ValidationMessage[];
|
|
22
|
+
getAllErrorMessages(messages?: ValidationMessage[]): ValidationMessage[];
|
|
23
|
+
getFullErrorString(includeCode?: boolean): string;
|
|
24
|
+
getGeneralErrorString(includeCode?: boolean): string;
|
|
25
|
+
getGeneralMessageString(includeCode?: boolean): string;
|
|
26
|
+
getValidationFieldsErrorString(): string;
|
|
27
|
+
createOrGetSubValidationResult(objectOrFieldId: string, objectId?: BusinessObjectIDType): ValidationResult;
|
|
28
|
+
getAllFieldIds(): string[];
|
|
29
|
+
hasErrorForPropertyWithId(parentPropPath: string, boId: BusinessObjectIDType): boolean;
|
|
30
|
+
private _getSubValidationResult;
|
|
31
|
+
private _addSubValidationToValidationResultField;
|
|
32
|
+
private _mergeValidationResultFieldsObjects;
|
|
33
|
+
private _getMessageString;
|
|
16
34
|
}
|
|
@@ -4,6 +4,10 @@ exports.ValidationResult = void 0;
|
|
|
4
4
|
const object_utils_1 = require("../utils/object-utils");
|
|
5
5
|
const validation_message_1 = require("./validation-message");
|
|
6
6
|
const field_validation_1 = require("./field-validation");
|
|
7
|
+
const number_utils_1 = require("../utils/number-utils");
|
|
8
|
+
const business_object_utils_1 = require("../utils/business-object-utils");
|
|
9
|
+
const array_utils_1 = require("../utils/array-utils");
|
|
10
|
+
const message_type_enum_1 = require("../enum/message-type.enum");
|
|
7
11
|
class ValidationResult {
|
|
8
12
|
constructor(rawData) {
|
|
9
13
|
this.messages = [];
|
|
@@ -34,6 +38,156 @@ class ValidationResult {
|
|
|
34
38
|
});
|
|
35
39
|
}
|
|
36
40
|
}
|
|
41
|
+
merge(otherValidation) {
|
|
42
|
+
if (otherValidation) {
|
|
43
|
+
this.success = this.success && otherValidation.success;
|
|
44
|
+
this.messages.push(...otherValidation.messages);
|
|
45
|
+
this._mergeValidationResultFieldsObjects(otherValidation.fieldValidations);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
addValidationResultField(key, value) {
|
|
49
|
+
this.fieldValidations[key] = value;
|
|
50
|
+
}
|
|
51
|
+
makeAndAddValidationResultField(key, plainErrorMssg) {
|
|
52
|
+
const field = new field_validation_1.FieldValidation();
|
|
53
|
+
field.messages = [];
|
|
54
|
+
const messageObject = new validation_message_1.ValidationMessage();
|
|
55
|
+
messageObject.fieldId = key;
|
|
56
|
+
messageObject.message = plainErrorMssg;
|
|
57
|
+
field.messages.push(messageObject);
|
|
58
|
+
this.fieldValidations[key] = field;
|
|
59
|
+
}
|
|
60
|
+
getAllErrorMessagesOfMyValidationFields() {
|
|
61
|
+
return this.getAllErrorMessages();
|
|
62
|
+
}
|
|
63
|
+
getAllErrorMessages(messages = null) {
|
|
64
|
+
if (messages === null) {
|
|
65
|
+
messages = [];
|
|
66
|
+
}
|
|
67
|
+
object_utils_1.ObjectUtils.ForOwnProperty(this.fieldValidations, (validationField) => {
|
|
68
|
+
messages = validationField.getAllErrorMessages(messages);
|
|
69
|
+
});
|
|
70
|
+
return messages;
|
|
71
|
+
}
|
|
72
|
+
getFullErrorString(includeCode = true) {
|
|
73
|
+
const generalError = this.getGeneralErrorString(includeCode);
|
|
74
|
+
const validationFieldsError = this.getValidationFieldsErrorString();
|
|
75
|
+
if (!generalError && !validationFieldsError) {
|
|
76
|
+
return "";
|
|
77
|
+
}
|
|
78
|
+
else if (generalError && validationFieldsError) {
|
|
79
|
+
return generalError + "\n" + validationFieldsError;
|
|
80
|
+
}
|
|
81
|
+
else if (generalError) {
|
|
82
|
+
return generalError;
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
return validationFieldsError;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
getGeneralErrorString(includeCode = true) {
|
|
89
|
+
return this._getMessageString(includeCode, true);
|
|
90
|
+
}
|
|
91
|
+
getGeneralMessageString(includeCode = true) {
|
|
92
|
+
return this._getMessageString(includeCode, false);
|
|
93
|
+
}
|
|
94
|
+
getValidationFieldsErrorString() {
|
|
95
|
+
let errors = "";
|
|
96
|
+
object_utils_1.ObjectUtils.ForOwnProperty(this.fieldValidations, (validationField, propKey) => {
|
|
97
|
+
const errorString = validationField.getErrorString();
|
|
98
|
+
if (errorString) {
|
|
99
|
+
if (propKey) {
|
|
100
|
+
errors += propKey + ": ";
|
|
101
|
+
}
|
|
102
|
+
errors += errorString;
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
return errors;
|
|
106
|
+
}
|
|
107
|
+
createOrGetSubValidationResult(objectOrFieldId, objectId = null) {
|
|
108
|
+
let subValidation = this._getSubValidationResult(objectOrFieldId, objectId);
|
|
109
|
+
if (!subValidation) {
|
|
110
|
+
subValidation = new ValidationResult();
|
|
111
|
+
subValidation.objectId = objectId;
|
|
112
|
+
this._addSubValidationToValidationResultField(objectOrFieldId, subValidation);
|
|
113
|
+
}
|
|
114
|
+
return subValidation;
|
|
115
|
+
}
|
|
116
|
+
getAllFieldIds() {
|
|
117
|
+
const allFieldIds = [];
|
|
118
|
+
if (this.fieldValidations) {
|
|
119
|
+
object_utils_1.ObjectUtils.ForOwnProperty(this.fieldValidations, (fieldValidation) => {
|
|
120
|
+
if (fieldValidation) {
|
|
121
|
+
allFieldIds.push(...fieldValidation.getAllFieldIds());
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
return allFieldIds;
|
|
126
|
+
}
|
|
127
|
+
hasErrorForPropertyWithId(parentPropPath, boId) {
|
|
128
|
+
const messages = this.getAllErrorMessages();
|
|
129
|
+
return array_utils_1.ArrayUtils.ContainsAnElementFoundBy(messages, (msg) => {
|
|
130
|
+
return msg.getParentFieldId() === parentPropPath && business_object_utils_1.BusinessObjectUtils.IsEqualBoId(msg.boId, boId);
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
_getSubValidationResult(objectOrFieldId, objectId = null, subValidationFields = null) {
|
|
134
|
+
if (subValidationFields === null) {
|
|
135
|
+
subValidationFields = this.fieldValidations;
|
|
136
|
+
}
|
|
137
|
+
object_utils_1.ObjectUtils.ForOwnProperty(subValidationFields, (validationField, propKey) => {
|
|
138
|
+
const len = validationField.subValidations.length;
|
|
139
|
+
for (let i = 0; i < len; i++) {
|
|
140
|
+
const subValidation = validationField.subValidations[i];
|
|
141
|
+
if (subValidation.objectType === objectOrFieldId && (subValidation.objectId === objectId || objectId === null)) {
|
|
142
|
+
return subValidation;
|
|
143
|
+
}
|
|
144
|
+
if (subValidation.fieldValidations) {
|
|
145
|
+
return this._getSubValidationResult(objectOrFieldId, objectId, subValidation.fieldValidations);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
return null;
|
|
150
|
+
}
|
|
151
|
+
_addSubValidationToValidationResultField(key, sub) {
|
|
152
|
+
let found = false;
|
|
153
|
+
object_utils_1.ObjectUtils.ForOwnProperty(this.fieldValidations, (validationField, propKey) => {
|
|
154
|
+
if (propKey === key) {
|
|
155
|
+
validationField.subValidations.push(sub);
|
|
156
|
+
found = true;
|
|
157
|
+
return false;
|
|
158
|
+
}
|
|
159
|
+
});
|
|
160
|
+
if (!found) {
|
|
161
|
+
const validationResultField = new field_validation_1.FieldValidation();
|
|
162
|
+
validationResultField.subValidations.push(sub);
|
|
163
|
+
this.addValidationResultField(key, validationResultField);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
_mergeValidationResultFieldsObjects(otherValidationFields) {
|
|
167
|
+
if (this.fieldValidations && otherValidationFields) {
|
|
168
|
+
object_utils_1.ObjectUtils.ForOwnProperty(otherValidationFields, (val, key) => {
|
|
169
|
+
this.fieldValidations[key] = val;
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
_getMessageString(includeCode = true, errorFilter) {
|
|
174
|
+
let allMessages = "";
|
|
175
|
+
if (this.messages) {
|
|
176
|
+
const len = this.messages.length;
|
|
177
|
+
for (let i = 0; i < len; i++) {
|
|
178
|
+
const message = this.messages[i];
|
|
179
|
+
if (message && ((message.messageType === message_type_enum_1.MessageType.Error) || !errorFilter)) {
|
|
180
|
+
if (includeCode && !number_utils_1.NumberUtils.IsNaN(message.code)) {
|
|
181
|
+
allMessages += message.code + ": " + message.message + "\n";
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
allMessages += message.message + "\n";
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
return allMessages;
|
|
190
|
+
}
|
|
37
191
|
}
|
|
38
192
|
exports.ValidationResult = ValidationResult;
|
|
39
193
|
//# sourceMappingURL=validation-result.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation-result.js","sourceRoot":"","sources":["../../src/model/validation-result.ts"],"names":[],"mappings":";;;AAAA,wDAAkD;AAClD,6DAAuD;AAEvD,yDAAmD;
|
|
1
|
+
{"version":3,"file":"validation-result.js","sourceRoot":"","sources":["../../src/model/validation-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ class BaseBackendConnectionService {
|
|
|
28
28
|
else {
|
|
29
29
|
this.version = parseInt(this.options.version);
|
|
30
30
|
}
|
|
31
|
-
if (options && ((options.username && options.password)
|
|
31
|
+
if (options && ((options.username && options.password))) {
|
|
32
32
|
this.usePublicToken = false;
|
|
33
33
|
}
|
|
34
34
|
this.schema = options.schema;
|
|
@@ -70,6 +70,7 @@ class BaseBackendConnectionService {
|
|
|
70
70
|
this.session.dataSessionId = this.dataSessionId;
|
|
71
71
|
this.session.id = this.sessionId ? this.sessionId : this.generateUniqueId();
|
|
72
72
|
this.session.windowsId = this.windowSessionId;
|
|
73
|
+
this.localStorageService.setPublicToken(undefined);
|
|
73
74
|
this.localStorageService.setDataSessionId(this.session.dataSessionId);
|
|
74
75
|
this.localStorageService.setSessionId(this.session.id);
|
|
75
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":";;;AACA,8CAAyC;AACzC,4DAAsD;AACtD,+BAA6B;AAC7B,wEAAkE;AAGlE,4EAAqE;AACrE,oEAA6D;AAC7D,gFAAyE;AAEzE,MAAsB,4BAA4B;IAwB9C,YAAY,OAAgB;QAvBZ,eAAU,GAAqB,IAAI,cAAO,EAAW,CAAC;QACtD,sBAAiB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QACvD,8BAAyB,GAAkB,IAAI,cAAO,EAAQ,CAAC;QAExE,YAAO,GAAY,IAAI,iBAAO,EAAE,CAAC;QAGjC,oBAAe,GAAW,GAAG,CAAC;QAC9B,WAAM,GAAW,aAAa,CAAC;QAO5B,WAAM,GAAW,GAAG,CAAC;QAIrB,mBAAc,GAAY,IAAI,CAAC;QAKrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,EAAE,EAAE;YAC5B,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,EAAE,EAAE;YAC7B,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;SAC5C;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SACjD;QACD,IAAI,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"base-backend-connection.service.js","sourceRoot":"","sources":["../../src/provider/base-backend-connection.service.ts"],"names":[],"mappings":"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"}
|