@visns-studio/visns-components 5.6.11 → 5.6.12

package/package.json

@@ -84,7 +84,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.6.11",
+    "version": "5.6.12",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/crm/DataGrid.jsx

@@ -935,6 +935,12 @@ const DataGrid = forwardRef(
             const cellElement = event.target.closest(
                 '.InovuaReactDataGrid__cell'
             );
+
+            // Add null check to prevent errors when cellElement is null
+            if (!cellElement) {
+                return; // Exit early if no cell element was found
+            }
+
             const columnIndex = Array.from(
                 cellElement.parentNode.children
             ).indexOf(cellElement);
@@ -1042,6 +1048,12 @@ const DataGrid = forwardRef(
                 const cellElement = event.target.closest(
                     '.InovuaReactDataGrid__cell'
                 );
+
+                // Add null check to prevent errors when cellElement is null
+                if (!cellElement) {
+                    return; // Exit early if no cell element was found
+                }
+
                 const columnIndex = Array.from(
                     cellElement.parentNode.children
                 ).indexOf(cellElement);
@@ -2773,13 +2785,68 @@ const DataGrid = forwardRef(
                                                             e.preventDefault();
 
                                                             // Check if every required field in column.validate exists and is truthy in data
-                                                            const isValid =
-                                                                column.validate?.every(
-                                                                    (v) =>
-                                                                        data[v]
-                                                                ) ?? true;
+                                                            if (
+                                                                column.validate &&
+                                                                column.validate
+                                                                    .length > 0
+                                                            ) {
+                                                                const missingFields =
+                                                                    column.validate.filter(
+                                                                        (v) =>
+                                                                            !data[
+                                                                                v
+                                                                            ]
+                                                                    );
 
-                                                            if (isValid) {
+                                                                if (
+                                                                    missingFields.length ===
+                                                                    0
+                                                                ) {
+                                                                    handleTimer(
+                                                                        data[
+                                                                            form
+                                                                                .primaryKey
+                                                                        ],
+                                                                        column.id
+                                                                    );
+                                                                } else {
+                                                                    // Format field names to be more readable
+                                                                    const formattedFields =
+                                                                        missingFields.map(
+                                                                            (
+                                                                                field
+                                                                            ) => {
+                                                                                // Try to find the column with this field ID to get its label
+                                                                                const fieldColumn =
+                                                                                    columns.find(
+                                                                                        (
+                                                                                            col
+                                                                                        ) =>
+                                                                                            col.id ===
+                                                                                            field
+                                                                                    );
+                                                                                // Use the label if found, otherwise use the field ID
+                                                                                return (
+                                                                                    fieldColumn?.label ||
+                                                                                    field
+                                                                                );
+                                                                            }
+                                                                        );
+
+                                                                    const fieldList =
+                                                                        formattedFields.join(
+                                                                            ', '
+                                                                        );
+                                                                    toast.error(
+                                                                        `Please complete the following required field${
+                                                                            missingFields.length >
+                                                                            1
+                                                                                ? 's'
+                                                                                : ''
+                                                                        } before starting the timer: ${fieldList}`
+                                                                    );
+                                                                }
+                                                            } else {
                                                                 handleTimer(
                                                                     data[
                                                                         form
@@ -2787,10 +2854,6 @@ const DataGrid = forwardRef(
                                                                     ],
                                                                     column.id
                                                                 );
-                                                            } else {
-                                                                toast.error(
-                                                                    'Please complete the required fields before starting the timer.'
-                                                                );
                                                             }
                                                         }}
                                                     >