Fix no-confusing-arrow

sampaiodiego · sampaiodiego · commit 39c1b92b869b · 2018-08-16T08:33:22.000-03:00
diff --git a/.eslintrc b/.eslintrc
@@ -64,7 +64,7 @@
 		"prefer-rest-params": 2,
 		"arrow-spacing": 2,
 		"arrow-body-style": [2, "as-needed"],
-		"no-confusing-arrow": 2,
+		"no-confusing-arrow": [2, { "allowParens": true }],
 		"dot-notation": 2,
 		"no-nested-ternary": 2,
 		"no-unneeded-ternary": 2,
diff --git a/packages/rocketchat-2fa/client/accountSecurity.js b/packages/rocketchat-2fa/client/accountSecurity.js
@@ -135,7 +135,7 @@ Template.accountSecurity.onCreated(function() {
 	this.codesRemaining = new ReactiveVar();
 
 	this.showBackupCodes = (userCodes) => {
-		const backupCodes = userCodes.map((value, index) => (index + 1) % 4 === 0 && index < 11 ? `${ value }\n` : `${ value } `).join('');
+		const backupCodes = userCodes.map((value, index) => ((index + 1) % 4 === 0 && index < 11 ? `${ value }\n` : `${ value } `)).join('');
 		const codes = `<code class="text-center allow-text-selection">${ backupCodes }</code>`;
 		modal.open({
 			title: t('Backup_codes'),
diff --git a/packages/rocketchat-apps/server/bridges/http.js b/packages/rocketchat-apps/server/bridges/http.js
@@ -7,7 +7,7 @@ export class AppHttpBridge {
 		console.log(`The App ${ info.appId } is requesting from the outter webs:`, info);
 
 		return new Promise((resolve, reject) => {
-			HTTP.call(info.method, info.url, info.request, (e, result) => e ? reject(e.response) : resolve(result));
+			HTTP.call(info.method, info.url, info.request, (e, result) => (e ? reject(e.response) : resolve(result)));
 		});
 	}
 }
diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -140,7 +140,7 @@ class AutoTranslate {
 	deTokenize(message) {
 		if (message.tokens && message.tokens.length > 0) {
 			for (const { token, text, noHtml } of message.tokens) {
-				message.msg = message.msg.replace(token, () => noHtml ? noHtml : text);
+				message.msg = message.msg.replace(token, () => (noHtml ? noHtml : text));
 			}
 		}
 		return message.msg;
diff --git a/packages/rocketchat-ldap/server/sync.js b/packages/rocketchat-ldap/server/sync.js
@@ -129,11 +129,12 @@ export function getDataToSyncUserData(ldapUser, user) {
 						// TODO: Find a better solution.
 						const dKeys = userField.split('.');
 						const lastKey = _.last(dKeys);
-						_.reduce(dKeys, (obj, currKey) =>
+						_.reduce(dKeys, (obj, currKey) => (
 							(currKey === lastKey)
 								? obj[currKey] = tmpLdapField
 								: obj[currKey] = obj[currKey] || {}
-							, userData);
+							, userData)
+						);
 						logger.debug(`user.${ userField } changed to: ${ tmpLdapField }`);
 					}
 			}
diff --git a/packages/rocketchat-markdown/markdown.js b/packages/rocketchat-markdown/markdown.js
@@ -48,7 +48,7 @@ class MarkdownClass {
 	mountTokensBack(message, useHtml = true) {
 		if (message.tokens && message.tokens.length > 0) {
 			for (const { token, text, noHtml } of message.tokens) {
-				message.html = message.html.replace(token, () => useHtml ? text : noHtml); // Uses lambda so doesn't need to escape $
+				message.html = message.html.replace(token, () => (useHtml ? text : noHtml)); // Uses lambda so doesn't need to escape $
 			}
 		}
 
diff --git a/packages/rocketchat-ui-flextab/client/tabs/membersList.js b/packages/rocketchat-ui-flextab/client/tabs/membersList.js
@@ -197,7 +197,9 @@ Template.membersList.events({
 			user: this.user.user,
 			hideAdminControls: RocketChat.roomTypes.roomTypes[room.t].userDetailShowAdmin(room) || false,
 			directActions: RocketChat.roomTypes.roomTypes[room.t].userDetailShowAll(room) || false,
-		}).map((action) => typeof action === 'function' ? action.call(this) : action).filter((action) => action && (!action.condition || action.condition.call(this)));
+		})
+			.map((action) => (typeof action === 'function' ? action.call(this) : action))
+			.filter((action) => action && (!action.condition || action.condition.call(this)));
 		const groups = [];
 		const columns = [];
 		const admin = _actions.filter((action) => action.group === 'admin');
diff --git a/packages/rocketchat-ui-flextab/client/tabs/userInfo.js b/packages/rocketchat-ui-flextab/client/tabs/userInfo.js
@@ -6,7 +6,10 @@ import moment from 'moment';
 import { getActions } from './userActions';
 
 const more = function() {
-	return Template.instance().actions.get().map((action) => typeof action === 'function' ? action.call(this) : action).filter((action) => action && (!action.condition || action.condition.call(this))).slice(2);
+	return Template.instance().actions.get()
+		.map((action) => (typeof action === 'function' ? action.call(this) : action))
+		.filter((action) => action && (!action.condition || action.condition.call(this)))
+		.slice(2);
 };
 
 
@@ -17,7 +20,10 @@ Template.userInfo.helpers({
 	moreActions: more,
 
 	actions() {
-		return Template.instance().actions.get().map((action) => typeof action === 'function' ? action.call(this) : action).filter((action) => action && (!action.condition || action.condition.call(this))).slice(0, 2);
+		return Template.instance().actions.get()
+			.map((action) => (typeof action === 'function' ? action.call(this) : action))
+			.filter((action) => action && (!action.condition || action.condition.call(this)))
+			.slice(0, 2);
 	},
 	customField() {
 		const sCustomFieldsToShow = RocketChat.settings.get('Accounts_CustomFieldsToShowInUserInfo').trim();
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
@@ -222,7 +222,10 @@ Template.message.helpers({
 		return Object.keys(this.reactions || {}).map((emoji) => {
 			const reaction = this.reactions[emoji];
 			const total = reaction.usernames.length;
-			let usernames = reaction.usernames.slice(0, 15).map((username) => username === userUsername ? t('You').toLowerCase() : `@${ username }`).join(', ');
+			let usernames = reaction.usernames
+				.slice(0, 15)
+				.map((username) => (username === userUsername ? t('You').toLowerCase() : `@${ username }`))
+				.join(', ');
 			if (total > 15) {
 				usernames = `${ usernames } ${ t('And_more', {
 					length: total - 15,
diff --git a/packages/rocketchat-ui/client/components/tabs.js b/packages/rocketchat-ui/client/components/tabs.js
@@ -12,7 +12,7 @@ Template.tabs.events({
 
 Template.tabs.helpers({
 	tabs() {
-		return Template.instance().data.tabs.tabs.filter((tab) => tab.condition ? tab.condition() : tab);
+		return Template.instance().data.tabs.tabs.filter((tab) => (tab.condition ? tab.condition() : tab));
 	},
 	isActive(value) {
 		return Template.instance().activeTab.get() === value;
diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js
@@ -543,7 +543,7 @@ describe('[Users]', function() {
 				.set(credentials)
 				.send({ username: user.username })
 				.expect('Content-Type', 'application/json')
-				.end((err, res) => err ? done() : request.get(api('me'))
+				.end((err, res) => (err ? done() : request.get(api('me')))
 					.set({ 'X-Auth-Token': `${ res.body.data.authToken }`, 'X-User-Id': res.body.data.userId })
 					.expect(200)
 					.expect((res) => {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export class AppHttpBridge {`
`7`	`7`	console.log(`The App ${ info.appId } is requesting from the outter webs:`, info);
`8`	`8`
`9`	`9`	`return new Promise((resolve, reject) => {`
`10`		`- HTTP.call(info.method, info.url, info.request, (e, result) => e ? reject(e.response) : resolve(result));`
	`10`	`+ HTTP.call(info.method, info.url, info.request, (e, result) => (e ? reject(e.response) : resolve(result)));`
`11`	`11`	`});`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class AutoTranslate {`
`140`	`140`	`deTokenize(message) {`
`141`	`141`	`if (message.tokens && message.tokens.length > 0) {`
`142`	`142`	`for (const { token, text, noHtml } of message.tokens) {`
`143`		`- message.msg = message.msg.replace(token, () => noHtml ? noHtml : text);`
	`143`	`+ message.msg = message.msg.replace(token, () => (noHtml ? noHtml : text));`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`return message.msg;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class MarkdownClass {`
`48`	`48`	`mountTokensBack(message, useHtml = true) {`
`49`	`49`	`if (message.tokens && message.tokens.length > 0) {`
`50`	`50`	`for (const { token, text, noHtml } of message.tokens) {`
`51`		`- message.html = message.html.replace(token, () => useHtml ? text : noHtml); // Uses lambda so doesn't need to escape $`
	`51`	`+ message.html = message.html.replace(token, () => (useHtml ? text : noHtml)); // Uses lambda so doesn't need to escape $`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`