From 72ba5031a33f66b6f70945a01ea8a9ffb406bd93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20M=C4=85dry?= <madryk@icm.edu.pl>
Date: Wed, 22 Jan 2025 13:37:06 +0100
Subject: [PATCH 1/3] Allow to perform action inside search results dataTable

---
 .../iq/dataverse/search/LastSearchValue.java  | 35 +++++++++++++++++++
 .../search/SearchIncludeFragment.java         |  2 ++
 .../main/webapp/search-include-fragment.xhtml | 34 +++++++++---------
 3 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/LastSearchValue.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/LastSearchValue.java
index a1e0bbf427..29bdb4185e 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/LastSearchValue.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/LastSearchValue.java
@@ -9,6 +9,13 @@
 
 import edu.harvard.iq.dataverse.search.response.SolrSearchResult;
 
+/**
+ * Results of the last performed search by the user.
+ * Existence of this bean is needed since {@link SearchIncludeFragment}
+ * bean is request scoped. When we perform some action on the search page
+ * (for example clicking on some button) we sometimes still need for search
+ * results to be present in the jsf context.
+ */
 @SessionScoped
 @Named("lastSearchValue")
 public class LastSearchValue implements Serializable {
@@ -16,14 +23,42 @@ public class LastSearchValue implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private List<SolrSearchResult> searchResultsList = new ArrayList<>();
+    private boolean rootDv;
+    private long dataverseId;
 
     public List<SolrSearchResult> getSearchResultsList() {
 
         return this.searchResultsList;
     }
 
+    /**
+     * Returns true if last search was inside root dataverse
+     */
+    public boolean isRootDv() {
+
+        return rootDv;
+    }
+
+    /**
+     * Returns id of dataverse from which last search was performed
+     */
+    public long getDataverseId() {
+
+        return dataverseId;
+    }
+
     public void setSearchResultsList(List<SolrSearchResult> searchResultsList) {
 
         this.searchResultsList = searchResultsList;
     }
+
+    public void setRootDv(boolean rootDv) {
+
+        this.rootDv = rootDv;
+    }
+
+    public void setDataverseId(long dataverseId) {
+
+        this.dataverseId = dataverseId;
+    }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
index 69baf7c5f7..9832c1b34a 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
@@ -442,6 +442,8 @@ public void search(Dataverse dataverse) {
         setDisplayCardValues(dataversePath);
         
         this.lastSearchValue.setSearchResultsList(searchResultsList);
+        this.lastSearchValue.setRootDv(dataverse.isRoot());
+        this.lastSearchValue.setDataverseId(dataverse.getId());
     }
     
     public StreamedContent getSearchResultsFile() {
diff --git a/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml b/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
index ca33874e24..bd76684679 100644
--- a/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
+++ b/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
@@ -180,7 +180,7 @@
                                             <h:outputText styleClass="sr-only" value=" #{facetCategory.displayName}: #{bundle['dataverse.search.filters.remove.screenReaderPostfix']}" />
 
                                             <span class="glyphicon glyphicon-remove"></span>
-                                            <f:param name="q" value="#{SearchIncludeFragment.query}"/>
+                                            <f:param name="q" value="#{lastSearchValuement.query}"/>
                                             <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
                                                 <f:param name="fq#{status.index}" value='#{clickedFilterQuery}' disable="#{clickedFilterQuery == facetLabel.filterQuery}"/>
                                             </c:forEach>
@@ -450,18 +450,18 @@
                     <o:importFunctions type="org.omnifaces.el.functions.Strings" />
                     <ui:param name="descriptionAbbreviationThreshold" value="280"/>
                     <!--CARDS-->
-                    <h:dataTable id="resultsTable" value="#{SearchIncludeFragment.searchResultsList}" var="result"
-                                 rendered="#{!(empty SearchIncludeFragment.searchResultsList)}">
+                    <h:dataTable id="resultsTable" value="#{lastSearchValue.searchResultsList}" var="result"
+                                 rendered="#{!(empty lastSearchValue.searchResultsList)}">
                         <h:column>
                             <!--DATAVERSE CARDS-->
                             <div class="dataverseResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" jsf:rendered="#{result.type eq searchObjectTypeEnum.DATAVERSES}">
                                 <c:set var="dvUrl" value="/dataverse/#{result.dataverseAlias}"/>
                                 <c:set var="dvUrlFinal" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" />
-                                <c:set var="dvCardUrlsTarget" value="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}" />
-                                <c:set var="dvIsLinked" value="#{!SearchIncludeFragment.rootDv and !result.isInTree}" />
+                                <c:set var="dvCardUrlsTarget" value="#{!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}" />
+                                <c:set var="dvIsLinked" value="#{!lastSearchValue.rootDv and !result.isInTree}" />
 
                                 <c:set var="dvParentUrl" value="/dataverse/#{result.dataverseParentAlias}"/>
-                                <c:set var="dvParentUrlFinal" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvParentUrl : widgetWrapper.wrapURL(dvParentUrl)}"/>
+                                <c:set var="dvParentUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? dvParentUrl : widgetWrapper.wrapURL(dvParentUrl)}"/>
 
 
                                 <div class="card-preview-icon-block text-center">
@@ -493,7 +493,7 @@
 
                                     <h:outputText value="#{dv:formatDate(result.releaseOrCreateDate)}" styleClass="text-muted" style="margin-right:.5em;"/>
 
-                                    <h:outputLink value="#{dvParentUrlFinal}" target="#{dvCardUrlsTarget}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
+                                    <h:outputLink value="#{dvParentUrlFinal}" target="#{dvCardUrlsTarget}" rendered="#{result.parent.id != lastSearchValue.dataverseId}">
                                         <h:outputText value="#{bundle.dataverse}" styleClass="sr-only" />
                                         <h:outputText value="#{result.parent.name}"/>
                                     </h:outputLink>
@@ -520,12 +520,12 @@
                             </div>
                             <!--DATASET CARDS-->
                             <div class="datasetResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" jsf:rendered="#{result.type eq searchObjectTypeEnum.DATASETS}">
-                                <c:set var="dsUrlFinal" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" />
-                                <c:set var="dsCardUrlsTarget" value="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
-                                <c:set var="dsIsLinked" value="#{!SearchIncludeFragment.rootDv and !result.isInTree}" />
+                                <c:set var="dsUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" />
+                                <c:set var="dsCardUrlsTarget" value="#{(!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
+                                <c:set var="dsIsLinked" value="#{!lastSearchValue.rootDv and !result.isInTree}" />
 
                                 <c:set var="dsParentUrl" value="/dataverse/#{result.dataverseAlias}"/>
-                                <c:set var="dsParentUrlFinal" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dsParentUrl : widgetWrapper.wrapURL(dvParentAlias)}"/>
+                                <c:set var="dsParentUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? dsParentUrl : widgetWrapper.wrapURL(dvParentAlias)}"/>
 
 
                                 <div class="card-preview-icon-block text-center">
