From a3d98595e2bb6a3c1a893edbcff5d4cf8230bd4a Mon Sep 17 00:00:00 2001
From: Danielv123 <danielv@danielv.no>
Date: Mon, 22 Nov 2021 13:28:29 +0100
Subject: [PATCH] Fix linter errors

---
 .../web_ui/src/components/BaseConfigTree.jsx  | 53 +++++++++----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/packages/web_ui/src/components/BaseConfigTree.jsx b/packages/web_ui/src/components/BaseConfigTree.jsx
index 15581814..5f78d44d 100644
--- a/packages/web_ui/src/components/BaseConfigTree.jsx
+++ b/packages/web_ui/src/components/BaseConfigTree.jsx
@@ -3,6 +3,30 @@ import { Button, Card, Checkbox, Form, Input, InputNumber, Space, Spin, Tree, Ty
 
 const { Title } = Typography;
 
+function getInitialValues(config, props) {
+	let initialValues = {};
+	for (let [name, GroupClass] of props.ConfigClass.groups) {
+		let group = config.group(name);
+		for (let def of GroupClass.definitions.values()) {
+			if (!group.canAccess(def.name)) {
+				continue;
+			}
+
+			let value = group.get(def.name);
+			let fieldName = `${group.name}.${def.name}`;
+
+			if (def.type === "object") {
+				for (let prop of Object.keys(value)) {
+					let propPath = `${group.name}.${def.name}.${prop}`;
+					initialValues[propPath] = JSON.stringify(value[prop]);
+				}
+			} else {
+				initialValues[fieldName] = value;
+			}
+		}
+	}
+	return initialValues;
+}
 
 export default function BaseConfigTree(props) {
 	let [config, setConfig] = useState(null);
@@ -19,8 +43,8 @@ export default function BaseConfigTree(props) {
 		return newConfig;
 	}
 	useEffect(() => {
-		updateConfig().then(config => {
-			form.setFieldsValue(getInitialValues(config, props));
+		updateConfig().then(updatedConfig => {
+			form.setFieldsValue(getInitialValues(updatedConfig, props));
 		});
 	}, [props.id]);
 
@@ -255,28 +279,3 @@ export default function BaseConfigTree(props) {
 		</Card>
 	</>;
 }
-
-function getInitialValues(config, props) {
-	let initialValues = {};
-	for (let [name, GroupClass] of props.ConfigClass.groups) {
-		let group = config.group(name);
-		for (let def of GroupClass.definitions.values()) {
-			if (!group.canAccess(def.name)) {
-				continue;
-			}
-
-			let value = group.get(def.name);
-			let fieldName = `${group.name}.${def.name}`;
-
-			if (def.type === "object") {
-				for (let prop of Object.keys(value)) {
-					let propPath = `${group.name}.${def.name}.${prop}`;
-					initialValues[propPath] = JSON.stringify(value[prop]);
-				}
-			} else {
-				initialValues[fieldName] = value;
-			}
-		}
-	}
-	return initialValues;
-}