Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-08 06:55:28 +02:00
Code Releases Activity

Refactor to use ember-ajax host and namespace

Browse source
This commit is contained in:
zinyando 2016-06-28 15:29:29 +02:00
parent 7cce377f93
commit 10dbeeefbb
8 changed files with 57 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

59
app/app/services/document.js
View file

@ -18,9 +18,7 @@ export default Ember.Service.extend({
// Returns document model for specified document id.
getDocument(documentId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}`, {
method: "GET"
}).then((response) => {
return models.DocumentModel.create(response);
@ -29,10 +27,7 @@ export default Ember.Service.extend({
// Returns all documents for specified folder.
getAllByFolder(folderId) {
let appMeta = this.get('sessionService.appMeta');
let url = appMeta.getUrl(`documents?folder=${folderId}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents?folder=${folderId}`, {
method: "GET"
}).then((response) => {
let documents = Ember.ArrayProxy.create({
@ -50,9 +45,7 @@ export default Ember.Service.extend({
// getDocumentsByTag returns all documents for specified tag (not folder!).
getAllByTag(tag) {
let url = this.get('sessionService').appMeta.getUrl(`documents?filter=tag&tag=${tag}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents?filter=tag&tag=${tag}`, {
method: "GET"
}).then((response) => {
let documents = Ember.ArrayProxy.create({
@ -71,16 +64,15 @@ export default Ember.Service.extend({
// saveDocument updates an existing document record.
save(doc) {
let id = doc.get('id');
let url = this.get('sessionService').appMeta.getUrl(`documents/${id}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${id}`, {
method: 'PUT',
data: JSON.stringify(doc)
});
},
getBatchedPages: function(documentId, payload) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/batch");
let url = `documents/${documentId}/pages/batch`;
return this.get('ajax').request(url, {
method: 'POST',
@ -95,7 +87,7 @@ export default Ember.Service.extend({
},
changePageSequence: function(documentId, payload) {
var url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/sequence");
let url = `documents/${documentId}/pages/sequence`;
return this.get('ajax').post(url, {
data: JSON.stringify(payload),
@ -104,7 +96,7 @@ export default Ember.Service.extend({
},
changePageLevel(documentId, payload) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/level");
let url = `documents/${documentId}/pages/level`;
return this.get('ajax').post(url, {
data: JSON.stringify(payload),
@ -113,7 +105,7 @@ export default Ember.Service.extend({
},
deleteDocument: function(documentId) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId);
let url = `documents/${documentId}`;
return this.get('ajax').request(url, {
method: 'DELETE'
@ -122,7 +114,7 @@ export default Ember.Service.extend({
updatePage: function(documentId, pageId, payload, skipRevision) {
var revision = skipRevision ? "?r=true" : "?r=false";
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + revision);
let url = `documents/${documentId}/pages/${pageId}${revision}`
return this.get('ajax').request(url, {
method: 'PUT',
@ -133,7 +125,7 @@ export default Ember.Service.extend({
// addPage inserts new page to an existing document.
addPage: function(documentId, payload) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages");
let url = `documents/${documentId}/pages`;
return this.get('ajax').post(url, {
data: JSON.stringify(payload),
@ -143,7 +135,7 @@ export default Ember.Service.extend({
// Nukes multiple pages from the document.
deletePages: function(documentId, pageId, payload) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId);
let url = `documents/${documentId}/pages/${pageId}`;
return this.get('ajax').post(url, {
data: JSON.stringify(payload),
@ -153,7 +145,7 @@ export default Ember.Service.extend({
// Nukes a single page from the document.
deletePage: function(documentId, pageId) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId);
let url = `documents/${documentId}/pages/${pageId}`;
return this.get('ajax').request(url, {
method: 'DELETE'
@ -161,7 +153,7 @@ export default Ember.Service.extend({
},
getPageRevisions(documentId, pageId) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + "/revisions");
let url = `documents/${documentId}/pages/${pageId}/revisions`;
return this.get('ajax').request(url, {
method: "GET"
@ -169,7 +161,7 @@ export default Ember.Service.extend({
},
getPageRevisionDiff(documentId, pageId, revisionId) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + "/revisions/" + revisionId);
let url = `documents/${documentId}/pages/${pageId}/revisions/${revisionId}`;
return this.get('ajax').request(url, {
method: "GET",
@ -178,7 +170,7 @@ export default Ember.Service.extend({
},
rollbackPage(documentId, pageId, revisionId) {
let url = this.get('sessionService').appMeta.getUrl("documents/" + documentId + "/pages/" + pageId + "/revisions/" + revisionId);
let url = `documents/${documentId}/pages/${pageId}/revisions/${revisionId}`;
return this.get('ajax').request(url, {
method: "POST"
@ -187,18 +179,16 @@ export default Ember.Service.extend({
// document meta referes to number of views, edits, approvals, etc.
getMeta(documentId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/meta`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}/meta`, {
method: "GET"
});
},
// Returns all pages without the content
getTableOfContents(documentId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages?content=0`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}/pages?content=0`, {
method: 'GET'
}).then((response) => {
let data = [];
@ -212,9 +202,8 @@ export default Ember.Service.extend({
// Returns all document pages with content
getPages(documentId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}/pages`, {
method: 'GET'
}).then((response) => {
let pages = [];
@ -229,9 +218,8 @@ export default Ember.Service.extend({
// Returns document page with content
getPage(documentId, pageId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages/${pageId}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}/pages/${pageId}`, {
method: 'GET'
}).then((response) => {
let page = models.PageModel.create(response);
@ -241,9 +229,8 @@ export default Ember.Service.extend({
// Returns document page meta object
getPageMeta(documentId, pageId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/pages/${pageId}/meta`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}/pages/${pageId}/meta`, {
method: 'GET'
}).then((response) => {
let meta = models.PageMetaModel.create(response);
@ -253,9 +240,8 @@ export default Ember.Service.extend({
// document attachments without the actual content
getAttachments(documentId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/attachments`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}/attachments`, {
method: 'GET'
}).then((response) => {
let data = [];
@ -268,9 +254,8 @@ export default Ember.Service.extend({
// nuke an attachment
deleteAttachment(documentId, attachmentId) {
let url = this.get('sessionService').appMeta.getUrl(`documents/${documentId}/attachments/${attachmentId}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`documents/${documentId}/attachments/${attachmentId}`, {
method: 'DELETE'
});
},

