@visns-studio/visns-components 4.10.42 → 4.10.44

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -94,6 +94,7 @@ const loadData = async (
                         id: identifier,
                         value: fv.value,
                         operator: fv.operator,
+                        whereHas: fv.whereHas || [],
                     });
                 }
             } else {
@@ -571,20 +572,11 @@ const DataGrid = forwardRef(
                     break;
                 case 'form':
                     if (s.key) {
-                        console.info('Form Setting Data:', formSettingData);
                         let fsd = s.form;
 
                         if (fsd.fields && fsd.fields.length > 0) {
-                            console.info(
-                                'Form Setting Data Fields:',
-                                fsd.fields.length
-                            );
                             fsd.fields.forEach((fItem, fKey) => {
                                 if (fItem.id === s.key) {
-                                    console.info(
-                                        'Form Setting Data Fields ID:',
-                                        fItem.id
-                                    );
                                     fsd.fields[fKey].value = d.id;
                                 }
                             });
@@ -765,7 +757,9 @@ const DataGrid = forwardRef(
             } else {
                 const column = rowProps.columns[columnIndex];
 
-                if (column.type !== 'dropdown') {
+                const excludedColumnTypes = ['dropdown', 'text_input'];
+
+                if (!excludedColumnTypes.includes(column.type)) {
                     if (column.id !== '__checkbox-column') {
                         if (column.link && column.link.hasOwnProperty('url')) {
                             if (column.link.url) {
@@ -2344,6 +2338,51 @@ const DataGrid = forwardRef(
                                         return <span>{stage}</span>;
                                     },
                                 };
+                            case 'text_input':
+                                columnId = Array.isArray(column.id)
+                                    ? column.id.join('-')
+                                    : column.id;
+
+                                return {
+                                    ...commonProps,
+                                    name: columnId,
+                                    render: ({ data }) => {
+                                        const debouncedOnChange = debounce(
+                                            (name, value) => {
+                                                if (
+                                                    column.update?.key &&
+                                                    column.update?.url &&
+                                                    column.update?.method
+                                                ) {
+                                                    handleDropdownUpdate(
+                                                        column.update.key,
+                                                        `${column.update.url}/${data.id}`,
+                                                        column.update.method,
+                                                        value
+                                                    );
+                                                }
+                                            },
+                                            1000
+                                        );
+
+                                        const handleChange = (e) => {
+                                            const { name, value } = e.target;
+                                            debouncedOnChange(name, value);
+                                        };
+
+                                        return (
+                                            <input
+                                                name={column.id}
+                                                defaultValue={
+                                                    data[column.id] || ''
+                                                }
+                                                style={{ padding: '7px' }}
+                                                onChange={handleChange}
+                                                type="text"
+                                            />
+                                        );
+                                    },
+                                };
                             case 'time':
                                 return {
                                     ...commonProps,
@@ -2600,6 +2639,7 @@ const DataGrid = forwardRef(
                                 name: filterName,
                                 operator: column.filter.operator,
                                 type: column.filter.type,
+                                whereHas: column.filter.whereHas || [],
                                 value: filterValue,
                                 reset: column.filter.reset
                                     ? column.filter.reset

package/src/components/crm/Form.jsx

@@ -619,7 +619,6 @@ function Form({
                                     validation += `${item.label} is a required field.<br/>`;
                                     _inputClass[item.id] = styles.inputError;
                                 } else {
-                                    console.info('b', formData, item.id);
                                     validation += `${item.label} is a required field.<br/>`;
                                     _inputClass[item.id] = styles.inputError;
                                 }

package/src/components/crm/QuickAction.jsx

@@ -398,7 +398,6 @@ const QuickAction = ({ childRef, navConfig }) => {
                 <button
                     onClick={() => {
                         if (location.pathname === '/leads/create') {
-                            console.info('aa');
                             childRef.current.contactOpen();
                         } else {
                             contactModalOpen('create', 0);

package/src/components/crm/generic/GenericAuth.jsx

@@ -51,8 +51,12 @@ const GenericAuth = ({
     const updateAuthStatus = async () => {
         try {
             const { data } = await CustomFetch('/ajax/user/profile', 'GET');
-            setUserProfile(data);
-            setIsAuthenticated(true);
+
+            if (data && data.id) {
+                setUserProfile(data);
+                setIsAuthenticated(true);
+            }
+
             setIsLoading(false);
 
             if (location.pathname.split('/')[1] === 'login') {

package/src/components/crm/generic/GenericDetail.jsx

@@ -192,6 +192,7 @@ function GenericDetail({
             relationKey,
             size,
             truncateLength,
+            checkboxLabel,
         } = item;
         const value =
             relation && relation.length > 0 && type !== 'total'
@@ -264,16 +265,22 @@ function GenericDetail({
                 return '';
             }
 
-            const formatKey = (key) => {
-                return key
-                    .toLowerCase()
-                    .split('_')
-                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(' ');
-            };
+            // Create a lookup map for checkbox labels if it exists
+            const labelMap = checkboxLabel
+                ? checkboxLabel.reduce((map, item) => {
+                      map[item.id] = item.label;
+                      return map;
+                  }, {})
+                : {};
 
             const keys = Object.keys(value)
-                .filter((key) => value[key] && key !== 'notes')
+                .filter(
+                    (key) =>
+                        (typeof value[key] === 'boolean' ||
+                            typeof value[key] === 'string') &&
+                        value[key] &&
+                        key !== 'notes'
+                )
                 .sort((a, b) => {
                     if (a === 'other') return 1;
                     if (b === 'other') return -1;
@@ -281,25 +288,30 @@ function GenericDetail({
                 });
 
             const formattedKeys = keys.map((key) => {
-                let formattedKey = formatKey(key);
-                if (key === 'other') {
-                    const otherValue = getValueFromData(
-                        data,
-                        [...relation],
-                        `${id}_other`,
-                        type
-                    );
-
-                    if (otherValue) {
-                        formattedKey += `: ${otherValue}`;
-                    }
+                // Use the label if available; otherwise, fallback to the formatted key
+                let label = labelMap[key] || formatKey(key);
+
+                // If the value is a string, append it directly to the label
+                if (typeof value[key] === 'string') {
+                    return `${label}: ${value[key]}`;
                 }
-                return formattedKey;
+
+                // Return the label for boolean values
+                return label;
             });
 
             return formattedKeys.join(', ');
         };
 
+        // Helper function to format the key as a fallback
+        const formatKey = (key) => {
+            return key
+                .toLowerCase()
+                .split('_')
+                .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+                .join(' ');
+        };
+
         const renderDate = () => formatDateValue(value);
 
         const renderDateTime = () => formatDateTimeValue(value);

package/src/components/crm/generic/GenericIndex.jsx

@@ -4,6 +4,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { Outlet } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import { saveAs } from 'file-saver';
+import parse from 'html-react-parser';
 import _ from 'lodash';
 import moment from 'moment';
 
@@ -387,7 +388,7 @@ function GenericIndex({
                                 : styles.crmtitleSimple
                         }`}
                     >
-                        <h1>{setting.page?.title}</h1>
+                        <h1>{parse(setting.page?.title)}</h1>
                         <div className={styles.titleInfo}>
                             <span>
                                 [<strong>{total}</strong> Total{' '}