Merged in task/dspace-cris-2023_02_x/DSC-1630 (pull request DSpace#2813)

Added searchFilterEntityType to configuration used by the mydspace page Approved-by: Vincenzo Mecca
4Science · Oct 1, 2024 · ff0a459 · ff0a459
2 parents 39c9ef1 + 01e3b5c
commit ff0a459
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/...ce-api/src/main/java/org/dspace/content/integration/crosswalks/script/BulkItemExport.java b/...ce-api/src/main/java/org/dspace/content/integration/crosswalks/script/BulkItemExport.java
@@ -43,9 +43,11 @@
 import org.dspace.discovery.configuration.DiscoveryConfiguration;
 import org.dspace.discovery.configuration.DiscoveryConfigurationService;
 import org.dspace.discovery.configuration.DiscoveryRelatedItemConfiguration;
+import org.dspace.discovery.indexobject.IndexableClaimedTask;
 import org.dspace.discovery.indexobject.IndexableCollection;
 import org.dspace.discovery.indexobject.IndexableCommunity;
 import org.dspace.discovery.indexobject.IndexableItem;
+import org.dspace.discovery.indexobject.IndexablePoolTask;
 import org.dspace.discovery.indexobject.IndexableWorkflowItem;
 import org.dspace.discovery.indexobject.IndexableWorkspaceItem;
 import org.dspace.discovery.utils.DiscoverQueryBuilder;
@@ -276,7 +278,8 @@ private DiscoverResultItemIterator searchItemsToExport(int maxResults, boolean o
     private DiscoverQuery buildDiscoveryQuery(DiscoveryConfiguration discoveryConfiguration,
         IndexableObject<?, ?> scope, boolean onlyPublic) throws SQLException, SearchServiceException {
 
-        List<String> dsoTypes = List.of(IndexableItem.TYPE, IndexableWorkspaceItem.TYPE, IndexableWorkflowItem.TYPE);
+        List<String> dsoTypes = List.of(IndexableItem.TYPE, IndexableWorkspaceItem.TYPE, IndexableWorkflowItem.TYPE,
+            IndexablePoolTask.TYPE, IndexableClaimedTask.TYPE);
 
         String sortBy = null;
         String sortOrder = null;

diff --git a/dspace-api/src/main/java/org/dspace/discovery/DiscoverResultItemIterator.java b/dspace-api/src/main/java/org/dspace/discovery/DiscoverResultItemIterator.java
@@ -11,7 +11,9 @@
 
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.discovery.indexobject.IndexableClaimedTask;
 import org.dspace.discovery.indexobject.IndexableItem;
+import org.dspace.discovery.indexobject.IndexablePoolTask;
 import org.dspace.discovery.indexobject.IndexableWorkflowItem;
 import org.dspace.discovery.indexobject.IndexableWorkspaceItem;
 
@@ -61,6 +63,14 @@ public Item next() {
             return ((IndexableWorkspaceItem) nextIndexableObject).getIndexedObject().getItem();
         }
 
+        if (IndexablePoolTask.TYPE.equals(objectType)) {
+            return ((IndexablePoolTask) nextIndexableObject).getIndexedObject().getWorkflowItem().getItem();
+        }
+
+        if (IndexableClaimedTask.TYPE.equals(objectType)) {
+            return ((IndexableClaimedTask) nextIndexableObject).getIndexedObject().getWorkflowItem().getItem();
+        }
+
         throw new IllegalStateException("Invalid object type for discover item iterator:" + objectType);
     }
 

diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
@@ -783,6 +783,7 @@
                 <ref bean="searchFilterObjectNamedType" />
                 <ref bean="searchFilterType" />
                 <ref bean="searchFilterIssued" />
+                <ref bean="searchFilterEntityType" />
             </list>
         </property>
         <!--The sort filters for the discovery search-->
@@ -854,6 +855,7 @@
                 <ref bean="searchFilterObjectNamedType" />
                 <ref bean="searchFilterType" />
                 <ref bean="searchFilterIssued" />
+                <ref bean="searchFilterEntityType" />
             </list>
         </property>
         <!--The sort filters for the discovery search-->
@@ -929,6 +931,7 @@
                 <ref bean="searchFilterObjectNamedType" />
                 <ref bean="searchFilterType" />
                 <ref bean="searchFilterIssued" />
+                <ref bean="searchFilterEntityType" />
             </list>
         </property>
         <!--The sort filters for the discovery search-->
@@ -1007,6 +1010,7 @@
                 <ref bean="searchFilterType" />
                 <ref bean="searchFilterIssued" />
                 <ref bean="searchFilterSubmitter" />
+                <ref bean="searchFilterEntityType" />
             </list>
         </property>
         <!--The sort filters for the discovery search-->