diff --git a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts index 73ff48a14..b0675ba42 100644 --- a/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/multiple/multiple-auto-complete.component.ts @@ -95,7 +95,6 @@ export class MultipleAutoCompleteComponent extends _CustomComponentMixinBase imp @Input() minLength: number = 0; @Input() showNoResultsLabel: boolean = true; - @Input() hidePlaceholder: boolean = false; @Input() get placeholder() { diff --git a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts index 97d2c11c5..9b354dd59 100644 --- a/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts +++ b/dmp-frontend/src/app/library/auto-complete/single/single-auto-complete.component.ts @@ -212,6 +212,14 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple this.optionActionClicked.emit(item); } + private clearValue(): void { + this._setValue(null); + this.stateChanges.next(); + this.optionSelected.emit(null); + this.inputValue = null; + this._items = null; + } + private optionSelectedInternal(item: any) { const newValue = this._valueToAssign(item); @@ -229,7 +237,9 @@ export class SingleAutoCompleteComponent extends _CustomComponentMixinBase imple // prevent filtering results if arrow were pressed if (event.keyCode !== ENTER && (event.keyCode < 37 || event.keyCode > 40)) { if (this.inputValue.length === 0 && this.value != null) { + this.clearValue(); this._onInputFocus(); + return; } this._inputSubject.next(this.inputValue); } diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html index 512f46532..07af14ebc 100644 --- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html +++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html @@ -123,7 +123,7 @@ {{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.COMPOSITE-FIELD.FIELDS.SEMANTICS' | translate}} - + {{form.get('schematics').getError('backendError').message}} diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html index 54b42c9ed..cd23a0c54 100644 --- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html @@ -173,7 +173,7 @@
{{'DMP-BLUEPRINT-EDITOR.FIELDS.SEMANTICS' | translate}} - + {{field.get('semantics').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} @@ -257,7 +257,7 @@
{{'DMP-BLUEPRINT-EDITOR.FIELDS.DESCRIPTION-TEMPLATE' | translate}} - + {{descriptionTemplate.get('descriptionTemplateGroupId').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} diff --git a/dmp-frontend/src/app/ui/admin/entity-locks/filters/lock-listing-filters.component.html b/dmp-frontend/src/app/ui/admin/entity-locks/filters/lock-listing-filters.component.html index ae0057c6b..6edc67cd1 100644 --- a/dmp-frontend/src/app/ui/admin/entity-locks/filters/lock-listing-filters.component.html +++ b/dmp-frontend/src/app/ui/admin/entity-locks/filters/lock-listing-filters.component.html @@ -23,7 +23,7 @@
{{'LOCK-LISTING.FILTER.USERS' | translate}} - +
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html index a29ae9b6b..36ab6c70f 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html +++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html @@ -17,10 +17,10 @@
- + - +
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html index a65ff6ef6..e0e4f293c 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.html @@ -201,7 +201,7 @@
{{'DMP-EDITOR.FIELDS.USER' | translate}} - + {{contact.get('userId').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} @@ -319,7 +319,7 @@
{{'DMP-EDITOR.FIELDS.DESCRIPTION-TEMPLATES' | translate}}
{{'DMP-EDITOR.FIELDS.DESCRIPTION-TEMPLATES-HINT' | translate}} - + {{formGroup.get('descriptionTemplates').get(section.id).getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} diff --git a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html index bf1a4bd5e..f54b95d61 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html +++ b/dmp-frontend/src/app/ui/dmp/dmp-user-field/dmp-user-field.component.html @@ -44,7 +44,7 @@
{{'DMP-EDITOR.FIELDS.USER' | translate}} - + {{user.get('user').getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} diff --git a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html index 9b7c83681..3228e5b6a 100644 --- a/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html +++ b/dmp-frontend/src/app/ui/dmp/editor/dataset-info/dataset-info.component.html @@ -13,7 +13,7 @@
{{'DMP-EDITOR.FIELDS.SELECT-TEMPLATE' | translate}} - + {{formGroup.get('profiles').getError('backendError').message}} diff --git a/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html b/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html index 0e7f05cdd..7c0dbdb46 100644 --- a/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html +++ b/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html @@ -1,14 +1,14 @@ - {{label ?? referenceType?.name}} - + {{label?.length > 0 ? label : referenceType?.name}} + {{form.getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} {{hint}} - {{label ?? referenceType?.name}} - + {{label?.length > 0 ? label : referenceType?.name}} + {{form.getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} diff --git a/dmp-frontend/src/notification-service/ui/admin/notification/filters/notification-listing-filters.component.html b/dmp-frontend/src/notification-service/ui/admin/notification/filters/notification-listing-filters.component.html index 6adc22cd1..4dd876f75 100644 --- a/dmp-frontend/src/notification-service/ui/admin/notification/filters/notification-listing-filters.component.html +++ b/dmp-frontend/src/notification-service/ui/admin/notification/filters/notification-listing-filters.component.html @@ -33,7 +33,7 @@
{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.FILTER.USERS' | translate}} - +