From 82ddcc057d624e239185bf6d8f3530fb357c84fd Mon Sep 17 00:00:00 2001 From: sauls8t Date: Thu, 6 Jun 2019 17:58:48 +0100 Subject: [PATCH] Make copy/move process use dropdowns for selection We currently use keyword searching to find target documents. Replace this with space and document list dropdown for quicker and easier target document selection. --- gui/app/components/document/page-heading.js | 97 ++++++------ .../components/document/document-page.hbs | 1 + .../components/document/page-heading.hbs | 146 +++++++----------- .../components/document/view-content.hbs | 1 + 4 files changed, 106 insertions(+), 139 deletions(-) diff --git a/gui/app/components/document/page-heading.js b/gui/app/components/document/page-heading.js index 102c0c02..455105f6 100644 --- a/gui/app/components/document/page-heading.js +++ b/gui/app/components/document/page-heading.js @@ -26,10 +26,9 @@ export default Component.extend(Notifier, ModalMixin, { deleteChildren: false, blockTitle: "", blockExcerpt: "", - // canEdit: false, - canDelete: false, - canMove: false, - docSearchFilter: '', + targetSpace: null, + targetDocs: null, + targetDoc: null, // eslint-disable-next-line ember/no-observers onKeywordChange: observer('docSearchFilter', function() { @@ -39,12 +38,6 @@ export default Component.extend(Notifier, ModalMixin, { emptySearch: computed('docSearchResults', function() { return this.get('docSearchResults.length') === 0; }), - hasMenuPermissions: computed('permissions.{documentCopy,documentTemplate}', 'userPendingItem', 'canEdit', 'canMove', 'canDelete', function() { - let permissions = this.get('permissions'); - - return permissions.get('documentCopy') || permissions.get('documentTemplate') || - this.get('canEdit') || this.get('canMove') || this.get('canDelete'); - }), canEdit: computed('permissions', 'document', 'pages', function() { let constants = this.get('constants'); let permissions = this.get('permissions'); @@ -59,7 +52,7 @@ export default Component.extend(Notifier, ModalMixin, { init() { this._super(...arguments); - this.docSearchResults = []; + this.state = { actionablePage: false, upDisabled: true, @@ -74,11 +67,6 @@ export default Component.extend(Notifier, ModalMixin, { this._super(...arguments); this.modalInputFocus('#publish-page-modal-' + this.get('page.id'), '#block-title-' + this.get('page.id')); - let permissions = this.get('permissions'); - // this.set('canEdit', permissions.get('documentEdit')); - this.set('canDelete', permissions.get('documentDelete')); - this.set('canMove', permissions.get('documentMove')); - this.setState(this.get('page.id')); }, @@ -101,19 +89,12 @@ export default Component.extend(Notifier, ModalMixin, { }, willDestroyElement() { + this._super(...arguments); + let clip = this.get('clip'); if (!_.isUndefined(clip)) clip.destroy(); }, - searchDocs() { - let payload = { keywords: this.get('docSearchFilter').trim(), doc: true }; - if (payload.keywords.length == 0) return; - - this.get('searchService').find(payload).then((response)=> { - this.set('docSearchResults', response); - }); - }, - // Controls what user can do with the toc enty for this page setState(pageId) { let toc = this.get('pages'); @@ -196,45 +177,55 @@ export default Component.extend(Notifier, ModalMixin, { }); }, - onSelectSearchResult(documentId) { - let results = this.get('docSearchResults'); - results.forEach((d) => { - d.set('selected', d.get('documentId') === documentId); - }); - this.set('docSearchResults', results); + onShowCopyModal() { + this.send('onSelectSpace', this.get('folder')); + this.modalOpen('#copy-page-modal-' + this.get('page.id'), {show:true}); + }, + + onShowMoveModal() { + this.send('onSelectSpace', this.get('folder')); + this.modalOpen('#move-page-modal-' + this.get('page.id'), {show:true}); }, onCopyPage() { - let item = this.get('docSearchResults').findBy('selected', true); - let documentId = !_.isUndefined(item) ? item.get('documentId') : ''; - - if (_.isEmpty(documentId)) return; + let targetDoc = this.get('targetDoc'); + if (_.isNull(targetDoc)) return; this.modalClose('#copy-page-modal-' + this.get('page.id')); - let cb = this.get('onCopyPage'); - cb(documentId); - - let refresh = this.get('refresh'); - refresh(); + this.get('onCopyPage')(targetDoc.get('id')); + this.get('refresh')(); }, onMovePage() { - let item = this.get('docSearchResults').findBy('selected', true); - let documentId = !_.isUndefined(item) ? item.get('documentId') : ''; - - if (_.isEmpty(documentId)) return; - - // can't move into self - if (documentId === this.get('document.id')) return; + let targetDoc = this.get('targetDoc'); + if (_.isNull(targetDoc)) return; this.modalClose('#move-page-modal-' + this.get('page.id')); - let cb = this.get('onMovePage'); - cb(documentId); + this.get('onMovePage')(targetDoc.get('id')); + this.get('refresh')(); + }, - let refresh = this.get('refresh'); - refresh(); + // Load up documents for selected space and select the first one. + onSelectSpace(space) { + this.set('targetSpace', space); + + this.get('documentService').getAllBySpace(space.get('id')).then((docs) => { + this.set('targetDocs', docs); + + if (space.get('id') === this.get('folder.id')) { + this.set('targetDoc', this.get('document')); + } else { + if (docs.length > 0) { + this.set('targetDoc', docs[0]); + } + } + }); + }, + + onSelectDoc(doc) { + this.set('targetDoc', doc); }, // Page up -- above pages shunt down @@ -303,7 +294,7 @@ export default Component.extend(Notifier, ModalMixin, { cb(state.pageId, pendingChanges); } }, - + onExpand() { this.set('expanded', !this.get('expanded')); this.get('onExpand')(this.get('page.id'), this.get('expanded')); @@ -311,6 +302,6 @@ export default Component.extend(Notifier, ModalMixin, { onCopyLink() { this.set('currentPageId', this.get('page.id')); - } + } } }); diff --git a/gui/app/templates/components/document/document-page.hbs b/gui/app/templates/components/document/document-page.hbs index 2689bfec..c4837191 100644 --- a/gui/app/templates/components/document/document-page.hbs +++ b/gui/app/templates/components/document/document-page.hbs @@ -19,6 +19,7 @@ pages=pages roles=roles folder=folder + folders=folders blocks=blocks tabMode=tabMode pending=pending diff --git a/gui/app/templates/components/document/page-heading.hbs b/gui/app/templates/components/document/page-heading.hbs index 8268778a..ab8a2358 100644 --- a/gui/app/templates/components/document/page-heading.hbs +++ b/gui/app/templates/components/document/page-heading.hbs @@ -10,58 +10,55 @@
- {{#unless (eq document.protection constants.ProtectionType.Lock)}} {{#if canEdit}} {{#attach-tooltip showDelay=1000}}Insert section above{{/attach-tooltip}}
- {{/if}} - {{#if hasMenuPermissions}}
- - {{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}} -
- {{#if canEdit}} - Edit - {{/if}} - {{#if permissions.documentCopy}} - Copy - {{/if}} - {{#if canMove}} - Move - {{/if}} - {{#if permissions.documentTemplate}} - Publish - {{/if}} - {{#if canDelete}} - Delete - {{/if}} - {{#if (and canEdit state.actionablePage)}} -
- {{#unless state.indentDisabled}} - Indent - {{/unless}} - {{#unless state.outdentDisabled}} - Outdent - {{/unless}} - {{#unless state.upDisabled}} - Move up - {{/unless}} - {{#unless state.downDisabled}} - Move down - {{/unless}} - {{/if}} -
- {{/attach-popover}} - {{/if}} - {{/unless}} -
- - {{#attach-tooltip showDelay=1000}}Copy link{{/attach-tooltip}} - + + {{#attach-popover class="ember-attacher-popper" hideOn="clickout click" showOn="click" isShown=false}} +
+ Copy link + {{#if (or canEdit permissions.documentCopy permissions.documentMove permissions.documentTemplate)}} +
+ {{/if}} + {{#if canEdit}} + Edit + {{/if}} + {{#if permissions.documentCopy}} + Copy + {{/if}} + {{#if permissions.documentMove}} + Move + {{/if}} + {{#if permissions.documentTemplate}} + Publish + {{/if}} + {{#if permissions.documentDelete}} +
+ Delete + {{/if}} + {{#if (and canEdit state.actionablePage)}} +
+ {{#unless state.indentDisabled}} + Indent + {{/unless}} + {{#unless state.outdentDisabled}} + Outdent + {{/unless}} + {{#unless state.upDisabled}} + Move up + {{/unless}} + {{#unless state.downDisabled}} + Move down + {{/unless}} + {{/if}} +
+ {{/attach-popover}} +
{{#attach-tooltip showDelay=1000}}Show/hide{{/attach-tooltip}} @@ -73,31 +70,19 @@ {{#if permissions.documentCopy}}