diff --git a/annotation-service/Dockerfile b/annotation-service/Dockerfile
index 1e0a28fda..b5c4d6f33 100644
--- a/annotation-service/Dockerfile
+++ b/annotation-service/Dockerfile
@@ -14,7 +14,7 @@ COPY annotation /build/annotation/
COPY annotation-web /build/annotation-web/
COPY settings.xml /root/.m2/settings.xml
RUN rm -f /build/annotation-web/src/main/resources/config/app.env
-RUN rm -f /build/annotation-web/src/main/resources/config/*-dev.yml
+RUN rm -f /build/annotation-web/src/main/resources/config/*-devel.yml
RUN rm -f /build/annotation-web/src/main/resources/logging/*.xml
RUN rm -f /build/annotation-web/src/main/resources/certificates/*.crt
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/annotationentitiestouch/AnnotationEntitiesTouchedIntegrationEventHandlerImpl.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/annotationentitiestouch/AnnotationEntitiesTouchedIntegrationEventHandlerImpl.java
index 9f88c1455..fa3c1d6e9 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/annotationentitiestouch/AnnotationEntitiesTouchedIntegrationEventHandlerImpl.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/annotationentitiestouch/AnnotationEntitiesTouchedIntegrationEventHandlerImpl.java
@@ -115,7 +115,7 @@ public class AnnotationEntitiesTouchedIntegrationEventHandlerImpl implements Ann
data.setCreatedAt(Instant.now());
data.setUpdatedAt(Instant.now());
data.setIsActive(IsActive.Active);
-
+ tenantEntityManager.persist(data);
}
updatedCreatedIds.add(data.getId());
}
diff --git a/annotation-service/pom.xml b/annotation-service/pom.xml
index 09052208a..47d35f3bb 100644
--- a/annotation-service/pom.xml
+++ b/annotation-service/pom.xml
@@ -180,19 +180,6 @@
-
- cite-dev
-
-
- cite-maven
- CITE Maven Repository
- https://crepo.cite.gr/repository/cite-maven/
-
-
-
- true
-
-
\ No newline at end of file
diff --git a/dmp-backend/Dockerfile b/dmp-backend/Dockerfile
index e88f1d175..faf300072 100644
--- a/dmp-backend/Dockerfile
+++ b/dmp-backend/Dockerfile
@@ -14,7 +14,7 @@ COPY core /build/core/
COPY web /build/web/
COPY settings.xml /root/.m2/settings.xml
RUN rm -f /build/web/src/main/resources/config/*-devel.yml
-RUN rm -f /build/annotation-web/src/main/resources/logging/*.xml
+RUN rm -f /build/web/src/main/resources/logging/*.xml
WORKDIR /build/
@@ -34,6 +34,6 @@ ARG REVISION
ENV SERVER_PORT=8080
EXPOSE ${SERVER_PORT}
-COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app.jar
+COPY --from=build-stage /build/web/target/web-${REVISION}.jar /app/app.jar
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=/files/config/", "-cp", "/app/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROFILE}", "-Dspring.config.additional-location=file:/config/", "-jar", "/app/app.jar"]
\ No newline at end of file
diff --git a/dmp-backend/core/pom.xml b/dmp-backend/core/pom.xml
index 9536dcc03..40c8add96 100644
--- a/dmp-backend/core/pom.xml
+++ b/dmp-backend/core/pom.xml
@@ -3,6 +3,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
+
+ core
+ ${revision}
+
eu.eudat
dmp-backend
@@ -10,13 +14,9 @@
../pom.xml
- eu.eudat
- core
- ${revision}
- ${packaging.type}
-
21
+ 21
21
21
UTF-8
diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java
index 8b4dc2036..b54eb3453 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/descriptiontemplate/SectionEntity.java
@@ -28,8 +28,6 @@ public class SectionEntity{
@XmlElementWrapper(name = "fieldSets")
@XmlElement(name = "fieldSet")
private List fieldSets;
- @XmlAttribute(name="multiplicity")
- private Boolean multiplicity;
public String getId() {
return id;
@@ -103,14 +101,6 @@ public class SectionEntity{
this.numbering = numbering;
}
- public Boolean getMultiplicity() {
- return multiplicity;
- }
-
- public void setMultiplicity(Boolean multiplicity) {
- this.multiplicity = multiplicity;
- }
-
public List getAllField(){
List fieldEntities = new ArrayList<>();
if (this.getFieldSets() != null){
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java
index cc42614d7..5956ad0ef 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/builder/commonmodels/descriptiontemplate/SectionCommonModelBuilder.java
@@ -53,7 +53,6 @@ public class SectionCommonModelBuilder extends BaseCommonModelBuilder {
if (fields.hasField(this.asIndexer(Section._description))) m.setDescription(d.getDescription());
if (fields.hasField(this.asIndexer(Section._ordinal))) m.setOrdinal(d.getOrdinal());
if (fields.hasField(this.asIndexer(Section._defaultVisibility))) m.setDefaultVisibility(d.isDefaultVisibility());
- if (fields.hasField(this.asIndexer(Section._multiplicity))) m.setMultiplicity(d.getMultiplicity());
if (fields.hasField(this.asIndexer(Section._numbering))) m.setNumbering(d.getNumbering());
if (fields.hasField(this.asIndexer(Section._title))) m.setTitle(d.getTitle());
if (fields.hasField(this.asIndexer(Section._extendedDescription))) m.setExtendedDescription(d.getExtendedDescription());
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
index a4222ce96..c83753c4f 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/descriptiontemplatedefinition/Section.java
@@ -14,9 +14,6 @@ public class Section {
public final static String _defaultVisibility = "defaultVisibility";
private Boolean defaultVisibility;
- public final static String _multiplicity = "multiplicity";
- private Boolean multiplicity;
-
public final static String _numbering = "numbering";
private String numbering; //TODO maybe remove
@@ -59,14 +56,6 @@ public class Section {
this.defaultVisibility = defaultVisibility;
}
- public Boolean getMultiplicity() {
- return multiplicity;
- }
-
- public void setMultiplicity(Boolean multiplicity) {
- this.multiplicity = multiplicity;
- }
-
public String getNumbering() {
return numbering;
}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionSectionToDatasetSectionMapper.java b/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionSectionToDatasetSectionMapper.java
index d698d16b2..723cccb3e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionSectionToDatasetSectionMapper.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/mapper/publicapi/DescriptionSectionToDatasetSectionMapper.java
@@ -19,7 +19,6 @@ public class DescriptionSectionToDatasetSectionMapper {
model.setOrdinal(section.getOrdinal());
model.setTitle(section.getTitle());
model.setSections(section.getSections().stream().map(x-> this.toPublicModel(x, page)).toList());
- model.setMultiplicity(section.getMultiplicity());
model.setDefaultVisibility(section.getDefaultVisibility());
model.setNumbering(section.getNumbering());
model.setPage("page_" + page);
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java
index 5591bf73c..4b742f4a6 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java
@@ -232,14 +232,6 @@ public class ReferencePersist {
@Override
protected List specifications(ReferencePersist item) {
return Arrays.asList(
- this.spec()
- .iff(() -> this.isValidGuid(item.getId()))
- .must(() -> this.isValidHash(item.getHash()))
- .failOn(ReferencePersist._hash).failWith(messageSource.getMessage("Validation_Required", new Object[]{ReferencePersist._hash}, LocaleContextHolder.getLocale())),
- this.spec()
- .iff(() -> !this.isValidGuid(item.getId()))
- .must(() -> !this.isValidHash(item.getHash()))
- .failOn(ReferencePersist._hash).failWith(messageSource.getMessage("Validation_OverPosting", new Object[]{}, LocaleContextHolder.getLocale())),
this.spec()
.must(() -> !this.isEmpty(item.getLabel()))
.failOn(ReferencePersist._label).failWith(messageSource.getMessage("Validation_Required", new Object[]{ReferencePersist._label}, LocaleContextHolder.getLocale())),
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java
index e56da9699..826f71fb1 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptiontemplatedefinition/SectionPersist.java
@@ -28,10 +28,6 @@ public class SectionPersist {
public static final String _defaultVisibility = "defaultVisibility";
- private Boolean multiplicity = null;
-
- public static final String _multiplicity = "multiplicity";
-
private String title = null;
public static final String _title = "title";
@@ -72,13 +68,6 @@ public class SectionPersist {
this.defaultVisibility = defaultVisibility;
}
- public Boolean getMultiplicity() {
- return multiplicity;
- }
-
- public void setMultiplicity(Boolean multiplicity) {
- this.multiplicity = multiplicity;
- }
public String getTitle() {
return title;
@@ -145,9 +134,6 @@ public class SectionPersist {
this.spec()
.must(() -> !this.isNull(item.getDefaultVisibility()))
.failOn(SectionPersist._defaultVisibility).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._defaultVisibility}, LocaleContextHolder.getLocale())),
- this.spec()
- .must(() -> !this.isNull(item.getMultiplicity()))
- .failOn(SectionPersist._multiplicity).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._multiplicity}, LocaleContextHolder.getLocale())),
this.spec()
.must(() -> !this.isEmpty(item.getTitle()))
.failOn(SectionPersist._title).failWith(messageSource.getMessage("Validation_Required", new Object[]{SectionPersist._title}, LocaleContextHolder.getLocale())),
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java
index c319fdab5..d35f4c5f7 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java
@@ -560,6 +560,7 @@ public class DescriptionServiceImpl implements DescriptionService {
if (referenceEntity == null){
referenceEntity = new ReferenceEntity();
referenceEntity.setId(UUID.randomUUID());
+ referenceEntity.setLabel(referencePersist.getLabel());
referenceEntity.setIsActive(IsActive.Active);
referenceEntity.setCreatedAt(Instant.now());
referenceEntity.setTypeId(fieldEntity.getReferenceTypeId());
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java
index df4232960..642ee889e 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/service/descriptiontemplate/DescriptionTemplateServiceImpl.java
@@ -316,7 +316,6 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
data.setDescription(persist.getDescription());
data.setOrdinal(persist.getOrdinal());
data.setDefaultVisibility(persist.getDefaultVisibility());
- data.setMultiplicity(persist.getMultiplicity());
data.setTitle(persist.getTitle());
if (!this.conventionService.isListNullOrEmpty(persist.getSections())) {
@@ -329,14 +328,14 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
if (!this.conventionService.isListNullOrEmpty(persist.getFieldSets())) {
data.setFieldSets(new ArrayList<>());
for (FieldSetPersist fieldSetPersist : persist.getFieldSets()) {
- data.getFieldSets().add(this.buildFieldSetEntity(fieldSetPersist, persist.getMultiplicity()));
+ data.getFieldSets().add(this.buildFieldSetEntity(fieldSetPersist));
}
}
return data;
}
- private @NotNull FieldSetEntity buildFieldSetEntity(FieldSetPersist persist, Boolean multiplicity) throws InvalidApplicationException {
+ private @NotNull FieldSetEntity buildFieldSetEntity(FieldSetPersist persist) throws InvalidApplicationException {
FieldSetEntity data = new FieldSetEntity();
if (persist == null)
return data;
@@ -348,7 +347,7 @@ public class DescriptionTemplateServiceImpl implements DescriptionTemplateServic
data.setNumbering(persist.getNumbering());
data.setAdditionalInformation(persist.getAdditionalInformation());
data.setExtendedDescription(persist.getExtendedDescription());
- if (persist.getMultiplicity() != null && multiplicity)
+ if (persist.getMultiplicity() != null)
data.setMultiplicity(this.buildMultiplicityEntity(persist.getMultiplicity()));
data.setHasCommentField(persist.getHasCommentField());
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 4aa20dc3b..8c21353a4 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -4,6 +4,7 @@
4.0.0
eu.eudat
dmp-backend
+ OpenDMP Backend Parent
${revision}
pom
@@ -14,8 +15,8 @@
- web
core
+ web
diff --git a/dmp-backend/web/pom.xml b/dmp-backend/web/pom.xml
index 79bf497ad..505adb18a 100644
--- a/dmp-backend/web/pom.xml
+++ b/dmp-backend/web/pom.xml
@@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- dmp-backend
web
${revision}
${packaging.type}
@@ -22,6 +21,7 @@
21
21
1.0.0-SNAPSHOT
+ jar
diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java
index 2e3cbed4d..d7df96fc9 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/publicapi/PublicDatasetsDescriptionDocumentation.java
@@ -166,7 +166,6 @@ public class PublicDatasetsDescriptionDocumentation {
String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._description),
String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._extendedDescription),
String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._title),
- String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._multiplicity),
String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._numbering),
String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._ordinal),
String.join(".", Description._descriptionTemplate, DescriptionTemplate._definition, Definition._pages, Page._sections, Section._sections),
diff --git a/dmp-frontend/src/app/core/services/reference/reference.service.ts b/dmp-frontend/src/app/core/services/reference/reference.service.ts
index 2cc3b9735..fdca0d1ea 100644
--- a/dmp-frontend/src/app/core/services/reference/reference.service.ts
+++ b/dmp-frontend/src/app/core/services/reference/reference.service.ts
@@ -124,8 +124,9 @@ export class ReferenceService {
filterFn: (searchQuery: string, data?: any) => this.searchWithDefinition(this.buildAutocompleteSearchLookup(typeId, searchQuery)).pipe(map(x => x)),
getSelectedItem: (selectedItem: any) => this.query(this.buildAutocompleteSearchSelectedItemsLookup([typeId], null, null, null, [selectedItem])).pipe(map(x => x.items[0])),
displayFn: (item: Reference) => item.label,
+ subtitleFn: (item: Reference) => item?.sourceType === ReferenceSourceType.External ? this.language.instant('REFERENCE-FIELD-COMPONENT.EXTERNAL-SOURCE') + ': ' + item.source : this.language.instant('REFERENCE-FIELD-COMPONENT.INTERNAL-SOURCE'),
titleFn: (item: Reference) => item.label,
- valueAssign: (item: Reference) => item.id,
+ valueAssign: (item: Reference) => item,
};
};
diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
index 7bc0d3bd1..1ad6f8c69 100644
--- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.component.ts
@@ -62,7 +62,6 @@ export class DmpEditorComponent extends BaseEditor implemen
isNew = true;
isDeleted = false;
- goToNextStep = true;
item: Dmp;
selectedBlueprint: DmpBlueprint;
step: number = 0;
@@ -224,10 +223,6 @@ export class DmpEditorComponent extends BaseEditor implemen
if (this.editorModel.status == DmpStatus.Finalized || this.isDeleted) {
this.formGroup.disable();
}
-
- if (this.item != null && this.goToNextStep) {
- this.nextStep();
- }
}
refreshData(): void {
@@ -346,11 +341,14 @@ export class DmpEditorComponent extends BaseEditor implemen
this.formGroup.get('blueprint').setValue(this.selectedBlueprint.id);
const goToNextStep: boolean = this.formGroup.get('label').valid && this.formGroup.get('description').valid;
- this.buildFormAfterBlueprintSelection(goToNextStep);
+ if (goToNextStep) {
+ this.buildFormAfterBlueprintSelection();
+ this.nextStep();
+ }
});
}
- private buildFormAfterBlueprintSelection(goToNextStep: boolean = true) {
+ private buildFormAfterBlueprintSelection() {
const dmp: Dmp = {
label: this.formGroup.get('label').value,
description: this.formGroup.get('description').value,
@@ -359,7 +357,6 @@ export class DmpEditorComponent extends BaseEditor implemen
}
this.prepareForm(dmp);
- this.goToNextStep = true; //reset
}
//
diff --git a/notification-service/Dockerfile b/notification-service/Dockerfile
index 744d0f133..e37a0f645 100644
--- a/notification-service/Dockerfile
+++ b/notification-service/Dockerfile
@@ -14,7 +14,7 @@ COPY notification /build/notification/
COPY notification-web /build/notification-web/
COPY settings.xml /root/.m2/settings.xml
RUN rm -f /build/notification-web/src/main/resources/config/app.env
-RUN rm -f /build/notification-web/src/main/resources/config/*-dev.yml
+RUN rm -f /build/notification-web/src/main/resources/config/*-devel.yml
RUN rm -f /build/notification-web/src/main/resources/logging/*.xml
RUN rm -f /build/notification-web/src/main/resources/certificates/*.crt