@visns-studio/visns-components 5.10.0 → 5.10.2

package/package.json

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

package/src/components/crm/DataGrid.jsx

@@ -1836,15 +1836,7 @@ const DataGrid = forwardRef(
             return (
                 <div className={buttonClassName}>
                     {form.export && form.export.url && (
-                        <button
-                            className={styles.btn}
-                            style={{
-                                borderRadius: isSearchEnabled
-                                    ? 0
-                                    : 'var(--br, 4px)',
-                            }}
-                            onClick={exportTrigger}
-                        >
+                        <button className={styles.btn} onClick={exportTrigger}>
                             <LinkOut
                                 strokeWidth={2}
                                 size={16}
@@ -1854,15 +1846,7 @@ const DataGrid = forwardRef(
                         </button>
                     )}
                     {form.sort && form.sort.title && (
-                        <button
-                            className={styles.btn}
-                            style={{
-                                borderRadius: isSearchEnabled
-                                    ? 0
-                                    : 'var(--br, 4px)',
-                            }}
-                            onClick={sortTrigger}
-                        >
+                        <button className={styles.btn} onClick={sortTrigger}>
                             <Sort
                                 strokeWidth={2}
                                 size={16}
@@ -1878,11 +1862,6 @@ const DataGrid = forwardRef(
                     (form.url && form.create?.title !== '') ? (
                         <button
                             className={styles.btn}
-                            style={{
-                                borderRadius: isSearchEnabled
-                                    ? 0
-                                    : 'var(--br, 4px)',
-                            }}
                             onClick={(e) => {
                                 e.preventDefault();
 
@@ -1928,11 +1907,6 @@ const DataGrid = forwardRef(
                     ) : form.url && form.modal === false ? (
                         <button
                             className={styles.btn}
-                            style={{
-                                borderRadius: isSearchEnabled
-                                    ? 0
-                                    : 'var(--br, 4px)',
-                            }}
                             onClick={(e) => {
                                 e.preventDefault();
 
@@ -4790,15 +4764,7 @@ const DataGrid = forwardRef(
         }, [autoRefreshEnabled, refreshInterval, ajaxSetting]);
 
         return (
-            <div
-                style={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    border: 'none',
-                    borderRadius: '0',
-                    overflow: 'hidden',
-                }}
-            >
+            <>
                 {/* Top container with search, action buttons, and auto-refresh */}
                 {/* Only show top container if there are controls to display */}
                 {(renderSearch() ||
@@ -5353,11 +5319,11 @@ const DataGrid = forwardRef(
                 </div>
 
                 {/* Relocated auto refresh control when it's the only control */}
-                {shouldRelocateAutoRefresh() && (
+                {/* {shouldRelocateAutoRefresh() && (
                     <div className={styles.dataGridBottomContainer}>
                         {renderAutoRefreshControls(true)}
                     </div>
-                )}
+                )} */}
 
                 {audioSource && <audio src={audioSource} ref={audioRef} />}
                 <Popup
@@ -5632,7 +5598,7 @@ const DataGrid = forwardRef(
                     index={lightboxIndex}
                     slides={galleryData.map((img) => ({ src: img.src }))}
                 />
-            </div>
+            </>
         );
     }
 );

package/src/components/crm/Field.jsx

@@ -162,8 +162,18 @@ function Field({
             let filter = {};
 
             if (settings.where?.length > 0) {
+                const processedWhere = settings.where.map((whereItem) => {
+                    if (whereItem.getKey && formData[whereItem.getKey]) {
+                        return {
+                            ...whereItem,
+                            value: formData[whereItem.getKey],
+                        };
+                    }
+                    return whereItem;
+                });
+
                 filter = {
-                    where: settings.where,
+                    where: processedWhere,
                 };
             }
 
@@ -187,6 +197,8 @@ function Field({
                 };
             }
 
+            console.info(JSON.stringify(filter));
+
             CustomFetch(settings.url, 'POST', filter, function (result) {
                 setOptions(result.data);
 
@@ -247,7 +259,7 @@ function Field({
             );
             setCanvasUrl(canvasType.url);
         }
-    }, [settings, counter]);
+    }, [settings, counter, formData]);
 
     const fetchChildDropdownData = (s, v) => {
         let filter = {};
@@ -265,7 +277,9 @@ function Field({
                                     {
                                         id: s.id,
                                         value: _inputValue,
-                                        ...(a.whereHas && { whereHas: a.whereHas }),
+                                        ...(a.whereHas && {
+                                            whereHas: a.whereHas,
+                                        }),
                                     },
                                 ],
                             };

package/src/components/crm/styles/DataGrid.module.scss

@@ -10,7 +10,6 @@
     overflow: hidden;
     background: var(--primary-color);
     border: 1px solid rgba(var(--primary-rgb), 1.1);
-    border-radius: var(--br);
     outline: none;
     transition: all 0.2s cubic-bezier(0.85, 0, 0.15, 1) 0s;
 
@@ -493,8 +492,7 @@
 
 /* DataGrid top container and search container styles */
 .dataGridTopContainer {
-    justify-content: space-between;
-    align-items: center;
+    display: flex;
 }
 
 .dataGridTopLeftContainer {
@@ -505,7 +503,6 @@
     display: flex;
     align-items: center;
     justify-content: flex-end;
-    padding-right: 10px;
 }
 
 /* Date field styling for uniform width */
@@ -595,8 +592,6 @@
     height: 38px;
     background-color: #f9fafb;
     border: 1px solid #d1d5db;
-    border-radius: var(--br, 4px);
-    margin-left: 10px;
     margin-bottom: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
 }
@@ -658,11 +653,6 @@
         border: none;
         box-sizing: border-box;
 
-        &:last-child {
-            border-top-right-radius: var(--br, 4px);
-            border-bottom-right-radius: var(--br, 4px);
-        }
-
         &:focus,
         &:active {
             outline: none;
@@ -681,7 +671,6 @@
 
     > .btn {
         height: 38px;
-        border-radius: var(--br, 4px);
         display: flex;
         align-items: center;
         justify-content: center;