From dbad250a51203c8d97cd789b4425e92a0714aafc Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Mon, 5 Mar 2018 22:51:51 -0300
Subject: [PATCH 1/3] add sidebar default options on admin

---
 packages/rocketchat-api/server/v1/users.js    |  1 -
 .../rocketchat-lib/server/startup/settings.js | 42 +++++++++----------
 .../components/sidebar/sidebar-item.css       | 34 +++++++--------
 .../client/accountPreferences.html            | 11 -----
 .../client/accountPreferences.js              |  1 -
 .../rocketchat-ui/client/views/app/room.html  |  2 +-
 .../rocketchat-ui/client/views/app/room.js    |  7 ----
 server/methods/saveUserPreferences.js         |  1 -
 tests/data/user.js                            |  1 -
 tests/end-to-end/ui/11-admin.js               |  8 ----
 tests/pageobjects/administration.page.js      |  3 --
 11 files changed, 39 insertions(+), 72 deletions(-)

diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index ab92925e3c394..8969b07c0eba8 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -308,7 +308,6 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				enableAutoAway: Match.Maybe(Boolean),
 				highlights: Match.Maybe(Array),
 				desktopNotificationDuration: Match.Maybe(Number),
-				viewMode: Match.Maybe(Number),
 				hideUsernames: Match.Maybe(Boolean),
 				hideRoles: Match.Maybe(Boolean),
 				hideAvatars: Match.Maybe(Boolean),
diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index 771d298bc0b39..5b4d814c90162 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -310,10 +310,29 @@ RocketChat.settings.addGroup('Accounts', function() {
 			'public': true,
 			i18nLabel: 'Sidebar_list_mode'
 		});
