got saving working

Author: Ian Redpath

public/assignment/views/forms/fields.controller.ts

@@ -69,8 +69,6 @@ export class FieldsController {
 		return this.newFieldMap[this.newFieldType]
 	}
 	addNewField() {
-		console.log(this.newFieldType)
-		console.log(this.getNewField())
 		this.fieldsService.createFieldForForm(this.formId, this.getNewField())
 			.subscribe(resp => {
 				this.fields = resp.json().fields
@@ -90,6 +88,7 @@ export class FieldsController {
 		if (field.options) {
 			field.options = this.getOptionsFor(field._id)
 		}
+		console.log(field.options)
 		this.fieldsService.updateField(this.formId, field._id, field)
 			.subscribe(resp => {
 				this.fields = resp.json().fields
@@ -100,10 +99,14 @@ export class FieldsController {
 	getOptionsFor(id) {
 		const optionString = this.optionsMap[id]
 		const optionsArray = optionString.split('\n')
-		return optionsArray.map(opt => {
-			const labelValuePair = opt.split(":")
-			return { label: labelValuePair[0], value: labelValuePair[1] }
+		let retVal = []
+		optionsArray.forEach(opt => {
+			if (opt) {
+				const labelValuePair = opt.split(":")
+				retVal.push({ label: labelValuePair[0], value: labelValuePair[1] })
+			} 
 		})
+		return retVal
 	}
 	isTextField(type) {
 		return type === 'TEXT' || type === 'TEXTAREA'

server/models/form.model.ts

@@ -58,13 +58,13 @@ export default class FormModel {
 
 	getFieldForForm(formId: string, fieldId: string) {
 		const fields = this.getFieldsForForm(formId)
-		return _.find(fields, field => { return field._id === fieldId })
+		return _.find(fields, field => { return field._id.toString() === fieldId.toString() })
 	}
 
 	deleteFieldForForm(formId: string, fieldId: string) {
 		const form = this.findById(formId)
 		const fields: Array<any> = form.fields
-		_.remove(fields, field => { return field._id === fieldId })
+		_.remove(fields, field => { return field._id.toString() === fieldId.toString() })
 		return fields
 	}
 
@@ -76,13 +76,15 @@ export default class FormModel {
 	}
 
 	updateFieldForForm(formId: string, fieldId: string, field) {
+		console.log(field)
 		const form = this.findById(formId)
 		const fields: Array<any> = form.fields
-		fields.forEach(f => {
-			if (field._id === fieldId) {
-				f = field
+		form.fields = fields.map(f => {
+			if (f._id.toString() === fieldId) {
+				return field
 			}
+			return f
 		})
-		return fields
+		return form.fields
 	}
 }

server/services/field.service.server.ts

@@ -27,7 +27,7 @@ export default function FieldEndpoints(app, formModel: FormModel) {
 		res.status(200).send({ fields: updatedFields })
 	})
 
-	app.put('/api/assignment/form/:formId/field/:fieldid', (req, res) => {
+	app.put('/api/assignment/form/:formId/field/:fieldId', (req, res) => {
 		const { formId, fieldId } = req.params
 		const field = req.body.field
 		const updatedFields = formModel.updateFieldForForm(formId, fieldId, field)