Merge branch 'fixUXBugs' into updateSetupScript

app/controllers/forms.server.controller.js

@@ -364,8 +364,8 @@ exports.update = function(req, res) {
 
     var form = req.form;
     var updatedForm = req.body.form;
- 
+
-    if(!form.analytics){
+    if(!form.analytics && req.body.form.analytics){
     	form.analytics = {
     		visitors: [],
     		gaCode: ''
@@ -379,9 +379,18 @@ exports.update = function(req, res) {
 			diff.applyChange(form._doc, true, change);
 		});
 	} else {
+		if(!updatedForm){
+			res.status(400).send({
+				message: 'Updated Form is empty'
+			});
+		}
 
-	    delete updatedForm.__v;
+		delete updatedForm.lastModified; 
 	    delete updatedForm.created; 
+	    delete updatedForm.id;
+	    delete updatedForm._id;
+	    delete updatedForm.__v;
+
 		//Unless we have 'admin' privileges, updating the form's admin is disabled
 		if(updatedForm && req.user.roles.indexOf('admin') === -1) {
 			delete updatedForm.admin;
@@ -556,7 +565,8 @@ exports.formByIDFast = function(req, res, next, id) {
  */
 exports.hasAuthorization = function(req, res, next) {
 	var form = req.form;
-	if (req.form.admin.id !== req.user.id && req.user.roles.indexOf('admin') === -1) {
+	debugger
+	if (req.form.admin.id !== req.user.id || req.user.roles.indexOf('admin') > -1) {
 		res.status(403).send({
 			message: 'User '+req.user.username+' is not authorized to edit Form: '+form.title
 		});

app/libs/constants.js

@@ -22,24 +22,33 @@ var constants = module.exports = {
 		'date',
 		'email',
 		'legal',
-		'url',
 		'textarea',
+		'link',
 		'statement',
-		'welcome',
-		'thankyou',
-		'file',
 		'dropdown',
-		'scale',
 		'rating',
 		'radio',
-		'checkbox',
 		'hidden',
 		'yes_no',
-		'natural',
-		'stripe',
 		'number'
 	],
 
+    ratingShapeTypes: [
+		'Heart',
+		'Star',
+		'thumbs-up',
+		'thumbs-down',
+		'Circle',
+		'Square',
+		'Check Circle',
+		'Smile Outlined',
+		'Hourglass',
+		'bell',
+		'Paper Plane',
+		'Comment',
+		'Trash'
+	],
+
     ratingShapeTypes: [
     		'Heart',
 			'Star',

app/libs/send-email-notifications.js

@@ -39,8 +39,8 @@ module.exports = {
 	createFieldDict: function(form_fields){
 		var formFieldDict = {};
 		form_fields.forEach(function(field){
-			if(field.hasOwnProperty('globalId') && field.hasOwnProperty('fieldValue')){
+			if(field.hasOwnProperty('fieldValue') && field.hasOwnProperty('_id')){
-				formFieldDict[field.globalId+''] = field.fieldValue+'';
+				formFieldDict[field._id] = String(field.fieldValue);
 			}
 		});
 		return formFieldDict;

app/models/form.server.model.js

@@ -228,30 +228,6 @@ FormSchema.plugin(timeStampPlugin, {
 	useVirtual: false
 });
 
-function getDeletedIndexes(needle, haystack){
-	var deletedIndexes = [];
-
-	if(haystack.length > 0){
-	  	for(var i = 0; i < needle.length; i++){
-	    	if(haystack.indexOf(needle[i]) === -1){
-				deletedIndexes.push(i);
-	    	}
-	  	}
-	}
-	return deletedIndexes;
-}
-
-function formFieldsAllHaveIds(form_fields){
-	if(form_fields){
-		for(var i=0; i<form_fields.length; i++){
-			if(form_fields[i] && !form_fields[i].hasOwnProperty('_id') && !form_fields[i].hasOwnProperty('globalId')){
-				return false;
-			}
-		}
-	}
-	return true;
-}
-
 FormSchema.pre('save', function (next) {
 	if(this.form_fields && this.form_fields.length){
 		this.form_fields = this.form_fields.filter(function(field){

app/models/form_field.server.model.js

@@ -49,13 +49,6 @@ function BaseFieldSchema(){
 	Schema.apply(this, arguments);
 
 	this.add({
-		newOptionSchema: {
-			type: Boolean,
-			default: false
-		},
-		globalId: {
-			type: String,
-    	},
 		isSubmission: {
 			type: Boolean,
 			default: false
@@ -151,21 +144,13 @@ FormFieldSchema.pre('validate', function(next) {
 		if(this.fieldOptions && this.fieldOptions.length > 0){
 			error.errors.ratingOptions = new mongoose.Error.ValidatorError({path:'fieldOptions', message: 'fieldOptions are only allowed for type dropdown, checkbox or radio fields.', type: 'notvalid', value: this.ratingOptions});
 			console.error(error);
-			return(next(error));
+			return next(error);
 		}
 	}
 
 	return next();
 });
 
-//LogicJump Save
-FormFieldSchema.pre('save', function(next) {
-	if(!this.globalId){
-		this.globalId = tokgen();
-	}
-	next();
-});
-
 //Submission fieldValue correction
 FormFieldSchema.pre('save', function(next) {
 	if(this.fieldType === 'dropdown' && this.isSubmission){

app/tests/form.server.model.test.js

@@ -40,8 +40,8 @@ describe('Form Model Unit Tests:', function() {
 				language: 'en',
 				form_fields: [
 					{'fieldType':'textfield', title:'First Name', 'fieldValue': ''},
-					{'fieldType':'checkbox',  title:'nascar',     'fieldValue': ''},
+					{'fieldType':'legal',  title:'nascar',     'fieldValue': ''},
-					{'fieldType':'checkbox',  title:'hockey',     'fieldValue': ''}
+					{'fieldType':'legal',  title:'hockey',     'fieldValue': ''}
 				]
 			});
 			done();

app/tests/form.server.routes.test.js

@@ -10,7 +10,22 @@ var should = require('should'),
 	Form = require('../models/form.server.model.js'),
 	FormSubmission = require('../models/form_submission.server.model.js'),
 	Field = mongoose.model('Field'),
-	async = require('async');
+	async = require('async'),
+	_ = require('lodash');
+
+function omitDeep(collection, excludeKeys) {
+
+  function omitFn(value) {
+
+    if (value && typeof value === 'object') {
+      excludeKeys.forEach((key) => {
+        delete value[key];
+      });
+    }
+  }
+
+  return _.cloneDeepWith(collection, omitFn);
+}
 
 /**
  * Globals
@@ -24,6 +39,18 @@ var credentials = {
 	password: 'password'
 };
 
+var sampleVisitorData = [{
+	socketId: 'ntneooe8989eotnoeeo',
+	referrer: 'http://google.com',
+	timeElapsed: 89898989,
+	isSubmitted: true,
+	language:  'en',
+	ipAddr: '192.168.1.1',
+	deviceType: 'desktop',
+	userAgent: 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36',
+	filledOutFields: []
+}];
+
 /**
  * Form routes tests
  */
@@ -50,8 +77,8 @@ describe('Form Routes Unit tests', function() {
 				admin: user.id,
 				form_fields: [
 					new Field({'fieldType':'textfield', 'title':'First Name', 'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'nascar',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'nascar',      'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'hockey',      'fieldValue': ''})
+					new Field({'fieldType':'legal', 'title':'hockey',      'fieldValue': ''})
 				],
 				isLive: true
 			};
@@ -91,7 +118,7 @@ describe('Form Routes Unit tests', function() {
 		FormObj.save(function(err, form) {
 			if(err) return done(err);
 
-			userSession.get('/subdomain/' + credentials.username + '/forms/' + form._id + '/render')
+			userSession.get('/forms/' + form._id + '/render')
 				.expect(200)
 				.end(function(err, res) {
 					if(err) return done(err)
@@ -114,7 +141,7 @@ describe('Form Routes Unit tests', function() {
 		FormObj.save(function(err, form) {
 			if(err) return done(err);
 
-			userSession.get('/subdomain/' + credentials.username + '/forms/' + form._id + '/render')
+			userSession.get('/forms/' + form._id + '/render')
 				.expect(401, {message: 'Form is Not Public'})
 				.end(function(err, res) {
 					done(err);
@@ -315,8 +342,8 @@ describe('Form Routes Unit tests', function() {
 				admin: user.id,
 				form_fields: [
 					new Field({'fieldType':'textfield', 'title':'First Name', 'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'nascar',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'nascar',      'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'hockey',      'fieldValue': ''})
+					new Field({'fieldType':'legal', 'title':'hockey',      'fieldValue': ''})
 				],
 				isLive: true
 			};
@@ -327,8 +354,8 @@ describe('Form Routes Unit tests', function() {
 				admin: user.id,
 				form_fields: [
 					new Field({'fieldType':'textfield', 'title':'Last Name', 'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'formula one',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'formula one',      'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'football',      'fieldValue': ''})
+					new Field({'fieldType':'legal', 'title':'football',      'fieldValue': ''})
 				],
 				isLive: true
 			};
@@ -364,6 +391,123 @@ describe('Form Routes Unit tests', function() {
 			});
 		});
 
+		it(' > should preserve visitor data when updating a Form', function(done) {
+			// Create new Form model instance
+
+			var formObject = {
+				title: 'First Form',
+				language: 'en',
+				admin: user.id,
+				form_fields: [
+					new Field({'fieldType':'textfield', 'title':'First Name', 'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'nascar',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'hockey',      'fieldValue': ''})
+				],
+				isLive: true,
+				analytics: {
+					gaCode: '',
+					visitors: sampleVisitorData
+				}
+			};
+
+			var formUpdateObject = {
+				title: 'Second Form',
+				language: 'en',
+				admin: user.id,
+				form_fields: [
+					new Field({'fieldType':'textfield', 'title':'Last Name', 'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'formula one',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'football',      'fieldValue': ''})
+				],
+				isLive: true
+			};
+
+			var CurrentForm = new Form(formObject);
+
+			// Save the Form
+			CurrentForm.save(function(err, form) {
+				if(err) return done(err);
+
+				loginSession.put('/forms/' + form.id)
+					.send({ form: formUpdateObject })
+					.expect(200)
+					.end(function(err, res) {
+
+						should.not.exist(err);
+
+						Form.findById(form.id, function (FormFindErr, UpdatedForm){
+							should.not.exist(FormFindErr);
+							should.exist(UpdatedForm);
+
+							var updatedFormObj = UpdatedForm.toJSON();
+							var oldFormObj = CurrentForm.toJSON();
+
+							updatedFormObj.analytics.should.deepEqual(oldFormObj.analytics);
+
+							done(FormFindErr);
+						});
+					});
+			});
+		});
+
+		it(' > shouldn\'t allow a user to change the id when updating a form', function(done) {
+			// Create new Form model instance
+
+			var formObject = {
+				title: 'First Form',
+				language: 'en',
+				admin: user.id,
+				form_fields: [
+					new Field({'fieldType':'textfield', 'title':'First Name', 'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'nascar',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'hockey',      'fieldValue': ''})
+				],
+				isLive: true
+			};
+
+			var formUpdateObject = {
+				id: mongoose.Types.ObjectId(),
+				title: 'First Form',
+				language: 'en',
+				admin: user.id,
+				form_fields: [
+					new Field({'fieldType':'textfield', 'title':'Last Name', 'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'formula one',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'football',      'fieldValue': ''})
+				],
+				isLive: true
+			};
+
+			var CurrentForm = new Form(formObject);
+
+			// Save the Form
+			CurrentForm.save(function(err, InitialForm) {
+				if(err) return done(err);
+
+				loginSession.put('/forms/' + InitialForm.id)
+					.send({ form: formUpdateObject })
+					.expect(200)
+					.end(function(err, OldForm) {
+						should.not.exist(err);
+
+						Form.findById(InitialForm.id, function (FormFindErr, UpdatedForm){
+							should.not.exist(FormFindErr);
+							should.exist(UpdatedForm);
+
+							var updatedFormObj = UpdatedForm.toJSON();
+							var oldFormObj = InitialForm.toJSON();
+
+							updatedFormObj = omitDeep('lastModified');
+							oldFormObj = omitDeep('lastModified');
+
+							updatedFormObj.should.deepEqual(oldFormObj);
+
+							done(FormFindErr);
+						});
+					});
+			});
+		});
+
 		afterEach('should be able to signout user', function(done){
 			authenticatedSession.get('/auth/signout')
 				.expect(200)

app/tests/form_submission.model.test.js

@@ -166,7 +166,7 @@ describe('FormSubmission Model Unit Tests:', function() {
 		});
 
 		it('should be able to find FormSubmission by $elemMatch on form_fields id', function(done){
-			 FormSubmission.findOne({ form: myForm._id, form_fields: {$elemMatch: {globalId: myForm.form_fields[0].globalId} }  })
+			 FormSubmission.findOne({ form: myForm.id, form_fields: {$elemMatch: {_id: myForm.form_fields[0]._id} }  })
 				.exec(function(err, submission){
 					should.not.exist(err);
 					should.exist(submission);
@@ -176,78 +176,6 @@ describe('FormSubmission Model Unit Tests:', function() {
 		});
 	});
 
-	/*
-	describe('Test FormField and Submission Logic', function() {
-
-		beforeEach(function(done){
-
-			//Create Submission
-			mySubmission = new FormSubmission({
-				form_fields: _.merge(sampleSubmission, myForm.form_fields),
-				admin: user,
-				form: myForm,
-				timeElapsed: 17.55
-			});
-
-			mySubmission.save(function(err){
-				should.not.exist(err);
-				done();
-			});
-
-		});
-
-        it('should preserve deleted form_fields that have submissions without any problems', function(done) {
-
-        	var fieldPropertiesToOmit = ['deletePreserved', 'globalId', 'lastModified', 'created', '_id', 'submissionId', 'isSubmission', 'validFieldTypes', 'title'];
-			var old_fields = myForm.toObject().form_fields;
-			var new_form_fields = _.clone(myForm.toObject().form_fields);
-			new_form_fields.splice(0, 1);
-
-			myForm.form_fields = new_form_fields;
-
-			myForm.save(function(err, _form) {
-
-				should.not.exist(err);
-				should.exist(_form.form_fields);
-
-				var actual_fields = _.deepOmit(_form.toObject().form_fields, fieldPropertiesToOmit);
-				old_fields = _.deepOmit(old_fields, fieldPropertiesToOmit);
-
-				should.deepEqual(actual_fields, old_fields, 'old form_fields not equal to newly saved form_fields');
-				done();
-			});
-		});
-
-		it('should delete \'preserved\' form_fields whose submissions have been removed without any problems', function(done) {
-
-			var old_fields = myForm.toObject().form_fields;
-			old_fields.splice(0,1);
-			var new_form_fields = _.clone(myForm.toObject().form_fields);
-			new_form_fields.splice(0, 1);
-
-			myForm.form_fields = new_form_fields;
-
-			myForm.save(function(err, _form){
-				should.not.exist(err);
-				should.exist(_form.form_fields);
-				should.exist(old_fields);
-
-				var actual_fields = _.deepOmit(_form.toObject().form_fields, ['lastModified', 'created', '_id']);
-				old_fields = _.deepOmit(old_fields, ['lastModified', 'created', '_id']);
-
-				should.deepEqual(JSON.stringify(actual_fields), JSON.stringify(old_fields)); //'old form_fields not equal to newly saved form_fields');
-				done();
-			});
-		});
-
-		afterEach(function(done){
-			mySubmission.remove(function(){
-				done();
-			});
-		});
-	});
-	*/
-
 	afterEach(function(done) {
 		Form.remove().exec(function() {
 			User.remove().exec(function() {

app/tests/form_submission.routes.test.js

@@ -54,8 +54,8 @@ describe('Form Submission Routes Unit tests', function() {
 				admin: user._id,
 				form_fields: [
 					new Field({'fieldType':'textfield', 'title':'First Name', 'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'nascar',      'fieldValue': ''}),
+					new Field({'fieldType':'legal', 'title':'nascar',      'fieldValue': ''}),
-					new Field({'fieldType':'checkbox', 'title':'hockey',      'fieldValue': ''})
+					new Field({'fieldType':'legal', 'title':'hockey',      'fieldValue': ''})
 				],
 				selfNotifications: {
 					fromField: mongoose.Types.ObjectId(),
@@ -81,8 +81,8 @@ describe('Form Submission Routes Unit tests', function() {
 					form: form._id,
 					form_fields: [
 						{'fieldType':'textfield', 	'title':'First Name', 	'fieldValue': 'David', 	_id: '', isSubmission: false, deletePreserved: false},
-						{'fieldType':'checkbox', 	'title':'nascar',      	'fieldValue': true, 	_id: '', isSubmission: false, deletePreserved: true},
+						{'fieldType':'legal', 	'title':'nascar',      	'fieldValue': true, 	_id: '', isSubmission: false, deletePreserved: true},
-						{'fieldType':'checkbox', 	'title':'hockey',      	'fieldValue': false, 	_id: '', isSubmission: false, deletePreserved: false}
+						{'fieldType':'legal', 	'title':'hockey',      	'fieldValue': false, 	_id: '', isSubmission: false, deletePreserved: false}
 					],
 					percentageComplete: 100,
 					timeElapsed: 11.55,
@@ -101,8 +101,8 @@ describe('Form Submission Routes Unit tests', function() {
 					_id: form._id,
 					form_fields: [
 						{'fieldType':'textfield', 	'title':'First Name', 	'fieldValue': 'David', 	_id: '', isSubmission: false, deletePreserved: false},
-						{'fieldType':'checkbox', 	'title':'nascar',      	'fieldValue': true, 	_id: '', isSubmission: false, deletePreserved: true},
+						{'fieldType':'legal', 	'title':'nascar',      	'fieldValue': true, 	_id: '', isSubmission: false, deletePreserved: true},
-						{'fieldType':'checkbox', 	'title':'hockey',      	'fieldValue': false, 	_id: '', isSubmission: false, deletePreserved: false}
+						{'fieldType':'legal', 	'title':'hockey',      	'fieldValue': false, 	_id: '', isSubmission: false, deletePreserved: false}
 					],
 					percentageComplete: 100,
 					timeElapsed: 11.55,

app/tests/libs/send-email-notifications.test.js

@@ -14,9 +14,9 @@ const should = require('should'),
  * Globals
  */
 const validFormFields = [
-	{fieldType:'textfield', title:'First Name', fieldValue: 'John Smith', deletePreserved: false, globalId:'56340745f59a6fc9e22028e9'},
+	{fieldType:'textfield', title:'First Name', fieldValue: 'John Smith', deletePreserved: false, _id:'56340745f59a6fc9e22028e9'},
-    {fieldType:'link', title:'Your Website',      fieldValue: 'https://johnsmith.me', deletePreserved: false, globalId:'5c9e22028e907634f45f59a6'},
+    {fieldType:'link', title:'Your Website',      fieldValue: 'https://johnsmith.me', deletePreserved: false, _id:'5c9e22028e907634f45f59a6'},
-    {fieldType:'number', title:'Your Age',      fieldValue: 45, deletePreserved: false, globalId:'56e90745f5934fc9e22028a6'}
+    {fieldType:'number', title:'Your Age',      fieldValue: 45, deletePreserved: false, _id:'56e90745f5934fc9e22028a6'}
 ];
 
 const validFieldDict = {

config/env/test.js

@@ -18,6 +18,7 @@ module.exports = {
 			//stream: 'access.log'
 		}
 	},
+	subdomainsDisabled: true,
 	app: {
 		title: 'TellForm Test'
 	},

public/modules/forms/admin/controllers/admin-form.client.controller.js

@@ -207,22 +207,11 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$windo
                     if(dataToSend.analytics && dataToSend.analytics.visitors){
                         delete dataToSend.analytics.visitors;
                     }
-                    if(dataToSend.submissions){
-                        delete dataToSend.submissions;
-                    }
 
                     if(dataToSend.visible_form_fields){
                         delete dataToSend.visible_form_fields;
                     }
 
-                     if(dataToSend.analytics){
-                        delete dataToSend.analytics.visitors;
-                        delete dataToSend.analytics.fields;
-                        delete dataToSend.analytics.submissions;
-                        delete dataToSend.analytics.views;
-                        delete dataToSend.analytics.conversionRate;
-                    }
-
                     delete dataToSend.created;
                     delete dataToSend.lastModified;
                     delete dataToSend.__v;

public/modules/forms/admin/directives/configure-form.client.directive.js

@@ -18,7 +18,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$sta
                     placeholder: {
                         placeholders: $scope.myform.visible_form_fields.map(function(field){
                             return {
-                                id: field.globalId,
+                                id: field.id,
                                 label: field.title
                             };
                         }),

public/modules/forms/admin/directives/edit-form.client.directive.js

@@ -26,7 +26,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
 					forceHelperSize: true,
 					forcePlaceholderSize: true,
 					stop: function(e, ui) {
-						debugger;
                         $scope.update(false, $scope.myform, true, false, function(err){
                         	if(err){
                         		console.error(err);

public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html

@@ -36,7 +36,7 @@
                     <ui-select-match placeholder="{{ 'OPTION_PLACEHOLDER' | translate }}">
                         {{$select.selected.title}}
                     </ui-select-match>
-                    <ui-select-choices repeat="field.globalId as field in emailFields | filter: { title: $select.search }">
+                    <ui-select-choices repeat="field.id as field in emailFields | filter: { title: $select.search }">
                         <span ng-bind-html="field.title | highlight: $select.search">
                         </span>
                     </ui-select-choices>

public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html

@@ -42,7 +42,7 @@
                     <ui-select-match placeholder="{{ 'OPTION_PLACEHOLDER' | translate }}">
                     {{$select.selected.title}}
                     </ui-select-match>
-                    <ui-select-choices repeat="field.globalId as field in emailFields | filter: { title: $select.search }">
+                    <ui-select-choices repeat="field.id as field in emailFields | filter: { title: $select.search }">
                         <span ng-bind-html="field.title | highlight: $select.search">
                         </span>
                     </ui-select-choices>