@hmcts/ccd-case-ui-toolkit 7.0.37 → 7.0.38-client-context-2
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/shared/components/case-editor/case-edit/case-edit.component.mjs +11 -11
- package/esm2020/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.mjs +83 -38
- package/esm2020/lib/shared/components/case-editor/case-editor.module.mjs +6 -5
- package/esm2020/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-reassigned/case-event-completion-task-reassigned.component.mjs +16 -14
- package/esm2020/lib/shared/components/case-editor/services/case-worker.service.mjs +3 -3
- package/esm2020/lib/shared/components/case-editor/services/cases.service.mjs +53 -27
- package/esm2020/lib/shared/components/case-editor/services/event-completion-state-machine.service.mjs +14 -6
- package/esm2020/lib/shared/components/event-start/event-guard/event-start.guard.mjs +13 -5
- package/esm2020/lib/shared/components/event-start/services/event-start-state-machine.service.mjs +11 -3
- package/esm2020/lib/shared/components/palette/address/write-address-field.component.mjs +3 -5
- package/esm2020/lib/shared/components/palette/base-field/abstract-form-field.component.mjs +1 -1
- package/esm2020/lib/shared/components/palette/case-flag/write-case-flag-field.component.mjs +1 -1
- package/esm2020/lib/shared/components/palette/collection/write-collection-field.component.mjs +2 -4
- package/esm2020/lib/shared/components/palette/complex/write-complex-field.component.mjs +2 -4
- package/esm2020/lib/shared/components/palette/document/write-document-field.component.mjs +2 -2
- package/esm2020/lib/shared/components/palette/dynamic-multi-select-list/write-dynamic-multi-select-list-field.component.mjs +5 -5
- package/esm2020/lib/shared/components/palette/markdown/markdown.component.mjs +43 -3
- package/esm2020/lib/shared/components/palette/query-management/components/query-list/query-list.component.mjs +2 -2
- package/esm2020/lib/shared/components/palette/text/write-text-field.component.mjs +1 -1
- package/esm2020/lib/shared/components/palette/utils/first-error.pipe.mjs +4 -1
- package/esm2020/lib/shared/components/search-result/search-result.component.mjs +2 -2
- package/esm2020/lib/shared/domain/definition/case-field.model.mjs +4 -2
- package/esm2020/lib/shared/domain/work-allocation/Task.mjs +1 -1
- package/esm2020/lib/shared/services/fields/fields.utils.mjs +8 -1
- package/esm2020/lib/shared/services/form/field-type-sanitiser.mjs +13 -2
- package/esm2020/lib/shared/services/form/form-validators.service.mjs +28 -2
- package/esm2020/lib/shared/services/profile/profile.service.mjs +2 -1
- package/fesm2015/hmcts-ccd-case-ui-toolkit.mjs +366 -169
- package/fesm2015/hmcts-ccd-case-ui-toolkit.mjs.map +1 -1
- package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs +351 -169
- package/fesm2020/hmcts-ccd-case-ui-toolkit.mjs.map +1 -1
- package/lib/shared/components/case-editor/case-edit/case-edit.component.d.ts.map +1 -1
- package/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.d.ts +8 -3
- package/lib/shared/components/case-editor/case-edit-submit/case-edit-submit.component.d.ts.map +1 -1
- package/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-reassigned/case-event-completion-task-reassigned.component.d.ts +1 -2
- package/lib/shared/components/case-editor/case-event-completion/components/case-event-completion-task-reassigned/case-event-completion-task-reassigned.component.d.ts.map +1 -1
- package/lib/shared/components/case-editor/services/cases.service.d.ts +2 -1
- package/lib/shared/components/case-editor/services/cases.service.d.ts.map +1 -1
- package/lib/shared/components/case-editor/services/event-completion-state-machine.service.d.ts +1 -0
- package/lib/shared/components/case-editor/services/event-completion-state-machine.service.d.ts.map +1 -1
- package/lib/shared/components/event-start/event-guard/event-start.guard.d.ts +1 -1
- package/lib/shared/components/event-start/event-guard/event-start.guard.d.ts.map +1 -1
- package/lib/shared/components/event-start/services/event-start-state-machine.service.d.ts.map +1 -1
- package/lib/shared/components/palette/address/write-address-field.component.d.ts +1 -2
- package/lib/shared/components/palette/address/write-address-field.component.d.ts.map +1 -1
- package/lib/shared/components/palette/base-field/abstract-form-field.component.d.ts.map +1 -1
- package/lib/shared/components/palette/case-flag/write-case-flag-field.component.d.ts +0 -1
- package/lib/shared/components/palette/case-flag/write-case-flag-field.component.d.ts.map +1 -1
- package/lib/shared/components/palette/collection/write-collection-field.component.d.ts +1 -2
- package/lib/shared/components/palette/collection/write-collection-field.component.d.ts.map +1 -1
- package/lib/shared/components/palette/complex/write-complex-field.component.d.ts +1 -2
- package/lib/shared/components/palette/complex/write-complex-field.component.d.ts.map +1 -1
- package/lib/shared/components/palette/markdown/markdown.component.d.ts +6 -1
- package/lib/shared/components/palette/markdown/markdown.component.d.ts.map +1 -1
- package/lib/shared/components/palette/utils/first-error.pipe.d.ts.map +1 -1
- package/lib/shared/domain/definition/case-field.model.d.ts.map +1 -1
- package/lib/shared/domain/work-allocation/Task.d.ts +4 -0
- package/lib/shared/domain/work-allocation/Task.d.ts.map +1 -1
- package/lib/shared/services/fields/fields.utils.d.ts +2 -0
- package/lib/shared/services/fields/fields.utils.d.ts.map +1 -1
- package/lib/shared/services/form/field-type-sanitiser.d.ts +1 -0
- package/lib/shared/services/form/field-type-sanitiser.d.ts.map +1 -1
- package/lib/shared/services/form/form-validators.service.d.ts +4 -0
- package/lib/shared/services/form/form-validators.service.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -8,6 +8,7 @@ export class FormValidatorsService {
|
|
|
8
8
|
FormValidatorsService.CUSTOM_VALIDATED_TYPES.indexOf(caseField.field_type.type) === -1) {
|
|
9
9
|
const validators = [Validators.required];
|
|
10
10
|
if (caseField.field_type.type === 'Text') {
|
|
11
|
+
validators.push(this.markDownPatternValidator());
|
|
11
12
|
if (caseField.field_type.regular_expression) {
|
|
12
13
|
validators.push(Validators.pattern(caseField.field_type.regular_expression));
|
|
13
14
|
}
|
|
@@ -21,22 +22,37 @@ export class FormValidatorsService {
|
|
|
21
22
|
validators.push(Validators.maxLength(caseField.field_type.max));
|
|
22
23
|
}
|
|
23
24
|
}
|
|
25
|
+
if (caseField.field_type.type === 'TextArea') {
|
|
26
|
+
validators.push(this.emptyValidator());
|
|
27
|
+
validators.push(this.markDownPatternValidator());
|
|
28
|
+
}
|
|
24
29
|
if (control.validator) {
|
|
25
30
|
validators.push(control.validator);
|
|
26
31
|
}
|
|
27
32
|
control.setValidators(validators);
|
|
28
33
|
}
|
|
34
|
+
else if (caseField.display_context === 'OPTIONAL' && (caseField.field_type.type === 'Text' || caseField.field_type.type === 'TextArea')
|
|
35
|
+
|| (caseField.display_context === 'COMPLEX' && caseField.field_type.type === 'Complex')) {
|
|
36
|
+
control.setValidators(this.markDownPatternValidator());
|
|
37
|
+
}
|
|
29
38
|
return control;
|
|
30
39
|
}
|
|
31
40
|
static emptyValidator() {
|
|
32
41
|
const validator = (control) => {
|
|
33
|
-
if (control
|
|
42
|
+
if (control?.value?.toString().trim().length === 0) {
|
|
34
43
|
return { required: {} };
|
|
35
44
|
}
|
|
36
45
|
return null;
|
|
37
46
|
};
|
|
38
47
|
return validator;
|
|
39
48
|
}
|
|
49
|
+
static markDownPatternValidator() {
|
|
50
|
+
const pattern = /(\[[^\]]{0,500}\]\([^)]{0,500}\)|!\[[^\]]{0,500}\]\([^)]{0,500}\)|<img[^>]{0,500}>|<a[^>]{0,500}>.*?<\/a>)/;
|
|
51
|
+
return (control) => {
|
|
52
|
+
const value = control?.value?.toString().trim();
|
|
53
|
+
return (value && pattern.test(value)) ? { markDownPattern: {} } : null;
|
|
54
|
+
};
|
|
55
|
+
}
|
|
40
56
|
// TODO: Strip this out as it's only here for the moment because
|
|
41
57
|
// the service is being injected all over the place but it doesn't
|
|
42
58
|
// need to be as FormValidatorsService.addValidators is perfectly
|
|
@@ -44,13 +60,23 @@ export class FormValidatorsService {
|
|
|
44
60
|
addValidators(caseField, control) {
|
|
45
61
|
return FormValidatorsService.addValidators(caseField, control);
|
|
46
62
|
}
|
|
63
|
+
addMarkDownValidators(formGroup, controlPath) {
|
|
64
|
+
const control = formGroup.get(controlPath);
|
|
65
|
+
if (control) {
|
|
66
|
+
control.setValidators(FormValidatorsService.markDownPatternValidator());
|
|
67
|
+
control.updateValueAndValidity();
|
|
68
|
+
}
|
|
69
|
+
return control;
|
|
70
|
+
}
|
|
47
71
|
}
|
|
48
72
|
FormValidatorsService.CUSTOM_VALIDATED_TYPES = [
|
|
49
73
|
'Date', 'MoneyGBP', 'Label', 'JudicialUser'
|
|
50
74
|
];
|
|
75
|
+
FormValidatorsService.DEFAULT_INPUT_TEXT = 'text';
|
|
76
|
+
FormValidatorsService.DEFAULT_INPUT_TEXTAREA = 'textAreas';
|
|
51
77
|
FormValidatorsService.ɵfac = function FormValidatorsService_Factory(t) { return new (t || FormValidatorsService)(); };
|
|
52
78
|
FormValidatorsService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: FormValidatorsService, factory: FormValidatorsService.ɵfac });
|
|
53
79
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(FormValidatorsService, [{
|
|
54
80
|
type: Injectable
|
|
55
81
|
}], null, null); })();
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form-validators.service.js","sourceRoot":"","sources":["../../../../../../../projects/ccd-case-ui-toolkit/src/lib/shared/services/form/form-validators.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { AbstractControl, ValidationErrors, ValidatorFn, Validators } from '@angular/forms';\n\nimport { Constants } from '../../commons/constants';\nimport { CaseField } from '../../domain/definition/case-field.model';\nimport { FieldTypeEnum } from '../../domain/definition/field-type-enum.model';\n\n@Injectable()\nexport class FormValidatorsService {\n  private static readonly CUSTOM_VALIDATED_TYPES: FieldTypeEnum[] = [\n    'Date', 'MoneyGBP', 'Label', 'JudicialUser'\n  ];\n  private static readonly DEFAULT_INPUT_TEXT = 'text';\n  private static readonly DEFAULT_INPUT_TEXTAREA = 'textAreas';\n\n  public static addValidators(caseField: CaseField, control: AbstractControl): AbstractControl {\n    if (\n      caseField.display_context === Constants.MANDATORY &&\n      FormValidatorsService.CUSTOM_VALIDATED_TYPES.indexOf(caseField.field_type.type) === -1\n    ) {\n      const validators = [Validators.required];\n      if (caseField.field_type.type === 'Text') {\n        validators.push(this.markDownPatternValidator());\n        if (caseField.field_type.regular_expression) {\n          validators.push(Validators.pattern(caseField.field_type.regular_expression));\n        } else {\n          validators.push(this.emptyValidator());\n        }\n        if (caseField.field_type.min && (typeof caseField.field_type.min === 'number')) {\n          validators.push(Validators.minLength(caseField.field_type.min));\n        }\n        if (caseField.field_type.max && (typeof caseField.field_type.max === 'number')) {\n          validators.push(Validators.maxLength(caseField.field_type.max));\n        }\n      }\n\n      if (caseField.field_type.type === 'TextArea') {\n        validators.push(this.emptyValidator());\n        validators.push(this.markDownPatternValidator());\n      }\n\n      if (control.validator) {\n        validators.push(control.validator);\n      }\n      control.setValidators(validators);\n    } else if (caseField.display_context === 'OPTIONAL' && (caseField.field_type.type === 'Text' || caseField.field_type.type === 'TextArea')\n    || (caseField.display_context === 'COMPLEX' && caseField.field_type.type === 'Complex')) {\n      control.setValidators(this.markDownPatternValidator());\n    }\n\n    return control;\n  }\n\n  public static emptyValidator(): ValidatorFn {\n    const validator = (control: AbstractControl):ValidationErrors | null => {\n      if (control?.value?.toString().trim().length === 0) {\n        return { required: {} };\n      }\n      return null;\n    };\n    return validator;\n  }\n\n  public static markDownPatternValidator(): ValidatorFn {\n    const pattern = /(\\[[^\\]]{0,500}\\]\\([^)]{0,500}\\)|!\\[[^\\]]{0,500}\\]\\([^)]{0,500}\\)|<img[^>]{0,500}>|<a[^>]{0,500}>.*?<\\/a>)/;\n\n    return (control: AbstractControl): ValidationErrors | null => {\n      const value = control?.value?.toString().trim();\n      return (value && pattern.test(value)) ? { markDownPattern: {} } : null;\n    };\n  }\n\n  // TODO: Strip this out as it's only here for the moment because\n  // the service is being injected all over the place but it doesn't\n  // need to be as FormValidatorsService.addValidators is perfectly\n  // happy being static.\n  public addValidators(caseField: CaseField, control: AbstractControl): AbstractControl {\n    return FormValidatorsService.addValidators(caseField, control);\n  }\n\n  public addMarkDownValidators(formGroup: AbstractControl, controlPath: string): AbstractControl {\n    const control = formGroup.get(controlPath);\n    if (control) {\n      control.setValidators(FormValidatorsService.markDownPatternValidator());\n      control.updateValueAndValidity();\n    }\n    return control;\n  }\n}\n"]}
|
|
@@ -19,6 +19,7 @@ export class ProfileService {
|
|
|
19
19
|
.set('experimental', 'true')
|
|
20
20
|
.set('Accept', ProfileService.V2_MEDIATYPE_USER_PROFILE)
|
|
21
21
|
.set('Content-Type', 'application/json');
|
|
22
|
+
// Not adding client context header because header is added to call immediately afterwards
|
|
22
23
|
return this.httpService
|
|
23
24
|
.get(url, { headers, observe: 'body' })
|
|
24
25
|
.pipe(map((p) => plainToClass(Profile, p)));
|
|
@@ -31,4 +32,4 @@ ProfileService.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: ProfileSe
|
|
|
31
32
|
(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(ProfileService, [{
|
|
32
33
|
type: Injectable
|
|
33
34
|
}], function () { return [{ type: i1.HttpService }, { type: i2.AbstractAppConfig }]; }, null); })();
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY2NkLWNhc2UtdWktdG9vbGtpdC9zcmMvbGliL3NoYXJlZC9zZXJ2aWNlcy9wcm9maWxlL3Byb2ZpbGUuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbkQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFakQsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFDO0FBQ3JDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3hELE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUM3RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7Ozs7QUFHbkQsTUFBTSxPQUFPLGNBQWM7SUFNekIsWUFBNkIsV0FBd0IsRUFBbUIsU0FBNEI7UUFBdkUsZ0JBQVcsR0FBWCxXQUFXLENBQWE7UUFBbUIsY0FBUyxHQUFULFNBQVMsQ0FBbUI7SUFBRyxDQUFDO0lBRWpHLEdBQUc7UUFDUixNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxHQUFHLGNBQWMsQ0FBQyxHQUFHLENBQUM7UUFDakUsTUFBTSxPQUFPLEdBQUcsSUFBSSxXQUFXLEVBQUU7YUFDOUIsR0FBRyxDQUFDLGNBQWMsRUFBRSxNQUFNLENBQUM7YUFDM0IsR0FBRyxDQUFDLFFBQVEsRUFBRSxjQUFjLENBQUMseUJBQXlCLENBQUM7YUFDdkQsR0FBRyxDQUFDLGNBQWMsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1FBQzNDLDBGQUEwRjtRQUMxRixPQUFPLElBQUksQ0FBQyxXQUFXO2FBQ3BCLEdBQUcsQ0FBQyxHQUFHLEVBQUUsRUFBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBQyxDQUFDO2FBQ3BDLElBQUksQ0FDSCxHQUFHLENBQUMsQ0FBQyxDQUFTLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FDN0MsQ0FBQztJQUNOLENBQUM7O0FBbEJzQix3Q0FBeUIsR0FDOUMsdUZBQXVGLENBQUM7QUFDbEUsa0JBQUcsR0FBRyxtQkFBbUIsQ0FBQzs0RUFKdkMsY0FBYztvRUFBZCxjQUFjLFdBQWQsY0FBYzt1RkFBZCxjQUFjO2NBRDFCLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBIdHRwSGVhZGVycyB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IHBsYWluVG9DbGFzcyB9IGZyb20gJ2NsYXNzLXRyYW5zZm9ybWVyJztcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcbmltcG9ydCB7IG1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEFic3RyYWN0QXBwQ29uZmlnIH0gZnJvbSAnLi4vLi4vLi4vYXBwLmNvbmZpZyc7XG5pbXBvcnQgeyBQcm9maWxlIH0gZnJvbSAnLi4vLi4vZG9tYWluL3Byb2ZpbGUvcHJvZmlsZS5tb2RlbCc7XG5pbXBvcnQgeyBIdHRwU2VydmljZSB9IGZyb20gJy4uL2h0dHAvaHR0cC5zZXJ2aWNlJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFByb2ZpbGVTZXJ2aWNlIHtcblxuICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IFYyX01FRElBVFlQRV9VU0VSX1BST0ZJTEUgPVxuICAgICdhcHBsaWNhdGlvbi92bmQudWsuZ292LmhtY3RzLmNjZC1kYXRhLXN0b3JlLWFwaS51aS11c2VyLXByb2ZpbGUudjIranNvbjtjaGFyc2V0PVVURi04JztcbiAgcHJpdmF0ZSBzdGF0aWMgcmVhZG9ubHkgVVJMID0gJy9pbnRlcm5hbC9wcm9maWxlJztcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJlYWRvbmx5IGh0dHBTZXJ2aWNlOiBIdHRwU2VydmljZSwgcHJpdmF0ZSByZWFkb25seSBhcHBDb25maWc6IEFic3RyYWN0QXBwQ29uZmlnKSB7fVxuXG4gIHB1YmxpYyBnZXQoKTogT2JzZXJ2YWJsZTxQcm9maWxlPiB7XG4gICAgY29uc3QgdXJsID0gdGhpcy5hcHBDb25maWcuZ2V0Q2FzZURhdGFVcmwoKSArIFByb2ZpbGVTZXJ2aWNlLlVSTDtcbiAgICBjb25zdCBoZWFkZXJzID0gbmV3IEh0dHBIZWFkZXJzKClcbiAgICAgIC5zZXQoJ2V4cGVyaW1lbnRhbCcsICd0cnVlJylcbiAgICAgIC5zZXQoJ0FjY2VwdCcsIFByb2ZpbGVTZXJ2aWNlLlYyX01FRElBVFlQRV9VU0VSX1BST0ZJTEUpXG4gICAgICAuc2V0KCdDb250ZW50LVR5cGUnLCAnYXBwbGljYXRpb24vanNvbicpO1xuICAgIC8vIE5vdCBhZGRpbmcgY2xpZW50IGNvbnRleHQgaGVhZGVyIGJlY2F1c2UgaGVhZGVyIGlzIGFkZGVkIHRvIGNhbGwgaW1tZWRpYXRlbHkgYWZ0ZXJ3YXJkc1xuICAgIHJldHVybiB0aGlzLmh0dHBTZXJ2aWNlXG4gICAgICAuZ2V0KHVybCwge2hlYWRlcnMsIG9ic2VydmU6ICdib2R5J30pXG4gICAgICAucGlwZShcbiAgICAgICAgbWFwKChwOiBvYmplY3QpID0+IHBsYWluVG9DbGFzcyhQcm9maWxlLCBwKSlcbiAgICAgICk7XG4gIH1cblxufVxuIl19
|