@bindu-dashing/dam-solution-v2 5.8.173 → 5.8.174

package/build/AssetType/AddFieldProperties.js

@@ -29,25 +29,20 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
     const [defaultValueInput, setDefaultValueInput] = useState("");
     const [loading, setLoading] = useState(false);
     const [form] = Form.useForm();
-    // Watch form values and errors to determine if Update button should be enabled
     const formValues = Form.useWatch([], form);
     const [isFormValid, setIsFormValid] = useState(false);
     useEffect(() => {
         const checkFormValidity = () => __awaiter(this, void 0, void 0, function* () {
             try {
-                // Check if required fields are filled and valid
                 const errors = form.getFieldsError();
-                const touchedFields = form.isFieldsTouched(['name', 'placeholder'], true);
                 const hasErrors = errors.some((error) => error.errors.length > 0);
                 // Get current form values
                 const values = form.getFieldsValue();
                 const nameFilled = !!(values.name && typeof values.name === 'string' && values.name.trim() !== '');
                 const placeholderFilled = !!(values.placeholder && typeof values.placeholder === 'string' && values.placeholder.trim() !== '');
-                // Enable button only if:
-                // 1. Required fields are filled
-                // 2. No validation errors
-                // 3. Fields are touched (user has interacted with them)
-                setIsFormValid(Boolean(!!touchedFields && nameFilled && placeholderFilled && !hasErrors));
+                // Enable Update button if mandatory fields are filled and there are no errors
+                // No need to require fields to be "touched" when they already have valid values
+                setIsFormValid(Boolean(nameFilled && placeholderFilled && !hasErrors));
             }
             catch (error) {
                 setIsFormValid(false);
@@ -59,8 +54,11 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
         try {
             setLoading(true);
             const allValues = Object.assign({}, values);
-            if (allValues === null || allValues === void 0 ? void 0 : allValues.defaultValue) {
-                allValues["defaultValue"] = getFormattedDefaultValue(allValues);
+            // Format defaultValue if it exists (including empty string/null/undefined)
+            if (allValues.hasOwnProperty("defaultValue")) {
+                const formattedValue = getFormattedDefaultValue(allValues);
+                // Set to undefined if empty/null, otherwise use formatted value
+                allValues["defaultValue"] = formattedValue === null || formattedValue === "" ? undefined : formattedValue;
             }
             if (get(field, "_id", null)) {
                 allValues["_id"] = get(field, "_id");
@@ -103,6 +101,23 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                 return defaultValue || [];
             case InputTypes.SELECT:
                 return allowMultiple ? defaultValue || [] : defaultValue || undefined;
+            case InputTypes.NUMBERS:
+                // Ensure defaultValue is a valid number, convert string to number if needed
+                if (defaultValue === null || defaultValue === undefined || defaultValue === "") {
+                    return undefined;
+                }
+                if (typeof defaultValue === "number" && !isNaN(defaultValue) && isFinite(defaultValue)) {
+                    return defaultValue;
+                }
+                if (typeof defaultValue === "string") {
+                    const parsed = Number(defaultValue);
+                    const trimmedValue = defaultValue.trim();
+                    if (!isNaN(parsed) && isFinite(parsed) && trimmedValue !== "") {
+                        return parsed;
+                    }
+                }
+                // If value is not a valid number, return undefined
+                return undefined;
             default:
                 return defaultValue;
         }
@@ -122,6 +137,25 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                 return allowMultiple ? value || [] : value !== null && value !== void 0 ? value : undefined;
             case InputTypes.CHECKBOX:
                 return value || [];
+            case InputTypes.NUMBERS:
+                // Convert string to number if valid, otherwise return undefined
+                if (value === null || value === undefined || value === "") {
+                    return undefined;
+                }
+                const valueType = typeof value;
+                if (valueType === "number" && !isNaN(value) && isFinite(value)) {
+                    return value;
+                }
+                if (valueType === "string") {
+                    const stringVal = value;
+                    const parsed = Number(stringVal);
+                    const trimmedValue = stringVal.trim();
+                    if (!isNaN(parsed) && isFinite(parsed) && trimmedValue !== "") {
+                        return parsed;
+                    }
+                }
+                // If value is not a valid number, return undefined
+                return undefined;
             default:
                 return value;
         }
@@ -132,12 +166,13 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
         // Check initial form validity after setting field values
         setTimeout(() => {
             const errors = form.getFieldsError();
-            const touchedFields = form.isFieldsTouched(['name', 'placeholder'], true);
             const hasErrors = errors.some((error) => error.errors && error.errors.length > 0);
             const values = form.getFieldsValue();
             const nameFilled = !!(values.name && typeof values.name === 'string' && values.name.trim() !== '');
             const placeholderFilled = !!(values.placeholder && typeof values.placeholder === 'string' && values.placeholder.trim() !== '');
-            setIsFormValid(Boolean(!!touchedFields && nameFilled && placeholderFilled && !hasErrors));
+            // Enable Update button if mandatory fields are filled and there are no errors
+            // No need to require fields to be "touched" when they already have valid values
+            setIsFormValid(Boolean(nameFilled && placeholderFilled && !hasErrors));
         }, 100);
     }, [field, form]);
     // Update defaultValueInput whenever form values change
@@ -147,7 +182,6 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
         const defaultName = currentInputType === null || currentInputType === void 0 ? void 0 : currentInputType.defaultName;
         const options = ((_a = formValues.options) === null || _a === void 0 ? void 0 : _a.filter((opt) => (opt === null || opt === void 0 ? void 0 : opt.label) && (opt === null || opt === void 0 ? void 0 : opt.value))) || [];
         const settings = formValues.inputTypeSettings || {};
-        // For SELECT/RADIO/CHECKBOX fields, only show Default Value when options exist
         const isOptionsBasedField = includes([InputTypes.SELECT, InputTypes.CHECKBOX, InputTypes.RADIO], defaultName);
         if (isOptionsBasedField && options.length === 0) {
             // Don't show Default Value field if no options exist
@@ -185,6 +219,29 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                 },
             });
         }
+        // Rule for NUMBERS: ensure only numeric values are accepted
+        if (defaultName === InputTypes.NUMBERS) {
+            rules.push({
+                validator: (_, value) => {
+                    if (value === undefined || value === null || value === "") {
+                        return Promise.resolve();
+                    }
+                    // Check if value is a valid number
+                    if (typeof value === "number" && !isNaN(value) && isFinite(value)) {
+                        return Promise.resolve();
+                    }
+                    // Try to parse string values
+                    if (typeof value === "string") {
+                        const parsed = Number(value);
+                        const trimmedValue = value.trim();
+                        if (!isNaN(parsed) && isFinite(parsed) && trimmedValue !== "") {
+                            return Promise.resolve();
+                        }
+                    }
+                    return Promise.reject("Default value must be a valid number");
+                },
+            });
+        }
         // Rule for DATE and DATE_RANGE: check time part if allow time is selected
         if ((defaultName === InputTypes.DATE ||
             defaultName === InputTypes.DATE_RANGE) &&
@@ -196,9 +253,6 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                         return Promise.resolve();
                     // For DATE
                     if (defaultName === InputTypes.DATE) {
-                        // Check if value has time methods (dayjs object with time support)
-                        // When showTime is enabled, dayjs object will have hour/minute/second methods
-                        // 00:00:00 is a valid time, so we check for the presence of time methods, not non-zero values
                         const hasTimeMethods = value &&
                             typeof value.hour === "function" &&
                             typeof value.minute === "function" &&
@@ -213,8 +267,6 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                     // For DATE_RANGE
                     if (defaultName === InputTypes.DATE_RANGE && Array.isArray(value)) {
                         const [start, end] = value;
-                        // Check for presence of time methods, not non-zero values
-                        // 00:00:00 is a valid time selection
                         const startHasTimeMethods = start &&
                             typeof start.hour === "function" &&
                             typeof start.minute === "function" &&
@@ -238,7 +290,7 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
         const defaultValueItem = getFormItem(Object.assign(Object.assign({}, item), { additionalRules: rules }), true);
         setDefaultValueInput(defaultValueItem);
     };
-    return (_jsxs("div", { className: "md-lib-p-4", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2", children: [_jsx("h2", { className: "md-lib-text-xl md-lib-font-semibold", children: "Properties" }), _jsxs("p", { className: "md-lib-ml-auto md-lib-text-sm md-lib-truncate", style: { color: styles === null || styles === void 0 ? void 0 : styles.secondaryTextColor }, children: ["Type: ", get(field, "name", "N/A")] })] }), _jsx("div", { className: "md-lib-mt-4 md-lib-relative", children: _jsxs(Form, { layout: "vertical", form: form, requiredMark: true, scrollToFirstError: true, onFinish: onUpdate, initialValues: field, onValuesChange: handleFormValuesChange, className: "md-lib-pb-20", children: [_jsx(Form.Item, { name: "isMandatory", valuePropName: "checked", children: _jsx(Checkbox, { children: "Marks as mandatory field" }) }), _jsx(Form.Item, { name: "name", label: "Field Name", rules: [
+    return (_jsxs("div", { className: "md-lib-p-4", children: [_jsxs("div", { className: "md-lib-flex md-lib-items-center md-lib-gap-2", children: [_jsx("h2", { className: "md-lib-text-xl md-lib-font-semibold", children: "Properties" }), _jsxs("p", { className: "md-lib-ml-auto md-lib-text-sm md-lib-truncate", style: { color: styles === null || styles === void 0 ? void 0 : styles.secondaryTextColor }, children: ["Type: ", get(field, "name", "N/A")] })] }), _jsx("div", { className: "md-lib-mt-4 md-lib-relative", children: _jsxs(Form, { layout: "vertical", form: form, requiredMark: true, scrollToFirstError: true, onFinish: onUpdate, initialValues: field, onValuesChange: handleFormValuesChange, className: "md-lib-pb-20", children: [_jsx(Form.Item, { name: "isMandatory", valuePropName: "checked", children: _jsx(Checkbox, { children: "Marks as mandatory field" }) }), _jsx(Form.Item, { name: "name", label: "Name", rules: [
                                 { required: true, message: "Name is required" },
                                 {
                                     validator: (_, value) => {
@@ -249,12 +301,12 @@ export default function AddFieldProperties({ field, setCurrentFieldIndex, onUpda
                                         return Promise.reject("Name must be unique");
                                     },
                                 },
-                            ], children: _jsx(Input, { placeholder: "Enter name", className: "md-lib-h-12" }) }), _jsx(Form.Item, { label: "Placeholder", name: "placeholder", rules: [
+                            ], children: _jsx(Input, { placeholder: "Enter name", className: "md-lib-h-12", maxLength: 255, showCount: true }) }), _jsx(Form.Item, { label: "Placeholder", name: "placeholder", rules: [
                                 {
                                     required: true,
                                     message: "Placeholder is required",
                                 },
-                            ], children: _jsx(Input, { placeholder: "Enter Field Placeholder", className: "md-lib-h-12" }) }), defaultValueInput && defaultValueInput, _jsxs("div", { children: [!!get(currentInputType, "supportedTypes.length") && (_jsx("h3", { className: "md-lib-text-md md-lib-font-semibold md-lib-mb-2", children: "Field Validations" })), _jsxs(Form.Item, { name: "field_validations", children: [includes([InputTypes.PARAGRAPH, InputTypes.TEXT, InputTypes.LINK], get(currentInputType, "defaultName")) && (_jsx(TextField, { field: field, supportedTypes: get(currentInputType, "supportedTypes", []) })), get(currentInputType, "defaultName") == InputTypes.NUMBERS && (_jsx(NumberField, { field: field, supportedTypes: get(currentInputType, "supportedTypes", []) })), (get(currentInputType, "defaultName") == InputTypes.DATE ||
+                            ], children: _jsx(Input, { placeholder: "Enter Field Placeholder", className: "md-lib-h-12", maxLength: 255, showCount: true }) }), defaultValueInput && defaultValueInput, _jsxs("div", { children: [!!get(currentInputType, "supportedTypes.length") && (_jsx("h3", { className: "md-lib-text-md md-lib-font-semibold md-lib-mb-2", children: "Field Validations" })), _jsxs(Form.Item, { name: "field_validations", children: [includes([InputTypes.PARAGRAPH, InputTypes.TEXT, InputTypes.LINK], get(currentInputType, "defaultName")) && (_jsx(TextField, { field: field, supportedTypes: get(currentInputType, "supportedTypes", []) })), get(currentInputType, "defaultName") == InputTypes.NUMBERS && (_jsx(NumberField, { field: field, supportedTypes: get(currentInputType, "supportedTypes", []) })), (get(currentInputType, "defaultName") == InputTypes.DATE ||
                                             get(currentInputType, "defaultName") ==
                                                 InputTypes.DATE_RANGE) && (_jsx(DateField, { field: field, supportedTypes: get(currentInputType, "supportedTypes", []) })), includes([
                                             InputTypes.SELECT,

package/build/AssetType/CreateOrEditAssetTemplate.js

@@ -55,7 +55,6 @@ export default function CreateOrEditAssetTemplate() {
         try {
             const response = yield api.get(FETCH_INPUT_TYPES_URL);
             const filteredData = (_a = get(response, "data", [])) === null || _a === void 0 ? void 0 : _a.filter((input) => get(input, "defaultName") !== InputTypes.PERSON);
-            // Sort widgets alphabetically by name
             const sortedData = filteredData === null || filteredData === void 0 ? void 0 : filteredData.sort((a, b) => {
                 const nameA = get(a, "name", "").toLowerCase();
                 const nameB = get(b, "name", "").toLowerCase();

package/build/AssetType/EditAssetTemplate.js

@@ -47,7 +47,6 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
     const navigate = useAppNavigate();
     const damConfig = useDamConfig();
     const api = useMemo(() => createApiClient(damConfig), [damConfig]);
-    // Track original values for change detection
     const originalName = useMemo(() => get(assetTemplate, "name", ""), [assetTemplate]);
     const originalDescription = useMemo(() => get(assetTemplate, "description", ""), [assetTemplate]);
     const originalFields = useMemo(() => get(assetTemplate, "metadataFields", []), [assetTemplate]);
@@ -69,23 +68,18 @@ export default function EditAssetTemplate({ assetTemplate, inputTypes, }) {
         });
     }, [assetTemplate]);
     const { name, description, currentFieldIndex, fields, loading, showOutputFormat, imagePickerOutputFormat, imagePickerOutputFormatError, } = state;
-    // Check if there are changes to name or description
     const hasNameOrDescriptionChanges = useMemo(() => {
         return name.trim() !== originalName.trim() ||
             description.trim() !== originalDescription.trim();
     }, [name, description, originalName, originalDescription]);
-    // Check if there are changes to fields
     const hasFieldChanges = useMemo(() => {
         if (fields.length !== originalFields.length)
             return true;
-        // Simple comparison - can be enhanced if needed
         return JSON.stringify(fields) !== JSON.stringify(originalFields);
     }, [fields, originalFields]);
-    // Check if there are changes to imagePickerOutputFormat
     const hasImagePickerOutputFormatChanges = useMemo(() => {
         return JSON.stringify(imagePickerOutputFormat) !== JSON.stringify(originalImagePickerOutputFormat);
     }, [imagePickerOutputFormat, originalImagePickerOutputFormat]);
-    // Enable save button if there are changes and no field is being edited
     const canSave = hasNameOrDescriptionChanges || hasFieldChanges || hasImagePickerOutputFormatChanges;
     const transformInputTypePayload = (updatedValues, field, mapId) => {
         const supportedTypes = get(field, "supportedTypes", []);

package/build/AssetType/FieldsSection.js

@@ -35,8 +35,6 @@ import { EMPTY_ASSET_TEMPLATE_WIDGETS_URL } from "../utilities/constants/imageUr
 import _ from "lodash";
 import useAppParams from "../utilities/useAppParams";
 export const getWidgetIcon = (defaultName) => {
-    // Guard against undefined, null, or non-string values
-    // Use explicit checks and ensure we have a valid string before calling toUpperCase
     if (defaultName === undefined || defaultName === null) {
         return null;
     }
@@ -254,14 +252,12 @@ export default function FieldsSection({ name, inputTypes, transformInputTypePayl
                                                 : `selected-${index}`}`)))) }), provided.placeholder] }))) }) }), !!currentField && !showOutputFormat && (_jsx("div", { className: "md-lib-col-span-1 md-lib-bg-white dark:md-lib-bg-darkPrimaryHoverColor", children: _jsx(AddFieldProperties, { field: currentField, index: currentFieldIndex, setCurrentFieldIndex: (val) => setCurrentFieldIndex(val), onUpdateField: (updatedValues, field, index) => onUpdateField(updatedValues, field, index), currentInputType: currentInputType, allFields: fields, onCancel: (index) => {
                                     if (index !== null) {
                                         const fieldToCancel = fields[index];
-                                        // If field doesn't have _id, it's a new unsaved field - remove it
                                         if (!get(fieldToCancel, "_id")) {
                                             const updatedFields = filter(fields, (field, i) => i !== index);
                                             const updatedImagePickerOutputFormat = filter(imagePickerOutputFormat, (field) => get(field, "mapId") !== get(fieldToCancel, "mapId"));
                                             setState((prevState) => (Object.assign(Object.assign({}, prevState), { fields: updatedFields, currentFieldIndex: null, imagePickerOutputFormat: updatedImagePickerOutputFormat })));
                                         }
                                         else {
-                                            // Existing field - just close the properties panel
                                             setCurrentFieldIndex(null);
                                         }
                                     }

package/build/MyDrive/fileDetails/MetaForm.js

@@ -91,11 +91,9 @@ export const getFormItem = (item, fromDefaultValue, userOptions) => {
             message = `Maximum ${max} characters allowed.`;
         }
         rules.push(Object.assign(Object.assign(Object.assign({}, (hasMin ? { min } : {})), (hasMax ? { max } : {})), { message }));
-        // Set maxLength for Input/TextArea components - use configured max or default to 255
         if (hasMax && isNumber(max)) {
             maxLength = max;
         }
-        // If character limit is enabled but no max is set, keep default 255
     }
     // REGEX
     if (get(settings, "REGEX.allow") && get(settings, "REGEX.value")) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bindu-dashing/dam-solution-v2",
-  "version": "5.8.173",
+  "version": "5.8.174",
   "dependencies": {
     "@ant-design/icons": "^5.0.1",
     "@emoji-mart/data": "^1.2.1",