diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java index 905ac88e3..1e0c39925 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java @@ -190,10 +190,6 @@ public class Admin extends BaseController { .status(ApiMessageCode.SUCCESS_MESSAGE).message("")); } - @RequestMapping(method = RequestMethod.GET, value = {"/getRDACommonStandards"}, produces = "application/json") - public ResponseEntity getRDACommonStandards(@ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) { - return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem>().status(ApiMessageCode.SUCCESS_MESSAGE).payload(configLoader.getRdaProperties())); - } @RequestMapping(method = RequestMethod.GET, value = {"/getSchematics"}, produces = "application/json") public ResponseEntity>> getSchematics(@RequestParam(value = "query", required = false) String query, @ClaimedAuthorities(claims = {ADMIN, DATASET_PROFILE_MANAGER}) Principal principal) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java index 7f12daa06..73966417c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/proxy/config/configloaders/ConfigLoader.java @@ -10,7 +10,6 @@ import java.util.Map; public interface ConfigLoader { ExternalUrls getExternalUrls(); - List getRdaProperties(); List getSchematics(); XWPFDocument getDocument(); XWPFDocument getDatasetDocument(); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java index 7f4442e5f..60f2da9e1 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java @@ -164,11 +164,6 @@ public class ExportXmlBuilderDatasetProfile { numbering.setTextContent(field.getNumbering()); elementField.appendChild(numbering); } - if (field.getRdaProperty() != null) { - Element rdaProperty = element.createElement("rdaProperty"); - rdaProperty.setTextContent(field.getRdaProperty()); - elementField.appendChild(rdaProperty); - } if (field.getSchematics() != null) { Element schematics = element.createElement("schematics"); field.getSchematics().forEach(schematic -> { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java index e6527bc9f..f6436a446 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java @@ -29,8 +29,6 @@ public class Field { private Object data; - private String rdaProperty; - private Schematics schematics; @XmlAttribute(name = "id") @@ -105,15 +103,6 @@ public class Field { this.data = data; } - @XmlElement(name = "rdaProperty") - public String getRdaProperty() { - return rdaProperty; - } - - public void setRdaProperty(String rdaProperty) { - this.rdaProperty = rdaProperty; - } - @XmlElement(name = "schematics") public Schematics getSchematics() { return schematics; @@ -141,7 +130,6 @@ public class Field { if (data != null) { fieldEntity.setData(data.toMap((Element) this.data)); } - fieldEntity.setRdaCommonStandard(this.rdaProperty); List schematicsList = new LinkedList<>(); if (this.schematics != null && this.schematics.getSchematics() != null) { for (Schematic schematic : this.schematics.getSchematics()) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java index 2d1e053c3..63bd89b6d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/admin/components/datasetprofile/Field.java @@ -45,7 +45,6 @@ public class Field implements ViewStyleDefinition schematics; private String value; private ViewStyle viewStyle; @@ -71,12 +70,6 @@ public class Field implements ViewStyleDefinition getSchematics() { return schematics; @@ -160,7 +153,6 @@ public class Field implements ViewStyleDefinition { private String id; private int ordinal; - private String rdaCommonStandard; private List schematics; private String numbering; private ViewStyle viewStyle; @@ -43,13 +42,6 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable getSchematics() { return schematics; } @@ -113,14 +105,13 @@ public class Field implements DatabaseViewStyleDefinition, XmlSerializable(); Element schematics = (Element) XmlBuilder.getNodeFromListByTagName(element.getChildNodes(), "schematics"); if(schematics != null){ diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java index 2205e9f18..46f11ded7 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/user/components/datasetprofile/Field.java @@ -39,7 +39,6 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin private List multiplicityItems; private List validations; private Visibility visible; - private String rdaProperty; private List schematics; private Boolean export; @@ -155,14 +154,6 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin this.numbering = numbering; } - public String getRdaProperty() { - return rdaProperty; - } - - public void setRdaProperty(String rdaProperty) { - this.rdaProperty = rdaProperty; - } - public List getSchematics() { return schematics; } @@ -190,7 +181,6 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin newField.defaultValue = this.defaultValue; newField.data = this.data; newField.validations = this.validations; - newField.rdaProperty = this.rdaProperty; newField.schematics = this.schematics; newField.numbering = "mult" + index + "_" + this.numbering; newField.export = this.export; @@ -206,7 +196,6 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin field.setDefaultValue(this.defaultValue); field.setVisible(this.visible); field.setValidations(this.validations); - field.setRdaCommonStandard(this.rdaProperty); field.setSchematics(this.schematics); field.setExport(this.export); return field; @@ -222,7 +211,6 @@ public class Field implements Comparable, PropertiesModelBuilder, ViewStyleDefin this.defaultValue = item.getDefaultValue(); this.visible = item.getVisible(); this.validations = item.getValidations(); - this.rdaProperty = item.getRdaCommonStandard(); this.schematics = item.getSchematics(); this.export = item.getExport(); } diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties index cf3de51df..5d3aca18b 100644 --- a/dmp-backend/web/src/main/resources/config/application-devel.properties +++ b/dmp-backend/web/src/main/resources/config/application-devel.properties @@ -23,7 +23,6 @@ pdf.converter.url=http://localhost:3000/ ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## configuration.externalUrls=externalUrls/ExternalUrls.xml -configuration.rda=RDACommonStandards.txt configuration.schematics=Schematics.json configuration.h2020template=documents/h2020.docx configuration.h2020datasettemplate=documents/h2020_dataset.docx diff --git a/dmp-backend/web/src/main/resources/config/application-docker.properties b/dmp-backend/web/src/main/resources/config/application-docker.properties index 53d24cdb3..075203f35 100644 --- a/dmp-backend/web/src/main/resources/config/application-docker.properties +++ b/dmp-backend/web/src/main/resources/config/application-docker.properties @@ -23,7 +23,6 @@ pdf.converter.url=http://opendmp-pdf:3000/ ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## configuration.externalUrls=externalUrls/ExternalUrls.xml -configuration.rda=RDACommonStandards.txt configuration.h2020template=documents/h2020.docx configuration.h2020datasettemplate=documents/h2020_dataset.docx configuration.configurable_login_providers=configurableLoginProviders.json diff --git a/dmp-backend/web/src/main/resources/config/application-production.properties b/dmp-backend/web/src/main/resources/config/application-production.properties index 296798080..61118ce55 100644 --- a/dmp-backend/web/src/main/resources/config/application-production.properties +++ b/dmp-backend/web/src/main/resources/config/application-production.properties @@ -17,7 +17,6 @@ pdf.converter.url=http://docsbox-web/ ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## configuration.externalUrls=externalUrls/ExternalUrls.xml -configuration.rda=RDACommonStandards.txt configuration.h2020template=documents/h2020.docx configuration.h2020datasettemplate=documents/h2020_dataset.docx configuration.configurable_login_providers=ConfigurableLoginProviders.json diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties index ad3562d79..36a28a8bb 100644 --- a/dmp-backend/web/src/main/resources/config/application.properties +++ b/dmp-backend/web/src/main/resources/config/application.properties @@ -49,7 +49,6 @@ elasticsearch.certKey= ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## configuration.externalUrls=externalUrls/ExternalUrls.xml -configuration.rda=RDACommonStandards.txt configuration.schematics=Schematics.json configuration.h2020template=documents/h2020.docx configuration.h2020datasettemplate=documents/h2020_dataset.docx diff --git a/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts b/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts index c676f56e6..8f8ec30d7 100644 --- a/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts +++ b/dmp-frontend/src/app/core/model/admin/dataset-profile/dataset-profile.ts @@ -59,7 +59,6 @@ export interface Field { data: any; visible: Visibility; validations: ValidationType[]; - rdaCommonStandard: string; schematics: string[]; export: boolean; } diff --git a/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts b/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts index 8aa031baa..a62b3beaa 100644 --- a/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts +++ b/dmp-frontend/src/app/core/services/dataset-profile/dataset-profile.service.ts @@ -19,9 +19,6 @@ import { ConfigurationService } from '../configuration/configuration.service'; @Injectable() export class DatasetProfileService extends BaseService { - private rdaCommonStandards: String[]; - private rdaCommonStandardsLoading: boolean; - private actionUrl: string; private headers = new HttpHeaders(); @@ -78,19 +75,6 @@ export class DatasetProfileService extends BaseService { return this.http.post(this.actionUrl + "upload", formData, { params: params }); } - getRDACommonStandards(): String[] { - if (!this.rdaCommonStandards && !this.rdaCommonStandardsLoading) { this.getRDACommonStandardsInternal(); } - return this.rdaCommonStandards; - } - - private getRDACommonStandardsInternal() { - this.rdaCommonStandardsLoading = true; - return this.http.get(this.actionUrl + "getRDACommonStandards").pipe(takeUntil(this._destroyed)).subscribe(x => { - this.rdaCommonStandards = x; - this.rdaCommonStandardsLoading = false; - }); - } - searchSchematics(like: string): Observable { return this.http.get(this.actionUrl + "getSchematics?query=" + like); } diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts index 0e57f4172..2ef81df2e 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/admin/field-editor-model.ts @@ -47,7 +47,6 @@ export class FieldEditorModel extends BaseFormModel { public visible: VisibilityEditorModel = new VisibilityEditorModel(); public data: FieldDataEditorModel; public validations: ValidationType[] = []; - public rdaCommonStandard: string; public schematics: string[]; public export: boolean = true; @@ -59,7 +58,6 @@ export class FieldEditorModel extends BaseFormModel { this.validations = item.validations; this.viewStyle = new ViewStyleEditorModel().fromModel(item.viewStyle); this.visible = new VisibilityEditorModel().fromModel(item.visible); - this.rdaCommonStandard = item.rdaCommonStandard; this.schematics = item.schematics; this.export = item.export; @@ -107,7 +105,6 @@ export class FieldEditorModel extends BaseFormModel { page: [{ value: this.page, disabled: (disabled && !skipDisable.includes('FieldEditorModel.page')) }], ordinal: [{ value: this.ordinal, disabled: (disabled && !skipDisable.includes('FieldEditorModel.ordinal')) }], validations: [{ value: this.validations, disabled: (disabled && !skipDisable.includes('FieldEditorModel.validations')) }], - rdaCommonStandard: [{value: this.rdaCommonStandard, disabled: (disabled && !skipDisable.includes('FieldSetEditorModel.rdaCommonStandard')) }], schematics: [{ value: this.schematics, disabled: (disabled && !skipDisable.includes('FieldEditorModel.schematics')) }], export: [{value: this.export, disabled: (disabled && !skipDisable.includes('FieldSetEditorModel.export'))}] }); diff --git a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts index 9b68efc11..1fe1f6a81 100644 --- a/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts +++ b/dmp-frontend/src/app/ui/admin/dataset-profile/editor/components/field/dataset-profile-editor-field.component.ts @@ -72,9 +72,6 @@ export class DatasetProfileEditorFieldComponent extends BaseComponent implements @Output() delete = new EventEmitter(); - - //rdaCommonStandards = this.datasetProfileService.getRDACommonStandards(); //GK: Don't do that again. The service has a weird async behaviour. - schematicsAutoCompleteConfiguration: MultipleAutoCompleteConfiguration = { filterFn: this.filterSchematics.bind(this), initialItems: (excludedItems: any[]) => this.filterSchematics('').pipe(map(result => result.filter(resultItem => (excludedItems || []).map(x => x !== resultItem)))), diff --git a/dmp-frontend/src/assets/resources/skipDisable.json b/dmp-frontend/src/assets/resources/skipDisable.json index 74d60d5df..b0d92f82e 100644 --- a/dmp-frontend/src/assets/resources/skipDisable.json +++ b/dmp-frontend/src/assets/resources/skipDisable.json @@ -11,7 +11,6 @@ "FreeTextFieldDataEditorModel.label", "WordListFieldDataEditorModel.label", "FieldDataOptionEditorModel.label", - "FieldSetEditorModel.rdaCommonStandard", "FieldSetEditorModel.schematics", "FieldSetEditorModel.export" ]