-		this.add('Accounts_Default_User_Preferences_mergeChannels', false, {
+		this.add('Accounts_Default_User_Preferences_sidebarViewMode', 'medium', {
+			type: 'select',
+			values: [
+				{
+					key: 'extended',
+					i18nLabel: 'Extended'
+				},
+				{
+					key: 'medium',
+					i18nLabel: 'Medium'
+				},
+				{
+					key: 'condensed',
+					i18nLabel: 'Extended'
+				}
+			],
+			'public': true,
+			i18nLabel: 'Sidebar_list_mode'
+		});
+		this.add('Accounts_Default_User_Preferences_sidebarHideAvatar', false, {
 			type: 'boolean',
 			'public': true,
-			i18nLabel: 'UI_Merge_Channels_Groups'
+			i18nLabel: 'Hide_Avatars'
 		});
 		this.add('Accounts_Default_User_Preferences_sidebarShowUnread', false, {
 			type: 'boolean',
@@ -344,25 +363,6 @@ RocketChat.settings.addGroup('Accounts', function() {
 			'public': true,
 			i18nLabel: 'Enter_Behaviour'
 		});
-		this.add('Accounts_Default_User_Preferences_viewMode', 0, {
-			type: 'select',
-			values: [
-				{
-					key: 0,
-					i18nLabel: 'Normal'
-				},
-				{
-					key: 1,
-					i18nLabel: 'Cozy'
-				},
-				{
-					key: 2,
-					i18nLabel: 'Compact'
-				}
-			],
-			'public': true,
-			i18nLabel: 'View_mode'
-		});
 		this.add('Accounts_Default_User_Preferences_emailNotificationMode', 'all', {
 			type: 'select',
 			values: [
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
index a723aaab68b04..13096bca1c1e6 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-item.css
@@ -18,22 +18,6 @@
 	display: none;
 }
 
-.sidebar--medium .sidebar-item {
-	height: var(--sidebar-item-height-medium);
-
-	&__picture {
-		flex: 0 0 var(--sidebar-item-thumb-size-medium);
-
-		width: var(--sidebar-item-thumb-size-medium);
-		height: var(--sidebar-item-thumb-size-medium);
-	}
-
-	&__user-thumb {
-		width: var(--sidebar-item-thumb-size-medium);
-		height: var(--sidebar-item-thumb-size-medium);
-	}
-}
-
 .sidebar--extended .sidebar-item {
 	height: var(--sidebar-item-height-extended);
 
@@ -64,6 +48,22 @@
 	}
 }
 
+.sidebar--medium .sidebar-item {
+	height: var(--sidebar-item-height-medium);
+
+	&__picture {
+		flex: 0 0 var(--sidebar-item-thumb-size-medium);
+
+		width: var(--sidebar-item-thumb-size-medium);
+		height: var(--sidebar-item-thumb-size-medium);
+	}
+
+	&__user-thumb {
+		width: var(--sidebar-item-thumb-size-medium);
+		height: var(--sidebar-item-thumb-size-medium);
+	}
+}
+
 .sidebar-item {
 	position: relative;
 
@@ -192,7 +192,7 @@
 	&__message {
 		display: flex;
 		overflow: hidden;
-		flex-direction: row;
+		flex-direction: row !important;
 		flex: 1;
 
 		margin: 0 -3px;
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.html b/packages/rocketchat-ui-account/client/accountPreferences.html
index f58cd39c98845..8b493c562a4f7 100644
--- a/packages/rocketchat-ui-account/client/accountPreferences.html
+++ b/packages/rocketchat-ui-account/client/accountPreferences.html
@@ -202,17 +202,6 @@ <h1>{{_ "Messages"}}</h1>
 									<div class="info">{{_ "Enter_Behaviour_Description"}}</div>
 								</div>
 							</div>
-							<div class="input-line double-col" id="viewMode">
-								<label>{{_ "View_mode"}}</label>
-								<div>
-									<select class="input-monitor rc-input__element" name="viewMode">
-										<option value="0" selected="{{selected 'viewMode' '0'}}">{{_ "Normal"}}</option>
-										<option value="1" selected="{{selected 'viewMode' '1'}}">{{_ "Cozy"}}</option>
-										<option value="2" selected="{{selected 'viewMode' '2'}}">{{_ "Compact"}}</option>
-									</select>
-									<div class="info">{{_ "View_mode_info"}}</div>
-								</div>
-							</div>
 							<div class="input-line double-col" id="emailNotificationMode">
 								<label>{{_ "Email_Notification_Mode"}}</label>
 								<div>
diff --git a/packages/rocketchat-ui-account/client/accountPreferences.js b/packages/rocketchat-ui-account/client/accountPreferences.js
index 8bc65c6e16c95..9653e7671291c 100644
--- a/packages/rocketchat-ui-account/client/accountPreferences.js
+++ b/packages/rocketchat-ui-account/client/accountPreferences.js
@@ -133,7 +133,6 @@ Template.accountPreferences.onCreated(function() {
 		data.saveMobileBandwidth = JSON.parse($('input[name=saveMobileBandwidth]:checked').val());
 		data.collapseMediaByDefault = JSON.parse($('input[name=collapseMediaByDefault]:checked').val());
 		data.muteFocusedConversations = JSON.parse($('#muteFocusedConversations').find('input:checked').val());
-		data.viewMode = parseInt($('#viewMode').find('select').val());
 		data.hideUsernames = JSON.parse($('#hideUsernames').find('input:checked').val());
 		data.hideRoles = JSON.parse($('#hideRoles').find('input:checked').val());
 		data.hideFlexTab = JSON.parse($('#hideFlexTab').find('input:checked').val());
diff --git a/packages/rocketchat-ui/client/views/app/room.html b/packages/rocketchat-ui/client/views/app/room.html
index 7efff1838b00d..6c19cf77f5348 100644
--- a/packages/rocketchat-ui/client/views/app/room.html
+++ b/packages/rocketchat-ui/client/views/app/room.html
@@ -68,7 +68,7 @@
 								</div>
 							{{/each}}
 						</div>
-						<div class="messages-box {{#if selectable}}selectable{{/if}} {{viewMode}} {{hasLeader}}">
+						<div class="messages-box {{#if selectable}}selectable{{/if}} {{hasLeader}}">
 							<div class="ticks-bar"></div>
 							<button class="new-message background-primary-action-color color-content-background-color not">
 								<i class="icon-down-big"></i>
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 7364d45f9aa01..35e0cf81068ab 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -308,13 +308,6 @@ Template.room.helpers({
 		if (isSubscribed(this._id) && favoritesEnabled()) { return true; }
 	},
 
-	viewMode() {
-		const user = Meteor.user();
-		const viewMode = RocketChat.getUserPreference(user, 'viewMode');
-		const modes = ['', 'cozy', 'compact'];
-		return modes[viewMode] || modes[0];
-	},
-
 	selectable() {
 		return Template.instance().selectable.get();
 	},
diff --git a/server/methods/saveUserPreferences.js b/server/methods/saveUserPreferences.js
index 9f3fa8c75b5ce..110b94a5e14f7 100644
--- a/server/methods/saveUserPreferences.js
+++ b/server/methods/saveUserPreferences.js
@@ -18,7 +18,6 @@ Meteor.methods({
 			enableAutoAway: Match.Optional(Boolean),
 			highlights: Match.Optional([String]),
 			desktopNotificationDuration: Match.Optional(Number),
-			viewMode: Match.Optional(Number),
 			hideUsernames: Match.Optional(Boolean),
 			hideRoles: Match.Optional(Boolean),
 			hideAvatars: Match.Optional(Boolean),
diff --git a/tests/data/user.js b/tests/data/user.js
index 0d40321d249a3..d2431c5df36f9 100644
--- a/tests/data/user.js
+++ b/tests/data/user.js
@@ -24,7 +24,6 @@ export const preferences = {
 		enableAutoAway: true,
 		highlights: [],
 		desktopNotificationDuration: 0,
-		viewMode: 0,
 		hideUsernames: false,
 		hideRoles: false,
 		hideAvatars: false,
diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index 4ab801cce0c26..8904cc1626d21 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -901,14 +901,6 @@ describe('[Administration]', () => {
 					admin.accountsSendOnEnter.getValue().should.equal('normal');
 				});
 
-				it('it should show the view mode field', () => {
-					admin.accountsViewMode.click();
-					admin.accountsViewMode.isVisible().should.be.true;
-				});
-				it('the view mode field value should be 0', () => {
-					admin.accountsViewMode.getValue().should.equal('0');
-				});
-
 				it('it should show the offline email notification field', () => {
 					admin.accountsEmailNotificationMode.click();
 					admin.accountsEmailNotificationMode.isVisible().should.be.true;
diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index f7c28c11ff20c..5f96179114c5c 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -195,9 +195,6 @@ class Administration extends Page {
 	get accountsSendOnEnter() { return browser.element('[name="Accounts_Default_User_Preferences_sendOnEnter"]'); }
 	get accountsSendOnEnterReset() { return browser.element('.reset-setting[data-setting="Accounts_Default_User_Preferences_sendOnEnter"]'); }
 
-	get accountsViewMode() { return browser.element('[name="Accounts_Default_User_Preferences_viewMode"]'); }
-	get accountsViewModeReset() { return browser.element('.reset-setting[data-setting="Accounts_Default_User_Preferences_viewMode"]'); }
-
 	get accountsEmailNotificationMode() { return browser.element('[name="Accounts_Default_User_Preferences_emailNotificationMode"]'); }
 	get accountsEmailNotificationModeReset() { return browser.element('.reset-setting[data-setting="Accounts_Default_User_Preferences_emailNotificationMode"]'); }
 

From a8b393688a4a99c2cc99fbc19bed1446c13e7285 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Wed, 7 Mar 2018 16:18:35 -0300
Subject: [PATCH 2/3] fix tests

---
 tests/end-to-end/ui/11-admin.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index 8904cc1626d21..4cb754fadb1ba 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -883,16 +883,6 @@ describe('[Administration]', () => {
 					admin.accountsRoomsListExhibitionMode.getValue().should.equal('category');
 				});
 
-				it('it should show the merge channels field', () => {
-					admin.accountsMergeChannelsTrue.scroll();
-					admin.accountsMergeChannelsTrue.isVisible().should.be.true;
-					admin.accountsMergeChannelsFalse.isVisible().should.be.true;
-				});
-				it('the merge channels field value should be false', () => {
-					admin.accountsMergeChannelsTrue.isSelected().should.be.false;
-					admin.accountsMergeChannelsFalse.isSelected().should.be.true;
-				});
-
 				it('it should show the enter key behavior field', () => {
 					admin.accountsSendOnEnter.click();
 					admin.accountsSendOnEnter.isVisible().should.be.true;

From 7e13860f48e09df58d71ea1daf0b0c53e276f7d2 Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Wed, 7 Mar 2018 17:27:50 -0300
Subject: [PATCH 3/3] fix option label

---
 packages/rocketchat-lib/server/startup/settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rocketchat-lib/server/startup/settings.js b/packages/rocketchat-lib/server/startup/settings.js
index 5b4d814c90162..39c4b2c11b9ad 100644
--- a/packages/rocketchat-lib/server/startup/settings.js
+++ b/packages/rocketchat-lib/server/startup/settings.js
@@ -323,7 +323,7 @@ RocketChat.settings.addGroup('Accounts', function() {
 				},
 				{
 					key: 'condensed',
-					i18nLabel: 'Extended'
+					i18nLabel: 'Condensed'
 				}
 			],
 			'public': true,