@visns-studio/visns-components 1.5.9 → 1.5.11

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

@@ -1199,7 +1199,8 @@ const DataGrid = forwardRef(
 
 								if (
 									relationValue &&
-									Array.isArray(relationValue)
+									Array.isArray(relationValue) &&
+									relationValue.length > 0
 								) {
 									const nameProperties = Array.isArray(
 										column.nameFrom
@@ -1257,48 +1258,46 @@ const DataGrid = forwardRef(
 										})
 										.filter((value) => value !== "");
 
-									if (values.length > 0) {
-										let result = "";
+									// if (values.length > 0) {
+									let result = "";
 
-										if (
-											column.relation?.id &&
-											column.relation?.key
-										) {
-											const relationValue =
-												column.relation.key.reduce(
-													(acc, id) =>
-														acc === ""
-															? data[id]
-															: acc && acc[id]
-															? acc[id]
-															: "",
-													""
-												);
+									if (
+										column.relation?.id &&
+										column.relation?.key
+									) {
+										const relationValue =
+											column.relation.key.reduce(
+												(acc, id) =>
+													acc === ""
+														? data[id]
+														: acc && acc[id]
+														? acc[id]
+														: "",
+												""
+											);
 
-											result = `${
-												relationValue[
-													column.relation.id
-												]
-											}<br />`;
-										}
+										result = `${
+											relationValue[column.relation.id]
+										}<br />`;
+									}
 
+									if (
+										column.where &&
+										column.where.id &&
+										column.where.value
+									) {
 										if (
-											column.where &&
-											column.where.id &&
+											data[column.where.id] ===
 											column.where.value
 										) {
-											if (
-												data[column.where.id] ===
-												column.where.value
-											) {
-												result += values.join("<br />");
-											}
-										} else {
 											result += values.join("<br />");
 										}
-
-										return <span>{parse(result)}</span>;
+									} else {
+										result += values.join("<br />");
 									}
+
+									return <span>{parse(result)}</span>;
+									// }
 								} else {
 									let result = "";
 
@@ -1318,7 +1317,12 @@ const DataGrid = forwardRef(
 											);
 
 										result =
-											relationValue[column.relation.id];
+											relationValue &&
+											relationValue[column.relation.id]
+												? relationValue[
+														column.relation.id
+												  ]
+												: "";
 									}
 
 									return <span>{parse(result)}</span>;

package/components/crm/visns-form.jsx

@@ -446,7 +446,7 @@ function Form(props) {
 				});
 			}
 
-			if (fileUpload === true) {
+			if (fileUpload === true && formData[fileKey] !== null) {
 				Vapor.store(formData[fileKey], {
 					progress: (progress) => {
 						setUploadProgress(progress * 100);

package/components/crm/visns-select.jsx

@@ -12,7 +12,7 @@ function Select(props) {
 			value={inputValue}
 			data-show={settings.show ? JSON.stringify(settings.show) : ""}
 		>
-			<option>Please select an option</option>
+			<option value="">Please select an option</option>
 			{options.map((item, index) => (
 				<option
 					key={settings.id + "-" + item.id}

package/package.json

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