fix: remove choices and go with expression

Author: gjulivan

packages/pluggableWidgets/file-uploader-web/CHANGELOG.md

@@ -10,9 +10,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - We fixed an issue where file uploader can still add more files when refreshed eventhough the number of maximum uploaded files has been reached.
 
-### Added
+### Changed
 
-- We added a configuration to set maximum number of uploaded files through expression.
+- We change the max file configuration to set maximum number of uploaded files through expression.
 
 ## [2.2.2] - 2025-07-01
 

packages/pluggableWidgets/file-uploader-web/src/FileUploader.editorConfig.ts

@@ -40,12 +40,6 @@ export function getProperties(
         hidePropertiesIn(properties, values, ["customButtons"]);
     }
 
-    if (values.maxFilePerUploadType === "expression") {
-        hidePropertiesIn(properties, values, ["maxFilesPerUpload"]);
-    } else {
-        hidePropertiesIn(properties, values, ["maxFilesPerUploadExpression"]);
-    }
-
     return properties;
 }
 
@@ -95,12 +89,7 @@ export function check(values: FileUploaderPreviewProps): Problem[] {
             }
         }
 
-        if (!values.maxFilesPerUpload || values.maxFilesPerUpload < 1) {
-            errors.push({
-                property: "maxFilesPerUpload",
-                message: "There must be at least one file per upload allowed."
-            });
-        }
+        // Note: maxFilesPerUpload validation is handled at runtime since it's an expression
 
         if (values.enableCustomButtons) {
             // check that at max one actions is default

packages/pluggableWidgets/file-uploader-web/src/FileUploader.xml

@@ -80,23 +80,11 @@
                     </propertyGroup>
                 </properties>
             </property>
-            <property key="maxFilePerUploadType" type="enumeration" defaultValue="number">
-                <caption>Maximum number of files per upload type</caption>
-                <description />
-                <enumerationValues>
-                    <enumerationValue key="number">Number</enumerationValue>
-                    <enumerationValue key="expression">Expression</enumerationValue>
-                </enumerationValues>
-            </property>
-            <property key="maxFilesPerUploadExpression" type="expression" defaultValue="10">
+            <property key="maxFilesPerUpload" type="expression" defaultValue="10">
                 <caption>Maximum number of files</caption>
                 <description>Limit the number of files per upload.</description>
                 <returnType type="Integer" />
             </property>
-            <property key="maxFilesPerUpload" type="integer" defaultValue="10">
-                <caption>Maximum number of files</caption>
-                <description>Limit the number of files per upload.</description>
-            </property>
             <property key="maxFileSize" type="integer" defaultValue="25">
                 <caption>Maximum file size (MB)</caption>
                 <description>Reject files that are bigger than specified size.</description>

packages/pluggableWidgets/file-uploader-web/src/stores/FileUploaderStore.ts

@@ -1,5 +1,5 @@
 import { DynamicValue, ListValue, ObjectItem } from "mendix";
-import { FileUploaderContainerProps, MaxFilePerUploadTypeEnum, UploadModeEnum } from "../../typings/FileUploaderProps";
+import { FileUploaderContainerProps, UploadModeEnum } from "../../typings/FileUploaderProps";
 import { action, computed, makeObservable, observable } from "mobx";
 import { Big } from "big.js";
 import { getImageUploaderFormats, parseAllowedFormats } from "../utils/parseAllowedFormats";
@@ -27,9 +27,7 @@ export class FileUploaderStore {
     _maxFileSizeMiB = 0;
     _maxFileSize = 0;
     _ds?: ListValue;
-    _maxFilesPerUpload: number;
-    _maxFilePerUploadType: MaxFilePerUploadTypeEnum;
-    _maxFilesPerUploadExpression: DynamicValue<Big>;
+    _maxFilesPerUpload: DynamicValue<Big>;
 
     errorMessage?: string = undefined;
 
@@ -40,8 +38,6 @@ export class FileUploaderStore {
         this._maxFileSizeMiB = props.maxFileSize;
         this._maxFileSize = this._maxFileSizeMiB * 1024 * 1024;
         this._maxFilesPerUpload = props.maxFilesPerUpload;
-        this._maxFilePerUploadType = props.maxFilePerUploadType;
-        this._maxFilesPerUploadExpression = props.maxFilesPerUploadExpression;
         this._uploadMode = props.uploadMode;
 
         this.objectCreationHelper = new ObjectCreationHelper(this._widgetName, props.objectCreationTimeout);
@@ -103,8 +99,6 @@ export class FileUploaderStore {
 
         // Update max files properties
         this._maxFilesPerUpload = props.maxFilesPerUpload;
-        this._maxFilePerUploadType = props.maxFilePerUploadType;
-        this._maxFilesPerUploadExpression = props.maxFilesPerUploadExpression;
 
         this.translations.updateProps(props);
         this.updateProcessor.processUpdate(this._ds);
@@ -125,23 +119,20 @@ export class FileUploaderStore {
             .join(", ");
     }
 
-    get maxFilesPerUpload(): number | undefined {
-        if (this._maxFilePerUploadType === "expression") {
-            const expressionValue = this._maxFilesPerUploadExpression.value;
-            if (expressionValue && !isNaN(Number(expressionValue))) {
-                return Number(expressionValue);
-            }
-            // Fallback to default if expression is invalid
-            return undefined;
+    get maxFilesPerUpload(): number {
+        const expressionValue = this._maxFilesPerUpload.value;
+        if (expressionValue && !isNaN(Number(expressionValue))) {
+            return Number(expressionValue);
         }
-        return this._maxFilesPerUpload;
+        // Fallback to unlimited
+        return 0;
     }
 
     get isFileUploadLimitReached(): boolean {
         const activeFiles = this.files.filter(
             file => file.fileStatus !== "missing" && file.fileStatus !== "removedFile"
         );
-        if (!this.maxFilesPerUpload || this.maxFilesPerUpload === 0) {
+        if (this.maxFilesPerUpload === 0) {
             return false;
         }
         return activeFiles.length >= this.maxFilesPerUpload;

packages/pluggableWidgets/file-uploader-web/typings/FileUploaderProps.d.ts

@@ -21,8 +21,6 @@ export interface AllowedFileFormatsType {
     typeFormatDescription: DynamicValue<string>;
 }
 
-export type MaxFilePerUploadTypeEnum = "number" | "expression";
-
 export interface CustomButtonsType {
     buttonCaption: DynamicValue<string>;
     buttonIcon: DynamicValue<WebIcon>;
@@ -61,9 +59,7 @@ export interface FileUploaderContainerProps {
     createFileAction?: ActionValue;
     createImageAction?: ActionValue;
     allowedFileFormats: AllowedFileFormatsType[];
-    maxFilePerUploadType: MaxFilePerUploadTypeEnum;
-    maxFilesPerUploadExpression: DynamicValue<Big>;
-    maxFilesPerUpload: number;
+    maxFilesPerUpload: DynamicValue<Big>;
     maxFileSize: number;
     dropzoneIdleMessage: DynamicValue<string>;
     dropzoneAcceptedMessage: DynamicValue<string>;
@@ -102,9 +98,7 @@ export interface FileUploaderPreviewProps {
     createFileAction: {} | null;
     createImageAction: {} | null;
     allowedFileFormats: AllowedFileFormatsPreviewType[];
-    maxFilePerUploadType: MaxFilePerUploadTypeEnum;
-    maxFilesPerUploadExpression: string;
-    maxFilesPerUpload: number | null;
+    maxFilesPerUpload: string;
     maxFileSize: number | null;
     dropzoneIdleMessage: string;
     dropzoneAcceptedMessage: string;