@visns-studio/visns-components 1.3.11 → 1.3.13

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

@@ -831,9 +831,38 @@ const DataGrid = forwardRef(
 							type: "number",
 						};
 					case "option":
+						selectedDataSource = filterDataSource.reduce(
+							(acc, fds) => {
+								if (fds.id === column.id) {
+									return fds.dataset;
+								}
+								return acc;
+							},
+							null
+						);
+
+						if (
+							column.filter &&
+							column.filter.type &&
+							column.filter.type === "select"
+						) {
+							filterEditor = SelectFilter;
+							filterEditorProps = {
+								placeholder: column.filter.placeholder
+									? column.filter.placeholder
+									: "All Options",
+								dataSource: selectedDataSource,
+							};
+						} else {
+							filterEditor = null;
+							filterEditorProps = null;
+						}
+
 						return {
 							...commonProps,
 							name: column.id,
+							filterEditor: filterEditor,
+							filterEditorProps: filterEditorProps,
 							render: ({ data }) => {
 								if (
 									data &&
@@ -906,7 +935,11 @@ const DataGrid = forwardRef(
 									if (acc === "") {
 										return data[id];
 									} else {
-										return acc[id];
+										if (acc[id]) {
+											return acc[id];
+										} else {
+											return "";
+										}
 									}
 								}, "");
 

package/package.json

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