Skip to content

Commit 7554511

Browse files
100553: Updated form validation errors from metadata schema and field form
1 parent 091d0fc commit 7554511

3 files changed

Lines changed: 24 additions & 7 deletions

File tree

src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,13 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
8787
name: 'name',
8888
validators: {
8989
required: null,
90-
pattern: '^[^. ,_]{1,32}$',
90+
pattern: '^[^. ,]*$',
91+
maxLength: 32,
9192
},
9293
required: true,
9394
errorMessages: {
94-
pattern: 'error.validation.metadata.namespace.invalid-pattern',
95+
pattern: 'error.validation.metadata.name.invalid-pattern',
96+
maxLength: 'error.validation.metadata.name.max-length',
9597
},
9698
});
9799
this.namespace = new DynamicInputModel({
@@ -100,8 +102,12 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
100102
name: 'namespace',
101103
validators: {
102104
required: null,
105+
maxLength: 256,
103106
},
104107
required: true,
108+
errorMessages: {
109+
maxLength: 'error.validation.metadata.namespace.max-length',
110+
},
105111
});
106112
this.formModel = [
107113
new DynamicFormGroupModel(

src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,27 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
109109
name: 'element',
110110
validators: {
111111
required: null,
112-
pattern: '^[^.]*$',
112+
pattern: '^[^. ,]*$',
113+
maxLength: 64,
113114
},
114115
required: true,
115116
errorMessages: {
116117
pattern: 'error.validation.metadata.element.invalid-pattern',
118+
maxLength: 'error.validation.metadata.element.max-length',
117119
},
118120
});
119121
this.qualifier = new DynamicInputModel({
120122
id: 'qualifier',
121123
label: qualifier,
122124
name: 'qualifier',
123125
validators: {
124-
pattern: '^[^.]*$',
126+
pattern: '^[^. ,]*$',
127+
maxLength: 64,
125128
},
126129
required: false,
127130
errorMessages: {
128131
pattern: 'error.validation.metadata.qualifier.invalid-pattern',
132+
maxLength: 'error.validation.metadata.qualifier.max-length',
129133
},
130134
});
131135
this.scopeNote = new DynamicInputModel({

src/assets/i18n/en.json5

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,12 +1478,19 @@
14781478

14791479
"error.validation.groupExists": "This group already exists",
14801480

1481-
"error.validation.metadata.namespace.invalid-pattern": "This field cannot contain dots, please use the Element & Qualifier fields instead",
1481+
"error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
14821482

1483-
"error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, please use the Qualifier field instead",
1483+
"error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
14841484

1485-
"error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots",
1485+
"error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
14861486

1487+
"error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
1488+
1489+
"error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
1490+
1491+
"error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
1492+
1493+
"error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
14871494

14881495
"feed.description": "Syndication feed",
14891496

0 commit comments

Comments
 (0)