Refactor: Omnichannel Current Chats (#18627)

Co-authored-by: Guilherme Gazzo <[email protected]>

.github/issue-close-app.yml

@@ -1,25 +1,14 @@
 # Config for Close Issue app: https://probot.github.io/apps/close-issue/
 
 # Comment that will be sent if an issue is judged to be closed
-comment: |
-  This issue was closed because it does not use our bug report issue template.
-
-  Please make sure to use it and fill it as much as you can so we can provide better and faster support.
-
-  The following sections **must not** be removed, or else the BOT will close it immediately again:
-
-    * Steps to reproduce
-    * Expected behavior
-    * Actual behavior
-    * Server Setup Information
+comment: "This issue was closed because it does not use any of our issue templates. Please make sure to use one of the suggested templates."
 issueConfigs:
 # There can be several configs for different kind of issues.
 - content:
 # Bug report
   - "Steps to reproduce"
   - "Expected behavior"
   - "Actual behavior"
-  - "Server Setup Information"
   - "Version of Rocket.Chat Server"
 - content:
 # Release issue

.github/workflows/build_and_test.yml

@@ -238,9 +238,7 @@ jobs:
         MONGO_URL: mongodb://localhost:27017/rocketchat
         MONGO_OPLOG_URL: mongodb://localhost:27017/local
       run: |
-        echo -e 'pcm.!default {\n type hw\n card 0\n}\n\nctl.!default {\n type hw\n card 0\n}' > ~/.asoundrc
-        Xvfb -screen 0 1024x768x24 :99 &
-        for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && npm run testci && s=0 && break || s=$? && sleep 1; done; (exit $s)
+        for i in $(seq 1 5); do (docker exec mongo mongo rocketchat --eval 'db.dropDatabase()') && xvfb-run --auto-servernum npm run testci && s=0 && break || s=$? && sleep 1; done; (exit $s)
 
 #   notification:
 #     runs-on: ubuntu-latest

.meteor/versions

@@ -4,7 +4,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].1
+[email protected].0
 [email protected]
 aldeed:[email protected]
 [email protected]
@@ -27,8 +27,8 @@ dandv:[email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].8
-[email protected].2
+[email protected].7
+[email protected].1
 deepwell:[email protected]
 [email protected]
 [email protected]
@@ -79,7 +79,7 @@ [email protected]
 [email protected]
 meteorhacks:[email protected]
 meteorspark:[email protected]
-[email protected].2
+[email protected].0
 [email protected]
 [email protected]
 mizzao:[email protected]
@@ -97,7 +97,7 @@ mystor:[email protected]
 nimble:[email protected]
 nooitaf:[email protected]_1
 [email protected]
-[email protected].1
+[email protected].0
 [email protected]
 [email protected]
 [email protected]
@@ -130,7 +130,7 @@ [email protected]
 [email protected]
 [email protected]
 simple:[email protected]
-[email protected].1
+[email protected].0
 [email protected]
 [email protected]
 [email protected]

app/authentication/server/startup/index.js

