@visns-studio/visns-components 5.11.21 → 5.12.0

package/package.json

@@ -14,8 +14,8 @@
         "@tinymce/miniature": "^6.0.0",
         "@tinymce/tinymce-react": "^6.2.1",
         "@uiw/react-color": "^2.6.0",
-        "@visns-studio/visns-datagrid-community": "^1.0.14",
-        "@visns-studio/visns-datagrid-enterprise": "^1.0.14",
+        "@visns-studio/visns-datagrid-community": "^1.0.23",
+        "@visns-studio/visns-datagrid-enterprise": "^1.0.23",
         "@vitejs/plugin-react": "^4.6.0",
         "add": "^2.0.6",
         "array-move": "^4.0.0",
@@ -24,13 +24,13 @@
         "dayjs": "^1.11.13",
         "fabric": "^6.7.0",
         "file-saver": "^2.0.5",
-        "framer-motion": "^12.19.1",
+        "framer-motion": "^12.19.2",
         "html-react-parser": "^5.2.5",
         "lodash": "^4.17.21",
         "lodash.debounce": "^4.0.8",
         "lucide-react": "^0.518.0",
         "moment": "^2.30.1",
-        "motion": "^12.19.1",
+        "motion": "^12.19.2",
         "numeral": "^2.0.6",
         "pluralize": "^8.0.0",
         "qrcode.react": "^4.2.0",
@@ -87,7 +87,7 @@
         "react-dom": "^17.0.0 || ^18.0.0"
     },
     "name": "@visns-studio/visns-components",
