@visns-studio/visns-components 2.8.5 → 2.8.7

package/components/crm/DataGrid.jsx

@@ -226,8 +226,65 @@ const DataGrid = forwardRef(
             }
         }, []);
 
-        const handleFilterChange = useCallback((d) => {
-            setFilterValue(d);
+        const findUpdatedFilter = (filters, currentValues) => {
+            for (const filter of filters) {
+                const matchingCurrentValue = currentValues.find(
+                    (currentValue) => currentValue.name === filter.name
+                );
+
+                if (
+                    matchingCurrentValue &&
+                    filter.value !== matchingCurrentValue.value
+                ) {
+                    return {
+                        key: filter.key || '',
+                        name: filter.name,
+                        oldValue: matchingCurrentValue.value,
+                        newValue: filter.value,
+                    };
+                }
+            }
+
+            return null; // No changes found
+        };
+
+        const handleFilterChange = useCallback((filters, currentValues) => {
+            const updatedFilter = findUpdatedFilter(filters, currentValues);
+            let updatedFilters = filters;
+            let resetMappings = [];
+
+            filters.forEach((filter) => {
+                if (filter.reset?.length > 0) {
+                    filter.reset.forEach((childId) => {
+                        resetMappings.push({ childId, parentId: filter.name });
+                    });
+                }
+            });
+
+            filters.forEach((filter, index) => {
+                if (
+                    filter.key &&
+                    resetMappings.some(
+                        (mapping) => mapping.childId === filter.key
+                    )
+                ) {
+                    resetMappings.forEach((mapping) => {
+                        if (
+                            updatedFilter &&
+                            mapping.childId === filter.key &&
+                            mapping.parentId === updatedFilter.name
+                        ) {
+                            updatedFilters[index].value = '';
+                            gridRef.current.setColumnFilterValue(
+                                updatedFilters[index].name,
+                                null
+                            );
+                        }
+                    });
+                }
+            });
+
+            setFilterValue(filters);
         }, []);
 
         const handleChangeSearch = (e) => {
@@ -2068,8 +2125,8 @@ const DataGrid = forwardRef(
                             headerProps={headerProps}
                             idProperty="id"
                             minRowHeight={40}
-                            onFilterValueChange={(filterValue) => {
-                                handleFilterChange(filterValue);
+                            onFilterValueChange={(fv) => {
+                                handleFilterChange(fv, filterValue);
                             }}
                             onLimitChange={setLimit}
                             onSelectionChange={handleSelectionChange}

package/components/crm/Field.jsx

@@ -227,6 +227,7 @@ function Field({
                 'plainrelationarray',
                 'plaintext',
                 'richeditor',
+                'time',
             ].includes(settings.type)
         ) {
             return (
@@ -667,6 +668,7 @@ function Field({
                 'plainrelationarray',
                 'plaintext',
                 'richeditor',
+                'time',
                 'toggle',
             ].includes(settings.type)
         ) {

package/package.json

@@ -44,7 +44,7 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "2.8.5",
+    "version": "2.8.7",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
     "scripts": {