SHIBUI-1602 Fixed issue with validation on providers

TIER · Nov 22, 2019 · 6f9d5fc · 6f9d5fc
1 parent 5e7168d
commit 6f9d5fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json
@@ -287,7 +287,6 @@
                     "title": "label.certificate-name-display-only",
                     "description": "tooltip.certificate-name",
                     "type": "string",
-                    "minLength": 1,
                     "maxLength": 255
                 },
                 "type": {

diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
@@ -69,11 +69,11 @@ export class ProviderEditStepComponent implements OnDestroy {
                 this.store.select(fromProvider.getProviderXmlIds),
                 this.provider$
             ),
-            filter(([def, names, ids, provider]) => !def),
-            map(([def, names, ids, provider]) => def ? def.getValidators(
+            filter(([def, names, ids, provider]) => !!def),
+            map(([def, names, ids, provider]) => def.getValidators(
                 names.filter(n => n !== provider.name),
                 ids.filter(id => id !== provider.xmlId)
-            ) : {})
+            ))
         );
 
         this.model$ = this.schema$.pipe(

diff --git a/ui/src/app/schema-form/widget/string/string.component.html b/ui/src/app/schema-form/widget/string/string.component.html
@@ -14,7 +14,7 @@
         validate="true"
         [attr.readonly]="schema.readOnly?true:null"
         class="text-widget.id textline-widget form-control"
-        [class.is-invalid]="control.touched && !control.value && errorMessages.length"
+        [class.is-invalid]="control.touched && !control.value && (errorMessages.length > 0)"
         [attr.type]="this.getInputType()"
         [id]="formProperty._canonicalPath"
         [formControl]="control"

diff --git a/ui/src/app/schema-form/widget/string/string.component.ts b/ui/src/app/schema-form/widget/string/string.component.ts
@@ -34,6 +34,7 @@ export class CustomStringComponent extends StringWidget implements AfterViewInit
             if (!this.required) {
                 this.errorMessages = this.errorMessages.filter(e => e !== REQUIRED_MSG_OVERRIDE);
             }
+            console.log(this.errorMessages.length);
         });
     }