From 2c3ea15bac30a620f48a37ed193137b65bc1477e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 12 Jun 2018 15:46:35 -0300
Subject: [PATCH 1/2] fix set-toolbar-items iframe

---
 .../client/imports/components/header.css      |  8 ++++++
 .../client/flexTabBar.html                    | 15 +++++++++--
 .../client/flexTabBar.js                      | 10 ++++++++
 .../client/components/header/header.js        | 25 ++++++++++++++-----
 .../client/lib/iframeCommands.js              |  4 +--
 5 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/packages/rocketchat-theme/client/imports/components/header.css b/packages/rocketchat-theme/client/imports/components/header.css
index b05a45e848cd..00be50a788b0 100644
--- a/packages/rocketchat-theme/client/imports/components/header.css
+++ b/packages/rocketchat-theme/client/imports/components/header.css
@@ -259,6 +259,14 @@
 		font-size: 12px;
 		font-weight: 600;
 	}
+	& + & {
+		border-left: 1px var(--color-gray) solid;
+
+		.rtl & {
+			border-left: 0;
+			border-right: 1px var(--color-gray) solid;
+		}
+	}
 }
 
 .tab-button-icon--star {
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.html b/packages/rocketchat-ui-flextab/client/flexTabBar.html
index 40797a795322..4db9b5f805af 100644
--- a/packages/rocketchat-ui-flextab/client/flexTabBar.html
+++ b/packages/rocketchat-ui-flextab/client/flexTabBar.html
@@ -31,6 +31,17 @@ <h1 class="contextual-bar__header-title">{{_ label}}</h1>
 </template>
 
 <template name="RoomsActionTab">
+	{{# with postButtons}}
+		<div class="rc-room-actions iframe-toolbar">
+			{{#each .}}
+			<div class="rc-room-actions__action tab-button {{active}} {{visible}} {{class}} js-iframe-action" data-id="{{id}}">
+				<button class="rc-tooltip rc-tooltip--down rc-room-actions__button" aria-label="{{title}}">
+					{{> icon block="tab-button-icon" icon=icon }}
+				</button>
+			</div>
+			{{/each}}
+		</div>
+	{{/with}}
 	<div class="rc-room-actions">
 		{{#each buttons}}
 		<div class="rc-room-actions__action tab-button {{active}} {{visible}} {{class}} js-action" data-id="{{id}}">
@@ -39,10 +50,10 @@ <h1 class="contextual-bar__header-title">{{_ label}}</h1>
 			</button>
 		</div>
 		{{/each}}
-		{{# with moreButtons}}
+	 	{{# with moreButtons}}
 		<div class="rc-room-actions__action {{opened}}">
 			<button class="rc-tooltip rc-tooltip--down rc-room-actions__button js-more" aria-label="{{_ 'More'}}">
-			{{> icon block="tab-button-icon" icon="menu" }}
+				{{> icon block="tab-button-icon" icon="menu" }}
 			</button>
 		</div>
 		{{/with}}
diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js
index 51d75d175eef..ffdc283f76b3 100644
--- a/packages/rocketchat-ui-flextab/client/flexTabBar.js
+++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js
@@ -201,6 +201,16 @@ Template.RoomsActionTab.onCreated(function() {
 
 Template.RoomsActionTab.helpers({
 	...commonHelpers,
+	postButtons() {
+		const toolbar = Session.get('toolbarButtons');
+		const buttons = Object.keys(toolbar.buttons).map(key => {
+			return {
+				id: key,
+				...toolbar.buttons[key]
+			};
+		});
+		return buttons;
+	},
 	active() {
 		if (this.template === Template.instance().tabBar.getTemplate() && Template.instance().tabBar.getState() === 'opened') {
 			return 'active';
diff --git a/packages/rocketchat-ui/client/components/header/header.js b/packages/rocketchat-ui/client/components/header/header.js
index 3dd548f8ccd7..3cd641d16b61 100644
--- a/packages/rocketchat-ui/client/components/header/header.js
+++ b/packages/rocketchat-ui/client/components/header/header.js
@@ -104,25 +104,38 @@ Template.header.helpers({
 });
 
 Template.header.events({
-	'click .iframe-toolbar button'() {
+	'click .iframe-toolbar .js-iframe-action'(e) {
 		fireGlobalEvent('click-toolbar-button', { id: this.id });
+		$('button', e.currentTarget).blur();
+		return false;
 	},
 
 	'click .rc-header__toggle-favorite'(event) {
 		event.stopPropagation();
 		event.preventDefault();
-		return Meteor.call('toggleFavorite', this._id, !$(event.currentTarget).hasClass('favorite-room'), function(err) {
-			if (err) {
-				return handleError(err);
+		return Meteor.call(
+			'toggleFavorite',
+			this._id,
+			!$(event.currentTarget).hasClass('favorite-room'),
+			function(err) {
+				if (err) {
+					return handleError(err);
+				}
 			}
-		});
+		);
 	},
 
 	'click .edit-room-title'(event) {
 		event.preventDefault();
 		Session.set('editRoomTitle', true);
 		$('.rc-header').addClass('visible');
-		return Meteor.setTimeout(() => $('#room-title-field').focus().select(), 10);
+		return Meteor.setTimeout(
+			() =>
+				$('#room-title-field')
+					.focus()
+					.select(),
+			10
+		);
 	}
 });
 
diff --git a/packages/rocketchat-ui/client/lib/iframeCommands.js b/packages/rocketchat-ui/client/lib/iframeCommands.js
index cd270e1136a9..4e9eab498156 100644
--- a/packages/rocketchat-ui/client/lib/iframeCommands.js
+++ b/packages/rocketchat-ui/client/lib/iframeCommands.js
@@ -54,9 +54,9 @@ const commands = {
 		});
 	},
 
-	'set-toolbar-button'({ id, icon, label }) {
+	'set-toolbar-button'({ id, icon, label: i18nTitle }) {
 		const toolbar = Session.get('toolbarButtons') || { buttons: {} };
-		toolbar.buttons[id] = { icon, label };
+		toolbar.buttons[id] = { icon, i18nTitle };
 		Session.set('toolbarButtons', toolbar);
 	},
 

From bfe6116930df220ec99fe9f4b3c36c8386510de0 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 14 Jun 2018 18:07:57 -0300
Subject: [PATCH 2/2] fix review

---
 .../client/flexTabBar.js                      | 10 ++--------
 .../client/components/header/header.js        | 20 +++++++------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/packages/rocketchat-ui-flextab/client/flexTabBar.js b/packages/rocketchat-ui-flextab/client/flexTabBar.js
index ffdc283f76b3..335c0b1ed87d 100644
--- a/packages/rocketchat-ui-flextab/client/flexTabBar.js
+++ b/packages/rocketchat-ui-flextab/client/flexTabBar.js
@@ -202,14 +202,8 @@ Template.RoomsActionTab.onCreated(function() {
 Template.RoomsActionTab.helpers({
 	...commonHelpers,
 	postButtons() {
-		const toolbar = Session.get('toolbarButtons');
-		const buttons = Object.keys(toolbar.buttons).map(key => {
-			return {
-				id: key,
-				...toolbar.buttons[key]
-			};
-		});
-		return buttons;
+		const toolbar = Session.get('toolbarButtons') || {};
+		return Object.keys(toolbar.buttons || []).map(key =>({ id: key, ...toolbar.buttons[key] }));
 	},
 	active() {
 		if (this.template === Template.instance().tabBar.getTemplate() && Template.instance().tabBar.getState() === 'opened') {
diff --git a/packages/rocketchat-ui/client/components/header/header.js b/packages/rocketchat-ui/client/components/header/header.js
index 3cd641d16b61..8c75c98d0d3c 100644
--- a/packages/rocketchat-ui/client/components/header/header.js
+++ b/packages/rocketchat-ui/client/components/header/header.js
@@ -106,7 +106,7 @@ Template.header.helpers({
 Template.header.events({
 	'click .iframe-toolbar .js-iframe-action'(e) {
 		fireGlobalEvent('click-toolbar-button', { id: this.id });
-		$('button', e.currentTarget).blur();
+		e.currentTarget.querySelector('button').blur();
 		return false;
 	},
 
@@ -117,11 +117,7 @@ Template.header.events({
 			'toggleFavorite',
 			this._id,
 			!$(event.currentTarget).hasClass('favorite-room'),
-			function(err) {
-				if (err) {
-					return handleError(err);
-				}
-			}
+			err => err && handleError(err)
 		);
 	},
 
@@ -129,13 +125,11 @@ Template.header.events({
 		event.preventDefault();
 		Session.set('editRoomTitle', true);
 		$('.rc-header').addClass('visible');
-		return Meteor.setTimeout(
-			() =>
-				$('#room-title-field')
-					.focus()
-					.select(),
-			10
-		);
+		return Meteor.setTimeout(() =>
+			$('#room-title-field')
+				.focus()
+				.select(),
+		10);
 	}
 });