From 091f248a55ac5ca9cea249dbf4196240b6de4993 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 12 Sep 2023 12:19:24 -0300
Subject: [PATCH 1/2] refactor(client): async loading (#30314)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .../meteor/client/lib/2fa/process2faReturn.ts |  4 +++-
 apps/meteor/client/main.ts                    | 24 ++++++++++---------
 apps/meteor/client/polyfills/index.ts         |  1 -
 .../client/polyfills/objectFromEntries.ts     |  5 ----
 .../client/providers/RouterProvider.tsx       |  6 -----
 5 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 apps/meteor/client/polyfills/objectFromEntries.ts

diff --git a/apps/meteor/client/lib/2fa/process2faReturn.ts b/apps/meteor/client/lib/2fa/process2faReturn.ts
index e5ff73be77b1..95f7f1dcb361 100644
--- a/apps/meteor/client/lib/2fa/process2faReturn.ts
+++ b/apps/meteor/client/lib/2fa/process2faReturn.ts
@@ -1,10 +1,12 @@
 import { SHA256 } from '@rocket.chat/sha256';
 import { Meteor } from 'meteor/meteor';
+import { lazy } from 'react';
 
-import TwoFactorModal from '../../components/TwoFactorModal';
 import { imperativeModal } from '../imperativeModal';
 import { isTotpInvalidError, isTotpRequiredError } from './utils';
 
+const TwoFactorModal = lazy(() => import('../../components/TwoFactorModal'));
+
 const twoFactorMethods = ['totp', 'email', 'password'] as const;
 
 type TwoFactorMethod = (typeof twoFactorMethods)[number];
diff --git a/apps/meteor/client/main.ts b/apps/meteor/client/main.ts
index bb08f0242d4f..334515980787 100644
--- a/apps/meteor/client/main.ts
+++ b/apps/meteor/client/main.ts
@@ -1,13 +1,15 @@
-import '../ee/client/ecdh';
-import './polyfills';
+import { FlowRouter } from 'meteor/kadira:flow-router';
 
-import '../lib/oauthRedirectUriClient';
-import './lib/meteorCallWrapper';
-import './importPackages';
+FlowRouter.wait();
 
-import '../ee/client';
-import './methods';
-import './startup';
-import './views/admin';
-import './views/marketplace';
-import './views/account';
+FlowRouter.notFound = {
+	action: () => undefined,
+};
+
+import('./polyfills')
+	.then(() => Promise.all([import('./lib/meteorCallWrapper'), import('../lib/oauthRedirectUriClient')]))
+	.then(() => import('../ee/client/ecdh'))
+	.then(() => import('./importPackages'))
+	.then(() => Promise.all([import('./methods'), import('./startup')]))
+	.then(() => import('../ee/client'))
+	.then(() => Promise.all([import('./views/admin'), import('./views/marketplace'), import('./views/account')]));
diff --git a/apps/meteor/client/polyfills/index.ts b/apps/meteor/client/polyfills/index.ts
index 46f5bcb8d68d..f07d828a4602 100644
--- a/apps/meteor/client/polyfills/index.ts
+++ b/apps/meteor/client/polyfills/index.ts
@@ -4,4 +4,3 @@ import './childNodeRemove';
 import './cssVars';
 import './customEventPolyfill';
 import './hoverTouchClick';
-import './objectFromEntries';
diff --git a/apps/meteor/client/polyfills/objectFromEntries.ts b/apps/meteor/client/polyfills/objectFromEntries.ts
deleted file mode 100644
index d59198ebd1d3..000000000000
--- a/apps/meteor/client/polyfills/objectFromEntries.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-Object.fromEntries =
-	Object.fromEntries ||
-	function fromEntries<T>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T } {
-		return [...entries].reduce((obj, { 0: key, 1: val }) => Object.assign(obj, { [key]: val }), {});
-	};
diff --git a/apps/meteor/client/providers/RouterProvider.tsx b/apps/meteor/client/providers/RouterProvider.tsx
index 0dd7ee31deed..0f146ec83128 100644
--- a/apps/meteor/client/providers/RouterProvider.tsx
+++ b/apps/meteor/client/providers/RouterProvider.tsx
@@ -17,12 +17,6 @@ import React from 'react';
 import { appLayout } from '../lib/appLayout';
 import { queueMicrotask } from '../lib/utils/queueMicrotask';
 
-FlowRouter.wait();
-
-FlowRouter.notFound = {
-	action: () => undefined,
-};
-
 const subscribers = new Set<() => void>();
 
 const listenToRouteChange = () => {

From 8202f2782ce987ed36159bfc1640944c1b7fa41c Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kaleman960@gmail.com>
Date: Tue, 12 Sep 2023 10:10:21 -0600
Subject: [PATCH 2/2] regression: Reports by-department showing null when
 department no longer exists (#30350)

---
 apps/meteor/ee/server/models/raw/LivechatRooms.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/meteor/ee/server/models/raw/LivechatRooms.ts b/apps/meteor/ee/server/models/raw/LivechatRooms.ts
index 227da1c98e8c..70824c7d7130 100644
--- a/apps/meteor/ee/server/models/raw/LivechatRooms.ts
+++ b/apps/meteor/ee/server/models/raw/LivechatRooms.ts
@@ -540,6 +540,13 @@ export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoo
 						},
 					},
 				},
+				{
+					$match: {
+						_id: {
+							$ne: null,
+						},
+					},
+				},
 				{
 					$sort: sort || { total: 1 },
 				},