@visns-studio/visns-components 5.11.22 → 5.12.0

package/package.json

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

package/src/components/DataGrid.jsx

@@ -275,6 +275,8 @@ const DataGrid = forwardRef(
         const [formType, setFormType] = useState('');
         const [formId, setFormId] = useState(0);
         const [modalShow, setModalShow] = useState(false);
+        const [bulkEditMode, setBulkEditMode] = useState(false);
+        const [bulkEditGroupData, setBulkEditGroupData] = useState(null);
 
         /** Modal Functions */
         const modalOpen = (formType, formId) => {
@@ -285,6 +287,8 @@ const DataGrid = forwardRef(
 
         const modalClose = () => {
             setModalShow(false);
+            setBulkEditMode(false);
+            setBulkEditGroupData(null);
         };
 
         useEffect(() => {
@@ -1209,7 +1213,13 @@ const DataGrid = forwardRef(
             // Get all rows for this group
             const groupRows = getGroupRows(groupValue);
 
-            // Show confirmation dialog to prevent accidental clicks
+            // Skip confirmation dialog for edit actions - open modal directly
+            if (iconConfig.id === 'edit' && iconConfig.formModal) {
+                executeGroupAction(groupValue, iconConfig);
+                return;
+            }
+
+            // Show confirmation dialog for other actions to prevent accidental clicks
             const confirmMessage = `Are you sure you want to perform "${iconConfig.label}" action on group "${groupValue}" (${groupRows.length} rows)?`;
 
             confirmDialog({
@@ -1310,7 +1320,10 @@ const DataGrid = forwardRef(
                 }
             } else {
                 // Fallback to existing switch logic if no fetch config
-                toast.info(`${iconConfig.label} - Group: ${groupValue}`);
+                // Skip toast notification for edit actions
+                if (iconConfig.id !== 'edit') {
+                    toast.info(`${iconConfig.label} - Group: ${groupValue}`);
+                }
 
                 switch (iconConfig.id) {
                     case 'clock':
@@ -1329,9 +1342,28 @@ const DataGrid = forwardRef(
                         );
                         break;
                     case 'edit':
-                        console.log(
-                            `Bulk edit action for group: ${groupValue}`
-                        );
+                        // Handle bulk edit action
+                        if (iconConfig.formModal) {
+                            // Get all rows in the group for bulk editing
+                            const groupRows = getGroupRows(groupValue);
+                            const groupRowIds = groupRows.map(row => row[form?.primaryKey || 'id']);
+                            
+                            // Set bulk edit data
+                            setBulkEditMode(true);
+                            setBulkEditGroupData({
+                                groupValue: groupValue,
+                                groupRows: groupRows,
+                                groupRowIds: groupRowIds,
+                                iconConfig: iconConfig
+                            });
+                            
+                            // Open modal for bulk editing
+                            modalOpen('update', null);
+                        } else {
+                            console.log(
+                                `Bulk edit action for group: ${groupValue}`
+                            );
+                        }
                         break;
                     case 'envelope':
                         console.log(
@@ -3621,6 +3653,8 @@ const DataGrid = forwardRef(
                                 style={style}
                                 updateForm={setFormData}
                                 userProfile={userProfile}
+                                bulkEditMode={bulkEditMode}
+                                bulkEditGroupData={bulkEditGroupData}
                             />
                         </div>
                     </div>

package/src/components/Form.jsx

@@ -80,6 +80,8 @@ function Form({
     type,
     updateForm,
     userProfile,
+    bulkEditMode = false,
+    bulkEditGroupData = null,
 }) {
     const navigate = useNavigate();
     const [fetchTrigger, setFetchTrigger] = useState(false);
@@ -888,34 +890,42 @@ function Form({
                             }
                             method = formSettings.customMethod;
                         } else {
-                            switch (formType) {
-                                case 'create':
-                                    if (formSettings.json) {
-                                        url += '/json/store';
-                                    }
-                                    break;
-                                case 'update':
-                                case 'delete':
-                                    if (formSettings.json) {
-                                        url +=
+                            // Check if this is bulk edit mode
+                            if (bulkEditMode && bulkEditGroupData?.iconConfig?.formModal) {
+                                // Use bulk edit endpoint configuration
+                                const formModalConfig = bulkEditGroupData.iconConfig.formModal;
+                                url = formModalConfig.url || url;
+                                method = formModalConfig.method || 'POST';
+                            } else {
+                                switch (formType) {
+                                    case 'create':
+                                        if (formSettings.json) {
+                                            url += '/json/store';
+                                        }
+                                        break;
+                                    case 'update':
+                                    case 'delete':
+                                        if (formSettings.json) {
+                                            url +=
+                                                formType === 'update'
+                                                    ? '/json/update'
+                                                    : `/json/delete/${
+                                                          formData[
+                                                              formSettings
+                                                                  .primaryKey
+                                                          ]
+                                                      }`;
+                                        } else {
+                                            url += `/${
+                                                formData[formSettings.primaryKey]
+                                            }`;
+                                        }
+                                        method =
                                             formType === 'update'
-                                                ? '/json/update'
-                                                : `/json/delete/${
-                                                      formData[
-                                                          formSettings
-                                                              .primaryKey
-                                                      ]
-                                                  }`;
-                                    } else {
-                                        url += `/${
-                                            formData[formSettings.primaryKey]
-                                        }`;
-                                    }
-                                    method =
-                                        formType === 'update'
-                                            ? 'PUT'
-                                            : 'DELETE';
-                                    break;
+                                                ? 'PUT'
+                                                : 'DELETE';
+                                        break;
+                                }
                             }
                         }
 
@@ -1046,7 +1056,7 @@ function Form({
                         }
 
                         // Transform keys with dots into nested objects
-                        const payload = Object.keys(updatedFormData).reduce(
+                        let payload = Object.keys(updatedFormData).reduce(
                             (acc, key) => {
                                 if (key.includes('.')) {
                                     const [root, sub] = key.split('.');
@@ -1060,6 +1070,18 @@ function Form({
                             {}
                         );
 
+                        // Add bulk edit data to payload if in bulk edit mode
+                        if (bulkEditMode && bulkEditGroupData) {
+                            payload = {
+                                ...payload,
+                                bulkEdit: true,
+                                groupValue: bulkEditGroupData.groupValue,
+                                groupKey: bulkEditGroupData.iconConfig.formModal?.groupKey || ajaxSetting?.groupBy?.[0],
+                                rowIds: bulkEditGroupData.groupRowIds,
+                                ...bulkEditGroupData.iconConfig.formModal?.data
+                            };
+                        }
+
                         const res = await CustomFetch(url, method, payload);
 
                         if (res.data.error === '') {
@@ -2233,7 +2255,12 @@ function Form({
             <div className={styles.modalwrap}>
                 <div className={styles.modal}>
                     <div className={styles.modal__header}>
-                        <h1>{formSettings[formType]?.title}</h1>
+                        <h1>
+                            {bulkEditMode && bulkEditGroupData
+                                ? `${bulkEditGroupData.iconConfig.formModal?.title || 'Bulk Edit'} - ${bulkEditGroupData.groupValue} (${bulkEditGroupData.groupRows.length} items)`
+                                : formSettings[formType]?.title
+                            }
+                        </h1>
                         <button
                             className={styles.modal__close}
                             onClick={closeModal}
@@ -2265,6 +2292,14 @@ function Form({
                                     ) {
                                         return null;
                                     }
+                                    // In bulk edit mode, only show fields specified in the formModal configuration
+                                    if (
+                                        bulkEditMode && 
+                                        bulkEditGroupData?.iconConfig?.formModal?.fields &&
+                                        !bulkEditGroupData.iconConfig.formModal.fields.includes(item.id)
+                                    ) {
+                                        return null;
+                                    }
 
                                     return (
                                         <Field

package/src/utils/ConfirmDialog.jsx

@@ -46,7 +46,7 @@ export const confirmDialog = ({
                     }}
                     style={{
                         padding: '6px 12px',
-                        background: '#d32f2f',
+                        background: '#2563eb',
                         color: 'white',
                         border: 'none',
                         borderRadius: '4px',