Merged dspace-cris-7 into CST-11738

4Science · Oct 25, 2023 · 72052ef · 72052ef
2 parents 5b4703a + e529855
commit 72052ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/...c/main/java/org/dspace/script2externalservices/CreateWorkspaceItemWithExternalSource.java b/...c/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<MetadataValueDTO> metadataList : metadataValueToAdd(wsItem.getItem())) {
                         addMetadata(wsItem.getItem(), metadataList);
                     }

diff --git a/...er-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java b/...er-webapp/src/test/java/org/dspace/app/rest/CreateWorkspaceItemFromExternalServiceIT.java
@@ -8,6 +8,7 @@
 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;
@@ -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)));
     }
 

diff --git 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

diff --git a/dspace/config/spring/api/deduplication.xml b/dspace/config/spring/api/deduplication.xml
@@ -33,6 +33,7 @@
 		<property name="metadata" value="dc.identifier.arxiv" />
 		<property name="resourceTypeID" value="2" />
 		<property name="prefix" value="arxiv:"/>
+		<property name="useEntityType" value="false"/>
 		<!-- remember to add the prefix to the ignoreprefix list -->
 		<property name="ignorePrefix">
 			<list>
@@ -48,20 +49,23 @@
 		<property name="metadata" value="dc.identifier.isi" />
 		<property name="resourceTypeID" value="2" />
 		<property name="prefix" value="isi:"/>
+		<property name="useEntityType" value="false"/>
 	</bean>
 
 	<bean class="org.dspace.app.deduplication.utils.MD5ValueSignature" name="ScopusSignature">
 		<property name="signatureType" value="identifier" />
 		<property name="metadata" value="dc.identifier.scopus" />
 		<property name="resourceTypeID" value="2" />
 		<property name="prefix" value="scopus:"/>
+		<property name="useEntityType" value="false"/>
 	</bean>
 
 	<bean class="org.dspace.app.deduplication.utils.MD5ValueSignature" name="PubmedIDSignature">
 		<property name="signatureType" value="identifier" />
 		<property name="metadata" value="dc.identifier.pmid" />
 		<property name="resourceTypeID" value="2" />
 		<property name="prefix" value="pmid:"/>
+		<property name="useEntityType" value="false"/>
 		<!-- remember to add the prefix to the ignoreprefix list -->
 		<property name="ignorePrefix">
 			<list>
@@ -78,6 +82,7 @@
 		<property name="metadata" value="dc.identifier.doi" />
 		<property name="resourceTypeID" value="2" />
 		<property name="prefix" value="doi:"/>
+		<property name="useEntityType" value="false"/>
 		<!-- remember to add the prefix to the ignoreprefix list -->
 		<property name="ignorePrefix">
 			<list>