@visns-studio/visns-components 5.0.27 → 5.0.29

package/package.json

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

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

@@ -70,9 +70,9 @@ function GenericDashboard({ setting }) {
         }
     };
 
-    useEffect(() => {
-        fetchData(filters); // Fetch initial data
-    }, [setting]);
+    // useEffect(() => {
+    //     fetchData(filters); // Fetch initial data
+    // }, [setting]);
 
     const openModal = (widgetId) => {
         setModalContent(widgetId);
@@ -165,6 +165,7 @@ function GenericDashboard({ setting }) {
     useEffect(() => {
         // Fetch data whenever filters are updated
         if (Object.keys(filters).length > 0) {
+            console.info(filters);
             fetchData(filters);
         }
     }, [filters]);
@@ -244,14 +245,6 @@ function GenericDashboard({ setting }) {
                         }
                     })}
                     <div className={styles['filter-actions']}>
-                        {/* <button
-                            className={`${styles.btn} ${styles['btn-primary']}`}
-                            onClick={() => {
-                                fetchData(filters); // Trigger fetchData with the current filters
-                            }}
-                        >
-                            Apply Filters
-                        </button> */}
                         <button
                             className={`${styles.btn} ${styles['btn-secondary']}`}
                             onClick={() => {
@@ -285,10 +278,11 @@ function GenericDashboard({ setting }) {
                         widget.props.keys = widgetData.keys;
                     }
 
-                    const barData = widgetData.bar?.data || widgetData;
+                    const barData =
+                        widgetData.bar?.data || widgetData.data || widgetData;
 
                     return (
-                        <div style={{ height: '600px' }}>
+                        <div style={{ height: widget.height || '600px' }}>
                             <ResponsiveBar data={barData} {...widget.props} />
                         </div>
                     );

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

@@ -1682,7 +1682,15 @@ function GenericDetail({
                 const options = {};
                 for (const column of ajaxColumns) {
                     try {
-                        const res = await CustomFetch(column.url, 'POST');
+                        let params = {};
+
+                        if (column.fields) {
+                            params.fields = column.fields;
+                        }
+
+                        const res = await CustomFetch(column.url, 'POST', {
+                            ...params,
+                        });
                         options[column.id] = res.data.data || res.data || []; // Assume API returns options in the expected format
                     } catch (error) {
                         console.error(

package/src/components/crm/generic/styles/GenericDashboard.module.scss

@@ -157,20 +157,21 @@
     border-top: 1px solid transparent !important;
     border-left: 1px solid transparent !important;
     border-right: 1px solid transparent !important;
-    border-bottom: 4px solid rgba(var(--primary-color-rgb), 0.9) !important;
+    border-bottom: 4px solid rgba(var(--secondary-rgb), 0.9) !important;
 
     h2 {
         color: var(--highlight-color) !important;
     }
 
     .widgetTitle {
-        border-bottom: 1px dashed rgba(#dadce0, 0.15);
+        padding-bottom: 10px;
+        border-bottom: 1px solid rgba(var(--secondary-rgb), 0.5);
     }
 }
 
 .dashwidget--highlight {
-    background: var(--primary-color) !important;
-    border-bottom: 4px solid rgba(var(--primary-color-rgb), 0.85) !important;
+    background: var(--secondary-color) !important;
+    border-bottom: 4px solid rgba(var(--secondary-rgb), 0.85) !important;
 }
 
 .widgetNo {