-    "version": "5.11.21",
+    "version": "5.12.0",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "src/index.js",
     "files": [

package/src/components/{crm/Autocomplete.jsx → Autocomplete.jsx}

@@ -2,7 +2,7 @@ import { useState, useEffect, useCallback, useMemo, memo, useRef } from 'react';
 import AwesomeDebouncePromise from 'awesome-debounce-promise';
 import { ToggleLeft, ToggleRight, Search } from 'lucide-react';
 import styles from './styles/Autocomplete.module.scss';
-import fetchUtil from '../../utils/fetchUtil';
+import fetchUtil from '../utils/fetchUtil';
 
 // Create the debounced function outside the component to prevent recreation
 const createDebouncedSearch = (fn) =>

package/src/components/{crm/BusinessCardOcr.jsx → BusinessCardOcr.jsx}

@@ -1,4 +1,4 @@
-import '../styles/global.css';
+import './styles/global.css';
 
 import { useState, useRef, useCallback, useEffect } from 'react';
 import { motion } from 'framer-motion';

package/src/components/{crm/DataGrid.jsx → DataGrid.jsx}

@@ -1,4 +1,4 @@
-import '../styles/global.css';
+import './styles/global.css';
 import './styles/global-datagrid.css';
 
 /**
@@ -39,10 +39,10 @@ import SelectFilter from '@visns-studio/visns-datagrid-enterprise/SelectFilter';
 import DateFilter from '@visns-studio/visns-datagrid-enterprise/DateFilter';
 import ReactDataGrid from '@visns-studio/visns-datagrid-enterprise';
 import { toast } from 'react-toastify';
-import fetchUtil from '../../utils/fetchUtil';
+import fetchUtil from '../utils/fetchUtil';
 import { confirmDialog } from '../utils/ConfirmDialog';
-import { DEFAULT_INTELLIGENT_SORTING_CONFIG } from '../../utils/relationshipSortingUtils';
-import { extractColumnsMetadata, isColumnSortable } from '../../utils/columnsMetadataUtils';
+import { DEFAULT_INTELLIGENT_SORTING_CONFIG } from '../utils/relationshipSortingUtils';
+import { extractColumnsMetadata, isColumnSortable } from '../utils/columnsMetadataUtils';
 import {
     AlarmClock,
     RotateCcw,
@@ -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(
@@ -2449,7 +2481,21 @@ const DataGrid = forwardRef(
                                             ? column.filter.placeholder
                                             : 'All Options',
                                         dataSource: selectedDataSource,
+                                        searchable: column.filter.searchable !== false,
+                                        // Enable clear functionality even when searchable is false
+                                        allowClearWhenNotSearchable: column.filter.searchable === false,
+                                        // Explicitly enable clear icon
+                                        clearIcon: true,
                                     };
+                                    
+                                    // Debug: Check if fix is applied
+                                    if (column.filter.searchable === false) {
+                                        console.log('Filter Debug - searchable=false:', {
+                                            columnName: column.name || 'unknown',
+                                            props: filterEditorProps,
+                                            visnsDataGridVersion: 'v1.0.18'
+                                        });
+                                    }
                                     break;
                                 default:
                                     filterEditor = null;
@@ -3607,6 +3653,8 @@ const DataGrid = forwardRef(
                                 style={style}
                                 updateForm={setFormData}
                                 userProfile={userProfile}
+                                bulkEditMode={bulkEditMode}
+                                bulkEditGroupData={bulkEditGroupData}
                             />
                         </div>
                     </div>

package/src/components/{crm/Download.jsx → Download.jsx}

@@ -2,7 +2,7 @@ import React from 'react';
 import { trackPromise } from 'react-promise-tracker';
 import { toast } from 'react-toastify';
 import parse from 'html-react-parser';
-import fetchUtil from '../../utils/fetchUtil';
+import fetchUtil from '../utils/fetchUtil';
 
 const CustomDownload = (
     url,

package/src/components/{cms/DropZone.jsx → DropZone.jsx}

@@ -8,7 +8,7 @@ import Popup from 'reactjs-popup';
 import imageCompression from 'browser-image-compression';
 
 import { confirmDialog } from '../utils/ConfirmDialog';
-import CustomFetch from '../crm/Fetch';
+import CustomFetch from './Fetch';
 import Gallery from './Gallery';
 import styles from './styles/DropZone.module.css';
 

package/src/components/{crm/Field.jsx → Field.jsx}

@@ -1,4 +1,4 @@
-import '../styles/global.css';
+import './styles/global.css';
 
 import React, { useEffect, useRef, useState, useMemo } from 'react';
 import DatePicker from 'react-datepicker';
@@ -36,7 +36,7 @@ import SketchField from './sketch/SketchField';
 import Tools from './sketch/tools';
 import VisnsAsyncSelect from './AsyncSelect';
 import VisnsAutocomplete from './Autocomplete';
-import VisnsDropZone from '../cms/DropZone';
+import VisnsDropZone from './DropZone';
 
 import 'react-toggle/style.css';
 import 'react-datepicker/dist/react-datepicker.css';

package/src/components/{crm/Form.jsx → Form.jsx}

@@ -1,4 +1,4 @@
-import '../styles/global.css';
+import './styles/global.css';
 
 import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { useNavigate } from 'react-router-dom';
@@ -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/components/{crm/auth → auth}/ClientLogin.jsx

@@ -1,4 +1,4 @@
-import '../../styles/global.css';
+import '../styles/global.css';
 
 import React, { useState } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
@@ -7,7 +7,7 @@ import { User } from 'lucide-react';
 
 import CustomFetch from '../Fetch';
 
-import styles from './styles/ClientAuth.module.scss';
+import styles from '../styles/ClientAuth.module.scss';
 
 const ClientLogin = ({ logo, setSystemAuth, urls = {} }) => {
     const location = useLocation();

package/src/components/{crm/auth → auth}/ClientOTPVerify.jsx

@@ -1,4 +1,4 @@
-import '../../styles/global.css';
+import '../styles/global.css';
 
 import React, { useState, useEffect } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
@@ -7,7 +7,7 @@ import { Lock, ArrowLeft } from 'lucide-react';
 
 import CustomFetch from '../Fetch';
 
-import styles from './styles/ClientAuth.module.scss';
+import styles from '../styles/ClientAuth.module.scss';
 
 const ClientOTPVerify = ({
     logo,

package/src/components/{crm/auth → auth}/Login.jsx

@@ -1,4 +1,4 @@
-import '../../styles/global.css';
+import '../styles/global.css';
 
 import React, { useState } from 'react';
 import { Link, useLocation, useNavigate } from 'react-router-dom';
@@ -8,7 +8,7 @@ import { User, Lock } from 'lucide-react';
 
 import CustomFetch from '../Fetch';
 
-import styles from './styles/Login.module.scss';
+import styles from '../styles/Login.module.scss';
 
 const Login = ({ logo, providers, setSystemAuth, setUserProfile }) => {
     const location = useLocation();

package/src/components/{crm/auth → auth}/Profile.jsx

@@ -1,5 +1,5 @@
-// src/components/crm/auth/Profile.jsx
-import '../../styles/global.css';
+// src/components/auth/Profile.jsx
+import '../styles/global.css';
 
 import React, { useState, useEffect, useRef, useCallback, memo } from 'react';
 import { useLocation } from 'react-router-dom';
@@ -9,7 +9,7 @@ import SignaturePad from 'react-signature-pad-wrapper';
 import Swal from 'sweetalert2';
 import CustomFetch from '../Fetch';
 import TableFilter from '../TableFilter';
-import styles from './styles/Profile.module.scss';
+import styles from '../styles/Profile.module.scss';
 
 // Form field component to reduce repetition
 const FormField = memo(

package/src/components/{crm/auth → auth}/Reset.jsx

@@ -1,4 +1,4 @@
-import '../../styles/global.css';
+import '../styles/global.css';
 
 import React, { useState } from 'react';
 import Reveal from 'react-reveal/Reveal';
@@ -8,7 +8,7 @@ import { User } from 'lucide-react';
 
 import CustomFetch from '../Fetch';
 
-import styles from './styles/Reset.module.scss';
+import styles from '../styles/Reset.module.scss';
 
 const Reset = ({ logo }) => {
     const [email, setEmail] = useState('');

package/src/components/{crm/auth → auth}/TwoFactorAuth.jsx

@@ -1,4 +1,4 @@
-import '../../styles/global.css';
+import '../styles/global.css';
 
 import React, { useState, useEffect } from 'react';
 import { useNavigate, useLocation } from 'react-router-dom';
@@ -8,7 +8,7 @@ import { Lock } from 'lucide-react';
 
 import CustomFetch from '../Fetch';
 
-import styles from './styles/TwoFactorAuth.module.scss';
+import styles from '../styles/TwoFactorAuth.module.scss';
 
 const TwoFactorAuth = ({ logo, setSystemAuth, setUserProfile }) => {
     const navigate = useNavigate();

package/src/components/{crm/auth → auth}/Verify.jsx

@@ -1,4 +1,4 @@
-import '../../styles/global.css';
+import '../styles/global.css';
 
 import React, { useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
@@ -9,7 +9,7 @@ import Reveal from 'react-reveal/Reveal';
 
 import CustomFetch from '../Fetch';
 
-import styles from './styles/Verify.module.scss';
+import styles from '../styles/Verify.module.scss';
 
 const Verify = ({ logo }) => {
     const navigate = useNavigate();

package/src/components/{crm/client → client}/ClientDashboard.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import styles from './styles/ClientDashboard.module.scss';
+import styles from '../styles/ClientDashboard.module.scss';
 
 /**
  * ClientDashboard - Example dashboard component for client portal

package/src/components/{crm/client → client}/ClientPortal.jsx

@@ -4,7 +4,7 @@ import { toast } from 'react-toastify';
 
 import CustomFetch from '../Fetch';
 
-import styles from './styles/ClientPortal.module.scss';
+import styles from '../styles/ClientPortal.module.scss';
 
 const ClientPortal = ({
     clientProfile,

package/src/components/{crm/columns → columns}/ColumnRenderers.jsx

@@ -8,7 +8,7 @@ import {
     isRelationshipColumnSortable,
     getRelationshipPath,
     DEFAULT_INTELLIGENT_SORTING_CONFIG,
-} from '../../../utils/relationshipSortingUtils';
+} from '../../utils/relationshipSortingUtils';
 
 // Boolean Column Renderer
 export const renderBooleanColumn = ({
@@ -135,11 +135,11 @@ export const renderDateTimeColumn = ({
                 moment(data[column.id]).format('YYYY-MM-DD') !== '1970-01-01'
             ) {
                 let dateValue = moment(data[column.id]);
-                
+
                 // Apply modifier if present
                 if (column.modifier) {
                     const { operator, value, unit } = column.modifier;
-                    
+
                     if (operator === '+') {
                         dateValue = dateValue.add(value, unit);
                     } else if (operator === '-') {
@@ -1453,16 +1453,22 @@ export const renderGalleryColumn = ({
                 : data[column.id];
 
             // Check if we have valid image data
-            if (!imagesArray || !Array.isArray(imagesArray) || imagesArray.length === 0) {
+            if (
+                !imagesArray ||
+                !Array.isArray(imagesArray) ||
+                imagesArray.length === 0
+            ) {
                 return (
-                    <div style={{ 
-                        display: 'flex', 
-                        alignItems: 'center', 
-                        justifyContent: 'center',
-                        height: '40px',
-                        color: '#999',
-                        fontSize: '12px'
-                    }}>
+                    <div
+                        style={{
+                            display: 'flex',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                            height: '40px',
+                            color: '#999',
+                            fontSize: '12px',
+                        }}
+                    >
                         No images
                     </div>
                 );
@@ -1486,13 +1492,13 @@ export const renderGalleryColumn = ({
 
                 // Set gallery data and current item
                 setGalleryData(galleryData);
-                setCurrentItem({ 
-                    data: data, 
+                setCurrentItem({
+                    data: data,
                     settings: {
                         relation: column.relation,
                         key: column.key,
-                        captionKey: column.captionKey || 'file_name'
-                    }
+                        captionKey: column.captionKey || 'file_name',
+                    },
                 });
 
                 // Open the gallery modal
@@ -1533,7 +1539,7 @@ export const renderGalleryColumn = ({
                         {displayImages.map((image, index) => {
                             const imageUrl = image[column.key];
                             if (!imageUrl) return null;
-                            
+
                             return (
                                 <div
                                     key={index}
@@ -1548,7 +1554,11 @@ export const renderGalleryColumn = ({
                                 >
                                     <img
                                         src={imageUrl}
-                                        alt={image[column.captionKey || 'file_name'] || `Image ${index + 1}`}
+                                        alt={
+                                            image[
+                                                column.captionKey || 'file_name'
+                                            ] || `Image ${index + 1}`
+                                        }
                                         style={{
                                             width: '100%',
                                             height: '100%',
@@ -1562,7 +1572,7 @@ export const renderGalleryColumn = ({
                             );
                         })}
                     </div>
-                    
+
                     {/* Count badge */}
                     <div
                         style={{
@@ -1572,7 +1582,8 @@ export const renderGalleryColumn = ({
                             lineHeight: '1.2',
                         }}
                     >
-                        {imagesArray.length} {imagesArray.length === 1 ? 'image' : 'images'}
+                        {imagesArray.length}{' '}
+                        {imagesArray.length === 1 ? 'image' : 'images'}
                         {remainingCount > 0 && ` (+${remainingCount})`}
                     </div>
                 </div>

package/src/components/{crm/generic → generic}/ActionButtons.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import styles from './styles/ActionButtons.module.scss';
+import styles from '../styles/ActionButtons.module.scss';
 
 function ActionButtons({ actions, onActionClick }) {
     return (

package/src/components/{crm/generic → generic}/AlternativeActionModal.jsx

@@ -1,6 +1,6 @@
 import Swal from 'sweetalert2';
-import './styles/SweetAlert.module.css';
-import './styles/AlternativeActionModal.css';
+import '../styles/SweetAlert.module.css';
+import '../styles/AlternativeActionModal.css';
 
 /**
  * Show an alternative action modal for choosing between different workflows

package/src/components/{crm/generic → generic}/AuditLog.jsx

@@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom';
 import dayjs from 'dayjs';
 import Breadcrumb from '../Breadcrumb';
 import CustomFetch from '../Fetch';
-import styles from './styles/AuditLog.module.scss';
+import styles from '../styles/AuditLog.module.scss';
 
 const AuditLog = ({ userProfile }) => {
     const routeParams = useParams();

package/src/components/{crm/generic → generic}/AuditLogs.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import Table from '../DataGrid';
-import styles from './styles/AuditLogs.module.scss';
+import styles from '../styles/AuditLogs.module.scss';
 
 const AuditLogs = ({ layout }) => {
     const setting = {