@visns-studio/visns-components 3.8.5 → 3.8.7

package/components/crm/Field.jsx

@@ -701,11 +701,9 @@ function Field({
                                 : true
                         }
                         decimalSeparator={
-                            settings.type === 'decimal' ? '.' : undefined
-                        }
-                        decimalScale={
-                            settings.type === 'decimal' ? 2 : undefined
+                            settings.type === 'decimal' ? '.' : '.'
                         }
+                        decimalScale={settings.type === 'decimal' ? 2 : 2}
                         value={
                             inputValue && inputValue !== 'null'
                                 ? inputValue
@@ -920,12 +918,28 @@ function Field({
                                 alignItems: 'center',
                             }}
                         >
+                            <label
+                                htmlFor={settings.id}
+                                style={{
+                                    padding: '6px 12px',
+                                    border: '1px solid #ccc',
+                                    display: 'inline-block',
+                                    backgroundColor: '#f8f8f8',
+                                    cursor: 'pointer',
+                                }}
+                            >
+                                Choose file...
+                            </label>
                             <input
+                                id={settings.id}
                                 type="file"
-                                data-name={settings.id}
-                                className={inputClass[settings.id]}
+                                className={inputClass[settings.id]} // Ensure inputClass is defined or passed
                                 onChange={onChange}
-                            />{' '}
+                                style={{ display: 'none' }}
+                            />
+                            <span style={{ marginLeft: '10px' }}>
+                                {inputValue.filename}
+                            </span>
                             {inputValue &&
                                 inputValue.key &&
                                 inputValue.uuid && (
@@ -940,7 +954,6 @@ function Field({
                                         }
                                         onClick={(e) => {
                                             e.preventDefault();
-
                                             onFileDownload(inputValue);
                                         }}
                                     >

package/components/crm/generic/GenericDynamic.jsx

@@ -72,6 +72,16 @@ const renderValue = (field, data) => {
     }
 };
 
+const slugify = (text) => {
+    return text
+        .toString()
+        .toLowerCase()
+        .trim()
+        .replace(/\s+/g, '-') // Replace spaces with -
+        .replace(/[^\w\-]+/g, '') // Remove all non-word chars
+        .replace(/\-\-+/g, '-'); // Replace multiple - with single -
+};
+
 const GenericDynamic = ({
     data,
     fetchData,
@@ -104,7 +114,6 @@ const GenericDynamic = ({
                 updateField(prevState, name, newValue)
             );
         } else if (files && files[0]) {
-            console.info('aa');
             const toastId = toast.loading('Uploading file...'); // Show loading toast
             // Start the upload process and read the file if it's an image
             Vapor.store(files[0], {
@@ -199,6 +208,10 @@ const GenericDynamic = ({
         setActiveForm((prevState) => updateField(prevState, id, value));
     };
 
+    const handleChangeNumberFormat = (value, id) => {
+        setActiveForm((prevState) => updateField(prevState, id, value.value));
+    };
+
     const handleChangeToggle = (e) => {
         if (!e) {
             return;
@@ -285,17 +298,38 @@ const GenericDynamic = ({
     };
 
     const handleDownloadForm = async (item, label, data) => {
-        // Show loading toast and keep its ID
         const toastId = toast.loading('Downloading form...');
 
         try {
-            const res = await Download(setting.download, 'POST', {
+            // Assuming Download returns an object with { data: Blob, headers: Headers }
+            const response = await Download(setting.download, 'POST', {
                 data: item,
                 dynamicData: data,
                 label: label,
             });
 
-            if (res.data) {
+            if (response && response.data) {
+                const contentDisposition = response.headers.get(
+                    'Content-Disposition'
+                );
+                let filename = null; // Default to null, letting saveAs decide the filename
+
+                if (contentDisposition) {
+                    const filenameMatch = contentDisposition.match(
+                        /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/
+                    );
+                    if (filenameMatch && filenameMatch[1]) {
+                        filename = filenameMatch[1].replace(/['"]/g, ''); // Remove potential quotes
+                    }
+                }
+
+                // Perform the download using FileSaver.js
+                if (filename) {
+                    saveAs(response.data, filename);
+                } else {
+                    saveAs(response.data); // No filename extracted, let FileSaver handle it
+                }
+
                 // Update loading toast to a success message before closing it
                 toast.update(toastId, {
                     render: 'Download successful!',
@@ -304,26 +338,15 @@ const GenericDynamic = ({
                     autoClose: 5000,
                     closeButton: true,
                 });
-                // Perform the download
-
-                // const fileName = slugify(label) + '.pdf';
-                // saveAs(res.data, fileName);
-                saveAs(res.data);
             } else {
-                // Update the toast to show an error message
-                toast.update(toastId, {
-                    render: 'Error downloading form',
-                    type: 'error',
-                    isLoading: false,
-                    autoClose: 5000,
-                    closeButton: true,
-                });
+                // Handle the case where there is no data in the response
+                throw new Error('No data received from the server');
             }
         } catch (err) {
             console.error(err);
             // Update the toast to show an error message
             toast.update(toastId, {
-                render: 'Error downloading form',
+                render: 'Error downloading form: ' + err.message,
                 type: 'error',
                 isLoading: false,
                 autoClose: 5000,
@@ -629,6 +652,9 @@ const GenericDynamic = ({
                                                               onChangeDate={
                                                                   handleChangeDate
                                                               }
+                                                              onChangeNumberFormat={
+                                                                  handleChangeNumberFormat
+                                                              }
                                                               onChangeToggle={
                                                                   handleChangeToggle
                                                               }

package/package.json

@@ -12,7 +12,7 @@
         "awesome-debounce-promise": "^2.1.0",
         "axios": "^1.6.8",
         "file-saver": "^2.0.5",
-        "framer-motion": "^11.0.24",
+        "framer-motion": "^11.1.7",
         "html-react-parser": "^5.1.10",
         "lodash": "^4.17.21",
         "lodash.debounce": "^4.0.8",
@@ -24,7 +24,7 @@
         "react-color": "^2.19.3",
         "react-confirm-alert": "^3.0.6",
         "react-copy-to-clipboard": "^5.1.0",
-        "react-datepicker": "^6.6.0",
+        "react-datepicker": "^6.9.0",
         "react-dropzone": "^14.2.3",
         "react-number-format": "^5.3.4",
         "react-password-strength-bar": "^0.4.1",
@@ -54,7 +54,7 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "3.8.5",
+    "version": "3.8.7",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {