Skip to content

Cache popup values used in DatasetPage #12100

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

Open
qqmyers wants to merge 2 commits into
base: develop
Choose a base branch
from
+44 −7
Open

Cache popup values used in DatasetPage #12100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03fe4d6
cache popup values
qqmyers Jan 19, 2026
86e4fba
Merge branch 'develop' into Cache_redundant_util_calls
qqmyers Jan 28, 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
51 changes: 44 additions & 7 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 @@ -3063,6 +3063,8 @@ public String refresh() {
//dataset = datasetService.find(dataset.getId());
dataset = null;
workingVersion = null;

clearCachedPopupRequiredValues();

logger.fine("refreshing working version");

Expand Down Expand Up @@ -3995,6 +3997,10 @@ public void validateForwardURL(FacesContext context, UIComponent toValidate, Obj
}

public String save() {

//Clear cached info
clearCachedPopupRequiredValues();

//Before dataset saved, write cached prov freeform to version
if (systemConfig.isProvCollectionEnabled()) {
provPopupFragmentBean.saveStageProvFreeformToLatestVersion();
Expand Down Expand Up @@ -5546,24 +5552,55 @@ public boolean isFileAccessRequestMultiSignUpButtonEnabled(){
return false;
}

private Boolean downloadPopupRequired = null;
private Boolean requestAccessPopupRequired = null;
private Boolean guestbookAndTermsPopupRequired = null;
private Boolean guestbookPopupRequired = null;
private Boolean termsPopupRequired = null;

public boolean isDownloadPopupRequired() {
return FileUtil.isDownloadPopupRequired(workingVersion);
if (downloadPopupRequired == null) {
downloadPopupRequired = FileUtil.isDownloadPopupRequired(workingVersion);
}
return downloadPopupRequired;
}

public boolean isRequestAccessPopupRequired() {
return FileUtil.isRequestAccessPopupRequired(workingVersion);
if (requestAccessPopupRequired == null) {
requestAccessPopupRequired = FileUtil.isRequestAccessPopupRequired(workingVersion);
}
return requestAccessPopupRequired;
}

public boolean isGuestbookAndTermsPopupRequired() {
return FileUtil.isGuestbookAndTermsPopupRequired(workingVersion);
public boolean isGuestbookAndTermsPopupRequired() {
if (guestbookAndTermsPopupRequired == null) {
guestbookAndTermsPopupRequired = FileUtil.isGuestbookAndTermsPopupRequired(workingVersion);
}
return guestbookAndTermsPopupRequired;
}

public boolean isGuestbookPopupRequired(){
return FileUtil.isGuestbookPopupRequired(workingVersion);
if(guestbookPopupRequired == null) {
guestbookPopupRequired = FileUtil.isGuestbookPopupRequired(workingVersion);
}
return guestbookPopupRequired;
}

public boolean isTermsPopupRequired() {
if (termsPopupRequired == null) {
termsPopupRequired = FileUtil.isTermsPopupRequired(workingVersion);
}
return termsPopupRequired;
}

public boolean isTermsPopupRequired(){
return FileUtil.isTermsPopupRequired(workingVersion);
private void clearCachedPopupRequiredValues() {
downloadPopupRequired = null;
requestAccessPopupRequired = null;
guestbookAndTermsPopupRequired = null;
guestbookPopupRequired = null;
termsPopupRequired = null;

downloadButtonAvailable = null;
}

public boolean isGuestbookPopupRequiredAtDownload(){
Expand Down