From b9f5bf9f8972a74bcb8adfa3656109a37d3b2722 Mon Sep 17 00:00:00 2001 From: eskander Date: Mon, 6 Feb 2023 14:38:46 +0200 Subject: [PATCH 1/4] [DSC-879] Identifiers Signature should check all item types --- dspace/config/spring/api/deduplication.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dspace/config/spring/api/deduplication.xml b/dspace/config/spring/api/deduplication.xml index bdf2747f47b3..7dd4f1e7bd20 100644 --- a/dspace/config/spring/api/deduplication.xml +++ b/dspace/config/spring/api/deduplication.xml @@ -33,6 +33,7 @@ + @@ -48,6 +49,7 @@ + @@ -55,6 +57,7 @@ + @@ -62,6 +65,7 @@ + @@ -78,6 +82,7 @@ + From f8149bbeb2adc46ffad4b84f08934216a36e0e90 Mon Sep 17 00:00:00 2001 From: "aliaksei.bykau" Date: Mon, 9 Oct 2023 16:02:40 +0200 Subject: [PATCH 2/4] [DSC-1282] added addDepositLicense to CreateWorkspaceItemWithExternalSource#fillWorkspaceItems. Added new check for test CreateWorkspaceItemFromExternalServiceIT#creatingWorkspaceItemImportedFromScopusTest --- .../CreateWorkspaceItemWithExternalSource.java | 3 +++ .../app/rest/CreateWorkspaceItemFromExternalServiceIT.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java b/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java index 2872ee19d125..7f8cf9e0772e 100644 --- a/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java +++ b/dspace-api/src/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java @@ -37,6 +37,7 @@ import org.dspace.content.MetadataValue; import org.dspace.content.WorkspaceItem; import org.dspace.content.dto.MetadataValueDTO; +import org.dspace.content.packager.PackageUtils; import org.dspace.core.Context; import org.dspace.discovery.DiscoverQuery; import org.dspace.discovery.DiscoverQuery.SORT_ORDER; @@ -287,6 +288,8 @@ private int fillWorkspaceItems(Context context, int record, LiveImportDataProvid if (!exist(dataObject.getMetadata())) { WorkspaceItem wsItem = externalDataService.createWorkspaceItemFromExternalDataObject(context, dataObject, this.collection); + Item itemFromWs = wsItem.getItem(); + PackageUtils.addDepositLicense(context, null, itemFromWs, wsItem.getCollection()); for (List metadataList : metadataValueToAdd(wsItem.getItem())) { addMetadata(wsItem.getItem(), metadataList); } diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java index 79253dcc6dee..2750dc01193c 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java @@ -12,6 +12,7 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.containsString; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; @@ -199,6 +200,8 @@ public void creatingWorkspaceItemImportedFromScopusTest() throws Exception { + ".traditionalpageone['dc.identifier.scopus'][0].value", is(scopus2R.getValue()))) .andExpect(jsonPath("$._embedded.workflowitems[1].sections" + ".traditionalpageone['dc.identifier.doi'][0].value", is(doi2R.getValue()))) + .andExpect(jsonPath("$._embedded.workflowitems[0].sections.license.url", + containsString("/api/core/bitstreams/"))) .andExpect(jsonPath("$.page.totalElements", is(2))); } From 1d485d1bf8025e630003bbc39508cbe379a2072d Mon Sep 17 00:00:00 2001 From: "aliaksei.bykau" Date: Fri, 13 Oct 2023 10:17:30 +0200 Subject: [PATCH 3/4] [DSC-1282] checkstyle fixes --- .../app/rest/CreateWorkspaceItemFromExternalServiceIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java index 2750dc01193c..19100f722333 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java @@ -8,11 +8,11 @@ package org.dspace.app.rest; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.containsString; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; From 47a4e75c8b73567dc90ba8663059dc24b8907d45 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Tue, 17 Oct 2023 15:56:25 +0200 Subject: [PATCH 4/4] [DSC-552] Fix plumx popup position in item page --- dspace/config/modules/metrics.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace/config/modules/metrics.cfg b/dspace/config/modules/metrics.cfg index f8521db34ec7..0bdaaa25967a 100644 --- a/dspace/config/modules/metrics.cfg +++ b/dspace/config/modules/metrics.cfg @@ -103,7 +103,7 @@ plumx.data-no-thumbnail = false plumx.data-no-artifacts = false # properties for publication widget -plumx.data-popup = left +plumx.data-popup = bottom plumx.data-hide-when-empty = true plumx.data-hide-usage = false plumx.data-hide-captures = false