34
app/app/services/folder.js
View file

@ -23,10 +23,8 @@ export default BaseService.extend({
// Add a new folder.
add(folder) {
let appMeta = this.get('sessionService.appMeta');
let url = appMeta.getUrl(`folders`);
return this.get('ajax').post(url, {
return this.get('ajax').post(`folders`, {
contentType: 'json',
data: JSON.stringify(folder)
}).then((folder)=>{
@ -37,10 +35,8 @@ export default BaseService.extend({
// Returns folder model for specified folder id.
getFolder(id) {
let appMeta = this.get('sessionService.appMeta');
let url = appMeta.getUrl(`folders/${id}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`folders/${id}`, {
method: 'GET'
}).then((response)=>{
let folder = models.FolderModel.create(response);
@ -64,9 +60,8 @@ export default BaseService.extend({
// Updates an existing folder record.
save(folder) {
let id = folder.get('id');
let url = this.get('sessionService').appMeta.getUrl(`folders/${id}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`folders/${id}`, {
method: 'PUT',
contentType: 'json',
data: JSON.stringify(folder)
@ -74,7 +69,7 @@ export default BaseService.extend({
},
remove: function(folderId, moveToId) {
var url = this.get('sessionService').appMeta.getUrl('folders/' + folderId + "/move/" + moveToId);
let url = `folders/${folderId}/move/${moveToId}`;
return this.get('ajax').request(url, {
method: 'DELETE'
@ -82,7 +77,7 @@ export default BaseService.extend({
},
onboard: function(folderId, payload) {
var url = this.get('sessionService').appMeta.getUrl('public/share/' + folderId);
let url = `public/share/${folderId}`;
return this.get('ajax').post(url, {
contentType: "application/json",
@ -92,9 +87,7 @@ export default BaseService.extend({
// getProtectedFolderInfo returns non-private folders and who has access to them.
getProtectedFolderInfo: function() {
var url = this.get('sessionService').appMeta.getUrl('folders?filter=viewers');
return this.get('ajax').request(url, {
return this.get('ajax').request(`folders?filter=viewers`, {
method: "GET"
}).then((response)=>{
let data = [];
@ -108,10 +101,8 @@ export default BaseService.extend({
// reloads and caches folders.
reload() {
let appMeta = this.get('sessionService.appMeta');
let url = appMeta.getUrl(`folders`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`folders`, {
method: "GET"
}).then((response)=>{
let data = [];
@ -125,9 +116,8 @@ export default BaseService.extend({
// so who can see/edit this folder?
getPermissions(folderId) {
let url = this.get('sessionService').appMeta.getUrl(`folders/${folderId}/permissions`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`folders/${folderId}/permissions`, {
method: "GET"
}).then((response)=>{
let data = [];
@ -141,9 +131,8 @@ export default BaseService.extend({
// persist folder permissions
savePermissions(folderId, payload) {
let url = this.get('sessionService').appMeta.getUrl(`folders/${folderId}/permissions`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`folders/${folderId}/permissions`, {
method: 'PUT',
contentType: 'json',
data: JSON.stringify(payload)
@ -152,9 +141,8 @@ export default BaseService.extend({
// share this folder with new users!
share(folderId, invitation) {
let url = this.get('sessionService').appMeta.getUrl(`folders/${folderId}/invitation`);
return this.get('ajax').post(url, {
return this.get('ajax').post(`folders/${folderId}/invitation`, {
contentType: 'json',
data: JSON.stringify(invitation)
});
@ -175,7 +163,7 @@ export default BaseService.extend({
userId = "0";
}
let url = this.get('sessionService').appMeta.getUrl('users/' + userId + "/permissions");
let url = `users/${userId}/permissions`;
return this.get('ajax').request(url).then((folderPermissions) => {
// safety check

7
app/app/services/organization.js
View file

@ -18,9 +18,7 @@ export default Ember.Service.extend({
// Returns attributes for specified org id.
getOrg(id) {
let url = this.get('sessionService').appMeta.getUrl(`organizations/${id}`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`organizations/${id}`, {
method: 'GET'
}).then((response) =>{
let org = models.OrganizationModel.create(response);
@ -31,13 +29,12 @@ export default Ember.Service.extend({
// Updates an existing organization record.
save(org) {
let id = org.get('id');
let url = this.get('sessionService').appMeta.getUrl(`organizations/${id}`);
// refresh on-screen data
this.get('sessionService').get('appMeta').setSafe('message', org.message);
this.get('sessionService').get('appMeta').setSafe('title', org.title);
return this.get('ajax').request(url, {
return this.get('ajax').request(`organizations/${id}`, {
method: 'PUT',
data: JSON.stringify(org)
});

2
app/app/services/search.js
View file

@ -17,7 +17,7 @@ export default Ember.Service.extend({
// getUsers returns all users for organization.
find(keywords) {
let url = this.get('sessionService').appMeta.getUrl("search?keywords=" + encodeURIComponent(keywords));
let url = "search?keywords=" + encodeURIComponent(keywords);
return this.get('ajax').request(url, {
method: "GET"

9
app/app/services/section.js
View file

@ -19,9 +19,7 @@ export default BaseService.extend({
// Returns all available sections.
getAll() {
let url = this.get('sessionService').appMeta.getUrl(`sections`);
return this.get('ajax').request(url,{
return this.get('ajax').request(`sections`,{
method: 'GET'
}).then((response)=>{
let data = [];
@ -38,8 +36,7 @@ export default BaseService.extend({
fetch(page, method, data) {
let documentId = page.get('documentId');
let section = page.get('contentType');
let endpoint = `sections?documentID=${documentId}&section=${section}&method=${method}`;
let url = this.get('sessionService').appMeta.getUrl(endpoint);
let url = `sections?documentID=${documentId}&section=${section}&method=${method}`;
return this.get('ajax').post(url, {
data: JSON.stringify(data),
@ -49,7 +46,7 @@ export default BaseService.extend({
// Did any dynamic sections change? Fetch and send up for rendering?
refresh(documentId) {
let url = this.get('sessionService').appMeta.getUrl(`sections/refresh?documentID=${documentId}`);
let url = `sections/refresh?documentID=${documentId}`;
return this.get('ajax').request(url, {
method: 'GET'

12
app/app/services/session.js
View file

@ -51,7 +51,6 @@ export default Ember.Service.extend({
// Authentication
login: function(credentials) {
let url = this.appMeta.getUrl('public/authenticate');
let domain = netUtil.getSubdomain();
this.clearSession();
@ -65,7 +64,7 @@ export default Ember.Service.extend({
'Authorization': 'Basic ' + encoded
};
return this.get('ajax').post(url, {
return this.get('ajax').post('public/authenticate', {
headers
}).then((response)=>{
this.setSession(response.token, models.UserModel.create(response.user));
@ -76,7 +75,6 @@ export default Ember.Service.extend({
// SSO in the form of 'domain:email:password'
sso: function(credentials) {
let url = this.appMeta.getUrl('public/authenticate');
this.clearSession();
if (is.empty(credentials.email) || is.empty(credentials.password)) {
@ -87,7 +85,7 @@ export default Ember.Service.extend({
'Authorization': 'Basic ' + credentials
};
return this.get('ajax').post(url, {
return this.get('ajax').post('public/authenticate', {
headers
}).then((response)=>{
this.setSession(response.token, models.UserModel.create(response.user));
@ -184,9 +182,7 @@ export default Ember.Service.extend({
});
}
let url = this.get('appMeta').getUrl("public/meta");
return this.get('ajax').request(url)
return this.get('ajax').request("public/meta")
.then((response) => {
this.get('appMeta').set('orgId', response.orgId);
this.get('appMeta').setSafe('title', response.title);
@ -198,7 +194,7 @@ export default Ember.Service.extend({
if (is.not.undefined(token)) {
// We now validate current token
let tokenCheckUrl = this.get('appMeta').getUrl(`public/validate?token=${token}`);
let tokenCheckUrl = `public/validate?token=${token}`;
return this.get('ajax').request(tokenCheckUrl, {
method: 'GET',

16
app/app/services/template.js
View file

@ -17,8 +17,7 @@ export default Ember.Service.extend({
ajax: Ember.inject.service(),
importStockTemplate: function(folderId, templateId) {
let url = this.get('sessionService').appMeta.getUrl("templates/" + templateId + "/folder/" + folderId + "?type=stock");
let url = `templates/${templateId}/folder/${folderId}?type=stock`;
return this.get('ajax').request(url, {
method: "POST"
@ -26,7 +25,7 @@ export default Ember.Service.extend({
},
importSavedTemplate: function(folderId, templateId) {
let url = this.get('sessionService').appMeta.getUrl("templates/" + templateId + "/folder/" + folderId + "?type=saved");
let url = `templates/${templateId}/folder/${folderId}?type=saved`;
return this.get('ajax').post(url).then((doc)=>{
let docModel = models.DocumentModel.create(doc);
@ -35,9 +34,7 @@ export default Ember.Service.extend({
},
getSavedTemplates() {
let url = this.get('sessionService').appMeta.getUrl("templates");
return this.get('ajax').request(url, {
return this.get('ajax').request(`templates`, {
method: 'GET'
}).then((response) => {
if (is.not.array(response)) {
@ -57,22 +54,19 @@ export default Ember.Service.extend({
},
getStockTemplates() {
let url = this.get('sessionService').appMeta.getUrl("templates/stock");
return this.get('ajax').request(url, {
return this.get('ajax').request(`templates/stock`, {
method: 'GET'
});
},
saveAsTemplate(documentId, name, excerpt) {
let url = this.get('sessionService').appMeta.getUrl("templates");
let payload = {
DocumentID: documentId,
Name: name,
Excerpt: excerpt
};
return this.get('ajax').request(url, {
return this.get('ajax').request(`templates`, {
method: 'POST',
data: JSON.stringify(payload)
}).then(() => {

21
app/app/services/user.js
View file

@ -18,9 +18,8 @@ export default Ember.Service.extend({
// Adds a new user.
add(user) {
let url = this.get('sessionService').appMeta.getUrl(`users`);
return this.get('ajax').request(url, {
return this.get('ajax').request(`users`, {
type: 'POST',
data: JSON.stringify(user),
contentType: 'json'
@ -31,7 +30,7 @@ export default Ember.Service.extend({
// Returns user model for specified user id.
getUser(userId) {
let url = this.get('sessionService').appMeta.getUrl(`users/${userId}`);
let url = `users/${userId}`;
return this.get('ajax').request(url, {
type: 'GET'
@ -42,9 +41,7 @@ export default Ember.Service.extend({
// Returns all users for organization.
getAll() {
let url = this.get('sessionService').appMeta.getUrl(`users`);
return this.get('ajax').request(url).then((response) => {
return this.get('ajax').request(`users`).then((response) => {
return response.map(function(obj){
return models.UserModel.create(obj);
});
@ -53,7 +50,7 @@ export default Ember.Service.extend({
// Returns all users that can see folder.
getFolderUsers(folderId) {
let url = this.get('sessionService').appMeta.getUrl(`users/folder/${folderId}`);
let url = `users/folder/${folderId}`;
return this.get('ajax').request(url, {
method: "GET"
@ -70,7 +67,7 @@ export default Ember.Service.extend({
// Updates an existing user record.
save(user) {
let userId = user.get('id');
let url = this.get('sessionService').appMeta.getUrl(`users/${userId}`);
let url = `users/${userId}`;
return this.get('ajax').request(url, {
type: 'PUT',
@ -81,7 +78,7 @@ export default Ember.Service.extend({
// updatePassword changes the password for the specified user.
updatePassword(userId, password) {
let url = this.get('sessionService').appMeta.getUrl(`users/${userId}/password`);
let url = `users/${userId}/password`;
return this.get('ajax').post(url, {
data: password
@ -90,7 +87,7 @@ export default Ember.Service.extend({
// Removes the specified user.
remove(userId) {
let url = this.get('sessionService').appMeta.getUrl(`users/${userId}`);
let url = `users/${userId}`;
return this.get('ajax').request(url, {
method: 'DELETE'
@ -99,7 +96,7 @@ export default Ember.Service.extend({
// Request password reset.
forgotPassword(email) {
let url = this.get('sessionService').appMeta.getUrl('public/forgot');
let url = `public/forgot`;
if (is.empty(email)) {
return Ember.RSVP.reject("invalid");
@ -118,7 +115,7 @@ export default Ember.Service.extend({
// Set new password.
resetPassword(token, password) {
var url = this.get('sessionService').appMeta.getUrl('public/reset/' + token);
var url = `public/reset/${token}`;
if (is.empty(token) || is.empty(password)) {
return Ember.RSVP.reject("invalid");