@visns-studio/visns-components 1.7.2 → 1.7.4

package/.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-3.6.1.cjs

package/components/crm/visns-data-grid.jsx

@@ -155,7 +155,7 @@ const DataGrid = forwardRef(
                 const sqlResult = loadData(params, dSearch, ajaxSetting);
 
                 if (setFilterData && params.filterValue) {
-                    setFilterData([params.filterValue]);
+                    setFilterData(params.filterValue);
                 }
 
                 sqlResult.then((res) => {
@@ -189,9 +189,23 @@ const DataGrid = forwardRef(
             },
         }));
 
-        const handleFilterChange = (d) => {
+        const handleFilterChange = useCallback((d) => {
+            // d.forEach((filterValue) => {
+            //     if (filterValue.reset && filterValue.reset.length > 0) {
+            //         filterValue.reset.forEach((reset) => {
+            //             const existingIndex = d.findIndex(
+            //                 (f) => f.key === reset
+            //             );
+
+            //             if (existingIndex !== -1) {
+            //                 d[existingIndex].value = "";
+            //             }
+            //         });
+            //     }
+            // });
+
             setFilterValue(d);
-        };
+        }, []);
 
         const handleChangeSearch = (e) => {
             const { value } = e.target;
@@ -510,7 +524,9 @@ const DataGrid = forwardRef(
             if (s.active) {
                 if (
                     d.hasOwnProperty(s.active.id) &&
-                    d[s.active.id] === s.active.value
+                    d[s.active.id] === s.active.value &&
+                    s.active.type !== "greater" &&
+                    s.active.type !== "not null"
                 ) {
                     iconStyle = {
                         color: s.active.colour,
@@ -529,6 +545,10 @@ const DataGrid = forwardRef(
                     iconStyle = {
                         color: s.active.colour,
                     };
+                } else {
+                    iconStyle = {
+                        color: "",
+                    };
                 }
             }
 
@@ -1570,6 +1590,7 @@ const DataGrid = forwardRef(
                         operator: column.filter.operator,
                         type: column.filter.type,
                         value: column.filter.value ? column.filter.value : "",
+                        reset: column.filter.reset ? column.filter.reset : [],
                     };
                 });
 
@@ -1593,13 +1614,11 @@ const DataGrid = forwardRef(
                             : {},
                         (res) => {
                             let filterName;
-
                             if (Array.isArray(column.id)) {
                                 const concatenatedIds = column.id.reduce(
                                     (acc, id) => acc + `${id}.`,
                                     ""
                                 );
-
                                 filterName = column.nameFrom
                                     ? concatenatedIds + column.nameFrom
                                     : concatenatedIds;
@@ -1608,11 +1627,9 @@ const DataGrid = forwardRef(
                                     ? column.id + column.nameFrom
                                     : column.id;
                             }
-
                             const filterIndex = filterDataSource.findIndex(
                                 (filter) => filter.id === filterName
                             );
-
                             if (filterIndex >= 0) {
                                 const updatedFilter = {
                                     ...filterDataSource[filterIndex],
@@ -1640,16 +1657,13 @@ const DataGrid = forwardRef(
                     let filterName = Array.isArray(column.id)
                         ? column.id.reduce((acc, id) => acc + `${id}.`, "")
                         : column.id;
-
                     if (column.nameFrom) {
                         filterName += column.nameFrom;
                     }
-
                     const newFilter = {
                         id: filterName,
                         dataset: column.filter.options,
                     };
-
                     setFilterDataSource((prevState) => [
                         ...prevState,
                         newFilter,
@@ -1734,7 +1748,9 @@ const DataGrid = forwardRef(
                         "-"
                     )}`}
                     minRowHeight={40}
-                    onFilterValueChange={setFilterValue}
+                    onFilterValueChange={(filterValue) => {
+                        handleFilterChange(filterValue);
+                    }}
                     onLimitChange={setLimit}
                     onRenderRow={onRenderRow}
                     pagination

package/package.json

@@ -1,17 +1,17 @@
 {
     "dependencies": {
-        "@inovua/reactdatagrid-community": "^5.9.4",
+        "@inovua/reactdatagrid-community": "^5.10.1",
         "akar-icons": "^1.9.28",
         "awesome-debounce-promise": "^2.1.0",
         "axios": "^1.4.0",
-        "framer-motion": "^10.12.16",
+        "framer-motion": "^10.12.18",
         "html-react-parser": "^4.0.0",
         "lodash": "^4.17.21",
         "moment": "^2.29.4",
         "numeral": "^2.0.6",
         "quill-image-uploader": "^1.3.0",
         "react-confirm-alert": "^3.0.6",
-        "react-datepicker": "^4.14.0",
+        "react-datepicker": "^4.15.0",
         "react-dropzone": "^14.2.3",
         "react-number-format": "^5.2.2",
         "react-promise-tracker": "^2.1.1",
@@ -21,7 +21,7 @@
         "react-sortable-hoc": "^2.0.0",
         "react-toastify": "^9.1.3",
         "react-toggle": "^4.1.3",
-        "react-tooltip": "^5.14.0",
+        "react-tooltip": "^5.18.0",
         "react-window": "^1.8.9",
         "reactjs-popup": "^2.0.5"
     },
@@ -34,10 +34,9 @@
         "react-dom": "^17.0.1"
     },
     "name": "@visns-studio/visns-components",
-    "version": "1.7.2",
+    "version": "1.7.4",
     "description": "Various packages to assist in the development of our Custom Applications.",
     "main": "index.js",
-    "devDependencies": {},
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
     },
@@ -50,5 +49,6 @@
     "bugs": {
         "url": "https://github.com/visnsstudio/visns-components/issues"
     },
-    "homepage": "https://github.com/visnsstudio/visns-components#readme"
+    "homepage": "https://github.com/visnsstudio/visns-components#readme",
+    "packageManager": "yarn@3.6.1"
 }