@rxap/forms 14.0.2 → 14.1.0
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/directives/form.directive.mjs +14 -4
- package/esm2020/lib/form-array.mjs +38 -11
- package/esm2020/lib/form-group.mjs +17 -3
- package/esm2020/lib/types.mjs +1 -1
- package/esm2020/lib/validators/index.mjs +6 -2
- package/esm2020/lib/validators/is-port.mjs +19 -0
- package/esm2020/lib/validators/is-uuid.mjs +19 -0
- package/fesm2015/rxap-forms.mjs +106 -17
- package/fesm2015/rxap-forms.mjs.map +1 -1
- package/fesm2020/rxap-forms.mjs +106 -17
- package/fesm2020/rxap-forms.mjs.map +1 -1
- package/lib/form-array.d.ts +5 -3
- package/lib/form-group.d.ts +1 -0
- package/lib/types.d.ts +26 -1
- package/lib/validators/index.d.ts +4 -0
- package/lib/validators/is-port.d.ts +4 -0
- package/lib/validators/is-uuid.d.ts +5 -0
- package/package.json +2 -2
|
@@ -11,6 +11,8 @@ import { IsPhoneNumber } from './is-phone-number';
|
|
|
11
11
|
import { IsEmail } from './is-email';
|
|
12
12
|
import { IsUrl } from './is-url';
|
|
13
13
|
import { IsIP } from './is-ip';
|
|
14
|
+
import { IsPort } from './is-port';
|
|
15
|
+
import { IsUUID } from './is-uuid';
|
|
14
16
|
export const RxapValidators = {
|
|
15
17
|
IsNumber,
|
|
16
18
|
IsBoolean,
|
|
@@ -24,6 +26,8 @@ export const RxapValidators = {
|
|
|
24
26
|
IsPhoneNumber,
|
|
25
27
|
IsEmail,
|
|
26
28
|
IsUrl,
|
|
27
|
-
IsIP
|
|
29
|
+
IsIP,
|
|
30
|
+
IsPort,
|
|
31
|
+
IsUUID,
|
|
28
32
|
};
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL2Zvcm1zL3NyYy9saWIvdmFsaWRhdG9ycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxJQUFJLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNwRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdkMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUN2QyxPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ2pDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDbkMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNuQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDekMsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFDckMsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUNqQyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQy9CLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDbkMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUVuQyxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUc7SUFDNUIsUUFBUTtJQUNSLFNBQVM7SUFDVCxPQUFPO0lBQ1AsTUFBTTtJQUNOLE1BQU07SUFDTixLQUFLO0lBQ0wsUUFBUTtJQUNSLFFBQVE7SUFDUixTQUFTO0lBQ1QsYUFBYTtJQUNiLE9BQU87SUFDUCxLQUFLO0lBQ0wsSUFBSTtJQUNKLE1BQU07SUFDTixNQUFNO0NBQ1AsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IF9Jc051bWJlciBhcyBJc051bWJlciB9IGZyb20gJy4vaXMtbnVtYmVyJztcbmltcG9ydCB7IElzQm9vbGVhbiB9IGZyb20gJy4vaXMtYm9vbGVhbic7XG5pbXBvcnQgeyBJc09iamVjdCB9IGZyb20gJy4vaXMtb2JqZWN0JztcbmltcG9ydCB7IElzU3RyaW5nIH0gZnJvbSAnLi9pcy1zdHJpbmcnO1xuaW1wb3J0IHsgSXNJbnQgfSBmcm9tICcuL2lzLWludCc7XG5pbXBvcnQgeyBJc0VudW0gfSBmcm9tICcuL2lzLWVudW0nO1xuaW1wb3J0IHsgSXNEYXRlIH0gZnJvbSAnLi9pcy1kYXRlJztcbmltcG9ydCB7IElzQXJyYXkgfSBmcm9tICcuL2lzLWFycmF5JztcbmltcG9ydCB7IElzQ29tcGxleCB9IGZyb20gJy4vaXMtY29tcGxleCc7XG5pbXBvcnQgeyBJc1Bob25lTnVtYmVyIH0gZnJvbSAnLi9pcy1waG9uZS1udW1iZXInO1xuaW1wb3J0IHsgSXNFbWFpbCB9IGZyb20gJy4vaXMtZW1haWwnO1xuaW1wb3J0IHsgSXNVcmwgfSBmcm9tICcuL2lzLXVybCc7XG5pbXBvcnQgeyBJc0lQIH0gZnJvbSAnLi9pcy1pcCc7XG5pbXBvcnQgeyBJc1BvcnQgfSBmcm9tICcuL2lzLXBvcnQnO1xuaW1wb3J0IHsgSXNVVUlEIH0gZnJvbSAnLi9pcy11dWlkJztcblxuZXhwb3J0IGNvbnN0IFJ4YXBWYWxpZGF0b3JzID0ge1xuICBJc051bWJlcixcbiAgSXNCb29sZWFuLFxuICBJc0FycmF5LFxuICBJc0RhdGUsXG4gIElzRW51bSxcbiAgSXNJbnQsXG4gIElzT2JqZWN0LFxuICBJc1N0cmluZyxcbiAgSXNDb21wbGV4LFxuICBJc1Bob25lTnVtYmVyLFxuICBJc0VtYWlsLFxuICBJc1VybCxcbiAgSXNJUCxcbiAgSXNQb3J0LFxuICBJc1VVSUQsXG59O1xuIl19
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isPort } from '@rxap/validator';
|
|
2
|
+
export function IsPort({ message } = {}) {
|
|
3
|
+
return (control) => {
|
|
4
|
+
if (control.value === null) {
|
|
5
|
+
return null;
|
|
6
|
+
}
|
|
7
|
+
if (!(typeof control.value === 'string' && isPort(control.value))) {
|
|
8
|
+
return {
|
|
9
|
+
isPort: {
|
|
10
|
+
expected: `A valid port number between 1 and 65535`,
|
|
11
|
+
actual: control.value,
|
|
12
|
+
message
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
return null;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXMtcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvZm9ybXMvc3JjL2xpYi92YWxpZGF0b3JzL2lzLXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXpDLE1BQU0sVUFBVSxNQUFNLENBQUMsRUFBRSxPQUFPLEtBQTJCLEVBQUU7SUFDM0QsT0FBTyxDQUFDLE9BQXdCLEVBQTJCLEVBQUU7UUFDM0QsSUFBSSxPQUFPLENBQUMsS0FBSyxLQUFLLElBQUksRUFBRTtZQUMxQixPQUFPLElBQUksQ0FBQztTQUNiO1FBQ0QsSUFBSSxDQUFDLENBQUMsT0FBTyxPQUFPLENBQUMsS0FBSyxLQUFLLFFBQVEsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7WUFDakUsT0FBTztnQkFDTCxNQUFNLEVBQUU7b0JBQ04sUUFBUSxFQUFFLHlDQUF5QztvQkFDbkQsTUFBTSxFQUFJLE9BQU8sQ0FBQyxLQUFLO29CQUN2QixPQUFPO2lCQUNSO2FBQ0YsQ0FBQztTQUNIO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgQWJzdHJhY3RDb250cm9sLFxuICBWYWxpZGF0aW9uRXJyb3JzXG59IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IGlzUG9ydCB9IGZyb20gJ0ByeGFwL3ZhbGlkYXRvcic7XG5cbmV4cG9ydCBmdW5jdGlvbiBJc1BvcnQoeyBtZXNzYWdlIH06IHsgbWVzc2FnZT86IHN0cmluZyB9ID0ge30pIHtcbiAgcmV0dXJuIChjb250cm9sOiBBYnN0cmFjdENvbnRyb2wpOiBWYWxpZGF0aW9uRXJyb3JzIHwgbnVsbCA9PiB7XG4gICAgaWYgKGNvbnRyb2wudmFsdWUgPT09IG51bGwpIHtcbiAgICAgIHJldHVybiBudWxsO1xuICAgIH1cbiAgICBpZiAoISh0eXBlb2YgY29udHJvbC52YWx1ZSA9PT0gJ3N0cmluZycgJiYgaXNQb3J0KGNvbnRyb2wudmFsdWUpKSkge1xuICAgICAgcmV0dXJuIHtcbiAgICAgICAgaXNQb3J0OiB7XG4gICAgICAgICAgZXhwZWN0ZWQ6IGBBIHZhbGlkIHBvcnQgbnVtYmVyIGJldHdlZW4gMSBhbmQgNjU1MzVgLFxuICAgICAgICAgIGFjdHVhbDogICBjb250cm9sLnZhbHVlLFxuICAgICAgICAgIG1lc3NhZ2VcbiAgICAgICAgfVxuICAgICAgfTtcbiAgICB9XG4gICAgcmV0dXJuIG51bGw7XG4gIH07XG59XG4iXX0=
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isUUID } from '@rxap/validator';
|
|
2
|
+
export function IsUUID({ message, version = 'all' } = {}) {
|
|
3
|
+
return (control) => {
|
|
4
|
+
if (control.value === null) {
|
|
5
|
+
return null;
|
|
6
|
+
}
|
|
7
|
+
if (!(typeof control.value === 'string' && isUUID(control.value, version))) {
|
|
8
|
+
return {
|
|
9
|
+
isUuid: {
|
|
10
|
+
expected: version === 'all' ? `A valid uuid` : `A valid uuid version ${version}`,
|
|
11
|
+
actual: control.value,
|
|
12
|
+
message
|
|
13
|
+
}
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
return null;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXMtdXVpZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvZm9ybXMvc3JjL2xpYi92YWxpZGF0b3JzL2lzLXV1aWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXpDLE1BQU0sVUFBVSxNQUFNLENBQUMsRUFBRSxPQUFPLEVBQUUsT0FBTyxHQUFHLEtBQUssS0FBNkMsRUFBRTtJQUM5RixPQUFPLENBQUMsT0FBd0IsRUFBMkIsRUFBRTtRQUMzRCxJQUFJLE9BQU8sQ0FBQyxLQUFLLEtBQUssSUFBSSxFQUFFO1lBQzFCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFDRCxJQUFJLENBQUMsQ0FBQyxPQUFPLE9BQU8sQ0FBQyxLQUFLLEtBQUssUUFBUSxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxDQUFDLEVBQUU7WUFDMUUsT0FBTztnQkFDTCxNQUFNLEVBQUU7b0JBQ04sUUFBUSxFQUFFLE9BQU8sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsd0JBQXdCLE9BQU8sRUFBRTtvQkFDaEYsTUFBTSxFQUFJLE9BQU8sQ0FBQyxLQUFLO29CQUN2QixPQUFPO2lCQUNSO2FBQ0YsQ0FBQztTQUNIO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDLENBQUM7QUFDSixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgQWJzdHJhY3RDb250cm9sLFxuICBWYWxpZGF0aW9uRXJyb3JzXG59IGZyb20gJ0Bhbmd1bGFyL2Zvcm1zJztcbmltcG9ydCB7IGlzVVVJRCB9IGZyb20gJ0ByeGFwL3ZhbGlkYXRvcic7XG5cbmV4cG9ydCBmdW5jdGlvbiBJc1VVSUQoeyBtZXNzYWdlLCB2ZXJzaW9uID0gJ2FsbCcgfTogeyBtZXNzYWdlPzogc3RyaW5nLCB2ZXJzaW9uPzogc3RyaW5nIH0gPSB7fSkge1xuICByZXR1cm4gKGNvbnRyb2w6IEFic3RyYWN0Q29udHJvbCk6IFZhbGlkYXRpb25FcnJvcnMgfCBudWxsID0+IHtcbiAgICBpZiAoY29udHJvbC52YWx1ZSA9PT0gbnVsbCkge1xuICAgICAgcmV0dXJuIG51bGw7XG4gICAgfVxuICAgIGlmICghKHR5cGVvZiBjb250cm9sLnZhbHVlID09PSAnc3RyaW5nJyAmJiBpc1VVSUQoY29udHJvbC52YWx1ZSwgdmVyc2lvbikpKSB7XG4gICAgICByZXR1cm4ge1xuICAgICAgICBpc1V1aWQ6IHtcbiAgICAgICAgICBleHBlY3RlZDogdmVyc2lvbiA9PT0gJ2FsbCcgPyBgQSB2YWxpZCB1dWlkYCA6IGBBIHZhbGlkIHV1aWQgdmVyc2lvbiAke3ZlcnNpb259YCxcbiAgICAgICAgICBhY3R1YWw6ICAgY29udHJvbC52YWx1ZSxcbiAgICAgICAgICBtZXNzYWdlXG4gICAgICAgIH1cbiAgICAgIH07XG4gICAgfVxuICAgIHJldHVybiBudWxsO1xuICB9O1xufVxuIl19
|
package/fesm2015/rxap-forms.mjs
CHANGED
|
@@ -14,7 +14,7 @@ import { ToggleSubject } from '@rxap/utilities/rxjs';
|
|
|
14
14
|
import * as i2$1 from '@angular/router';
|
|
15
15
|
import { Router } from '@angular/router';
|
|
16
16
|
import { ConfirmClick } from '@rxap/directives';
|
|
17
|
-
import { isMobilePhone, isEmail, isURL, isIP } from '@rxap/validator';
|
|
17
|
+
import { isMobilePhone, isEmail, isURL, isIP, isPort, isUUID } from '@rxap/validator';
|
|
18
18
|
|
|
19
19
|
function getControlValue(control) {
|
|
20
20
|
if (control.getRawValue) {
|
|
@@ -174,8 +174,9 @@ class RxapFormArray extends UntypedFormArray {
|
|
|
174
174
|
*
|
|
175
175
|
* @param index (optional) the index where the control should be created
|
|
176
176
|
* @param state (optional) the initial state of the new control
|
|
177
|
+
* @param options (optional) ControlEventOptions
|
|
177
178
|
*/
|
|
178
|
-
insertAt(index, state) {
|
|
179
|
+
insertAt(index, state, options) {
|
|
179
180
|
const insertIndex = index !== null && index !== void 0 ? index : this.controls.length;
|
|
180
181
|
const controlOrDefinition = this._builder(state, {
|
|
181
182
|
controlId: insertIndex.toFixed(0),
|
|
@@ -190,10 +191,10 @@ class RxapFormArray extends UntypedFormArray {
|
|
|
190
191
|
// call the super insert after the update, bc the insert method will
|
|
191
192
|
// trigger a change detection
|
|
192
193
|
if (controlOrDefinition instanceof AbstractControl) {
|
|
193
|
-
super.insert(insertIndex, controlOrDefinition);
|
|
194
|
+
super.insert(insertIndex, controlOrDefinition, options);
|
|
194
195
|
}
|
|
195
196
|
else {
|
|
196
|
-
super.insert(insertIndex, controlOrDefinition.rxapFormGroup);
|
|
197
|
+
super.insert(insertIndex, controlOrDefinition.rxapFormGroup, options);
|
|
197
198
|
}
|
|
198
199
|
}
|
|
199
200
|
disabledWhile(observable, options) {
|
|
@@ -220,7 +221,9 @@ class RxapFormArray extends UntypedFormArray {
|
|
|
220
221
|
}
|
|
221
222
|
setValue(valueOrObservable, options) {
|
|
222
223
|
if (isObservable(valueOrObservable)) {
|
|
223
|
-
return valueOrObservable.subscribe((value) =>
|
|
224
|
+
return valueOrObservable.subscribe((value) => {
|
|
225
|
+
super.setValue(value, options);
|
|
226
|
+
});
|
|
224
227
|
}
|
|
225
228
|
super.setValue(valueOrObservable, options);
|
|
226
229
|
}
|
|
@@ -235,13 +238,37 @@ class RxapFormArray extends UntypedFormArray {
|
|
|
235
238
|
hasErrorAndTouched(errorCode, path) {
|
|
236
239
|
return hasErrorAndTouched(this, errorCode, path);
|
|
237
240
|
}
|
|
241
|
+
_patchValue(value, options) {
|
|
242
|
+
// Even though the `value` argument type doesn't allow `null` and `undefined` values, the
|
|
243
|
+
// `patchValue` can be called recursively and inner data structures might have these values, so
|
|
244
|
+
// we just ignore such cases when a field containing FormArray instance receives `null` or
|
|
245
|
+
// `undefined` as a value.
|
|
246
|
+
if (value == null /* both `null` and `undefined` */)
|
|
247
|
+
return;
|
|
248
|
+
if (options === null || options === void 0 ? void 0 : options.strict) {
|
|
249
|
+
if (this.length > value.length) {
|
|
250
|
+
for (let index = this.length - 1; index >= value.length; index--) {
|
|
251
|
+
this.removeAt(index);
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
value.forEach((newValue, index) => {
|
|
256
|
+
if (this.at(index)) {
|
|
257
|
+
this.at(index).patchValue(newValue, Object.assign(Object.assign({}, (options !== null && options !== void 0 ? options : {})), { onlySelf: true }));
|
|
258
|
+
}
|
|
259
|
+
else if (options === null || options === void 0 ? void 0 : options.coerce) {
|
|
260
|
+
this.insertAt(index, value[index]);
|
|
261
|
+
}
|
|
262
|
+
});
|
|
263
|
+
this.updateValueAndValidity(options);
|
|
264
|
+
}
|
|
238
265
|
patchValue(valueOrObservable, options) {
|
|
239
266
|
if (isObservable(valueOrObservable)) {
|
|
240
267
|
return valueOrObservable.subscribe((value) => {
|
|
241
|
-
|
|
268
|
+
this._patchValue(value, options);
|
|
242
269
|
});
|
|
243
270
|
}
|
|
244
|
-
|
|
271
|
+
this._patchValue(valueOrObservable, options);
|
|
245
272
|
}
|
|
246
273
|
hasErrorAndDirty(errorCode, path) {
|
|
247
274
|
return hasErrorAndDirty(this, errorCode, path);
|
|
@@ -256,20 +283,20 @@ class RxapFormArray extends UntypedFormArray {
|
|
|
256
283
|
setEnable(enable = true, opts) {
|
|
257
284
|
enableControl(this, enable, opts);
|
|
258
285
|
}
|
|
259
|
-
push(control) {
|
|
286
|
+
push(control, options) {
|
|
260
287
|
if (isDevMode()) {
|
|
261
288
|
console.warn('It is not recommend to use the FormArray.push method');
|
|
262
289
|
}
|
|
263
|
-
return super.push(control);
|
|
290
|
+
return super.push(control, options);
|
|
264
291
|
}
|
|
265
292
|
setDisable(disable = true, opts) {
|
|
266
293
|
disableControl(this, disable, opts);
|
|
267
294
|
}
|
|
268
|
-
setControl(index, control) {
|
|
295
|
+
setControl(index, control, options) {
|
|
269
296
|
if (isDevMode()) {
|
|
270
297
|
console.warn('It is not recommend to use the FormArray.setControl method');
|
|
271
298
|
}
|
|
272
|
-
return super.setControl(index, control);
|
|
299
|
+
return super.setControl(index, control, options);
|
|
273
300
|
}
|
|
274
301
|
markAsTouched(opts) {
|
|
275
302
|
super.markAsTouched(opts);
|
|
@@ -415,11 +442,25 @@ class RxapFormGroup extends UntypedFormGroup {
|
|
|
415
442
|
}
|
|
416
443
|
super.setValue(valueOrObservable, options);
|
|
417
444
|
}
|
|
445
|
+
_patchValue(value, options) {
|
|
446
|
+
// Even though the `value` argument type doesn't allow `null` and `undefined` values, the
|
|
447
|
+
// `patchValue` can be called recursively and inner data structures might have these values, so
|
|
448
|
+
// we just ignore such cases when a field containing FormGroup instance receives `null` or
|
|
449
|
+
// `undefined` as a value.
|
|
450
|
+
if (value == null /* both `null` and `undefined` */)
|
|
451
|
+
return;
|
|
452
|
+
Object.keys(value).forEach(name => {
|
|
453
|
+
if (this.controls[name]) {
|
|
454
|
+
this.controls[name].patchValue(value[name], Object.assign(Object.assign({}, (options !== null && options !== void 0 ? options : {})), { onlySelf: true }));
|
|
455
|
+
}
|
|
456
|
+
});
|
|
457
|
+
this.updateValueAndValidity(options);
|
|
458
|
+
}
|
|
418
459
|
patchValue(valueOrObservable, options) {
|
|
419
460
|
if (isObservable(valueOrObservable)) {
|
|
420
|
-
return valueOrObservable.subscribe((value) =>
|
|
461
|
+
return valueOrObservable.subscribe((value) => this._patchValue(value, options));
|
|
421
462
|
}
|
|
422
|
-
|
|
463
|
+
this._patchValue(valueOrObservable, options);
|
|
423
464
|
}
|
|
424
465
|
disabledWhile(observable, options) {
|
|
425
466
|
return controlDisabledWhile(this, observable, options);
|
|
@@ -1181,10 +1222,14 @@ class FormDirective extends FormGroupDirective {
|
|
|
1181
1222
|
}
|
|
1182
1223
|
}
|
|
1183
1224
|
ngOnInit() {
|
|
1184
|
-
if (!this.
|
|
1225
|
+
if (!this._formDefinition) {
|
|
1185
1226
|
// TODO : replace with rxap error
|
|
1186
1227
|
throw new Error('The form definition instance is not defined');
|
|
1187
1228
|
}
|
|
1229
|
+
if (!this.form) {
|
|
1230
|
+
// TODO : replace with rxap error
|
|
1231
|
+
throw new Error('The form instance is not defined');
|
|
1232
|
+
}
|
|
1188
1233
|
this.loadInitialState(this.form);
|
|
1189
1234
|
function HasNgOnInitMethod(obj) {
|
|
1190
1235
|
return obj && typeof obj.ngOnInit === 'function';
|
|
@@ -1196,8 +1241,14 @@ class FormDirective extends FormGroupDirective {
|
|
|
1196
1241
|
const debounce = typeof this._formDefinition.rxapMetadata.autoSubmit === 'number'
|
|
1197
1242
|
? this._formDefinition.rxapMetadata.autoSubmit
|
|
1198
1243
|
: 5000;
|
|
1199
|
-
this._autoSubmitSubscription = this
|
|
1200
|
-
.
|
|
1244
|
+
this._autoSubmitSubscription = this
|
|
1245
|
+
.form
|
|
1246
|
+
.valueChanges
|
|
1247
|
+
.pipe(debounceTime(debounce), filter(() => this.form.valid), tap((value) => {
|
|
1248
|
+
if (isDevMode()) {
|
|
1249
|
+
console.debug(`Auto submit form '${this._formDefinition.rxapMetadata.id}'`, value);
|
|
1250
|
+
}
|
|
1251
|
+
}), tap(() => this.submit()))
|
|
1201
1252
|
.subscribe();
|
|
1202
1253
|
}
|
|
1203
1254
|
}
|
|
@@ -2699,6 +2750,42 @@ function IsIP({ message, version } = {}) {
|
|
|
2699
2750
|
};
|
|
2700
2751
|
}
|
|
2701
2752
|
|
|
2753
|
+
function IsPort({ message } = {}) {
|
|
2754
|
+
return (control) => {
|
|
2755
|
+
if (control.value === null) {
|
|
2756
|
+
return null;
|
|
2757
|
+
}
|
|
2758
|
+
if (!(typeof control.value === 'string' && isPort(control.value))) {
|
|
2759
|
+
return {
|
|
2760
|
+
isPort: {
|
|
2761
|
+
expected: `A valid port number between 1 and 65535`,
|
|
2762
|
+
actual: control.value,
|
|
2763
|
+
message
|
|
2764
|
+
}
|
|
2765
|
+
};
|
|
2766
|
+
}
|
|
2767
|
+
return null;
|
|
2768
|
+
};
|
|
2769
|
+
}
|
|
2770
|
+
|
|
2771
|
+
function IsUUID({ message, version = 'all' } = {}) {
|
|
2772
|
+
return (control) => {
|
|
2773
|
+
if (control.value === null) {
|
|
2774
|
+
return null;
|
|
2775
|
+
}
|
|
2776
|
+
if (!(typeof control.value === 'string' && isUUID(control.value, version))) {
|
|
2777
|
+
return {
|
|
2778
|
+
isUuid: {
|
|
2779
|
+
expected: version === 'all' ? `A valid uuid` : `A valid uuid version ${version}`,
|
|
2780
|
+
actual: control.value,
|
|
2781
|
+
message
|
|
2782
|
+
}
|
|
2783
|
+
};
|
|
2784
|
+
}
|
|
2785
|
+
return null;
|
|
2786
|
+
};
|
|
2787
|
+
}
|
|
2788
|
+
|
|
2702
2789
|
const RxapValidators = {
|
|
2703
2790
|
IsNumber: _IsNumber,
|
|
2704
2791
|
IsBoolean,
|
|
@@ -2712,7 +2799,9 @@ const RxapValidators = {
|
|
|
2712
2799
|
IsPhoneNumber,
|
|
2713
2800
|
IsEmail,
|
|
2714
2801
|
IsUrl,
|
|
2715
|
-
IsIP
|
|
2802
|
+
IsIP,
|
|
2803
|
+
IsPort,
|
|
2804
|
+
IsUUID,
|
|
2716
2805
|
};
|
|
2717
2806
|
|
|
2718
2807
|
// endregion
|