From 1ef209b74f728192cb396efb0c82b11f40f9546b Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Tue, 15 Jan 2019 20:14:32 +0000
Subject: [PATCH] Change attachment deletion confirmation from modal to popover

---
 .../components/document/sidebar-attachment.js | 26 +++----------------
 gui/app/components/folder/settings-delete.js  |  5 ++--
 .../document/sidebar-attachment.hbs           | 16 ++++++++++--
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/gui/app/components/document/sidebar-attachment.js b/gui/app/components/document/sidebar-attachment.js
index d679b85a..5556a2e4 100644
--- a/gui/app/components/document/sidebar-attachment.js
+++ b/gui/app/components/document/sidebar-attachment.js
@@ -29,11 +29,6 @@ export default Component.extend(Modals, Notifier, {
 	showDialog: false,
 	downloadQuery: '',
 
-	init() {
-		this._super(...arguments);
-		this.deleteAttachment = { id: '', name: '' };
-	},
-
 	didReceiveAttrs() {
 		this._super(...arguments);
 		this.getAttachments();
@@ -94,6 +89,8 @@ export default Component.extend(Modals, Notifier, {
 		let qry = '';
 		if (this.get('session.authenticated')) {
 			qry = '?token=' + this.get('session.authToken');
+		} else {
+			qry = '?secure=' + this.get('session.secureToken');
 		}
 		this.set('downloadQuery', qry);
 	},
@@ -105,26 +102,11 @@ export default Component.extend(Modals, Notifier, {
 	},
 
 	actions: {
-		onShowDialog(id, name) {
-			this.set('deleteAttachment', { id: id, name: name });
-
-			this.set('showDialog', true);
-		},
-
-		onDelete() {
-			this.set('showDialog', false);
-
-			let attachment = this.get('deleteAttachment');
-
+		onDelete(attachment) {
 			this.get('documentService').deleteAttachment(this.get('document.id'), attachment.id).then(() => {
+				this.notifySuccess('File deleted');
 				this.getAttachments();
-				this.set('deleteAttachment', {
-					id: "",
-					name: ""
-				});
 			});
-
-			return true;
 		},
 
 		onExport() {
diff --git a/gui/app/components/folder/settings-delete.js b/gui/app/components/folder/settings-delete.js
index 33a24dfb..c9705e68 100644
--- a/gui/app/components/folder/settings-delete.js
+++ b/gui/app/components/folder/settings-delete.js
@@ -36,9 +36,10 @@ export default Component.extend(AuthMixin, Notifier, {
 			$("#delete-space-name").removeClass("is-invalid");
 
 			this.get('spaceSvc').delete(this.get('space.id')).then(() => { /* jshint ignore:line */
-				this.get('localStorage').clearSessionItem('folder');
-				this.get('router').transitionTo('folders');
 			});
+
+			this.get('localStorage').clearSessionItem('folder');
+			this.get('router').transitionTo('folders');
 		}
 	}
 });
diff --git a/gui/app/templates/components/document/sidebar-attachment.hbs b/gui/app/templates/components/document/sidebar-attachment.hbs
index 888c7d59..1b7fd155 100644
--- a/gui/app/templates/components/document/sidebar-attachment.hbs
+++ b/gui/app/templates/components/document/sidebar-attachment.hbs
@@ -18,8 +18,20 @@
 					{{#if canEdit}}
 						<div class="menu">
 							{{#ui/ui-toolbar dark=false light=false raised=false large=false bordered=false}}
-								{{ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Red
-									onClick=(action "onShowDialog" file.id file.filename)}}
+								{{#ui/ui-toolbar-icon icon=constants.Icon.Delete color=constants.Color.Red}}
+									{{#attach-popover class="ember-attacher-popper" hideOn="escapekey, clickout" showOn="click" isShown=false}}
+										<div class="form">
+											<p>Are you sure you want to delete this file?</p>
+											{{ui/ui-spacer size=100}}
+											{{ui/ui-button
+												light=false
+												label=constants.Label.Delete
+												color=constants.Color.Red
+												onClick=(action "onDelete" file)}}
+										</div>
+									{{/attach-popover}}
+								{{/ui/ui-toolbar-icon}}
+
 							{{/ui/ui-toolbar}}
 						</div>
 					{{/if}}