Add support for multiple sources on dataset autocomplete templates

dmp-backend/web/src/main/java/eu/eudat/logic/managers/DatasetProfileManager.java

@@ -37,6 +37,7 @@ import javax.xml.xpath.*;
 import java.io.*;
 import java.nio.file.Files;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Component
@@ -46,12 +47,14 @@ public class DatasetProfileManager {
     private ApiContext apiContext;
     private DatabaseRepository databaseRepository;
     private Environment environment;
+    private List<String> cache;
 
     @Autowired
     public DatasetProfileManager(ApiContext apiContext, Environment environment) {
         this.apiContext = apiContext;
         this.databaseRepository = apiContext.getOperationsContext().getDatabaseRepository();
         this.environment = environment;
+        this.cache = new ArrayList<>();
     }
 
     public eu.eudat.models.data.admin.composite.DatasetProfile getDatasetProfile(String id) {
@@ -107,17 +110,45 @@ public class DatasetProfileManager {
         List<ExternalAutocompleteFieldModel> result = new LinkedList<>();
         RestTemplate restTemplate = new RestTemplate();
         HttpHeaders headers = new HttpHeaders();
-        headers.setAccept(Collections.singletonList(MediaType.valueOf("application/vnd.api+json; charset=utf-8")));
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        HttpEntity<String> entity = new HttpEntity<>("parameters", headers);
+        DocumentContext jsonContext = null;
+        HttpEntity<String> entity;
+        ResponseEntity response;
+        List<Map<String, String>> jsonItems;
+        int i = 0;
+        for (AutoCompleteData.AutoCompleteSingleData singleData: data.getAutoCompleteSingleDataList()) {
+            switch (AutoCompleteData.AutocompleteType.fromValue(singleData.getAutocompleteType())) {
+                case UNCACHED:
+                    headers.setAccept(Collections.singletonList(MediaType.valueOf("application/vnd.api+json; charset=utf-8")));
+                    headers.setContentType(MediaType.APPLICATION_JSON);
+                    entity = new HttpEntity<>("parameters", headers);
+
+                    response = restTemplate.exchange(singleData.getUrl() + "?search=" + like, HttpMethod.GET, entity, Object.class);
+                    jsonContext = JsonPath.parse(response.getBody());
+                    jsonItems = jsonContext.read(singleData.getOptionsRoot() + "['" + singleData.getAutoCompleteOptions().getLabel() + "','" + singleData.getAutoCompleteOptions().getValue() + "','" + singleData.getAutoCompleteOptions().getSource() + "','" + "uri" + "']");
+                    jsonItems.forEach(item -> result.add(new ExternalAutocompleteFieldModel(item.get(singleData.getAutoCompleteOptions().getValue()), item.get(singleData.getAutoCompleteOptions().getLabel()), item.get(singleData.getAutoCompleteOptions().getSource()), item.get("uri"))));
+                    break;
+                case CACHED:
+                    headers.setAccept(Collections.singletonList(MediaType.valueOf("text/plain; charset=utf-8")));
+                    headers.setContentType(MediaType.TEXT_PLAIN);
+                    entity = new HttpEntity<>("parameters", headers);
+
+                    if (this.cache.size() <= i) {
+                        response = restTemplate.exchange(singleData.getUrl(), HttpMethod.GET, entity, String.class);
+                        this.cache.add((String) response.getBody());
+                    }
+                    jsonContext = JsonPath.parse(cache.get(i));
+                    jsonItems = jsonContext.read(singleData.getOptionsRoot() + "['" + singleData.getAutoCompleteOptions().getLabel() + "','" + singleData.getAutoCompleteOptions().getValue() + "','" + singleData.getAutoCompleteOptions().getSource() + "','" + "uri" + "']");
+                    jsonItems.stream().filter(item -> item.get(singleData.getAutoCompleteOptions().getLabel()).toLowerCase().contains(like.toLowerCase()))
+                             .forEach(item -> result.add(new ExternalAutocompleteFieldModel(item.get(singleData.getAutoCompleteOptions().getValue()), item.get(singleData.getAutoCompleteOptions().getLabel()), item.get(singleData.getAutoCompleteOptions().getSource())  != null ? item.get(singleData.getAutoCompleteOptions().getSource()) : singleData.getAutoCompleteOptions().getSource(), item.get("uri"))));
+                    i++;
+                    break;
+            }
 
-        ResponseEntity<Object> response = restTemplate.exchange(data.getUrl() + "?search=" + like, HttpMethod.GET, entity, Object.class);
-        DocumentContext jsonContext = JsonPath.parse(response.getBody());
+        }
 
-        List<Map<String, String>> jsonItems = jsonContext.read(data.getOptionsRoot() + "['" + data.getAutoCompleteOptions().getLabel() + "','" + data.getAutoCompleteOptions().getValue() + "','" + data.getAutoCompleteOptions().getSource() + "','" + "uri" + "']");
-        jsonItems.forEach(item -> result.add(new ExternalAutocompleteFieldModel(item.get(data.getAutoCompleteOptions().getValue()), item.get(data.getAutoCompleteOptions().getLabel()), item.get(data.getAutoCompleteOptions().getSource()), item.get("uri"))));
+        return result.stream().sorted(Comparator.comparing(ExternalAutocompleteFieldModel::getLabel)).collect(Collectors.toList());
 
-        return result;
+        //return result;
     }
 
     public ResponseEntity<byte[]> getDocument(eu.eudat.models.data.user.composite.DatasetProfile datasetProfile, String label) throws IllegalAccessException, IOException, InstantiationException {

dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java

@@ -217,13 +217,17 @@ public class ExportXmlBuilderDatasetProfile {
                         AutoCompleteData autoCompleteDataObject = (AutoCompleteData) field.getData();
                         dataOut.setAttribute("label", autoCompleteDataObject.getLabel());
                         dataOut.setAttribute("type", autoCompleteDataObject.getType());
-                        dataOut.setAttribute("optionsRoot", autoCompleteDataObject.getOptionsRoot());
-                        dataOut.setAttribute("url", autoCompleteDataObject.getUrl());
-                        if (autoCompleteDataObject.getAutoCompleteOptions() != null) {
-                            Element optionChild = element.createElement("option");
-                            optionChild.setAttribute("label", autoCompleteDataObject.getAutoCompleteOptions().getLabel());
-                            optionChild.setAttribute("value", autoCompleteDataObject.getAutoCompleteOptions().getValue());
-                            dataOut.appendChild(optionChild);
+                        for (AutoCompleteData.AutoCompleteSingleData singleData: autoCompleteDataObject.getAutoCompleteSingleDataList()) {
+                            Element singleItem = element.createElement("autocompleteSingle");
+                            singleItem.setAttribute("optionsRoot", singleData.getOptionsRoot());
+                            singleItem.setAttribute("url", singleData.getUrl());
+                            if (singleData.getAutoCompleteOptions() != null) {
+                                Element optionChild = element.createElement("option");
+                                optionChild.setAttribute("label", singleData.getAutoCompleteOptions().getLabel());
+                                optionChild.setAttribute("value", singleData.getAutoCompleteOptions().getValue());
+                                singleItem.appendChild(optionChild);
+                            }
+                            dataOut.appendChild(singleItem);
                         }
                     }
                 } else if (field.getViewStyle().getRenderStyle().equals("booleanDecision")) {

dmp-backend/web/src/main/java/eu/eudat/models/data/components/commons/datafield/AutoCompleteData.java

@@ -2,87 +2,156 @@ package eu.eudat.models.data.components.commons.datafield;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
-    private String url;
-    private Option autoCompleteOptions;
-    private String optionsRoot;
-    private Boolean multiAutoComplete;
+    public class AutoCompleteSingleData {
+        private int autocompleteType;
+        private String url;
+        private Option autoCompleteOptions;
+        private String optionsRoot;
 
-    public String getOptionsRoot() {
-        return optionsRoot;
-    }
-    public void setOptionsRoot(String optionsRoot) {
-        this.optionsRoot = optionsRoot;
-    }
+        public int getAutocompleteType() {
+            return autocompleteType;
+        }
 
-    public String getUrl() {
-        return url;
-    }
-    public void setUrl(String url) {
-        this.url = url;
-    }
+        public void setAutocompleteType(int autocompleteType) {
+            this.autocompleteType = autocompleteType;
+        }
 
-    public Option getAutoCompleteOptions() {
-        return autoCompleteOptions;
-    }
-    public void setAutoCompleteOptions(Option autoCompleteOptions) {
-        this.autoCompleteOptions = autoCompleteOptions;
+        public String getOptionsRoot() {
+            return optionsRoot;
+        }
+        public void setOptionsRoot(String optionsRoot) {
+            this.optionsRoot = optionsRoot;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public Option getAutoCompleteOptions() {
+            return autoCompleteOptions;
+        }
+        public void setAutoCompleteOptions(Option autoCompleteOptions) {
+            this.autoCompleteOptions = autoCompleteOptions;
+        }
     }
 
+    private Boolean multiAutoComplete;
+    private List<AutoCompleteSingleData> autoCompleteSingleDataList;
+
     public Boolean getMultiAutoComplete() { return multiAutoComplete; }
     public void setMultiAutoComplete(Boolean multiAutoComplete) { this.multiAutoComplete = multiAutoComplete; }
 
+    public List<AutoCompleteSingleData> getAutoCompleteSingleDataList() {
+        return autoCompleteSingleDataList;
+    }
+
+    public void setAutoCompleteSingleDataList(List<AutoCompleteSingleData> autoCompleteSingleDataList) {
+        this.autoCompleteSingleDataList = autoCompleteSingleDataList;
+    }
+
     @Override
     public Element toXml(Document doc) {
         Element root = super.toXml(doc);
-
-        root.setAttribute("url", this.url);
-        root.setAttribute("optionsRoot", this.optionsRoot);
         if (this.multiAutoComplete != null)
             root.setAttribute("multiAutoComplete", this.multiAutoComplete.toString());
-        Element element = doc.createElement("option");
-        element.setAttribute("label", this.autoCompleteOptions.getLabel());
-        element.setAttribute("value", autoCompleteOptions.getValue());
-        element.setAttribute("source", autoCompleteOptions.getSource());
-        root.appendChild(element);
+        for (AutoCompleteSingleData singleData: this.autoCompleteSingleDataList) {
+            Element parent = doc.createElement("autocompleteSingle");
+            parent.setAttribute("url", singleData.url);
+            parent.setAttribute("optionsRoot", singleData.optionsRoot);
+            parent.setAttribute("autoCompleteType", Integer.toString(singleData.autocompleteType));
+            Element element = doc.createElement("option");
+            element.setAttribute("label", singleData.autoCompleteOptions.getLabel());
+            element.setAttribute("value", singleData.autoCompleteOptions.getValue());
+            element.setAttribute("source", singleData.autoCompleteOptions.getSource());
+            parent.appendChild(element);
+            root.appendChild(parent);
+        }
         return root;
     }
 
     @Override
     public AutoCompleteData fromXml(Element item) {
         super.fromXml(item);
-        this.url = item.getAttribute("url");
-        this.optionsRoot = item.getAttribute("optionsRoot");
+        this.autoCompleteSingleDataList = new ArrayList<>();
+        NodeList items = item.getElementsByTagName("autocompleteSingle");
+        if (items != null && items.getLength() > 0) {
+            for (int i = 0; i < items.getLength(); i++) {
+                this.autoCompleteSingleDataList.add(new AutoCompleteSingleData());
+                Element single = (Element) items.item(i);
+                this.mapFromXml(single, this.autoCompleteSingleDataList.get(i));
+            }
+        } else {
+            this.autoCompleteSingleDataList.add(new AutoCompleteSingleData());
+            this.mapFromXml(item, this.autoCompleteSingleDataList.get(0));
+        }
         this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
+        return this;
+    }
+
+    private void mapFromXml(Element item, AutoCompleteSingleData singleData) {
+        singleData.url = item.getAttribute("url");
+        singleData.optionsRoot = item.getAttribute("optionsRoot");
+        this.multiAutoComplete = Boolean.parseBoolean(item.getAttribute("multiAutoComplete"));
+        if (item.getAttribute("autoCompleteType") == null || item.getAttribute("autoCompleteType").equals("") ) {
+            singleData.autocompleteType = AutocompleteType.UNCACHED.getValue();
+        } else {
+            singleData.autocompleteType = AutocompleteType.fromValue(Integer.parseInt(item.getAttribute("autoCompleteType"))).getValue();
+        }
         Element optionElement = (Element) item.getElementsByTagName("option").item(0);
         if (optionElement != null) {
-            this.autoCompleteOptions = new Option();
-            this.autoCompleteOptions.setLabel(optionElement.getAttribute("label"));
-            this.autoCompleteOptions.setValue(optionElement.getAttribute("value"));
-            this.autoCompleteOptions.setSource(optionElement.getAttribute("source"));
-            this.autoCompleteOptions.setUri(optionElement.getAttribute("uri"));
+            singleData.autoCompleteOptions = new Option();
+            singleData.autoCompleteOptions.setLabel(optionElement.getAttribute("label"));
+            singleData.autoCompleteOptions.setValue(optionElement.getAttribute("value"));
+            singleData.autoCompleteOptions.setSource(optionElement.getAttribute("source"));
+            singleData.autoCompleteOptions.setUri(optionElement.getAttribute("uri"));
         }
-        return this;
     }
 
     @Override
     public AutoCompleteData fromData(Object data) {
         super.fromData(data);
-        this.autoCompleteOptions = new Option();
+        this.autoCompleteSingleDataList = new ArrayList<>();
+
+
+
         if (data != null) {
-            this.url = (String) ((Map<String, Object>) data).get("url");
-            this.optionsRoot = (String) ((Map<String, Object>) data).get("optionsRoot");
             this.multiAutoComplete = (Boolean) ((Map<Boolean, Object>) data).get("multiAutoComplete");
-            Map<String, String> options = ((Map<String, Map<String, String>>) data).get("autoCompleteOptions");
-            if (options != null) {
-                this.autoCompleteOptions.setLabel(options.get("label"));
-                this.autoCompleteOptions.setValue(options.get("value"));
-                this.autoCompleteOptions.setSource(options.get("source"));
-                this.autoCompleteOptions.setUri(options.get("uri"));
+
+            List<Map<String, Object>> dataList = (List<Map<String, Object>>) ((Map<String, Object>) data).get("autoCompleteSingleDataList");
+
+            this.autoCompleteSingleDataList = new ArrayList<>();
+
+            int i = 0;
+            for (Map<String, Object> singleData: dataList) {
+                this.autoCompleteSingleDataList.add(new AutoCompleteSingleData());
+                this.autoCompleteSingleDataList.get(i).autoCompleteOptions = new Option();
+                this.autoCompleteSingleDataList.get(i).url = (String) singleData.get("url");
+                this.autoCompleteSingleDataList.get(i).optionsRoot = (String) singleData.get("optionsRoot");
+
+                if (singleData.get("autoCompleteType") == null) {
+                    this.autoCompleteSingleDataList.get(i).autocompleteType = AutocompleteType.UNCACHED.getValue();
+                } else {
+                    this.autoCompleteSingleDataList.get(i).autocompleteType = AutocompleteType.fromValue((Integer) singleData.get("autoCompleteType")).getValue();
+                }
+                Map<String, String> options = (Map<String, String>) singleData.get("autoCompleteOptions");
+                if (options != null) {
+                    this.autoCompleteSingleDataList.get(i).autoCompleteOptions.setLabel(options.get("label"));
+                    this.autoCompleteSingleDataList.get(i).autoCompleteOptions.setValue(options.get("value"));
+                    this.autoCompleteSingleDataList.get(i).autoCompleteOptions.setSource(options.get("source"));
+                    this.autoCompleteSingleDataList.get(i).autoCompleteOptions.setUri(options.get("uri"));
+                }
+                i++;
             }
         }
 
@@ -119,4 +188,29 @@ public class AutoCompleteData extends ComboBoxData<AutoCompleteData> {
         dataMap.put("source", item != null ? item.getAttribute("source") : "");
         return dataMap;
     }
+
+    public enum AutocompleteType {
+        UNCACHED(0), CACHED(1);
+
+        int value;
+
+        AutocompleteType(int value) {
+            this.value = value;
+        }
+
+        public int getValue() {
+            return this.value;
+        }
+
+        public static AutocompleteType fromValue(int value) {
+            for (AutocompleteType type: AutocompleteType.values()) {
+                if (type.getValue() == value) {
+                    return type;
+                }
+            }
+            return UNCACHED;
+        }
+    }
 }
+
+

dmp-frontend/src/app/core/model/dataset-profile-definition/field-data/field-data.ts

@@ -7,10 +7,15 @@ export interface FieldData {
 
 export interface AutoCompleteFieldData extends FieldData {
 	type: DatasetProfileComboBoxType;
+	autoCompleteSingleDataList: AutoCompleteSingleData[];
+	multiAutoComplete: boolean;
+}
+
+export interface AutoCompleteSingleData extends FieldData {
 	url: string;
 	optionsRoot: string;
 	autoCompleteOptions: FieldDataOption;
-	multiAutoComplete: boolean;
+	autocompleteType: number;
 }
 
 export interface CheckBoxFieldData extends FieldData {
@@ -56,6 +61,7 @@ export interface ResearchersAutoCompleteFieldData extends FieldData {
 export interface DatasetsAutoCompleteFieldData extends FieldData {
 	type: DatasetProfileInternalDmpEntitiesType;
 	multiAutoComplete: boolean;
+	autoCompleteType: number;
 }
 
 export interface DmpsAutoCompleteFieldData extends FieldData {

dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-field-data-editor-model.ts

@@ -3,36 +3,40 @@ import { DatasetProfileComboBoxType } from '../../../../../core/common/enum/data
 import { AutoCompleteFieldData } from '../../../../../core/model/dataset-profile-definition/field-data/field-data';
 import { FieldDataEditorModel } from './field-data-editor-model';
 import { FieldDataOptionEditorModel } from './field-data-option-editor-model';
+import { AutoCompleteSingleDataEditorModel } from './auto-complete-single-data';
 
 export class AutoCompleteFieldDataEditorModel extends FieldDataEditorModel<AutoCompleteFieldDataEditorModel> {
 
 	public type: DatasetProfileComboBoxType = DatasetProfileComboBoxType.Autocomplete;
-	public url: string;
-	public optionsRoot: string;
 	public multiAutoComplete: boolean;
-	public autoCompleteOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel();
+	public autoCompleteSingleDataList: Array<AutoCompleteSingleDataEditorModel> = new Array<AutoCompleteSingleDataEditorModel>();
 	//public multiAutoCompleteOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel();
 
 	buildForm(disabled: boolean = false, skipDisable: Array<String> = []): FormGroup {
 		const formGroup = this.formBuilder.group({
 			label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('AutoCompleteFieldDataEditorModel.label')) }],
 			type: [{ value: this.type, disabled: (disabled && !skipDisable.includes('AutoCompleteFieldDataEditorModel.type')) }],
-			url: [{ value: this.url, disabled: (disabled && !skipDisable.includes('AutoCompleteFieldDataEditorModel.url')) }],
-			optionsRoot: [{ value: this.optionsRoot, disabled: (disabled && !skipDisable.includes('AutoCompleteFieldDataEditorModel.optionsRoot')) }],
 			multiAutoComplete: [{ value: this.multiAutoComplete, disabled: (disabled && !skipDisable.includes('AutoCompleteFieldDataEditorModel.multiAutoComplete')) }]
 		});
-		formGroup.addControl('autoCompleteOptions', this.autoCompleteOptions.buildForm(disabled, skipDisable));
+
+		const autocompleteFormArray = new Array<FormGroup>();
+		if (this.autoCompleteSingleDataList) {
+			this.autoCompleteSingleDataList.forEach(item => {
+				const form: FormGroup = item.buildForm(disabled, skipDisable);
+				autocompleteFormArray.push(form);
+			});
+		}
+
+		formGroup.addControl('autoCompleteSingleDataList', this.formBuilder.array(autocompleteFormArray));
 
 		return formGroup;
 	}
 
 	fromModel(item: AutoCompleteFieldData): AutoCompleteFieldDataEditorModel {
 		this.type = item.type;
-		this.url = item.url;
 		this.label = item.label;
-		this.optionsRoot = item.optionsRoot;
 		this.multiAutoComplete = item.multiAutoComplete;
-		this.autoCompleteOptions = new FieldDataOptionEditorModel().fromModel(item.autoCompleteOptions);
+		if (item.autoCompleteSingleDataList) { this.autoCompleteSingleDataList = item.autoCompleteSingleDataList.map(x => new AutoCompleteSingleDataEditorModel().fromModel(x)); }
 		return this;
 	}
 }

dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data.ts

@@ -0,0 +1,36 @@
+import { FieldDataEditorModel } from './field-data-editor-model';
+import { DatasetProfileComboBoxType } from '@app/core/common/enum/dataset-profile-combo-box-type';
+import { FieldDataOptionEditorModel } from './field-data-option-editor-model';
+import { FormGroup } from '@angular/forms';
+import { AutoCompleteFieldData, AutoCompleteSingleData } from '@app/core/model/dataset-profile-definition/field-data/field-data';
+
+export class AutoCompleteSingleDataEditorModel extends FieldDataEditorModel<AutoCompleteSingleDataEditorModel> {
+
+	public url: string;
+	public optionsRoot: string;
+
+	public autoCompleteOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel();
+	public autoCompleteType: number;
+	//public multiAutoCompleteOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel();
+
+	buildForm(disabled: boolean = false, skipDisable: Array<String> = []): FormGroup {
+		const formGroup = this.formBuilder.group({
+			label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.label')) }],
+			url: [{ value: this.url, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.url')) }],
+			optionsRoot: [{ value: this.optionsRoot, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.optionsRoot')) }],
+			autoCompleteType: [{ value: this.autoCompleteType, disabled: (disabled && !skipDisable.includes('AutoCompleteSingleDataEditorModel.autoCompleteType')) }]
+		});
+		formGroup.addControl('autoCompleteOptions', this.autoCompleteOptions.buildForm(disabled, skipDisable));
+
+		return formGroup;
+	}
+
+	fromModel(item: AutoCompleteSingleData): AutoCompleteSingleDataEditorModel {
+		this.url = item.url;
+		this.label = item.label;
+		this.optionsRoot = item.optionsRoot;
+		this.autoCompleteType = item.autocompleteType;
+		this.autoCompleteOptions = new FieldDataOptionEditorModel().fromModel(item.autoCompleteOptions);
+		return this;
+	}
+}

dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-data/datasets-autocomplete-field-data-editor-mode.ts

@@ -8,12 +8,14 @@ export class DatasetsAutoCompleteFieldDataEditorModel extends FieldDataEditorMod
 	public type: DatasetProfileInternalDmpEntitiesType = DatasetProfileInternalDmpEntitiesType.Datasets;
 	public multiAutoComplete: boolean = false;
 	public autoCompleteOptions: FieldDataOptionEditorModel = new FieldDataOptionEditorModel();
+	public autoCompleteType: number;
 
 	buildForm(disabled: boolean = false, skipDisable: Array<String> = []): FormGroup {
 		const formGroup = this.formBuilder.group({
 			label: [{ value: this.label, disabled: (disabled && !skipDisable.includes('DatasetsAutoCompleteFieldDataEditorModel.label')) }],
 			type: [{ value: this.type, disabled: (disabled && !skipDisable.includes('DatasetsAutoCompleteFieldDataEditorModel.type')) }],
-			multiAutoComplete: [{ value: this.multiAutoComplete, disabled: (disabled && !skipDisable.includes('DatasetsAutoCompleteFieldDataEditorModel.multiAutoComplete')) }]
+			multiAutoComplete: [{ value: this.multiAutoComplete, disabled: (disabled && !skipDisable.includes('DatasetsAutoCompleteFieldDataEditorModel.multiAutoComplete')) }],
+			autoCompleteType: [{ value: this.autoCompleteType, disabled: (disabled && !skipDisable.includes('DatasetsAutoCompleteFieldDataEditorModel.autoCompleteType')) }]
 		})
 		return formGroup;
 	}
@@ -22,6 +24,7 @@ export class DatasetsAutoCompleteFieldDataEditorModel extends FieldDataEditorMod
 		this.label = item.label;
 		this.type = item.type;
 		this.multiAutoComplete = item.multiAutoComplete;
+		this.autoCompleteType = item.autoCompleteType;
 		return this;
 	}
 }

dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.html

@@ -9,20 +9,36 @@
 		<input matInput type="string" placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-PLACEHOLDER' | translate}}"
 		 [formControl]="form.get('data').get('label')">
 	</mat-form-field>
-	<mat-form-field class="col-md-12">
-		<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-URL' | translate}}" [formControl]="this.form.get('data').get('url')">
-	</mat-form-field>
-	<mat-form-field class="col-md-3">
-		<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-OPTIONS-ROOT' | translate}}"
-		 [formControl]="this.form.get('data').get('optionsRoot')">
-	</mat-form-field>
-	<mat-form-field class="col-md-3">
-		<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-LABEL' | translate}}" [formControl]="this.form.get('data').get('autoCompleteOptions').get('label')">
-	</mat-form-field>
-	<mat-form-field class="col-md-3">
-		<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-VALUE' | translate}}" [formControl]="this.form.get('data').get('autoCompleteOptions').get('value')">
-	</mat-form-field>
-	<mat-form-field class="col-md-3">
-		<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-SOURCE' | translate}}" [formControl]="this.form.get('data').get('autoCompleteOptions').get('source')">
-	</mat-form-field>
-</div>
+
+	<h6 style="font-weight: bold" class="col-auto">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-SOURCE-TITLE' | translate}}</h6>
+	<button mat-raised-button type="button" class="col-auto" (click)="addSource()">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-ADD_SOURCE' | translate}}</button>
+	</div>
+
+	<div *ngFor="let singleForm of multiForm.controls; let i = index" class="row">
+		<mat-form-field class="col-12">
+			<mat-label>{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-TYPE' | translate}}</mat-label>
+			<mat-select [formControl]="singleForm.get('autoCompleteType')">
+				<mat-option [value]="0">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-TYPE-UNCACHED' | translate}}</mat-option>
+				<mat-option [value]="1">{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-TYPE-CACHED' | translate}}</mat-option>
+			</mat-select>
+		</mat-form-field>
+
+		<mat-form-field class="col-md-12">
+			<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-URL' | translate}}" [formControl]="this.singleForm.get('url')">
+		</mat-form-field>
+		<mat-form-field class="col-md-3">
+			<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-OPTIONS-ROOT' | translate}}"
+			[formControl]="this.singleForm.get('optionsRoot')">
+		</mat-form-field>
+		<mat-form-field class="col-md-3">
+			<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-LABEL' | translate}}" [formControl]="this.singleForm.get('autoCompleteOptions').get('label')">
+		</mat-form-field>
+		<mat-form-field class="col-md-3">
+			<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-VALUE' | translate}}" [formControl]="this.singleForm.get('autoCompleteOptions').get('value')">
+		</mat-form-field>
+		<mat-form-field class="col-md-3">
+			<input matInput placeholder="{{'DATASET-PROFILE-EDITOR.STEPS.FORM.FIELD.FIELDS.FIELD-AUTOCOMPLETE-SOURCE' | translate}}" [formControl]="this.singleForm.get('autoCompleteOptions').get('source')">
+		</mat-form-field>
+		<button mat-button type="button" (click)="removeSource(i)"><mat-icon>delete</mat-icon></button>
+	</div>
+

dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field-type/auto-complete/dataset-profile-editor-auto-complete-field.component.ts

@@ -1,7 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { FormGroup, FormArray, AbstractControl } from '@angular/forms';
 import { DatasetProfileComboBoxType } from '../../../../../../../core/common/enum/dataset-profile-combo-box-type';
 import { AutoCompleteFieldDataEditorModel } from '../../../../admin/field-data/auto-complete-field-data-editor-model';
+import { AutoCompleteSingleDataEditorModel } from '@app/ui/admin/dataset-profile/admin/field-data/auto-complete-single-data';
 
 @Component({
 	selector: 'app-dataset-profile-editor-auto-complete-field-component',
@@ -12,8 +13,18 @@ export class DatasetProfileEditorAutoCompleteFieldComponent implements OnInit {
 
 	@Input() form: FormGroup;
 	private data: AutoCompleteFieldDataEditorModel = new AutoCompleteFieldDataEditorModel();
+	multiForm: AbstractControl;
 
 	ngOnInit() {
+		this.multiForm = (<FormArray>this.form.get('data').get('autoCompleteSingleDataList'));
 		this.data.type = DatasetProfileComboBoxType.Autocomplete;
 	}
+
+	addSource() {
+		(<FormArray>this.multiForm).push(new AutoCompleteSingleDataEditorModel().buildForm());
+	}
+
+	removeSource(index: number) {
+		(<FormArray>this.multiForm).removeAt(index);
+	}
 }

dmp-frontend/src/assets/i18n/en.json

@@ -321,6 +321,11 @@
 						"FIELD-RADIO-BOX-VALUE": "Value",
 						"FIELD-AUTOCOMPLETE-TITLE": "Autocomplete Data",
 						"FIELD-AUTOCOMPLETE-PLACEHOLDER": "Input Placeholder",
+						"FIELD-AUTOCOMPLETE-SOURCE-TITLE": "Sources",
+						"FIELD-AUTOCOMPLETE-ADD_SOURCE": "Add Source",
+						"FIELD-AUTOCOMPLETE-TYPE": "Source Type",
+						"FIELD-AUTOCOMPLETE-TYPE-UNCACHED": "Uncached",
+						"FIELD-AUTOCOMPLETE-TYPE-CACHED": "Cached",
 						"FIELD-AUTOCOMPLETE-LABEL": "Label",
 						"FIELD-AUTOCOMPLETE-VALUE": "Value",
 						"FIELD-AUTOCOMPLETE-SOURCE": "Source",

dmp-frontend/src/assets/i18n/es.json

@@ -321,6 +321,11 @@
 						"FIELD-RADIO-BOX-VALUE": "Valor",
 						"FIELD-AUTOCOMPLETE-TITLE": "Datos autocompletado",
 						"FIELD-AUTOCOMPLETE-PLACEHOLDER": "Marcador de entrada",
+						"FIELD-AUTOCOMPLETE-SOURCE-TITLE": "Sources",
+						"FIELD-AUTOCOMPLETE-ADD_SOURCE": "Add Source",
+						"FIELD-AUTOCOMPLETE-TYPE": "Source Type",
+						"FIELD-AUTOCOMPLETE-TYPE-UNCACHED": "Uncached",
+						"FIELD-AUTOCOMPLETE-TYPE-CACHED": "Cached",
 						"FIELD-AUTOCOMPLETE-LABEL": "Etiqueta",
 						"FIELD-AUTOCOMPLETE-VALUE": "Valor",
 						"FIELD-AUTOCOMPLETE-SOURCE": "Fuente",

dmp-frontend/src/assets/i18n/gr.json

@@ -321,6 +321,11 @@
 						"FIELD-RADIO-BOX-VALUE": "Τιμή",
 						"FIELD-AUTOCOMPLETE-TITLE": "Αυτόματη Συμπλήρωση Δεδομένων",
 						"FIELD-AUTOCOMPLETE-PLACEHOLDER": "Τοποθέτηση placeholder",
+						"FIELD-AUTOCOMPLETE-SOURCE-TITLE": "Sources",
+						"FIELD-AUTOCOMPLETE-ADD_SOURCE": "Add Source",
+						"FIELD-AUTOCOMPLETE-TYPE": "Source Type",
+						"FIELD-AUTOCOMPLETE-TYPE-UNCACHED": "Uncached",
+						"FIELD-AUTOCOMPLETE-TYPE-CACHED": "Cached",
 						"FIELD-AUTOCOMPLETE-LABEL": "Ετικέτα",
 						"FIELD-AUTOCOMPLETE-VALUE": "Τιμή",
 						"FIELD-AUTOCOMPLETE-SOURCE": "Πηγή",
@@ -1248,4 +1253,4 @@
 		"DRAFT": "Πρόχειρα",
 		"FINALIZED": "Οριστικοποιημένα"
 	}
-}
+}