[NEW] Service account sidenav type

app/api/server/v1/users.js

@@ -522,6 +522,7 @@ API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				sidebarHideAvatar: Match.Optional(Boolean),
 				sidebarGroupByType: Match.Optional(Boolean),
 				sidebarShowDiscussion: Match.Optional(Boolean),
+				sidebarShowServiceAccounts: Match.Optional(Boolean),
 				muteFocusedConversations: Match.Optional(Boolean),
 			}),
 		});

app/service-accounts/client/index.js

@@ -4,4 +4,7 @@ import './route';
 // views
 import './views/serviceAccountDashboard';
 import './views/creationDialog/createServiceAccount';
+import './views/serviceAccountsList';
+
+import '../lib/serviceAccountRoomType';
 import './views/serviceAccountSidebarLogin';

app/service-accounts/client/views/serviceAccountsList.html

@@ -0,0 +1,10 @@
+<template name="serviceAccountsList">
+	{{#if rooms}}
+		<h3 class="rooms-list__type">
+			{{_ "Subscriptions"}}
+		</h3>
+		<ul class="rooms-list__list">
+			{{#each room in rooms}} {{> chatRoomItem room }} {{/each}}
+		</ul>
+	{{/if}}
+</template>

app/service-accounts/client/views/serviceAccountsList.js

@@ -0,0 +1,29 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+
+import { ChatSubscription } from '../../../models/client';
+import { getUserPreference } from '../../../utils/client';
+import { settings } from '../../../settings/client';
+
+import './serviceAccountsList.html';
+
+Template.serviceAccountsList.helpers({
+	rooms() {
+		const user = Meteor.userId();
+		const sortBy = getUserPreference(user, 'sidebarSortby') || 'alphabetical';
+		const query = {
+			open: true,
+		};
+
+		const sort = {};
+
+		if (sortBy === 'activity') {
+			sort.lm = -1;
+		} else { // alphabetical
+			sort[this.identifier === 'd' && settings.get('UI_Use_Real_Name') ? 'lowerCaseFName' : 'lowerCaseName'] = /descending/.test(sortBy) ? -1 : 1;
+		}
+
+		query.sa = { $exists: true };
+		return ChatSubscription.find(query, { sort });
+	},
+});

app/service-accounts/lib/serviceAccountRoomType.js

@@ -0,0 +1,22 @@
+import { Meteor } from 'meteor/meteor';
+
+import { RoomTypeConfig, roomTypes, getUserPreference } from '../../utils';
+
+export class ServiceAccountRoomType extends RoomTypeConfig {
+	constructor() {
+		super({
+			identifier: 'sa',
+			order: 60,
+			label: 'Subscriptions',
+		});
+
+		// we need a custom template in order to have a custom query showing the subscriptions to serviceAccounts
+		this.customTemplate = 'serviceAccountsList';
+	}
+
+	condition() {
+		return getUserPreference(Meteor.userId(), 'sidebarShowServiceAccounts');
+	}
+}
+
+roomTypes.add(new ServiceAccountRoomType());

app/service-accounts/server/config.js

@@ -19,4 +19,11 @@ Meteor.startup(() => {
 			public: true,
 		});
 	});
+	settings.add('Accounts_Default_User_Preferences_sidebarShowServiceAccounts', true, {
+		group: 'Accounts',
+		section: 'Accounts_Default_User_Preferences',
+		type: 'boolean',
+		public: true,
+		i18nLabel: 'Group_subscriptions',
+	});
 });

app/service-accounts/server/index.js

@@ -11,3 +11,5 @@ import './hooks/serviceAccountCallback';
 
 import './publications/fullServiceAccountData';
 import './publications/userServiceAccounts';
+
+import '../lib/serviceAccountRoomType';

app/ui-account/client/accountPreferences.html

@@ -278,6 +278,13 @@ <h1>{{_ "Sidebar"}}</h1>
 								<label><input type="radio" name="sidebarShowDiscussion" value="false" checked="{{checked 'sidebarShowDiscussion' false}}"/> {{_ "False"}}</label>
 							</div>
 						</div>
+						<div class="input-line double-col" id="sidebarShowServiceAccounts">
+							<label class="setting-label">{{_ "Group_subscriptions"}}</label>
+							<div>
+								<label><input type="radio" name="sidebarShowServiceAccounts" value="true" checked="{{checked 'sidebarShowServiceAccounts' true}}"/> {{_ "True"}}</label>
+								<label><input type="radio" name="sidebarShowServiceAccounts" value="false" checked="{{checked 'sidebarShowServiceAccounts' false}}"/> {{_ "False"}}</label>
+							</div>
+						</div>
 					</div>
 				</div>
 				<div class="section">

app/ui-account/client/accountPreferences.js

