temp

.github/CODEOWNERS

@@ -22,12 +22,12 @@
 /apps/meteor/server/models @RocketChat/Architecture
 apps/meteor/server/startup/migrations @RocketChat/Architecture
 /apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel
-/apps/meteor/server/services/voip-asterisk @RocketChat/omnichannel
+/apps/meteor/server/services/voip @RocketChat/omnichannel
 /apps/meteor/server/services/omnichannel-voip @RocketChat/omnichannel
 /apps/meteor/server/features/EmailInbox @RocketChat/omnichannel
 /apps/meteor/ee/app/canned-responses @RocketChat/omnichannel
 /apps/meteor/ee/app/livechat @RocketChat/omnichannel
 /apps/meteor/ee/app/livechat-enterprise @RocketChat/omnichannel
-/apps/meteor/client/omnichannel @RocketChat/omnichannel
+/apps/meteor/ee/client/omnichannel @RocketChat/omnichannel
 /apps/meteor/client/components/omnichannel @RocketChat/omnichannel
 /apps/meteor/client/components/voip @RocketChat/omnichannel

.github/workflows/ci-test-e2e.yml

@@ -50,10 +50,6 @@ on:
       type:
         required: true
         type: string
-      db-watcher-disabled:
-        default: 'false'
-        required: false
-        type: string
     secrets:
       CR_USER:
         required: true
@@ -87,7 +83,7 @@ jobs:
         mongodb-version: ${{ fromJSON(inputs.mongodb-version) }}
         shard: ${{ fromJSON(inputs.shard) }}
 
-    name: MongoDB ${{ matrix.mongodb-version }}${{ inputs.db-watcher-disabled == 'true' && ' [no watchers]' || '' }} (${{ matrix.shard }}/${{ inputs.total-shard }})${{ matrix.mongodb-version == '6.0' && ' - Alpine' || '' }}
+    name: MongoDB ${{ matrix.mongodb-version }} (${{ matrix.shard }}/${{ inputs.total-shard }})${{ matrix.mongodb-version == '6.0' && ' - Alpine' || '' }}
 
     steps:
       - name: Login to GitHub Container Registry
@@ -165,7 +161,6 @@ jobs:
           TRANSPORTER: ${{ inputs.transporter }}
           COVERAGE_DIR: '/tmp/coverage'
           COVERAGE_REPORTER: 'lcov'
-          DISABLE_DB_WATCHERS: ${{ inputs.db-watcher-disabled }}
         run: |
           docker compose -f docker-compose-ci.yml up -d
 

.github/workflows/ci.yml

@@ -389,40 +389,10 @@ jobs:
       REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-  test-ui-ee-no-watcher:
-    name: 🔨 Test UI (EE)
-    needs: [checks, build-gh-docker-coverage, release-versions]
-
-    uses: ./.github/workflows/ci-test-e2e.yml
-    with:
-      type: ui
-      release: ee
-      transporter: 'nats://nats:4222'
-      enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
-      shard: '[1, 2, 3, 4, 5]'
-      total-shard: 5
-      mongodb-version: "['6.0']"
-      node-version: ${{ needs.release-versions.outputs.node-version }}
-      lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
-      rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
-      rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
-      rc-dockerfile-alpine: ${{ needs.release-versions.outputs.rc-dockerfile-alpine }}
-      rc-docker-tag-alpine: ${{ needs.release-versions.outputs.rc-docker-tag-alpine }}
-      gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
-      retries: ${{ (github.event_name == 'release' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master') && 2 || 0 }}
-      db-watcher-disabled: 'true'
-    secrets:
-      CR_USER: ${{ secrets.CR_USER }}
-      CR_PAT: ${{ secrets.CR_PAT }}
-      QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
-      REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
-      REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
   tests-done:
     name: ✅ Tests Done
     runs-on: ubuntu-20.04
-    needs: [checks, test-unit, test-api, test-ui, test-api-ee, test-ui-ee, test-ui-ee-no-watcher]
+    needs: [checks, test-unit, test-api, test-ui, test-api-ee, test-ui-ee]
 
     steps:
       - name: Test finish aggregation

.github/workflows/pr-title-checker.yml

@@ -12,6 +12,6 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: thehanimo/pr-title-checker@v1.4.1
+      - uses: thehanimo/pr-title-checker@v1.3.7
         with:
           GITHUB_TOKEN: ${{ secrets.RC_TITLE_CHECKER }}

apps/meteor/.storybook/main.js

@@ -7,6 +7,7 @@ module.exports = {
 		'../client/**/*.stories.{js,tsx}',
 		'../app/**/*.stories.{js,tsx}',
 		'../ee/app/**/*.stories.{js,tsx}',
+		'../ee/client/**/*.stories.{js,tsx}',
 	],
 	addons: [
 		'@storybook/addon-essentials',

apps/meteor/app/api/server/lib/getServerInfo.ts

@@ -5,18 +5,17 @@ import {
 	getCachedSupportedVersionsToken,
 	wrapPromise,
 } from '../../../cloud/server/functions/supportedVersionsToken/supportedVersionsToken';
-import { settings } from '../../../settings/server';
 import { Info, minimumClientVersions } from '../../../utils/rocketchat.info';
 
 const removePatchInfo = (version: string): string => version.replace(/(\d+\.\d+).*/, '$1');
 
 export async function getServerInfo(userId?: string): Promise<IWorkspaceInfo> {
 	const hasPermissionToViewStatistics = userId && (await hasPermissionAsync(userId, 'view-statistics'));
 	const supportedVersionsToken = await wrapPromise(getCachedSupportedVersionsToken());
-	const cloudWorkspaceId = settings.get<string | undefined>('Cloud_Workspace_Id');
 
 	return {
 		version: removePatchInfo(Info.version),
+
 		...(hasPermissionToViewStatistics && {
 			info: {
 				...Info,
@@ -29,7 +28,5 @@ export async function getServerInfo(userId?: string): Promise<IWorkspaceInfo> {
 			supportedVersionsToken.result && {
 				supportedVersions: { signed: supportedVersionsToken.result },
 			}),
-
-		cloudWorkspaceId,
 	};
 }

apps/meteor/app/api/server/v1/permissions.ts

@@ -4,7 +4,6 @@ import { isBodyParamsValidPermissionUpdate } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import { notifyOnPermissionChangedById } from '../../../lib/server/lib/notifyListener';
 import { API } from '../api';
 
 API.v1.addRoute(
@@ -71,7 +70,6 @@ API.v1.addRoute(
 
 			for await (const permission of bodyParams.permissions) {
 				await Permissions.setRoles(permission._id, permission.roles);
-				void notifyOnPermissionChangedById(permission._id);
 			}
 
 			const result = (await Meteor.callAsync('permissions/get')) as IPermission[];

apps/meteor/app/api/server/v1/roles.ts

@@ -9,7 +9,6 @@ import { getUsersInRolePaginated } from '../../../authorization/server/functions
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { hasRoleAsync, hasAnyRoleAsync } from '../../../authorization/server/functions/hasRole';
 import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
-import { notifyOnRoleChanged } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server/index';
 import { API } from '../api';
 import { getPaginationItems } from '../helpers/getPaginationItems';
@@ -180,8 +179,6 @@ API.v1.addRoute(
 
 			await Roles.removeById(role._id);
 
-			void notifyOnRoleChanged(role, 'removed');
-
 			return API.v1.success();
 		},
 	},