@@ -153,7 +153,7 @@ Accounts.onCreateUser(function(options, user = {}) {
 	callbacks.run('beforeCreateUser', options, user);
 
 	user.status = 'offline';
-	user.active = user.active !== undefined ? user.active : !settings.get('Accounts_ManuallyApproveNewUsers');
+	user.active = !settings.get('Accounts_ManuallyApproveNewUsers');
 
 	if (!user.name) {
 		if (options.profile) {

app/authorization/client/views/permissions.js

@@ -11,6 +11,7 @@ import { hasAllPermission } from '../hasPermission';
 import { t } from '../../../utils/client';
 import { SideNav } from '../../../ui-utils/client/lib/SideNav';
 import { CONSTANTS, AuthorizationUtils } from '../../lib';
+
 import { hasAtLeastOnePermission } from '..';
 
 Template.permissions.helpers({

app/authorization/server/startup.js

@@ -24,7 +24,6 @@ Meteor.startup(function() {
 		{ _id: 'assign-roles',                       roles: ['admin'] },
 		{ _id: 'ban-user',                           roles: ['admin', 'owner', 'moderator'] },
 		{ _id: 'bulk-register-user',                 roles: ['admin'] },
-		{ _id: 'change-livechat-room-visitor',       roles: ['admin', 'livechat-manager', 'livechat-agent'] },
 		{ _id: 'create-c',                           roles: ['admin', 'user', 'bot', 'app'] },
 		{ _id: 'create-d',                           roles: ['admin', 'user', 'bot', 'app'] },
 		{ _id: 'create-p',                           roles: ['admin', 'user', 'bot', 'app'] },

app/autotranslate/server/methods/getSupportedLanguages.js

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 
 import { hasPermission } from '../../../authorization';
+
 import { TranslationProviderRegistry } from '..';
 
 Meteor.methods({

app/autotranslate/server/methods/translateMessage.js

@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import { Rooms } from '../../../models';
+
 import { TranslationProviderRegistry } from '..';
 
 Meteor.methods({

app/e2e/client/rocketchat.e2e.js

@@ -481,10 +481,8 @@ class E2E {
 	}
 
 	closeAlert() {
-		if (showingE2EAlert) {
-			alerts.close();
-		}
 		showingE2EAlert = false;
+		alerts.close();
 	}
 }
 

app/importer/server/methods/downloadPublicImportFile.js

@@ -7,6 +7,7 @@ import { Meteor } from 'meteor/meteor';
 import { RocketChatImportFileInstance } from '../startup/store';
 import { ProgressStep } from '../../lib/ImporterProgressStep';
 import { hasPermission } from '../../../authorization';
+
 import { Importers } from '..';
 
 function downloadHttpFile(fileUrl, writeStream) {

app/importer/server/methods/getImportFileData.js

@@ -7,6 +7,7 @@ import { RocketChatImportFileInstance } from '../startup/store';
 import { hasPermission } from '../../../authorization';
 import { Imports } from '../../../models';
 import { ProgressStep } from '../../lib/ImporterProgressStep';
+
 import { Importers } from '..';
 
 Meteor.methods({

app/importer/server/methods/getImportProgress.js

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../authorization';
 import { Imports } from '../../../models';
+
 import { Importers } from '..';
 
 

app/importer/server/methods/startImport.js

@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../authorization';
 import { Imports } from '../../../models';
+
 import {
 	Importers,
 	Selection,

app/importer/server/methods/uploadImportFile.js

@@ -5,6 +5,7 @@ import { RocketChatFile } from '../../../file';
 import { RocketChatImportFileInstance } from '../startup/store';
 import { hasPermission } from '../../../authorization';
 import { ProgressStep } from '../../lib/ImporterProgressStep';
+
 import { Importers } from '..';
 
 Meteor.methods({

app/livechat/client/route.js

@@ -18,14 +18,6 @@ AccountBox.addRoute({
 	pageTemplate: 'livechatDashboard',
 }, livechatManagerRoutes, load);
 
-AccountBox.addRoute({
-	name: 'livechat-current-chats',
-	path: '/current',
-	sideNav: 'omnichannelFlex',
-	i18nPageTitle: 'Current_Chats',
-	pageTemplate: 'livechatCurrentChats',
-}, livechatManagerRoutes, load);
-
 AccountBox.addRoute({
 	name: 'livechat-analytics',
 	path: '/analytics',

app/livechat/client/ui.js

@@ -16,7 +16,7 @@ Tracker.autorun((c) => {
 AccountBox.addItem({
 	name: 'Omnichannel',
 	icon: 'omnichannel',
-	href: 'livechat-current-chats',
+	href: '/omnichannel/current',
 	sideNav: 'omnichannelFlex',
 	condition: () => settings.get('Livechat_enabled') && hasAllPermission('view-livechat-manager'),
 });

app/livechat/client/views/admin.js

@@ -3,6 +3,5 @@ import './app/analytics/livechatAnalyticsCustomDaterange';
 import './app/analytics/livechatAnalyticsDaterange';
 import './app/analytics/livechatRealTimeMonitoring';
 import './app/livechatDashboard.html';
-import './app/livechatCurrentChats';
 import './app/livechatDepartmentForm';
 import './app/livechatDepartments';