From 3b00b76f19121855d01dc0409de16fa889d1337c Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 9 Dec 2020 17:51:30 +0200 Subject: [PATCH] Add option to make static dataset profile fields with autocomplete to have multiple values --- .../datafield/DataRepositoriesData.java | 16 +++++++++++ .../datafield/ExternalDatasetsData.java | 16 +++++++++++ .../commons/datafield/OrganizationsData.java | 16 +++++++++++ .../commons/datafield/RegistriesData.java | 16 +++++++++++ .../commons/datafield/ResearcherData.java | 16 +++++++++++ .../commons/datafield/ServicesData.java | 16 +++++++++++ .../field-data/field-data.ts | 8 +++--- .../data-repositories-data-editor-models.ts | 7 +++-- .../dataset-identifier-data-editor-models.ts | 2 +- .../external-datasets-data-editor-models.ts | 7 +++-- .../organizations-data-editor-models.ts | 2 +- .../registries-data-editor-models.ts | 7 +++-- .../researchers-data-editor-models.ts | 2 +- .../field-data/services-data-editor-models.ts | 7 +++-- .../field-data/tags-data-editor-models.ts | 2 +- ...tor-data-repositories-field.component.html | 5 +++- ...tor-external-datasets-field.component.html | 6 +++- ...-editor-organizations-field.component.html | 6 +++- ...ile-editor-registries-field.component.html | 5 +++- ...le-editor-researchers-field.component.html | 5 +++- ...ofile-editor-services-field.component.html | 5 +++- .../form-field/form-field.component.html | 28 +++++++++++++++++++ 22 files changed, 178 insertions(+), 22 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java index 0fcb22b1b..e72843a39 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/DataRepositoriesData.java @@ -7,10 +7,21 @@ import java.util.HashMap; import java.util.Map; public class DataRepositoriesData extends FieldData { + private Boolean multiAutoComplete; + + public Boolean getMultiAutoComplete() { + return multiAutoComplete; + } + + public void setMultiAutoComplete(Boolean multiAutoComplete) { + this.multiAutoComplete = multiAutoComplete; + } + @Override public DataRepositoriesData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); } return this; } @@ -24,12 +35,16 @@ public class DataRepositoriesData extends FieldData { public Element toXml(Document doc) { Element root = doc.createElement("data"); root.setAttribute("label", this.getLabel()); + if (this.getMultiAutoComplete() != null) { + root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString()); + } return root; } @Override public DataRepositoriesData fromXml(Element item) { this.setLabel(item != null ? item.getAttribute("label") : ""); + this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete"))); return this; } @@ -37,6 +52,7 @@ public class DataRepositoriesData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null ? item.getAttribute("label") : ""); + dataMap.put("multiAutoComplete", item != null ? item.getAttribute("multiAutoComplete") : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java index 5f10b4f01..78c075290 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ExternalDatasetsData.java @@ -7,10 +7,21 @@ import java.util.HashMap; import java.util.Map; public class ExternalDatasetsData extends FieldData { + private Boolean multiAutoComplete; + + public Boolean getMultiAutoComplete() { + return multiAutoComplete; + } + + public void setMultiAutoComplete(Boolean multiAutoComplete) { + this.multiAutoComplete = multiAutoComplete; + } + @Override public ExternalDatasetsData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); } return this; } @@ -24,12 +35,16 @@ public class ExternalDatasetsData extends FieldData { public Element toXml(Document doc) { Element root = doc.createElement("data"); root.setAttribute("label", this.getLabel()); + if (this.getMultiAutoComplete() != null) { + root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString()); + } return root; } @Override public ExternalDatasetsData fromXml(Element item) { this.setLabel(item != null ? item.getAttribute("label") : ""); + this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete"))); return this; } @@ -37,6 +52,7 @@ public class ExternalDatasetsData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null ? item.getAttribute("label") : ""); + dataMap.put("multiAutoComplete", item != null ? item.getAttribute("multiAutoComplete") : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java index 5f762b3c3..0a9f92f3c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/OrganizationsData.java @@ -7,10 +7,21 @@ import java.util.HashMap; import java.util.Map; public class OrganizationsData extends FieldData { + private Boolean multiAutoComplete; + + public Boolean getMultiAutoComplete() { + return multiAutoComplete; + } + + public void setMultiAutoComplete(Boolean multiAutoComplete) { + this.multiAutoComplete = multiAutoComplete; + } + @Override public OrganizationsData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); } return this; } @@ -24,12 +35,16 @@ public class OrganizationsData extends FieldData { public Element toXml(Document doc) { Element root = doc.createElement("data"); root.setAttribute("label", this.getLabel()); + if (this.getMultiAutoComplete() != null) { + root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString()); + } return root; } @Override public OrganizationsData fromXml(Element item) { this.setLabel(item != null ? item.getAttribute("label") : ""); + this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete"))); return this; } @@ -37,6 +52,7 @@ public class OrganizationsData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null ? item.getAttribute("label") : ""); + dataMap.put("multiAutoComplete", item != null ? item.getAttribute("multiAutoComplete") : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java index ed8fca59e..263d9de0b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/RegistriesData.java @@ -7,10 +7,21 @@ import java.util.HashMap; import java.util.Map; public class RegistriesData extends FieldData { + private Boolean multiAutoComplete; + + public Boolean getMultiAutoComplete() { + return multiAutoComplete; + } + + public void setMultiAutoComplete(Boolean multiAutoComplete) { + this.multiAutoComplete = multiAutoComplete; + } + @Override public RegistriesData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); + this.setMultiAutoComplete((Boolean) ((Map) data).get("multiAutoComplete")); } return this; } @@ -24,12 +35,16 @@ public class RegistriesData extends FieldData { public Element toXml(Document doc) { Element root = doc.createElement("data"); root.setAttribute("label", this.getLabel()); + if (this.getMultiAutoComplete() != null) { + root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString()); + } return root; } @Override public RegistriesData fromXml(Element item) { this.setLabel(item != null ? item.getAttribute("label") : ""); + this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete"))); return this; } @@ -37,6 +52,7 @@ public class RegistriesData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null ? item.getAttribute("label") : ""); + dataMap.put("multiAutoComplete", item != null ? item.getAttribute("multiAutoComplete") : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java index efbd2fa45..ccdbaa96b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ResearcherData.java @@ -7,10 +7,21 @@ import java.util.HashMap; import java.util.Map; public class ResearcherData extends FieldData { + private Boolean multiAutoComplete; + + public Boolean getMultiAutoComplete() { + return multiAutoComplete; + } + + public void setMultiAutoComplete(Boolean multiAutoComplete) { + this.multiAutoComplete = multiAutoComplete; + } + @Override public ResearcherData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); } return this; } @@ -24,12 +35,16 @@ public class ResearcherData extends FieldData { public Element toXml(Document doc) { Element root = doc.createElement("data"); root.setAttribute("label", this.getLabel()); + if (this.getMultiAutoComplete() != null) { + root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString()); + } return root; } @Override public ResearcherData fromXml(Element item) { this.setLabel(item != null ? item.getAttribute("label") : ""); + this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete"))); return this; } @@ -37,6 +52,7 @@ public class ResearcherData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null ? item.getAttribute("label") : ""); + dataMap.put("multiAutoComplete", item != null ? item.getAttribute("multiAutoComplete") : false); return dataMap; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java index 09a963933..b68b497b3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/ServicesData.java @@ -7,10 +7,21 @@ import java.util.HashMap; import java.util.Map; public class ServicesData extends FieldData { + private Boolean multiAutoComplete; + + public Boolean getMultiAutoComplete() { + return multiAutoComplete; + } + + public void setMultiAutoComplete(Boolean multiAutoComplete) { + this.multiAutoComplete = multiAutoComplete; + } + @Override public ServicesData fromData(Object data) { if (data != null) { this.setLabel((String) ((Map) data).get("label")); + this.setMultiAutoComplete(((Map) data).get("multiAutoComplete") != null ? (Boolean) ((Map) data).get("multiAutoComplete") : false); } return this; } @@ -24,12 +35,16 @@ public class ServicesData extends FieldData { public Element toXml(Document doc) { Element root = doc.createElement("data"); root.setAttribute("label", this.getLabel()); + if (this.getMultiAutoComplete() != null) { + root.setAttribute("multiAutoComplete", this.getMultiAutoComplete().toString()); + } return root; } @Override public ServicesData fromXml(Element item) { this.setLabel(item != null ? item.getAttribute("label") : ""); + this.setMultiAutoComplete(Boolean.parseBoolean(item.getAttribute("multiAutoComplete"))); return this; } @@ -37,6 +52,7 @@ public class ServicesData extends FieldData { public Map toMap(Element item) { HashMap dataMap = new HashMap(); dataMap.put("label", item != null ? item.getAttribute("label") : ""); + dataMap.put("multiAutoComplete", item != null ? item.getAttribute("multiAutoComplete") : false); return dataMap; } } diff --git a/dmp-frontend/src/app/core/model/dataset-profile-definition/field-data/field-data.ts b/dmp-frontend/src/app/core/model/dataset-profile-definition/field-data/field-data.ts index eba3aa2a6..2a2e953f8 100644 --- a/dmp-frontend/src/app/core/model/dataset-profile-definition/field-data/field-data.ts +++ b/dmp-frontend/src/app/core/model/dataset-profile-definition/field-data/field-data.ts @@ -71,19 +71,19 @@ export interface DmpsAutoCompleteFieldData extends FieldData { } export interface ExternalDatasetsFieldData extends FieldData { - + multiAutoComplete: boolean; } export interface DataRepositoriesFieldData extends FieldData { - + multiAutoComplete: boolean; } export interface RegistriesFieldData extends FieldData { - + multiAutoComplete: boolean; } export interface ServicesFieldData extends FieldData { - + multiAutoComplete: boolean; } export interface TagsFieldData extends FieldData { diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/data-repositories-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/data-repositories-data-editor-models.ts index 0e3e007d2..c337a5311 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/data-repositories-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/data-repositories-data-editor-models.ts @@ -1,19 +1,22 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData, DataRepositoriesFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { DataRepositoriesFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class DataRepositoriesDataEditorModel extends FieldDataEditorModel { public label: string; + public multiAutoComplete: boolean; buildForm(disabled: boolean = false, skipDisable: Array = []): FormGroup { const formGroup = this.formBuilder.group({ - label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('DataRepositoriesDataEditorModel.label')) }] + label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.label')) }], + multiAutoComplete: [{ value: this.multiAutoComplete, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.multiAutoComplete')) }] }); return formGroup; } fromModel(item: DataRepositoriesFieldData): DataRepositoriesDataEditorModel { this.label = item.label; + this.multiAutoComplete = item.multiAutoComplete; return this; } } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/dataset-identifier-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/dataset-identifier-data-editor-models.ts index 0475d1c81..42492776b 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/dataset-identifier-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/dataset-identifier-data-editor-models.ts @@ -1,6 +1,6 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData, DataRepositoriesFieldData, RegistriesFieldData, ServicesFieldData, TagsFieldData, ResearchersFieldData, OrganizationsFieldData, DatasetIdentifierFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { DatasetIdentifierFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class DatasetIdentifierDataEditorModel extends FieldDataEditorModel { public label: string; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/external-datasets-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/external-datasets-data-editor-models.ts index a77e31902..7ee716fbb 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/external-datasets-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/external-datasets-data-editor-models.ts @@ -1,19 +1,22 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { ExternalDatasetsFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class ExternalDatasetsDataEditorModel extends FieldDataEditorModel { public label: string; + public multiAutoComplete: boolean; buildForm(disabled: boolean = false, skipDisable: Array = []): FormGroup { const formGroup = this.formBuilder.group({ - label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('ExternalDatasetsDataEditorModel.label')) }] + label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.label')) }], + multiAutoComplete: [{ value: this.multiAutoComplete, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.multiAutoComplete')) }] }); return formGroup; } fromModel(item: ExternalDatasetsFieldData): ExternalDatasetsDataEditorModel { this.label = item.label; + this.multiAutoComplete = item.multiAutoComplete; return this; } } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/organizations-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/organizations-data-editor-models.ts index da70c48ec..975abbe0b 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/organizations-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/organizations-data-editor-models.ts @@ -1,6 +1,6 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData, DataRepositoriesFieldData, RegistriesFieldData, ServicesFieldData, TagsFieldData, ResearchersFieldData, OrganizationsFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { OrganizationsFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class OrganizationsDataEditorModel extends FieldDataEditorModel { public label: string; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/registries-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/registries-data-editor-models.ts index a8891139b..2d9cee08e 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/registries-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/registries-data-editor-models.ts @@ -1,19 +1,22 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData, DataRepositoriesFieldData, RegistriesFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { RegistriesFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class RegistriesDataEditorModel extends FieldDataEditorModel { public label: string; + public multiAutoComplete: boolean; buildForm(disabled: boolean = false, skipDisable: Array = []): FormGroup { const formGroup = this.formBuilder.group({ - label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('RegistriesDataEditorModel.label')) }] + label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.label')) }], + multiAutoComplete: [{ value: this.multiAutoComplete, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.multiAutoComplete')) }] }); return formGroup; } fromModel(item: RegistriesFieldData): RegistriesDataEditorModel { this.label = item.label; + this.multiAutoComplete = item.multiAutoComplete; return this; } } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/researchers-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/researchers-data-editor-models.ts index 0b0ed0839..6141a88f2 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/researchers-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/researchers-data-editor-models.ts @@ -1,6 +1,6 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData, DataRepositoriesFieldData, RegistriesFieldData, ServicesFieldData, TagsFieldData, ResearchersFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { ResearchersFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class ResearchersDataEditorModel extends FieldDataEditorModel { public label: string; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/services-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/services-data-editor-models.ts index 71d759e14..033868e4f 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/services-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/services-data-editor-models.ts @@ -1,19 +1,22 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData, DataRepositoriesFieldData, RegistriesFieldData, ServicesFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { ServicesFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class ServicesDataEditorModel extends FieldDataEditorModel { public label: string; + public multiAutoComplete: boolean; buildForm(disabled: boolean = false, skipDisable: Array = []): FormGroup { const formGroup = this.formBuilder.group({ - label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.label')) }] + label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.label')) }], + multiAutoComplete: [{ value: this.multiAutoComplete, disabled: (disabled && !skipDisable.includes('ServicesDataEditorModel.multiAutoComplete')) }] }); return formGroup; } fromModel(item: ServicesFieldData): ServicesDataEditorModel { this.label = item.label; + this.multiAutoComplete = item.multiAutoComplete; return this; } } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/tags-data-editor-models.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/tags-data-editor-models.ts index 4eacb9eb1..7cbbf0662 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/tags-data-editor-models.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/tags-data-editor-models.ts @@ -1,6 +1,6 @@ import { FormGroup } from '@angular/forms'; import { FieldDataEditorModel } from './field-data-editor-model'; -import { DatePickerFieldData, ExternalDatasetsFieldData, DataRepositoriesFieldData, RegistriesFieldData, ServicesFieldData, TagsFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; +import { TagsFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data'; export class TagsDataEditorModel extends FieldDataEditorModel { public label: string; diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/data-repositories/dataset-profile-editor-data-repositories-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/data-repositories/dataset-profile-editor-data-repositories-field.component.html index aeb72f4ed..95cf28e76 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/data-repositories/dataset-profile-editor-data-repositories-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/data-repositories/dataset-profile-editor-data-repositories-field.component.html @@ -1,9 +1,12 @@
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-DATE-PICKER-TITLE' | translate}}
+ + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}} + -
\ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/external-datasets/dataset-profile-editor-external-datasets-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/external-datasets/dataset-profile-editor-external-datasets-field.component.html index aeb72f4ed..96016ab7c 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/external-datasets/dataset-profile-editor-external-datasets-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/external-datasets/dataset-profile-editor-external-datasets-field.component.html @@ -1,9 +1,13 @@
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-DATE-PICKER-TITLE' | translate}}
+ + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}} + + -
\ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/organizations/dataset-profile-editor-organizations-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/organizations/dataset-profile-editor-organizations-field.component.html index aeb72f4ed..96016ab7c 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/organizations/dataset-profile-editor-organizations-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/organizations/dataset-profile-editor-organizations-field.component.html @@ -1,9 +1,13 @@
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-DATE-PICKER-TITLE' | translate}}
+ + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}} + + -
\ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/registries/dataset-profile-editor-registries-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/registries/dataset-profile-editor-registries-field.component.html index aeb72f4ed..95cf28e76 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/registries/dataset-profile-editor-registries-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/registries/dataset-profile-editor-registries-field.component.html @@ -1,9 +1,12 @@
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-DATE-PICKER-TITLE' | translate}}
+ + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}} + -
\ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/researchers/dataset-profile-editor-researchers-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/researchers/dataset-profile-editor-researchers-field.component.html index aeb72f4ed..95cf28e76 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/researchers/dataset-profile-editor-researchers-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/researchers/dataset-profile-editor-researchers-field.component.html @@ -1,9 +1,12 @@
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-DATE-PICKER-TITLE' | translate}}
+ + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}} + -
\ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/services/dataset-profile-editor-services-field.component.html b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/services/dataset-profile-editor-services-field.component.html index aeb72f4ed..95cf28e76 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/services/dataset-profile-editor-services-field.component.html +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/services/dataset-profile-editor-services-field.component.html @@ -1,9 +1,12 @@
{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-DATE-PICKER-TITLE' | translate}}
+ + {{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-MULTIPLE-AUTOCOMPLETE' | translate}} + -
\ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html index 80c93039c..d55354672 100644 --- a/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html +++ b/dmp-frontend/src/app/ui/misc/dataset-description-form/components/form-field/form-field.component.html @@ -138,11 +138,18 @@
+
+ + +
+
{{'GENERAL.VALIDATION.REQUIRED' | translate}} +
{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}
@@ -151,11 +158,18 @@
+
+ + +
+
{{'GENERAL.VALIDATION.REQUIRED' | translate}} +
{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}
@@ -164,11 +178,18 @@
+
+ + +
+
{{'GENERAL.VALIDATION.REQUIRED' | translate}} +
{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}
@@ -177,11 +198,18 @@
+
+ + +
+
{{'GENERAL.VALIDATION.REQUIRED' | translate}} +
{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}