More refactoring and fixes

app/app/components/folder/folder-settings.js

@@ -11,9 +11,13 @@
 
 import Ember from 'ember';
 
+const {
+	inject: { service }
+} = Ember;
+
 export default Ember.Component.extend({
-    folderService: Ember.inject.service('folder'),
-    appMeta: Ember.inject.service(),
+	folderService: service('folder'),
+	appMeta: service(),
 	users: [],
 	folders: [],
 	folder: {},
@@ -99,7 +103,7 @@ export default Ember.Component.extend({
 				message = this.getDefaultInvitationMessage();
 			}
 
-            this.get('permissions').forEach(function(permission, index) /* jshint ignore:line */ {
+			this.get('permissions').forEach((permission, index) => { /* jshint ignore:line */
 				Ember.set(permission, 'canView', $("#canView-" + permission.userId).prop('checked'));
 				Ember.set(permission, 'canEdit', $("#canEdit-" + permission.userId).prop('checked'));
 			});

app/app/components/folder/folders-list.js

@@ -32,7 +32,6 @@ export default Ember.Component.extend(TooltipMixin, {
 
 	didReceiveAttrs() {
 		let folders = this.get('folders');
-        let self = this;
 
 		// clear out state
 		this.set('publicFolders', []);
@@ -40,20 +39,20 @@ export default Ember.Component.extend(TooltipMixin, {
 		this.set('privateFolders', []);
 
 		_.each(folders, folder => {
-            if (folder.folderType === constants.FolderType.Public) {
-                let folders = self.get('publicFolders');
+			if (folder.get('folderType') === constants.FolderType.Public) {
+				let folders = this.get('publicFolders');
 				folders.pushObject(folder);
-                self.set('publicFolders', folders);
+				this.set('publicFolders', folders);
 			}
-            if (folder.folderType === constants.FolderType.Private) {
-                let folders = self.get('privateFolders');
+			if (folder.get('folderType') === constants.FolderType.Private) {
+				let folders = this.get('privateFolders');
 				folders.pushObject(folder);
-                self.set('privateFolders', folders);
+				this.set('privateFolders', folders);
 			}
-            if (folder.folderType === constants.FolderType.Protected) {
-                let folders = self.get('protectedFolders');
+			if (folder.get('folderType') === constants.FolderType.Protected) {
+				let folders = this.get('protectedFolders');
 				folders.pushObject(folder);
-                self.set('protectedFolders', folders);
+				this.set('protectedFolders', folders);
 			}
 		});
 

app/app/models/folder.js

@@ -20,7 +20,7 @@ export default Model.extend({
 	name: attr('string'),
 	orgId: attr('string'),
 	userId: attr('string'),
-	folderType: constants.FolderType.Private,
+	folderType: attr('number', { defaultValue: 2 }),
 
 	slug: Ember.computed('name', function () {
 		return stringUtil.makeSlug(this.get('name'));

app/app/pods/folders/route.js

@@ -27,7 +27,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	afterModel: function (model) {
-
+		debugger;
 		let params = this.paramsFor('folders.folder');
 
 		if (is.empty(params)) {

app/app/pods/folders/settings/route.js

@@ -13,11 +13,16 @@ import Ember from 'ember';
 import models from '../../../utils/model';
 import NotifierMixin from '../../../mixins/notifier';
 
+const {
+	inject: { service }
+} = Ember;
+
 export default Ember.Route.extend(NotifierMixin, {
-	folderService: Ember.inject.service('folder'),
-	userService: Ember.inject.service('user'),
+	folderService: service('folder'),
+	userService: service('user'),
 	folder: {},
 	tab: "",
+	localStorage: service(),
 
 	beforeModel: function (transition) {
 		this.tab = is.not.undefined(transition.queryParams.tab) ? transition.queryParams.tab : "tabGeneral";
@@ -100,36 +105,33 @@ export default Ember.Route.extend(NotifierMixin, {
 		},
 
 		onRemove(moveId) {
-			let self = this;
 
-			this.get('folderService').remove(this.folder.get('id'), moveId).then(function () { /* jshint ignore:line */
-				self.showNotification("Deleted");
-				self.session.clearSessionItem('folder');
+			this.get('folderService').remove(this.folder.get('id'), moveId).then(() => { /* jshint ignore:line */
+				this.showNotification("Deleted");
+				this.get('localStorage').clearSessionItem('folder');
 
-				self.get('folderService').getFolder(moveId).then(function (folder) {
-					self.get('folderService').setCurrentFolder(folder);
-					self.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
+				this.get('folderService').getFolder(moveId).then((folder) => {
+					this.get('folderService').setCurrentFolder(folder);
+					this.transitionTo('folders.folder', folder.get('id'), folder.get('slug'));
 				});
 			});
 		},
 
 		onShare: function (invitation) {
-			let self = this;
 
-			this.get('folderService').share(this.folder.get('id'), invitation).then(function () {
-				self.showNotification("Shared");
+			this.get('folderService').share(this.folder.get('id'), invitation).then(() => {
+				this.showNotification("Shared");
 			});
 		},
 
 		onPermission: function (folder, message, permissions) {
-			var self = this;
 			var data = permissions.map(function (obj) {
 				return obj.getProperties('orgId', 'folderId', 'userId', 'canEdit', 'canView');
 			});
 			var payload = { Message: message, Roles: data };
 
-			this.get('folderService').savePermissions(folder.get('id'), payload).then(function () {
-				self.showNotification("Saved");
+			this.get('folderService').savePermissions(folder.get('id'), payload).then(() => {
+				this.showNotification("Saved");
 			});
 
 			var hasEveryone = _.find(data, function (permission) {

app/app/services/document.js

@@ -39,6 +39,10 @@ export default Ember.Service.extend({
 				content: Ember.A([])
 			});
 
+			if (isObject(response)) {
+				return documents;
+			}
+
 			documents = response.map((doc) => {
 				let data = this.get('store').normalize('document', doc);
 				return this.get('store').push({ data: data });

app/app/services/folder.js

@@ -14,7 +14,7 @@ import BaseService from '../services/base';
 
 const {
 	get,
-	RSVP: { resolve },
+	RSVP,
 	inject: { service }
 } = Ember;
 
@@ -41,7 +41,6 @@ export default BaseService.extend({
 
 	// Returns folder model for specified folder id.
 	getFolder(id) {
-
 		return this.get('ajax').request(`folders/${id}`, {
 			method: 'GET'
 		}).then((folder) => {
@@ -52,12 +51,14 @@ export default BaseService.extend({
 
 	// Returns all folders that user can see.
 	getAll() {
+		let folders = this.get('folders');
 
-		if (this.get('folders') != null) {
-			return new resolve(this.get('folders'));
-		} else {
-			return this.reload();
+		if (folders != null) {
+			return new RSVP.resolve(folders);
 		}
+
+		return this.reload();
+
 	},
 
 	// Updates an existing folder record.
@@ -140,7 +141,6 @@ export default BaseService.extend({
 
 	// persist folder permissions
 	savePermissions(folderId, payload) {
-
 		return this.get('ajax').request(`folders/${folderId}/permissions`, {
 			method: 'PUT',
 			contentType: 'json',

app/app/services/organization.js

@@ -33,11 +33,11 @@ export default Ember.Service.extend({
 
 	// Updates an existing organization record.
 	save(org) {
-		let id = org.get('id');
+		let id = org.id;
 
 		this.get('appMeta').setProperties({
-			message: org.message,
-			title: org.title
+			message: org.get('message'),
+			title: org.get('title')
 		});
 
 		return this.get('ajax').request(`organizations/${id}`, {