@visns-studio/visns-components 5.7.6 → 5.7.7

package/package.json

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

package/src/components/crm/TableFilter.jsx

@@ -5,6 +5,7 @@ function TableFilter({
     filters,
     setFilters,
     setSettings,
+    settings,
     type,
     onFilterChange,
 }) {
@@ -165,15 +166,36 @@ function TableFilter({
             }
             // For non-parent filters (backward compatibility)
             else {
+                const updatedChildren = isParent
+                    ? filter.children.map((child) => ({
+                          ...child,
+                          class: child.id === id ? 'subactivechildren' : '',
+                          show: child.id === id,
+                          active: child.id === id,
+                      }))
+                    : filter.children
+                    ? filter.children.map((child, childKey) => ({
+                          ...child,
+                          class:
+                              childKey === 0 && isActive
+                                  ? 'subactivechildren'
+                                  : '',
+                          show: childKey === 0 && isActive,
+                          active: childKey === 0 && isActive,
+                      }))
+                    : [];
+
                 return {
                     ...filter,
-                    class: isActive
-                        ? type === 'simple'
-                            ? 'activetab'
-                            : 'subactive'
-                        : '',
-                    show: isActive,
-                    active: isActive,
+                    class:
+                        isActive || isParent
+                            ? type === 'simple'
+                                ? 'activetab'
+                                : 'subactive'
+                            : '',
+                    show: isActive || isParent,
+                    active: isActive || isParent,
+                    children: updatedChildren,
                 };
             }
         };
@@ -199,27 +221,36 @@ function TableFilter({
         let updatedSettings = null;
 
         if (setSettings) {
-            // For child items or non-parent items, we need to update the filter value
+            // For child items, non-parent items, or parent items with a value property
+            // we need to update the filter value
             if (
                 filtertype === 'children' ||
                 (filtertype === 'parent' &&
-                    !filters.find((f) => f.id === id && f.isParent))
+                    (!filters.find((f) => f.id === id && f.isParent) ||
+                        filters.find(
+                            (f) => f.id === id && f.hasOwnProperty('value')
+                        )))
             ) {
-                // For child filters, we need to update the filter with the child's ID
+                // For filters, we need to update the filter with the ID and value
                 const filterId = id;
                 const filterValue = value || '';
 
                 // Start with the current settings
-                updatedSettings = { ...setSettings._currentValue };
+                // Check if _currentValue exists (React state setter) or use the object directly
+                updatedSettings = setSettings._currentValue
+                    ? { ...setSettings._currentValue }
+                    : { ...setSettings };
 
                 if (updatedSettings.ajaxSetting) {
                     // First, remove any existing filters that might conflict
-                    let _where = [...updatedSettings.ajaxSetting.where].filter(
-                        (item) => {
-                            // Keep items that don't match this filter ID
-                            return item.id !== filterId;
-                        }
-                    );
+                    let _where = updatedSettings.ajaxSetting.where
+                        ? [...updatedSettings.ajaxSetting.where].filter(
+                              (item) => {
+                                  // Keep items that don't match this filter ID
+                                  return item.id !== filterId;
+                              }
+                          )
+                        : [];
 
                     // Add the new filter
                     _where.push({ id: filterId, value: filterValue });
@@ -244,6 +275,15 @@ function TableFilter({
                     w.push({ id: filterId, value: filterValue });
 
                     updatedSettings = { ...updatedSettings, where: w };
+                } else {
+                    // If neither ajaxSetting.where nor where exists, create a new ajaxSetting
+                    updatedSettings = {
+                        ...settings,
+                        ajaxSetting: {
+                            ...(settings.ajaxSetting || {}),
+                            where: [{ id: filterId, value: filterValue }],
+                        },
+                    };
                 }
             }
         }

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

@@ -576,6 +576,7 @@ function GenericIndex({
                                         filters={subnav}
                                         setFilters={setSubnav}
                                         setSettings={setConfig}
+                                        settings={config}
                                         type={layout}
                                         onFilterChange={handleFilterChange}
                                     />
@@ -598,6 +599,7 @@ function GenericIndex({
                                     filters={subnav}
                                     setFilters={setSubnav}
                                     setSettings={setConfig}
+                                    settings={config}
                                     type={layout}
                                     onFilterChange={handleFilterChange}
                                 />