Skip to content

9647 bugfix facets on files page #9649

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

Merged
kcondon merged 3 commits into from
Jun 16, 2023
Merged

9647 bugfix facets on files page #9649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60d34e2
restored missing side effect
ErykKul Jun 16, 2023
1997a44
improved comment
ErykKul Jun 16, 2023
4f782d6
crawles should not follow the filter links
ErykKul Jun 16, 2023
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
10 changes: 6 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,12 +684,14 @@ public void showAll(){

private List<FileMetadata> selectFileMetadatasForDisplay() {
final Set<Long> searchResultsIdSet;
if (StringUtil.isEmpty(fileLabelSearchTerm) && StringUtil.isEmpty(fileTypeFacet) && StringUtil.isEmpty(fileAccessFacet) && StringUtil.isEmpty(fileTagsFacet)) {
// But, if no search terms were specified, we return the full
// list of the files in the version:
if (isIndexedVersion() && StringUtil.isEmpty(fileLabelSearchTerm) && StringUtil.isEmpty(fileTypeFacet) && StringUtil.isEmpty(fileAccessFacet) && StringUtil.isEmpty(fileTagsFacet)) {
// Indexed version: we need facets, they are set as a side effect of getFileIdsInVersionFromSolr method.
// But, no search terms were specified, we will return the full
// list of the files in the version: we discard the result from getFileIdsInVersionFromSolr.
getFileIdsInVersionFromSolr(workingVersion.getId(), this.fileLabelSearchTerm);
// Since the search results should include the full set of fmds if all the
// terms/facets are empty, setting them to null should just be
// an optimization for the loop below
// an optimization to skip the loop below
searchResultsIdSet = null;
} else if (isIndexedVersion()) {
// We run the search even if no search term and/or facets are
Expand Down
24 changes: 12 additions & 12 deletions src/main/webapp/filesFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
</button>
<ul class="dropdown-menu">
<!-- link for "All" - all file types: -->
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{empty DatasetPage.fileTypeFacet ? 'highlightBold' : ''}" value="#{bundle['file.results.filter.all']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -158,7 +158,7 @@
</h:outputLink></li>
<li role="separator" class="divider"></li>
<ui:repeat value="#{DatasetPage.fileTypeFacetLabels}" var="facetLabel">
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputFormat styleClass="#{facetLabel.name == DatasetPage.fileTypeFacet ? 'highlightBold' : ''}" value="#{facetLabel.name} &#40;{0}&#41;">
<f:param value="#{facetLabel.count}"/>
</h:outputFormat>
Expand All @@ -185,7 +185,7 @@
</button>
<ul class="dropdown-menu">
<!-- link for "All" - i.e., all (both) types of access: -->
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{empty DatasetPage.fileAccessFacet ? 'highlightBold' : ''}" value="#{bundle['file.results.filter.all']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -199,7 +199,7 @@
</h:outputLink></li>
<li role="separator" class="divider"></li>
<ui:repeat value="#{DatasetPage.fileAccessFacetLabels}" var="facetLabel">
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputFormat styleClass="#{facetLabel.name == DatasetPage.fileAccessFacet ? 'highlightBold' : ''}" value="#{facetLabel.name} &#40;{0}&#41;">
<f:param value="#{facetLabel.count}"/>
</h:outputFormat>
Expand All @@ -226,7 +226,7 @@
</button>
<ul class="dropdown-menu">
<!-- link for "All" - i.e., all file tags: -->
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{empty DatasetPage.fileTagsFacet ? 'highlightBold' : ''}" value="#{bundle['file.results.filter.all']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -240,7 +240,7 @@
</h:outputLink></li>
<li role="separator" class="divider"></li>
<ui:repeat value="#{DatasetPage.fileTagsFacetLabels}" var="facetLabel">
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputFormat styleClass="#{facetLabel.name == DatasetPage.fileTagsFacet ? 'highlightBold' : ''}" value="#{facetLabel.name} &#40;{0}&#41;">
<f:param value="#{facetLabel.count}"/>
</h:outputFormat>
Expand Down Expand Up @@ -278,7 +278,7 @@
<span class="glyphicon glyphicon-sort"></span> #{bundle['file.results.btn.sort']} <span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right text-left">
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{((empty DatasetPage.fileSortField) or DatasetPage.fileSortField == 'name') and (empty DatasetPage.fileSortOrder) ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.nameAZ']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -288,7 +288,7 @@
<f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
<f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
</h:outputLink></li>
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{(DatasetPage.fileSortField == 'name' and DatasetPage.fileSortOrder == 'desc') ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.nameZA']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -300,7 +300,7 @@
<f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
<f:param name="folderPresort" value="#{DatasetPage.folderPresort}"/>
</h:outputLink></li>
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{(DatasetPage.fileSortField == 'date' and (empty DatasetPage.fileSortOrder)) ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.newest']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -310,7 +310,7 @@
<f:param name="fileSortField" value="date"/>
<f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
</h:outputLink></li>
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{(DatasetPage.fileSortField == 'date' and DatasetPage.fileSortOrder == 'desc') ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.oldest']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -321,7 +321,7 @@
<f:param name="fileSortOrder" value="desc"/>
<f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
</h:outputLink></li>
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{DatasetPage.fileSortField == 'size' ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.size']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand All @@ -331,7 +331,7 @@
<f:param name="fileSortField" value="size"/>
<f:param name="tagPresort" value="#{DatasetPage.tagPresort}"/>
</h:outputLink></li>
<li><h:outputLink value="/dataset.xhtml">
<li><h:outputLink rel="nofollow" value="/dataset.xhtml">
<h:outputText styleClass="#{DatasetPage.fileSortField == 'type' ? 'highlightBold' : ''}" value="#{bundle['file.results.btn.sort.option.type']}"/>
<f:param name="persistentId" value="#{DatasetPage.persistentId}"/>
<f:param name="version" value="#{DatasetPage.version}"/>
Expand Down