Merge pull request #13 from DSACMS/nat/cleanup

MVP: Cleanup and refactor code.json download

Author: natalialuzuriaga

form.html index.htmlform.html renamed to index.html

@@ -14,58 +14,62 @@ async function retrieveFile(filePath) {
 	}
 }
 
-// Populates blank code.json object with values from form
-function populateObject(data, blankObject) {
-
-	for (const key in data) {
-		if (blankObject.hasOwnProperty(key)) {
-			console.log(`${key}: ${data[key]}`);
-
-			if(typeof data[key] === "object" && isMultiSelect(data[key])) {
-				blankObject[key] = getSelectedOptions(data[key]);
-			}
-			else {
-				blankObject[key] = data[key];
-			}
-			
-		}
-	}
-}
-
 function isMultiSelect(obj) {
-	  for (const key in obj) {
-		if (typeof obj[key] !== 'boolean') {
-		  return false;
-		}
+	for (const key in obj) {
+	  if (typeof obj[key] !== 'boolean') {
+		return false;
 	  }
-	  return true; // Return true if all values are booleans
+	}
+	return true; // Returns true if all values are booleans
 }
 
 // Convert from dictionary to array
 function getSelectedOptions(options) {
-	let selectedOptions = [];
+  let selectedOptions = [];
+
+  for (let key in options) {
+	  if(options[key]) {
+		  selectedOptions.push(key);
+	  }
+  }
+  return selectedOptions;
+}
+
+// Populates fields with form data
+function populateObject(data, schema) {
+	let reorderedObject = {}
+
+	// Array of fields following proper order of fields in schema
+	const fields = Object.keys(schema.properties.items);
 
-	for (let key in options) {
-		if(options[key]) {
-			selectedOptions.push(key);
+	for (const key of fields) {
+		let value = data[key];
+
+		// Adjusts value accordingly if multi-select field
+		if((typeof value === "object" && isMultiSelect(value))) {
+			value = getSelectedOptions(value);
 		}
+
+		reorderedObject[key] = value;
 	}
-	return selectedOptions;
+
+	return reorderedObject;
 }
 
 async function populateCodeJson(data) {
-	// Path to the blank json file
-	const filePath = "schemas/template-code.json";
+	const filePath = "schemas/schema-0.0.0.json";
 
-	let codeJson = await retrieveFile(filePath);
+	// Retrieves schema with fields in correct order
+	const schema = await retrieveFile(filePath);
+	let codeJson = {};
 
-	if (codeJson) {
-		populateObject(data, codeJson);
+	// Populates fields with form data
+	if (schema) {
+		codeJson = populateObject(data, schema);
 	} else {
 		console.error("Failed to retrieve JSON data.");
 	}
 
-	console.log("FINAL CODE JSON HERE", codeJson);
 	return codeJson;
 }
 

js/formDataToJson.js

@@ -53,15 +53,14 @@ function determineType(field) {
 
 // Creates Form.io component based on json field type
 function createComponent(fieldName, fieldObject) {
-	var componentType = determineType(fieldObject);
+	const componentType = determineType(fieldObject);
 	switch (componentType) {
 		case "textfield":
 			return {
 				type: "textfield",
 				key: fieldName,
 				label: fieldName,
 				input: true,
-				tooltip: fieldObject["description"],
 				description: fieldObject["description"]
 			};
 		case "tags":
@@ -105,7 +104,6 @@ function createComponent(fieldName, fieldObject) {
 				type: "radio",
 				input: true,
 				description: fieldObject["description"],
-				tooltip: fieldObject["description"]
 			};
 		case "selectboxes":
 			var options = transformArrayToOptions(fieldObject.items.enum);
@@ -224,14 +222,14 @@ function createAllComponents(schema, prefix = ""){
 
 	if (schema.type === "object" && schema.properties) {
 
-		let items = schema.properties.hasOwnProperty("items") ? schema.properties.items : schema.properties
+		const items = schema.properties.hasOwnProperty("items") ? schema.properties.items : schema.properties
 
         for (const [key, value] of Object.entries(items)) {
 
 			console.log("key at play:", key);
 			const fullKey = prefix ? `${prefix}.${key}` : key;
 
-			var fieldComponent = createComponent(key, value);
+			let fieldComponent = createComponent(key, value);
 
 			if (fieldComponent.type === "container") {
 				fieldComponent.components = createAllComponents(value, fullKey);
@@ -252,7 +250,7 @@ async function createFormComponents() {
 	let components = [];
 
 	const filePath = "schemas/schema-0.0.0.json";
-	let jsonData = await retrieveFile(filePath);
+	const jsonData = await retrieveFile(filePath);
 	console.log("JSON Data:", jsonData);
 
 	createFormHeading(jsonData["title"], jsonData["description"]);