diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.html b/src/app/project/ontology/ontology-form/ontology-form.component.html index 44ae70500c..3f700f9ec5 100644 --- a/src/app/project/ontology/ontology-form/ontology-form.component.html +++ b/src/app/project/ontology/ontology-form/ontology-form.component.html @@ -12,9 +12,9 @@ - {{project.shortname}}:  + {{ formErrors.label }} diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts index fabc09eba0..4af1cf039e 100644 --- a/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts +++ b/src/app/project/ontology/ontology-form/ontology-form.component.spec.ts @@ -174,7 +174,7 @@ describe('OntologyFormComponent', () => { nameInput.setValue('biblio'); const compiled = ontologyFormFixture.debugElement; - expect(ontologyFormComponent.ontologyLabel).toEqual('Biblio'); + expect(ontologyFormComponent.ontologyForm.controls.label.value).toEqual('Biblio'); expect(form.valid).toBeTruthy(); diff --git a/src/app/project/ontology/ontology-form/ontology-form.component.ts b/src/app/project/ontology/ontology-form/ontology-form.component.ts index 9d3d2f7f23..eed7f2b6c5 100644 --- a/src/app/project/ontology/ontology-form/ontology-form.component.ts +++ b/src/app/project/ontology/ontology-form/ontology-form.component.ts @@ -194,6 +194,12 @@ export class OntologyFormComponent implements OnInit { }); this.ontologyForm.valueChanges.subscribe(data => this.onValueChanged(data)); + + if (!this.iri) { + this.ontologyForm.get('name').valueChanges.subscribe(val => { + this.ontologyForm.controls.label.setValue(this.capitalizeFirstLetter(val)); + }); + } } onValueChanged(data?: any) { @@ -202,10 +208,6 @@ export class OntologyFormComponent implements OnInit { return; } - if (!this.iri) { - this.ontologyLabel = this.capitalizeFirstLetter(data.name); - } - Object.keys(this.formErrors).map(field => { this.formErrors[field] = ''; const control = this.ontologyForm.get(field);