From 6121e640d82516bc6da4301c6f6d3abff869a330 Mon Sep 17 00:00:00 2001 From: zinyando Date: Fri, 12 Aug 2016 14:02:57 +0200 Subject: [PATCH] Cleanup and fixes --- app/app/models/folder.js | 6 ++-- app/app/models/organization.js | 9 ++++-- app/app/services/document.js | 33 +++++++++---------- app/app/services/folder.js | 30 ++++++++---------- app/app/services/organization.js | 54 +++++++++++++++++--------------- app/app/services/section.js | 15 ++++----- app/app/services/template.js | 6 ++-- app/app/services/user.js | 8 ++--- 8 files changed, 79 insertions(+), 82 deletions(-) diff --git a/app/app/models/folder.js b/app/app/models/folder.js index e00735b2..474ba4ac 100644 --- a/app/app/models/folder.js +++ b/app/app/models/folder.js @@ -14,15 +14,15 @@ export default Model.extend({ return stringUtil.makeSlug(this.get('name')); }), - markAsRestricted: function () { + markAsRestricted() { this.set('folderType', constants.FolderType.Protected); }, - markAsPrivate: function () { + markAsPrivate() { this.set('folderType', constants.FolderType.Private); }, - markAsPublic: function () { + markAsPublic() { this.set('folderType', constants.FolderType.Public); }, diff --git a/app/app/models/organization.js b/app/app/models/organization.js index 1246b0de..acaa9dc7 100644 --- a/app/app/models/organization.js +++ b/app/app/models/organization.js @@ -1,7 +1,12 @@ import Model from 'ember-data/model'; -// import attr from 'ember-data/attr'; +import attr from 'ember-data/attr'; // import { belongsTo, hasMany } from 'ember-data/relationships'; export default Model.extend({ - + title: attr('string'), + message: attr('string'), + email: attr('string'), + allowAnonymousAccess: attr('boolean', { defaultValue: false }), + created: attr(), + revised: attr() }); diff --git a/app/app/services/document.js b/app/app/services/document.js index d0fa3283..e1195640 100644 --- a/app/app/services/document.js +++ b/app/app/services/document.js @@ -25,8 +25,8 @@ export default Ember.Service.extend({ return this.get('ajax').request(`documents/${documentId}`, { method: "GET" }).then((response) => { - let doc = this.get('store').normalize('document', response); - return this.get('store').push({ data: doc }); + let data = this.get('store').normalize('document', response); + return this.get('store').push({ data: data }); }); }, @@ -39,10 +39,9 @@ export default Ember.Service.extend({ content: Ember.A([]) }); - _.each(response, (doc) => { + documents = response.map((doc) => { let data = this.get('store').normalize('document', doc); - let documentModel = this.get('store').push({ data: data }); - documents.pushObject(documentModel); + return this.get('store').push({ data: data }); }); return documents; @@ -58,10 +57,9 @@ export default Ember.Service.extend({ content: Ember.A([]) }); - _.each(response, function (doc) { + documents = response.map((doc) => { let data = this.get('store').normalize('document', doc); - let documentModel = this.get('store').push({ data: data }); - documents.pushObject(documentModel); + return this.get('store').push({ data: data }); }); return documents; @@ -199,10 +197,9 @@ export default Ember.Service.extend({ method: 'GET' }).then((response) => { let data = []; - _.each(response, (obj) => { + data = response.map((obj) => { let data = this.get('store').normalize('page', obj); - let tableOfContents = this.get('store').push({ data: data }); - data.pushObject(tableOfContents); + return this.get('store').push({ data: data }); }); return data; @@ -217,10 +214,9 @@ export default Ember.Service.extend({ }).then((response) => { let pages = []; - _.each(response, (page) => { + pages = response.map((page) => { let data = this.get('store').normalize('page', page); - let pageData = this.get('store').push({ data: data }); - pages.pushObject(pageData); + return this.get('store').push({ data: data }); }); return pages; @@ -256,11 +252,12 @@ export default Ember.Service.extend({ method: 'GET' }).then((response) => { let data = []; - _.each(response, (obj) => { - let attachmentData = this.get('store').normalize('attachment', obj); - let attachments = this.get('store').push({ data: attachmentData }); - data.pushObject(attachments); + + data = response.map((obj) => { + let data = this.get('store').normalize('attachment', obj); + return this.get('store').push({ data: data }); }); + return data; }); }, diff --git a/app/app/services/folder.js b/app/app/services/folder.js index 3230a8a9..5de258dd 100644 --- a/app/app/services/folder.js +++ b/app/app/services/folder.js @@ -11,7 +11,6 @@ import Ember from 'ember'; import BaseService from '../services/base'; -import models from '../utils/model'; const { get, @@ -55,9 +54,7 @@ export default BaseService.extend({ getAll() { if (this.get('folders') != null) { - return new Ember.RSVP.Promise((resolve) => { - resolve(this.get('folders')); - }); + return new Ember.RSVP.resolve(this.get('folders')); } else { return this.reload(); } @@ -97,11 +94,10 @@ export default BaseService.extend({ method: "GET" }).then((response) => { let data = []; - _.each(response, (obj) => { - debugger; - let participantData = this.get('store').normalize('protected-folder-participant', obj); - let participant = this.get('store').push({ data: participantData }); - data.pushObject(participant); + + data = response.map((obj) => { + let data = this.get('store').normalize('protected-folder-participant', obj); + return this.get('store').push({ data: data }); }); return data; @@ -115,10 +111,10 @@ export default BaseService.extend({ method: "GET" }).then((response) => { let data = []; - _.each(response, (obj) => { - let folderData = this.get('store').normalize('folder', obj); - let folder = this.get('store').push({ data: folderData }); - data.pushObject(folder); + + data = response.map((obj) => { + let data = this.get('store').normalize('folder', obj); + return this.get('store').push({ data: data }); }); return data; @@ -132,10 +128,10 @@ export default BaseService.extend({ method: "GET" }).then((response) => { let data = []; - _.each(response, (obj) => { - let permissionData = this.get('store').normalize('folder-permission', obj); - let permission = this.get('store').push({ data: permissionData }); - data.pushObject(permission); + + data = response.map((obj) => { + let data = this.get('store').normalize('folder-permission', obj); + return this.get('store').push({ data: data }); }); return data; diff --git a/app/app/services/organization.js b/app/app/services/organization.js index cfe86fea..5740d285 100644 --- a/app/app/services/organization.js +++ b/app/app/services/organization.js @@ -10,35 +10,39 @@ // https://documize.com import Ember from 'ember'; -import models from '../utils/model'; + +const { + inject: { service } +} = Ember; export default Ember.Service.extend({ - sessionService: Ember.inject.service('session'), - ajax: Ember.inject.service(), - appMeta: Ember.inject.service(), + sessionService: service('session'), + ajax: service(), + appMeta: service(), + store: service(), - // Returns attributes for specified org id. - getOrg(id) { - return this.get('ajax').request(`organizations/${id}`, { - method: 'GET' - }).then((response) =>{ - let org = models.OrganizationModel.create(response); - return org; - }); - }, + // Returns attributes for specified org id. + getOrg(id) { + return this.get('ajax').request(`organizations/${id}`, { + method: 'GET' + }).then((response) => { + let data = this.get('store').normalize('organization', response); + return this.get('store').push({ data: data }); + }); + }, - // Updates an existing organization record. - save(org) { - let id = org.get('id'); + // Updates an existing organization record. + save(org) { + let id = org.get('id'); - this.get('appMeta').setProperties({ - message: org.message, - title: org.title - }); + this.get('appMeta').setProperties({ + message: org.message, + title: org.title + }); - return this.get('ajax').request(`organizations/${id}`, { - method: 'PUT', - data: JSON.stringify(org) - }); - } + return this.get('ajax').request(`organizations/${id}`, { + method: 'PUT', + data: JSON.stringify(org) + }); + } }); diff --git a/app/app/services/section.js b/app/app/services/section.js index 1d7d0d2c..0f304bda 100644 --- a/app/app/services/section.js +++ b/app/app/services/section.js @@ -10,7 +10,6 @@ // https://documize.com import Ember from 'ember'; -import models from '../utils/model'; import BaseService from '../services/base'; export default BaseService.extend({ @@ -24,11 +23,10 @@ export default BaseService.extend({ method: 'GET' }).then((response) => { let data = []; - _.each(response, (obj) => { - debugger; - let sectionData = this.get('store').normalize('section', obj); - let section = this.get('store').push({ data: sectionData }); - data.pushObject(section); + + data = response.map((obj) => { + let data = this.get('store').normalize('section', obj); + return this.get('store').push({ data: data }); }); return data; @@ -58,10 +56,9 @@ export default BaseService.extend({ let pages = []; if (is.not.null(response) && is.array(response) && response.length > 0) { - _.each(response, (page) => { + pages = response.map((page) => { let data = this.get('store').normalize('page', page); - let pageData = this.get('store').push({ data: data }); - pages.pushObject(pageData); + return this.get('store').push({ data: data }); }); } diff --git a/app/app/services/template.js b/app/app/services/template.js index 9f9af1d8..ad5c9d02 100644 --- a/app/app/services/template.js +++ b/app/app/services/template.js @@ -10,7 +10,6 @@ // https://documize.com import Ember from 'ember'; -import models from '../utils/model'; const { inject: { service } @@ -49,10 +48,9 @@ export default Ember.Service.extend({ content: Ember.A([]) }); - _.each(response, (template) => { + templates = response.map((template) => { let data = this.get('store').normalize('template', template); - let templateModel = this.get('store').push({ data: data }); - templates.pushObject(templateModel); + return this.get('store').push({ data: data }); }); return templates; diff --git a/app/app/services/user.js b/app/app/services/user.js index f9afd0d7..618e3104 100644 --- a/app/app/services/user.js +++ b/app/app/services/user.js @@ -10,7 +10,6 @@ // https://documize.com import Ember from 'ember'; -// import models from '../utils/model'; export default Ember.Service.extend({ sessionService: Ember.inject.service('session'), @@ -59,9 +58,10 @@ export default Ember.Service.extend({ method: "GET" }).then((response) => { let data = []; - _.each(response, (obj) => { - let user = this.get('store').normalize('user', obj); - data.pushObject(this.get('store').push({ data: user })); + + data = response.map((obj) => { + let data = this.get('store').normalize('user', obj); + return this.get('store').push({ data: data }) }); return data;