glib-web 4.35.3 → 4.35.4

package/components/composable/file.js

@@ -126,4 +126,16 @@ function validateFile(accepts, file) {
   return true;
 }
 
-export { useFileUtils, useFilesState, validateFile };
+function validateFiles({ files, newFiles, accepts }) {
+  const { maxFileLength, maxFileLengthErrorText } = accepts;
+  if (maxFileLength !== null) {
+    const fileLength = newFiles.length + Object.keys(files.value).length;
+    if (fileLength > maxFileLength) {
+      showError(maxFileLengthErrorText);
+      return false;
+    }
+  }
+  return true;
+}
+
+export { useFileUtils, useFilesState, validateFile, validateFiles };

package/components/composable/upload.js

@@ -2,7 +2,7 @@ import { watch } from 'vue';
 import { triggerOnChange } from "./form";
 import Uploader from "../../utils/glibDirectUpload";
 import { vueApp } from "../../store";
-import { useFilesState, useFileUtils, validateFile } from "./file";
+import { useFilesState, useFileUtils, validateFile, validateFiles } from "./file";
 const { makeKey, Item } = useFileUtils();
 
 function submitOnAllUploaded({ url, formData, files, actionName }) {
@@ -36,6 +36,8 @@ function uploadFiles({ droppedFiles, files, spec, container, onAfterUploaded })
   let { responseMessages } = spec;
   responseMessages ||= {};
 
+  if (!validateFiles({ newFiles: droppedFiles, accepts: spec.accepts, files })) return;
+
   let key = '';
   for (let index = 0; index < droppedFiles.length; index++) {
     // show new dropped file and track progress

package/components/composable/upload_nothing.js

@@ -1,9 +1,12 @@
-import { useFileUtils, validateFile } from "./file";
+import { useFileUtils, validateFile, validateFiles } from "./file";
 
 const { makeKey, Item } = useFileUtils();
 
 function uploadFiles({ droppedFiles, files, spec }) {
   const { accepts } = spec;
+
+  if (!validateFiles({ newFiles: droppedFiles, files, accepts })) return;
+
   let key = '';
   files.value = {};
   for (let index = 0; index < droppedFiles.length; index++) {

package/components/fields/file.vue

@@ -89,13 +89,13 @@ export default {
       this.fileValue = null;
     },
     displayImagePreview(file, blob) {
+      this.fileTitle = file.name;
+      this.fileValue = blob.signed_id;
       if (!file.type.startsWith('image')) return;
 
       let reader = new FileReader();
       reader.onload = (e) => {
-        this.fileTitle = file.name;
         this.fileImage = e.target.result;
-        this.fileValue = blob.signed_id;
       };
       reader.readAsDataURL(file);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "4.35.3",
+  "version": "4.35.4",
   "description": "",
   "main": "index.js",
   "scripts": {