6684 dataset pg btn responsive

.gitignore

@@ -60,3 +60,8 @@ scripts/installer/default.config
 tests/node_modules
 tests/package-lock.json
 venv
+
+# from thumbnail tests in SearchIT
+scripts/search/data/binary/trees.png.thumb140
+src/main/webapp/resources/images/cc0.png.thumb140
+src/main/webapp/resources/images/dataverseproject.png.thumb140

doc/release-notes/6684-buttons

@@ -0,0 +1 @@
+Note about how the buttons are the next steps towards the dataset and file redesign, mention previews on page, filtering/sorting options, tree view.

doc/sphinx-guides/source/api/dataaccess.rst

@@ -58,8 +58,8 @@ the following parameter values are supported (for image and pdf files only):
 ==============  ===========
 Value           Description
 ==============  ===========
-true            Generates a thumbnail image, by rescaling to the default thumbnail size (64 pixels)
-``N``           Rescales the image to ``N`` pixels.
+true            Generates a thumbnail image by rescaling to the default thumbnail size (64 pixels wide).
+``N``           Rescales the image to ``N`` pixels wide. ``imageThumb=true`` and ``imageThumb=64`` are equivalent.
 ==============  ===========
 
 Multiple File ("bundle") download

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

@@ -845,8 +845,8 @@ public boolean isAncestorOf( DvObject other ) {
         return equals(other) || equals(other.getOwner());
     }
 
