Merge pull request #7988 from RocketChat/action=messages

[FIX] Vertical menu on flex-tab # Conflicts: # packages/rocketchat-ui-master/public/icons.svg
RocketChat · Sep 5, 2017 · 7e39818 · 7e39818
1 parent 678fe0b
commit 7e39818
Show file tree

Hide file tree

Showing 20 changed files with 104 additions and 180 deletions.
diff --git a/packages/rocketchat-autotranslate/client/lib/actionButton.js b/packages/rocketchat-autotranslate/client/lib/actionButton.js
@@ -12,7 +12,6 @@ Meteor.startup(function() {
 				action() {
 					const message = this._arguments[1];
 					const language = RocketChat.AutoTranslate.getLanguage(message.rid);
-					RocketChat.MessageAction.hideDropDown();
 					if ((!message.translations || !message.translations[language])) { //} && !_.find(message.attachments, attachment => { return attachment.translations && attachment.translations[language]; })) {
 						RocketChat.AutoTranslate.messageIdsToWait[message._id] = true;
 						RocketChat.models.Messages.update({ _id: message._id }, { $set: { autoTranslateFetching: true } });

diff --git a/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json b/packages/rocketchat-google-vision/.npm/package/npm-shrinkwrap.json
diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js
@@ -59,23 +59,22 @@ RocketChat.MessageAction = new class {
 	}
 
 	getButtons(message, context, group) {
-		const allButtons = _.toArray(this.buttons.get());
-		let allowedButtons = allButtons;
+		let allButtons = _.toArray(this.buttons.get());
 
 		if (group) {
-			allowedButtons = allowedButtons.filter(button => button.group === group);
+			allButtons = allButtons.filter(button => button.group === group);
 		}
 
 		if (message) {
-			allowedButtons = _.compact(_.map(allowedButtons, function(button) {
+			allButtons = _.compact(_.map(allButtons, function(button) {
 				if (button.context == null || button.context.includes(context)) {
 					if (button.condition == null || button.condition(message, context)) {
 						return button;
 					}
 				}
 			}));
 		}
-		return _.sortBy(allowedButtons, 'order');
+		return _.sortBy(allButtons, 'order');
 	}
 
 	resetButtons() {
@@ -96,10 +95,6 @@ RocketChat.MessageAction = new class {
 	closePopover() {
 		popover.close();
 	}
-
-	hideDropDown() {
-		$('.message-dropdown:visible').hide();
-	}
 };
 
 Meteor.startup(function() {

diff --git a/packages/rocketchat-mentions-flextab/client/actionButton.js b/packages/rocketchat-mentions-flextab/client/actionButton.js
@@ -1,12 +1,11 @@
 Meteor.startup(function() {
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-message',
-		icon: 'right-hand',
+		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['mentions'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			if (window.matchMedia('(max-width: 500px)').matches) {
 				Template.instance().tabBar.close();
 			}

diff --git a/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js b/packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.js
@@ -19,9 +19,7 @@ Template.mentionsFlexTab.helpers({
 		});
 	},
 	message() {
-		return _.extend(this, {
-			customClass: 'mentions'
-		});
+		return _.extend(this, { customClass: 'mentions', actionContext: 'mentions'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();
@@ -42,21 +40,6 @@ Template.mentionsFlexTab.onCreated(function() {
 });
 
 Template.mentionsFlexTab.events({
-	'click .message-cog'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		const message_id = $(e.currentTarget).closest('.message').attr('id');
-		RocketChat.MessageAction.hideDropDown();
-		t.$(`\#${ message_id } .message-dropdown`).remove();
-		const message = MentionedMessage.findOne(message_id);
-		const actions = RocketChat.MessageAction.getButtons(message, 'mentions');
-		const el = Blaze.toHTMLWithData(Template.messageDropdown, {
-			actions
-		});
-		t.$(`\#${ message_id } .message-cog-container`).append(el);
-		const dropDown = t.$(`\#${ message_id } .message-dropdown`);
-		return dropDown.show();
-	},
 	'scroll .js-list': _.throttle(function(e, instance) {
 		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight && instance.hasMore.get()) {
 			return instance.limit.set(instance.limit.get() + 50);

diff --git a/packages/rocketchat-message-mark-as-unread/client/actionButton.js b/packages/rocketchat-message-mark-as-unread/client/actionButton.js
@@ -6,7 +6,6 @@ Meteor.startup(() => {
 		context: ['message', 'message-mobile'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			return Meteor.call('unreadMessages', message, function(error) {
 				if (error) {
 					return handleError(error);

diff --git a/packages/rocketchat-message-pin/client/actionButton.js b/packages/rocketchat-message-pin/client/actionButton.js
@@ -9,18 +9,17 @@ Meteor.startup(function() {
 		action() {
 			const message = this._arguments[1];
 			message.pinned = true;
-			return Meteor.call('pinMessage', message, function(error) {
+			Meteor.call('pinMessage', message, function(error) {
 				if (error) {
 					return handleError(error);
 				}
 			});
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
-				return false;
-			} else if (message.pinned || !RocketChat.settings.get('Message_AllowPinning')) {
+			if	(!RocketChat.settings.get('Message_AllowPinning') || message.pinned || !RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
+
 			return RocketChat.authz.hasAtLeastOnePermission('pin-message', message.rid);
 		},
 		order: 20,
@@ -35,38 +34,37 @@ Meteor.startup(function() {
 		action() {
 			const message = this._arguments[1];
 			message.pinned = false;
-			return Meteor.call('unpinMessage', message, function(error) {
+			Meteor.call('unpinMessage', message, function(error) {
 				if (error) {
 					return handleError(error);
 				}
 			});
 		},
 		condition(message) {
-			if ((RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) && (!message.pinned || !RocketChat.settings.get('Message_AllowPinning'))) {
+			if	(!RocketChat.settings.get('Message_AllowPinning') || !message.pinned || !RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
 
-			RocketChat.authz.hasAtLeastOnePermission('pin-message', message.rid);
+			return RocketChat.authz.hasAtLeastOnePermission('pin-message', message.rid);
 		},
 		order: 21,
 		group: 'menu'
 	});
 
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-pin-message',
-		icon: 'right-hand',
+		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['pinned'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			if (window.matchMedia('(max-width: 500px)').matches) {
 				Template.instance().tabBar.close();
 			}
 			return RoomHistoryManager.getSurroundingMessages(message, 50);
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (!RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
 			return true;
@@ -77,18 +75,17 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'permalink-pinned',
-		icon: 'link',
+		icon: 'permalink',
 		label: 'Permalink',
 		classes: 'clipboard',
 		context: ['pinned'],
 		action(event) {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'));
 		},
 		condition(message) {
-			if (RocketChat.models.Subscriptions.findOne({ rid: message.rid }) == null) {
+			if (!RocketChat.models.Subscriptions.findOne({ rid: message.rid }, {fields: {_id: 1}})) {
 				return false;
 			}
 			return true;

diff --git a/packages/rocketchat-message-pin/client/views/pinnedMessages.js b/packages/rocketchat-message-pin/client/views/pinnedMessages.js
@@ -19,9 +19,7 @@ Template.pinnedMessages.helpers({
 		});
 	},
 	message() {
-		return _.extend(this, {
-			customClass: 'pinned'
-		});
+		return _.extend(this, { customClass: 'pinned', actionContext: 'pinned'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();
@@ -44,21 +42,6 @@ Template.pinnedMessages.onCreated(function() {
 });
 
 Template.pinnedMessages.events({
-	'click .message-cog'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		const message_id = $(e.currentTarget).closest('.message').attr('id');
-		RocketChat.MessageAction.hideDropDown();
-		t.$(`\#${ message_id } .message-dropdown`).remove();
-		const message = PinnedMessage.findOne(message_id);
-		const actions = RocketChat.MessageAction.getButtons(message, 'pinned');
-		const el = Blaze.toHTMLWithData(Template.messageDropdown, {
-			actions
-		});
-		t.$(`\#${ message_id } .message-cog-container`).append(el);
-		const dropDown = t.$(`\#${ message_id } .message-dropdown`);
-		return dropDown.show();
-	},
 	'scroll .js-list': _.throttle(function(e, instance) {
 		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight && instance.hasMore.get()) {
 			return instance.limit.set(instance.limit.get() + 50);

diff --git a/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js b/packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.js
@@ -7,7 +7,7 @@ Template.snippetedMessages.helpers({
 		return SnippetedMessages.find({ snippeted: true, rid: this.rid }, { sort: { ts: -1 } });
 	},
 	message() {
-		return _.extend(this, { customClass: 'snippeted' });
+		return _.extend(this, { customClass: 'snippeted', actionContext: 'snippeted'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();

diff --git a/packages/rocketchat-message-star/client/actionButton.js b/packages/rocketchat-message-star/client/actionButton.js
@@ -52,12 +52,11 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'jump-to-star-message',
-		icon: 'right-hand',
+		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['starred'],
 		action() {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			if (window.matchMedia('(max-width: 500px)').matches) {
 				Template.instance().tabBar.close();
 			}
@@ -75,13 +74,12 @@ Meteor.startup(function() {
 
 	RocketChat.MessageAction.addButton({
 		id: 'permalink-star',
-		icon: 'link',
+		icon: 'permalink',
 		label: 'Permalink',
 		classes: 'clipboard',
 		context: ['starred'],
 		action(event) {
 			const message = this._arguments[1];
-			RocketChat.MessageAction.hideDropDown();
 			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'));
 		},

diff --git a/packages/rocketchat-message-star/client/views/starredMessages.js b/packages/rocketchat-message-star/client/views/starredMessages.js
@@ -19,9 +19,7 @@ Template.starredMessages.helpers({
 		});
 	},
 	message() {
-		return _.extend(this, {
-			customClass: 'starred'
-		});
+		return _.extend(this, { customClass: 'starred', actionContext: 'starred'});
 	},
 	hasMore() {
 		return Template.instance().hasMore.get();
@@ -43,21 +41,6 @@ Template.starredMessages.onCreated(function() {
 });
 
 Template.starredMessages.events({
-	'click .message-cog'(e, t) {
-		e.stopPropagation();
-		e.preventDefault();
-		const message_id = $(e.currentTarget).closest('.message').attr('id');
-		RocketChat.MessageAction.hideDropDown();
-		t.$(`\#${ message_id } .message-dropdown`).remove();
-		const message = StarredMessage.findOne(message_id);
-		const actions = RocketChat.MessageAction.getButtons(message, 'starred');
-		const el = Blaze.toHTMLWithData(Template.messageDropdown, {
-			actions
-		});
-		t.$(`\#${ message_id } .message-cog-container`).append(el);
-		const dropDown = t.$(`\#${ message_id } .message-dropdown`);
-		return dropDown.show();
-	},
 	'scroll .js-list': _.throttle(function(e, instance) {
 		if (e.target.scrollTop >= e.target.scrollHeight - e.target.clientHeight) {
 			return instance.limit.set(instance.limit.get() + 50);

diff --git a/packages/rocketchat-theme/client/imports/components/popover.css b/packages/rocketchat-theme/client/imports/components/popover.css
@@ -103,6 +103,10 @@
 
 	&__icon-element {
 		font-size: 18px;
+
+		&--star {
+			fill: none;
+		}
 	}
 
 	&__item-text {
@@ -118,6 +122,10 @@
 	}
 }
 
+[data-message-action="unstar-message"] .rc-popover__icon-element--star {
+	fill: currentColor;
+}
+
 @keyframes dropdown-show {
 	0% {
 		transform: translate(0, -2%);

diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
@@ -88,9 +88,15 @@ button {
 	}
 
 	& .tab-button-icon {
-		font-size: 1.125rem;
 		color: var(--color-dark-medium);
+
+		font-size: 1.125rem;
+
 		fill: var(--color-dark-medium);
+
+		&--star {
+			fill: none;
+		}
 	}
 }
 

diff --git a/packages/rocketchat-ui-flextab/client/tabs/messageSearch.html b/packages/rocketchat-ui-flextab/client/tabs/messageSearch.html
@@ -23,7 +23,7 @@ <h2>{{_ "No_results_found"}}</h2>
 		<div class="flex-tab__result js-list">
 			<ul class="list clearfix">
 				{{#each searchResultMessages}}
-				{{#nrr nrrargs 'message' message}}{{/nrr}}
+					{{#nrr nrrargs 'message' message}}{{/nrr}}
 				{{/each}}
 			</ul>
 			{{#if hasMore}}