@visns-studio/visns-components 1.4.15 → 1.5.1

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

@@ -597,6 +597,8 @@ const DataGrid = forwardRef(
 							...commonProps,
 							name: `${column.type}.${column.id}`,
 							render: ({ data }) => {
+								value = "";
+
 								if (data.address1) {
 									value += `${data.address1} `;
 								}

package/components/crm/visns-form.jsx

@@ -268,50 +268,41 @@ function Form(props) {
 	};
 
 	const autocompleteSelect = (place, id) => {
-		let address1 = place.address
-			? place.address + " " + place.text
-			: place.text;
+		const { address, text, context } = place;
+		const address1 = address !== undefined ? address + " " + text : text;
 		let address2 = "";
 		let suburb = "";
 		let postcode = "";
 		let state = "";
 		let country = "";
 
-		if (place.context[1]) {
-			suburb = place.context[1].text;
+		if (context[1]) {
+			suburb = context[1].text;
 		}
 
-		if (place.context[0]) {
-			postcode = place.context[0].text;
+		if (context[0]) {
+			postcode = context[0].text;
 		}
 
-		if (place.context.length === 5) {
-			if (place.context[3]) {
-				state = place.context[3].text;
-			}
-
-			if (place.context[4]) {
-				country = place.context[4].text;
-			}
+		if (context.length === 5) {
+			[state, country] = [context[3]?.text, context[4]?.text];
 		} else {
-			if (place.context[2]) {
-				state = place.context[2].text;
-			}
-
-			if (place.context[3]) {
-				country = place.context[3].text;
-			}
+			[state, country] = [context[2]?.text, context[3]?.text];
 		}
 
+		const formDataUpdate = {
+			address1,
+			address2,
+			suburb,
+			postcode,
+			state,
+			country,
+		};
+
 		if (formData.same_address === true) {
 			setFormData((prevState) => ({
 				...prevState,
-				address1: address1,
-				address2: address2,
-				suburb: suburb,
-				postcode: postcode,
-				state: state,
-				country: country,
+				...formDataUpdate,
 				postal_address1: address1,
 				postal_address2: address2,
 				postal_suburb: suburb,
@@ -319,28 +310,22 @@ function Form(props) {
 				postal_state: state,
 				postal_country: country,
 			}));
+		} else if (id === "address1") {
+			setFormData((prevState) => ({
+				...prevState,
+				...formDataUpdate,
+			}));
 		} else {
-			if (id === "address1") {
-				setFormData((prevState) => ({
-					...prevState,
-					address1: address1,
-					address2: address2,
-					suburb: suburb,
-					postcode: postcode,
-					state: state,
-					country: country,
-				}));
-			} else {
-				setFormData((prevState) => ({
-					...prevState,
-					postal_address1: address1,
-					postal_address2: address2,
-					postal_suburb: suburb,
-					postal_postcode: postcode,
-					postal_state: state,
-					postal_country: country,
-				}));
-			}
+			setFormData((prevState) => ({
+				...prevState,
+				...formDataUpdate,
+				postal_address1: address1,
+				postal_address2: address2,
+				postal_suburb: suburb,
+				postal_postcode: postcode,
+				postal_state: state,
+				postal_country: country,
+			}));
 		}
 	};
 

package/package.json

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