merge fixes

Author: qqmyers

modules/dataverse-parent/pom.xml

@@ -133,7 +133,7 @@
 
     <properties>
         <!-- This is a special Maven property name, do not change! -->
-        <revision>6.6</revision>
+        <revision>6.7</revision>
 
         <target.java.version>17</target.java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>edu.harvard.iq</groupId>
         <artifactId>dataverse-parent</artifactId>
-        <version>6.6-qdr-dev</version>
+        <version>6.7-qdr-dev</version>
         <relativePath>modules/dataverse-parent</relativePath>
     </parent>
 

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

@@ -204,7 +204,10 @@ public enum Referrer {
     private Long maxIngestSizeInBytes = null;
     // CSV: 4.8 MB, DTA: 976.6 KB, XLSX: 5.7 MB, etc.
     private String humanPerFormatTabularLimits = null;
-    private Integer multipleUploadFilesLimit = null; 
+    private Integer multipleUploadFilesLimit = null;
+    // Maximum number of files per dataset allowed ot be uploaded
+    private Integer maxFileUploadCount = null;
+    private Integer fileUploadsAvailable = null;
 
     //MutableBoolean so it can be passed from DatasetPage, supporting DatasetPage.cancelCreate()
     private MutableBoolean uploadInProgress = null;
@@ -396,6 +399,10 @@ public String populateHumanPerFormatTabularLimits() {
         return String.join(", ", formatLimits);
     }
 
+    public Integer getFileUploadsAvailable() {
+        return fileUploadsAvailable != null ? fileUploadsAvailable : -1;
+    }
+
     /*
         The number of files the GUI user is allowed to upload in one batch, 
         via drag-and-drop, or through the file select dialog. Now configurable 
@@ -559,17 +566,28 @@ public String initCreateMode(String modeToken, DatasetVersion version, MutableBo
         this.maxIngestSizeInBytes = systemConfig.getTabularIngestSizeLimit();
         this.humanPerFormatTabularLimits = populateHumanPerFormatTabularLimits();
         this.multipleUploadFilesLimit = systemConfig.getMultipleUploadFilesLimit();
-        
+        setFileUploadCountLimits(0);
         logger.fine("done");
 
         saveEnabled = true;
 
         return null;
     }
+    private void setFileUploadCountLimits(int preLoaded) {
+        this.maxFileUploadCount = this.maxFileUploadCount == null ? dataset.getEffectiveDatasetFileCountLimit() : this.maxFileUploadCount;
+        Long id = dataset.getId() != null ? dataset.getId() : dataset.getOwner() != null ? dataset.getOwner().getId() : null;
+        this.fileUploadsAvailable = this.maxFileUploadCount != null && id != null ?
+                Math.max(0, this.maxFileUploadCount - datasetService.getDataFileCountByOwner(id) - preLoaded) :
+                -1;
+    }
 
     public boolean isQuotaExceeded() {
         return systemConfig.isStorageQuotasEnforced() && uploadSessionQuota != null && uploadSessionQuota.getRemainingQuotaInBytes() == 0;
     }
+    public boolean isFileUploadCountExceeded() {
+        boolean ignoreLimit = this.session.getUser().isSuperuser();
+        return !ignoreLimit && !isFileReplaceOperation() && fileUploadsAvailable != null && fileUploadsAvailable == 0;
+    }
 
     public String init() {
         // default mode should be EDIT
@@ -620,9 +638,8 @@ public String init() {
         }
         this.maxIngestSizeInBytes = systemConfig.getTabularIngestSizeLimit();
         this.humanPerFormatTabularLimits = populateHumanPerFormatTabularLimits();
-        this.multipleUploadFilesLimit = systemConfig.getMultipleUploadFilesLimit();        
-        this.maxFileUploadSizeInBytes = systemConfig.getMaxFileUploadSizeForStore(dataset.getEffectiveStorageDriverId());
-        
+        this.multipleUploadFilesLimit = systemConfig.getMultipleUploadFilesLimit();
+        setFileUploadCountLimits(0);
         hasValidTermsOfAccess = isHasValidTermsOfAccess();
         if (!hasValidTermsOfAccess) {
             PrimeFaces.current().executeScript("PF('blockDatasetForm').show()");
@@ -1119,9 +1136,17 @@ public String save() {
                     }
                 }
             }
-
+            boolean ignoreUploadFileLimits = this.session.getUser() != null ? this.session.getUser().isSuperuser() : false;
             // Try to save the NEW files permanently: 
-            List<DataFile> filesAdded = ingestService.saveAndAddFilesToDataset(workingVersion, newFiles, null, true); 
+            List<DataFile> filesAdded = ingestService.saveAndAddFilesToDataset(workingVersion, newFiles, null, true, ignoreUploadFileLimits);
+            if (filesAdded.size() < nNewFiles) {
+                // Not all files were saved
+                Integer limit = dataset.getEffectiveDatasetFileCountLimit();
+                if (limit != null) {
+                    String msg = BundleUtil.getStringFromBundle("file.add.count_exceeds_limit", List.of(limit.toString()));
+                    JsfHelper.addInfoMessage(msg);
+                }
+            }
 
             // reset the working list of fileMetadatas, as to only include the ones
             // that have been added to the version successfully: