From fb0cc0d6c2728491f64e9f390fb4fd1bf1b00831 Mon Sep 17 00:00:00 2001
From: ritwizsinha <43509699+ritwizsinha@users.noreply.github.com>
Date: Thu, 21 May 2020 11:02:51 +0530
Subject: [PATCH] [FIX] Missing dropdown to select custom status color on
 user's profile (#16537)

Co-authored-by: Gabriel Henriques <gabriel.henriques@rocket.chat>
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 app/ui-account/client/accountProfile.html |  5 +-
 app/ui-account/client/accountProfile.js   | 19 +++++++-
 app/ui/client/index.js                    |  1 +
 app/ui/client/lib/userPopoverStatus.js    | 57 ++++++++++++++++++++++
 app/ui/client/views/app/editStatus.html   |  2 +-
 app/ui/client/views/app/editStatus.js     | 58 ++---------------------
 server/methods/saveUserProfile.js         |  4 ++
 7 files changed, 86 insertions(+), 60 deletions(-)
 create mode 100644 app/ui/client/lib/userPopoverStatus.js

diff --git a/app/ui-account/client/accountProfile.html b/app/ui-account/client/accountProfile.html
index edb1ce6f6a8..9da2906056f 100644
--- a/app/ui-account/client/accountProfile.html
+++ b/app/ui-account/client/accountProfile.html
@@ -115,8 +115,9 @@
 									<label class="rc-input__label">
 										<div class="rc-input__title">{{_ "StatusMessage"}}</div>
 										<div class="rc-input__wrapper">
-											<div class="rc-input__icon">
-												{{> icon block="rc-input__icon-svg" icon="edit"}}
+											<div class="rc-input__icon js-status-type edit-status-type-icon--{{statusType}}">
+												{{> icon block="rc-input__icon-svg" icon="circle"}}
+												{{> icon block="rc-input__icon-svg" icon="arrow-down"}}
 											</div>
 
 											<input type="text" class="rc-input__element" maxlength="120" name="statusText" id="statusText" placeholder="{{_ "StatusMessage_Placeholder" }}" value="{{get 'statusText'}}" {{ifThenElse canChange '' 'disabled'}}>
diff --git a/app/ui-account/client/accountProfile.js b/app/ui-account/client/accountProfile.js
index eb14c6543fb..12f01b5b54b 100644
--- a/app/ui-account/client/accountProfile.js
+++ b/app/ui-account/client/accountProfile.js
@@ -9,11 +9,12 @@ import _ from 'underscore';
 import s from 'underscore.string';
 import toastr from 'toastr';
 
-import { modal, SideNav } from '../../ui-utils';
+import { modal, SideNav, popover } from '../../ui-utils';
 import { t, handleError } from '../../utils';
 import { settings } from '../../settings';
 import { Notifications } from '../../notifications';
 import { callbacks } from '../../callbacks';
+import { getPopoverStatusConfig } from '../../ui/client';
 
 const validateEmail = (email) => /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(email);
 const validateUsername = (username) => {
@@ -118,6 +119,8 @@ Template.accountProfile.helpers({
 		const instance = Template.instance();
 		instance.dep.depend();
 		const realname = instance.realname.get();
+
+		const statusType = instance.statusType.get();
 		const statusText = instance.fields.get('statusText');
 		const bio = instance.fields.get('bio');
 		const username = instance.username.get();
@@ -137,9 +140,11 @@ Template.accountProfile.helpers({
 				return;
 			}
 		}
-		if (!avatar && user.bio === bio && user.name === realname && user.username === username && getUserEmailAddress(user) === email && statusText === user.statusText && !password) {
+
+		if (!avatar && user.bio === bio && user.name === realname && user.username === username && getUserEmailAddress(user) === email && statusText === user.statusText && !password && statusType === user.status) {
 			return ret;
 		}
+
 		if (!validateEmail(email) || !validatePassword(password, confirmationPassword) || (!validateUsername(username) || usernameAvaliable !== true) || !validateName(realname) || !validateStatusMessage(statusText)) {
 			return ret;
 		}
@@ -186,6 +191,9 @@ Template.accountProfile.helpers({
 	customFields() {
 		return Meteor.user().customFields;
 	},
+	statusType() {
+		return Meteor.user().status;
+	},
 	get(field) {
 		return Template.instance().fields.get(field);
 	},
@@ -211,6 +219,7 @@ Template.accountProfile.onCreated(function() {
 	self.url = new ReactiveVar('');
 	self.usernameAvaliable = new ReactiveVar(true);
 	self.statusText = new ReactiveVar(user.statusText);
+	self.statusType = new ReactiveVar(user.status);
 
 	Notifications.onLogged('updateAvatar', () => self.avatar.set());
 	self.getSuggestions = function() {
@@ -289,6 +298,9 @@ Template.accountProfile.onCreated(function() {
 		if (s.trim(self.fields.get('bio')) !== user.statusText) {
 			data.bio = s.trim(self.fields.get('bio'));
 		}
+		if (self.statusType.get() !== user.statusType) {
+			data.statusType = self.statusType.get();
+		}
 		if (s.trim(self.username.get()) !== user.username) {
 			if (!settings.get('Accounts_AllowUsernameChange')) {
 				toastr.remove();
@@ -379,6 +391,9 @@ Template.accountProfile.events({
 			},
 		}, [e, instance, ...args]);
 	},
+	'click .js-status-type'(e, instance) {
+		popover.open(getPopoverStatusConfig(e.currentTarget, (status) => instance.statusType.set(status)));
+	},
 	'input .js-avatar-url-input'(e, instance) {
 		const text = e.target.value;
 		instance.url.set(text);
diff --git a/app/ui/client/index.js b/app/ui/client/index.js
index 40e796da5d0..2f9c199fd96 100644
--- a/app/ui/client/index.js
+++ b/app/ui/client/index.js
@@ -66,5 +66,6 @@ export { Login, animationSupport, animeBack, Button, preLoadImgs } from './lib/r
 export { AudioRecorder } from './lib/recorderjs/audioRecorder';
 export { VideoRecorder } from './lib/recorderjs/videoRecorder';
 export { chatMessages } from './views/app/room';
+export * from './lib/userPopoverStatus';
 
 createTemplateForComponent('RoomForeword', () => import('./views/app/RoomForeword'));
diff --git a/app/ui/client/lib/userPopoverStatus.js b/app/ui/client/lib/userPopoverStatus.js
new file mode 100644
index 00000000000..8d9720f5ce7
--- /dev/null
+++ b/app/ui/client/lib/userPopoverStatus.js
@@ -0,0 +1,57 @@
+import { t } from '../../../utils';
+
+export const getPopoverStatusConfig = (currentTarget, actionCallback) => ({
+	popoverClass: 'edit-status-type',
+	columns: [
+		{
+			groups: [
+				{
+					items: [
+						{
+							icon: 'circle',
+							name: t('Online'),
+							modifier: 'online',
+							action: () => {
+								(typeof actionCallback === 'function') && actionCallback('online');
+								$('input[name=statusType]').val('online');
+								$(currentTarget).prop('class', 'rc-input__icon js-status-type edit-status-type-icon--online');
+							},
+						},
+						{
+							icon: 'circle',
+							name: t('Away'),
+							modifier: 'away',
+							action: () => {
+								(typeof actionCallback === 'function') && actionCallback('away');
+								$('input[name=statusType]').val('away');
+								$(currentTarget).prop('class', 'rc-input__icon js-status-type edit-status-type-icon--away');
+							},
+						},
+						{
+							icon: 'circle',
+							name: t('Busy'),
+							modifier: 'busy',
+							action: () => {
+								(typeof actionCallback === 'function') && actionCallback('busy');
+								$('input[name=statusType]').val('busy');
+								$(currentTarget).prop('class', 'rc-input__icon js-status-type edit-status-type-icon--busy');
+							},
+						},
+						{
+							icon: 'circle',
+							name: t('Invisible'),
+							modifier: 'offline',
+							action: () => {
+								(typeof actionCallback === 'function') && actionCallback('offline');
+								$('input[name=statusType]').val('offline');
+								$(currentTarget).prop('class', 'rc-input__icon js-status-type edit-status-type-icon--offline');
+							},
+						},
+					],
+				},
+			],
+		},
+	],
+	currentTarget,
+	offsetVertical: currentTarget.clientHeight,
+});
diff --git a/app/ui/client/views/app/editStatus.html b/app/ui/client/views/app/editStatus.html
index 7228679a398..83644edb20b 100644
--- a/app/ui/client/views/app/editStatus.html
+++ b/app/ui/client/views/app/editStatus.html
@@ -8,7 +8,7 @@
 							<label class="rc-input__label">
 								<div class="rc-input__title">{{_ "StatusMessage"}}</div>
 								<div class="rc-input__wrapper edit-status">
-									<div class="rc-input__icon edit-status-type-icon--{{statusType}}">
+									<div class="rc-input__icon js-status-type edit-status-type-icon--{{statusType}}">
 										{{> icon block="rc-input__icon-svg" icon="circle"}}
 										{{> icon block="rc-input__icon-svg" icon="arrow-down"}}
 									</div>
diff --git a/app/ui/client/views/app/editStatus.js b/app/ui/client/views/app/editStatus.js
index 2c35e80b5fb..3f76c461116 100644
--- a/app/ui/client/views/app/editStatus.js
+++ b/app/ui/client/views/app/editStatus.js
@@ -6,6 +6,7 @@ import s from 'underscore.string';
 import { settings } from '../../../../settings';
 import { t } from '../../../../utils';
 import { popover } from '../../../../ui-utils';
+import { getPopoverStatusConfig } from '../..';
 
 Template.editStatus.helpers({
 	canChange() {
@@ -20,61 +21,8 @@ Template.editStatus.helpers({
 });
 
 Template.editStatus.events({
-	'click .edit-status .rc-input__icon'(e) {
-		const options = [
-			{
-				icon: 'circle',
-				name: t('Online'),
-				modifier: 'online',
-				action: () => {
-					$('input[name=statusType]').val('online');
-					$('.edit-status .rc-input__icon').prop('class', 'rc-input__icon edit-status-type-icon--online');
-				},
-			},
-			{
-				icon: 'circle',
-				name: t('Away'),
-				modifier: 'away',
-				action: () => {
-					$('input[name=statusType]').val('away');
-					$('.edit-status .rc-input__icon').prop('class', 'rc-input__icon edit-status-type-icon--away');
-				},
-			},
-			{
-				icon: 'circle',
-				name: t('Busy'),
-				modifier: 'busy',
-				action: () => {
-					$('input[name=statusType]').val('busy');
-					$('.edit-status .rc-input__icon').prop('class', 'rc-input__icon edit-status-type-icon--busy');
-				},
-			},
-			{
-				icon: 'circle',
-				name: t('Invisible'),
-				modifier: 'offline',
-				action: () => {
-					$('input[name=statusType]').val('offline');
-					$('.edit-status .rc-input__icon').prop('class', 'rc-input__icon edit-status-type-icon--offline');
-				},
-			},
-		];
-
-		const config = {
-			popoverClass: 'edit-status-type',
-			columns: [
-				{
-					groups: [
-						{
-							items: options,
-						},
-					],
-				},
-			],
-			currentTarget: e.currentTarget,
-			offsetVertical: e.currentTarget.clientHeight,
-		};
-		popover.open(config);
+	'click .js-status-type'(e) {
+		popover.open(getPopoverStatusConfig(e.currentTarget));
 	},
 
 	'submit .edit-status__content'(e, instance) {
diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js
index 13159231efa..43333ce9f6e 100644
--- a/server/methods/saveUserProfile.js
+++ b/server/methods/saveUserProfile.js
@@ -42,6 +42,10 @@ Meteor.methods({
 			Meteor.call('setUserStatus', null, settings.statusText);
 		}
 
+		if (settings.statusType) {
+			Meteor.call('setUserStatus', settings.statusType, null);
+		}
+
 		if (settings.bio) {
 			if (typeof settings.bio !== 'string' || settings.bio.length > 260) {
 				throw new Meteor.Error('error-invalid-field', 'bio', {