-    public DatasetThumbnail getDatasetThumbnail() {
-        return DatasetUtil.getThumbnail(this);
+    public DatasetThumbnail getDatasetThumbnail(int size) {
+        return DatasetUtil.getThumbnail(this, size);
     }
 
     /** 
@@ -857,8 +857,8 @@ public DatasetThumbnail getDatasetThumbnail() {
      * @param datasetVersion
      * @return A thumbnail of the dataset (may be {@code null}).
      */
-    public DatasetThumbnail getDatasetThumbnail(DatasetVersion datasetVersion) {
-        return DatasetUtil.getThumbnail(this, datasetVersion);
+    public DatasetThumbnail getDatasetThumbnail(DatasetVersion datasetVersion, int size) {
+        return DatasetUtil.getThumbnail(this, datasetVersion, size);
     }
 
 }

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

@@ -375,7 +375,7 @@ public String getThumbnailString() {
         }
 
         if (!readOnly) {
-            DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+            DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
             if (datasetThumbnail == null) {
                 thumbnailString = "";
                 return null;
@@ -391,7 +391,10 @@ public String getThumbnailString() {
 
             thumbnailString = datasetThumbnail.getBase64image();
         } else {
-            thumbnailString = thumbnailServiceWrapper.getDatasetCardImageAsBase64Url(dataset, workingVersion.getId(),!workingVersion.isDraft());
+            thumbnailString = thumbnailServiceWrapper.getDatasetCardImageAsBase64Url(dataset, 
+                    workingVersion.getId(),
+                    !workingVersion.isDraft(),
+                    ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
             if (thumbnailString == null) {
                 thumbnailString = "";
                 return null;
@@ -1057,6 +1060,17 @@ public boolean canComputeAllFiles(boolean isCartCompute){
         }
         return true;
     }
+
+    public boolean canDownloadFiles(){
+        //returns true if the page user has permission to download at least one file
+        for (FileMetadata fmd : workingVersion.getFileMetadatas()) {
+             if (fileDownloadHelper.canDownloadFile(fmd)) {
+                 return true;
+             }
+        }
+        return false;
+    }
+
     /*
     in getComputeUrl(), we are sending the container/dataset name and the exipiry and signature 
     for the temporary url of only ONE datafile within the dataset. This is because in the 
@@ -1802,7 +1816,7 @@ private String init(boolean initFull) {
         String nonNullDefaultIfKeyNotFound = "";
         protocol = settingsWrapper.getValueForKey(SettingsServiceBean.Key.Protocol, nonNullDefaultIfKeyNotFound);
         authority = settingsWrapper.getValueForKey(SettingsServiceBean.Key.Authority, nonNullDefaultIfKeyNotFound);
-        if (dataset.getId() != null || versionId != null || persistentId != null) { // view mode for a dataset
+        if (this.getId() != null || versionId != null || persistentId != null) { // view mode for a dataset
 
             DatasetVersionServiceBean.RetrieveDatasetVersionResponse retrieveDatasetVersionResponse = null;
 
@@ -2418,22 +2432,6 @@ public void edit(EditMode editMode) {
         this.readOnly = false;
     }
 
-    public String releaseDraft() {
-        if (releaseRadio == 1) {
-            return releaseDataset(true);
-        } else if(releaseRadio ==2) {
-            return releaseDataset(false);
-        } else if(releaseRadio ==3) {
-            return updateCurrentVersion();
-        } else {
-            return "Invalid Choice";
-        }
-    }
-
-    public String releaseMajor() {
-        return releaseDataset(false);
-    }
-
     public String sendBackToContributor() {
         try {
             //FIXME - Get Return Comment from sendBackToContributor popup
@@ -2484,7 +2482,22 @@ public String releaseParentDVAndDataset(){
     }
 
     public String releaseDataset() {
-        return releaseDataset(false);
+        if(!dataset.getOwner().isReleased()){
+            releaseParentDV();
+        }       
+        if(publishDatasetPopup()|| publishBothPopup() || !dataset.getLatestVersion().isMinorUpdate()){
+            return releaseDataset(false);
+        }        
+        switch (releaseRadio) {
+            case 1:
+                return releaseDataset(true);
+            case 2:
+                return releaseDataset(false);
+            case 3:
+                return updateCurrentVersion();
+            default:
+                return "Invalid Choice";
+        }
     }
 
     private void releaseParentDV(){
@@ -3764,17 +3777,95 @@ public boolean isLockedForAnyReason() {
         }
         return false;
     }
+
+    public void processPublishButton() {
+        if (dataset.isReleased()) {
+            PrimeFaces.current().executeScript("PF('publishDataset').show()");
+        }
+
+        if (!dataset.isReleased()) {
+            if (dataset.getOwner().isReleased()) {
+                PrimeFaces.current().executeScript("PF('publishDataset').show()");
+                return;
+            }
+            if (!dataset.getOwner().isReleased()) {
+                if (canPublishDataverse()) {
+                    if (dataset.getOwner().getOwner() == null
+                            || (dataset.getOwner().getOwner() != null && dataset.getOwner().getOwner().isReleased())) {
+                        PrimeFaces.current().executeScript("PF('publishDataset').show()");
+                        return;
+                    }
+                    if ((dataset.getOwner().getOwner() != null && !dataset.getOwner().getOwner().isReleased())) {
+                        PrimeFaces.current().executeScript("PF('maynotPublishParent').show()");
+                    }
+
+                } else {
+                    PrimeFaces.current().executeScript("PF('mayNotRelease').show()");
+                }
+            }
+        }
+    }
 
+    public boolean releaseDraftPopup(){
+        return dataset.isReleased();
+    }
+
+    public boolean publishDatasetPopup(){
+        if (!dataset.isReleased()) {
+            return dataset.getOwner().isReleased();
+        }
+       return false; 
+    }
+
+    public boolean publishBothPopup() {
+        if (!dataset.getOwner().isReleased()) {
+            if (canPublishDataverse()) {
+                if (dataset.getOwner().getOwner() == null
+                        || (dataset.getOwner().getOwner() != null && dataset.getOwner().getOwner().isReleased())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    } 
+
+    public String getPublishButtonLabel(){
+        if(publishDatasetPopup() || releaseDraftPopup()){
+            BundleUtil.getStringFromBundle("continue");  
+        }
+        if(publishBothPopup()){
+            BundleUtil.getStringFromBundle("dataset.mayNotBePublished.both.button");
+        }        
+        return "";
+    }
+
     private Boolean lockedFromEditsVar;
     private Boolean lockedFromDownloadVar;    
     private boolean lockedDueToDcmUpload;
     private Boolean lockedDueToIngestVar;
+    private Boolean lockedFromPublishingVar;
+
+    /**
+     * Authors are not allowed to publish but curators are allowed - when Dataset is inReview
+     * For all other locks edit should be locked for all editors.
+     */
+    public boolean isLockedFromPublishing() {
+        if (null == lockedFromPublishingVar || stateChanged) {
+            try {
+                permissionService.checkPublishDatasetLock(dataset, dvRequestService.getDataverseRequest(), new PublishDatasetCommand(dataset, dvRequestService.getDataverseRequest(), true));
+                lockedFromPublishingVar = false;
+            } catch (IllegalCommandException ex) {
+                lockedFromPublishingVar = true;
+            }
+        }
+        return lockedFromPublishingVar;
+    }
     /**
      * Authors are not allowed to edit but curators are allowed - when Dataset is inReview
      * For all other locks edit should be locked for all editors.
      */
     public boolean isLockedFromEdits() {
-        if(null == lockedFromEditsVar || stateChanged) {
+        if (null == lockedFromEditsVar || stateChanged) {
             try {
                 permissionService.checkEditDatasetLock(dataset, dvRequestService.getDataverseRequest(), new UpdateDatasetVersionCommand(dataset, dvRequestService.getDataverseRequest()));
                 lockedFromEditsVar = false;
@@ -3783,6 +3874,7 @@ public boolean isLockedFromEdits() {
             }
         }
         return lockedFromEditsVar;
+
     }
 
     /**
@@ -4076,12 +4168,18 @@ private List<DatasetVersion> resetReleasedVersionTabList() {
         }
         return retList;
     }
+
+    public boolean isDisplayPublishPopupCustomText() {
+        if (dataset.isReleased()) {
+            return isDatasetPublishPopupCustomTextOnAllVersions() && !getDatasetPublishCustomText().isEmpty();
+        }
+        return !getDatasetPublishCustomText().isEmpty();
+    }
 
     public String getDatasetPublishCustomText(){
         String datasetPublishCustomText = settingsWrapper.getValueForKey(SettingsServiceBean.Key.DatasetPublishPopupCustomText);
         if( datasetPublishCustomText!= null && !datasetPublishCustomText.isEmpty()){
-            return datasetPublishCustomText;
-
+            return datasetPublishCustomText;        
         }
         return "";
     }

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

@@ -726,7 +726,7 @@ public Dataset setNonDatasetFileAsThumbnail(Dataset dataset, InputStream inputSt
             logger.fine("In setNonDatasetFileAsThumbnail but inputStream is null! Returning null.");
             return null;
         }
-        dataset = DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnail(dataset, inputStream);
+        dataset = DatasetUtil.persistDatasetLogoToStorageAndCreateThumbnails(dataset, inputStream);
         dataset.setThumbnailFile(null);
         return merge(dataset);
     }

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

@@ -67,8 +67,8 @@ public String init() {
         if (!permissionsWrapper.canIssueCommand(dataset, UpdateDatasetVersionCommand.class)) {
             return permissionsWrapper.notAuthorized();
         }
-        datasetThumbnails = DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate);
-        datasetThumbnail = dataset.getDatasetThumbnail();
+        datasetThumbnails = DatasetUtil.getThumbnailCandidates(dataset, considerDatasetLogoAsCandidate, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
+        datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         if (datasetThumbnail != null) {
             DataFile dataFile = datasetThumbnail.getDataFile();
             if (dataFile != null) {
@@ -117,7 +117,7 @@ public void setDatasetFileThumbnailToSwitchTo(DataFile datasetFileThumbnailToSwi
     public void setDataFileAsThumbnail() {
         logger.fine("setDataFileAsThumbnail clicked");
         updateDatasetThumbnailCommand = new UpdateDatasetThumbnailCommand(dvRequestService.getDataverseRequest(), dataset, UpdateDatasetThumbnailCommand.UserIntent.setDatasetFileAsThumbnail, datasetFileThumbnailToSwitchTo.getId(), null);
-        String base64image = ImageThumbConverter.getImageThumbnailAsBase64(datasetFileThumbnailToSwitchTo, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        String base64image = ImageThumbConverter.getImageThumbnailAsBase64(datasetFileThumbnailToSwitchTo, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         datasetThumbnail = new DatasetThumbnail(base64image, datasetFileThumbnailToSwitchTo);
     }
 
@@ -146,7 +146,7 @@ public void handleImageFileUpload(FileUploadEvent event) {
             Logger.getLogger(DatasetWidgetsPage.class.getName()).log(Level.SEVERE, null, ex);
             return;
         }
-        String base64image = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(file, ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
+        String base64image = ImageThumbConverter.generateImageThumbnailFromFileAsBase64(file, ImageThumbConverter.DEFAULT_DATASETLOGO_SIZE);
         if (base64image != null) {
             datasetThumbnail = new DatasetThumbnail(base64image, datasetFileThumbnailToSwitchTo);
         } else {

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

@@ -2512,7 +2512,7 @@ public void deleteDatasetLogoAndUseThisDataFileAsThumbnailInstead() {
     }
 
     public boolean isThumbnailIsFromDatasetLogoRatherThanDatafile() {
-        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail();
+        DatasetThumbnail datasetThumbnail = dataset.getDatasetThumbnail(ImageThumbConverter.DEFAULT_CARDIMAGE_SIZE);
         return datasetThumbnail != null && !datasetThumbnail.isFromDataFile();
     }
 

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

@@ -708,28 +708,62 @@ public List<Long> getDvObjectIdsUserHasRoleOn(User user, List<DataverseRole> rol
 
     public void checkEditDatasetLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
         if (dataset.isLocked()) {
+            if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            // TODO: Do we need to check for "Workflow"? Should the message be more specific?
+            if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            // TODO: Do we need to check for "DcmUpload"? Should the message be more specific?
+            if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
+            if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+            }
             if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
                 // The "InReview" lock is not really a lock for curators. They can still make edits.
                 if (!isUserAllowedOn(dataverseRequest.getUser(), new PublishDatasetCommand(dataset, dataverseRequest, true), dataset)) {
                     throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowedInReview"), command);
                 }
+            } else {
+                //catch all for locked for any other reason
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
             }
+        }
+    }
+
+    public void checkPublishDatasetLock(Dataset dataset, DataverseRequest dataverseRequest, Command command) throws IllegalCommandException {
+        if (dataset.isLocked()) {
             if (dataset.isLockedFor(DatasetLock.Reason.Ingest)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             if (dataset.isLockedFor(DatasetLock.Reason.finalizePublication)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             // TODO: Do we need to check for "Workflow"? Should the message be more specific?
             if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             // TODO: Do we need to check for "DcmUpload"? Should the message be more specific?
             if (dataset.isLockedFor(DatasetLock.Reason.DcmUpload)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
             if (dataset.isLockedFor(DatasetLock.Reason.EditInProgress)) {
-                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.editNotAllowed"), command);
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+            }
+            if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
+                // The "InReview" lock is not really a lock for curators. They can still publish
+                if (!isUserAllowedOn(dataverseRequest.getUser(), new PublishDatasetCommand(dataset, dataverseRequest, true), dataset)) {
+                    throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
+                }
+            } else {
+                //catch all for locked for some other reason
+                throw new IllegalCommandException(BundleUtil.getStringFromBundle("dataset.message.locked.publishNotAllowed"), command);
             }
         }
     }