@@ -558,9 +558,9 @@
 
                                     <h:outputText styleClass="text-muted" value="#{dv:formatDate(result.releaseOrCreateDate)}"/>
 
-                                    <h:outputText styleClass="text-muted" value=" - " rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}"/>
+                                    <h:outputText styleClass="text-muted" value=" - " rendered="#{result.parent.id != lastSearchValue.dataverseId}"/>
 
-                                    <h:outputLink value="#{dsParentUrl}" target="#{dsCardUrlsTarget}" rendered="#{result.parent.id != SearchIncludeFragment.dataverse.id}">
+                                    <h:outputLink value="#{dsParentUrl}" target="#{dsCardUrlsTarget}" rendered="#{result.parent.id != lastSearchValue.dataverseId}">
                                         <h:outputText value="#{bundle.dataverse}" styleClass="sr-only" />
                                         <h:outputText value="#{result.parent.name}"/>
                                     </h:outputLink>
@@ -596,11 +596,11 @@
                             </div>
                             <!--FILE CARDS-->
                             <div class="fileResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" jsf:rendered="#{result.type eq searchObjectTypeEnum.FILES}">
-                                <c:set var="fileUrlFinal" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" />
-                                <c:set var="fileCardUrlsTarget" value="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
-                                <c:set var="fileIsLinked" value="#{!SearchIncludeFragment.rootDv and !result.isInTree}" />
+                                <c:set var="fileUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" />
+                                <c:set var="fileCardUrlsTarget" value="#{(!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" />
+                                <c:set var="fileIsLinked" value="#{!lastSearchValue.rootDv and !result.isInTree}" />
 
-                                <c:set var="fileParentUrlFinal" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.fileDatasetUrl : widgetWrapper.wrapURL(result.fileDatasetUrl)}"/>
+                                <c:set var="fileParentUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? result.fileDatasetUrl : widgetWrapper.wrapURL(result.fileDatasetUrl)}"/>
 
                                 <div class="card-preview-icon-block text-center">
                                     <a href="#{fileUrlFinal}" target="#{fileCardUrlsTarget}" tabindex="-1"

From 8679d003a5a8e0e5eba8add563add55cdffe8c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20M=C4=85dry?= <madryk@icm.edu.pl>
Date: Fri, 24 Jan 2025 11:11:57 +0100
Subject: [PATCH 2/3] cr response

---
 dataverse-webapp/src/main/webapp/search-include-fragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml b/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
index bd76684679..f64456bcd6 100644
--- a/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
+++ b/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
@@ -180,7 +180,7 @@
                                             <h:outputText styleClass="sr-only" value=" #{facetCategory.displayName}: #{bundle['dataverse.search.filters.remove.screenReaderPostfix']}" />
 
                                             <span class="glyphicon glyphicon-remove"></span>
-                                            <f:param name="q" value="#{lastSearchValuement.query}"/>
+                                            <f:param name="q" value="#{SearchIncludeFragment.query}"/>
                                             <c:forEach items="#{SearchIncludeFragment.filterQueries}" var="clickedFilterQuery" varStatus="status">
                                                 <f:param name="fq#{status.index}" value='#{clickedFilterQuery}' disable="#{clickedFilterQuery == facetLabel.filterQuery}"/>
                                             </c:forEach>

From 74cc4a3a461b3753a3d5ed18d91ab855b6730169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20M=C4=85dry?= <madryk@icm.edu.pl>
Date: Wed, 29 Jan 2025 12:00:42 +0100
Subject: [PATCH 3/3] cr response

---
 dataverse-webapp/src/main/webapp/search-include-fragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml b/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
index f64456bcd6..4c6237cbe2 100644
--- a/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
+++ b/dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
@@ -456,7 +456,7 @@
                             <!--DATAVERSE CARDS-->
                             <div class="dataverseResult clearfix #{result.unpublishedState ? 'unpublished' : ''}" jsf:rendered="#{result.type eq searchObjectTypeEnum.DATAVERSES}">
                                 <c:set var="dvUrl" value="/dataverse/#{result.dataverseAlias}"/>
-                                <c:set var="dvUrlFinal" value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" />
+                                <c:set var="dvUrlFinal" value="#{!lastSearchValue.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" />
                                 <c:set var="dvCardUrlsTarget" value="#{!lastSearchValue.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}" />
                                 <c:set var="dvIsLinked" value="#{!lastSearchValue.rootDv and !result.isInTree}" />