From 891f0ccd18b3b86f7ebcc6677aaf0e66f019e316 Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Tue, 7 Mar 2017 14:44:34 +0000
Subject: [PATCH] include selected sidebar tab in url query params

---
 app/app/components/document/sidebar-zone.js            |  8 ++++----
 app/app/pods/document/index/route.js                   |  4 ++++
 app/app/pods/document/index/template.hbs               |  2 +-
 app/app/templates/components/document/sidebar-zone.hbs | 10 +++++-----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/app/components/document/sidebar-zone.js b/app/app/components/document/sidebar-zone.js
index 125c6a32..52c07f44 100644
--- a/app/app/components/document/sidebar-zone.js
+++ b/app/app/components/document/sidebar-zone.js
@@ -30,13 +30,13 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 		name: "",
 		description: ""
 	},
-	currentTab: '',
+	tab: '',
 
 	init() {
 		this._super(...arguments);
 
-		if (is.empty(this.get('currentTab'))) {
-			this.set('currentTab', 'attachments');
+		if (is.empty(this.get('tab'))) {
+			this.set('tab', 'attachments');
 		}
 	},
 
@@ -65,7 +65,7 @@ export default Ember.Component.extend(TooltipMixin, NotifierMixin, {
 
     actions: {
 		onChangeTab(tab) {
-			this.set('currentTab', tab);
+			this.set('tab', tab);
 		},
 
 		onTagChange(tags) {
diff --git a/app/app/pods/document/index/route.js b/app/app/pods/document/index/route.js
index 93757b0d..55415078 100644
--- a/app/app/pods/document/index/route.js
+++ b/app/app/pods/document/index/route.js
@@ -20,11 +20,15 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	queryParams: {
 		pageId: {
 			refreshModel: true
+		},
+		tab: {
+			refreshModel: false
 		}
 	},
 
 	beforeModel(transition) {
 		this.set('pageId', is.not.undefined(transition.queryParams.pageId) ? transition.queryParams.pageId : '');
+		this.set('tab', is.not.undefined(transition.queryParams.tab) ? transition.queryParams.tab : '');
 	},
 
 	model() {
diff --git a/app/app/pods/document/index/template.hbs b/app/app/pods/document/index/template.hbs
index 30ad690f..ab09ced5 100644
--- a/app/app/pods/document/index/template.hbs
+++ b/app/app/pods/document/index/template.hbs
@@ -2,7 +2,7 @@
 	
 	<div id="sidebar-wrapper">
 		{{document/sidebar-zone folders=model.folders folder=model.folder document=model.document
-			pages=model.pages sections=model.section links=model.links isEditor=model.isEditor
+			pages=model.pages sections=model.section links=model.links isEditor=model.isEditor tab=tab
 			onDocumentDelete=(action 'onDocumentDelete') onSaveTemplate=(action 'onSaveTemplate')}}
 	</div>
 
diff --git a/app/app/templates/components/document/sidebar-zone.hbs b/app/app/templates/components/document/sidebar-zone.hbs
index 46f220fe..431b6f59 100644
--- a/app/app/templates/components/document/sidebar-zone.hbs
+++ b/app/app/templates/components/document/sidebar-zone.hbs
@@ -3,15 +3,15 @@
         <i class="material-icons color-gray">more_horiz</i>
     </div>
     <div class="margin-top-20"></div>
-    <div class="round-button-mono {{if (is-equal currentTab 'index') 'selected'}}" {{action 'onChangeTab' 'index'}}>
+    <div class="round-button-mono {{if (is-equal tab 'index') 'selected'}}" {{action 'onChangeTab' 'index'}}>
         <i class="material-icons">view_headline</i>
     </div>
     <div class="margin-top-20"></div>
-    <div class="round-button-mono {{if (is-equal currentTab 'attachments') 'selected'}}" {{action 'onChangeTab' 'attachments'}}>
+    <div class="round-button-mono {{if (is-equal tab 'attachments') 'selected'}}" {{action 'onChangeTab' 'attachments'}}>
         <i class="material-icons">attach_file</i>
     </div>
     <div class="margin-top-20"></div>
-    <div class="round-button-mono {{if (is-equal currentTab 'activity') 'selected'}}" {{action 'onChangeTab' 'activity'}}>
+    <div class="round-button-mono {{if (is-equal tab 'activity') 'selected'}}" {{action 'onChangeTab' 'activity'}}>
         <i class="material-icons">timeline</i>
     </div>
     <div class="margin-top-20"></div>
@@ -36,11 +36,11 @@
 </div>
 
 <div class="document-sidebar-wrapper">
-    {{#if (is-equal currentTab 'attachments')}}
+    {{#if (is-equal tab 'attachments')}}
         {{document/sidebar-view-attachments document=document isEditor=isEditor}}
     {{/if}}
 
-    {{#if (is-equal currentTab 'activity')}}
+    {{#if (is-equal tab 'activity')}}
         {{document/sidebar-view-activity document=document pages=pages isEditor=isEditor}}
     {{/if}}
 </div>