Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to perform action inside search results dataTable #2631

Merged
merged 4 commits into from
Jan 29, 2025
Merged

Allow to perform action inside search results dataTable #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72ba503
Allow to perform action inside search results dataTable
madryk Jan 22, 2025
8679d00
cr response
madryk Jan 24, 2025
74cc4a3
cr response
madryk Jan 29, 2025
105822b
Merge branch 'develop' into feature/allow_for_button_action_inside_se…
madryk Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/LastSearchValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,56 @@

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 {

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;
}
}
2 changes: 2 additions & 0 deletions dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
34 changes: 17 additions & 17 deletions dataverse-webapp/src/main/webapp/search-include-fragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="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}" />

<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">
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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"
Expand Down