Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-25 16:19:46 +02:00
Code Releases Activity

refactored ember route model hook to remove setupController()

Browse source
This commit is contained in:
Harvey Kandola 2016-11-11 16:17:43 -08:00
parent 43427c65dd
commit b68a0ac6d6
22 changed files with 251 additions and 375 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/app/components/document/document-meta.js
View file

@ -16,6 +16,18 @@ import TooltipMixin from '../../mixins/tooltip';
export default Ember.Component.extend(NotifierMixin, TooltipMixin, { export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
appMeta: Ember.inject.service(), appMeta: Ember.inject.service(),
didReceiveAttrs() {
// setup document owner
let owner = this.get('users').findBy('id', this.get('document.userId'));
// no document owner? You are the owner!
if (is.undefined(owner)) {
owner = this.session.user;
}
this.set('owner', owner);
},
actions: { actions: {
onSave() { onSave() {
let doc = this.get('document'); let doc = this.get('document');

3
app/app/components/document/document-sidebar-toc.js
View file

@ -31,7 +31,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
}), }),
didReceiveAttrs: function () { didReceiveAttrs: function () {
this.set('showToc', is.not.undefined(this.get('pages')) && this.get('pages').get('length') > 2); this.set('showToc', is.not.undefined(this.get('pages')) && this.get('pages').get('length') > 0);
if (is.not.null(this.get('page'))) { if (is.not.null(this.get('page'))) {
this.send('onEntryClick', this.get('page')); this.send('onEntryClick', this.get('page'));
} }
@ -66,7 +66,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
let toc = this.get('pages'); let toc = this.get('pages');
let page = _.findWhere(toc, { id: pageId }); let page = _.findWhere(toc, { id: pageId });
let state = tocUtil.getState(toc, page); let state = tocUtil.getState(toc, page);
if (!this.get('isEditor') || is.empty(pageId)) { if (!this.get('isEditor') || is.empty(pageId)) {

4
app/app/components/document/document-tab.js
View file

@ -22,6 +22,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
if (this.get('mode') === 'edit') { if (this.get('mode') === 'edit') {
this.send('onEdit'); this.send('onEdit');
} }
this.audit.record("viewed-document-section-" + this.get('model.page.contentType'));
}, },
didInsertElement() { didInsertElement() {
@ -42,11 +44,13 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
onEdit() { onEdit() {
this.set('viewMode', false); this.set('viewMode', false);
this.set('editMode', true); this.set('editMode', true);
this.set('mode', 'edit');
}, },
onView() { onView() {
this.set('viewMode', true); this.set('viewMode', true);
this.set('editMode', false); this.set('editMode', false);
this.set('mode', 'view');
}, },
onCancel() { onCancel() {

8
app/app/components/section/gemini/type-editor.js
View file

@ -1,11 +1,11 @@
// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved. // Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
// //
// This software (Documize Community Edition) is licensed under // This software (Documize Community Edition) is licensed under
// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html // GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
// //
// You can operate outside the AGPL restrictions by purchasing // You can operate outside the AGPL restrictions by purchasing
// Documize Enterprise Edition and obtaining a commercial license // Documize Enterprise Edition and obtaining a commercial license
// by contacting <sales@documize.com>. // by contacting <sales@documize.com>.
// //
// https://documize.com // https://documize.com
@ -49,9 +49,7 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
self.set('waiting', true); self.set('waiting', true);
this.get('sectionService').fetch(this.get('page'), "secrets", this.get('config')) this.get('sectionService').fetch(this.get('page'), "secrets", this.get('config'))
.then(function (response) { .then(function (response) {
console.log(response);
self.set('waiting', false); self.set('waiting', false);
self.set('config.APIKey', response.apikey); self.set('config.APIKey', response.apikey);
self.set('config.url', response.url); self.set('config.url', response.url);
self.set('config.username', response.username); self.set('config.username', response.username);
@ -223,4 +221,4 @@ export default Ember.Component.extend(SectionMixin, NotifierMixin, TooltipMixin,
this.attrs.onAction(page, meta); this.attrs.onAction(page, meta);
} }
} }
}); });

45
app/app/pods/document/activity/route.js
View file

@ -14,45 +14,20 @@ import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-rout
export default Ember.Route.extend(AuthenticatedRouteMixin, { export default Ember.Route.extend(AuthenticatedRouteMixin, {
documentService: Ember.inject.service('document'), documentService: Ember.inject.service('document'),
folderService: Ember.inject.service('folder'),
userService: Ember.inject.service('user'),
pages: [],
model() { model() {
this.audit.record("viewed-document-activity"); this.audit.record("viewed-document-activity");
let folders = this.get('store').peekAll('folder'); return Ember.RSVP.hash({
let folder = this.get('store').peekRecord('folder', this.paramsFor('document').folder_id); folders: this.modelFor('document').folders,
folder: this.modelFor('document').folder,
this.set('folders', folders); document: this.modelFor('document').document,
this.set('folder', folder); isEditor: this.modelFor('document').isEditor,
pages: this.modelFor('document').allPages,
return this.modelFor('document'); tabs: this.modelFor('document').tabs,
}, activity: this.get('documentService').getMeta(this.modelFor('document').document.get('id')).then((activity) => {
return activity;
afterModel(model) { })
let self = this;
let pages = this.get('store').peekAll('page').filter((page) => {
return page.get('documentId') === model.get('id');
}); });
this.set('pages', pages);
return new Ember.RSVP.Promise(function (resolve) {
self.get('documentService').getMeta(model.get('id')).then(function (activity) {
self.set('activity', activity);
resolve();
});
});
},
setupController(controller, model) {
controller.set('model', model);
controller.set('folder', this.get('folder'));
controller.set('folders', this.get('folders').rejectBy('id', 0));
controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
controller.set('activity', this.get('activity'));
controller.set('pages', this.get('pages'));
} }
}); });

2
app/app/pods/document/activity/template.hbs
View file

@ -1 +1 @@
{{document/document-activity document=model pages=pages activity=activity}} {{document/document-activity document=model.document pages=model.pages activity=model.activity}}

142
app/app/pods/document/controller.js
View file

@ -15,7 +15,6 @@ import NotifierMixin from '../../mixins/notifier';
export default Ember.Controller.extend(NotifierMixin, { export default Ember.Controller.extend(NotifierMixin, {
documentService: Ember.inject.service('document'), documentService: Ember.inject.service('document'),
templateService: Ember.inject.service('template'), templateService: Ember.inject.service('template'),
page: null, page: null,
folder: {}, folder: {},
pages: [], pages: [],
@ -53,11 +52,9 @@ export default Ember.Controller.extend(NotifierMixin, {
}, },
onPageSequenceChange(changes) { onPageSequenceChange(changes) {
let self = this; this.get('documentService').changePageSequence(this.get('model.document.id'), changes).then(() => {
_.each(changes, (change) => {
this.get('documentService').changePageSequence(this.model.get('id'), changes).then(function () { let pageContent = _.findWhere(this.get('model.pages'), {
_.each(changes, function (change) {
let pageContent = _.findWhere(self.get('pages'), {
id: change.pageId id: change.pageId
}); });
@ -66,16 +63,15 @@ export default Ember.Controller.extend(NotifierMixin, {
} }
}); });
self.set('pages', self.get('pages').sortBy('sequence')); this.set('model.pages', this.get('model.pages').sortBy('sequence'));
this.get('target.router').refresh();
}); });
}, },
onPageLevelChange(changes) { onPageLevelChange(changes) {
let self = this; this.get('documentService').changePageLevel(this.get('model.document.id'), changes).then(() => {
_.each(changes, (change) => {
this.get('documentService').changePageLevel(this.model.get('id'), changes).then(function () { let pageContent = _.findWhere(this.get('model.pages'), {
_.each(changes, function (change) {
let pageContent = _.findWhere(self.get('pages'), {
id: change.pageId id: change.pageId
}); });
@ -84,89 +80,23 @@ export default Ember.Controller.extend(NotifierMixin, {
} }
}); });
let pages = self.get('pages'); let pages = this.get('model.pages');
pages = pages.sortBy('sequence'); pages = pages.sortBy('sequence');
self.set('pages', []); this.set('model.pages', []);
self.set('pages', pages); this.set('model.pages', pages);
this.get('target.router').refresh();
}); });
}, },
onPageDeleted(deletePage) {
let self = this;
let documentId = this.get('model.id');
let pages = this.get('pages');
let deleteId = deletePage.id;
let deleteChildren = deletePage.children;
let page = _.findWhere(pages, {
id: deleteId
});
let pageIndex = _.indexOf(pages, page, false);
let pendingChanges = [];
// select affected pages
for (var i = pageIndex + 1; i < pages.get('length'); i++) {
if (pages[i].get('level') <= page.get('level')) {
break;
}
pendingChanges.push({
pageId: pages[i].get('id'),
level: pages[i].get('level') - 1
});
}
if (deleteChildren) {
// nuke of page tree
pendingChanges.push({
pageId: deleteId
});
this.get('documentService').deletePages(documentId, deleteId, pendingChanges).then(function () {
// update our models so we don't have to reload from db
for (var i = 0; i < pendingChanges.length; i++) {
let pageId = pendingChanges[i].pageId;
self.set('pages', _.reject(self.get('pages'), function (p) { //jshint ignore: line
return p.id === pageId;
}));
}
self.set('pages', _.sortBy(self.get('pages'), "sequence"));
self.audit.record("deleted-page");
// fetch document meta
self.get('documentService').getMeta(self.model.get('id')).then(function (meta) {
self.set('meta', meta);
});
});
} else {
// page delete followed by re-leveling child pages
this.get('documentService').deletePage(documentId, deleteId).then(function () {
self.set('pages', _.reject(self.get('pages'), function (p) {
return p.get('id') === deleteId;
}));
self.audit.record("deleted-page");
// fetch document meta
self.get('documentService').getMeta(self.model.get('id')).then(function (meta) {
self.set('meta', meta);
});
});
self.send('onPageLevelChange', pendingChanges);
}
},
onSaveTemplate(name, desc) { onSaveTemplate(name, desc) {
this.get('templateService').saveAsTemplate(this.model.get('id'), name, desc).then(function () {}); this.get('templateService').saveAsTemplate(this.get('model.document.id'), name, desc).then(function () {});
}, },
onAddSection(section) { onAddSection(section) {
this.audit.record("added-section-" + section.get('contentType')); this.audit.record("added-section-" + section.get('contentType'));
let page = { let page = {
documentId: this.get('model.id'), documentId: this.get('model.document.id'),
title: `${section.get('title')}`, title: `${section.get('title')}`,
level: 1, level: 1,
sequence: 0, sequence: 0,
@ -175,44 +105,42 @@ export default Ember.Controller.extend(NotifierMixin, {
pageType: section.get('pageType') pageType: section.get('pageType')
}; };
let data = this.get('store').normalize('page', page);
let pageData = this.get('store').push(data);
let meta = { let meta = {
documentId: this.get('model.id'), documentId: this.get('model.document.id'),
rawBody: "", rawBody: "",
config: "" config: ""
}; };
let pageMeta = this.get('store').normalize('page-meta', meta);
let pageMetaData = this.get('store').push(pageMeta);
let model = { let model = {
page: pageData, page: page,
meta: pageMetaData meta: meta
}; };
this.get('documentService').addPage(this.get('model.id'), model).then((newPage) => { this.get('documentService').addPage(this.get('model.document.id'), model).then((newPage) => {
let data = this.get('store').normalize('page', newPage); let data = this.get('store').normalize('page', newPage);
this.get('store').push(data); this.get('store').push(data);
console.log(newPage);
this.transitionToRoute('document.edit', this.get('documentService').getPages(this.get('model.document.id')).then((pages) => {
this.get('folder.id'), this.set('model.pages', pages.filterBy('pageType', 'section'));
this.get('folder.slug'), this.set('model.tabs', pages.filterBy('pageType', 'tab'));
this.get('model.id'),
this.get('model.slug'), this.get('documentService').getPageMeta(this.get('model.document.id'), newPage.id).then(() => {
newPage.id); this.transitionToRoute('document.edit',
this.get('model.folder.id'),
this.get('model.folder.slug'),
this.get('model.document.id'),
this.get('model.document.slug'),
newPage.id);
});
});
}); });
}, },
onDocumentDelete() { onDocumentDelete() {
let self = this; this.get('documentService').deleteDocument(this.get('model.document.id')).then(() => {
this.audit.record("deleted-page");
this.get('documentService').deleteDocument(this.get('model.id')).then(function () { this.send("showNotification", "Deleted");
self.audit.record("deleted-page"); this.transitionToRoute('folder', this.get('model.folder.id'), this.get('model.folder.slug'));
self.send("showNotification", "Deleted");
self.transitionToRoute('folder', self.get('folder.id'), self.get('folder.slug'));
}); });
} }
} }

19
app/app/pods/document/files/route.js
View file

@ -10,25 +10,22 @@
// https://documize.com // https://documize.com
import Ember from 'ember'; import Ember from 'ember';
import RSVP from 'rsvp';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, { export default Ember.Route.extend(AuthenticatedRouteMixin, {
documentService: Ember.inject.service('document'), documentService: Ember.inject.service('document'),
folderService: Ember.inject.service('folder'),
userService: Ember.inject.service('user'),
model() { model() {
this.audit.record("viewed-document-attachments"); this.audit.record("viewed-document-attachments");
return RSVP.hash({ return Ember.RSVP.hash({
document: this.modelFor('document'), folders: this.modelFor('document').folders,
files: this.get('documentService').getAttachments(this.modelFor('document').get('id')) folder: this.modelFor('document').folder,
document: this.modelFor('document').document,
isEditor: this.modelFor('document').isEditor,
pages: this.modelFor('document').allPages,
tabs: this.modelFor('document').tabs,
files: this.get('documentService').getAttachments(this.modelFor('document').document.get('id'))
}); });
},
setupController(controller, model) {
controller.set('model', model);
controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
} }
}); });

2
app/app/pods/document/files/template.hbs
View file

@ -1 +1 @@
{{document/document-files document=model.document files=model.files isEditor=isEditor onUpload=(action 'onUpload') onDelete=(action 'onDelete')}} {{document/document-files document=model.document files=model.files isEditor=model.isEditor onUpload=(action 'onUpload') onDelete=(action 'onDelete')}}

58
app/app/pods/document/index/controller.js
View file

@ -14,11 +14,7 @@ import NotifierMixin from '../../../mixins/notifier';
export default Ember.Controller.extend(NotifierMixin, { export default Ember.Controller.extend(NotifierMixin, {
documentService: Ember.inject.service('document'), documentService: Ember.inject.service('document'),
templateService: Ember.inject.service('template'),
queryParams: ['page'], queryParams: ['page'],
page: null,
folder: {},
pages: [],
// Jump to the right part of the document. // Jump to the right part of the document.
scrollToPage(pageId) { scrollToPage(pageId) {
@ -53,11 +49,9 @@ export default Ember.Controller.extend(NotifierMixin, {
}, },
onPageSequenceChange(changes) { onPageSequenceChange(changes) {
let self = this; this.get('documentService').changePageSequence(this.get('model.document.id'), changes).then(() => {
_.each(changes, (change) => {
this.get('documentService').changePageSequence(this.model.get('id'), changes).then(function () { let pageContent = _.findWhere(this.get('model.pages'), {
_.each(changes, function (change) {
let pageContent = _.findWhere(self.get('pages'), {
id: change.pageId id: change.pageId
}); });
@ -66,16 +60,15 @@ export default Ember.Controller.extend(NotifierMixin, {
} }
}); });
self.set('pages', self.get('pages').sortBy('sequence')); this.set('model.pages', this.get('model.pages').sortBy('sequence'));
this.get('target.router').refresh();
}); });
}, },
onPageLevelChange(changes) { onPageLevelChange(changes) {
let self = this; this.get('documentService').changePageLevel(this.get('model.document.id'), changes).then(() => {
_.each(changes, (change) => {
this.get('documentService').changePageLevel(this.model.get('id'), changes).then(function () { let pageContent = _.findWhere(this.get('model.pages'), {
_.each(changes, function (change) {
let pageContent = _.findWhere(self.get('pages'), {
id: change.pageId id: change.pageId
}); });
@ -84,17 +77,17 @@ export default Ember.Controller.extend(NotifierMixin, {
} }
}); });
let pages = self.get('pages'); let pages = this.get('model.pages');
pages = pages.sortBy('sequence'); pages = pages.sortBy('sequence');
self.set('pages', []); this.set('model.pages', pages);
self.set('pages', pages);
this.get('target.router').refresh();
}); });
}, },
onPageDeleted(deletePage) { onPageDeleted(deletePage) {
let self = this; let documentId = this.get('model.document.id');
let documentId = this.get('model.id'); let pages = this.get('model.pages');
let pages = this.get('pages');
let deleteId = deletePage.id; let deleteId = deletePage.id;
let deleteChildren = deletePage.children; let deleteChildren = deletePage.children;
let page = _.findWhere(pages, { let page = _.findWhere(pages, {
@ -103,6 +96,8 @@ export default Ember.Controller.extend(NotifierMixin, {
let pageIndex = _.indexOf(pages, page, false); let pageIndex = _.indexOf(pages, page, false);
let pendingChanges = []; let pendingChanges = [];
this.audit.record("deleted-page");
// select affected pages // select affected pages
for (var i = pageIndex + 1; i < pages.get('length'); i++) { for (var i = pageIndex + 1; i < pages.get('length'); i++) {
if (pages[i].get('level') <= page.get('level')) { if (pages[i].get('level') <= page.get('level')) {
@ -121,29 +116,28 @@ export default Ember.Controller.extend(NotifierMixin, {
pageId: deleteId pageId: deleteId
}); });
this.get('documentService').deletePages(documentId, deleteId, pendingChanges).then(function () { this.get('documentService').deletePages(documentId, deleteId, pendingChanges).then(() => {
// update our models so we don't have to reload from db // update our models so we don't have to reload from db
for (var i = 0; i < pendingChanges.length; i++) { for (var i = 0; i < pendingChanges.length; i++) {
let pageId = pendingChanges[i].pageId; let pageId = pendingChanges[i].pageId;
self.set('pages', _.reject(self.get('pages'), function (p) { //jshint ignore: line this.set('model.pages', _.reject(pages, function (p) { //jshint ignore: line
return p.id === pageId; return p.get('id') === pageId;
})); }));
} }
self.set('pages', _.sortBy(self.get('pages'), "sequence")); this.set('model.pages', _.sortBy(pages, "sequence"));
this.get('target.router').refresh();
}); });
} else { } else {
// page delete followed by re-leveling child pages // page delete followed by re-leveling child pages
this.get('documentService').deletePage(documentId, deleteId).then(function () { this.get('documentService').deletePage(documentId, deleteId).then(() => {
self.set('pages', _.reject(self.get('pages'), function (p) { this.set('model.pages', _.reject(pages, function (p) {
return p.get('id') === deleteId; return p.get('id') === deleteId;
})); }));
this.send('onPageLevelChange', pendingChanges);
}); });
self.send('onPageLevelChange', pendingChanges);
} }
}
self.audit.record("deleted-page");
},
} }
}); });

49
app/app/pods/document/index/route.js
View file

@ -16,11 +16,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
documentService: Ember.inject.service('document'), documentService: Ember.inject.service('document'),
folderService: Ember.inject.service('folder'), folderService: Ember.inject.service('folder'),
userService: Ember.inject.service('user'), userService: Ember.inject.service('user'),
pages: [],
attachments: [],
users: [],
meta: [],
folder: null,
queryParams: { queryParams: {
page: { page: {
refreshModel: false refreshModel: false
@ -28,40 +23,34 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
}, },
beforeModel(transition) { beforeModel(transition) {
this.pageId = is.not.undefined(transition.queryParams.page) ? transition.queryParams.page : ""; this.set('pageId', is.not.undefined(transition.queryParams.page) ? transition.queryParams.page : "");
this.set('folderId', this.paramsFor('document').folder_id);
this.set('documentId', this.paramsFor('document').document_id);
let folders = this.get('store').peekAll('folder'); let folders = this.get('store').peekAll('folder');
let folder = this.get('store').peekRecord('folder', this.paramsFor('document').folder_id); let folder = this.get('store').peekRecord('folder', this.get('folderId'));
let document = this.get('store').peekRecord('document', this.get('documentId'));
this.set('document', document);
this.set('folders', folders); this.set('folders', folders);
this.set('folder', folder); this.set('folder', folder);
this.get('folderService').setCurrentFolder(folder);
}, },
model() { model() {
this.audit.record("viewed-document"); this.browser.setTitle(this.get('document.name'));
return this.modelFor('document'); this.browser.setMetaDescription(this.get('document.excerpt'));
},
afterModel(model) { let self = this;
var self = this;
var documentId = model.get('id');
this.browser.setTitle(model.get('name')); return Ember.RSVP.hash({
folders: self.get('folders'),
return new Ember.RSVP.Promise(function (resolve) { folder: self.get('folder'),
self.get('documentService').getPages(documentId).then(function (pages) { document: self.get('document'),
self.set('pages', pages); page: self.get('pageId'),
resolve(); isEditor: self.get('folderService').get('canEditCurrentFolder'),
}); pages: self.get('documentService').getPages(self.get('documentId')).then(function (pages) {
return pages.filterBy('pageType', 'section');
})
}); });
},
setupController(controller, model) {
controller.set('model', model);
controller.set('folder', this.folder);
controller.set('folders', this.get('folders').rejectBy('id', 0));
controller.set('currentPage', this.pageId);
controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
controller.set('pages', this.get('pages').filterBy('pageType', 'section'));
} }
}); });

2
app/app/pods/document/index/template.hbs
View file

@ -1,2 +1,2 @@
{{document/document-view document=model meta=meta pages=pages attachments=attachments folder=folder folders=folders isEditor=isEditor {{document/document-view document=model.document meta=meta pages=model.pages folder=model.folder folders=model.folders isEditor=model.isEditor
gotoPage=(action 'gotoPage') onDeletePage=(action 'onPageDeleted')}} gotoPage=(action 'gotoPage') onDeletePage=(action 'onPageDeleted')}}

9
app/app/pods/document/meta/controller.js
View file

@ -17,12 +17,9 @@ export default Ember.Controller.extend(NotifierMixin, {
actions: { actions: {
onSave(doc) { onSave(doc) {
let self = this; this.get('documentService').save(doc).then(() => {
this.showNotification('Saved');
this.get('documentService').save(doc).then(function () { this.transitionToRoute('document.index');
self.showNotification('Saved');
self.set('model', doc);
self.transitionToRoute('document.index');
}); });
} }
} }

46
app/app/pods/document/meta/route.js
View file

@ -13,49 +13,21 @@ import Ember from 'ember';
import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
export default Ember.Route.extend(AuthenticatedRouteMixin, { export default Ember.Route.extend(AuthenticatedRouteMixin, {
documentService: Ember.inject.service('document'),
folderService: Ember.inject.service('folder'),
userService: Ember.inject.service('user'), userService: Ember.inject.service('user'),
model() { model() {
this.audit.record("viewed-document-meta"); this.audit.record("viewed-document-meta");
let folders = this.get('store').peekAll('folder'); let folderId = this.modelFor('document').folder.get('id');
let folder = this.get('store').peekRecord('folder', this.paramsFor('document').folder_id);
this.set('folders', folders);
this.set('folder', folder);
return this.modelFor('document'); return Ember.RSVP.hash({
}, folders: this.modelFor('document').folders,
folder: this.modelFor('document').folder,
afterModel() { document: this.modelFor('document').document,
let self = this; isEditor: this.modelFor('document').isEditor,
pages: this.modelFor('document').allPages,
return new Ember.RSVP.Promise(function (resolve) { tabs: this.modelFor('document').tabs,
self.get('userService').getFolderUsers(self.get('folder.id')).then(function (users) { users: this.get('userService').getFolderUsers(folderId)
self.set('users', users);
resolve();
});
}); });
},
setupController(controller, model) {
controller.set('model', model);
controller.set('folder', this.get('folder'));
controller.set('folders', this.get('folders').rejectBy('id', 0));
controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
controller.set('users', this.get('users'));
// setup document owner
let owner = this.get('users').findBy('id', model.get('userId'));
// no document owner? You are the owner!
if (is.undefined(owner)) {
owner = this.session.user;
model.set('userId', this.get('session.session.authenticated.user.id'));
this.get('documentService').save(model);
}
controller.set('owner', owner);
} }
}); });

2
app/app/pods/document/meta/template.hbs
View file

@ -1 +1 @@
{{document/document-meta document=model folders=folders folder=folder users=users owner=owner isEditor=isEditor onSave=(action 'onSave')}} {{document/document-meta document=model.document folders=model.folders folder=model.folder users=model.users isEditor=model.isEditor onSave=(action 'onSave')}}

86
app/app/pods/document/route.js
View file

@ -16,74 +16,56 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
sectionService: Ember.inject.service('section'), sectionService: Ember.inject.service('section'),
documentService: Ember.inject.service('document'), documentService: Ember.inject.service('document'),
folderService: Ember.inject.service('folder'), folderService: Ember.inject.service('folder'),
userService: Ember.inject.service('user'),
pages: [],
users: [],
meta: [],
folder: null,
beforeModel(transition) { beforeModel(transition) {
this.pageId = is.not.undefined(transition.queryParams.page) ? transition.queryParams.page : ""; this.set('pageId', is.not.undefined(transition.queryParams.page) ? transition.queryParams.page : "");
var self = this; this.set('folderId', this.paramsFor('document').folder_id);
this.set('documentId', this.paramsFor('document').document_id);
this.get('folderService').getAll().then(function (folders) { return new Ember.RSVP.Promise((resolve) => {
self.set('folders', folders); this.get('folderService').getAll().then((folders) => {
self.set('folder', folders.findBy("id", self.paramsFor('document').folder_id)); this.set('folders', folders);
self.get('folderService').setCurrentFolder(self.get('folder'));
});
},
model: function (params) { this.get('folderService').getFolder(this.get('folderId')).then((folder) => {
// this.audit.record("viewed-document"); this.set('folder', folder);
return this.get('documentService').getDocument(params.document_id);
},
afterModel(model) { this.get('folderService').setCurrentFolder(folder).then(() => {
var self = this; this.set('isEditor', this.get('folderService').get('canEditCurrentFolder'));
var documentId = model.get('id');
this.browser.setTitle(model.get('name')); this.get('documentService').getPages(this.get('documentId')).then((pages) => {
this.set('allPages', pages);
return new Ember.RSVP.Promise(function (resolve) { this.set('pages', pages.filterBy('pageType', 'section'));
self.get('documentService').getPages(documentId).then(function (pages) { this.set('tabs', pages.filterBy('pageType', 'tab'));
self.set('allPages', pages); resolve();
});
self.get('sectionService').getAll().then(function (sections) { });
self.set('sections', sections.filterBy('pageType', 'section'));
resolve();
}); });
}); });
}); });
}, },
setupController(controller, model) { model() {
controller.set('model', model); return Ember.RSVP.hash({
controller.set('folder', this.folder); folders: this.get('folders'),
controller.set('folders', this.get('folders').rejectBy('id', 0)); folder: this.get('folder'),
controller.set('currentPage', this.pageId); document: this.get('documentService').getDocument(this.get('documentId')).then((document) => {
controller.set('isEditor', this.get('folderService').get('canEditCurrentFolder')); return document;
controller.set('pages', this.get('allPages').filterBy('pageType', 'section')); }),
controller.set('tabs', this.get('allPages').filterBy('pageType', 'tab')); page: this.get('pageId'),
controller.set('sections', this.get('sections')); isEditor: this.get('isEditor'),
allPages: this.get('allPages'),
// setup document owner pages: this.get('pages'),
let owner = this.get('users').findBy('id', model.get('userId')); tabs: this.get('tabs'),
sections: this.get('sectionService').getAll().then((sections) => {
// no document owner? You are the owner! return sections.filterBy('pageType', 'section');
if (is.undefined(owner)) { }),
owner = this.session.user; });
model.set('userId', this.get('session.session.authenticated.user.id'));
this.get('documentService').save(model);
}
controller.set('owner', owner);
this.browser.setMetaDescription(model.get('excerpt'));
}, },
actions: { actions: {
error(error /*, transition*/ ) { error(error /*, transition*/ ) {
console.log(error); console.log(error);
console.log(error.stack);
if (error) { if (error) {
this.transitionTo('/not-found'); this.transitionTo('/not-found');
return false; return false;

22
app/app/pods/document/section/controller.js
View file

@ -19,7 +19,6 @@ export default Ember.Controller.extend(NotifierMixin, {
actions: { actions: {
onAction(page, meta) { onAction(page, meta) {
let self = this;
this.showNotification("Saving"); this.showNotification("Saving");
let model = { let model = {
@ -27,21 +26,20 @@ export default Ember.Controller.extend(NotifierMixin, {
meta: meta.toJSON({ includeId: true }) meta: meta.toJSON({ includeId: true })
}; };
this.get('documentService').updatePage(page.get('documentId'), page.get('id'), model).then(function (page) { this.get('documentService').updatePage(page.get('documentId'), page.get('id'), model).then((page) => {
self.audit.record("edited-page"); this.audit.record("edited-page");
let data = self.get('store').normalize('page', page); let data = this.get('store').normalize('page', page);
self.get('store').push(data); this.get('store').push(data);
this.get('target.router').refresh();
}); });
}, },
onDelete(document, page) { onDelete(document, page) {
let self = this; this.get('documentService').deletePage(document.get('id'), page.get('id')).then(() => {
this.audit.record("deleted-page");
this.get('documentService').deletePage(document.get('id'), page.get('id')).then(function () { this.showNotification('Deleted');
page.deleteRecord(); this.transitionToRoute('document');
self.audit.record("deleted-page"); this.get('target.router').refresh();
self.showNotification('Deleted');
self.transitionToRoute('document');
}); });
} }
} }

32
app/app/pods/document/section/route.js
View file

@ -28,30 +28,16 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
}, },
model(params) { model(params) {
let self = this;
let document = this.modelFor('document');
let folders = this.get('store').peekAll('folder');
let folder = this.get('store').peekRecord('folder', this.paramsFor('document').folder_id);
let pages = this.get('store').peekAll('page').filter((page) => {
return page.get('documentId') === document.get('id') && page.get('pageType') === 'section';
});
let tabs = this.get('store').peekAll('page').filter((page) => {
return page.get('documentId') === document.get('id') && page.get('pageType') === 'tab';
});
let page = tabs.findBy('id', params.page_id);
this.audit.record("viewed-document-section-" + page.get('contentType'));
return Ember.RSVP.hash({ return Ember.RSVP.hash({
folders: folders, folders: this.modelFor('document').folders,
folder: folder, folder: this.modelFor('document').folder,
document: document, document: this.modelFor('document').document,
pages: pages, pages: this.modelFor('document').pages,
page: page, tabs: this.get('documentService').getPages(this.modelFor('document').document.get('id')).then((pages) => {
meta: self.get('documentService').getPageMeta(document.get('id'), params.page_id) return pages.filterBy('pageType', 'tab');
}),
page: this.get('documentService').getPage(this.modelFor('document').document.get('id'), params.page_id),
meta: this.get('documentService').getPageMeta(this.modelFor('document').document.get('id'), params.page_id)
}); });
}, },
}); });

4
app/app/pods/document/template.hbs
View file

@ -1,12 +1,12 @@
{{layout/zone-navigation}} {{layout/zone-navigation}}
{{#layout/zone-sidebar}} {{#layout/zone-sidebar}}
{{document/document-sidebar document=model folder=folder pages=pages page=page isEditor=isEditor sections=sections {{document/document-sidebar document=model.document folder=model.folder pages=model.pages page=model.page isEditor=model.isEditor sections=model.sections
onAddSection=(action 'onAddSection') changePageSequence=(action 'onPageSequenceChange') changePageLevel=(action 'onPageLevelChange') gotoPage=(action 'gotoPage')}} onAddSection=(action 'onAddSection') changePageSequence=(action 'onPageSequenceChange') changePageLevel=(action 'onPageLevelChange') gotoPage=(action 'gotoPage')}}
{{/layout/zone-sidebar}} {{/layout/zone-sidebar}}
{{#layout/zone-content}} {{#layout/zone-content}}
{{document/document-toolbar document=model pages=pages tabs=tabs folder=folder isEditor=isEditor {{document/document-toolbar document=model.document pages=model.pages tabs=model.tabs folder=model.folder isEditor=model.isEditor
onSaveTemplate=(action 'onSaveTemplate') onDocumentDelete=(action 'onDocumentDelete')}} onSaveTemplate=(action 'onSaveTemplate') onDocumentDelete=(action 'onDocumentDelete')}}
{{outlet}} {{outlet}}

65
app/app/pods/document/wizard/controller.js
View file

@ -9,6 +9,7 @@ export default Ember.Controller.extend(NotifierMixin, {
this.transitionToRoute('document'); this.transitionToRoute('document');
}, },
onAddSection(section) { onAddSection(section) {
this.audit.record("added-section-" + section.get('contentType')); this.audit.record("added-section-" + section.get('contentType'));
@ -22,28 +23,70 @@ export default Ember.Controller.extend(NotifierMixin, {
pageType: section.get('pageType') pageType: section.get('pageType')
}; };
let data = this.get('store').normalize('page', page);
let pageData = this.get('store').push(data);
let meta = { let meta = {
documentId: this.get('model.document.id'), documentId: this.get('model.document.id'),
rawBody: "", rawBody: "",
config: "" config: ""
}; };
let pageMeta = this.get('store').normalize('page-meta', meta);
let pageMetaData = this.get('store').push(pageMeta);
let model = { let model = {
page: pageData, page: page,
meta: pageMetaData meta: meta
}; };
this.get('documentService').addPage(this.get('model.document.id'), model).then((newPage) => { this.get('documentService').addPage(this.get('model.document.id'), model).then((newPage) => {
let options = {}; let data = this.get('store').normalize('page', newPage);
options['mode'] = 'edit'; this.get('store').push(data);
this.transitionToRoute('document.section', newPage.id, { queryParams: options });
this.get('documentService').getPages(this.get('model.document.id')).then((pages) => {
this.set('model.pages', pages.filterBy('pageType', 'section'));
this.set('model.tabs', pages.filterBy('pageType', 'tab'));
this.get('documentService').getPageMeta(this.get('model.document.id'), newPage.id).then(() => {
let options = {};
options['mode'] = 'edit';
this.transitionToRoute('document.section', newPage.id, { queryParams: options });
});
});
}); });
} }
//
// zonAddSection(section) {
// this.audit.record("added-section-" + section.get('contentType'));
//
// let page = {
// documentId: this.get('model.document.id'),
// title: `${section.get('title')}`,
// level: 1,
// sequence: 0,
// body: "",
// contentType: section.get('contentType'),
// pageType: section.get('pageType')
// };
//
// let data = this.get('store').normalize('page', page);
// let pageData = this.get('store').push(data);
//
// let meta = {
// documentId: this.get('model.document.id'),
// rawBody: "",
// config: ""
// };
//
// let pageMeta = this.get('store').normalize('page-meta', meta);
// let pageMetaData = this.get('store').push(pageMeta);
//
// let model = {
// page: pageData,
// meta: pageMetaData
// };
//
// this.get('documentService').addPage(this.get('model.document.id'), model).then((newPage) => {
// let options = {};
// options['mode'] = 'edit';
// this.transitionToRoute('document.section', newPage.id, { queryParams: options });
// });
// }
} }
}); });

11
app/app/pods/document/wizard/route.js
View file

@ -6,12 +6,13 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
folderService: Ember.inject.service('folder'), folderService: Ember.inject.service('folder'),
sectionService: Ember.inject.service('section'), sectionService: Ember.inject.service('section'),
model() { model(params) {
let self = this;
return Ember.RSVP.hash({ return Ember.RSVP.hash({
folder: self.get('folderService').getFolder(self.paramsFor('document').folder_id), folders: this.modelFor('document').folders,
document: self.get('documentService').getDocument(self.paramsFor('document').document_id), folder: this.modelFor('document').folder,
document: this.modelFor('document').document,
pages: this.modelFor('document').pages,
tabs: this.modelFor('document').tabs,
sections: this.get('sectionService').getAll().then(function (sections) { sections: this.get('sectionService').getAll().then(function (sections) {
return sections.filterBy('pageType', 'tab'); return sections.filterBy('pageType', 'tab');
}) })

3
app/app/templates/components/document/document-sidebar.hbs
View file

@ -25,6 +25,7 @@
gotoPage=(action 'gotoPage')}} gotoPage=(action 'gotoPage')}}
{{/if}} {{/if}}
{{#if showSections}} {{#if showSections}}
{{document/page-wizard display='section' document=document folder=folder sections=sections onCancel=(action 'onCancel') onAction=(action 'onAddSection')}} {{document/page-wizard display='section' document=document folder=folder sections=sections
onCancel=(action 'onCancel') onAction=(action 'onAddSection')}}
{{/if}} {{/if}}
</div> </div>