Skip to content

3297 reorder files button visibility #3298

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
lbownik merged 3 commits into from
May 27, 2026
Merged

3297 reorder files button visibility #3298

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
635ebad
Closes #3297 If there is zero or one file(s) in a dataset, "Reorder f…
May 20, 2026
5eacd64
moved logic to backing bean
May 20, 2026
ddc574d
Fix typo in fileMetadata reference in XHTML
lbownik May 27, 2026
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
26 changes: 26 additions & 0 deletions fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/tab/DatasetFilesTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static edu.harvard.iq.dataverse.util.JsfHelper.addErrorMessage;
import static edu.harvard.iq.dataverse.util.JsfHelper.addFlashErrorMessage;
import static edu.harvard.iq.dataverse.util.JsfHelper.addFlashSuccessMessage;
import static java.lang.Math.min;
import static java.util.Collections.emptyList;
import static java.util.stream.Collectors.joining;
import static java.util.stream.Collectors.toList;
Expand Down Expand Up @@ -318,6 +319,18 @@ public int getFilePaginatorPage() {
public int getRowsPerPage() {
return rowsPerPage;
}

public int getMinVisibleFileIndex() {
return this.filePaginatorPage * this.rowsPerPage + 1;
}

public int getMaxVisibleFileIndex() {
return min((this.filePaginatorPage + 1) * this.rowsPerPage, getFileCount());
}

public int getFileCount() {
return this.fileMetadatasSearch.getAllAvailableFilesCount();
}

public List<FileMetadata> getSelectedFileMetadataForView() {
return this.fileMetadatasSearch.getWrappedData().stream()
Expand Down Expand Up @@ -408,7 +421,20 @@ public boolean displayThumbnailFor(final FileMetadata fileMetadata) {
return fileMetadata.getDataFile().getId() != null
&& isThumbnailAvailable(fileMetadata);
}

public boolean displayReorderFilesButton() {
return canUpdateDataset() && getFileCount() > 1;
}

public boolean displayFilesCount() {
return this.fileMetadatasSearch.getAllAvailableFilesCount() > 0;
}

public boolean displayDownloadAllFilesButton() {
return !this.workingVersion.getFileMetadatas().isEmpty() &&
isDownloadButtonAvailable();
}

public boolean isThumbnailAvailable(FileMetadata fileMetadata) {

// new and optimized logic:
Expand Down
22 changes: 10 additions & 12 deletions fairchive-webapp/src/main/webapp/filesFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@
<div jsf:id="filesHeaderCount"
class="col-sm-3 text-left">
<!-- Files Count -->
<h:outputFormat value="#{datasetFilesTab.fileMetadatasSearch.getAllAvailableFilesCount() == 1 ? bundle['file.count.one'] : bundle['file.count']}"
rendered="#{datasetFilesTab.fileMetadatasSearch.getAllAvailableFilesCount() gt 0}">
<f:param value="#{(datasetFilesTab.filePaginatorPage * datasetFilesTab.rowsPerPage) + 1}"/>
<f:param value="#{Math:min((datasetFilesTab.filePaginatorPage + 1) * datasetFilesTab.rowsPerPage,datasetFilesTab.fileMetadatasSearch.getAllAvailableFilesCount()) }"/>
<f:param value="#{datasetFilesTab.fileMetadatasSearch.getAllAvailableFilesCount()}"/>
<h:outputFormat value="#{datasetFilesTab.fileCount == 1 ? bundle['file.count.one'] : bundle['file.count']}"
rendered="#{datasetFilesTab.displayFilesCount()}">
<f:param value="#{datasetFilesTab.minVisibleFileIndex}"/>
<f:param value="#{datasetFilesTab.maxVisibleFileIndex}"/>
<f:param value="#{datasetFilesTab.fileCount}"/>
</h:outputFormat>
</div>

Expand All @@ -161,8 +161,7 @@

<!-- DOWNLOAD ALL FILES BUTTON -->
<p:outputPanel style="display: inline-block"
rendered="#{not empty datasetFilesTab.workingVersion.fileMetadatas
and datasetFilesTab.downloadButtonAvailable}">
rendered="#{datasetFilesTab.displayDownloadAllFilesButton()}">
<button type="button"
class="btn btn-default btn-access dropdown-toggle"
data-toggle="dropdown">
Expand Down Expand Up @@ -205,7 +204,7 @@
</p:outputPanel>

<!-- REORDER FILES BUTTON -->
<h:outputLink rendered="#{datasetFilesTab.canUpdateDataset()}"
<h:outputLink rendered="#{datasetFilesTab.displayReorderFilesButton()}"
value="/reorderdatafiles.xhtml?datasetVersionId=#{datasetFilesTab.workingVersion.id}"
type="button"
styleClass="btn btn-default btn-access #{datasetFilesTab.lockedFromEdits ? 'ui-state-disabled' : ''}"
Expand Down Expand Up @@ -296,7 +295,7 @@

<!-- Restricted File Icon -->
<div class="file-icon-restricted-block"
jsf:rendered="#{fileMetadata.termsOfUse.termsOfUseType eq termsOfUseTypeEnum.RESTRICTED}">
jsf:rendered="#{fileMetadata.fileUseRestricted}">
<span class="glyphicon glyphicon-lock text-danger"
jsf:rendered="#{!fileDownloadHelper.canUserDownloadFile(fileMetadata)}"/>
<span class="icon-unlock text-success"
Expand All @@ -307,7 +306,6 @@
<p:column class="col-file-metadata">

<ui:fragment rendered="#{!empty fileMetadata.dataFile.globalIdString}">
<!-- rendered="# {!(fileMetadata.datasetVersion.released or fileMetadata.datasetVersion.deaccessioned)}" -->
<a href="#{widgetWrapper.wrapURL('/file.xhtml?persistentId='.concat(fileMetadata.dataFile.globalIdString).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber))}"
class="file-title-label">
#{fileMetadata.label}
Expand Down Expand Up @@ -376,7 +374,7 @@
</div>

<div class="file-tags-block"
jsf:rendered="#{!(empty fileMetadata.categories) or !(empty fileMetadata.dataFile.tags)}">
jsf:rendered="#{fileMetadata.hasCategoriesOrTags()}">
<ui:fragment rendered="#{!(empty fileMetadata.categories)}">
<ui:repeat value="#{fileMetadata.categories}" var="cat">
<h:outputText value="#{cat.name}"
Expand All @@ -397,7 +395,7 @@
<!-- EDIT -->
<div style="margin-right:14px;" class="btn-group"
jsf:rendered="#{!widgetWrapper.widgetView and datasetFilesTab.canUpdateDataset()
and (datasetFilesTab.fileMetadatasSearch.getAllAvailableFilesCount() gt 0)}">
and (datasetFilesTab.fileCount gt 0)}">
<button type="button"
class="btn btn-default btn-access dropdown-toggle"
data-toggle="dropdown"
Expand Down
Loading