[pull] develop from IQSS:develop

doc/release-notes/12163-REFI-QDA-types

@@ -0,0 +1,5 @@
+This release adds support to map *.qdc and *.qdpx files as [REFI-QDA standard](https://www.qdasoftware.org/) Codebook and Project files for qualitative data analysis, which allows them to be used with the 
+new REFI QDA Previewers at https://github.com/gdcc/dataverse-previewers.
+
+Note that, to enable existing qdc and qdpx files to be used with the previewers, their Mimetypes will ned to be reassigned (by api (https://guides.dataverse.org/en/latest/api/native-api.html#redetect-file-type) or in the database) or their existing types used when configuring the previewers.
+

src/main/java/edu/harvard/iq/dataverse/DatasetPage.java

@@ -3065,6 +3065,8 @@ public String refresh() {
         //dataset = datasetService.find(dataset.getId());
         dataset = null;
         workingVersion = null; 
+
+        clearCachedPopupRequiredValues();
 
         logger.fine("refreshing working version");
 
@@ -4006,6 +4008,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();
@@ -5557,24 +5563,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(){

src/main/java/propertyFiles/MimeTypeDetectionByFileExtension.properties

@@ -25,6 +25,8 @@ png=image/png
 pptx=application/vnd.openxmlformats-officedocument.presentationml.presentation
 prj=application/prj
 py=text/x-python
+qdc=text/x-xml-refiqda
+qdpx=application/x-zip-refiqda
 rar=application/rar
 sas=application/x-sas
 sbn=application/sbn

src/main/java/propertyFiles/MimeTypeDisplay.properties

@@ -25,6 +25,7 @@ text/x-markdown=Markdown Text
 text/x-r-markdown=R Markdown Text
 application/rtf=Rich Text Format
 text/x-rst=reStructuredText
+text/x-xml-refiqda=REFI-QDA
 text/rtf=Rich Text Format
 text/richtext=Rich Text Format
 text/turtle=Turtle RDF
@@ -227,5 +228,6 @@ application/octet-stream=Unknown
 application/x-docker-file=Docker Image File
 application/x-vagrant-file=Vagrant Image File
 application/ld+json;\u0020profile\u003d\u0022http\u003a//www.w3.org/ns/json-ld#flattened\u0020http\u003a//www.w3.org/ns/json-ld#compacted\u0020https\u003a//w3id.org/ro/crate\u0022=RO-Crate metadata
+application/x-zip-refiqda=REFI-QDA-Project
 # Dataverse-specific
 application/vnd.dataverse.file-package=Dataverse Package