Add check for exceeded storage quota

Previous check only contained size of selected files, but did not consider already used storage.
biigle · May 13, 2024 · 64ee390 · 64ee390
1 parent 7010bb4
commit 64ee390
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/resources/assets/js/createContainer.vue b/src/resources/assets/js/createContainer.vue
@@ -65,7 +65,9 @@ export default {
             return sizeForHumans(this.uploadedSize);
         },
         exceedsMaxSize() {
-            return this.availableQuotaBytes !== -1  && this.totalSize() > this.availableQuotaBytes;
+            let selectionExceedsQuota = this.availableQuotaBytes !== -1  && this.totalSize() > this.availableQuotaBytes;
+            let exceedsStorage = this.availableQuotaBytes !== -1 && this.usedQuota !== -1 && this.totalSize() + this.usedQuota > this.availableQuotaBytes;
+            return selectionExceedsQuota || exceedsStorage;
         },
         canSubmit() {
             return this.hasFiles && !this.exceedsMaxSize;
@@ -82,7 +84,9 @@ export default {
     },
     methods: {
         noFilesUploaded() {
-            return (this.nbrDuplicatedFiles === this.files.length) || (this.getFailedFiles().length === this.files.length);
+            return this.exceedsMaxSize
+                || (this.nbrDuplicatedFiles === this.files.length)
+                || (this.getFailedFiles().length === this.files.length);
         },
         totalSize() {
             let files = this.finishIncomplete ? this.failedFiles : this.files;
@@ -588,6 +592,7 @@ export default {
         this.availableQuotaBytes = biigle.$require('user-storage.availableQuota');
         this.maxFilesizeBytes = biigle.$require('user-storage.maxFilesize');
         this.chunkSize = biigle.$require('user-storage.chunkSize');
+        this.usedQuota = biigle.$require('user-storage.usedQuota')
         // This remains null if no previous request exists.
         this.storageRequest = biigle.$require('user-storage.previousRequest');
         if (this.storageRequest && this.storageRequest.files.length > 0) {

diff --git a/src/resources/views/create.blade.php b/src/resources/views/create.blade.php
@@ -9,6 +9,7 @@
         biigle.$declare('user-storage.availableQuota', {!! $availableQuota !!});
         biigle.$declare('user-storage.maxFilesize', {!! $maxFilesize !!});
         biigle.$declare('user-storage.chunkSize', {!! $chunkSize !!});
+        biigle.$declare('user-storage.usedQuota', {!! $usedQuota !!});
     </script>
 @endpush