@@ -169,6 +169,7 @@ Template.accountPreferences.onCreated(function() {
 		data.mobileNotifications = $('#mobileNotifications').find('select').val();
 		data.unreadAlert = JSON.parse($('#unreadAlert').find('input:checked').val());
 		data.sidebarShowDiscussion = JSON.parse($('#sidebarShowDiscussion').find('input:checked').val());
+		data.sidebarShowServiceAccounts = JSON.parse($('#sidebarShowServiceAccounts').find('input:checked').val());
 		data.notificationsSoundVolume = parseInt($('#notificationsSoundVolume').val());
 		data.roomCounterSidebar = JSON.parse($('#roomCounterSidebar').find('input:checked').val());
 		data.highlights = _.compact(_.map($('[name=highlights]').val().split(/,|\n/), function(e) {

app/ui-sidenav/client/roomList.js

@@ -25,6 +25,7 @@ Template.roomList.helpers({
 				'settings.preferences.sidebarShowFavorites': 1,
 				'settings.preferences.sidebarShowUnread': 1,
 				'settings.preferences.sidebarShowDiscussion': 1,
+				'settings.preferences.sidebarShowServiceAccounts': 1,
 				'services.tokenpass': 1,
 				messageViewMode: 1,
 			},
@@ -84,6 +85,10 @@ Template.roomList.helpers({
 				query.prid = { $exists: false };
 			}
 
+			if (getUserPreference(user, 'sidebarShowServiceAccounts')) {
+				query.sa = { $exists: false };
+			}
+
 			if (getUserPreference(user, 'sidebarShowUnread')) {
 				query.$or = [
 					{ alert: { $ne: true } },

app/ui-sidenav/client/sortlist.html

@@ -31,6 +31,15 @@
 					<span class="rc-popover__item-text">{{_ "Group_discussions"}}</span>
 				</label>
 			</li>
+			<li class="rc-popover__item {{bold 'sidebarShowServiceAccounts'}}">
+				<label class="rc-popover__label">
+					<input type="checkbox" name="sidebarShowServiceAccounts" class="hidden" checked="{{checked 'sidebarShowServiceAccounts'}}" />
+					<span class="rc-popover__icon">
+						{{> icon block="rc-popover__icon-element" icon='user' }}
+					</span>
+					<span class="rc-popover__item-text">{{_ "Group_subscriptions"}}</span>
+				</label>
+			</li>
 			<li class="rc-popover__item {{bold 'sidebarGroupByType'}}">
 				<label class="rc-popover__label">
 					<input type="checkbox" name="sidebarGroupByType" class="hidden" checked="{{checked 'sidebarGroupByType'}}"/>

app/ui-sidenav/client/sortlist.js

@@ -11,6 +11,9 @@ const checked = function(prop, field) {
 	if (prop === 'sidebarShowDiscussion') {
 		return getUserPreference(userId, 'sidebarShowDiscussion');
 	}
+	if (prop === 'sidebarShowServiceAccounts') {
+		return getUserPreference(userId, 'sidebarShowServiceAccounts');
+	}
 	if (prop === 'sidebarShowFavorites') {
 		return getUserPreference(userId, 'sidebarShowFavorites');
 	}

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -1493,6 +1493,7 @@
   "Group_favorites": "Group favorites",
   "Group_mentions_disabled_x_members": "Group mentions `@all` and `@here` have been disabled for rooms with more than __total__ members.",
   "Group_mentions_only": "Group mentions only",
+  "Group_subscriptions": "Group subscriptions",
   "Guest_Pool": "Guest Pool",
   "Hash": "Hash",
   "Header": "Header",

server/methods/saveUserPreferences.js

@@ -38,6 +38,7 @@ Meteor.methods({
 			sidebarHideAvatar: Match.Optional(Boolean),
 			sidebarGroupByType: Match.Optional(Boolean),
 			sidebarShowDiscussion: Match.Optional(Boolean),
+			sidebarShowServiceAccounts: Match.Optional(Boolean),
 			muteFocusedConversations: Match.Optional(Boolean),
 		};
 		check(settings, Match.ObjectIncluding(keys));

server/publications/subscription/index.js

@@ -18,6 +18,7 @@ export const fields = {
 	roles: 1,
 	unread: 1,
 	prid: 1,
+	sa: 1,
 	userMentions: 1,
 	groupMentions: 1,
 	archived: 1,

tests/end-to-end/api/00-miscellaneous.js

@@ -141,6 +141,7 @@ describe('miscellaneous', function() {
 					'sidebarGroupByType',
 					'muteFocusedConversations',
 					'sidebarShowDiscussion',
+					'sidebarShowServiceAccounts',
 				];
 
 				expect(res.body).to.have.property('success', true);