From ccb9420189b6d3980576cf2ad4a97907c928b329 Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Fri, 2 Aug 2024 15:57:25 -0300 Subject: [PATCH 01/49] chore: update apps-engine (#32958) --- apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/ddp-streamer/package.json | 2 +- ee/packages/presence/package.json | 2 +- packages/apps/package.json | 2 +- packages/core-services/package.json | 2 +- packages/core-typings/package.json | 2 +- packages/fuselage-ui-kit/package.json | 2 +- packages/rest-typings/package.json | 2 +- yarn.lock | 26 ++++++++++----------- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index b9b1523c0c04..f28d34faa40f 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -18,7 +18,7 @@ "author": "Rocket.Chat", "license": "MIT", "dependencies": { - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "~0.31.25", diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 1e3ec0c70f0f..45bd640fed45 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -231,7 +231,7 @@ "@rocket.chat/agenda": "workspace:^", "@rocket.chat/api-client": "workspace:^", "@rocket.chat/apps": "workspace:^", - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/base64": "workspace:^", "@rocket.chat/cas-validate": "workspace:^", "@rocket.chat/core-services": "workspace:^", diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 42a72b165b46..562c3eca03e6 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -15,7 +15,7 @@ ], "author": "Rocket.Chat", "dependencies": { - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/core-services": "workspace:^", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/emitter": "~0.31.25", diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 09fd9db48b5f..83678740fc4b 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.20", "@babel/preset-env": "~7.22.20", "@babel/preset-typescript": "~7.22.15", - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/rest-typings": "workspace:^", "@types/node": "^14.18.63", diff --git a/packages/apps/package.json b/packages/apps/package.json index ac0fa9589a26..9c7306d5cf79 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -22,7 +22,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/model-typings": "workspace:^" } diff --git a/packages/core-services/package.json b/packages/core-services/package.json index eb9f2fdf4c69..079cd766af3d 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -34,7 +34,7 @@ "extends": "../../package.json" }, "dependencies": { - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/icons": "^0.36.0", "@rocket.chat/message-parser": "workspace:^", diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 8d045fb2e4c8..4d44193ca672 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -22,7 +22,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/icons": "^0.36.0", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/ui-kit": "workspace:~" diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 001a5d08c065..f14aeb67719f 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -63,7 +63,7 @@ "@babel/preset-env": "~7.22.20", "@babel/preset-react": "~7.22.15", "@babel/preset-typescript": "~7.22.15", - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/fuselage": "^0.56.0", diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 3eaf55915a85..a4323af82e40 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -24,7 +24,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "alpha", + "@rocket.chat/apps-engine": "1.44.0", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/ui-kit": "workspace:~", diff --git a/yarn.lock b/yarn.lock index 4537533a7247..2e401aa7cc04 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8509,9 +8509,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/apps-engine@npm:alpha": - version: 1.44.0-alpha.828 - resolution: "@rocket.chat/apps-engine@npm:1.44.0-alpha.828" +"@rocket.chat/apps-engine@npm:1.44.0": + version: 1.44.0 + resolution: "@rocket.chat/apps-engine@npm:1.44.0" dependencies: "@msgpack/msgpack": 3.0.0-beta2 adm-zip: ^0.5.9 @@ -8527,7 +8527,7 @@ __metadata: uuid: ~8.3.2 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: e26914b62d2e9823577fe8165a2635d65f69ddc315a880bbc417ddd674e4df487dc9bc9507bf3a0616de06cd927596872c1e90e4c29c61da8581e0a1b7c8d97d + checksum: f2b1b13c6a070c8d320a6d681ede6945a5882f9e2d42f2569bfc8c098229f761c7ef358589d3f1714d17b157fafa8e4869f28752408356f4a9286f62cb517f46 languageName: node linkType: hard @@ -8535,7 +8535,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/apps@workspace:packages/apps" dependencies: - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@types/jest": ~29.5.7 @@ -8614,7 +8614,7 @@ __metadata: "@babel/core": ~7.22.20 "@babel/preset-env": ~7.22.20 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ^0.36.0 @@ -8640,7 +8640,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/core-typings@workspace:packages/core-typings" dependencies: - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ^0.36.0 "@rocket.chat/message-parser": "workspace:^" @@ -8717,7 +8717,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer" dependencies: - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 @@ -8913,7 +8913,7 @@ __metadata: "@babel/preset-env": ~7.22.20 "@babel/preset-react": ~7.22.15 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/fuselage": ^0.56.0 @@ -9358,7 +9358,7 @@ __metadata: "@rocket.chat/agenda": "workspace:^" "@rocket.chat/api-client": "workspace:^" "@rocket.chat/apps": "workspace:^" - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/base64": "workspace:^" "@rocket.chat/cas-validate": "workspace:^" "@rocket.chat/core-services": "workspace:^" @@ -9997,7 +9997,7 @@ __metadata: "@babel/core": ~7.22.20 "@babel/preset-env": ~7.22.20 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" @@ -10112,7 +10112,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings" dependencies: - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/message-parser": "workspace:^" @@ -37162,7 +37162,7 @@ __metadata: version: 0.0.0-use.local resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services" dependencies: - "@rocket.chat/apps-engine": alpha + "@rocket.chat/apps-engine": 1.44.0 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 From 7444c3c360106b170759deaea8a9fbf00e8706be Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 2 Aug 2024 23:14:38 -0300 Subject: [PATCH 02/49] regression: fix dispatchInquiryPosition not being fired on room creation (#32972) --- .../meteor/app/livechat/server/lib/QueueManager.ts | 14 ++++++++++++++ .../app/livechat-enterprise/server/lib/Helper.ts | 6 +----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts index 5ae03e0ee03b..2075a5e9af97 100644 --- a/apps/meteor/app/livechat/server/lib/QueueManager.ts +++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts @@ -15,6 +15,7 @@ import { Random } from '@rocket.chat/random'; import { Match, check } from 'meteor/check'; import { Meteor } from 'meteor/meteor'; +import { dispatchInquiryPosition } from '../../../../ee/app/livechat-enterprise/server/lib/Helper'; import { callbacks } from '../../../../lib/callbacks'; import { sendNotification } from '../../../lib/server'; import { @@ -27,6 +28,7 @@ import { i18n } from '../../../utils/lib/i18n'; import { createLivechatRoom, createLivechatInquiry, allowAgentSkipQueue } from './Helper'; import { Livechat } from './LivechatTyped'; import { RoutingManager } from './RoutingManager'; +import { getInquirySortMechanismSetting } from './settings'; const logger = new Logger('QueueManager'); @@ -259,6 +261,18 @@ export class QueueManager { throw new Error('room-not-found'); } + if (!newRoom.servedBy && settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) { + const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({ + inquiryId: inquiry._id, + department, + queueSortBy: getInquirySortMechanismSetting(), + }); + + if (inq) { + void dispatchInquiryPosition(inq); + } + } + return newRoom; } diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts index 08ea48910f02..9d4b413d218a 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts @@ -107,15 +107,11 @@ export const dispatchInquiryPosition = async (inquiry: Omit) => { + return setTimeout(() => { void api.broadcast('omnichannel.room', inquiry.rid, { type: 'queueData', data, }); - }; - - return setTimeout(() => { - propagateInquiryPosition(inquiry); }, 1000); }; From 5ecdaff8539e15526d84268613f75fc7ac263098 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Sat, 3 Aug 2024 14:36:02 +0000 Subject: [PATCH 03/49] Release 6.11.0-rc.3 [no ci] --- .changeset/bump-patch-1722695753777.md | 5 +++ .changeset/pre.json | 1 + apps/meteor/CHANGELOG.md | 32 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 13 ++++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 13 ++++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 13 ++++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 15 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 14 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 13 ++++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 13 ++++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 12 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 10 ++++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 10 ++++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 9 ++++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 14 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 9 ++++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 11 +++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/apps/CHANGELOG.md | 10 ++++++ packages/apps/package.json | 2 +- packages/core-services/CHANGELOG.md | 11 +++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 10 ++++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 13 ++++++++ packages/fuselage-ui-kit/package.json | 8 ++--- packages/gazzodown/CHANGELOG.md | 11 +++++++ packages/gazzodown/package.json | 6 ++-- packages/instance-status/CHANGELOG.md | 9 ++++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 9 ++++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 9 ++++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 9 ++++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 9 ++++++ packages/rest-typings/package.json | 2 +- packages/ui-avatar/CHANGELOG.md | 9 ++++++ packages/ui-avatar/package.json | 4 +-- packages/ui-client/CHANGELOG.md | 9 ++++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 11 +++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 10 ++++++ packages/ui-video-conf/package.json | 6 ++-- packages/uikit-playground/CHANGELOG.md | 11 +++++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 9 ++++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 20 ++++++------ 69 files changed, 422 insertions(+), 54 deletions(-) create mode 100644 .changeset/bump-patch-1722695753777.md diff --git a/.changeset/bump-patch-1722695753777.md b/.changeset/bump-patch-1722695753777.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1722695753777.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 38a7fe160e48..d4757b9380d4 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -65,6 +65,7 @@ "afraid-guests-jog", "bump-patch-1722087664914", "bump-patch-1722559871139", + "bump-patch-1722695753777", "chatty-hounds-hammer", "chilled-yaks-beg", "chilly-papayas-march", diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index c80c36bf4890..cc355a5f68a5 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,37 @@ # @rocket.chat/meteor +## 6.11.0-rc.3 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/api-client@0.2.3-rc.3 + - @rocket.chat/license@0.2.3-rc.3 + - @rocket.chat/omnichannel-services@0.3.0-rc.3 + - @rocket.chat/pdf-worker@0.2.0-rc.3 + - @rocket.chat/presence@0.2.3-rc.3 + - @rocket.chat/apps@0.1.3-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/cron@0.1.3-rc.3 + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.3 + - @rocket.chat/gazzodown@9.0.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/ui-contexts@9.0.0-rc.3 + - @rocket.chat/server-cloud-communication@0.0.2 + - @rocket.chat/models@0.2.0-rc.3 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.3 + - @rocket.chat/ui-client@9.0.0-rc.3 + - @rocket.chat/ui-video-conf@9.0.0-rc.3 + - @rocket.chat/web-ui-registration@9.0.0-rc.3 + - @rocket.chat/instance-status@0.1.3-rc.3 +
+ ## 6.11.0-rc.2 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index b2dc220a6d51..976a2d1c1198 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-rc.2" + "version": "6.11.0-rc.3" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 4f5beb9327cb..d4ce5dfb6408 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,18 @@ # rocketchat-services +## 1.3.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 1.3.0-rc.2 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index f28d34faa40f..4aeb62869734 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.3.0-rc.2", + "version": "1.3.0-rc.3", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 45bd640fed45..7c80995a89bc 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.11.0-rc.2", + "version": "6.11.0-rc.3", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 13f5a86d0f67..f4528f2b2c98 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/account-service +## 0.4.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.4.3-rc.2 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index a4a29c5f7aaa..7f642163a3d2 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.4.3-rc.2", + "version": "0.4.3-rc.3", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 3e65906e0c1b..ca97afb60b94 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/authorization-service +## 0.4.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.4.3-rc.2 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 043d203cca88..19c94e3a1d7f 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.4.3-rc.2", + "version": "0.4.3-rc.3", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index cc5d65a49914..2d5d3801320d 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/ddp-streamer +## 0.3.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/ui-contexts@9.0.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 + - @rocket.chat/instance-status@0.1.3-rc.3 +
+ ## 0.3.3-rc.2 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 562c3eca03e6..0b8f0993162b 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.3.3-rc.2", + "version": "0.3.3-rc.3", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index e9d49967c49f..4ac9716efcfb 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-transcript +## 0.4.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/omnichannel-services@0.3.0-rc.3 + - @rocket.chat/pdf-worker@0.2.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.4.3-rc.2 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 5976e940ea84..246623b55f4f 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.4.3-rc.2", + "version": "0.4.3-rc.3", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 40771ea7ca96..900e6a69120b 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/presence-service +## 0.4.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/presence@0.2.3-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.4.3-rc.2 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 1153188bffe1..8e8d1a877d47 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.4.3-rc.2", + "version": "0.4.3-rc.3", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index bac927b65d20..6b622cbd9ee0 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/queue-worker +## 0.4.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/omnichannel-services@0.3.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.4.3-rc.2 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index c117382266a6..8d5f0f380f9e 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.4.3-rc.2", + "version": "0.4.3-rc.3", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 955104ad6cb3..da60a3ebf20b 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/stream-hub-service +## 0.4.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.4.3-rc.2 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index d3fb0d4b4950..0859e03ec9e5 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.4.3-rc.2", + "version": "0.4.3-rc.3", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 8c9a3c2b1cc6..47d4bd7668eb 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/api-client +## 0.2.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 +
+ ## 0.2.3-rc.2 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 1bbd8d6b0b87..89c9c496463f 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.2.3-rc.2", + "version": "0.2.3-rc.3", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index ed49a458277e..689116b0ccda 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ddp-client +## 0.3.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/api-client@0.2.3-rc.3 +
+ ## 0.3.3-rc.2 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 2b57bb6bef78..fcd53133bc45 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.3.3-rc.2", + "version": "0.3.3-rc.3", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index e29f97b6929c..760586616052 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 +
+ ## 0.2.3-rc.2 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 87da017b63fb..0545fdadb2ec 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.3-rc.2", + "version": "0.2.3-rc.3", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 457e8d0236c5..c499efe0ea2e 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-services +## 0.3.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/pdf-worker@0.2.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.3.0-rc.2 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 8729b1ac28d4..cb9fed1eced8 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.3.0-rc.2", + "version": "0.3.0-rc.3", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index d5e341a2360d..3afd228e31db 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/pdf-worker +## 0.2.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 +
+ ## 0.2.0-rc.2 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 938f6bc34432..376b060af775 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.2.0-rc.2", + "version": "0.2.0-rc.3", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index d8c531e3d72d..b8bbdd1c6259 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/presence +## 0.2.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/core-services@0.5.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.2.3-rc.2 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 83678740fc4b..281775624a9f 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.3-rc.2", + "version": "0.2.3-rc.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 339a74271975..fc76a3d44ca4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-rc.2", + "version": "6.11.0-rc.3", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index 0c686c073432..307ade401d44 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/apps +## 0.1.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/model-typings@0.6.0-rc.3 +
+ ## 0.1.3-rc.2 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index 9c7306d5cf79..7480a03b04ac 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.3-rc.2", + "version": "0.1.3-rc.3", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 286b003068d3..b6c09da269a1 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/core-services +## 0.5.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.5.0-rc.2 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 079cd766af3d..372232ca9d3d 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.5.0-rc.2", + "version": "0.5.0-rc.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 2d62b835be92..2051bf53528d 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.11.0-rc.3 + ## 6.11.0-rc.2 ## 6.11.0-rc.1 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 4d44193ca672..9063cf39fc06 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.11.0-rc.2", + "version": "6.11.0-rc.3", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 1fd83782f500..e94eea377caa 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.1.3-rc.2 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 028de546744c..43c36e9c0c57 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.3-rc.2", + "version": "0.1.3-rc.3", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 0009b0237063..b44f3ff536c7 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 9.0.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/gazzodown@9.0.0-rc.3 + - @rocket.chat/ui-contexts@9.0.0-rc.3 + - @rocket.chat/ui-avatar@5.0.0-rc.3 + - @rocket.chat/ui-video-conf@9.0.0-rc.3 +
+ ## 9.0.0-rc.2 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index f14aeb67719f..44be4babdc34 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "9.0.0-rc.2", + "version": "9.0.0-rc.3", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -50,10 +50,10 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.2", - "@rocket.chat/ui-contexts": "9.0.0-rc.2", + "@rocket.chat/ui-avatar": "5.0.0-rc.3", + "@rocket.chat/ui-contexts": "9.0.0-rc.3", "@rocket.chat/ui-kit": "0.36.0-rc.0", - "@rocket.chat/ui-video-conf": "9.0.0-rc.2", + "@rocket.chat/ui-video-conf": "9.0.0-rc.3", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 7e60bdcb4e5f..e3ae037777a7 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/ui-contexts@9.0.0-rc.3 + - @rocket.chat/ui-client@9.0.0-rc.3 +
+ ## 9.0.0-rc.2 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index a90d765208ad..68fb28175c46 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "9.0.0-rc.2", + "version": "9.0.0-rc.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -71,8 +71,8 @@ "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "0.31.29", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "9.0.0-rc.2", - "@rocket.chat/ui-contexts": "9.0.0-rc.2", + "@rocket.chat/ui-client": "9.0.0-rc.3", + "@rocket.chat/ui-contexts": "9.0.0-rc.3", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 77382a05d6a6..5f6778ac7ebb 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/models@0.2.0-rc.3 +
+ ## 0.1.3-rc.2 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 09d81c81b1e6..978efda3228d 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.1.3-rc.2", + "version": "0.1.3-rc.3", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index c5e1fa9c91dc..e3b85ec2e06a 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/livechat Change Log +## 1.19.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/gazzodown@9.0.0-rc.3 +
+ ## 1.19.0-rc.2 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index af91b807ca2c..56bbf4c5aec2 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.19.0-rc.2", + "version": "1.19.0-rc.3", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 9608c678e649..0dacd0e498a2 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/model-typings +## 0.6.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 +
+ ## 0.6.0-rc.2 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index ca0195079e91..e61461f13907 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.6.0-rc.2", + "version": "0.6.0-rc.3", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 375dd26f6aeb..5b6a99588bff 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/models +## 0.2.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/model-typings@0.6.0-rc.3 +
+ ## 0.2.0-rc.2 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 8a7c50d8f2d0..0443b3c39831 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.2.0-rc.2", + "version": "0.2.0-rc.3", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 3be5f4643578..486d5bba1313 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/rest-typings +## 6.11.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 +
+ ## 6.11.0-rc.2 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index a4323af82e40..a278a3a527bc 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.11.0-rc.2", + "version": "6.11.0-rc.3", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md index f0b0b7b7fe99..1f19f7615382 100644 --- a/packages/ui-avatar/CHANGELOG.md +++ b/packages/ui-avatar/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-avatar +## 5.0.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.3 +
+ ## 5.0.0-rc.2 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 77d7af5288d1..0b78657b51dc 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-avatar", - "version": "5.0.0-rc.2", + "version": "5.0.0-rc.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.2", + "@rocket.chat/ui-contexts": "9.0.0-rc.3", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index a08ff45507d9..ca9ab371c41a 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-client +## 9.0.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.3 +
+ ## 9.0.0-rc.2 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index feb8eabcda14..ff483766daad 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "9.0.0-rc.2", + "version": "9.0.0-rc.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -63,7 +63,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.2", + "@rocket.chat/ui-contexts": "9.0.0-rc.3", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index f2bbb77a501c..9907912c5562 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/ui-contexts +## 9.0.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.3 + - @rocket.chat/rest-typings@6.11.0-rc.3 + - @rocket.chat/ddp-client@0.3.3-rc.3 +
+ ## 9.0.0-rc.2 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index f9833521673c..4183d0a0e2fb 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "9.0.0-rc.2", + "version": "9.0.0-rc.3", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 4acd711bd304..be2e4e9444b6 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ui-video-conf +## 9.0.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.3 + - @rocket.chat/ui-avatar@5.0.0-rc.3 +
+ ## 9.0.0-rc.2 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 6991762ada03..f585656d72e0 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "9.0.0-rc.2", + "version": "9.0.0-rc.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -36,8 +36,8 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.2", - "@rocket.chat/ui-contexts": "9.0.0-rc.2", + "@rocket.chat/ui-avatar": "5.0.0-rc.3", + "@rocket.chat/ui-contexts": "9.0.0-rc.3", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index d1aa257adf5c..d65421b1115b 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.3-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.3 + - @rocket.chat/ui-contexts@9.0.0-rc.3 + - @rocket.chat/ui-avatar@5.0.0-rc.3 +
+ ## 0.3.3-rc.2 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 101e45a56559..bfb647c2d28e 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.3.3-rc.2", + "version": "0.3.3-rc.3", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index e6d4fa500e47..98d721324216 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/web-ui-registration +## 9.0.0-rc.3 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.3 +
+ ## 9.0.0-rc.2 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 3144b1a58176..96479929263c 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "9.0.0-rc.2", + "version": "9.0.0-rc.3", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "0.2.2-rc.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.2", + "@rocket.chat/ui-contexts": "9.0.0-rc.3", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 2e401aa7cc04..78f33041365c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8968,10 +8968,10 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.1 - "@rocket.chat/ui-contexts": 9.0.0-rc.1 + "@rocket.chat/ui-avatar": 5.0.0-rc.2 + "@rocket.chat/ui-contexts": 9.0.0-rc.2 "@rocket.chat/ui-kit": 0.36.0-rc.0 - "@rocket.chat/ui-video-conf": 9.0.0-rc.1 + "@rocket.chat/ui-video-conf": 9.0.0-rc.2 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -9060,8 +9060,8 @@ __metadata: "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": 0.31.29 "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 9.0.0-rc.1 - "@rocket.chat/ui-contexts": 9.0.0-rc.1 + "@rocket.chat/ui-client": 9.0.0-rc.2 + "@rocket.chat/ui-contexts": 9.0.0-rc.2 katex: "*" react: "*" languageName: unknown @@ -10281,7 +10281,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.1 + "@rocket.chat/ui-contexts": 9.0.0-rc.2 react: ~17.0.2 languageName: unknown linkType: soft @@ -10334,7 +10334,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.1 + "@rocket.chat/ui-contexts": 9.0.0-rc.2 react: ~17.0.2 languageName: unknown linkType: soft @@ -10510,8 +10510,8 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.1 - "@rocket.chat/ui-contexts": 9.0.0-rc.1 + "@rocket.chat/ui-avatar": 5.0.0-rc.2 + "@rocket.chat/ui-contexts": 9.0.0-rc.2 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -10601,7 +10601,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": 0.2.2-rc.0 - "@rocket.chat/ui-contexts": 9.0.0-rc.1 + "@rocket.chat/ui-contexts": 9.0.0-rc.2 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From dea72b5d9febf346f060573908c9db7383ae10dc Mon Sep 17 00:00:00 2001 From: Debdut Chakraborty Date: Mon, 5 Aug 2024 19:34:05 +0530 Subject: [PATCH 04/49] regression: default to already stored value not value from code (#32870) Co-authored-by: Guilherme Gazzo Co-authored-by: Marcos Spessatto Defendi --- .../app/settings/server/SettingsRegistry.ts | 6 +- .../server/functions/settings.tests.ts | 66 +++++++++++++++++-- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/apps/meteor/app/settings/server/SettingsRegistry.ts b/apps/meteor/app/settings/server/SettingsRegistry.ts index e86a391ad8fa..d7d2fa0a79f8 100644 --- a/apps/meteor/app/settings/server/SettingsRegistry.ts +++ b/apps/meteor/app/settings/server/SettingsRegistry.ts @@ -139,6 +139,7 @@ export class SettingsRegistry { const settingFromCodeOverwritten = overwriteSetting(settingFromCode); const settingStored = this.store.getSetting(_id); + const settingStoredOverwritten = settingStored && overwriteSetting(settingStored); try { @@ -166,7 +167,10 @@ export class SettingsRegistry { })(); await this.saveUpdatedSetting(_id, updatedProps, removedKeys); - this.store.set(settingFromCodeOverwritten); + if ('value' in updatedProps) { + this.store.set(updatedProps as ISetting); + } + return; } diff --git a/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts b/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts index 3f409881b259..5f5001c0251d 100644 --- a/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts +++ b/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts @@ -448,7 +448,7 @@ describe('Settings', () => { .to.not.have.any.keys('section'); }); - it('should ignore setting object from code if only value changes and setting already stored', async () => { + it('should ignore setting object from code if only value changes in code and setting already stored', async () => { const settings = new CachedSettings(); Settings.settings = settings; settings.initialized(); @@ -467,7 +467,60 @@ describe('Settings', () => { expect(Settings.upsertCalls).to.be.equal(0); }); - it('should ignore value from environment if setting is already stored', async () => { + it('should not update (reset) cached setting with value in code if some prop in code changes (including value)', async () => { + Settings.setDelay(1000); + const settings = new CachedSettings(); + process.env[`OVERWRITE_SETTING_${testSetting._id}`] = 'false'; + const storedSetting = { ...testSetting, value: true, packageValue: true }; + settings.set(storedSetting); + + Settings.settings = settings; + + settings.initialized(); + + expect(settings.get(storedSetting._id)).to.be.equal(true); + + const settingsRegistry = new SettingsRegistry({ store: settings, model: Settings as any }); + + const settingFromCodeFaked = { + ...storedSetting, + value: true, + enterprise: true, + invalidValue: '', + }; + + await settingsRegistry.add(settingFromCodeFaked._id, settingFromCodeFaked.value, settingFromCodeFaked); + + expect(Settings.insertCalls).to.be.equal(0); + expect(Settings.upsertCalls).to.be.equal(1); + + expect(settings.get(storedSetting._id)).to.be.equal(false); + }); + + it('should update cached setting with value from environment if some prop including value in code changes', async () => { + const settings = new CachedSettings(); + Settings.settings = settings; + settings.initialized(); + const settingsRegistry = new SettingsRegistry({ store: settings, model: Settings as any }); + + await settingsRegistry.add(testSetting._id, testSetting.value, testSetting); + + expect(Settings.insertCalls).to.be.equal(1); + Settings.insertCalls = 0; + + const settingFromCodeFaked = { ...testSetting, value: Date.now().toString(), enterprise: true, invalidValue: '' }; + + process.env[`OVERWRITE_SETTING_${testSetting._id}`] = Date.now().toString(); + + await settingsRegistry.add(settingFromCodeFaked._id, settingFromCodeFaked.value, settingFromCodeFaked); + + expect(Settings.insertCalls).to.be.equal(0); + expect(Settings.upsertCalls).to.be.equal(1); + + expect(settings.get(testSetting._id)).to.be.equal(process.env[`OVERWRITE_SETTING_${testSetting._id}`]); + }); + + it('should ignore default value from environment if setting is already stored', async () => { const settings = new CachedSettings(); Settings.settings = settings; settings.initialized(); @@ -482,12 +535,14 @@ describe('Settings', () => { expect(Settings.findOne({ _id: testSetting._id }).value).to.be.equal(testSetting.value); }); - it('should update setting cache synchronously if overwrite is available in enviornment', async () => { + it('should update setting cache synchronously if overwrite is available in environment', async () => { const settings = new CachedSettings(); Settings.settings = settings; settings.initialized(); const settingsRegistry = new SettingsRegistry({ store: settings, model: Settings as any }); + settings.set(testSetting); + process.env[`OVERWRITE_SETTING_${testSetting._id}`] = Date.now().toString(); await settingsRegistry.add(testSetting._id, testSetting.value, testSetting); @@ -495,7 +550,7 @@ describe('Settings', () => { expect(settings.get(testSetting._id)).to.be.equal(process.env[`OVERWRITE_SETTING_${testSetting._id}`]); }); - it('should update cached value with OVERWRITE_SETTING value even if both with-prefixed and without-prefixed variables exist', async () => { + it('should update cached value with OVERWRITE_SETTING value even if both overwrite and default overwrite variables both exist', async () => { const settings = new CachedSettings(); Settings.settings = settings; settings.initialized(); @@ -506,7 +561,8 @@ describe('Settings', () => { await settingsRegistry.add(testSetting._id, testSetting.value, testSetting); - expect(Settings.findOne({ _id: testSetting._id }).value).to.be.equal(process.env[`OVERWRITE_SETTING_${testSetting._id}`]); + expect(Settings.insertCalls).to.be.equal(1); + expect(settings.get(testSetting._id)).to.be.equal(process.env[`OVERWRITE_SETTING_${testSetting._id}`]); }); it('should call `settings.get` callback on setting added', async () => { From 05de4ba54f2c5b7ad2308439478b47d5dd5146ae Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Tue, 6 Aug 2024 07:50:50 +0000 Subject: [PATCH 05/49] Release 6.11.0-rc.4 [no ci] --- .changeset/bump-patch-1722930641296.md | 5 +++ .changeset/pre.json | 1 + apps/meteor/CHANGELOG.md | 32 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 13 ++++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 13 ++++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 13 ++++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 15 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 14 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 13 ++++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 13 ++++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 12 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 10 ++++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 10 ++++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 9 ++++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 14 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 9 ++++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 11 +++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/apps/CHANGELOG.md | 10 ++++++ packages/apps/package.json | 2 +- packages/core-services/CHANGELOG.md | 11 +++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 10 ++++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 13 ++++++++ packages/fuselage-ui-kit/package.json | 8 ++--- packages/gazzodown/CHANGELOG.md | 11 +++++++ packages/gazzodown/package.json | 6 ++-- packages/instance-status/CHANGELOG.md | 9 ++++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 9 ++++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 9 ++++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 9 ++++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 9 ++++++ packages/rest-typings/package.json | 2 +- packages/ui-avatar/CHANGELOG.md | 9 ++++++ packages/ui-avatar/package.json | 4 +-- packages/ui-client/CHANGELOG.md | 9 ++++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 11 +++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 10 ++++++ packages/ui-video-conf/package.json | 6 ++-- packages/uikit-playground/CHANGELOG.md | 11 +++++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 9 ++++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 20 ++++++------ 69 files changed, 422 insertions(+), 54 deletions(-) create mode 100644 .changeset/bump-patch-1722930641296.md diff --git a/.changeset/bump-patch-1722930641296.md b/.changeset/bump-patch-1722930641296.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1722930641296.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index d4757b9380d4..aafa9a312133 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -66,6 +66,7 @@ "bump-patch-1722087664914", "bump-patch-1722559871139", "bump-patch-1722695753777", + "bump-patch-1722930641296", "chatty-hounds-hammer", "chilled-yaks-beg", "chilly-papayas-march", diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index cc355a5f68a5..078f9815d55a 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,37 @@ # @rocket.chat/meteor +## 6.11.0-rc.4 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/api-client@0.2.3-rc.4 + - @rocket.chat/license@0.2.3-rc.4 + - @rocket.chat/omnichannel-services@0.3.0-rc.4 + - @rocket.chat/pdf-worker@0.2.0-rc.4 + - @rocket.chat/presence@0.2.3-rc.4 + - @rocket.chat/apps@0.1.3-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/cron@0.1.3-rc.4 + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.4 + - @rocket.chat/gazzodown@9.0.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/ui-contexts@9.0.0-rc.4 + - @rocket.chat/server-cloud-communication@0.0.2 + - @rocket.chat/models@0.2.0-rc.4 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.4 + - @rocket.chat/ui-client@9.0.0-rc.4 + - @rocket.chat/ui-video-conf@9.0.0-rc.4 + - @rocket.chat/web-ui-registration@9.0.0-rc.4 + - @rocket.chat/instance-status@0.1.3-rc.4 +
+ ## 6.11.0-rc.3 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 976a2d1c1198..2153c14b3a8b 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-rc.3" + "version": "6.11.0-rc.4" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index d4ce5dfb6408..ca444eaa3555 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,18 @@ # rocketchat-services +## 1.3.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 1.3.0-rc.3 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 4aeb62869734..8c6a4ac724a1 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.3.0-rc.3", + "version": "1.3.0-rc.4", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 7c80995a89bc..09d90f4d913c 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.11.0-rc.3", + "version": "6.11.0-rc.4", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index f4528f2b2c98..330f4216c603 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/account-service +## 0.4.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.4.3-rc.3 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 7f642163a3d2..56bf0835b59c 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.4.3-rc.3", + "version": "0.4.3-rc.4", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index ca97afb60b94..643e846b41b6 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/authorization-service +## 0.4.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.4.3-rc.3 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 19c94e3a1d7f..58c4721655fc 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.4.3-rc.3", + "version": "0.4.3-rc.4", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 2d5d3801320d..c67f72caeb1d 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/ddp-streamer +## 0.3.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/ui-contexts@9.0.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 + - @rocket.chat/instance-status@0.1.3-rc.4 +
+ ## 0.3.3-rc.3 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 0b8f0993162b..c84454c7b60c 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.3.3-rc.3", + "version": "0.3.3-rc.4", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 4ac9716efcfb..fb9b79136b49 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-transcript +## 0.4.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/omnichannel-services@0.3.0-rc.4 + - @rocket.chat/pdf-worker@0.2.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.4.3-rc.3 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 246623b55f4f..c5f3d25fb306 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.4.3-rc.3", + "version": "0.4.3-rc.4", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 900e6a69120b..e0122ec3a194 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/presence-service +## 0.4.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/presence@0.2.3-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.4.3-rc.3 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 8e8d1a877d47..3764076bf94c 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.4.3-rc.3", + "version": "0.4.3-rc.4", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 6b622cbd9ee0..9ca974747a19 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/queue-worker +## 0.4.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/omnichannel-services@0.3.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.4.3-rc.3 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 8d5f0f380f9e..4bf292e31590 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.4.3-rc.3", + "version": "0.4.3-rc.4", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index da60a3ebf20b..78b7c955c562 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/stream-hub-service +## 0.4.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.4.3-rc.3 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 0859e03ec9e5..17fb792a1775 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.4.3-rc.3", + "version": "0.4.3-rc.4", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 47d4bd7668eb..6a287f1ff106 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/api-client +## 0.2.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 +
+ ## 0.2.3-rc.3 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 89c9c496463f..86ffc389412b 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.2.3-rc.3", + "version": "0.2.3-rc.4", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 689116b0ccda..521c7783a3b4 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ddp-client +## 0.3.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/api-client@0.2.3-rc.4 +
+ ## 0.3.3-rc.3 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index fcd53133bc45..86e982665438 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.3.3-rc.3", + "version": "0.3.3-rc.4", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 760586616052..97e9aa3ae9fe 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 +
+ ## 0.2.3-rc.3 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 0545fdadb2ec..e4af3354f806 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.3-rc.3", + "version": "0.2.3-rc.4", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index c499efe0ea2e..7a40ba9b076c 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-services +## 0.3.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/pdf-worker@0.2.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.3.0-rc.3 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index cb9fed1eced8..4206404d1658 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.3.0-rc.3", + "version": "0.3.0-rc.4", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 3afd228e31db..98fbca3ceccd 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/pdf-worker +## 0.2.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 +
+ ## 0.2.0-rc.3 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 376b060af775..3ea9b604a246 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.2.0-rc.3", + "version": "0.2.0-rc.4", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index b8bbdd1c6259..4c6471b6f9b0 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/presence +## 0.2.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/core-services@0.5.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.2.3-rc.3 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 281775624a9f..41b728e53a8d 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.3-rc.3", + "version": "0.2.3-rc.4", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index fc76a3d44ca4..262d59132d5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-rc.3", + "version": "6.11.0-rc.4", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index 307ade401d44..bf0477edaa36 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/apps +## 0.1.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/model-typings@0.6.0-rc.4 +
+ ## 0.1.3-rc.3 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index 7480a03b04ac..c36b17380d96 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.3-rc.3", + "version": "0.1.3-rc.4", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index b6c09da269a1..de4b332aa791 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/core-services +## 0.5.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.5.0-rc.3 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 372232ca9d3d..2c9bfed68b8d 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.5.0-rc.3", + "version": "0.5.0-rc.4", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 2051bf53528d..0babf61dace8 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.11.0-rc.4 + ## 6.11.0-rc.3 ## 6.11.0-rc.2 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 9063cf39fc06..1c3fb9446a71 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.11.0-rc.3", + "version": "6.11.0-rc.4", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index e94eea377caa..8f40c8b0b134 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.1.3-rc.3 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 43c36e9c0c57..5b9939747c3f 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.3-rc.3", + "version": "0.1.3-rc.4", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index b44f3ff536c7..6921e780af1a 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 9.0.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/gazzodown@9.0.0-rc.4 + - @rocket.chat/ui-contexts@9.0.0-rc.4 + - @rocket.chat/ui-avatar@5.0.0-rc.4 + - @rocket.chat/ui-video-conf@9.0.0-rc.4 +
+ ## 9.0.0-rc.3 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 44be4babdc34..94ea8ef1b3b3 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "9.0.0-rc.3", + "version": "9.0.0-rc.4", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -50,10 +50,10 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.3", - "@rocket.chat/ui-contexts": "9.0.0-rc.3", + "@rocket.chat/ui-avatar": "5.0.0-rc.4", + "@rocket.chat/ui-contexts": "9.0.0-rc.4", "@rocket.chat/ui-kit": "0.36.0-rc.0", - "@rocket.chat/ui-video-conf": "9.0.0-rc.3", + "@rocket.chat/ui-video-conf": "9.0.0-rc.4", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index e3ae037777a7..31b1f94d4a7f 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/ui-contexts@9.0.0-rc.4 + - @rocket.chat/ui-client@9.0.0-rc.4 +
+ ## 9.0.0-rc.3 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 68fb28175c46..a87e4cbcd5b9 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "9.0.0-rc.3", + "version": "9.0.0-rc.4", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -71,8 +71,8 @@ "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "0.31.29", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "9.0.0-rc.3", - "@rocket.chat/ui-contexts": "9.0.0-rc.3", + "@rocket.chat/ui-client": "9.0.0-rc.4", + "@rocket.chat/ui-contexts": "9.0.0-rc.4", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 5f6778ac7ebb..682dbcea8eb1 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/models@0.2.0-rc.4 +
+ ## 0.1.3-rc.3 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 978efda3228d..7179d7d1796b 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.1.3-rc.3", + "version": "0.1.3-rc.4", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index e3b85ec2e06a..7c585e147359 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/livechat Change Log +## 1.19.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/gazzodown@9.0.0-rc.4 +
+ ## 1.19.0-rc.3 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 56bbf4c5aec2..41d38e6615d5 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.19.0-rc.3", + "version": "1.19.0-rc.4", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 0dacd0e498a2..b3d90db0f34e 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/model-typings +## 0.6.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 +
+ ## 0.6.0-rc.3 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index e61461f13907..6fe12d7a71bd 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.6.0-rc.3", + "version": "0.6.0-rc.4", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 5b6a99588bff..aa5a88d88981 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/models +## 0.2.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/model-typings@0.6.0-rc.4 +
+ ## 0.2.0-rc.3 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 0443b3c39831..3f1fd66b47d7 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.2.0-rc.3", + "version": "0.2.0-rc.4", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 486d5bba1313..6297a58a39ca 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/rest-typings +## 6.11.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 +
+ ## 6.11.0-rc.3 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index a278a3a527bc..5c53c581b326 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.11.0-rc.3", + "version": "6.11.0-rc.4", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md index 1f19f7615382..99914f95c887 100644 --- a/packages/ui-avatar/CHANGELOG.md +++ b/packages/ui-avatar/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-avatar +## 5.0.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.4 +
+ ## 5.0.0-rc.3 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 0b78657b51dc..4d14b0db6476 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-avatar", - "version": "5.0.0-rc.3", + "version": "5.0.0-rc.4", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.3", + "@rocket.chat/ui-contexts": "9.0.0-rc.4", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index ca9ab371c41a..c30f8b47d1e2 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-client +## 9.0.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.4 +
+ ## 9.0.0-rc.3 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index ff483766daad..8c11835c701a 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "9.0.0-rc.3", + "version": "9.0.0-rc.4", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -63,7 +63,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.3", + "@rocket.chat/ui-contexts": "9.0.0-rc.4", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 9907912c5562..7046c428ea3f 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/ui-contexts +## 9.0.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.4 + - @rocket.chat/rest-typings@6.11.0-rc.4 + - @rocket.chat/ddp-client@0.3.3-rc.4 +
+ ## 9.0.0-rc.3 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 4183d0a0e2fb..e6f1f2cfb35d 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "9.0.0-rc.3", + "version": "9.0.0-rc.4", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index be2e4e9444b6..adc27e661575 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ui-video-conf +## 9.0.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.4 + - @rocket.chat/ui-avatar@5.0.0-rc.4 +
+ ## 9.0.0-rc.3 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index f585656d72e0..d6552cffc0db 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "9.0.0-rc.3", + "version": "9.0.0-rc.4", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -36,8 +36,8 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.3", - "@rocket.chat/ui-contexts": "9.0.0-rc.3", + "@rocket.chat/ui-avatar": "5.0.0-rc.4", + "@rocket.chat/ui-contexts": "9.0.0-rc.4", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index d65421b1115b..582f6170dab8 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.3-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.4 + - @rocket.chat/ui-contexts@9.0.0-rc.4 + - @rocket.chat/ui-avatar@5.0.0-rc.4 +
+ ## 0.3.3-rc.3 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index bfb647c2d28e..3eb07bae7902 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.3.3-rc.3", + "version": "0.3.3-rc.4", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 98d721324216..4f59a6ee8db4 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/web-ui-registration +## 9.0.0-rc.4 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.4 +
+ ## 9.0.0-rc.3 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 96479929263c..31f47e77466e 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "9.0.0-rc.3", + "version": "9.0.0-rc.4", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "0.2.2-rc.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.3", + "@rocket.chat/ui-contexts": "9.0.0-rc.4", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 78f33041365c..fd83eccadf8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8968,10 +8968,10 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.2 - "@rocket.chat/ui-contexts": 9.0.0-rc.2 + "@rocket.chat/ui-avatar": 5.0.0-rc.3 + "@rocket.chat/ui-contexts": 9.0.0-rc.3 "@rocket.chat/ui-kit": 0.36.0-rc.0 - "@rocket.chat/ui-video-conf": 9.0.0-rc.2 + "@rocket.chat/ui-video-conf": 9.0.0-rc.3 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -9060,8 +9060,8 @@ __metadata: "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": 0.31.29 "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 9.0.0-rc.2 - "@rocket.chat/ui-contexts": 9.0.0-rc.2 + "@rocket.chat/ui-client": 9.0.0-rc.3 + "@rocket.chat/ui-contexts": 9.0.0-rc.3 katex: "*" react: "*" languageName: unknown @@ -10281,7 +10281,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.2 + "@rocket.chat/ui-contexts": 9.0.0-rc.3 react: ~17.0.2 languageName: unknown linkType: soft @@ -10334,7 +10334,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.2 + "@rocket.chat/ui-contexts": 9.0.0-rc.3 react: ~17.0.2 languageName: unknown linkType: soft @@ -10510,8 +10510,8 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.2 - "@rocket.chat/ui-contexts": 9.0.0-rc.2 + "@rocket.chat/ui-avatar": 5.0.0-rc.3 + "@rocket.chat/ui-contexts": 9.0.0-rc.3 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -10601,7 +10601,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": 0.2.2-rc.0 - "@rocket.chat/ui-contexts": 9.0.0-rc.2 + "@rocket.chat/ui-contexts": 9.0.0-rc.3 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From 97c7042bb8a0089e567921a1c8a500d4f32dc01d Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 7 Aug 2024 00:12:53 -0300 Subject: [PATCH 06/49] ci: remove tmp files (#32996) --- .github/workflows/ci-test-e2e.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml index 920aea0aa308..5824a38c8f11 100644 --- a/.github/workflows/ci-test-e2e.yml +++ b/.github/workflows/ci-test-e2e.yml @@ -178,6 +178,12 @@ jobs: run: | docker compose -f docker-compose-ci.yml up -d + - name: Clean up temporary files + # remove all folders inside /tmp except /tmp/coverage + run: | + cd /tmp + sudo find . -mindepth 1 -maxdepth 1 -type d | grep -v './coverage' | sudo xargs rm -rf + - name: Cache Playwright binaries if: inputs.type == 'ui' uses: actions/cache@v3 @@ -212,6 +218,8 @@ jobs: sleep 10 done; + - name: Remove unused Docker images + run: docker system prune -af - name: E2E Test API if: inputs.type == 'api' working-directory: ./apps/meteor From 72792c15b8dc4f5198f4218dc96c8eba11e16142 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Wed, 7 Aug 2024 00:47:55 -0300 Subject: [PATCH 07/49] ci: only rebuild docker if event is pull request and is from outside (#32997) --- .github/workflows/ci-test-e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml index 5824a38c8f11..378769883f19 100644 --- a/.github/workflows/ci-test-e2e.yml +++ b/.github/workflows/ci-test-e2e.yml @@ -124,7 +124,7 @@ jobs: # if we are testing a PR from a fork, we need to build the docker image at this point - uses: ./.github/actions/build-docker - if: github.event.pull_request.head.repo.full_name != github.repository + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository with: CR_USER: ${{ secrets.CR_USER }} CR_PAT: ${{ secrets.CR_PAT }} From f92ffd8106a5ac4e0590d2f6a45a02c397015811 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Wed, 7 Aug 2024 13:57:21 +0000 Subject: [PATCH 08/49] Release 6.11.0-rc.5 [no ci] --- .changeset/bump-patch-1723039032546.md | 5 +++ .changeset/pre.json | 1 + apps/meteor/CHANGELOG.md | 32 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 13 ++++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 13 ++++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 13 ++++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 15 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 14 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 13 ++++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 13 ++++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 12 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 10 ++++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 10 ++++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 9 ++++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 14 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 9 ++++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 11 +++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/apps/CHANGELOG.md | 10 ++++++ packages/apps/package.json | 2 +- packages/core-services/CHANGELOG.md | 11 +++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 10 ++++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 13 ++++++++ packages/fuselage-ui-kit/package.json | 8 ++--- packages/gazzodown/CHANGELOG.md | 11 +++++++ packages/gazzodown/package.json | 6 ++-- packages/instance-status/CHANGELOG.md | 9 ++++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 9 ++++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 9 ++++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 9 ++++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 9 ++++++ packages/rest-typings/package.json | 2 +- packages/ui-avatar/CHANGELOG.md | 9 ++++++ packages/ui-avatar/package.json | 4 +-- packages/ui-client/CHANGELOG.md | 9 ++++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 11 +++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 10 ++++++ packages/ui-video-conf/package.json | 6 ++-- packages/uikit-playground/CHANGELOG.md | 11 +++++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 9 ++++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 20 ++++++------ 69 files changed, 422 insertions(+), 54 deletions(-) create mode 100644 .changeset/bump-patch-1723039032546.md diff --git a/.changeset/bump-patch-1723039032546.md b/.changeset/bump-patch-1723039032546.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1723039032546.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index aafa9a312133..85cb4dc92058 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -67,6 +67,7 @@ "bump-patch-1722559871139", "bump-patch-1722695753777", "bump-patch-1722930641296", + "bump-patch-1723039032546", "chatty-hounds-hammer", "chilled-yaks-beg", "chilly-papayas-march", diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 078f9815d55a..d54bf16c8950 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,37 @@ # @rocket.chat/meteor +## 6.11.0-rc.5 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/api-client@0.2.3-rc.5 + - @rocket.chat/license@0.2.3-rc.5 + - @rocket.chat/omnichannel-services@0.3.0-rc.5 + - @rocket.chat/pdf-worker@0.2.0-rc.5 + - @rocket.chat/presence@0.2.3-rc.5 + - @rocket.chat/apps@0.1.3-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/cron@0.1.3-rc.5 + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.5 + - @rocket.chat/gazzodown@9.0.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/ui-contexts@9.0.0-rc.5 + - @rocket.chat/server-cloud-communication@0.0.2 + - @rocket.chat/models@0.2.0-rc.5 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.5 + - @rocket.chat/ui-client@9.0.0-rc.5 + - @rocket.chat/ui-video-conf@9.0.0-rc.5 + - @rocket.chat/web-ui-registration@9.0.0-rc.5 + - @rocket.chat/instance-status@0.1.3-rc.5 +
+ ## 6.11.0-rc.4 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 2153c14b3a8b..2601b60b2c1b 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-rc.4" + "version": "6.11.0-rc.5" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index ca444eaa3555..e806d9caf013 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,18 @@ # rocketchat-services +## 1.3.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 1.3.0-rc.4 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 8c6a4ac724a1..092348a67cb6 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.3.0-rc.4", + "version": "1.3.0-rc.5", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 09d90f4d913c..58d83932357d 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.11.0-rc.4", + "version": "6.11.0-rc.5", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 330f4216c603..0a0dfedcff0b 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/account-service +## 0.4.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.4.3-rc.4 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 56bf0835b59c..f4b612c077fd 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.4.3-rc.4", + "version": "0.4.3-rc.5", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 643e846b41b6..929f843bf910 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/authorization-service +## 0.4.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.4.3-rc.4 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 58c4721655fc..595f1fdd5bbc 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.4.3-rc.4", + "version": "0.4.3-rc.5", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index c67f72caeb1d..7bd47e2f853c 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/ddp-streamer +## 0.3.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/ui-contexts@9.0.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 + - @rocket.chat/instance-status@0.1.3-rc.5 +
+ ## 0.3.3-rc.4 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index c84454c7b60c..1b32e3ae55ed 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.3.3-rc.4", + "version": "0.3.3-rc.5", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index fb9b79136b49..e395679492be 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-transcript +## 0.4.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/omnichannel-services@0.3.0-rc.5 + - @rocket.chat/pdf-worker@0.2.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.4.3-rc.4 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index c5f3d25fb306..52c240775e8c 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.4.3-rc.4", + "version": "0.4.3-rc.5", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index e0122ec3a194..5ed31278e1d3 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/presence-service +## 0.4.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/presence@0.2.3-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.4.3-rc.4 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 3764076bf94c..ead22c63d3fd 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.4.3-rc.4", + "version": "0.4.3-rc.5", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 9ca974747a19..4efe5b362673 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/queue-worker +## 0.4.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/omnichannel-services@0.3.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.4.3-rc.4 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 4bf292e31590..1722d42ebd76 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.4.3-rc.4", + "version": "0.4.3-rc.5", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 78b7c955c562..473152114851 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/stream-hub-service +## 0.4.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.4.3-rc.4 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 17fb792a1775..ed122b67d8b0 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.4.3-rc.4", + "version": "0.4.3-rc.5", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 6a287f1ff106..3e0e87b56aee 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/api-client +## 0.2.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 +
+ ## 0.2.3-rc.4 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 86ffc389412b..31ab9813d3bc 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.2.3-rc.4", + "version": "0.2.3-rc.5", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 521c7783a3b4..d9818ee3e189 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ddp-client +## 0.3.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/api-client@0.2.3-rc.5 +
+ ## 0.3.3-rc.4 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 86e982665438..56d3c57a4c41 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.3.3-rc.4", + "version": "0.3.3-rc.5", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 97e9aa3ae9fe..728b8d89303a 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 +
+ ## 0.2.3-rc.4 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index e4af3354f806..59b0d885f4f7 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.3-rc.4", + "version": "0.2.3-rc.5", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 7a40ba9b076c..4bc33af04b9d 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-services +## 0.3.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/pdf-worker@0.2.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.3.0-rc.4 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 4206404d1658..012308f1c696 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.3.0-rc.4", + "version": "0.3.0-rc.5", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index 98fbca3ceccd..bf5b6563d9b5 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/pdf-worker +## 0.2.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 +
+ ## 0.2.0-rc.4 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 3ea9b604a246..d70f6dde0eca 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.2.0-rc.4", + "version": "0.2.0-rc.5", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 4c6471b6f9b0..a82a3d553043 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/presence +## 0.2.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/core-services@0.5.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.2.3-rc.4 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 41b728e53a8d..064379c7c03f 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.3-rc.4", + "version": "0.2.3-rc.5", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 262d59132d5f..a46106df1bba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-rc.4", + "version": "6.11.0-rc.5", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index bf0477edaa36..3df4c6f71129 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/apps +## 0.1.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/model-typings@0.6.0-rc.5 +
+ ## 0.1.3-rc.4 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index c36b17380d96..bad1b5c8e744 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.3-rc.4", + "version": "0.1.3-rc.5", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index de4b332aa791..7b34a6c11c8f 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/core-services +## 0.5.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.5.0-rc.4 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 2c9bfed68b8d..55b22fe1a95a 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.5.0-rc.4", + "version": "0.5.0-rc.5", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 0babf61dace8..b7ac6f42ec60 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.11.0-rc.5 + ## 6.11.0-rc.4 ## 6.11.0-rc.3 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 1c3fb9446a71..dfd8e3e400fd 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.11.0-rc.4", + "version": "6.11.0-rc.5", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 8f40c8b0b134..14c76337fb80 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.1.3-rc.4 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 5b9939747c3f..6a7b0e67fae5 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.3-rc.4", + "version": "0.1.3-rc.5", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 6921e780af1a..8d1c933893c4 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 9.0.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/gazzodown@9.0.0-rc.5 + - @rocket.chat/ui-contexts@9.0.0-rc.5 + - @rocket.chat/ui-avatar@5.0.0-rc.5 + - @rocket.chat/ui-video-conf@9.0.0-rc.5 +
+ ## 9.0.0-rc.4 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 94ea8ef1b3b3..a57399af9c06 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "9.0.0-rc.4", + "version": "9.0.0-rc.5", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -50,10 +50,10 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.4", - "@rocket.chat/ui-contexts": "9.0.0-rc.4", + "@rocket.chat/ui-avatar": "5.0.0-rc.5", + "@rocket.chat/ui-contexts": "9.0.0-rc.5", "@rocket.chat/ui-kit": "0.36.0-rc.0", - "@rocket.chat/ui-video-conf": "9.0.0-rc.4", + "@rocket.chat/ui-video-conf": "9.0.0-rc.5", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 31b1f94d4a7f..6e12fbf9e397 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/ui-contexts@9.0.0-rc.5 + - @rocket.chat/ui-client@9.0.0-rc.5 +
+ ## 9.0.0-rc.4 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index a87e4cbcd5b9..9b50489994f6 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "9.0.0-rc.4", + "version": "9.0.0-rc.5", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -71,8 +71,8 @@ "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "0.31.29", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "9.0.0-rc.4", - "@rocket.chat/ui-contexts": "9.0.0-rc.4", + "@rocket.chat/ui-client": "9.0.0-rc.5", + "@rocket.chat/ui-contexts": "9.0.0-rc.5", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 682dbcea8eb1..8c26f579a73c 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/models@0.2.0-rc.5 +
+ ## 0.1.3-rc.4 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 7179d7d1796b..2c9ecaf3a722 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.1.3-rc.4", + "version": "0.1.3-rc.5", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 7c585e147359..e7f7edc1c056 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/livechat Change Log +## 1.19.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/gazzodown@9.0.0-rc.5 +
+ ## 1.19.0-rc.4 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 41d38e6615d5..821a01718ac6 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.19.0-rc.4", + "version": "1.19.0-rc.5", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index b3d90db0f34e..59405b347045 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/model-typings +## 0.6.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 +
+ ## 0.6.0-rc.4 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 6fe12d7a71bd..39ae3e780f1b 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.6.0-rc.4", + "version": "0.6.0-rc.5", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index aa5a88d88981..2c3e47c91ff9 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/models +## 0.2.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/model-typings@0.6.0-rc.5 +
+ ## 0.2.0-rc.4 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 3f1fd66b47d7..93e8c756c2e2 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.2.0-rc.4", + "version": "0.2.0-rc.5", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 6297a58a39ca..001fd9e8a02a 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/rest-typings +## 6.11.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 +
+ ## 6.11.0-rc.4 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 5c53c581b326..b46276fac3b6 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.11.0-rc.4", + "version": "6.11.0-rc.5", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md index 99914f95c887..b86f9eb638bc 100644 --- a/packages/ui-avatar/CHANGELOG.md +++ b/packages/ui-avatar/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-avatar +## 5.0.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.5 +
+ ## 5.0.0-rc.4 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 4d14b0db6476..0234befcea3c 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-avatar", - "version": "5.0.0-rc.4", + "version": "5.0.0-rc.5", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.4", + "@rocket.chat/ui-contexts": "9.0.0-rc.5", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index c30f8b47d1e2..c6645c87b115 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-client +## 9.0.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.5 +
+ ## 9.0.0-rc.4 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 8c11835c701a..c6eac538b93a 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "9.0.0-rc.4", + "version": "9.0.0-rc.5", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -63,7 +63,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.4", + "@rocket.chat/ui-contexts": "9.0.0-rc.5", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 7046c428ea3f..dadf6f6bd0a9 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/ui-contexts +## 9.0.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.5 + - @rocket.chat/rest-typings@6.11.0-rc.5 + - @rocket.chat/ddp-client@0.3.3-rc.5 +
+ ## 9.0.0-rc.4 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index e6f1f2cfb35d..6c052286b348 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "9.0.0-rc.4", + "version": "9.0.0-rc.5", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index adc27e661575..1e5a1996cc1d 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ui-video-conf +## 9.0.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.5 + - @rocket.chat/ui-avatar@5.0.0-rc.5 +
+ ## 9.0.0-rc.4 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index d6552cffc0db..81aadaa7319f 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "9.0.0-rc.4", + "version": "9.0.0-rc.5", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -36,8 +36,8 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.4", - "@rocket.chat/ui-contexts": "9.0.0-rc.4", + "@rocket.chat/ui-avatar": "5.0.0-rc.5", + "@rocket.chat/ui-contexts": "9.0.0-rc.5", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 582f6170dab8..1d0b28392565 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.3-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.5 + - @rocket.chat/ui-contexts@9.0.0-rc.5 + - @rocket.chat/ui-avatar@5.0.0-rc.5 +
+ ## 0.3.3-rc.4 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 3eb07bae7902..e11a51a75c98 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.3.3-rc.4", + "version": "0.3.3-rc.5", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 4f59a6ee8db4..5f3269fa0b23 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/web-ui-registration +## 9.0.0-rc.5 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.5 +
+ ## 9.0.0-rc.4 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 31f47e77466e..c14152d26df6 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "9.0.0-rc.4", + "version": "9.0.0-rc.5", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "0.2.2-rc.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.4", + "@rocket.chat/ui-contexts": "9.0.0-rc.5", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index fd83eccadf8b..915bc86734cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8968,10 +8968,10 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.3 - "@rocket.chat/ui-contexts": 9.0.0-rc.3 + "@rocket.chat/ui-avatar": 5.0.0-rc.4 + "@rocket.chat/ui-contexts": 9.0.0-rc.4 "@rocket.chat/ui-kit": 0.36.0-rc.0 - "@rocket.chat/ui-video-conf": 9.0.0-rc.3 + "@rocket.chat/ui-video-conf": 9.0.0-rc.4 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -9060,8 +9060,8 @@ __metadata: "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": 0.31.29 "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 9.0.0-rc.3 - "@rocket.chat/ui-contexts": 9.0.0-rc.3 + "@rocket.chat/ui-client": 9.0.0-rc.4 + "@rocket.chat/ui-contexts": 9.0.0-rc.4 katex: "*" react: "*" languageName: unknown @@ -10281,7 +10281,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.3 + "@rocket.chat/ui-contexts": 9.0.0-rc.4 react: ~17.0.2 languageName: unknown linkType: soft @@ -10334,7 +10334,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.3 + "@rocket.chat/ui-contexts": 9.0.0-rc.4 react: ~17.0.2 languageName: unknown linkType: soft @@ -10510,8 +10510,8 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.3 - "@rocket.chat/ui-contexts": 9.0.0-rc.3 + "@rocket.chat/ui-avatar": 5.0.0-rc.4 + "@rocket.chat/ui-contexts": 9.0.0-rc.4 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -10601,7 +10601,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": 0.2.2-rc.0 - "@rocket.chat/ui-contexts": 9.0.0-rc.3 + "@rocket.chat/ui-contexts": 9.0.0-rc.4 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From 6a7570bf82b2bc7a9f26fb66bc45dbc60808811b Mon Sep 17 00:00:00 2001 From: Abhinav Kumar Date: Thu, 8 Aug 2024 19:03:08 +0530 Subject: [PATCH 09/49] refactor: custom-emoji functions out of meteor methods (#32925) --- apps/meteor/app/api/server/v1/emoji-custom.ts | 16 +- .../server/lib/insertOrUpdateEmoji.ts | 148 ++++++++++++++++++ .../server/lib/uploadEmojiCustom.ts | 77 +++++++++ .../server/methods/insertOrUpdateEmoji.ts | 132 +--------------- .../server/methods/uploadEmojiCustom.ts | 55 +------ 5 files changed, 245 insertions(+), 183 deletions(-) create mode 100644 apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts create mode 100644 apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts diff --git a/apps/meteor/app/api/server/v1/emoji-custom.ts b/apps/meteor/app/api/server/v1/emoji-custom.ts index a61149c5e66e..9cbf202896e1 100644 --- a/apps/meteor/app/api/server/v1/emoji-custom.ts +++ b/apps/meteor/app/api/server/v1/emoji-custom.ts @@ -3,6 +3,8 @@ import { EmojiCustom } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; import { SystemLogger } from '../../../../server/lib/logger/system'; +import { insertOrUpdateEmoji } from '../../../emoji-custom/server/lib/insertOrUpdateEmoji'; +import { uploadEmojiCustomWithBuffer } from '../../../emoji-custom/server/lib/uploadEmojiCustom'; import { settings } from '../../../settings/server'; import { API } from '../api'; import { getPaginationItems } from '../helpers/getPaginationItems'; @@ -148,9 +150,19 @@ API.v1.addRoute( fields.extension = emojiToUpdate.extension; } - await Meteor.callAsync('insertOrUpdateEmoji', { ...fields, newFile }); + const emojiData = { + name: fields.name, + _id: fields._id, + aliases: fields.aliases, + extension: fields.extension, + previousName: fields.previousName, + previousExtension: fields.previousExtension, + newFile, + }; + + await insertOrUpdateEmoji(this.userId, emojiData); if (fields.newFile) { - await Meteor.callAsync('uploadEmojiCustom', fileBuffer, mimetype, { ...fields, newFile }); + await uploadEmojiCustomWithBuffer(this.userId, fileBuffer, mimetype, emojiData); } return API.v1.success(); }, diff --git a/apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts b/apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts new file mode 100644 index 000000000000..7e838baee9b0 --- /dev/null +++ b/apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts @@ -0,0 +1,148 @@ +import { api } from '@rocket.chat/core-services'; +import { EmojiCustom } from '@rocket.chat/models'; +import limax from 'limax'; +import { Meteor } from 'meteor/meteor'; +import _ from 'underscore'; + +import { trim } from '../../../../lib/utils/stringUtils'; +import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; +import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; + +type EmojiData = { + _id?: string; + name: string; + aliases: string; + extension: string; + previousName?: string; + previousExtension?: string; + newFile?: boolean; +}; + +type EmojiDataWithParsedAliases = Omit & { _id: string; aliases: string[] }; + +export async function insertOrUpdateEmoji(userId: string | null, emojiData: EmojiData): Promise { + if (!userId || !(await hasPermissionAsync(userId, 'manage-emoji'))) { + throw new Meteor.Error('not_authorized'); + } + + if (!trim(emojiData.name)) { + throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', { + method: 'insertOrUpdateEmoji', + field: 'Name', + }); + } + + emojiData.name = limax(emojiData.name, { replacement: '_' }); + emojiData.aliases = limax(emojiData.aliases, { replacement: '_' }); + + // allow all characters except colon, whitespace, comma, >, <, &, ", ', /, \, (, ) + // more practical than allowing specific sets of characters; also allows foreign languages + const nameValidation = /[\s,:><&"'\/\\\(\)]/; + const aliasValidation = /[:><&\|"'\/\\\(\)]/; + + // silently strip colon; this allows for uploading :emojiname: as emojiname + emojiData.name = emojiData.name.replace(/:/g, ''); + emojiData.aliases = emojiData.aliases.replace(/:/g, ''); + + if (nameValidation.test(emojiData.name)) { + throw new Meteor.Error('error-input-is-not-a-valid-field', `${emojiData.name} is not a valid name`, { + method: 'insertOrUpdateEmoji', + input: emojiData.name, + field: 'Name', + }); + } + + let aliases: string[] = []; + if (emojiData.aliases) { + if (aliasValidation.test(emojiData.aliases)) { + throw new Meteor.Error('error-input-is-not-a-valid-field', `${emojiData.aliases} is not a valid alias set`, { + method: 'insertOrUpdateEmoji', + input: emojiData.aliases, + field: 'Alias_Set', + }); + } + aliases = _.without(emojiData.aliases.split(/[\s,]/).filter(Boolean), emojiData.name); + } + + emojiData.extension = emojiData.extension === 'svg+xml' ? 'png' : emojiData.extension; + + let matchingResults = []; + + if (emojiData._id) { + matchingResults = await EmojiCustom.findByNameOrAliasExceptID(emojiData.name, emojiData._id).toArray(); + for await (const alias of aliases) { + matchingResults = matchingResults.concat(await EmojiCustom.findByNameOrAliasExceptID(alias, emojiData._id).toArray()); + } + } else { + matchingResults = await EmojiCustom.findByNameOrAlias(emojiData.name).toArray(); + for await (const alias of aliases) { + matchingResults = matchingResults.concat(await EmojiCustom.findByNameOrAlias(alias).toArray()); + } + } + + if (matchingResults.length > 0) { + throw new Meteor.Error('Custom_Emoji_Error_Name_Or_Alias_Already_In_Use', 'The custom emoji or one of its aliases is already in use', { + method: 'insertOrUpdateEmoji', + }); + } + + if (typeof emojiData.extension === 'undefined') { + throw new Meteor.Error('error-the-field-is-required', 'The custom emoji file is required', { + method: 'insertOrUpdateEmoji', + }); + } + + if (!emojiData._id) { + // insert emoji + const createEmoji = { + name: emojiData.name, + aliases, + extension: emojiData.extension, + }; + + const _id = (await EmojiCustom.create(createEmoji)).insertedId; + + void api.broadcast('emoji.updateCustom', createEmoji); + + return { ...emojiData, ...createEmoji, _id }; + } + + // update emoji + if (emojiData.newFile) { + await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.extension}`)); + await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.previousExtension}`)); + await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.previousName}.${emojiData.extension}`)); + await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.previousName}.${emojiData.previousExtension}`)); + + await EmojiCustom.setExtension(emojiData._id, emojiData.extension); + } else if (emojiData.name !== emojiData.previousName) { + const rs = await RocketChatFileEmojiCustomInstance.getFileWithReadStream( + encodeURIComponent(`${emojiData.previousName}.${emojiData.previousExtension}`), + ); + if (rs !== null) { + await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.extension}`)); + const ws = RocketChatFileEmojiCustomInstance.createWriteStream( + encodeURIComponent(`${emojiData.name}.${emojiData.previousExtension}`), + rs.contentType, + ); + ws.on('end', () => + RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.previousName}.${emojiData.previousExtension}`)), + ); + rs.readStream.pipe(ws); + } + } + + if (emojiData.name !== emojiData.previousName) { + await EmojiCustom.setName(emojiData._id, emojiData.name); + } + + if (emojiData.aliases) { + await EmojiCustom.setAliases(emojiData._id, aliases); + } else { + await EmojiCustom.setAliases(emojiData._id, []); + } + + void api.broadcast('emoji.updateCustom', { ...emojiData, aliases }); + + return { ...emojiData, aliases } as EmojiDataWithParsedAliases; +} diff --git a/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts b/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts new file mode 100644 index 000000000000..07633eaa1a7d --- /dev/null +++ b/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts @@ -0,0 +1,77 @@ +import { api, Media } from '@rocket.chat/core-services'; +import limax from 'limax'; +import { Meteor } from 'meteor/meteor'; +import sharp from 'sharp'; + +import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; +import { RocketChatFile } from '../../../file/server'; +import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; + +const getFile = async (file: Buffer, extension: string) => { + if (extension !== 'svg+xml') { + return file; + } + + return sharp(file).png().toBuffer(); +}; + +type EmojiData = { + _id?: string; + name: string; + aliases?: string | string[]; + extension: string; + previousName?: string; + previousExtension?: string; + newFile?: boolean; +}; + +export async function uploadEmojiCustom(userId: string | null, binaryContent: string, contentType: string, emojiData: EmojiData) { + return uploadEmojiCustomWithBuffer(userId, Buffer.from(binaryContent, 'binary'), contentType, emojiData); +} + +export async function uploadEmojiCustomWithBuffer( + userId: string | null, + buffer: Buffer, + contentType: string, + emojiData: EmojiData, +): Promise { + // technically, since this method doesnt have any datatype validations, users can + // upload videos as emojis. The FE won't play them, but they will waste space for sure. + if (!userId || !(await hasPermissionAsync(userId, 'manage-emoji'))) { + throw new Meteor.Error('not_authorized'); + } + + emojiData.name = limax(emojiData.name, { replacement: '_' }); + // delete aliases for notification purposes. here, it is a string rather than an array + delete emojiData.aliases; + + const file = await getFile(buffer, emojiData.extension); + emojiData.extension = emojiData.extension === 'svg+xml' ? 'png' : emojiData.extension; + + let fileBuffer; + // sharp doesn't support these formats without imagemagick or libvips installed + // so they will be stored as they are :( + if (['gif', 'x-icon', 'bmp', 'webm'].includes(emojiData.extension)) { + fileBuffer = file; + } else { + // This is to support the idea of having "sticker-like" emojis + const { data: resizedEmojiBuffer } = await Media.resizeFromBuffer(file, 512, 512, true, false, false, 'inside'); + fileBuffer = resizedEmojiBuffer; + } + + const rs = RocketChatFile.bufferToStream(fileBuffer); + await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.extension}`)); + + return new Promise((resolve) => { + const ws = RocketChatFileEmojiCustomInstance.createWriteStream( + encodeURIComponent(`${emojiData.name}.${emojiData.extension}`), + contentType, + ); + ws.on('end', () => { + setTimeout(() => api.broadcast('emoji.updateCustom', emojiData), 500); + resolve(); + }); + + rs.pipe(ws); + }); +} diff --git a/apps/meteor/app/emoji-custom/server/methods/insertOrUpdateEmoji.ts b/apps/meteor/app/emoji-custom/server/methods/insertOrUpdateEmoji.ts index 5d4a6742314b..1891d1b3ed95 100644 --- a/apps/meteor/app/emoji-custom/server/methods/insertOrUpdateEmoji.ts +++ b/apps/meteor/app/emoji-custom/server/methods/insertOrUpdateEmoji.ts @@ -1,13 +1,7 @@ -import { api } from '@rocket.chat/core-services'; import type { ServerMethods } from '@rocket.chat/ddp-client'; -import { EmojiCustom } from '@rocket.chat/models'; -import limax from 'limax'; import { Meteor } from 'meteor/meteor'; -import _ from 'underscore'; -import { trim } from '../../../../lib/utils/stringUtils'; -import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; -import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; +import { insertOrUpdateEmoji } from '../lib/insertOrUpdateEmoji'; declare module '@rocket.chat/ddp-client' { // eslint-disable-next-line @typescript-eslint/naming-convention @@ -26,130 +20,12 @@ declare module '@rocket.chat/ddp-client' { Meteor.methods({ async insertOrUpdateEmoji(emojiData) { - if (!this.userId || !(await hasPermissionAsync(this.userId, 'manage-emoji'))) { - throw new Meteor.Error('not_authorized'); - } - - if (!trim(emojiData.name)) { - throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', { - method: 'insertOrUpdateEmoji', - field: 'Name', - }); - } - - emojiData.name = limax(emojiData.name, { replacement: '_' }); - emojiData.aliases = limax(emojiData.aliases, { replacement: '_' }); - - // allow all characters except colon, whitespace, comma, >, <, &, ", ', /, \, (, ) - // more practical than allowing specific sets of characters; also allows foreign languages - const nameValidation = /[\s,:><&"'\/\\\(\)]/; - const aliasValidation = /[:><&\|"'\/\\\(\)]/; - - // silently strip colon; this allows for uploading :emojiname: as emojiname - emojiData.name = emojiData.name.replace(/:/g, ''); - emojiData.aliases = emojiData.aliases.replace(/:/g, ''); - - if (nameValidation.test(emojiData.name)) { - throw new Meteor.Error('error-input-is-not-a-valid-field', `${emojiData.name} is not a valid name`, { - method: 'insertOrUpdateEmoji', - input: emojiData.name, - field: 'Name', - }); - } - - let aliases: string[] = []; - if (emojiData.aliases) { - if (aliasValidation.test(emojiData.aliases)) { - throw new Meteor.Error('error-input-is-not-a-valid-field', `${emojiData.aliases} is not a valid alias set`, { - method: 'insertOrUpdateEmoji', - input: emojiData.aliases, - field: 'Alias_Set', - }); - } - aliases = _.without(emojiData.aliases.split(/[\s,]/).filter(Boolean), emojiData.name); - } - - emojiData.extension = emojiData.extension === 'svg+xml' ? 'png' : emojiData.extension; - - let matchingResults = []; - - if (emojiData._id) { - matchingResults = await EmojiCustom.findByNameOrAliasExceptID(emojiData.name, emojiData._id).toArray(); - for await (const alias of aliases) { - matchingResults = matchingResults.concat(await EmojiCustom.findByNameOrAliasExceptID(alias, emojiData._id).toArray()); - } - } else { - matchingResults = await EmojiCustom.findByNameOrAlias(emojiData.name).toArray(); - for await (const alias of aliases) { - matchingResults = matchingResults.concat(await EmojiCustom.findByNameOrAlias(alias).toArray()); - } - } - - if (matchingResults.length > 0) { - throw new Meteor.Error( - 'Custom_Emoji_Error_Name_Or_Alias_Already_In_Use', - 'The custom emoji or one of its aliases is already in use', - { method: 'insertOrUpdateEmoji' }, - ); - } - - if (typeof emojiData.extension === 'undefined') { - throw new Meteor.Error('error-the-field-is-required', 'The custom emoji file is required', { - method: 'insertOrUpdateEmoji', - }); - } + const emoji = await insertOrUpdateEmoji(this.userId, emojiData); if (!emojiData._id) { - // insert emoji - const createEmoji = { - name: emojiData.name, - aliases, - extension: emojiData.extension, - }; - - const _id = (await EmojiCustom.create(createEmoji)).insertedId; - - void api.broadcast('emoji.updateCustom', createEmoji); - - return _id; + return emoji._id; } - // update emoji - if (emojiData.newFile) { - await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.extension}`)); - await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.previousExtension}`)); - await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.previousName}.${emojiData.extension}`)); - await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.previousName}.${emojiData.previousExtension}`)); - - await EmojiCustom.setExtension(emojiData._id, emojiData.extension); - } else if (emojiData.name !== emojiData.previousName) { - const rs = await RocketChatFileEmojiCustomInstance.getFileWithReadStream( - encodeURIComponent(`${emojiData.previousName}.${emojiData.previousExtension}`), - ); - if (rs !== null) { - await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.extension}`)); - const ws = RocketChatFileEmojiCustomInstance.createWriteStream( - encodeURIComponent(`${emojiData.name}.${emojiData.previousExtension}`), - rs.contentType, - ); - ws.on('end', () => - RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.previousName}.${emojiData.previousExtension}`)), - ); - rs.readStream.pipe(ws); - } - } - - if (emojiData.name !== emojiData.previousName) { - await EmojiCustom.setName(emojiData._id, emojiData.name); - } - - if (emojiData.aliases) { - await EmojiCustom.setAliases(emojiData._id, aliases); - } else { - await EmojiCustom.setAliases(emojiData._id, []); - } - - void api.broadcast('emoji.updateCustom', emojiData); - return true; + return !!emoji; }, }); diff --git a/apps/meteor/app/emoji-custom/server/methods/uploadEmojiCustom.ts b/apps/meteor/app/emoji-custom/server/methods/uploadEmojiCustom.ts index a46f457cd70f..e387888b1311 100644 --- a/apps/meteor/app/emoji-custom/server/methods/uploadEmojiCustom.ts +++ b/apps/meteor/app/emoji-custom/server/methods/uploadEmojiCustom.ts @@ -1,20 +1,7 @@ -import { api, Media } from '@rocket.chat/core-services'; import type { ServerMethods } from '@rocket.chat/ddp-client'; -import limax from 'limax'; import { Meteor } from 'meteor/meteor'; -import sharp from 'sharp'; -import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission'; -import { RocketChatFile } from '../../../file/server'; -import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom'; - -const getFile = async (file: Buffer, extension: string) => { - if (extension !== 'svg+xml') { - return file; - } - - return sharp(file).png().toBuffer(); -}; +import { uploadEmojiCustom } from '../lib/uploadEmojiCustom'; declare module '@rocket.chat/ddp-client' { // eslint-disable-next-line @typescript-eslint/naming-convention @@ -33,44 +20,6 @@ declare module '@rocket.chat/ddp-client' { Meteor.methods({ async uploadEmojiCustom(binaryContent, contentType, emojiData) { - // technically, since this method doesnt have any datatype validations, users can - // upload videos as emojis. The FE won't play them, but they will waste space for sure. - if (!this.userId || !(await hasPermissionAsync(this.userId, 'manage-emoji'))) { - throw new Meteor.Error('not_authorized'); - } - - emojiData.name = limax(emojiData.name, { replacement: '_' }); - // delete aliases for notification purposes. here, it is a string rather than an array - delete emojiData.aliases; - - const file = await getFile(Buffer.from(binaryContent, 'binary'), emojiData.extension); - emojiData.extension = emojiData.extension === 'svg+xml' ? 'png' : emojiData.extension; - - let fileBuffer; - // sharp doesn't support these formats without imagemagick or libvips installed - // so they will be stored as they are :( - if (['gif', 'x-icon', 'bmp', 'webm'].includes(emojiData.extension)) { - fileBuffer = file; - } else { - // This is to support the idea of having "sticker-like" emojis - const { data: resizedEmojiBuffer } = await Media.resizeFromBuffer(file, 512, 512, true, false, false, 'inside'); - fileBuffer = resizedEmojiBuffer; - } - - const rs = RocketChatFile.bufferToStream(fileBuffer); - await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.extension}`)); - - return new Promise((resolve) => { - const ws = RocketChatFileEmojiCustomInstance.createWriteStream( - encodeURIComponent(`${emojiData.name}.${emojiData.extension}`), - contentType, - ); - ws.on('end', () => { - setTimeout(() => api.broadcast('emoji.updateCustom', emojiData), 500); - resolve(); - }); - - rs.pipe(ws); - }); + await uploadEmojiCustom(this.userId, binaryContent, contentType, emojiData); }, }); From b3e6d3fdaf83e0e0d3e1b17db9b821ac6670eefd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9ssica=20Souza?= Date: Thu, 8 Aug 2024 16:13:29 -0300 Subject: [PATCH 10/49] regression: fallback offline department (#33009) Co-authored-by: Guilherme Gazzo --- .../app/livechat/server/lib/QueueManager.ts | 2 +- apps/meteor/tests/data/livechat/department.ts | 21 ++++++++-- .../tests/end-to-end/api/livechat/00-rooms.ts | 39 +++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts index 2075a5e9af97..e1ea79d84163 100644 --- a/apps/meteor/app/livechat/server/lib/QueueManager.ts +++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts @@ -223,7 +223,7 @@ export class QueueManager { const name = (roomInfo?.fname as string) || guest.name || guest.username; - const room = await createLivechatRoom(rid, name, guest, roomInfo, { + const room = await createLivechatRoom(rid, name, { ...guest, ...(department && { department }) }, roomInfo, { ...extraData, ...(Boolean(customFields) && { customFields }), }); diff --git a/apps/meteor/tests/data/livechat/department.ts b/apps/meteor/tests/data/livechat/department.ts index 47d0f7f2b468..fa37e698c52c 100644 --- a/apps/meteor/tests/data/livechat/department.ts +++ b/apps/meteor/tests/data/livechat/department.ts @@ -38,7 +38,16 @@ const updateDepartment = async (departmentId: string, departmentData: Partial
  • +const createDepartmentWithMethod = ( + initialAgents: { agentId: string; username: string }[] = [], + { + allowReceiveForwardOffline = false, + fallbackForwardDepartment, + }: { + allowReceiveForwardOffline?: boolean; + fallbackForwardDepartment?: string; + } = {}, +) => new Promise((resolve, reject) => { void request .post(methodCall('livechat:saveDepartment')) @@ -56,6 +65,7 @@ const createDepartmentWithMethod = (initialAgents: { agentId: string; username: name: `new department ${Date.now()}`, description: 'created from api', allowReceiveForwardOffline, + fallbackForwardDepartment, }, initialAgents, ], @@ -126,8 +136,10 @@ export const addOrRemoveAgentFromDepartment = async ( export const createDepartmentWithAnOfflineAgent = async ({ allowReceiveForwardOffline = false, + fallbackForwardDepartment, }: { - allowReceiveForwardOffline: boolean; + allowReceiveForwardOffline?: boolean; + fallbackForwardDepartment?: string; }): Promise<{ department: ILivechatDepartment; agent: { @@ -137,7 +149,10 @@ export const createDepartmentWithAnOfflineAgent = async ({ }> => { const { user, credentials } = await createAnOfflineAgent(); - const department = (await createDepartmentWithMethod(undefined, allowReceiveForwardOffline)) as ILivechatDepartment; + const department = (await createDepartmentWithMethod(undefined, { + allowReceiveForwardOffline, + fallbackForwardDepartment, + })) as ILivechatDepartment; await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true); diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts index 23f6d35d2acd..15f983927cf3 100644 --- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts +++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts @@ -1001,6 +1001,45 @@ describe('LIVECHAT - rooms', () => { roomId = newRoom._id; visitorToken = newVisitor.token; }); + (IS_EE ? describe : describe.skip)('fallback department', () => { + let fallbackDepartment: Awaited>['department']; + let initialDepartment: Awaited>['department']; + let newVisitor: ILivechatVisitor; + let latestRoom: IOmnichannelRoom; + before(async () => { + await updateSetting('Livechat_Routing_Method', 'Auto_Selection'); + + fallbackDepartment = (await createDepartmentWithAnOnlineAgent()).department; + initialDepartment = ( + await createDepartmentWithAnOfflineAgent({ + fallbackForwardDepartment: fallbackDepartment._id, + }) + ).department; + + expect(initialDepartment.fallbackForwardDepartment).to.be.equal(fallbackDepartment._id); + }); + + after(async () => { + await Promise.all([ + deleteDepartment(fallbackDepartment._id), + deleteDepartment(initialDepartment._id), + deleteVisitor(newVisitor._id), + closeOmnichannelRoom(latestRoom._id), + ]); + }); + + it('should redirect chat to fallback department when all agents in the initial department are offline', async () => { + await updateSetting('Livechat_Routing_Method', 'Auto_Selection'); + + newVisitor = await createVisitor(initialDepartment._id); + const newRoom = await createLivechatRoom(newVisitor.token); + + latestRoom = await getLivechatRoomInfo(newRoom._id); + + expect(latestRoom).to.have.property('departmentId'); + expect(latestRoom.departmentId).to.be.equal(fallbackDepartment._id); + }); + }); (IS_EE ? it : it.skip)('system messages sent on transfer should be properly generated', async () => { const messagesList = await fetchMessages(roomId, visitorToken); From 69661b3356feb13602cd2e17e05fe0accb0e9b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9ssica=20Souza?= Date: Thu, 8 Aug 2024 16:13:29 -0300 Subject: [PATCH 11/49] regression: fallback offline department (#33009) Co-authored-by: Guilherme Gazzo --- .../app/livechat/server/lib/QueueManager.ts | 2 +- apps/meteor/tests/data/livechat/department.ts | 21 ++++++++-- .../tests/end-to-end/api/livechat/00-rooms.ts | 39 +++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts index 2075a5e9af97..e1ea79d84163 100644 --- a/apps/meteor/app/livechat/server/lib/QueueManager.ts +++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts @@ -223,7 +223,7 @@ export class QueueManager { const name = (roomInfo?.fname as string) || guest.name || guest.username; - const room = await createLivechatRoom(rid, name, guest, roomInfo, { + const room = await createLivechatRoom(rid, name, { ...guest, ...(department && { department }) }, roomInfo, { ...extraData, ...(Boolean(customFields) && { customFields }), }); diff --git a/apps/meteor/tests/data/livechat/department.ts b/apps/meteor/tests/data/livechat/department.ts index 47d0f7f2b468..fa37e698c52c 100644 --- a/apps/meteor/tests/data/livechat/department.ts +++ b/apps/meteor/tests/data/livechat/department.ts @@ -38,7 +38,16 @@ const updateDepartment = async (departmentId: string, departmentData: Partial
  • +const createDepartmentWithMethod = ( + initialAgents: { agentId: string; username: string }[] = [], + { + allowReceiveForwardOffline = false, + fallbackForwardDepartment, + }: { + allowReceiveForwardOffline?: boolean; + fallbackForwardDepartment?: string; + } = {}, +) => new Promise((resolve, reject) => { void request .post(methodCall('livechat:saveDepartment')) @@ -56,6 +65,7 @@ const createDepartmentWithMethod = (initialAgents: { agentId: string; username: name: `new department ${Date.now()}`, description: 'created from api', allowReceiveForwardOffline, + fallbackForwardDepartment, }, initialAgents, ], @@ -126,8 +136,10 @@ export const addOrRemoveAgentFromDepartment = async ( export const createDepartmentWithAnOfflineAgent = async ({ allowReceiveForwardOffline = false, + fallbackForwardDepartment, }: { - allowReceiveForwardOffline: boolean; + allowReceiveForwardOffline?: boolean; + fallbackForwardDepartment?: string; }): Promise<{ department: ILivechatDepartment; agent: { @@ -137,7 +149,10 @@ export const createDepartmentWithAnOfflineAgent = async ({ }> => { const { user, credentials } = await createAnOfflineAgent(); - const department = (await createDepartmentWithMethod(undefined, allowReceiveForwardOffline)) as ILivechatDepartment; + const department = (await createDepartmentWithMethod(undefined, { + allowReceiveForwardOffline, + fallbackForwardDepartment, + })) as ILivechatDepartment; await addOrRemoveAgentFromDepartment(department._id, { agentId: user._id, username: user.username }, true); diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts index 23f6d35d2acd..15f983927cf3 100644 --- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts +++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts @@ -1001,6 +1001,45 @@ describe('LIVECHAT - rooms', () => { roomId = newRoom._id; visitorToken = newVisitor.token; }); + (IS_EE ? describe : describe.skip)('fallback department', () => { + let fallbackDepartment: Awaited>['department']; + let initialDepartment: Awaited>['department']; + let newVisitor: ILivechatVisitor; + let latestRoom: IOmnichannelRoom; + before(async () => { + await updateSetting('Livechat_Routing_Method', 'Auto_Selection'); + + fallbackDepartment = (await createDepartmentWithAnOnlineAgent()).department; + initialDepartment = ( + await createDepartmentWithAnOfflineAgent({ + fallbackForwardDepartment: fallbackDepartment._id, + }) + ).department; + + expect(initialDepartment.fallbackForwardDepartment).to.be.equal(fallbackDepartment._id); + }); + + after(async () => { + await Promise.all([ + deleteDepartment(fallbackDepartment._id), + deleteDepartment(initialDepartment._id), + deleteVisitor(newVisitor._id), + closeOmnichannelRoom(latestRoom._id), + ]); + }); + + it('should redirect chat to fallback department when all agents in the initial department are offline', async () => { + await updateSetting('Livechat_Routing_Method', 'Auto_Selection'); + + newVisitor = await createVisitor(initialDepartment._id); + const newRoom = await createLivechatRoom(newVisitor.token); + + latestRoom = await getLivechatRoomInfo(newRoom._id); + + expect(latestRoom).to.have.property('departmentId'); + expect(latestRoom.departmentId).to.be.equal(fallbackDepartment._id); + }); + }); (IS_EE ? it : it.skip)('system messages sent on transfer should be properly generated', async () => { const messagesList = await fetchMessages(roomId, visitorToken); From 7b35d122e02256cca1f71fd3328fee9044450530 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Thu, 8 Aug 2024 21:10:50 +0000 Subject: [PATCH 12/49] Release 6.11.0-rc.6 [no ci] --- .changeset/bump-patch-1723151441289.md | 5 +++ .changeset/pre.json | 1 + apps/meteor/CHANGELOG.md | 32 +++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 13 ++++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 13 ++++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 13 ++++++++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 15 +++++++++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 14 ++++++++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 13 ++++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 13 ++++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 12 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 10 ++++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 10 ++++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 9 ++++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 14 ++++++++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 9 ++++++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 11 +++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/apps/CHANGELOG.md | 10 ++++++ packages/apps/package.json | 2 +- packages/core-services/CHANGELOG.md | 11 +++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 2 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 10 ++++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 13 ++++++++ packages/fuselage-ui-kit/package.json | 8 ++--- packages/gazzodown/CHANGELOG.md | 11 +++++++ packages/gazzodown/package.json | 6 ++-- packages/instance-status/CHANGELOG.md | 9 ++++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 9 ++++++ packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 9 ++++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 9 ++++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 9 ++++++ packages/rest-typings/package.json | 2 +- packages/ui-avatar/CHANGELOG.md | 9 ++++++ packages/ui-avatar/package.json | 4 +-- packages/ui-client/CHANGELOG.md | 9 ++++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 11 +++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 10 ++++++ packages/ui-video-conf/package.json | 6 ++-- packages/uikit-playground/CHANGELOG.md | 11 +++++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 9 ++++++ packages/web-ui-registration/package.json | 4 +-- yarn.lock | 20 ++++++------ 69 files changed, 422 insertions(+), 54 deletions(-) create mode 100644 .changeset/bump-patch-1723151441289.md diff --git a/.changeset/bump-patch-1723151441289.md b/.changeset/bump-patch-1723151441289.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1723151441289.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/.changeset/pre.json b/.changeset/pre.json index 85cb4dc92058..40c93f4a63bd 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -68,6 +68,7 @@ "bump-patch-1722695753777", "bump-patch-1722930641296", "bump-patch-1723039032546", + "bump-patch-1723151441289", "chatty-hounds-hammer", "chilled-yaks-beg", "chilly-papayas-march", diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index d54bf16c8950..4f6de9c113b7 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,37 @@ # @rocket.chat/meteor +## 6.11.0-rc.6 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/api-client@0.2.3-rc.6 + - @rocket.chat/license@0.2.3-rc.6 + - @rocket.chat/omnichannel-services@0.3.0-rc.6 + - @rocket.chat/pdf-worker@0.2.0-rc.6 + - @rocket.chat/presence@0.2.3-rc.6 + - @rocket.chat/apps@0.1.3-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/cron@0.1.3-rc.6 + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.6 + - @rocket.chat/gazzodown@9.0.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/ui-contexts@9.0.0-rc.6 + - @rocket.chat/server-cloud-communication@0.0.2 + - @rocket.chat/models@0.2.0-rc.6 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.6 + - @rocket.chat/ui-client@9.0.0-rc.6 + - @rocket.chat/ui-video-conf@9.0.0-rc.6 + - @rocket.chat/web-ui-registration@9.0.0-rc.6 + - @rocket.chat/instance-status@0.1.3-rc.6 +
    + ## 6.11.0-rc.5 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 2601b60b2c1b..7cad52f21bcf 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-rc.5" + "version": "6.11.0-rc.6" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index e806d9caf013..11f7b666b209 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,18 @@ # rocketchat-services +## 1.3.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 1.3.0-rc.5 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 092348a67cb6..b71c10fd8896 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.3.0-rc.5", + "version": "1.3.0-rc.6", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 58d83932357d..987bb6d0e8ae 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.11.0-rc.5", + "version": "6.11.0-rc.6", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 0a0dfedcff0b..39c07917ca0d 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/account-service +## 0.4.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.4.3-rc.5 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index f4b612c077fd..bd2151f7365d 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.4.3-rc.5", + "version": "0.4.3-rc.6", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index 929f843bf910..a6b00c517a60 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/authorization-service +## 0.4.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.4.3-rc.5 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 595f1fdd5bbc..1a7a06b4f676 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.4.3-rc.5", + "version": "0.4.3-rc.6", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 7bd47e2f853c..09b01e7d4e82 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/ddp-streamer +## 0.3.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/ui-contexts@9.0.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 + - @rocket.chat/instance-status@0.1.3-rc.6 +
    + ## 0.3.3-rc.5 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 1b32e3ae55ed..dab52321a529 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.3.3-rc.5", + "version": "0.3.3-rc.6", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index e395679492be..7fd07c8efc1c 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-transcript +## 0.4.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/omnichannel-services@0.3.0-rc.6 + - @rocket.chat/pdf-worker@0.2.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.4.3-rc.5 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 52c240775e8c..a81c0514bd13 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.4.3-rc.5", + "version": "0.4.3-rc.6", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index 5ed31278e1d3..c15f14a8e5c9 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/presence-service +## 0.4.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/presence@0.2.3-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.4.3-rc.5 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index ead22c63d3fd..5524e56fac78 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.4.3-rc.5", + "version": "0.4.3-rc.6", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 4efe5b362673..69651cb85815 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/queue-worker +## 0.4.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/omnichannel-services@0.3.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.4.3-rc.5 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 1722d42ebd76..5736d2e844e8 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.4.3-rc.5", + "version": "0.4.3-rc.6", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 473152114851..349f0b880bd3 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/stream-hub-service +## 0.4.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.4.3-rc.5 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index ed122b67d8b0..e6c691d84808 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.4.3-rc.5", + "version": "0.4.3-rc.6", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 3e0e87b56aee..0c5c60a0037e 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/api-client +## 0.2.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 +
    + ## 0.2.3-rc.5 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 31ab9813d3bc..47f08fc2a8dc 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.2.3-rc.5", + "version": "0.2.3-rc.6", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index d9818ee3e189..8373c34e68f5 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ddp-client +## 0.3.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/api-client@0.2.3-rc.6 +
    + ## 0.3.3-rc.5 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 56d3c57a4c41..360a9dd0310c 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.3.3-rc.5", + "version": "0.3.3-rc.6", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index 728b8d89303a..e392640bbb7e 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 +
    + ## 0.2.3-rc.5 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 59b0d885f4f7..8519855ebd95 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.3-rc.5", + "version": "0.2.3-rc.6", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 4bc33af04b9d..450e59cd8be7 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-services +## 0.3.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/pdf-worker@0.2.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.3.0-rc.5 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 012308f1c696..85e5b603ea2b 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.3.0-rc.5", + "version": "0.3.0-rc.6", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index bf5b6563d9b5..b364e4a63e0a 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/pdf-worker +## 0.2.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 +
    + ## 0.2.0-rc.5 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index d70f6dde0eca..477332ee758e 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.2.0-rc.5", + "version": "0.2.0-rc.6", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index a82a3d553043..6fbf30218412 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/presence +## 0.2.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/core-services@0.5.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.2.3-rc.5 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 064379c7c03f..23fad94358ab 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.3-rc.5", + "version": "0.2.3-rc.6", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index a46106df1bba..1ba4bee9cd00 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-rc.5", + "version": "6.11.0-rc.6", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index 3df4c6f71129..ef2945f61a06 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/apps +## 0.1.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/model-typings@0.6.0-rc.6 +
    + ## 0.1.3-rc.5 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index bad1b5c8e744..d5c77c6fb437 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.3-rc.5", + "version": "0.1.3-rc.6", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 7b34a6c11c8f..7d54840e776f 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/core-services +## 0.5.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.5.0-rc.5 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 55b22fe1a95a..f080fa831330 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.5.0-rc.5", + "version": "0.5.0-rc.6", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index b7ac6f42ec60..336cabeecb50 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,7 @@ # @rocket.chat/core-typings +## 6.11.0-rc.6 + ## 6.11.0-rc.5 ## 6.11.0-rc.4 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index dfd8e3e400fd..7d1f623e0ca6 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.11.0-rc.5", + "version": "6.11.0-rc.6", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 14c76337fb80..392dbc2295e1 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.1.3-rc.5 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 6a7b0e67fae5..33fa83dcc2cf 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.3-rc.5", + "version": "0.1.3-rc.6", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 8d1c933893c4..8682786bb507 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,18 @@ # Change Log +## 9.0.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/gazzodown@9.0.0-rc.6 + - @rocket.chat/ui-contexts@9.0.0-rc.6 + - @rocket.chat/ui-avatar@5.0.0-rc.6 + - @rocket.chat/ui-video-conf@9.0.0-rc.6 +
    + ## 9.0.0-rc.5 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index a57399af9c06..a8c88afef7fc 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "9.0.0-rc.5", + "version": "9.0.0-rc.6", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -50,10 +50,10 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.5", - "@rocket.chat/ui-contexts": "9.0.0-rc.5", + "@rocket.chat/ui-avatar": "5.0.0-rc.6", + "@rocket.chat/ui-contexts": "9.0.0-rc.6", "@rocket.chat/ui-kit": "0.36.0-rc.0", - "@rocket.chat/ui-video-conf": "9.0.0-rc.5", + "@rocket.chat/ui-video-conf": "9.0.0-rc.6", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 6e12fbf9e397..49d8dca2d4c3 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/ui-contexts@9.0.0-rc.6 + - @rocket.chat/ui-client@9.0.0-rc.6 +
    + ## 9.0.0-rc.5 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 9b50489994f6..9aa4e2bcb3b7 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "9.0.0-rc.5", + "version": "9.0.0-rc.6", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -71,8 +71,8 @@ "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "0.31.29", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "9.0.0-rc.5", - "@rocket.chat/ui-contexts": "9.0.0-rc.5", + "@rocket.chat/ui-client": "9.0.0-rc.6", + "@rocket.chat/ui-contexts": "9.0.0-rc.6", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 8c26f579a73c..cef814c2e0af 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/models@0.2.0-rc.6 +
    + ## 0.1.3-rc.5 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 2c9ecaf3a722..2e7fdf85eb0f 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.1.3-rc.5", + "version": "0.1.3-rc.6", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index e7f7edc1c056..6e05f79aae23 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/livechat Change Log +## 1.19.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/gazzodown@9.0.0-rc.6 +
    + ## 1.19.0-rc.5 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 821a01718ac6..69cd58c02a7d 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.19.0-rc.5", + "version": "1.19.0-rc.6", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 59405b347045..e98280bb2ab4 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/model-typings +## 0.6.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 +
    + ## 0.6.0-rc.5 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 39ae3e780f1b..ec56fa0ce934 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.6.0-rc.5", + "version": "0.6.0-rc.6", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 2c3e47c91ff9..9ec03b0ebcc4 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/models +## 0.2.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/model-typings@0.6.0-rc.6 +
    + ## 0.2.0-rc.5 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 93e8c756c2e2..f2499f2ec3e9 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.2.0-rc.5", + "version": "0.2.0-rc.6", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 001fd9e8a02a..8b0ce9785ab3 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/rest-typings +## 6.11.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 +
    + ## 6.11.0-rc.5 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index b46276fac3b6..7758c3a8ab29 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.11.0-rc.5", + "version": "6.11.0-rc.6", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md index b86f9eb638bc..dfb74baecb42 100644 --- a/packages/ui-avatar/CHANGELOG.md +++ b/packages/ui-avatar/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-avatar +## 5.0.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.6 +
    + ## 5.0.0-rc.5 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 0234befcea3c..9447c998fdb6 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-avatar", - "version": "5.0.0-rc.5", + "version": "5.0.0-rc.6", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.5", + "@rocket.chat/ui-contexts": "9.0.0-rc.6", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index c6645c87b115..a62090a288c2 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-client +## 9.0.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.6 +
    + ## 9.0.0-rc.5 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index c6eac538b93a..6e4a10ed99c8 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "9.0.0-rc.5", + "version": "9.0.0-rc.6", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -63,7 +63,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.5", + "@rocket.chat/ui-contexts": "9.0.0-rc.6", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index dadf6f6bd0a9..37511c6a9a60 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/ui-contexts +## 9.0.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.6 + - @rocket.chat/rest-typings@6.11.0-rc.6 + - @rocket.chat/ddp-client@0.3.3-rc.6 +
    + ## 9.0.0-rc.5 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 6c052286b348..0cd54ccb2f58 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "9.0.0-rc.5", + "version": "9.0.0-rc.6", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 1e5a1996cc1d..5188c9080a09 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ui-video-conf +## 9.0.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.6 + - @rocket.chat/ui-avatar@5.0.0-rc.6 +
    + ## 9.0.0-rc.5 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 81aadaa7319f..73e711d2fced 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "9.0.0-rc.5", + "version": "9.0.0-rc.6", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -36,8 +36,8 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.5", - "@rocket.chat/ui-contexts": "9.0.0-rc.5", + "@rocket.chat/ui-avatar": "5.0.0-rc.6", + "@rocket.chat/ui-contexts": "9.0.0-rc.6", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 1d0b28392565..65d60ad02088 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.3-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.6 + - @rocket.chat/ui-contexts@9.0.0-rc.6 + - @rocket.chat/ui-avatar@5.0.0-rc.6 +
    + ## 0.3.3-rc.5 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index e11a51a75c98..4851578db635 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.3.3-rc.5", + "version": "0.3.3-rc.6", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 5f3269fa0b23..1a5ffb63c1a8 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/web-ui-registration +## 9.0.0-rc.6 + +### Patch Changes + +-
    Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.6 +
    + ## 9.0.0-rc.5 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index c14152d26df6..3136f8188f83 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "9.0.0-rc.5", + "version": "9.0.0-rc.6", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "0.2.2-rc.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.5", + "@rocket.chat/ui-contexts": "9.0.0-rc.6", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 915bc86734cd..6240d50dc134 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8968,10 +8968,10 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.4 - "@rocket.chat/ui-contexts": 9.0.0-rc.4 + "@rocket.chat/ui-avatar": 5.0.0-rc.5 + "@rocket.chat/ui-contexts": 9.0.0-rc.5 "@rocket.chat/ui-kit": 0.36.0-rc.0 - "@rocket.chat/ui-video-conf": 9.0.0-rc.4 + "@rocket.chat/ui-video-conf": 9.0.0-rc.5 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -9060,8 +9060,8 @@ __metadata: "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": 0.31.29 "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 9.0.0-rc.4 - "@rocket.chat/ui-contexts": 9.0.0-rc.4 + "@rocket.chat/ui-client": 9.0.0-rc.5 + "@rocket.chat/ui-contexts": 9.0.0-rc.5 katex: "*" react: "*" languageName: unknown @@ -10281,7 +10281,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.4 + "@rocket.chat/ui-contexts": 9.0.0-rc.5 react: ~17.0.2 languageName: unknown linkType: soft @@ -10334,7 +10334,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.4 + "@rocket.chat/ui-contexts": 9.0.0-rc.5 react: ~17.0.2 languageName: unknown linkType: soft @@ -10510,8 +10510,8 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.4 - "@rocket.chat/ui-contexts": 9.0.0-rc.4 + "@rocket.chat/ui-avatar": 5.0.0-rc.5 + "@rocket.chat/ui-contexts": 9.0.0-rc.5 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -10601,7 +10601,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": 0.2.2-rc.0 - "@rocket.chat/ui-contexts": 9.0.0-rc.4 + "@rocket.chat/ui-contexts": 9.0.0-rc.5 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From cab4ceb3893320be0acb05c5a34bc66d375eb6c9 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 9 Aug 2024 09:38:14 -0300 Subject: [PATCH 13/49] chore(models): Filter update accumulator (#33018) --- packages/model-typings/src/updater.ts | 7 +++++-- packages/models/src/updater.spec.ts | 18 +++++++++++++++++- packages/models/src/updater.ts | 4 ++-- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/model-typings/src/updater.ts b/packages/model-typings/src/updater.ts index 33ec78f4b86b..fe8354479c1f 100644 --- a/packages/model-typings/src/updater.ts +++ b/packages/model-typings/src/updater.ts @@ -1,15 +1,18 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import type { Join, NestedPaths, PropertyType, ArrayElement, NestedPathsOfType, Filter } from 'mongodb'; +import type { Join, NestedPaths, PropertyType, ArrayElement, NestedPathsOfType, Filter, UpdateFilter } from 'mongodb'; export interface Updater { set

    , K extends keyof P>(key: K, value: P[K]): Updater; unset>(key: K): Updater; inc>(key: K, value: number): Updater; - addToSet>(key: K, value: AddToSetProps[K]): Updater; + addToSet>(key: K, value: ArrayElementType[K]>): Updater; persist(query: Filter): Promise; hasChanges(): boolean; + getUpdateFilter(): UpdateFilter; } +type ArrayElementType = T extends (infer E)[] ? E : T; + export type SetProps = Readonly< { [Property in Join, '.'>]: PropertyType; diff --git a/packages/models/src/updater.spec.ts b/packages/models/src/updater.spec.ts index 4decc57d7c3b..ae75400bd9ee 100644 --- a/packages/models/src/updater.spec.ts +++ b/packages/models/src/updater.spec.ts @@ -1,3 +1,5 @@ +import type { IOmnichannelRoom } from '@rocket.chat/core-typings'; + import { UpdaterImpl } from './updater'; test('updater typings', () => { @@ -15,6 +17,20 @@ test('updater typings', () => { e: string[]; }>({} as any); + const omnichannel = new UpdaterImpl({} as any); + omnichannel.addToSet('v.activity', 'asd'); + // @ts-expect-error + omnichannel.addToSet('v.activity', 1); + // @ts-expect-error + omnichannel.addToSet('v.activity', { + asdas: 1, + }); + + // @ts-expect-error + omnichannel.addToSet('v.activity.asd', { + asdas: 1, + }); + updater.addToSet('e', 'a'); // @ts-expect-error @@ -160,7 +176,7 @@ test('it should add items to array', async () => { { _id: 'test', }, - { $addToSet: { $each: { a: ['b', 'c'] } } }, + { $addToSet: { a: { $each: ['b', 'c'] } } }, ); }); diff --git a/packages/models/src/updater.ts b/packages/models/src/updater.ts index ef163ea09e40..361e228e65ac 100644 --- a/packages/models/src/updater.ts +++ b/packages/models/src/updater.ts @@ -71,12 +71,12 @@ export class UpdaterImpl implements Updater { return Object.keys(this.getUpdateFilter()).length > 0; } - private getUpdateFilter() { + getUpdateFilter() { return { ...(this._set && { $set: Object.fromEntries(this._set) }), ...(this._unset && { $unset: Object.fromEntries([...this._unset.values()].map((k) => [k, 1])) }), ...(this._inc && { $inc: Object.fromEntries(this._inc) }), - ...(this._addToSet && { $addToSet: { $each: Object.fromEntries(this._addToSet) } }), + ...(this._addToSet && { $addToSet: Object.fromEntries([...this._addToSet.entries()].map(([k, v]) => [k, { $each: v }])) }), } as unknown as UpdateFilter; } } From 7fc1d3e7639696c631455b0e1221e4aa9ec0ca6c Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 9 Aug 2024 09:42:21 -0300 Subject: [PATCH 14/49] chore: create getVisitorActiveForPeriodUpdateQuery (#33017) --- .../app/livechat/server/hooks/markRoomResponded.ts | 6 ++---- apps/meteor/server/models/raw/LivechatRooms.ts | 13 ++++++------- .../model-typings/src/models/ILivechatRoomsModel.ts | 1 + 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts b/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts index d9c539182b06..69e9b11c57b9 100644 --- a/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts +++ b/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts @@ -25,10 +25,8 @@ export async function markRoomResponded( } if (!room.v?.activity?.includes(monthYear)) { - const [, livechatInquiry] = await Promise.all([ - LivechatRooms.markVisitorActiveForPeriod(room._id, monthYear), - LivechatInquiry.markInquiryActiveForPeriod(room._id, monthYear), - ]); + LivechatRooms.getVisitorActiveForPeriodUpdateQuery(monthYear, roomUpdater); + const livechatInquiry = await LivechatInquiry.markInquiryActiveForPeriod(room._id, monthYear); if (livechatInquiry) { void notifyOnLivechatInquiryChanged(livechatInquiry, 'updated', { v: livechatInquiry.v }); diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts index a5e32133e773..f3ddb73a7b92 100644 --- a/apps/meteor/server/models/raw/LivechatRooms.ts +++ b/apps/meteor/server/models/raw/LivechatRooms.ts @@ -2435,18 +2435,17 @@ export class LivechatRoomsRaw extends BaseRaw implements ILive return this.updateOne(query, update); } + getVisitorActiveForPeriodUpdateQuery(period: string, updater: Updater = this.getUpdater()): Updater { + return updater.addToSet('v.activity', period); + } + markVisitorActiveForPeriod(rid: string, period: string): Promise { const query = { _id: rid, }; + const updater = this.getVisitorActiveForPeriodUpdateQuery(period); - const update = { - $addToSet: { - 'v.activity': period, - }, - }; - - return this.updateOne(query, update); + return this.updateOne(query, updater.getUpdateFilter()); } async getMACStatisticsForPeriod(period: string): Promise { diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts index 05c00e44951f..a6ed74d0b19a 100644 --- a/packages/model-typings/src/models/ILivechatRoomsModel.ts +++ b/packages/model-typings/src/models/ILivechatRoomsModel.ts @@ -252,6 +252,7 @@ export interface ILivechatRoomsModel extends IBaseModel { changeVisitorByRoomId(roomId: string, visitor: { _id: string; username: string; token: string }): Promise; unarchiveOneById(roomId: string): Promise; markVisitorActiveForPeriod(rid: string, period: string): Promise; + getVisitorActiveForPeriodUpdateQuery(period: string, updater?: Updater): Updater; getMACStatisticsForPeriod(period: string): Promise; getMACStatisticsBetweenDates(start: Date, end: Date): Promise; } From 640d569eeb0ea4e46b8525b84b27d56fab661a41 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 9 Aug 2024 13:47:49 +0000 Subject: [PATCH 15/49] Release 6.11.0 [no ci] --- .changeset/afraid-guests-jog.md | 6 - .changeset/bump-patch-1722087664914.md | 5 - .changeset/bump-patch-1722559871139.md | 5 - .changeset/bump-patch-1722695753777.md | 5 - .changeset/bump-patch-1722930641296.md | 5 - .changeset/bump-patch-1723039032546.md | 5 - .changeset/bump-patch-1723151441289.md | 5 - .changeset/chatty-hounds-hammer.md | 6 - .changeset/chilled-yaks-beg.md | 5 - .changeset/chilly-papayas-march.md | 5 - .changeset/cuddly-brooms-approve.md | 6 - .changeset/dry-pumas-draw.md | 6 - .changeset/empty-readers-teach.md | 8 - .changeset/fast-buttons-shake.md | 5 - .changeset/funny-snails-promise.md | 10 -- .changeset/funny-wolves-tie.md | 5 - .changeset/grumpy-worms-appear.md | 5 - .changeset/happy-peaches-nail.md | 5 - .changeset/hip-queens-taste.md | 5 - .changeset/hungry-wombats-act.md | 5 - .changeset/large-vans-attack.md | 5 - .changeset/lucky-beds-glow.md | 7 - .changeset/lucky-countries-look.md | 5 - .changeset/many-tables-love.md | 6 - .changeset/mean-hairs-move.md | 5 - .changeset/nervous-rockets-impress.md | 5 - .changeset/new-balloons-speak.md | 5 - .changeset/new-scissors-love.md | 12 -- .changeset/nice-laws-eat.md | 15 -- .changeset/perfect-coins-camp.md | 5 - .changeset/polite-foxes-repair.md | 5 - .changeset/popular-trees-lay.md | 5 - .changeset/pre.json | 118 --------------- .changeset/proud-waves-bathe.md | 6 - .changeset/quick-ducks-live.md | 5 - .changeset/rare-penguins-hope.md | 6 - .changeset/red-numbers-happen.md | 5 - .changeset/red-vans-shave.md | 5 - .changeset/rich-carpets-brush.md | 5 - .changeset/rotten-eggs-end.md | 7 - .changeset/selfish-emus-sing.md | 6 - .changeset/shaggy-hats-raise.md | 5 - .changeset/sixty-nails-clean.md | 5 - .changeset/smooth-lobsters-flash.md | 5 - .changeset/soft-donkeys-thank.md | 8 - .changeset/sour-forks-breathe.md | 5 - .changeset/thin-windows-reply.md | 5 - .changeset/violet-brooms-press.md | 5 - .changeset/weak-insects-sort.md | 5 - .changeset/weak-pets-talk.md | 7 - .changeset/weak-taxis-design.md | 5 - .changeset/weak-tigers-suffer.md | 7 - .changeset/witty-bats-develop.md | 13 -- apps/meteor/CHANGELOG.md | 143 ++++++++++++++++++ apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 21 +++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 16 ++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 13 ++ ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 17 +++ ee/apps/ddp-streamer/package.json | 2 +- ee/apps/omnichannel-transcript/CHANGELOG.md | 15 ++ ee/apps/omnichannel-transcript/package.json | 2 +- ee/apps/presence-service/CHANGELOG.md | 13 ++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 13 ++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 12 ++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 10 ++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 10 ++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 9 ++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 23 +++ ee/packages/omnichannel-services/package.json | 2 +- ee/packages/pdf-worker/CHANGELOG.md | 15 ++ ee/packages/pdf-worker/package.json | 2 +- ee/packages/presence/CHANGELOG.md | 13 ++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/apps/CHANGELOG.md | 12 ++ packages/apps/package.json | 2 +- packages/core-services/CHANGELOG.md | 25 +++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 18 +++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 10 ++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 18 +++ packages/fuselage-ui-kit/package.json | 10 +- packages/gazzodown/CHANGELOG.md | 11 ++ packages/gazzodown/package.json | 6 +- packages/i18n/CHANGELOG.md | 22 +++ packages/i18n/package.json | 2 +- packages/instance-status/CHANGELOG.md | 9 ++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 20 +++ packages/livechat/package.json | 2 +- packages/mock-providers/CHANGELOG.md | 11 ++ packages/mock-providers/package.json | 2 +- packages/model-typings/CHANGELOG.md | 23 +++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 14 ++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 16 ++ packages/rest-typings/package.json | 2 +- packages/tools/CHANGELOG.md | 7 + packages/tools/package.json | 2 +- packages/ui-avatar/CHANGELOG.md | 9 ++ packages/ui-avatar/package.json | 4 +- packages/ui-client/CHANGELOG.md | 15 ++ packages/ui-client/package.json | 4 +- packages/ui-contexts/CHANGELOG.md | 19 +++ packages/ui-contexts/package.json | 2 +- packages/ui-kit/CHANGELOG.md | 7 + packages/ui-kit/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 15 ++ packages/ui-video-conf/package.json | 6 +- packages/uikit-playground/CHANGELOG.md | 11 ++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 12 ++ packages/web-ui-registration/package.json | 6 +- yarn.lock | 20 +-- 128 files changed, 707 insertions(+), 490 deletions(-) delete mode 100644 .changeset/afraid-guests-jog.md delete mode 100644 .changeset/bump-patch-1722087664914.md delete mode 100644 .changeset/bump-patch-1722559871139.md delete mode 100644 .changeset/bump-patch-1722695753777.md delete mode 100644 .changeset/bump-patch-1722930641296.md delete mode 100644 .changeset/bump-patch-1723039032546.md delete mode 100644 .changeset/bump-patch-1723151441289.md delete mode 100644 .changeset/chatty-hounds-hammer.md delete mode 100644 .changeset/chilled-yaks-beg.md delete mode 100644 .changeset/chilly-papayas-march.md delete mode 100644 .changeset/cuddly-brooms-approve.md delete mode 100644 .changeset/dry-pumas-draw.md delete mode 100644 .changeset/empty-readers-teach.md delete mode 100644 .changeset/fast-buttons-shake.md delete mode 100644 .changeset/funny-snails-promise.md delete mode 100644 .changeset/funny-wolves-tie.md delete mode 100644 .changeset/grumpy-worms-appear.md delete mode 100644 .changeset/happy-peaches-nail.md delete mode 100644 .changeset/hip-queens-taste.md delete mode 100644 .changeset/hungry-wombats-act.md delete mode 100644 .changeset/large-vans-attack.md delete mode 100644 .changeset/lucky-beds-glow.md delete mode 100644 .changeset/lucky-countries-look.md delete mode 100644 .changeset/many-tables-love.md delete mode 100644 .changeset/mean-hairs-move.md delete mode 100644 .changeset/nervous-rockets-impress.md delete mode 100644 .changeset/new-balloons-speak.md delete mode 100644 .changeset/new-scissors-love.md delete mode 100644 .changeset/nice-laws-eat.md delete mode 100644 .changeset/perfect-coins-camp.md delete mode 100644 .changeset/polite-foxes-repair.md delete mode 100644 .changeset/popular-trees-lay.md delete mode 100644 .changeset/pre.json delete mode 100644 .changeset/proud-waves-bathe.md delete mode 100644 .changeset/quick-ducks-live.md delete mode 100644 .changeset/rare-penguins-hope.md delete mode 100644 .changeset/red-numbers-happen.md delete mode 100644 .changeset/red-vans-shave.md delete mode 100644 .changeset/rich-carpets-brush.md delete mode 100644 .changeset/rotten-eggs-end.md delete mode 100644 .changeset/selfish-emus-sing.md delete mode 100644 .changeset/shaggy-hats-raise.md delete mode 100644 .changeset/sixty-nails-clean.md delete mode 100644 .changeset/smooth-lobsters-flash.md delete mode 100644 .changeset/soft-donkeys-thank.md delete mode 100644 .changeset/sour-forks-breathe.md delete mode 100644 .changeset/thin-windows-reply.md delete mode 100644 .changeset/violet-brooms-press.md delete mode 100644 .changeset/weak-insects-sort.md delete mode 100644 .changeset/weak-pets-talk.md delete mode 100644 .changeset/weak-taxis-design.md delete mode 100644 .changeset/weak-tigers-suffer.md delete mode 100644 .changeset/witty-bats-develop.md diff --git a/.changeset/afraid-guests-jog.md b/.changeset/afraid-guests-jog.md deleted file mode 100644 index 420b9bb5d329..000000000000 --- a/.changeset/afraid-guests-jog.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/livechat": minor ---- - -Created a `transferChat` Livechat API endpoint for transferring chats programmatically, the endpoint has all the limitations & permissions required that transferring via UI has diff --git a/.changeset/bump-patch-1722087664914.md b/.changeset/bump-patch-1722087664914.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1722087664914.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1722559871139.md b/.changeset/bump-patch-1722559871139.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1722559871139.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1722695753777.md b/.changeset/bump-patch-1722695753777.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1722695753777.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1722930641296.md b/.changeset/bump-patch-1722930641296.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1722930641296.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1723039032546.md b/.changeset/bump-patch-1723039032546.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1723039032546.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/bump-patch-1723151441289.md b/.changeset/bump-patch-1723151441289.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1723151441289.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/chatty-hounds-hammer.md b/.changeset/chatty-hounds-hammer.md deleted file mode 100644 index 1a2d3a7de559..000000000000 --- a/.changeset/chatty-hounds-hammer.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/fuselage-ui-kit": patch ---- - -Fix validations from "UiKit" modal component diff --git a/.changeset/chilled-yaks-beg.md b/.changeset/chilled-yaks-beg.md deleted file mode 100644 index 670fa24887b7..000000000000 --- a/.changeset/chilled-yaks-beg.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed issue in Marketplace that caused a subscription app to show incorrect modals when subscribing diff --git a/.changeset/chilly-papayas-march.md b/.changeset/chilly-papayas-march.md deleted file mode 100644 index a7724b126695..000000000000 --- a/.changeset/chilly-papayas-march.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed SAML users' full names being updated on login regardless of the "Overwrite user fullname (use idp attribute)" setting diff --git a/.changeset/cuddly-brooms-approve.md b/.changeset/cuddly-brooms-approve.md deleted file mode 100644 index 24905bb91c62..000000000000 --- a/.changeset/cuddly-brooms-approve.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/i18n": minor ---- - -Allows admins to customize the `Subject` field of Omnichannel email transcripts via setting. By passing a value to the setting `Custom email subject for transcript`, system will use it as the `Subject` field, unless a custom subject is passed when requesting a transcript. If there's no custom subject and setting value is empty, the current default value will be used diff --git a/.changeset/dry-pumas-draw.md b/.changeset/dry-pumas-draw.md deleted file mode 100644 index b66ca5157cd5..000000000000 --- a/.changeset/dry-pumas-draw.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/livechat": patch ---- - -Fixed an issue that caused the widget to set the wrong department when using the setDepartment Livechat api endpoint in conjunction with a Livechat Trigger diff --git a/.changeset/empty-readers-teach.md b/.changeset/empty-readers-teach.md deleted file mode 100644 index b4bd075ef654..000000000000 --- a/.changeset/empty-readers-teach.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/tools": patch -"@rocket.chat/account-service": patch ---- - -Fixed an inconsistent evaluation of the `Accounts_LoginExpiration` setting over the codebase. In some places, it was being used as milliseconds while in others as days. Invalid values produced different results. A helper function was created to centralize the setting validation and the proper value being returned to avoid edge cases. -Negative values may be saved on the settings UI panel but the code will interpret any negative, NaN or 0 value to the default expiration which is 90 days. diff --git a/.changeset/fast-buttons-shake.md b/.changeset/fast-buttons-shake.md deleted file mode 100644 index 6281fc9941ec..000000000000 --- a/.changeset/fast-buttons-shake.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -Fixed an issue where FCM actions did not respect environment's proxy settings diff --git a/.changeset/funny-snails-promise.md b/.changeset/funny-snails-promise.md deleted file mode 100644 index bdd74a60b1e9..000000000000 --- a/.changeset/funny-snails-promise.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/livechat": patch ---- - -livechat `setDepartment` livechat api fixes: -- Changing department didn't reflect on the registration form in real time -- Changing the department mid conversation didn't transfer the chat -- Depending on the state of the department, it couldn't be set as default - diff --git a/.changeset/funny-wolves-tie.md b/.changeset/funny-wolves-tie.md deleted file mode 100644 index e2364ccb05e5..000000000000 --- a/.changeset/funny-wolves-tie.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed issue where bad word filtering was not working in the UI for messages diff --git a/.changeset/grumpy-worms-appear.md b/.changeset/grumpy-worms-appear.md deleted file mode 100644 index fb9fab77b24c..000000000000 --- a/.changeset/grumpy-worms-appear.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/i18n": patch ---- - -Fixed wrong wording on a federation setting diff --git a/.changeset/happy-peaches-nail.md b/.changeset/happy-peaches-nail.md deleted file mode 100644 index 2dfb2151ced0..000000000000 --- a/.changeset/happy-peaches-nail.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed issue with livechat agents not being able to leave omnichannel rooms if joining after a room has been closed by the visitor (due to race conditions) diff --git a/.changeset/hip-queens-taste.md b/.changeset/hip-queens-taste.md deleted file mode 100644 index f1d7bb6f3f0e..000000000000 --- a/.changeset/hip-queens-taste.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": minor ---- - -Added the possibility for apps to remove users from a room diff --git a/.changeset/hungry-wombats-act.md b/.changeset/hungry-wombats-act.md deleted file mode 100644 index 4e50b172e17e..000000000000 --- a/.changeset/hungry-wombats-act.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed an issue where non-encrypted attachments were not being downloaded diff --git a/.changeset/large-vans-attack.md b/.changeset/large-vans-attack.md deleted file mode 100644 index c1008b2ca06f..000000000000 --- a/.changeset/large-vans-attack.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fixed the contextual bar closing when editing thread messages instead of cancelling the message edit diff --git a/.changeset/lucky-beds-glow.md b/.changeset/lucky-beds-glow.md deleted file mode 100644 index 3e23797025e1..000000000000 --- a/.changeset/lucky-beds-glow.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@rocket.chat/ui-client': minor -'@rocket.chat/i18n': minor -'@rocket.chat/meteor': minor ---- - -Feature Preview: New Navigation - `Header` and `Contextualbar` size improvements consistent with the new global `NavBar` diff --git a/.changeset/lucky-countries-look.md b/.changeset/lucky-countries-look.md deleted file mode 100644 index 79deda53edfc..000000000000 --- a/.changeset/lucky-countries-look.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed the disappearance of some settings after navigation under network latency. diff --git a/.changeset/many-tables-love.md b/.changeset/many-tables-love.md deleted file mode 100644 index 8f37283c6a96..000000000000 --- a/.changeset/many-tables-love.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/model-typings": minor ---- - -Fixed Livechat rooms being displayed in the Engagement Dashboard's "Channels" tab diff --git a/.changeset/mean-hairs-move.md b/.changeset/mean-hairs-move.md deleted file mode 100644 index c92293d6ae95..000000000000 --- a/.changeset/mean-hairs-move.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -Fixed an issue where adding `OVERWRITE_SETTING_` for any setting wasn't immediately taking effect sometimes, and needed a server restart to reflect. diff --git a/.changeset/nervous-rockets-impress.md b/.changeset/nervous-rockets-impress.md deleted file mode 100644 index 26e9276193de..000000000000 --- a/.changeset/nervous-rockets-impress.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixes Missing line breaks on Omnichannel Room Info Panel diff --git a/.changeset/new-balloons-speak.md b/.changeset/new-balloons-speak.md deleted file mode 100644 index 7d4e7cd3a57e..000000000000 --- a/.changeset/new-balloons-speak.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed web client crashing on Firefox private window. Firefox disables access to service workers inside private windows. Rocket.Chat needs service workers to process E2EE encrypted files on rooms. These types of files won't be available inside private windows, but the rest of E2EE encrypted features should work normally diff --git a/.changeset/new-scissors-love.md b/.changeset/new-scissors-love.md deleted file mode 100644 index fb962407b353..000000000000 --- a/.changeset/new-scissors-love.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -'@rocket.chat/omnichannel-services': minor -'@rocket.chat/pdf-worker': minor -'@rocket.chat/core-services': minor -'@rocket.chat/model-typings': minor -'@rocket.chat/i18n': minor -'@rocket.chat/meteor': minor ---- - -Added system messages support for Omnichannel PDF transcripts and email transcripts. Currently these transcripts don't render system messages and is shown as an empty message in PDF/email. This PR adds this support for all valid livechat system messages. - -Also added a new setting under transcripts, to toggle the inclusion of system messages in email and PDF transcripts. diff --git a/.changeset/nice-laws-eat.md b/.changeset/nice-laws-eat.md deleted file mode 100644 index e99e4f219ef9..000000000000 --- a/.changeset/nice-laws-eat.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -'rocketchat-services': minor -'@rocket.chat/core-services': minor -'@rocket.chat/model-typings': minor -'@rocket.chat/ui-video-conf': minor -'@rocket.chat/core-typings': minor -'@rocket.chat/ui-contexts': minor -'@rocket.chat/models': minor -'@rocket.chat/ui-kit': minor -'@rocket.chat/i18n': minor -'@rocket.chat/meteor': minor ---- - -New Feature: Video Conference Persistent Chat. -This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. \ No newline at end of file diff --git a/.changeset/perfect-coins-camp.md b/.changeset/perfect-coins-camp.md deleted file mode 100644 index 4dbddf965742..000000000000 --- a/.changeset/perfect-coins-camp.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -fixed an issue in the "Create discussion" form, that would have the "Create" action button disabled even though the form is prefilled when opening it from the message action diff --git a/.changeset/polite-foxes-repair.md b/.changeset/polite-foxes-repair.md deleted file mode 100644 index 2f524c7e5f10..000000000000 --- a/.changeset/polite-foxes-repair.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -Added a method to the Apps-Engine that allows apps to read multiple messages from a room diff --git a/.changeset/popular-trees-lay.md b/.changeset/popular-trees-lay.md deleted file mode 100644 index f38ef1f92367..000000000000 --- a/.changeset/popular-trees-lay.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Removed 'Hide' option in the room menu for Omnichannel conversations. diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 40c93f4a63bd..000000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,118 +0,0 @@ -{ - "mode": "pre", - "tag": "rc", - "initialVersions": { - "@rocket.chat/meteor": "6.11.0-develop", - "rocketchat-services": "1.2.1", - "@rocket.chat/account-service": "0.4.1", - "@rocket.chat/authorization-service": "0.4.1", - "@rocket.chat/ddp-streamer": "0.3.1", - "@rocket.chat/omnichannel-transcript": "0.4.1", - "@rocket.chat/presence-service": "0.4.1", - "@rocket.chat/queue-worker": "0.4.1", - "@rocket.chat/stream-hub-service": "0.4.1", - "@rocket.chat/api-client": "0.2.1", - "@rocket.chat/ddp-client": "0.3.1", - "@rocket.chat/license": "0.2.1", - "@rocket.chat/omnichannel-services": "0.2.1", - "@rocket.chat/pdf-worker": "0.1.1", - "@rocket.chat/presence": "0.2.1", - "@rocket.chat/ui-theming": "0.2.0", - "@rocket.chat/account-utils": "0.0.2", - "@rocket.chat/agenda": "0.1.0", - "@rocket.chat/apps": "0.1.1", - "@rocket.chat/base64": "1.0.13", - "@rocket.chat/cas-validate": "0.0.2", - "@rocket.chat/core-services": "0.4.1", - "@rocket.chat/core-typings": "6.11.0-develop", - "@rocket.chat/cron": "0.1.1", - "@rocket.chat/eslint-config": "0.7.0", - "@rocket.chat/favicon": "0.0.2", - "@rocket.chat/fuselage-ui-kit": "8.0.1", - "@rocket.chat/gazzodown": "8.0.1", - "@rocket.chat/i18n": "0.5.0", - "@rocket.chat/instance-status": "0.1.1", - "@rocket.chat/jwt": "0.1.1", - "@rocket.chat/livechat": "1.18.1", - "@rocket.chat/log-format": "0.0.2", - "@rocket.chat/logger": "0.0.2", - "@rocket.chat/message-parser": "0.31.29", - "@rocket.chat/mock-providers": "0.1.0", - "@rocket.chat/model-typings": "0.5.1", - "@rocket.chat/models": "0.1.1", - "@rocket.chat/poplib": "0.0.2", - "@rocket.chat/password-policies": "0.0.2", - "@rocket.chat/patch-injection": "0.0.1", - "@rocket.chat/peggy-loader": "0.31.25", - "@rocket.chat/random": "1.2.2", - "@rocket.chat/release-action": "2.2.3", - "@rocket.chat/release-changelog": "0.1.0", - "@rocket.chat/rest-typings": "6.11.0-develop", - "@rocket.chat/server-cloud-communication": "0.0.2", - "@rocket.chat/server-fetch": "0.0.3", - "@rocket.chat/sha256": "1.0.10", - "@rocket.chat/tools": "0.2.1", - "@rocket.chat/ui-avatar": "4.0.1", - "@rocket.chat/ui-client": "8.0.1", - "@rocket.chat/ui-composer": "0.2.0", - "@rocket.chat/ui-contexts": "8.0.1", - "@rocket.chat/ui-kit": "0.35.0", - "@rocket.chat/ui-video-conf": "8.0.1", - "@rocket.chat/uikit-playground": "0.3.1", - "@rocket.chat/web-ui-registration": "8.0.1" - }, - "changesets": [ - "afraid-guests-jog", - "bump-patch-1722087664914", - "bump-patch-1722559871139", - "bump-patch-1722695753777", - "bump-patch-1722930641296", - "bump-patch-1723039032546", - "bump-patch-1723151441289", - "chatty-hounds-hammer", - "chilled-yaks-beg", - "chilly-papayas-march", - "cuddly-brooms-approve", - "dry-pumas-draw", - "empty-readers-teach", - "fast-buttons-shake", - "funny-snails-promise", - "funny-wolves-tie", - "grumpy-worms-appear", - "happy-peaches-nail", - "hip-queens-taste", - "hungry-wombats-act", - "large-vans-attack", - "lucky-beds-glow", - "lucky-countries-look", - "many-tables-love", - "mean-hairs-move", - "nervous-rockets-impress", - "new-balloons-speak", - "new-scissors-love", - "nice-laws-eat", - "perfect-coins-camp", - "polite-foxes-repair", - "popular-trees-lay", - "proud-waves-bathe", - "quick-ducks-live", - "rare-penguins-hope", - "red-numbers-happen", - "red-vans-shave", - "rich-carpets-brush", - "rotten-eggs-end", - "selfish-emus-sing", - "shaggy-hats-raise", - "sixty-nails-clean", - "smooth-lobsters-flash", - "soft-donkeys-thank", - "sour-forks-breathe", - "thin-windows-reply", - "violet-brooms-press", - "weak-insects-sort", - "weak-pets-talk", - "weak-taxis-design", - "weak-tigers-suffer", - "witty-bats-develop" - ] -} diff --git a/.changeset/proud-waves-bathe.md b/.changeset/proud-waves-bathe.md deleted file mode 100644 index 556fa3af80e1..000000000000 --- a/.changeset/proud-waves-bathe.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/model-typings": minor ---- - -Improved Engagement Dashboard's "Channels" tab performance by not returning rooms that had no activity in the analyzed period diff --git a/.changeset/quick-ducks-live.md b/.changeset/quick-ducks-live.md deleted file mode 100644 index ad628c13d087..000000000000 --- a/.changeset/quick-ducks-live.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed LDAP rooms, teams and roles syncs not being triggered on login even when the "Update User Data on Login" setting is enabled diff --git a/.changeset/rare-penguins-hope.md b/.changeset/rare-penguins-hope.md deleted file mode 100644 index 187bd9d09ddc..000000000000 --- a/.changeset/rare-penguins-hope.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/core-typings": patch ---- - -Allow customFields on livechat creation bridge diff --git a/.changeset/red-numbers-happen.md b/.changeset/red-numbers-happen.md deleted file mode 100644 index 61cb0d2b7586..000000000000 --- a/.changeset/red-numbers-happen.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed "Copy link" message action enabled in Starred and Pinned list for End to End Encrypted channels, this action is disabled now diff --git a/.changeset/red-vans-shave.md b/.changeset/red-vans-shave.md deleted file mode 100644 index ddf76535087e..000000000000 --- a/.changeset/red-vans-shave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Fixed issue that caused unintentional clicks when scrolling the channels sidebar on safari/chrome in iOS diff --git a/.changeset/rich-carpets-brush.md b/.changeset/rich-carpets-brush.md deleted file mode 100644 index 16741e31e54a..000000000000 --- a/.changeset/rich-carpets-brush.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed some anomalies related to disabled E2EE rooms. Earlier there are some weird issues with disabled E2EE rooms, this PR fixes these anomalies. diff --git a/.changeset/rotten-eggs-end.md b/.changeset/rotten-eggs-end.md deleted file mode 100644 index 7d0ad6ee5047..000000000000 --- a/.changeset/rotten-eggs-end.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/i18n": patch -"@rocket.chat/ui-client": patch ---- - -Implemented a new tab to the users page called 'Active', this tab lists all users who have logged in for the first time and are active. diff --git a/.changeset/selfish-emus-sing.md b/.changeset/selfish-emus-sing.md deleted file mode 100644 index 315d674a1857..000000000000 --- a/.changeset/selfish-emus-sing.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/i18n": minor ---- - -Added account setting `Accounts_Default_User_Preferences_sidebarSectionsOrder` to allow users to reorganize sidebar sections diff --git a/.changeset/shaggy-hats-raise.md b/.changeset/shaggy-hats-raise.md deleted file mode 100644 index 40ee9f8fbb55..000000000000 --- a/.changeset/shaggy-hats-raise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": minor ---- - -Added a new setting `Livechat_transcript_send_always` that allows admins to decide if email transcript should be sent all the times when a conversation is closed. This setting bypasses agent's preferences. For this setting to work, `Livechat_enable_transcript` should be off, meaning that visitors will no longer receive the option to decide if they want a transcript or not. diff --git a/.changeset/sixty-nails-clean.md b/.changeset/sixty-nails-clean.md deleted file mode 100644 index 7d13e02f0bd3..000000000000 --- a/.changeset/sixty-nails-clean.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed an issue that prevented the option to start a discussion from being shown on the message actions diff --git a/.changeset/smooth-lobsters-flash.md b/.changeset/smooth-lobsters-flash.md deleted file mode 100644 index 541d5069ee9c..000000000000 --- a/.changeset/smooth-lobsters-flash.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fix show correct user roles after updating user roles on admin edit user panel. diff --git a/.changeset/soft-donkeys-thank.md b/.changeset/soft-donkeys-thank.md deleted file mode 100644 index 7273ddcffca4..000000000000 --- a/.changeset/soft-donkeys-thank.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/mock-providers": patch -"@rocket.chat/ui-contexts": patch -"@rocket.chat/web-ui-registration": patch ---- - -Fixed an issue with blocked login when dismissed 2FA modal by clicking outside of it or pressing the escape key diff --git a/.changeset/sour-forks-breathe.md b/.changeset/sour-forks-breathe.md deleted file mode 100644 index 2d1076845fa9..000000000000 --- a/.changeset/sour-forks-breathe.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": minor ---- - -Extended apps-engine events for users leaving a room to also fire when being removed by another user. Also added the triggering user's information to the event's context payload. diff --git a/.changeset/thin-windows-reply.md b/.changeset/thin-windows-reply.md deleted file mode 100644 index 1a32e1ddebfb..000000000000 --- a/.changeset/thin-windows-reply.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixes an issue not displaying all groups in settings list diff --git a/.changeset/violet-brooms-press.md b/.changeset/violet-brooms-press.md deleted file mode 100644 index 632026d6fe2e..000000000000 --- a/.changeset/violet-brooms-press.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Security Hotfix (https://docs.rocket.chat/guides/security/security-updates) diff --git a/.changeset/weak-insects-sort.md b/.changeset/weak-insects-sort.md deleted file mode 100644 index cbbe7c4aa08c..000000000000 --- a/.changeset/weak-insects-sort.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@rocket.chat/meteor": patch ---- - -Improving UX by change the position of room info actions buttons and menu order to avoid missclick in destructive actions. diff --git a/.changeset/weak-pets-talk.md b/.changeset/weak-pets-talk.md deleted file mode 100644 index abaa9c683d65..000000000000 --- a/.changeset/weak-pets-talk.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@rocket.chat/omnichannel-services': patch -'@rocket.chat/core-services': patch -'@rocket.chat/meteor': patch ---- - -Reduced time on generation of PDF transcripts. Earlier Rocket.Chat was fetching the required translations everytime a PDF transcript was requested, this process was async and was being unnecessarily being performed on every pdf transcript request. This PR improves this and now the translations are loaded at the start and kept in memory to process further pdf transcripts requests. This reduces the time of asynchronously fetching translations again and again. diff --git a/.changeset/weak-taxis-design.md b/.changeset/weak-taxis-design.md deleted file mode 100644 index a2d435495cd7..000000000000 --- a/.changeset/weak-taxis-design.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': minor ---- - -Added handling of attachments in Omnichannel email transcripts. Earlier attachments were being skipped and were being shown as empty space, now it should render the image attachments and should show relevant error message for unsupported attachments. diff --git a/.changeset/weak-tigers-suffer.md b/.changeset/weak-tigers-suffer.md deleted file mode 100644 index 91748a43c677..000000000000 --- a/.changeset/weak-tigers-suffer.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"@rocket.chat/meteor": minor -"@rocket.chat/model-typings": minor -"@rocket.chat/rest-typings": minor ---- - -Added the ability to filter chats by `queued` on the Current Chats Omnichannel page diff --git a/.changeset/witty-bats-develop.md b/.changeset/witty-bats-develop.md deleted file mode 100644 index 42c9409d9ef3..000000000000 --- a/.changeset/witty-bats-develop.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -"@rocket.chat/meteor": patch -"@rocket.chat/apps": patch -"@rocket.chat/core-services": patch -"@rocket.chat/core-typings": patch -"@rocket.chat/fuselage-ui-kit": patch -"@rocket.chat/rest-typings": patch -"@rocket.chat/ddp-streamer": patch -"@rocket.chat/presence": patch -"rocketchat-services": patch ---- - -Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 4f6de9c113b7..f466c34da838 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,148 @@ # @rocket.chat/meteor +## 6.11.0 + +### Minor Changes + +- ([#32498](https://github.com/RocketChat/Rocket.Chat/pull/32498)) Created a `transferChat` Livechat API endpoint for transferring chats programmatically, the endpoint has all the limitations & permissions required that transferring via UI has + +- ([#32792](https://github.com/RocketChat/Rocket.Chat/pull/32792)) Allows admins to customize the `Subject` field of Omnichannel email transcripts via setting. By passing a value to the setting `Custom email subject for transcript`, system will use it as the `Subject` field, unless a custom subject is passed when requesting a transcript. If there's no custom subject and setting value is empty, the current default value will be used + +- ([#32739](https://github.com/RocketChat/Rocket.Chat/pull/32739)) Fixed an issue where FCM actions did not respect environment's proxy settings + +- ([#32706](https://github.com/RocketChat/Rocket.Chat/pull/32706)) Added the possibility for apps to remove users from a room + +- ([#32517](https://github.com/RocketChat/Rocket.Chat/pull/32517)) Feature Preview: New Navigation - `Header` and `Contextualbar` size improvements consistent with the new global `NavBar` + +- ([#32493](https://github.com/RocketChat/Rocket.Chat/pull/32493)) Fixed Livechat rooms being displayed in the Engagement Dashboard's "Channels" tab + +- ([#32742](https://github.com/RocketChat/Rocket.Chat/pull/32742)) Fixed an issue where adding `OVERWRITE_SETTING_` for any setting wasn't immediately taking effect sometimes, and needed a server restart to reflect. + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Added system messages support for Omnichannel PDF transcripts and email transcripts. Currently these transcripts don't render system messages and is shown as an empty message in PDF/email. This PR adds this support for all valid livechat system messages. + + Also added a new setting under transcripts, to toggle the inclusion of system messages in email and PDF transcripts. + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. +- ([#32176](https://github.com/RocketChat/Rocket.Chat/pull/32176)) Added a method to the Apps-Engine that allows apps to read multiple messages from a room + +- ([#32493](https://github.com/RocketChat/Rocket.Chat/pull/32493)) Improved Engagement Dashboard's "Channels" tab performance by not returning rooms that had no activity in the analyzed period + +- ([#32024](https://github.com/RocketChat/Rocket.Chat/pull/32024)) Implemented a new tab to the users page called 'Active', this tab lists all users who have logged in for the first time and are active. + +- ([#32744](https://github.com/RocketChat/Rocket.Chat/pull/32744)) Added account setting `Accounts_Default_User_Preferences_sidebarSectionsOrder` to allow users to reorganize sidebar sections + +- ([#32820](https://github.com/RocketChat/Rocket.Chat/pull/32820)) Added a new setting `Livechat_transcript_send_always` that allows admins to decide if email transcript should be sent all the times when a conversation is closed. This setting bypasses agent's preferences. For this setting to work, `Livechat_enable_transcript` should be off, meaning that visitors will no longer receive the option to decide if they want a transcript or not. + +- ([#32724](https://github.com/RocketChat/Rocket.Chat/pull/32724)) Extended apps-engine events for users leaving a room to also fire when being removed by another user. Also added the triggering user's information to the event's context payload. + +- ([#32777](https://github.com/RocketChat/Rocket.Chat/pull/32777)) Added handling of attachments in Omnichannel email transcripts. Earlier attachments were being skipped and were being shown as empty space, now it should render the image attachments and should show relevant error message for unsupported attachments. + +- ([#32800](https://github.com/RocketChat/Rocket.Chat/pull/32800)) Added the ability to filter chats by `queued` on the Current Chats Omnichannel page + +### Patch Changes + +- Bump @rocket.chat/meteor version. + +- Bump @rocket.chat/meteor version. + +- Bump @rocket.chat/meteor version. + +- Bump @rocket.chat/meteor version. + +- Bump @rocket.chat/meteor version. + +- Bump @rocket.chat/meteor version. + +- Bump @rocket.chat/meteor version. + +- ([#32679](https://github.com/RocketChat/Rocket.Chat/pull/32679)) Fix validations from "UiKit" modal component + +- ([#32730](https://github.com/RocketChat/Rocket.Chat/pull/32730)) Fixed issue in Marketplace that caused a subscription app to show incorrect modals when subscribing + +- ([#32628](https://github.com/RocketChat/Rocket.Chat/pull/32628)) Fixed SAML users' full names being updated on login regardless of the "Overwrite user fullname (use idp attribute)" setting + +- ([#32692](https://github.com/RocketChat/Rocket.Chat/pull/32692)) Fixed an issue that caused the widget to set the wrong department when using the setDepartment Livechat api endpoint in conjunction with a Livechat Trigger + +- ([#32527](https://github.com/RocketChat/Rocket.Chat/pull/32527)) Fixed an inconsistent evaluation of the `Accounts_LoginExpiration` setting over the codebase. In some places, it was being used as milliseconds while in others as days. Invalid values produced different results. A helper function was created to centralize the setting validation and the proper value being returned to avoid edge cases. + Negative values may be saved on the settings UI panel but the code will interpret any negative, NaN or 0 value to the default expiration which is 90 days. +- ([#32626](https://github.com/RocketChat/Rocket.Chat/pull/32626)) livechat `setDepartment` livechat api fixes: + - Changing department didn't reflect on the registration form in real time + - Changing the department mid conversation didn't transfer the chat + - Depending on the state of the department, it couldn't be set as default +- ([#32810](https://github.com/RocketChat/Rocket.Chat/pull/32810)) Fixed issue where bad word filtering was not working in the UI for messages + +- ([#32707](https://github.com/RocketChat/Rocket.Chat/pull/32707)) Fixed issue with livechat agents not being able to leave omnichannel rooms if joining after a room has been closed by the visitor (due to race conditions) + +- ([#32837](https://github.com/RocketChat/Rocket.Chat/pull/32837)) Fixed an issue where non-encrypted attachments were not being downloaded + +- ([#32861](https://github.com/RocketChat/Rocket.Chat/pull/32861)) fixed the contextual bar closing when editing thread messages instead of cancelling the message edit + +- ([#32713](https://github.com/RocketChat/Rocket.Chat/pull/32713)) Fixed the disappearance of some settings after navigation under network latency. + +- ([#32592](https://github.com/RocketChat/Rocket.Chat/pull/32592)) Fixes Missing line breaks on Omnichannel Room Info Panel + +- ([#32807](https://github.com/RocketChat/Rocket.Chat/pull/32807)) Fixed web client crashing on Firefox private window. Firefox disables access to service workers inside private windows. Rocket.Chat needs service workers to process E2EE encrypted files on rooms. These types of files won't be available inside private windows, but the rest of E2EE encrypted features should work normally + +- ([#32864](https://github.com/RocketChat/Rocket.Chat/pull/32864)) fixed an issue in the "Create discussion" form, that would have the "Create" action button disabled even though the form is prefilled when opening it from the message action + +- ([#32691](https://github.com/RocketChat/Rocket.Chat/pull/32691)) Removed 'Hide' option in the room menu for Omnichannel conversations. + +- ([#32445](https://github.com/RocketChat/Rocket.Chat/pull/32445)) Fixed LDAP rooms, teams and roles syncs not being triggered on login even when the "Update User Data on Login" setting is enabled + +- ([#32328](https://github.com/RocketChat/Rocket.Chat/pull/32328)) Allow customFields on livechat creation bridge + +- ([#32803](https://github.com/RocketChat/Rocket.Chat/pull/32803)) Fixed "Copy link" message action enabled in Starred and Pinned list for End to End Encrypted channels, this action is disabled now + +- ([#32769](https://github.com/RocketChat/Rocket.Chat/pull/32769)) Fixed issue that caused unintentional clicks when scrolling the channels sidebar on safari/chrome in iOS + +- ([#32857](https://github.com/RocketChat/Rocket.Chat/pull/32857)) Fixed some anomalies related to disabled E2EE rooms. Earlier there are some weird issues with disabled E2EE rooms, this PR fixes these anomalies. + +- ([#32765](https://github.com/RocketChat/Rocket.Chat/pull/32765)) Fixed an issue that prevented the option to start a discussion from being shown on the message actions + +- ([#32671](https://github.com/RocketChat/Rocket.Chat/pull/32671)) Fix show correct user roles after updating user roles on admin edit user panel. + +- ([#32482](https://github.com/RocketChat/Rocket.Chat/pull/32482)) Fixed an issue with blocked login when dismissed 2FA modal by clicking outside of it or pressing the escape key + +- ([#32804](https://github.com/RocketChat/Rocket.Chat/pull/32804)) Fixes an issue not displaying all groups in settings list + +- ([#32815](https://github.com/RocketChat/Rocket.Chat/pull/32815)) Security Hotfix (https://docs.rocket.chat/guides/security/security-updates) + +- ([#32632](https://github.com/RocketChat/Rocket.Chat/pull/32632)) Improving UX by change the position of room info actions buttons and menu order to avoid missclick in destructive actions. + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Reduced time on generation of PDF transcripts. Earlier Rocket.Chat was fetching the required translations everytime a PDF transcript was requested, this process was async and was being unnecessarily being performed on every pdf transcript request. This PR improves this and now the translations are loaded at the start and kept in memory to process further pdf transcripts requests. This reduces the time of asynchronously fetching translations again and again. + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-

    Updated dependencies [88e5219bd2, b4bbcbfc9a, 8fc6ca8b4e, 25da5280a5, 1b7b1161cf, 439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 3ffe4a2944, 3b4b19cfc5, 4e8aa575a6, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/fuselage-ui-kit@9.0.0 + - @rocket.chat/i18n@0.6.0 + - @rocket.chat/tools@0.2.2 + - @rocket.chat/ui-client@9.0.0 + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/omnichannel-services@0.3.0 + - @rocket.chat/pdf-worker@0.2.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/ui-video-conf@9.0.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/ui-contexts@9.0.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/ui-kit@0.36.0 + - @rocket.chat/web-ui-registration@9.0.0 + - @rocket.chat/rest-typings@6.11.0 + - @rocket.chat/apps@0.1.3 + - @rocket.chat/presence@0.2.3 + - @rocket.chat/gazzodown@9.0.0 + - @rocket.chat/api-client@0.2.3 + - @rocket.chat/license@0.2.3 + - @rocket.chat/cron@0.1.3 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0 + - @rocket.chat/instance-status@0.1.3 + - @rocket.chat/server-cloud-communication@0.0.2 +
    + ## 6.11.0-rc.6 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 7cad52f21bcf..d5c0801e8d9c 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-rc.6" + "version": "6.11.0" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 11f7b666b209..230250c5ca64 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,26 @@ # rocketchat-services +## 1.3.0 + +### Minor Changes + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. + +### Patch Changes + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/ui-kit@0.36.0 + - @rocket.chat/rest-typings@6.11.0 +
    + ## 1.3.0-rc.6 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index b71c10fd8896..76a0c59d54e6 100644 --- a/apps/meteor/ee/server/services/package.json +++ b/apps/meteor/ee/server/services/package.json @@ -1,7 +1,7 @@ { "name": "rocketchat-services", "private": true, - "version": "1.3.0-rc.6", + "version": "1.3.0", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 987bb6d0e8ae..2cb522daf0d0 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "6.11.0-rc.6", + "version": "6.11.0", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 39c07917ca0d..fd5eb3925946 100644 --- a/ee/apps/account-service/CHANGELOG.md +++ b/ee/apps/account-service/CHANGELOG.md @@ -1,5 +1,21 @@ # @rocket.chat/account-service +## 0.4.3 + +### Patch Changes + +- ([#32527](https://github.com/RocketChat/Rocket.Chat/pull/32527)) Fixed an inconsistent evaluation of the `Accounts_LoginExpiration` setting over the codebase. In some places, it was being used as milliseconds while in others as days. Invalid values produced different results. A helper function was created to centralize the setting validation and the proper value being returned to avoid edge cases. + Negative values may be saved on the settings UI panel but the code will interpret any negative, NaN or 0 value to the default expiration which is 90 days. +-
    Updated dependencies [8fc6ca8b4e, 439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/tools@0.2.2 + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/rest-typings@6.11.0 +
    + ## 0.4.3-rc.6 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index bd2151f7365d..ac28eb76e76d 100644 --- a/ee/apps/account-service/package.json +++ b/ee/apps/account-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/account-service", "private": true, - "version": "0.4.3-rc.6", + "version": "0.4.3", "description": "Rocket.Chat Account service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md index a6b00c517a60..df7be3c9b1eb 100644 --- a/ee/apps/authorization-service/CHANGELOG.md +++ b/ee/apps/authorization-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/authorization-service +## 0.4.3 + +### Patch Changes + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/rest-typings@6.11.0 +
    + ## 0.4.3-rc.6 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 1a7a06b4f676..bff15e7f7d91 100644 --- a/ee/apps/authorization-service/package.json +++ b/ee/apps/authorization-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/authorization-service", "private": true, - "version": "0.4.3-rc.6", + "version": "0.4.3", "description": "Rocket.Chat Authorization service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md index 09b01e7d4e82..1162e17c05d7 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,22 @@ # @rocket.chat/ddp-streamer +## 0.3.3 + +### Patch Changes + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 4e8aa575a6, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/ui-contexts@9.0.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/rest-typings@6.11.0 + - @rocket.chat/instance-status@0.1.3 +
    + ## 0.3.3-rc.6 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index dab52321a529..7bcf45bf354c 100644 --- a/ee/apps/ddp-streamer/package.json +++ b/ee/apps/ddp-streamer/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/ddp-streamer", "private": true, - "version": "0.3.3-rc.6", + "version": "0.3.3", "description": "Rocket.Chat DDP-Streamer service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md index 7fd07c8efc1c..aac67c02dd3d 100644 --- a/ee/apps/omnichannel-transcript/CHANGELOG.md +++ b/ee/apps/omnichannel-transcript/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/omnichannel-transcript +## 0.4.3 + +### Patch Changes + +-
    Updated dependencies [8fc6ca8b4e, 439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/tools@0.2.2 + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/omnichannel-services@0.3.0 + - @rocket.chat/pdf-worker@0.2.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 +
    + ## 0.4.3-rc.6 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index a81c0514bd13..f23c79d97652 100644 --- a/ee/apps/omnichannel-transcript/package.json +++ b/ee/apps/omnichannel-transcript/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/omnichannel-transcript", "private": true, - "version": "0.4.3-rc.6", + "version": "0.4.3", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md index c15f14a8e5c9..b9544b0cdde9 100644 --- a/ee/apps/presence-service/CHANGELOG.md +++ b/ee/apps/presence-service/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/presence-service +## 0.4.3 + +### Patch Changes + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/presence@0.2.3 +
    + ## 0.4.3-rc.6 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 5524e56fac78..c800dd4d6c80 100644 --- a/ee/apps/presence-service/package.json +++ b/ee/apps/presence-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/presence-service", "private": true, - "version": "0.4.3-rc.6", + "version": "0.4.3", "description": "Rocket.Chat Presence service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md index 69651cb85815..12271005af74 100644 --- a/ee/apps/queue-worker/CHANGELOG.md +++ b/ee/apps/queue-worker/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/queue-worker +## 0.4.3 + +### Patch Changes + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/omnichannel-services@0.3.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 +
    + ## 0.4.3-rc.6 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 5736d2e844e8..0a227cb271c0 100644 --- a/ee/apps/queue-worker/package.json +++ b/ee/apps/queue-worker/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/queue-worker", "private": true, - "version": "0.4.3-rc.6", + "version": "0.4.3", "description": "Rocket.Chat service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md index 349f0b880bd3..3fbf664a0b30 100644 --- a/ee/apps/stream-hub-service/CHANGELOG.md +++ b/ee/apps/stream-hub-service/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/stream-hub-service +## 0.4.3 + +### Patch Changes + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 +
    + ## 0.4.3-rc.6 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index e6c691d84808..812522a5f1d8 100644 --- a/ee/apps/stream-hub-service/package.json +++ b/ee/apps/stream-hub-service/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/stream-hub-service", "private": true, - "version": "0.4.3-rc.6", + "version": "0.4.3", "description": "Rocket.Chat Stream Hub service", "scripts": { "build": "tsc -p tsconfig.json", diff --git a/ee/packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md index 0c5c60a0037e..8fe130aeaf28 100644 --- a/ee/packages/api-client/CHANGELOG.md +++ b/ee/packages/api-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/api-client +## 0.2.3 + +### Patch Changes + +-
    Updated dependencies [2d89a0c448, 24f7df4894, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/rest-typings@6.11.0 +
    + ## 0.2.3-rc.6 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 47f08fc2a8dc..bc809cff907f 100644 --- a/ee/packages/api-client/package.json +++ b/ee/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/api-client", - "version": "0.2.3-rc.6", + "version": "0.2.3", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md index 8373c34e68f5..0f9b5f7f26b3 100644 --- a/ee/packages/ddp-client/CHANGELOG.md +++ b/ee/packages/ddp-client/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ddp-client +## 0.3.3 + +### Patch Changes + +-
    Updated dependencies [264d7d5496, b8e5887fb9]: + + - @rocket.chat/rest-typings@6.11.0 + - @rocket.chat/api-client@0.2.3 +
    + ## 0.3.3-rc.6 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 360a9dd0310c..46d67b3ee508 100644 --- a/ee/packages/ddp-client/package.json +++ b/ee/packages/ddp-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ddp-client", - "version": "0.3.3-rc.6", + "version": "0.3.3", "devDependencies": { "@swc/core": "^1.3.95", "@swc/jest": "^0.2.29", diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md index e392640bbb7e..8cc9df0dd502 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.3 + +### Patch Changes + +-
    Updated dependencies [2d89a0c448, 24f7df4894, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0 +
    + ## 0.2.3-rc.6 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 8519855ebd95..468a3d1a857c 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.3-rc.6", + "version": "0.2.3", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md index 450e59cd8be7..a4a49de7aa30 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,28 @@ # @rocket.chat/omnichannel-services +## 0.3.0 + +### Minor Changes + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Added system messages support for Omnichannel PDF transcripts and email transcripts. Currently these transcripts don't render system messages and is shown as an empty message in PDF/email. This PR adds this support for all valid livechat system messages. + + Also added a new setting under transcripts, to toggle the inclusion of system messages in email and PDF transcripts. + +### Patch Changes + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Reduced time on generation of PDF transcripts. Earlier Rocket.Chat was fetching the required translations everytime a PDF transcript was requested, this process was async and was being unnecessarily being performed on every pdf transcript request. This PR improves this and now the translations are loaded at the start and kept in memory to process further pdf transcripts requests. This reduces the time of asynchronously fetching translations again and again. + +-
    Updated dependencies [8fc6ca8b4e, 439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/tools@0.2.2 + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/pdf-worker@0.2.0 + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/rest-typings@6.11.0 +
    + ## 0.3.0-rc.6 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 85e5b603ea2b..b66697cd7ed8 100644 --- a/ee/packages/omnichannel-services/package.json +++ b/ee/packages/omnichannel-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/omnichannel-services", - "version": "0.3.0-rc.6", + "version": "0.3.0", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md index b364e4a63e0a..5ebe251216a7 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/pdf-worker +## 0.2.0 + +### Minor Changes + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Added system messages support for Omnichannel PDF transcripts and email transcripts. Currently these transcripts don't render system messages and is shown as an empty message in PDF/email. This PR adds this support for all valid livechat system messages. + + Also added a new setting under transcripts, to toggle the inclusion of system messages in email and PDF transcripts. + +### Patch Changes + +-
    Updated dependencies [2d89a0c448, 24f7df4894, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0 +
    + ## 0.2.0-rc.6 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index 477332ee758e..7ce07434aca7 100644 --- a/ee/packages/pdf-worker/package.json +++ b/ee/packages/pdf-worker/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/pdf-worker", - "version": "0.2.0-rc.6", + "version": "0.2.0", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 6fbf30218412..3d1a7e35b705 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/presence +## 0.2.3 + +### Patch Changes + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [03c8b066f9, 2d89a0c448, 24f7df4894, 03c8b066f9, b8e5887fb9]: + + - @rocket.chat/core-services@0.5.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 +
    + ## 0.2.3-rc.6 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 23fad94358ab..b7c4ea821fe2 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.3-rc.6", + "version": "0.2.3", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 1ba4bee9cd00..690dc984c631 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-rc.6", + "version": "6.11.0", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index ef2945f61a06..07f4af49f31e 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/apps +## 0.1.3 + +### Patch Changes + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0 + - @rocket.chat/core-typings@6.11.0 +
    + ## 0.1.3-rc.6 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index d5c77c6fb437..32a25abbbf43 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.3-rc.6", + "version": "0.1.3", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 7d54840e776f..0c10b78c3bf4 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,30 @@ # @rocket.chat/core-services +## 0.5.0 + +### Minor Changes + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Added system messages support for Omnichannel PDF transcripts and email transcripts. Currently these transcripts don't render system messages and is shown as an empty message in PDF/email. This PR adds this support for all valid livechat system messages. + + Also added a new setting under transcripts, to toggle the inclusion of system messages in email and PDF transcripts. + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. + +### Patch Changes + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Reduced time on generation of PDF transcripts. Earlier Rocket.Chat was fetching the required translations everytime a PDF transcript was requested, this process was async and was being unnecessarily being performed on every pdf transcript request. This PR improves this and now the translations are loaded at the start and kept in memory to process further pdf transcripts requests. This reduces the time of asynchronously fetching translations again and again. + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [2d89a0c448, 24f7df4894, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 + - @rocket.chat/ui-kit@0.36.0 + - @rocket.chat/rest-typings@6.11.0 +
    + ## 0.5.0-rc.6 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index f080fa831330..0c459736456c 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.5.0-rc.6", + "version": "0.5.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 336cabeecb50..fb313a4d1320 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,23 @@ # @rocket.chat/core-typings +## 6.11.0 + +### Minor Changes + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. + +### Patch Changes + +- ([#32328](https://github.com/RocketChat/Rocket.Chat/pull/32328)) Allow customFields on livechat creation bridge + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [2d89a0c448]: + + - @rocket.chat/ui-kit@0.36.0 +
    + ## 6.11.0-rc.6 ## 6.11.0-rc.5 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 7d1f623e0ca6..a9f4fdd293e3 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "@rocket.chat/core-typings", - "version": "6.11.0-rc.6", + "version": "6.11.0", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 392dbc2295e1..33c0c9872a60 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.3 + +### Patch Changes + +-
    Updated dependencies [2d89a0c448, 24f7df4894, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/models@0.2.0 +
    + ## 0.1.3-rc.6 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 33fa83dcc2cf..868d5b5fb504 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.3-rc.6", + "version": "0.1.3", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md index 8682786bb507..e8fe73f6d549 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log +## 9.0.0 + +### Patch Changes + +- ([#32679](https://github.com/RocketChat/Rocket.Chat/pull/32679)) Fix validations from "UiKit" modal component + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [2d89a0c448, 24f7df4894, 4e8aa575a6, b8e5887fb9]: + + - @rocket.chat/ui-video-conf@9.0.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/ui-contexts@9.0.0 + - @rocket.chat/ui-kit@0.36.0 + - @rocket.chat/gazzodown@9.0.0 + - @rocket.chat/ui-avatar@5.0.0 +
    + ## 9.0.0-rc.6 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index a8c88afef7fc..4a1d7e4b7839 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/fuselage-ui-kit", "private": true, - "version": "9.0.0-rc.6", + "version": "9.0.0", "description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system", "homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/", "author": { @@ -50,10 +50,10 @@ "@rocket.chat/icons": "*", "@rocket.chat/prettier-config": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.6", - "@rocket.chat/ui-contexts": "9.0.0-rc.6", - "@rocket.chat/ui-kit": "0.36.0-rc.0", - "@rocket.chat/ui-video-conf": "9.0.0-rc.6", + "@rocket.chat/ui-avatar": "5.0.0", + "@rocket.chat/ui-contexts": "9.0.0", + "@rocket.chat/ui-kit": "0.36.0", + "@rocket.chat/ui-video-conf": "9.0.0", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 49d8dca2d4c3..4febdb0f54b2 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0 + +### Patch Changes + +-
    Updated dependencies [1b7b1161cf, 2d89a0c448, 24f7df4894, 3ffe4a2944, 4e8aa575a6, b8e5887fb9]: + + - @rocket.chat/ui-client@9.0.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/ui-contexts@9.0.0 +
    + ## 9.0.0-rc.6 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 9aa4e2bcb3b7..054a6ccaef66 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "9.0.0-rc.6", + "version": "9.0.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -71,8 +71,8 @@ "@rocket.chat/fuselage-tokens": "*", "@rocket.chat/message-parser": "0.31.29", "@rocket.chat/styled": "*", - "@rocket.chat/ui-client": "9.0.0-rc.6", - "@rocket.chat/ui-contexts": "9.0.0-rc.6", + "@rocket.chat/ui-client": "9.0.0", + "@rocket.chat/ui-contexts": "9.0.0", "katex": "*", "react": "*" }, diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md index 39691d4d3a15..8c46d5736706 100644 --- a/packages/i18n/CHANGELOG.md +++ b/packages/i18n/CHANGELOG.md @@ -1,5 +1,27 @@ # @rocket.chat/i18n +## 0.6.0 + +### Minor Changes + +- ([#32792](https://github.com/RocketChat/Rocket.Chat/pull/32792)) Allows admins to customize the `Subject` field of Omnichannel email transcripts via setting. By passing a value to the setting `Custom email subject for transcript`, system will use it as the `Subject` field, unless a custom subject is passed when requesting a transcript. If there's no custom subject and setting value is empty, the current default value will be used + +- ([#32517](https://github.com/RocketChat/Rocket.Chat/pull/32517)) Feature Preview: New Navigation - `Header` and `Contextualbar` size improvements consistent with the new global `NavBar` + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Added system messages support for Omnichannel PDF transcripts and email transcripts. Currently these transcripts don't render system messages and is shown as an empty message in PDF/email. This PR adds this support for all valid livechat system messages. + + Also added a new setting under transcripts, to toggle the inclusion of system messages in email and PDF transcripts. + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. +- ([#32744](https://github.com/RocketChat/Rocket.Chat/pull/32744)) Added account setting `Accounts_Default_User_Preferences_sidebarSectionsOrder` to allow users to reorganize sidebar sections + +### Patch Changes + +- ([#32788](https://github.com/RocketChat/Rocket.Chat/pull/32788)) Fixed wrong wording on a federation setting + +- ([#32024](https://github.com/RocketChat/Rocket.Chat/pull/32024)) Implemented a new tab to the users page called 'Active', this tab lists all users who have logged in for the first time and are active. + ## 0.6.0-rc.0 ### Minor Changes diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 3053af284604..40bdd75a6c68 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/i18n", - "version": "0.6.0-rc.0", + "version": "0.6.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index cef814c2e0af..849ccf591d08 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.3 + +### Patch Changes + +-
    Updated dependencies [2d89a0c448]: + + - @rocket.chat/models@0.2.0 +
    + ## 0.1.3-rc.6 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 2e7fdf85eb0f..088cba613d8e 100644 --- a/packages/instance-status/package.json +++ b/packages/instance-status/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/instance-status", - "version": "0.1.3-rc.6", + "version": "0.1.3", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 6e05f79aae23..56265d43563f 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,25 @@ # @rocket.chat/livechat Change Log +## 1.19.0 + +### Minor Changes + +- ([#32498](https://github.com/RocketChat/Rocket.Chat/pull/32498)) Created a `transferChat` Livechat API endpoint for transferring chats programmatically, the endpoint has all the limitations & permissions required that transferring via UI has + +### Patch Changes + +- ([#32692](https://github.com/RocketChat/Rocket.Chat/pull/32692)) Fixed an issue that caused the widget to set the wrong department when using the setDepartment Livechat api endpoint in conjunction with a Livechat Trigger + +- ([#32626](https://github.com/RocketChat/Rocket.Chat/pull/32626)) livechat `setDepartment` livechat api fixes: + - Changing department didn't reflect on the registration form in real time + - Changing the department mid conversation didn't transfer the chat + - Depending on the state of the department, it couldn't be set as default +-
    Updated dependencies [2d89a0c448]: + + - @rocket.chat/ui-kit@0.36.0 + - @rocket.chat/gazzodown@9.0.0 +
    + ## 1.19.0-rc.6 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 69cd58c02a7d..9d40643dd4c5 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.19.0-rc.6", + "version": "1.19.0", "files": [ "/build" ], diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md index 430c5d8a0ee5..300b624d5dff 100644 --- a/packages/mock-providers/CHANGELOG.md +++ b/packages/mock-providers/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/mock-providers +## 0.1.1 + +### Patch Changes + +- ([#32482](https://github.com/RocketChat/Rocket.Chat/pull/32482)) Fixed an issue with blocked login when dismissed 2FA modal by clicking outside of it or pressing the escape key + +-
    Updated dependencies [b4bbcbfc9a, 25da5280a5, 1b7b1161cf, 03c8b066f9, 2d89a0c448, 3ffe4a2944, 3b4b19cfc5]: + + - @rocket.chat/i18n@0.6.0 +
    + ## 0.1.1-rc.0 ### Patch Changes diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json index 3fb288102aa9..2d51e06e653d 100644 --- a/packages/mock-providers/package.json +++ b/packages/mock-providers/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/mock-providers", - "version": "0.1.1-rc.0", + "version": "0.1.1", "private": true, "dependencies": { "@rocket.chat/i18n": "workspace:~", diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index e98280bb2ab4..29eaadd0e0fe 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,28 @@ # @rocket.chat/model-typings +## 0.6.0 + +### Minor Changes + +- ([#32493](https://github.com/RocketChat/Rocket.Chat/pull/32493)) Fixed Livechat rooms being displayed in the Engagement Dashboard's "Channels" tab + +- ([#32752](https://github.com/RocketChat/Rocket.Chat/pull/32752)) Added system messages support for Omnichannel PDF transcripts and email transcripts. Currently these transcripts don't render system messages and is shown as an empty message in PDF/email. This PR adds this support for all valid livechat system messages. + + Also added a new setting under transcripts, to toggle the inclusion of system messages in email and PDF transcripts. + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. +- ([#32493](https://github.com/RocketChat/Rocket.Chat/pull/32493)) Improved Engagement Dashboard's "Channels" tab performance by not returning rooms that had no activity in the analyzed period + +- ([#32800](https://github.com/RocketChat/Rocket.Chat/pull/32800)) Added the ability to filter chats by `queued` on the Current Chats Omnichannel page + +### Patch Changes + +-
    Updated dependencies [2d89a0c448, 24f7df4894, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0 +
    + ## 0.6.0-rc.6 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index ec56fa0ce934..c06e25f68d73 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.6.0-rc.6", + "version": "0.6.0", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 9ec03b0ebcc4..e2b984708aaa 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/models +## 0.2.0 + +### Minor Changes + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. + +### Patch Changes + +-
    Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 264d7d5496]: + + - @rocket.chat/model-typings@0.6.0 +
    + ## 0.2.0-rc.6 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index f2499f2ec3e9..174464796076 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.2.0-rc.6", + "version": "0.2.0", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 8b0ce9785ab3..efcab160b8e6 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,21 @@ # @rocket.chat/rest-typings +## 6.11.0 + +### Minor Changes + +- ([#32800](https://github.com/RocketChat/Rocket.Chat/pull/32800)) Added the ability to filter chats by `queued` on the Current Chats Omnichannel page + +### Patch Changes + +- ([#32719](https://github.com/RocketChat/Rocket.Chat/pull/32719)) Added the `user` param to apps-engine update method call, allowing apps' new `onUpdate` hook to know who triggered the update. + +-
    Updated dependencies [2d89a0c448, 24f7df4894, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/ui-kit@0.36.0 +
    + ## 6.11.0-rc.6 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 7758c3a8ab29..77a78a6e938a 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.11.0-rc.6", + "version": "6.11.0", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "@types/jest": "~29.5.7", diff --git a/packages/tools/CHANGELOG.md b/packages/tools/CHANGELOG.md index bda8e7510825..b74d4940c211 100644 --- a/packages/tools/CHANGELOG.md +++ b/packages/tools/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/tools +## 0.2.2 + +### Patch Changes + +- ([#32527](https://github.com/RocketChat/Rocket.Chat/pull/32527)) Fixed an inconsistent evaluation of the `Accounts_LoginExpiration` setting over the codebase. In some places, it was being used as milliseconds while in others as days. Invalid values produced different results. A helper function was created to centralize the setting validation and the proper value being returned to avoid edge cases. + Negative values may be saved on the settings UI panel but the code will interpret any negative, NaN or 0 value to the default expiration which is 90 days. + ## 0.2.2-rc.0 ### Patch Changes diff --git a/packages/tools/package.json b/packages/tools/package.json index d1d1a2aad3cf..75de1ffa4a29 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/tools", - "version": "0.2.2-rc.0", + "version": "0.2.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md index dfb74baecb42..f65d986cfaf5 100644 --- a/packages/ui-avatar/CHANGELOG.md +++ b/packages/ui-avatar/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-avatar +## 5.0.0 + +### Patch Changes + +-
    Updated dependencies [2d89a0c448, 4e8aa575a6]: + + - @rocket.chat/ui-contexts@9.0.0 +
    + ## 5.0.0-rc.6 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 9447c998fdb6..3f429ca08278 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-avatar", - "version": "5.0.0-rc.6", + "version": "5.0.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.6", + "@rocket.chat/ui-contexts": "9.0.0", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index a62090a288c2..5936f8038bc8 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/ui-client +## 9.0.0 + +### Minor Changes + +- ([#32517](https://github.com/RocketChat/Rocket.Chat/pull/32517)) Feature Preview: New Navigation - `Header` and `Contextualbar` size improvements consistent with the new global `NavBar` + +### Patch Changes + +- ([#32024](https://github.com/RocketChat/Rocket.Chat/pull/32024)) Implemented a new tab to the users page called 'Active', this tab lists all users who have logged in for the first time and are active. + +-
    Updated dependencies [2d89a0c448, 4e8aa575a6]: + + - @rocket.chat/ui-contexts@9.0.0 +
    + ## 9.0.0-rc.6 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 6e4a10ed99c8..d5b6c74cf982 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "9.0.0-rc.6", + "version": "9.0.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -63,7 +63,7 @@ "@rocket.chat/fuselage": "*", "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.6", + "@rocket.chat/ui-contexts": "9.0.0", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 37511c6a9a60..fb3d074b6fbe 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,24 @@ # @rocket.chat/ui-contexts +## 9.0.0 + +### Minor Changes + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. + +### Patch Changes + +- ([#32482](https://github.com/RocketChat/Rocket.Chat/pull/32482)) Fixed an issue with blocked login when dismissed 2FA modal by clicking outside of it or pressing the escape key + +-
    Updated dependencies [b4bbcbfc9a, 25da5280a5, 1b7b1161cf, 03c8b066f9, 2d89a0c448, 24f7df4894, 3ffe4a2944, 3b4b19cfc5, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/i18n@0.6.0 + - @rocket.chat/core-typings@6.11.0 + - @rocket.chat/rest-typings@6.11.0 + - @rocket.chat/ddp-client@0.3.3 +
    + ## 9.0.0-rc.6 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 0cd54ccb2f58..4971be05fdcc 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "9.0.0-rc.6", + "version": "9.0.0", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-kit/CHANGELOG.md b/packages/ui-kit/CHANGELOG.md index c82da29ef930..9f31c620f4db 100644 --- a/packages/ui-kit/CHANGELOG.md +++ b/packages/ui-kit/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 0.36.0 + +### Minor Changes + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. + ## 0.36.0-rc.0 ### Minor Changes diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json index 4caa12f09530..b0582b4a353b 100644 --- a/packages/ui-kit/package.json +++ b/packages/ui-kit/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-kit", - "version": "0.36.0-rc.0", + "version": "0.36.0", "description": "Interactive UI elements for Rocket.Chat Apps", "homepage": "https://rocket.chat", "author": { diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md index 5188c9080a09..2a697e293211 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/ui-video-conf +## 9.0.0 + +### Minor Changes + +- ([#32793](https://github.com/RocketChat/Rocket.Chat/pull/32793)) New Feature: Video Conference Persistent Chat. + This feature provides a discussion id for conference provider apps to store the chat messages exchanged during the conferences, so that those users may then access those messages again at any time through Rocket.Chat. + +### Patch Changes + +-
    Updated dependencies [2d89a0c448, 4e8aa575a6]: + + - @rocket.chat/ui-contexts@9.0.0 + - @rocket.chat/ui-avatar@5.0.0 +
    + ## 9.0.0-rc.6 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 73e711d2fced..a60e9a9b2d1f 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-video-conf", - "version": "9.0.0-rc.6", + "version": "9.0.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -36,8 +36,8 @@ "@rocket.chat/fuselage-hooks": "*", "@rocket.chat/icons": "*", "@rocket.chat/styled": "*", - "@rocket.chat/ui-avatar": "5.0.0-rc.6", - "@rocket.chat/ui-contexts": "9.0.0-rc.6", + "@rocket.chat/ui-avatar": "5.0.0", + "@rocket.chat/ui-contexts": "9.0.0", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 65d60ad02088..0107fc049b8f 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.3 + +### Patch Changes + +-
    Updated dependencies [88e5219bd2, 2d89a0c448, 4e8aa575a6, b8e5887fb9]: + + - @rocket.chat/fuselage-ui-kit@9.0.0 + - @rocket.chat/ui-contexts@9.0.0 + - @rocket.chat/ui-avatar@5.0.0 +
    + ## 0.3.3-rc.6 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 4851578db635..0d1d1ab9e246 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/uikit-playground", "private": true, - "version": "0.3.3-rc.6", + "version": "0.3.3", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 1a5ffb63c1a8..871e66b0f29c 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/web-ui-registration +## 9.0.0 + +### Patch Changes + +- ([#32482](https://github.com/RocketChat/Rocket.Chat/pull/32482)) Fixed an issue with blocked login when dismissed 2FA modal by clicking outside of it or pressing the escape key + +-
    Updated dependencies [8fc6ca8b4e, 2d89a0c448, 4e8aa575a6]: + + - @rocket.chat/tools@0.2.2 + - @rocket.chat/ui-contexts@9.0.0 +
    + ## 9.0.0-rc.6 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 3136f8188f83..635633c808e2 100644 --- a/packages/web-ui-registration/package.json +++ b/packages/web-ui-registration/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/web-ui-registration", - "version": "9.0.0-rc.6", + "version": "9.0.0", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -50,8 +50,8 @@ }, "peerDependencies": { "@rocket.chat/layout": "*", - "@rocket.chat/tools": "0.2.2-rc.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.6", + "@rocket.chat/tools": "0.2.2", + "@rocket.chat/ui-contexts": "9.0.0", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 6240d50dc134..a04c45ee1f64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8968,10 +8968,10 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.5 - "@rocket.chat/ui-contexts": 9.0.0-rc.5 + "@rocket.chat/ui-avatar": 5.0.0-rc.6 + "@rocket.chat/ui-contexts": 9.0.0-rc.6 "@rocket.chat/ui-kit": 0.36.0-rc.0 - "@rocket.chat/ui-video-conf": 9.0.0-rc.5 + "@rocket.chat/ui-video-conf": 9.0.0-rc.6 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -9060,8 +9060,8 @@ __metadata: "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": 0.31.29 "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 9.0.0-rc.5 - "@rocket.chat/ui-contexts": 9.0.0-rc.5 + "@rocket.chat/ui-client": 9.0.0-rc.6 + "@rocket.chat/ui-contexts": 9.0.0-rc.6 katex: "*" react: "*" languageName: unknown @@ -10281,7 +10281,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.5 + "@rocket.chat/ui-contexts": 9.0.0-rc.6 react: ~17.0.2 languageName: unknown linkType: soft @@ -10334,7 +10334,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 9.0.0-rc.5 + "@rocket.chat/ui-contexts": 9.0.0-rc.6 react: ~17.0.2 languageName: unknown linkType: soft @@ -10510,8 +10510,8 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 5.0.0-rc.5 - "@rocket.chat/ui-contexts": 9.0.0-rc.5 + "@rocket.chat/ui-avatar": 5.0.0-rc.6 + "@rocket.chat/ui-contexts": 9.0.0-rc.6 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -10601,7 +10601,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": 0.2.2-rc.0 - "@rocket.chat/ui-contexts": 9.0.0-rc.5 + "@rocket.chat/ui-contexts": 9.0.0-rc.6 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From 9f50aafe52910cefc8df14fc1de683107114b797 Mon Sep 17 00:00:00 2001 From: Ricardo Garim Date: Fri, 9 Aug 2024 13:55:00 -0300 Subject: [PATCH 16/49] chore: create getNotResponseByRoomIdUpdateQuery method (#33021) --- .../server/hooks/markRoomNotResponded.ts | 4 ++-- .../meteor/server/models/raw/LivechatRooms.ts | 19 ++++--------------- .../src/models/ILivechatRoomsModel.ts | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts b/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts index 23131cee60a2..01d3014f1c27 100644 --- a/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts +++ b/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts @@ -5,7 +5,7 @@ import { callbacks } from '../../../../lib/callbacks'; callbacks.add( 'afterOmnichannelSaveMessage', - async (message, { room }) => { + (message, { room, roomUpdater }) => { // skips this callback if the message was edited if (!message || isEditedMessage(message)) { return message; @@ -21,7 +21,7 @@ callbacks.add( return message; } - await LivechatRooms.setNotResponseByRoomId(room._id); + LivechatRooms.getNotResponseByRoomIdUpdateQuery(roomUpdater); return message; }, diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts index f3ddb73a7b92..b588b48cef5b 100644 --- a/apps/meteor/server/models/raw/LivechatRooms.ts +++ b/apps/meteor/server/models/raw/LivechatRooms.ts @@ -1983,21 +1983,10 @@ export class LivechatRoomsRaw extends BaseRaw implements ILive return updater; } - setNotResponseByRoomId(roomId: string) { - return this.updateOne( - { - _id: roomId, - t: 'l', - }, - { - $set: { - waitingResponse: true, - }, - $unset: { - responseBy: 1, - }, - }, - ); + getNotResponseByRoomIdUpdateQuery(updater: Updater = this.getUpdater()) { + updater.set('waitingResponse', true); + updater.unset('responseBy'); + return updater; } getAgentLastMessageTsUpdateQuery(updater: Updater = this.getUpdater()) { diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts index a6ed74d0b19a..babfa4ea2165 100644 --- a/packages/model-typings/src/models/ILivechatRoomsModel.ts +++ b/packages/model-typings/src/models/ILivechatRoomsModel.ts @@ -212,7 +212,7 @@ export interface ILivechatRoomsModel extends IBaseModel { responseBy: IOmnichannelRoom['responseBy'], updater?: Updater, ): Updater; - setNotResponseByRoomId(roomId: string): Promise; + getNotResponseByRoomIdUpdateQuery(updater: Updater): Updater; getAgentLastMessageTsUpdateQuery(updater?: Updater): Updater; getAnalyticsUpdateQueryByRoomId( room: IOmnichannelRoom, From 27bd512673afdb61b1d279dfe8b482959d7b03b8 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Sun, 11 Aug 2024 20:38:29 -0300 Subject: [PATCH 17/49] refactor(tests): Align Jest tests (#32550) --- _templates/package/new/jest.config.ts.t | 6 + _templates/package/new/package.json.ejs.t | 8 +- _templates/package/new/tsconfig.json.ejs.t | 4 +- apps/meteor/.mocharc.client.js | 42 -- .../hooks/useAuditMenu.spec.tsx | 61 +- .../hooks/useMarketPlaceMenu.spec.tsx | 52 +- .../hooks/useAdministrationMenu.spec.tsx | 32 +- .../GenericMenu/GenericMenu.spec.tsx | 15 +- .../GenericModal/GenericModal.spec.tsx | 24 +- .../InfoPanel/RetentionPolicyCallout.spec.tsx | 7 +- .../modals/TranscriptModal.spec.tsx | 48 ++ .../Omnichannel/modals/TranscriptModal.tsx | 9 +- .../client/components/WarningModal.spec.tsx | 3 +- .../useToggleReactionMutation.spec.tsx | 20 +- .../content/urlPreviews/buildImageURL.spec.ts | 20 + .../message/variants/RoomMessage.spec.tsx | 112 +++ .../roomActions/useE2EERoomAction.spec.ts | 36 +- apps/meteor/client/hooks/useOTR.spec.tsx | 10 +- .../hooks/usePruneWarningMessage.spec.ts | 15 +- .../unit => }/client/lib/download.spec.ts | 21 +- .../client/lib/federation/Federation.spec.ts | 536 ++++++++++++++ apps/meteor/client/lib/minimongo/bson.spec.ts | 34 + .../client/lib/minimongo/comparisons.spec.ts | 129 ++++ .../client/lib/minimongo/lookups.spec.ts | 10 + .../lib/parseMessageTextToAstMarkdown.spec.ts | 550 ++++++++++++++ .../lib/utils/isRTLScriptLanguage.spec.ts | 26 + .../client/lib/utils/waitForElement.spec.ts | 18 + .../lib/parseStringToIceServers.spec.ts | 5 +- .../ModalProvider/ModalProvider.spec.tsx | 2 +- .../FederatedRoomList.tsx | 5 +- .../FederatedRoomListItem.tsx | 6 +- .../MatrixFederationManageServerModal.tsx | 15 +- .../MatrixFederationRemoveServerList.tsx | 14 +- .../MatrixFederationSearch.spec.tsx | 154 ++++ .../MatrixFederationSearch.tsx | 6 +- .../MatrixFederationSearchModalContent.tsx | 9 +- .../hooks/useAdministrationItems.spec.tsx | 8 +- .../actions/hooks/useAppsItems.spec.tsx | 54 +- .../actions/hooks/useAuditItems.spec.tsx | 57 +- .../hooks/useGroupingListItems.spec.tsx | 4 +- .../actions/hooks/useSortModeItems.spec.tsx | 4 +- .../actions/hooks/useViewModeItems.spec.tsx | 4 +- .../hooks/useGroupingListItems.spec.tsx | 4 +- .../actions/hooks/useSortModeItems.spec.tsx | 4 +- .../actions/hooks/useViewModeItems.spec.tsx | 4 +- .../inputs/TimespanSettingInput.spec.tsx | 33 +- .../tabs/AppStatus/AppStatus.spec.tsx | 5 +- .../client/views/marketplace/AppMenu.spec.tsx | 2 +- .../helpers/filterAppsByCategories.spec.ts} | 12 +- .../helpers/filterAppsByFree.spec.ts} | 15 +- .../helpers/filterAppsByPaid.spec.ts} | 15 +- .../helpers/filterAppsByText.spec.ts} | 10 +- ...tAppsByAlphabeticalOrInverseOrder.spec.ts} | 13 +- ...ClosestOrFarthestModificationDate.spec.ts} | 13 +- .../views/notFound/NotFoundPage.spec.tsx | 49 ++ .../room/MessageList/hooks/useKatex.spec.ts | 64 ++ .../MessageList/lib/autoTranslate.spec.ts | 37 + .../MessageList/lib/isMessageNewDay.spec.ts | 59 ++ .../lib/isMessageSequential.spec.ts | 164 +++++ .../MessageList/lib/isOwnUserMessage.spec.ts | 63 ++ .../MessageList/lib/isParsedMessage.spec.ts | 47 ++ .../room/MessageList/lib/isValidLink.spec.ts | 6 +- .../room/body/RetentionPolicyWarning.spec.tsx | 7 +- .../VideoConference/VideoConfBlockModal.tsx | 1 + .../hooks/useVideoConfOpenCall.spec.tsx | 85 ++- .../views/room/lib/getRoomGroup.spec.ts | 21 + .../MainLayout/MainLayoutStyleTags.spec.tsx | 21 + .../client/views/root/SAMLLoginRoute.spec.tsx | 107 +++ apps/meteor/package.json | 20 +- .../tests/end-to-end/api/livechat/00-rooms.ts | 1 - .../tests/mocks/client/ServerProviderMock.tsx | 6 +- apps/meteor/tests/mocks/client/blobUrls.ts | 23 - apps/meteor/tests/mocks/client/jsdom.ts | 9 - .../tests/setup/cleanupTestingLibrary.ts | 17 - apps/meteor/tests/setup/hoistedReact.ts | 15 - .../meteor/tests/setup/registerWebApiMocks.ts | 5 - .../tests/unit/app/ui-utils/client.tests.ts | 41 -- .../modals/TranscriptModal.spec.tsx | 51 -- .../client/lib/federation/Federation.test.ts | 489 ------------- .../unit/client/lib/getRoomGroup.spec.ts | 25 - .../unit/client/lib/minimongo/bson.spec.ts | 37 - .../client/lib/minimongo/comparisons.spec.ts | 134 ---- .../unit/client/lib/minimongo/lookups.spec.ts | 13 - .../lib/utils/isRTLScriptLanguage.spec.ts | 30 - .../MatrixFederationSearch.spec.tsx | 192 ----- .../views/notFound/NotFoundPage.spec.tsx | 51 -- .../views/room/MessageList/Message.test.tsx | 101 --- .../room/MessageList/hooks/useKatex.test.ts | 67 -- .../MessageList/lib/autoTranslate.spec.ts | 43 -- .../MessageList/lib/buildImageURL.spec.ts | 24 - .../MessageList/lib/isMessageNewDay.spec.ts | 61 -- .../lib/isMessageSequential.spec.ts | 168 ----- .../MessageList/lib/isOwnUserMessage.spec.ts | 67 -- .../MessageList/lib/isParsedMessage.spec.ts | 51 -- .../room/MessageList/lib/parseMessage.spec.ts | 317 --------- .../lib/parseMessageAttachment.spec.ts | 191 ----- .../lib/parseMessageAttachments.spec.ts | 236 ------ .../client/views/root/SAMLLoginRoute.spec.tsx | 89 --- ee/packages/api-client/jest.config.ts | 18 +- ee/packages/api-client/package.json | 14 +- ee/packages/ddp-client/jest.config.ts | 19 +- ee/packages/ddp-client/package.json | 15 +- ee/packages/license/jest.config.ts | 21 +- ee/packages/license/package.json | 15 +- .../omnichannel-services/jest.config.ts | 13 +- ee/packages/omnichannel-services/package.json | 2 +- .../src/OmnichannelTranscript.spec.ts | 1 - ee/packages/pdf-worker/jest.config.ts | 29 +- ee/packages/pdf-worker/jest.worker.config.ts | 5 - ee/packages/pdf-worker/package.json | 21 +- .../src/strategies/ChatTranscript.spec.ts | 1 - .../ChatTranscript/components/Files.spec.tsx | 1 - .../components/MessageList.spec.tsx | 1 - ee/packages/pdf-worker/src/worker.spec.ts | 109 +-- ee/packages/pdf-worker/tsconfig.build.json | 11 + ee/packages/pdf-worker/tsconfig.json | 8 +- ee/packages/presence/jest.config.ts | 6 + ee/packages/presence/package.json | 6 +- ee/packages/ui-theming/package.json | 14 - packages/account-utils/package.json | 4 - packages/agenda/package.json | 4 - packages/apps/package.json | 4 - packages/base64/jest.config.ts | 7 +- packages/base64/package.json | 2 +- packages/cas-validate/package.json | 4 - packages/core-services/jest.config.ts | 6 + packages/core-services/package.json | 8 +- packages/cron/package.json | 4 - packages/fuselage-ui-kit/jest.config.ts | 40 +- packages/fuselage-ui-kit/jest.setup.ts | 11 - packages/fuselage-ui-kit/package.json | 11 +- .../ChannelsSelectElement.spec.tsx | 5 +- .../MultiChannelsSelectElement.spec.tsx | 3 +- .../MultiUsersSelectElement.spec.tsx | 3 +- .../UserSelectElement.spec.tsx | 3 +- .../src/hooks/useAppTranslation.spec.tsx | 63 +- .../{tsconfig-cjs.json => tsconfig.cjs.json} | 2 +- .../{tsconfig-esm.json => tsconfig.esm.json} | 2 +- packages/fuselage-ui-kit/tsconfig.json | 7 +- packages/gazzodown/jest.config.ts | 36 +- packages/gazzodown/package.json | 19 +- packages/gazzodown/src/Markup.spec.tsx | 29 +- packages/gazzodown/tsconfig.build.json | 9 + packages/gazzodown/tsconfig.json | 7 +- packages/i18n/babel.config.cjs | 3 - packages/i18n/jest.config.mjs | 6 - packages/i18n/jest.config.ts | 9 + packages/i18n/package.json | 8 +- packages/i18n/src/index.spec.mjs | 2 + packages/i18n/tsconfig.json | 9 + packages/jest-presets/package.json | 5 +- .../jest-presets/src/client/jest-preset.ts | 7 +- .../jest-presets/src/server/jest-preset.ts | 12 +- packages/jwt/jest.config.js | 5 - packages/jwt/jest.config.ts | 6 + packages/jwt/package.json | 15 +- packages/log-format/package.json | 4 - packages/logger/package.json | 4 - packages/message-parser/jest.config.js | 12 - packages/message-parser/jest.config.ts | 12 + packages/message-parser/package.json | 11 +- packages/mock-providers/package.json | 14 +- .../src/MockedAppRootBuilder.tsx | 91 ++- packages/model-typings/package.json | 4 - packages/models/jest.config.ts | 18 +- packages/models/package.json | 11 +- packages/node-poplib/package.json | 6 - packages/password-policies/jest.config.ts | 7 +- packages/password-policies/package.json | 12 +- .../src/PasswordPolicy.spec.ts | 219 ++++++ ...sswordPolicyClass.ts => PasswordPolicy.ts} | 0 packages/password-policies/src/index.ts | 2 +- .../tests/passwordPolicyClass.test.ts | 223 ------ packages/patch-injection/jest.config.ts | 7 +- packages/patch-injection/package.json | 9 +- .../patch-injection/src/makeFunction.spec.ts | 236 ++++++ .../patch-injection/tests/patches.test.ts | 240 ------- packages/peggy-loader/jest.config.js | 5 - packages/peggy-loader/package.json | 6 +- .../{tsconfig-cjs.json => tsconfig.cjs.json} | 0 packages/random/jest.config.ts | 19 +- packages/random/package.json | 4 +- packages/random/src/main.client.spec.ts | 4 - packages/rest-typings/jest.config.ts | 6 - packages/rest-typings/package.json | 11 +- .../server-cloud-communication/package.json | 4 - packages/server-fetch/package.json | 4 - packages/sha256/jest.config.ts | 7 +- packages/sha256/package.json | 3 +- packages/tools/jest.config.ts | 8 +- packages/tools/package.json | 2 +- packages/ui-client/jest.config.ts | 31 +- packages/ui-client/package.json | 15 +- .../FeaturePreview/FeaturePreview.spec.tsx | 3 +- .../PasswordVerifiers.spec.tsx | 6 + .../src/hooks/useDocumentTitle.spec.ts | 15 +- .../src/hooks/useFeaturePreview.spec.tsx | 12 +- .../src/hooks/useFeaturePreviewList.spec.tsx | 13 +- .../src/hooks/useValidatePassword.spec.ts | 4 +- packages/ui-client/tsconfig-build.json | 4 - packages/ui-client/tsconfig.build.json | 9 + packages/ui-client/tsconfig.json | 5 - packages/ui-composer/package.json | 4 - packages/ui-contexts/package.json | 4 - packages/ui-kit/jest.config.js | 8 - packages/ui-kit/jest.config.ts | 6 + packages/ui-kit/package.json | 2 +- packages/ui-kit/tsconfig.cjs.json | 2 +- packages/ui-kit/tsconfig.esm.json | 2 +- packages/ui-video-conf/package.json | 1 - packages/web-ui-registration/package.json | 6 +- yarn.lock | 672 ++++++------------ 212 files changed, 3903 insertions(+), 4486 deletions(-) create mode 100644 _templates/package/new/jest.config.ts.t delete mode 100644 apps/meteor/.mocharc.client.js create mode 100644 apps/meteor/client/components/Omnichannel/modals/TranscriptModal.spec.tsx create mode 100644 apps/meteor/client/components/message/content/urlPreviews/buildImageURL.spec.ts create mode 100644 apps/meteor/client/components/message/variants/RoomMessage.spec.tsx rename apps/meteor/{tests/unit => }/client/lib/download.spec.ts (71%) create mode 100644 apps/meteor/client/lib/federation/Federation.spec.ts create mode 100644 apps/meteor/client/lib/minimongo/bson.spec.ts create mode 100644 apps/meteor/client/lib/minimongo/comparisons.spec.ts create mode 100644 apps/meteor/client/lib/minimongo/lookups.spec.ts create mode 100644 apps/meteor/client/lib/parseMessageTextToAstMarkdown.spec.ts create mode 100644 apps/meteor/client/lib/utils/isRTLScriptLanguage.spec.ts create mode 100644 apps/meteor/client/lib/utils/waitForElement.spec.ts rename apps/meteor/{tests/unit => }/client/providers/CallProvider/lib/parseStringToIceServers.spec.ts (93%) create mode 100644 apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.spec.tsx rename apps/meteor/{tests/unit/client/views/admin/apps/helpers/filterAppsByCategories.test.ts => client/views/marketplace/helpers/filterAppsByCategories.spec.ts} (62%) rename apps/meteor/{tests/unit/client/views/admin/apps/helpers/filterAppsByFree.test.ts => client/views/marketplace/helpers/filterAppsByFree.spec.ts} (78%) rename apps/meteor/{tests/unit/client/views/admin/apps/helpers/filterAppsByPaid.test.ts => client/views/marketplace/helpers/filterAppsByPaid.spec.ts} (79%) rename apps/meteor/{tests/unit/client/views/admin/apps/helpers/filterAppsByText.test.ts => client/views/marketplace/helpers/filterAppsByText.spec.ts} (65%) rename apps/meteor/{tests/unit/client/views/admin/apps/helpers/sortAppsByAlphabeticalOrInverseOrder.test.ts => client/views/marketplace/helpers/sortAppsByAlphabeticalOrInverseOrder.spec.ts} (71%) rename apps/meteor/{tests/unit/client/views/admin/apps/helpers/sortAppsByClosestOrFarthestModificationDate.test.ts => client/views/marketplace/helpers/sortAppsByClosestOrFarthestModificationDate.spec.ts} (73%) create mode 100644 apps/meteor/client/views/notFound/NotFoundPage.spec.tsx create mode 100644 apps/meteor/client/views/room/MessageList/hooks/useKatex.spec.ts create mode 100644 apps/meteor/client/views/room/MessageList/lib/autoTranslate.spec.ts create mode 100644 apps/meteor/client/views/room/MessageList/lib/isMessageNewDay.spec.ts create mode 100644 apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts create mode 100644 apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts create mode 100644 apps/meteor/client/views/room/MessageList/lib/isParsedMessage.spec.ts rename apps/meteor/{tests/unit => }/client/views/room/MessageList/lib/isValidLink.spec.ts (74%) create mode 100644 apps/meteor/client/views/room/lib/getRoomGroup.spec.ts create mode 100644 apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx delete mode 100644 apps/meteor/tests/mocks/client/blobUrls.ts delete mode 100644 apps/meteor/tests/mocks/client/jsdom.ts delete mode 100644 apps/meteor/tests/setup/cleanupTestingLibrary.ts delete mode 100644 apps/meteor/tests/setup/hoistedReact.ts delete mode 100644 apps/meteor/tests/setup/registerWebApiMocks.ts delete mode 100644 apps/meteor/tests/unit/app/ui-utils/client.tests.ts delete mode 100644 apps/meteor/tests/unit/client/components/Omnichannel/modals/TranscriptModal.spec.tsx delete mode 100644 apps/meteor/tests/unit/client/lib/federation/Federation.test.ts delete mode 100644 apps/meteor/tests/unit/client/lib/getRoomGroup.spec.ts delete mode 100644 apps/meteor/tests/unit/client/lib/minimongo/bson.spec.ts delete mode 100644 apps/meteor/tests/unit/client/lib/minimongo/comparisons.spec.ts delete mode 100644 apps/meteor/tests/unit/client/lib/minimongo/lookups.spec.ts delete mode 100644 apps/meteor/tests/unit/client/lib/utils/isRTLScriptLanguage.spec.ts delete mode 100644 apps/meteor/tests/unit/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.spec.tsx delete mode 100644 apps/meteor/tests/unit/client/views/notFound/NotFoundPage.spec.tsx delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/Message.test.tsx delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/hooks/useKatex.test.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/autoTranslate.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/buildImageURL.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/isMessageNewDay.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/isMessageSequential.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/isParsedMessage.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/parseMessage.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/parseMessageAttachment.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/room/MessageList/lib/parseMessageAttachments.spec.ts delete mode 100644 apps/meteor/tests/unit/client/views/root/SAMLLoginRoute.spec.tsx delete mode 100644 ee/packages/pdf-worker/jest.worker.config.ts create mode 100644 ee/packages/pdf-worker/tsconfig.build.json create mode 100644 ee/packages/presence/jest.config.ts create mode 100644 packages/core-services/jest.config.ts delete mode 100644 packages/fuselage-ui-kit/jest.setup.ts rename packages/fuselage-ui-kit/{tsconfig-cjs.json => tsconfig.cjs.json} (78%) rename packages/fuselage-ui-kit/{tsconfig-esm.json => tsconfig.esm.json} (78%) create mode 100644 packages/gazzodown/tsconfig.build.json delete mode 100644 packages/i18n/babel.config.cjs delete mode 100644 packages/i18n/jest.config.mjs create mode 100644 packages/i18n/jest.config.ts create mode 100644 packages/i18n/tsconfig.json delete mode 100644 packages/jwt/jest.config.js create mode 100644 packages/jwt/jest.config.ts delete mode 100644 packages/message-parser/jest.config.js create mode 100644 packages/message-parser/jest.config.ts create mode 100644 packages/password-policies/src/PasswordPolicy.spec.ts rename packages/password-policies/src/{PasswordPolicyClass.ts => PasswordPolicy.ts} (100%) delete mode 100644 packages/password-policies/tests/passwordPolicyClass.test.ts create mode 100644 packages/patch-injection/src/makeFunction.spec.ts delete mode 100644 packages/patch-injection/tests/patches.test.ts delete mode 100644 packages/peggy-loader/jest.config.js rename packages/peggy-loader/{tsconfig-cjs.json => tsconfig.cjs.json} (100%) delete mode 100644 packages/rest-typings/jest.config.ts delete mode 100644 packages/ui-client/tsconfig-build.json create mode 100644 packages/ui-client/tsconfig.build.json delete mode 100644 packages/ui-kit/jest.config.js create mode 100644 packages/ui-kit/jest.config.ts diff --git a/_templates/package/new/jest.config.ts.t b/_templates/package/new/jest.config.ts.t new file mode 100644 index 000000000000..c18c8ae02465 --- /dev/null +++ b/_templates/package/new/jest.config.ts.t @@ -0,0 +1,6 @@ +import server from '@rocket.chat/jest-presets/server'; +import type { Config } from 'jest'; + +export default { + preset: server.preset, +} satisfies Config; diff --git a/_templates/package/new/package.json.ejs.t b/_templates/package/new/package.json.ejs.t index 950e5cb2bf62..6bee52f55927 100644 --- a/_templates/package/new/package.json.ejs.t +++ b/_templates/package/new/package.json.ejs.t @@ -7,11 +7,11 @@ to: packages/<%= name %>/package.json "version": "0.0.1", "private": true, "devDependencies": { - "@types/jest": "~29.5.3", + "@rocket.chat/jest-presets": "workspace:~", + "@types/jest": "~29.5.12", "eslint": "~8.45.0", - "jest": "~29.6.1", - "ts-jest": "~29.0.5", - "typescript": "~5.1.6" + "jest": "~29.7.0", + "typescript": "~5.3.3" }, "scripts": { "lint": "eslint --ext .js,.jsx,.ts,.tsx .", diff --git a/_templates/package/new/tsconfig.json.ejs.t b/_templates/package/new/tsconfig.json.ejs.t index 3e192c674d1b..399544502ed0 100644 --- a/_templates/package/new/tsconfig.json.ejs.t +++ b/_templates/package/new/tsconfig.json.ejs.t @@ -2,10 +2,10 @@ to: packages/<%= name %>/tsconfig.json --- { - "extends": "../../tsconfig.base.client.json", + "extends": "../../tsconfig.base.server.json", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" }, - "include": ["./src/**/*"] + "include": ["./src/**/*"], } diff --git a/apps/meteor/.mocharc.client.js b/apps/meteor/.mocharc.client.js deleted file mode 100644 index cf339a420378..000000000000 --- a/apps/meteor/.mocharc.client.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict'; - -/** - * Mocha configuration for client-side unit and integration tests. - */ - -const base = require('./.mocharc.base.json'); - -/** - * Mocha will run `ts-node` without doing type checking to speed-up the tests. It should be fine as `npm run typecheck` - * covers test files too. - */ - -Object.assign( - process.env, - { - TS_NODE_FILES: true, - TS_NODE_TRANSPILE_ONLY: true, - }, - process.env, -); - -module.exports = { - ...base, // see https://github.com/mochajs/mocha/issues/3916 - require: [ - ...base.require, - './tests/setup/registerWebApiMocks.ts', - './tests/setup/hoistedReact.ts', - './tests/setup/cleanupTestingLibrary.ts', - ], - reporter: 'dot', - timeout: 5000, - exit: false, - slow: 200, - spec: [ - 'tests/unit/client/sidebar/**/*.spec.{ts,tsx}', - 'tests/unit/client/components/**/*.spec.{ts,tsx}', - 'tests/unit/client/lib/**/*.spec.{ts,tsx}', - 'tests/unit/lib/**/*.tests.ts', - 'tests/unit/client/**/*.test.ts', - ], -}; diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.spec.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.spec.tsx index 11eddf934055..94fdfe25a92d 100644 --- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.spec.tsx +++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.spec.tsx @@ -1,10 +1,11 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; -import { renderHook } from '@testing-library/react-hooks'; +import { renderHook, waitFor } from '@testing-library/react'; import { useAuditMenu } from './useAuditMenu'; it('should return an empty array of items if doesn`t have license', async () => { - const { result, waitFor } = renderHook(() => useAuditMenu(), { + const { result } = renderHook(() => useAuditMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/licenses.info', () => ({ // @ts-expect-error: just for testing @@ -18,13 +19,12 @@ it('should return an empty array of items if doesn`t have license', async () => .build(), }); - await waitFor(() => result.all.length > 1); - - expect(result.current).toEqual([]); + await waitFor(() => expect(result.current).toEqual([])); }); it('should return an empty array of items if have license and not have permissions', async () => { - const { result, waitFor } = renderHook(() => useAuditMenu(), { + const { result } = renderHook(() => useAuditMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/licenses.info', () => ({ license: { @@ -41,13 +41,12 @@ it('should return an empty array of items if have license and not have permissio .build(), }); - await waitFor(() => result.all.length > 1); - - expect(result.current).toEqual([]); + await waitFor(() => expect(result.current).toEqual([])); }); it('should return auditItems if have license and permissions', async () => { - const { result, waitFor } = renderHook(() => useAuditMenu(), { + const { result } = renderHook(() => useAuditMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/licenses.info', () => ({ license: { @@ -65,12 +64,12 @@ it('should return auditItems if have license and permissions', async () => { .build(), }); - await waitFor(() => result.current.length > 0); - - expect(result.current[0].items[0]).toEqual( - expect.objectContaining({ - id: 'messages', - }), + await waitFor(() => + expect(result.current[0]?.items[0]).toEqual( + expect.objectContaining({ + id: 'messages', + }), + ), ); expect(result.current[0].items[1]).toEqual( @@ -81,7 +80,8 @@ it('should return auditItems if have license and permissions', async () => { }); it('should return auditMessages item if have license and can-audit permission', async () => { - const { result, waitFor } = renderHook(() => useAuditMenu(), { + const { result } = renderHook(() => useAuditMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/licenses.info', () => ({ license: { @@ -98,17 +98,18 @@ it('should return auditMessages item if have license and can-audit permission', .build(), }); - await waitFor(() => result.current.length > 0); - - expect(result.current[0].items[0]).toEqual( - expect.objectContaining({ - id: 'messages', - }), + await waitFor(() => + expect(result.current[0]?.items[0]).toEqual( + expect.objectContaining({ + id: 'messages', + }), + ), ); }); it('should return audiLogs item if have license and can-audit-log permission', async () => { - const { result, waitFor } = renderHook(() => useAuditMenu(), { + const { result } = renderHook(() => useAuditMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/licenses.info', () => ({ license: { @@ -125,11 +126,11 @@ it('should return audiLogs item if have license and can-audit-log permission', a .build(), }); - await waitFor(() => result.current.length > 0); - - expect(result.current[0].items[0]).toEqual( - expect.objectContaining({ - id: 'auditLog', - }), + await waitFor(() => + expect(result.current[0]?.items[0]).toEqual( + expect.objectContaining({ + id: 'auditLog', + }), + ), ); }); diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.spec.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.spec.tsx index 2a3d277e69fe..d2d1e36ca05e 100644 --- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.spec.tsx +++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useMarketPlaceMenu.spec.tsx @@ -1,11 +1,12 @@ import { UIActionButtonContext } from '@rocket.chat/apps-engine/definition/ui'; import { mockAppRoot } from '@rocket.chat/mock-providers'; -import { renderHook } from '@testing-library/react-hooks'; +import { renderHook, waitFor } from '@testing-library/react'; import { useMarketPlaceMenu } from './useMarketPlaceMenu'; it('should return and empty array if the user does not have `manage-apps` and `access-marketplace` permission', () => { const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => []) .build(), @@ -16,6 +17,7 @@ it('should return and empty array if the user does not have `manage-apps` and `a it('should return `explore` and `installed` items if the user has `access-marketplace` permission', () => { const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => []) .withPermission('access-marketplace') @@ -37,6 +39,7 @@ it('should return `explore` and `installed` items if the user has `access-market it('should return `explore`, `installed` and `requested` items if the user has `manage-apps` permission', () => { const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => []) .withEndpoint('GET', '/apps/app-request/stats', () => ({ @@ -69,7 +72,8 @@ it('should return `explore`, `installed` and `requested` items if the user has ` }); it('should return one action from the server with no conditions', async () => { - const { result, waitForValueToChange } = renderHook(() => useMarketPlaceMenu(), { + const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => [ { @@ -101,18 +105,19 @@ it('should return one action from the server with no conditions', async () => { }), ); - await waitForValueToChange(() => result.current[0].items[3]); - - expect(result.current[0].items[3]).toEqual( - expect.objectContaining({ - id: 'APP_ID_ACTION_ID', - }), + await waitFor(() => + expect(result.current[0]?.items[3]).toEqual( + expect.objectContaining({ + id: 'APP_ID_ACTION_ID', + }), + ), ); }); describe('Marketplace menu with role conditions', () => { it('should return the action if the user has admin role', async () => { - const { result, waitForValueToChange } = renderHook(() => useMarketPlaceMenu(), { + const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => [ { @@ -149,17 +154,18 @@ describe('Marketplace menu with role conditions', () => { }), ); - await waitForValueToChange(() => result.current[0].items[3]); - - expect(result.current[0].items[3]).toEqual( - expect.objectContaining({ - id: 'APP_ID_ACTION_ID', - }), + await waitFor(() => + expect(result.current[0]?.items[3]).toEqual( + expect.objectContaining({ + id: 'APP_ID_ACTION_ID', + }), + ), ); }); it('should return filter the action if the user doesn`t have admin role', async () => { const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => [ { @@ -206,7 +212,8 @@ describe('Marketplace menu with role conditions', () => { describe('Marketplace menu with permission conditions', () => { it('should return the action if the user has manage-apps permission', async () => { - const { result, waitForValueToChange } = renderHook(() => useMarketPlaceMenu(), { + const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => [ { @@ -241,17 +248,18 @@ describe('Marketplace menu with permission conditions', () => { }), ); - await waitForValueToChange(() => result.current[0].items[3]); - - expect(result.current[0].items[3]).toEqual( - expect.objectContaining({ - id: 'APP_ID_ACTION_ID', - }), + await waitFor(() => + expect(result.current[0].items[3]).toEqual( + expect.objectContaining({ + id: 'APP_ID_ACTION_ID', + }), + ), ); }); it('should return filter the action if the user doesn`t have `any` permission', async () => { const { result } = renderHook(() => useMarketPlaceMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/apps/actionButtons', () => [ { diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.spec.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.spec.tsx index 1315d1053392..ba100fe79783 100644 --- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.spec.tsx +++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.spec.tsx @@ -1,10 +1,11 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; -import { renderHook } from '@testing-library/react-hooks'; +import { renderHook, waitFor } from '@testing-library/react'; import { useAdministrationMenu } from './useAdministrationMenu'; it('should return omnichannel item if has `view-livechat-manager` permission ', async () => { - const { result, waitFor } = renderHook(() => useAdministrationMenu(), { + const { result } = renderHook(() => useAdministrationMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/licenses.info', () => ({ // @ts-expect-error this is a mock @@ -19,17 +20,18 @@ it('should return omnichannel item if has `view-livechat-manager` permission ', .build(), }); - await waitFor(() => !!result.current.length); - - expect(result.current[0].items[0]).toEqual( - expect.objectContaining({ - id: 'omnichannel', - }), + await waitFor(() => + expect(result.current[0]?.items[0]).toEqual( + expect.objectContaining({ + id: 'omnichannel', + }), + ), ); }); it('should show administration item if has at least one admin permission', async () => { - const { result, waitFor } = renderHook(() => useAdministrationMenu(), { + const { result } = renderHook(() => useAdministrationMenu(), { + legacyRoot: true, wrapper: mockAppRoot() .withEndpoint('GET', '/v1/licenses.info', () => ({ // @ts-expect-error this is a mock @@ -44,11 +46,11 @@ it('should show administration item if has at least one admin permission', async .build(), }); - await waitFor(() => !!result.current.length); - - expect(result.current[0].items[0]).toEqual( - expect.objectContaining({ - id: 'workspace', - }), + await waitFor(() => + expect(result.current[0]?.items[0]).toEqual( + expect.objectContaining({ + id: 'workspace', + }), + ), ); }); diff --git a/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx b/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx index 99e62bac1a60..530bd1404dc7 100644 --- a/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx +++ b/apps/meteor/client/components/GenericMenu/GenericMenu.spec.tsx @@ -1,4 +1,3 @@ -import '@testing-library/jest-dom'; import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; @@ -32,28 +31,28 @@ const sections = [regular, danger]; describe('Room Actions Menu', () => { it('should render kebab menu with the list content', async () => { - render(); + render(, { legacyRoot: true }); - userEvent.click(screen.getByRole('button')); + await userEvent.click(screen.getByRole('button')); expect(await screen.findByText('Edit')).toBeInTheDocument(); expect(await screen.findByText('Delete')).toBeInTheDocument(); }); it('should have two different sections, regular and danger', async () => { - render(); + render(, { legacyRoot: true }); - userEvent.click(screen.getByRole('button')); + await userEvent.click(screen.getByRole('button')); expect(screen.getAllByRole('presentation')).toHaveLength(2); expect(screen.getByRole('separator')).toBeInTheDocument(); }); it('should call the action when item clicked', async () => { - render(); + render(, { legacyRoot: true }); - userEvent.click(screen.getByRole('button')); - userEvent.click(screen.getAllByRole('menuitem')[0]); + await userEvent.click(screen.getByRole('button')); + await userEvent.click(screen.getAllByRole('menuitem')[0]); expect(mockedFunction).toHaveBeenCalled(); }); diff --git a/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx b/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx index 0ef7235729c4..b47b6abf7b00 100644 --- a/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx +++ b/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx @@ -1,6 +1,5 @@ import { useSetModal } from '@rocket.chat/ui-contexts'; -import { act, screen } from '@testing-library/react'; -import { renderHook } from '@testing-library/react-hooks'; +import { act, screen, renderHook } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import type { ReactElement } from 'react'; import React, { Suspense } from 'react'; @@ -8,12 +7,11 @@ import React, { Suspense } from 'react'; import ModalProviderWithRegion from '../../providers/ModalProvider/ModalProviderWithRegion'; import GenericModal from './GenericModal'; -import '@testing-library/jest-dom'; - const renderModal = (modalElement: ReactElement) => { const { result: { current: setModal }, } = renderHook(() => useSetModal(), { + legacyRoot: true, wrapper: ({ children }) => ( {children} @@ -34,11 +32,11 @@ describe('callbacks', () => { renderModal(); - expect(await screen.findByRole('heading', { name: 'Modal', exact: true })).toBeInTheDocument(); + expect(await screen.findByRole('heading', { name: 'Modal' })).toBeInTheDocument(); - userEvent.keyboard('{Escape}'); + await userEvent.keyboard('{Escape}'); - expect(screen.queryByRole('heading', { name: 'Modal', exact: true })).not.toBeInTheDocument(); + expect(screen.queryByRole('heading', { name: 'Modal' })).not.toBeInTheDocument(); expect(handleClose).toHaveBeenCalled(); }); @@ -49,9 +47,9 @@ describe('callbacks', () => { const { setModal } = renderModal(); - expect(await screen.findByRole('heading', { name: 'Modal', exact: true })).toBeInTheDocument(); + expect(await screen.findByRole('heading', { name: 'Modal' })).toBeInTheDocument(); - userEvent.click(screen.getByRole('button', { name: 'Ok', exact: true })); + await userEvent.click(screen.getByRole('button', { name: 'Ok' })); expect(handleConfirm).toHaveBeenCalled(); @@ -59,7 +57,7 @@ describe('callbacks', () => { setModal(null); }); - expect(screen.queryByRole('heading', { name: 'Modal', exact: true })).not.toBeInTheDocument(); + expect(screen.queryByRole('heading', { name: 'Modal' })).not.toBeInTheDocument(); expect(handleClose).not.toHaveBeenCalled(); }); @@ -70,9 +68,9 @@ describe('callbacks', () => { const { setModal } = renderModal(); - expect(await screen.findByRole('heading', { name: 'Modal', exact: true })).toBeInTheDocument(); + expect(await screen.findByRole('heading', { name: 'Modal' })).toBeInTheDocument(); - userEvent.click(screen.getByRole('button', { name: 'Cancel', exact: true })); + await userEvent.click(screen.getByRole('button', { name: 'Cancel' })); expect(handleCancel).toHaveBeenCalled(); @@ -80,7 +78,7 @@ describe('callbacks', () => { setModal(null); }); - expect(screen.queryByRole('heading', { name: 'Modal', exact: true })).not.toBeInTheDocument(); + expect(screen.queryByRole('heading', { name: 'Modal' })).not.toBeInTheDocument(); expect(handleClose).not.toHaveBeenCalled(); }); diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx index fb97b0132f85..8db42e8c649d 100644 --- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx +++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx @@ -1,6 +1,5 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import '@testing-library/jest-dom/extend-expect'; import { createRenteionPolicySettingsMock as createMock } from '../../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../../tests/mocks/data'; @@ -15,13 +14,17 @@ beforeEach(() => { describe('RetentionPolicyCallout', () => { it('Should render callout if settings are valid', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - render(, { wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000 }) }); + render(, { + legacyRoot: true, + wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000 }), + }); expect(screen.getByRole('alert')).toHaveTextContent('a minute June 1, 2024, 12:30 AM'); }); it('Should not render callout if settings are invalid', () => { const fakeRoom = createFakeRoom({ t: 'c' }); render(, { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, advancedPrecisionCron: '* * * 12 *', advancedPrecision: true }), }); expect(screen.queryByRole('alert')).not.toBeInTheDocument(); diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.spec.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.spec.tsx new file mode 100644 index 000000000000..87f7f70fbfbb --- /dev/null +++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.spec.tsx @@ -0,0 +1,48 @@ +import type { IOmnichannelRoom } from '@rocket.chat/core-typings'; +import { render, screen } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import React from 'react'; + +import TranscriptModal from './TranscriptModal'; + +const room = { + open: true, + v: { token: '1234567890' }, + transcriptRequest: { + email: 'example@example.com', + subject: 'Transcript of livechat conversation', + }, +} as IOmnichannelRoom; + +const defaultProps = { + room, + email: 'test@example.com', + onRequest: () => null, + onSend: () => null, + onCancel: () => null, + onDiscard: () => null, +}; + +it('should show Undo request button when roomOpen is true and transcriptRequest exist', async () => { + const onDiscardMock = jest.fn(); + render(, { legacyRoot: true }); + + const undoRequestButton = await screen.findByText('Undo_request'); + await userEvent.click(undoRequestButton); + + expect(onDiscardMock).toHaveBeenCalled(); +}); + +it('should show Request button when roomOpen is true and transcriptRequest not exist', async () => { + render(, { legacyRoot: true }); + + const requestBtn = await screen.findByRole('button', { name: 'request-button' }); + expect(requestBtn).toBeInTheDocument(); +}); + +it('should show Send button when roomOpen is false', async () => { + render(, { legacyRoot: true }); + + const sendBtn = await screen.findByRole('button', { name: 'send-button' }); + expect(sendBtn).toBeInTheDocument(); +}); diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx index 95bda1e89107..c06b6a190465 100644 --- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx +++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx @@ -21,8 +21,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on handleSubmit, setValue, setFocus, - watch, - formState: { errors, isValid, isSubmitting }, + formState: { errors, isSubmitting }, } = useForm({ defaultValues: { email: emailDefault || '', subject: t('Transcript_of_your_livechat_conversation') }, }); @@ -56,7 +55,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on } }, [setValue, transcriptRequest]); - const canSubmit = isValid && Boolean(watch('subject')); + // const canSubmit = isValid && Boolean(watch('subject')); return ( } {...props}> @@ -103,12 +102,12 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on )} {roomOpen && !transcriptRequest && ( - )} {!roomOpen && ( - )} diff --git a/apps/meteor/client/components/WarningModal.spec.tsx b/apps/meteor/client/components/WarningModal.spec.tsx index 8a3ec4f47f8b..5747402d2d8b 100644 --- a/apps/meteor/client/components/WarningModal.spec.tsx +++ b/apps/meteor/client/components/WarningModal.spec.tsx @@ -4,10 +4,9 @@ import React from 'react'; import WarningModal from './WarningModal'; -import '@testing-library/jest-dom'; - it('should look good', async () => { render( undefined} close={() => undefined} />, { + legacyRoot: true, wrapper: mockAppRoot().build(), }); diff --git a/apps/meteor/client/components/message/content/reactions/useToggleReactionMutation.spec.tsx b/apps/meteor/client/components/message/content/reactions/useToggleReactionMutation.spec.tsx index 43da25f4f6b5..dfbe0fc07bed 100644 --- a/apps/meteor/client/components/message/content/reactions/useToggleReactionMutation.spec.tsx +++ b/apps/meteor/client/components/message/content/reactions/useToggleReactionMutation.spec.tsx @@ -1,20 +1,19 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; -import { renderHook, act } from '@testing-library/react-hooks'; +import { renderHook, waitFor } from '@testing-library/react'; import { useToggleReactionMutation } from './useToggleReactionMutation'; it('should be call rest `POST /v1/chat.react` method', async () => { const fn = jest.fn(); - const { result, waitFor } = renderHook(() => useToggleReactionMutation(), { + const { result } = renderHook(() => useToggleReactionMutation(), { + legacyRoot: true, wrapper: mockAppRoot().withEndpoint('POST', '/v1/chat.react', fn).withJohnDoe().build(), }); - await act(async () => { - await result.current.mutateAsync({ mid: 'MID', reaction: 'smile' }); - }); + result.current.mutate({ mid: 'MID', reaction: 'smile' }); - await waitFor(() => result.current.isLoading === false); + await waitFor(() => expect(result.current.status).toBe('success')); expect(fn).toHaveBeenCalledWith({ messageId: 'MID', @@ -26,15 +25,14 @@ it('should not work for non-logged in users', async () => { const fn = jest.fn(); const { result } = renderHook(() => useToggleReactionMutation(), { + legacyRoot: true, wrapper: mockAppRoot().withEndpoint('POST', '/v1/chat.react', fn).build(), }); - await act(async () => { - expect(result.current.mutateAsync({ mid: 'MID', reaction: 'smile' })).rejects.toThrowError(); - }); + result.current.mutate({ mid: 'MID', reaction: 'smile' }); - expect(fn).not.toHaveBeenCalled(); + await waitFor(() => expect(result.current.status).toBe('error')); - expect(result.current.status).toBe('error'); + expect(fn).not.toHaveBeenCalled(); expect(result.current.error).toEqual(new Error('Not logged in')); }); diff --git a/apps/meteor/client/components/message/content/urlPreviews/buildImageURL.spec.ts b/apps/meteor/client/components/message/content/urlPreviews/buildImageURL.spec.ts new file mode 100644 index 000000000000..678948df2b7e --- /dev/null +++ b/apps/meteor/client/components/message/content/urlPreviews/buildImageURL.spec.ts @@ -0,0 +1,20 @@ +import { buildImageURL } from './buildImageURL'; + +const testCases = [ + [ + 'https://g1.globo.com/mundo/video/misseis-atingem-ponte-de-vidro-em-kiev-11012523.ghtml', + 'https://s2.glbimg.com/fXQKM_UZjF6I_3APIbPJzJTOUvw=/1200x/smart/filters:cover():strip_icc()/s04.video.glbimg.com/x720/11012523.jpg', + 'https://s2.glbimg.com/fXQKM_UZjF6I_3APIbPJzJTOUvw=/1200x/smart/filters:cover():strip_icc()/s04.video.glbimg.com/x720/11012523.jpg', + ], + ['https://open.rocket.chat/channel/general', 'assets/favicon_512.png', 'https://open.rocket.chat/assets/favicon_512.png'], + ['https://open.rocket.chat/channel/general', '/assets/favicon_512.png', 'https://open.rocket.chat/assets/favicon_512.png'], + ['https://open.rocket.chat/channel/general/', '/assets/favicon_512.png', 'https://open.rocket.chat/assets/favicon_512.png'], +] as const; + +testCases.forEach(([linkUrl, metaImgUrl, expectedResult]) => { + it(`should return ${expectedResult} for ${metaImgUrl}`, () => { + const result = buildImageURL(linkUrl, metaImgUrl); + + expect(result).toBe(JSON.stringify(expectedResult)); + }); +}); diff --git a/apps/meteor/client/components/message/variants/RoomMessage.spec.tsx b/apps/meteor/client/components/message/variants/RoomMessage.spec.tsx new file mode 100644 index 000000000000..8d536c4b58f6 --- /dev/null +++ b/apps/meteor/client/components/message/variants/RoomMessage.spec.tsx @@ -0,0 +1,112 @@ +import type { IMessage } from '@rocket.chat/core-typings'; +import { mockAppRoot } from '@rocket.chat/mock-providers'; +import { render, screen } from '@testing-library/react'; +import React from 'react'; + +import RoomMessage from './RoomMessage'; + +const message: IMessage = { + ts: new Date('2021-10-27T00:00:00.000Z'), + u: { + _id: 'userId', + name: 'userName', + username: 'userName', + }, + msg: 'message body', + md: [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'message body', + }, + ], + }, + ], + rid: 'roomId', + _id: 'messageId', + _updatedAt: new Date('2021-10-27T00:00:00.000Z'), + urls: [], +}; + +jest.mock('../header/hooks/useMessageRoles', () => ({ + useMessageRoles: () => [], +})); +jest.mock('../../../lib/utils/fireGlobalEvent', () => ({ fireGlobalEvent: () => undefined })); +jest.mock('../../../views/room/hooks/useGoToRoom', () => ({ useGoToRoom: () => undefined })); +jest.mock('../../../views/room/contextualBar/Threads/hooks/useGetMessageByID', () => undefined); +jest.mock('../../../views/room/MessageList/hooks/useAutoTranslate', () => ({ + useAutoTranslate: () => ({ + autoTranslateEnabled: false, + autoTranslateLanguage: '', + showAutoTranslate: () => false, + }), +})); +jest.mock('../../../lib/actionLinks', () => undefined); + +it('should show normal message', () => { + render( + , + { + legacyRoot: true, + wrapper: mockAppRoot().build(), + }, + ); + + expect(screen.getByRole('figure')).toBeInTheDocument(); + expect(screen.getByText('message body')).toBeInTheDocument(); + expect(screen.queryByRole('button', { name: 'Message_Ignored' })).not.toBeInTheDocument(); +}); + +it('should show fallback content for ignored user', () => { + render( + , + { + legacyRoot: true, + wrapper: mockAppRoot().build(), + }, + ); + + expect(screen.getByRole('figure')).toBeInTheDocument(); + expect(screen.queryByText('message body')).not.toBeInTheDocument(); + expect(screen.getByRole('button', { name: 'Message_Ignored' })).toBeInTheDocument(); +}); + +it('should show ignored message', () => { + render( + , + { + legacyRoot: true, + wrapper: mockAppRoot().build(), + }, + ); + + expect(screen.getByRole('figure')).toBeInTheDocument(); + expect(screen.queryByText('message body')).not.toBeInTheDocument(); + expect(screen.getByRole('button', { name: 'Message_Ignored' })).toBeInTheDocument(); +}); diff --git a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts index eb0cbe5b24f4..e04e25f574e6 100644 --- a/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts +++ b/apps/meteor/client/hooks/roomActions/useE2EERoomAction.spec.ts @@ -1,5 +1,5 @@ import { useSetting, usePermission, useEndpoint } from '@rocket.chat/ui-contexts'; -import { act, renderHook } from '@testing-library/react-hooks'; +import { act, renderHook, waitFor } from '@testing-library/react'; import { E2EEState } from '../../../app/e2e/client/E2EEState'; import { e2e } from '../../../app/e2e/client/rocketchat.e2e'; @@ -72,7 +72,7 @@ describe('useE2EERoomAction', () => { it('should dispatch error toast message when otrState is ESTABLISHED', async () => { (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.ESTABLISHED }); - const { result } = renderHook(() => useE2EERoomAction()); + const { result } = renderHook(() => useE2EERoomAction(), { legacyRoot: true }); await act(async () => { await result?.current?.action?.(); @@ -84,39 +84,41 @@ describe('useE2EERoomAction', () => { it('should dispatch error toast message when otrState is ESTABLISHING', async () => { (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.ESTABLISHING }); - const { result } = renderHook(() => useE2EERoomAction()); + const { result } = renderHook(() => useE2EERoomAction(), { legacyRoot: true }); - await act(async () => { - await result?.current?.action?.(); + act(() => { + result?.current?.action?.(); }); - expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' }); + await waitFor(() => expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' })); }); it('should dispatch error toast message when otrState is REQUESTED', async () => { (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.REQUESTED }); - const { result } = renderHook(() => useE2EERoomAction()); + const { result } = renderHook(() => useE2EERoomAction(), { legacyRoot: true }); - await act(async () => { - await result?.current?.action?.(); + act(() => { + result?.current?.action?.(); }); - expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' }); + await waitFor(() => expect(dispatchToastMessage).toHaveBeenCalledWith({ type: 'error', message: 'E2EE_not_available_OTR' })); }); it('should dispatch success toast message when encryption is enabled', async () => { (useOTR as jest.Mock).mockReturnValue({ otrState: OtrRoomState.NOT_STARTED }); - const { result } = renderHook(() => useE2EERoomAction()); + const { result } = renderHook(() => useE2EERoomAction(), { legacyRoot: true }); - await act(async () => { - await result?.current?.action?.(); + act(() => { + result?.current?.action?.(); }); - expect(dispatchToastMessage).toHaveBeenCalledWith({ - type: 'success', - message: 'E2E_Encryption_enabled_for_room', - }); + await waitFor(() => + expect(dispatchToastMessage).toHaveBeenCalledWith({ + type: 'success', + message: 'E2E_Encryption_enabled_for_room', + }), + ); }); }); diff --git a/apps/meteor/client/hooks/useOTR.spec.tsx b/apps/meteor/client/hooks/useOTR.spec.tsx index 0206d96ca176..89082c072952 100644 --- a/apps/meteor/client/hooks/useOTR.spec.tsx +++ b/apps/meteor/client/hooks/useOTR.spec.tsx @@ -1,5 +1,5 @@ import { useUserId } from '@rocket.chat/ui-contexts'; -import { renderHook } from '@testing-library/react-hooks'; +import { renderHook } from '@testing-library/react'; import OTR from '../../app/otr/client/OTR'; import { OtrRoomState } from '../../app/otr/lib/OtrRoomState'; @@ -27,7 +27,7 @@ describe('useOTR', () => { (useUserId as jest.Mock).mockReturnValue(undefined); (useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' }); - const { result } = renderHook(() => useOTR()); + const { result } = renderHook(() => useOTR(), { legacyRoot: true }); expect(result.current.otr).toBeUndefined(); expect(result.current.otrState).toBe(OtrRoomState.ERROR); @@ -37,7 +37,7 @@ describe('useOTR', () => { (useUserId as jest.Mock).mockReturnValue('userId'); (useRoom as jest.Mock).mockReturnValue(undefined); - const { result } = renderHook(() => useOTR()); + const { result } = renderHook(() => useOTR(), { legacyRoot: true }); expect(result.current.otr).toBeUndefined(); expect(result.current.otrState).toBe(OtrRoomState.ERROR); @@ -48,7 +48,7 @@ describe('useOTR', () => { (useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' }); (OTR.getInstanceByRoomId as jest.Mock).mockReturnValue(undefined); - const { result } = renderHook(() => useOTR()); + const { result } = renderHook(() => useOTR(), { legacyRoot: true }); expect(result.current.otr).toBeUndefined(); expect(result.current.otrState).toBe(OtrRoomState.ERROR); @@ -62,7 +62,7 @@ describe('useOTR', () => { (useRoom as jest.Mock).mockReturnValue({ _id: 'roomId' }); (OTR.getInstanceByRoomId as jest.Mock).mockReturnValue(mockOtrInstance); - const { result } = renderHook(() => useOTR()); + const { result } = renderHook(() => useOTR(), { legacyRoot: true }); expect(result.current.otr).toBe(mockOtrInstance); expect(result.current.otrState).toBe(OtrRoomState.NOT_STARTED); diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts index bb602cb81a3a..4f51bd2040de 100644 --- a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts +++ b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts @@ -1,5 +1,5 @@ import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings'; -import { renderHook } from '@testing-library/react-hooks'; +import { renderHook } from '@testing-library/react'; import { createRenteionPolicySettingsMock as createMock } from '../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../tests/mocks/data'; @@ -30,6 +30,7 @@ describe('usePruneWarningMessage hook', () => { it('Should update the message after the nextRunDate has passaed', async () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -43,6 +44,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with precision set to every_hour', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -55,6 +57,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with precision set to every_six_hours', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -67,6 +70,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with precision set to every_day', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -79,6 +83,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with advanced precision', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -94,6 +99,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -105,6 +111,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the unpinned messages warning', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -118,6 +125,7 @@ describe('usePruneWarningMessage hook', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -131,6 +139,7 @@ describe('usePruneWarningMessage hook', () => { const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, @@ -146,6 +155,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps() }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock(), }); expect(result.current).toEqual('30 days June 1, 2024, 12:30 AM'); @@ -154,6 +164,7 @@ describe('usePruneWarningMessage hook', () => { it('Should return the unpinned messages warning', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true }) }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock(), }); expect(result.current).toEqual('Unpinned 30 days June 1, 2024, 12:30 AM'); @@ -163,6 +174,7 @@ describe('usePruneWarningMessage hook', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ filesOnly: true }) }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock(), }); expect(result.current).toEqual('FilesOnly 30 days June 1, 2024, 12:30 AM'); @@ -172,6 +184,7 @@ describe('usePruneWarningMessage hook', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true, filesOnly: true }) }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { + legacyRoot: true, wrapper: createMock(), }); expect(result.current).toEqual('UnpinnedFilesOnly 30 days June 1, 2024, 12:30 AM'); diff --git a/apps/meteor/tests/unit/client/lib/download.spec.ts b/apps/meteor/client/lib/download.spec.ts similarity index 71% rename from apps/meteor/tests/unit/client/lib/download.spec.ts rename to apps/meteor/client/lib/download.spec.ts index a5196264a18f..70051fd80bbe 100644 --- a/apps/meteor/tests/unit/client/lib/download.spec.ts +++ b/apps/meteor/client/lib/download.spec.ts @@ -1,47 +1,44 @@ -import { expect, spy } from 'chai'; -import { describe, it } from 'mocha'; - -import { download, downloadAs, downloadCsvAs, downloadJsonAs } from '../../../../client/lib/download'; +import { download, downloadAs, downloadCsvAs, downloadJsonAs } from './download'; describe('download', () => { it('should work', () => { - const listener = spy(); + const listener = jest.fn(); document.addEventListener('click', listener, false); download('about:blank', 'blank'); document.removeEventListener('click', listener, false); - expect(listener).to.have.been.called(); + expect(listener).toHaveBeenCalled(); }); }); describe('downloadAs', () => { it('should work', () => { - const listener = spy(); + const listener = jest.fn(); document.addEventListener('click', listener, false); downloadAs({ data: [] }, 'blank'); document.removeEventListener('click', listener, false); - expect(listener).to.have.been.called(); + expect(listener).toHaveBeenCalled(); }); }); describe('downloadJsonAs', () => { it('should work', () => { - const listener = spy(); + const listener = jest.fn(); document.addEventListener('click', listener, false); downloadJsonAs({}, 'blank'); document.removeEventListener('click', listener, false); - expect(listener).to.have.been.called(); + expect(listener).toHaveBeenCalled(); }); }); describe('downloadCsvAs', () => { it('should work', () => { - const listener = spy(); + const listener = jest.fn(); document.addEventListener('click', listener, false); downloadCsvAs( @@ -53,6 +50,6 @@ describe('downloadCsvAs', () => { ); document.removeEventListener('click', listener, false); - expect(listener).to.have.been.called(); + expect(listener).toHaveBeenCalled(); }); }); diff --git a/apps/meteor/client/lib/federation/Federation.spec.ts b/apps/meteor/client/lib/federation/Federation.spec.ts new file mode 100644 index 000000000000..1e367cbb9c6d --- /dev/null +++ b/apps/meteor/client/lib/federation/Federation.spec.ts @@ -0,0 +1,536 @@ +import type { IRoom, ISubscription, IUser, ValueOf } from '@rocket.chat/core-typings'; + +import { RoomRoles } from '../../../app/models/client'; +import { RoomMemberActions, RoomSettingsEnum } from '../../../definition/IRoomTypeConfig'; +import * as Federation from './Federation'; + +jest.mock('../../../app/models/client', () => ({ + RoomRoles: { + findOne: jest.fn(), + }, +})); + +afterEach(() => { + (RoomRoles.findOne as jest.Mock).mockClear(); +}); + +describe('#actionAllowed()', () => { + const me = 'user-id'; + const them = 'other-user-id'; + + it('should return false if the room is not federated', () => { + expect( + Federation.actionAllowed({ federated: false }, RoomMemberActions.REMOVE_USER, 'user-id', { roles: ['owner'] } as ISubscription), + ).toBe(false); + }); + + it('should return false if the room is a direct message', () => { + expect( + Federation.actionAllowed({ federated: true, t: 'd' }, RoomMemberActions.REMOVE_USER, 'user-id', { + roles: ['owner'], + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user is not subscribed to the room', () => { + expect(Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, 'user-id', undefined)).toBe(false); + }); + + it('should return false if the user is trying to remove himself', () => { + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, 'user-id', { + u: { _id: 'user-id' }, + roles: ['owner'], + } as ISubscription), + ).toBe(false); + }); + + describe('Owners', () => { + const myRole = ['owner']; + + describe('Seeing another owners', () => { + const theirRole = ['owner']; + + it('should return true if the user want to remove himself as an owner', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return true if the user want to add himself as a moderator (Demoting himself to moderator)', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return false if the user want to remove another owners as an owner', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove another owners from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + }); + + describe('Seeing moderators', () => { + const theirRole = ['moderator']; + + it('should return true if the user want to add/remove moderators as an owner', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return true if the user want to remove moderators as a moderator', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return true if the user want to remove moderators from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + }); + + describe('Seeing normal users', () => { + it('should return true if the user want to add/remove normal users as an owner', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return true if the user want to add/remove normal users as a moderator', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return true if the user want to remove normal users from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + }); + }); + + describe('Moderators', () => { + const myRole = ['moderator']; + + describe('Seeing owners', () => { + const theirRole = ['owner']; + + it('should return false if the user want to add/remove owners as a moderator', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to add/remove owners as a moderator', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to add/remove owners as a moderator', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove owners from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + }); + + describe('Seeing another moderators', () => { + const theirRole = ['moderator']; + + it('should return false if the user want to add/remove moderator as an owner', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return true if the user want to remove himself as a moderator (Demoting himself)', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return false if the user want to promote himself as an owner', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: me }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove another moderator from their role', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove another moderator from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + }); + + describe('Seeing normal users', () => { + it('should return false if the user want to add/remove normal users as an owner', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(false); + }); + + it('should return true if the user want to add/remove normal users as a moderator', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + + it('should return true if the user want to remove normal users from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + roles: myRole, + } as ISubscription), + ).toBe(true); + }); + }); + }); + + describe('Normal user', () => { + describe('Seeing owners', () => { + const theirRole = ['owner']; + + it('should return false if the user want to add/remove owners as a normal user', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to add/remove moderators as a normal user', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove owners from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + }); + + describe('Seeing moderators', () => { + const theirRole = ['owner']; + + it('should return false if the user want to add/remove owner as a normal user', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove a moderator from their role', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_MODERATOR, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove a moderator from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue({ roles: theirRole }); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + }); + + describe('Seeing another normal users', () => { + it('should return false if the user want to add/remove owner as a normal user', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to add/remove moderator as a normal user', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.SET_AS_OWNER, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + + it('should return false if the user want to remove normal users from the room', () => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, RoomMemberActions.REMOVE_USER, me, { + u: { _id: them }, + } as ISubscription), + ).toBe(false); + }); + + it.each([[RoomMemberActions.SET_AS_MODERATOR], [RoomMemberActions.SET_AS_OWNER], [RoomMemberActions.REMOVE_USER]])( + 'should return false if the user want to %s for himself', + (action) => { + (RoomRoles.findOne as jest.Mock).mockReturnValue(undefined); + expect( + Federation.actionAllowed({ federated: true }, action, me, { + u: { _id: me }, + } as ISubscription), + ).toBe(false); + }, + ); + }); + }); +}); + +describe('#isEditableByTheUser()', () => { + it('should return false if the user is null', () => { + expect(Federation.isEditableByTheUser(undefined, { u: { _id: 'id' } } as IRoom, {} as ISubscription)).toBe(false); + }); + + it('should return false if the room is null', () => { + expect(Federation.isEditableByTheUser({} as IUser, undefined, {} as ISubscription)).toBe(false); + }); + + it('should return false if the subscription is null', () => { + expect(Federation.isEditableByTheUser({} as IUser, {} as IRoom, undefined)).toBe(false); + }); + + it('should return false if the current room is NOT a federated one', () => { + expect(Federation.isEditableByTheUser({ _id: 'differentId' } as IUser, { u: { _id: 'id' } } as IRoom, {} as ISubscription)).toBe(false); + }); + + it('should return false if the current user is NOT the room owner nor moderator', () => { + expect( + Federation.isEditableByTheUser({ _id: 'differentId' } as IUser, { federated: true, u: { _id: 'id' } } as IRoom, {} as ISubscription), + ).toBe(false); + }); + + it('should return true if the current user is a room owner', () => { + expect( + Federation.isEditableByTheUser( + { _id: 'differentId' } as IUser, + { federated: true, u: { _id: 'id' } } as IRoom, + { roles: ['owner'] } as ISubscription, + ), + ).toBe(true); + }); + + it('should return true if the current user is a room moderator', () => { + expect( + Federation.isEditableByTheUser( + { _id: 'differentId' } as IUser, + { federated: true, u: { _id: 'id' } } as IRoom, + { roles: ['moderator'] } as ISubscription, + ), + ).toBe(true); + }); +}); + +describe('#canCreateInviteLinks()', () => { + it('should return false if the user is null', () => { + expect(Federation.canCreateInviteLinks(undefined, { u: { _id: 'id' } } as IRoom, {} as ISubscription)).toBe(false); + }); + + it('should return false if the room is null', () => { + expect(Federation.canCreateInviteLinks({} as IUser, undefined, {} as ISubscription)).toBe(false); + }); + + it('should return false if the subscription is null', () => { + expect(Federation.canCreateInviteLinks({} as IUser, {} as IRoom, undefined)).toBe(false); + }); + + it('should return false if the current room is NOT a federated one', () => { + expect(Federation.canCreateInviteLinks({ _id: 'differentId' } as IUser, { u: { _id: 'id' } } as IRoom, {} as ISubscription)).toBe( + false, + ); + }); + + it('should return false if the current room is federated one but NOT a public one', () => { + expect( + Federation.canCreateInviteLinks({ _id: 'differentId' } as IUser, { federated: true, u: { _id: 'id' } } as IRoom, {} as ISubscription), + ).toBe(false); + }); + + it('should return false if the current room is federated one, a public one but the user is NOT an owner nor moderator', () => { + expect( + Federation.canCreateInviteLinks( + { _id: 'differentId' } as IUser, + { federated: true, t: 'c', u: { _id: 'id' } } as IRoom, + {} as ISubscription, + ), + ).toBe(false); + }); + + it('should return false if the current room is federated one, a public one but the user is NOT an owner nor moderator', () => { + expect( + Federation.canCreateInviteLinks( + { _id: 'differentId' } as IUser, + { federated: true, t: 'c', u: { _id: 'id' } } as IRoom, + {} as ISubscription, + ), + ).toBe(false); + }); + + it('should return true if the current room is federated one, a public one but the user is an owner', () => { + expect( + Federation.canCreateInviteLinks( + { _id: 'differentId' } as IUser, + { federated: true, t: 'c', u: { _id: 'id' } } as IRoom, + { roles: ['owner'] } as ISubscription, + ), + ).toBe(true); + }); + + it('should return true if the current room is federated one, a public one but the user is an moderator', () => { + expect( + Federation.canCreateInviteLinks( + { _id: 'differentId' } as IUser, + { federated: true, t: 'c', u: { _id: 'id' } } as IRoom, + { roles: ['moderator'] } as ISubscription, + ), + ).toBe(true); + }); +}); + +describe('#isRoomSettingAllowed()', () => { + it('should return false if the room is NOT federated', () => { + expect(Federation.isRoomSettingAllowed({ t: 'c' }, RoomSettingsEnum.NAME)).toBe(false); + }); + + it('should return false if the room is a DM one', () => { + expect(Federation.isRoomSettingAllowed({ t: 'd', federated: true }, RoomSettingsEnum.NAME)).toBe(false); + }); + + const allowedSettingsChanges: ValueOf[] = [RoomSettingsEnum.NAME, RoomSettingsEnum.TOPIC]; + + Object.values(RoomSettingsEnum) + .filter((setting) => !allowedSettingsChanges.includes(setting)) + .forEach((setting) => { + it('should return false if the setting change is NOT allowed within the federation context for regular channels', () => { + expect(Federation.isRoomSettingAllowed({ t: 'c', federated: true }, setting)).toBe(false); + }); + }); + + allowedSettingsChanges.forEach((setting) => { + it('should return true if the setting change is allowed within the federation context for regular channels', () => { + expect(Federation.isRoomSettingAllowed({ t: 'c', federated: true }, setting)).toBe(true); + }); + }); +}); diff --git a/apps/meteor/client/lib/minimongo/bson.spec.ts b/apps/meteor/client/lib/minimongo/bson.spec.ts new file mode 100644 index 000000000000..b38b151f2c9e --- /dev/null +++ b/apps/meteor/client/lib/minimongo/bson.spec.ts @@ -0,0 +1,34 @@ +import { getBSONType, compareBSONValues } from './bson'; +import { BSONType } from './types'; + +describe('getBSONType', () => { + it('should work', () => { + expect(getBSONType(1)).toBe(BSONType.Double); + expect(getBSONType('xyz')).toBe(BSONType.String); + expect(getBSONType({})).toBe(BSONType.Object); + expect(getBSONType([])).toBe(BSONType.Array); + expect(getBSONType(new Uint8Array())).toBe(BSONType.BinData); + expect(getBSONType(undefined)).toBe(BSONType.Object); + expect(getBSONType(null)).toBe(BSONType.Null); + expect(getBSONType(false)).toBe(BSONType.Boolean); + expect(getBSONType(/.*/)).toBe(BSONType.Regex); + expect(getBSONType(() => true)).toBe(BSONType.JavaScript); + expect(getBSONType(new Date(0))).toBe(BSONType.Date); + }); +}); + +describe('compareBSONValues', () => { + it('should work for the same types', () => { + expect(compareBSONValues(2, 3)).toBe(-1); + expect(compareBSONValues('xyz', 'abc')).toBe(1); + expect(compareBSONValues({}, {})).toBe(0); + expect(compareBSONValues(true, false)).toBe(1); + expect(compareBSONValues(new Date(0), new Date(1))).toBe(-1); + }); + + it('should work for different types', () => { + expect(compareBSONValues(2, null)).toBe(1); + expect(compareBSONValues('xyz', {})).toBe(-1); + expect(compareBSONValues(false, 3)).toBe(1); + }); +}); diff --git a/apps/meteor/client/lib/minimongo/comparisons.spec.ts b/apps/meteor/client/lib/minimongo/comparisons.spec.ts new file mode 100644 index 000000000000..6209ee0c8298 --- /dev/null +++ b/apps/meteor/client/lib/minimongo/comparisons.spec.ts @@ -0,0 +1,129 @@ +import { equals, isObject, flatSome, some, isEmptyArray } from './comparisons'; + +describe('equals', () => { + it('should return true if two numbers are equal', () => { + expect(equals(1, 1)).toBe(true); + }); + + it('should return false if arguments are null or undefined', () => { + expect(equals(undefined, null)).toBe(false); + expect(equals(null, undefined)).toBe(false); + }); + + it('should return false if arguments arent objects and they are not the same', () => { + expect(equals('not', 'thesame')).toBe(false); + }); + + it('should return true if date objects provided have the same value', () => { + const currentDate = new Date(); + + expect(equals(currentDate, currentDate)).toBe(true); + }); + + it('should return true if 2 equal UInt8Array are provided', () => { + const arr1 = new Uint8Array([1, 2]); + const arr2 = new Uint8Array([1, 2]); + + expect(equals(arr1, arr2)).toBe(true); + }); + + it('should return true if 2 equal arrays are provided', () => { + const arr1 = [1, 2, 4]; + const arr2 = [1, 2, 4]; + + expect(equals(arr1, arr2)).toBe(true); + }); + + it('should return false if 2 arrays with different length are provided', () => { + const arr1 = [1, 4, 5]; + const arr2 = [1, 4, 5, 7]; + + expect(equals(arr1, arr2)).toBe(false); + }); + + it('should return true if the objects provided are "equal"', () => { + const obj = { a: 1 }; + const obj2 = obj; + + expect(equals(obj, obj2)).toBe(true); + }); + + it('should return true if both objects have the same keys', () => { + const obj = { a: 1 }; + const obj2 = { a: 1 }; + + expect(equals(obj, obj2)).toBe(true); + }); +}); + +describe('isObject', () => { + it('should return true if value is an object or function', () => { + const obj = {}; + const func = (a: any): any => a; + + expect(isObject(obj)).toBe(true); + expect(isObject(func)).toBe(true); + }); + + it('should return false for other data types', () => { + expect(isObject(1)).toBe(false); + expect(isObject(true)).toBe(false); + expect(isObject('212')).toBe(false); + }); +}); + +describe('flatSome', () => { + it('should run .some on array', () => { + const arr = [1, 2, 4, 6, 9]; + const isEven = (v: number): boolean => v % 2 === 0; + + expect(flatSome(arr, isEven)).toBe(true); + }); + + it('should run the function on the value when its not an array', () => { + const val = 1; + const isEven = (v: number): boolean => v % 2 === 0; + + expect(flatSome(val, isEven)).toBe(false); + }); +}); + +describe('some', () => { + it('should run .some on array', () => { + const arr = [1, 2, 4, 6, 9]; + const isEven = (v: number | number[]): boolean => { + if (Array.isArray(v)) { + return false; + } + return v % 2 === 0; + }; + + expect(some(arr, isEven)).toBe(true); + }); + + it('should run the function on the value when its not an array', () => { + const val = 1; + const isEven = (v: number | number[]): boolean => { + if (Array.isArray(v)) { + return false; + } + return v % 2 === 0; + }; + + expect(some(val, isEven)).toBe(false); + }); +}); + +describe('isEmptyArray', () => { + it('should return true if array is empty', () => { + expect(isEmptyArray([])).toBe(true); + }); + + it('should return false if value is not an array', () => { + expect(isEmptyArray(1)).toBe(false); + }); + + it('should return false if array is not empty', () => { + expect(isEmptyArray([1, 2])).toBe(false); + }); +}); diff --git a/apps/meteor/client/lib/minimongo/lookups.spec.ts b/apps/meteor/client/lib/minimongo/lookups.spec.ts new file mode 100644 index 000000000000..08f98cfdca4c --- /dev/null +++ b/apps/meteor/client/lib/minimongo/lookups.spec.ts @@ -0,0 +1,10 @@ +import { createLookupFunction } from './lookups'; + +describe('createLookupFunction', () => { + it('should work', () => { + expect(createLookupFunction('a.x')({ a: { x: 1 } })).toStrictEqual([1]); + expect(createLookupFunction('a.x')({ a: { x: [1] } })).toStrictEqual([[1]]); + expect(createLookupFunction('a.x')({ a: 5 })).toStrictEqual([undefined]); + expect(createLookupFunction('a.x')({ a: [{ x: 1 }, { x: [2] }, { y: 3 }] })).toStrictEqual([1, [2], undefined]); + }); +}); diff --git a/apps/meteor/client/lib/parseMessageTextToAstMarkdown.spec.ts b/apps/meteor/client/lib/parseMessageTextToAstMarkdown.spec.ts new file mode 100644 index 000000000000..e48eb15f885c --- /dev/null +++ b/apps/meteor/client/lib/parseMessageTextToAstMarkdown.spec.ts @@ -0,0 +1,550 @@ +import type { IMessage, ITranslatedMessage } from '@rocket.chat/core-typings'; +import type { Options, Root } from '@rocket.chat/message-parser'; + +import { parseMessageAttachments, parseMessageTextToAstMarkdown } from './parseMessageTextToAstMarkdown'; + +describe('parseMessageTextToAstMarkdown', () => { + const date = new Date('2021-10-27T00:00:00.000Z'); + + const parseOptions: Options = { + colors: true, + emoticons: true, + katex: { + dollarSyntax: true, + parenthesisSyntax: true, + }, + }; + + const messageParserTokenMessageWithWrongData: Root = [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'message', + }, + { + type: 'BOLD', + value: [ + { + type: 'PLAIN_TEXT', + value: 'bold', + }, + ], + }, + { + type: 'PLAIN_TEXT', + value: ' ', + }, + { + type: 'ITALIC', + value: [ + { + type: 'PLAIN_TEXT', + value: 'italic', + }, + ], + }, + { + type: 'PLAIN_TEXT', + value: ' and ', + }, + { + type: 'STRIKE', + value: [ + { + type: 'PLAIN_TEXT', + value: 'strike', + }, + ], + }, + ], + }, + ]; + + const messageParserTokenMessage: Root = [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'message ', + }, + { + type: 'BOLD', + value: [ + { + type: 'PLAIN_TEXT', + value: 'bold', + }, + ], + }, + { + type: 'PLAIN_TEXT', + value: ' ', + }, + { + type: 'ITALIC', + value: [ + { + type: 'PLAIN_TEXT', + value: 'italic', + }, + ], + }, + { + type: 'PLAIN_TEXT', + value: ' and ', + }, + { + type: 'STRIKE', + value: [ + { + type: 'PLAIN_TEXT', + value: 'strike', + }, + ], + }, + ], + }, + ]; + + const baseMessage: IMessage = { + ts: date, + u: { + _id: 'userId', + name: 'userName', + username: 'userName', + }, + msg: 'message **bold** _italic_ and ~strike~', + rid: 'roomId', + _id: 'messageId', + _updatedAt: date, + urls: [], + }; + + const autoTranslateOptions = { + autoTranslateEnabled: false, + showAutoTranslate: () => false, + }; + + const quoteMessage = { + author_name: 'authorName', + author_link: 'link', + author_icon: 'icon', + md: [], + }; + + it('should return md property populated if the message is parsed', () => { + expect(parseMessageTextToAstMarkdown(baseMessage, parseOptions, autoTranslateOptions).md).toStrictEqual(messageParserTokenMessage); + }); + + it('should return correct parsed md property populated and fail in comparison with different Root element', () => { + expect(parseMessageTextToAstMarkdown(baseMessage, parseOptions, autoTranslateOptions).md).not.toStrictEqual( + messageParserTokenMessageWithWrongData, + ); + }); + + describe('translated', () => { + const translatedMessage: ITranslatedMessage = { + ...baseMessage, + msg: 'message not translated', + translationProvider: 'provider', + translations: { + en: 'message translated', + }, + }; + const translatedMessageParsed: Root = [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'message translated', + }, + ], + }, + ]; + + const enabledAutoTranslatedOptions = { + autoTranslateEnabled: true, + autoTranslateLanguage: 'en', + showAutoTranslate: () => true, + }; + it('should return correct translated parsed md when translate is active', () => { + expect(parseMessageTextToAstMarkdown(translatedMessage, parseOptions, enabledAutoTranslatedOptions).md).toStrictEqual( + translatedMessageParsed, + ); + }); + + it('should return correct attachment translated parsed md when translate is active', () => { + const attachmentTranslatedMessage = { + ...translatedMessage, + attachments: [ + { + description: 'description', + translations: { + en: 'description translated', + }, + }, + ], + }; + const attachmentTranslatedMessageParsed = { + ...translatedMessage, + md: translatedMessageParsed, + attachments: [ + { + description: 'description', + translations: { + en: 'description translated', + }, + md: [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'description translated', + }, + ], + }, + ], + }, + ], + }; + + expect(parseMessageTextToAstMarkdown(attachmentTranslatedMessage, parseOptions, enabledAutoTranslatedOptions)).toStrictEqual( + attachmentTranslatedMessageParsed, + ); + }); + + it('should return correct attachment quote translated parsed md when translate is active', () => { + const attachmentTranslatedMessage = { + ...translatedMessage, + attachments: [ + { + text: 'text', + translations: { + en: 'text translated', + }, + }, + ], + }; + const attachmentTranslatedMessageParsed = { + ...translatedMessage, + md: translatedMessageParsed, + attachments: [ + { + text: 'text', + translations: { + en: 'text translated', + }, + md: [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'text translated', + }, + ], + }, + ], + }, + ], + }; + + expect(parseMessageTextToAstMarkdown(attachmentTranslatedMessage, parseOptions, enabledAutoTranslatedOptions)).toStrictEqual( + attachmentTranslatedMessageParsed, + ); + }); + + it('should return correct multiple attachment quote translated parsed md when translate is active', () => { + const attachmentTranslatedMessage = { + ...translatedMessage, + attachments: [ + { + text: 'text', + translations: { + en: 'text translated', + }, + attachments: [{ ...quoteMessage, text: 'text level 2', translations: { en: 'text level 2 translated' } }], + }, + ], + }; + const attachmentTranslatedMessageParsed = { + ...translatedMessage, + md: translatedMessageParsed, + attachments: [ + { + text: 'text', + translations: { + en: 'text translated', + }, + md: [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'text translated', + }, + ], + }, + ], + attachments: [ + { + ...quoteMessage, + text: 'text level 2', + translations: { + en: 'text level 2 translated', + }, + }, + ], + }, + ], + }; + + expect(parseMessageTextToAstMarkdown(attachmentTranslatedMessage, parseOptions, enabledAutoTranslatedOptions)).toStrictEqual( + attachmentTranslatedMessageParsed, + ); + }); + }); + + // TODO: Add more tests for each type of message and for each type of token +}); + +describe('parseMessageAttachments', () => { + const parseOptions: Options = { + colors: true, + emoticons: true, + katex: { + dollarSyntax: true, + parenthesisSyntax: true, + }, + }; + + const messageParserTokenMessage: Root = [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'message ', + }, + { + type: 'BOLD', + value: [ + { + type: 'PLAIN_TEXT', + value: 'bold', + }, + ], + }, + { + type: 'PLAIN_TEXT', + value: ' ', + }, + { + type: 'ITALIC', + value: [ + { + type: 'PLAIN_TEXT', + value: 'italic', + }, + ], + }, + { + type: 'PLAIN_TEXT', + value: ' and ', + }, + { + type: 'STRIKE', + value: [ + { + type: 'PLAIN_TEXT', + value: 'strike', + }, + ], + }, + ], + }, + ]; + + const autoTranslateOptions = { + autoTranslateEnabled: false, + translated: false, + }; + + const attachmentMessage = [ + { + description: 'message **bold** _italic_ and ~strike~', + md: messageParserTokenMessage, + }, + ]; + + describe('parseMessageAttachments', () => { + it('should return md property populated if the message is parsed', () => { + expect(parseMessageAttachments(attachmentMessage, parseOptions, autoTranslateOptions)[0].md).toStrictEqual(messageParserTokenMessage); + }); + + it('should return md property populated if the attachment is not parsed', () => { + expect(parseMessageAttachments([{ ...attachmentMessage[0], md: undefined }], parseOptions, autoTranslateOptions)[0].md).toStrictEqual( + messageParserTokenMessage, + ); + }); + + describe('translated', () => { + const enabledAutoTranslatedOptions = { + translated: true, + autoTranslateLanguage: 'en', + }; + + it('should return correct attachment description translated parsed md when translate is active', () => { + const descriptionAttachment = [ + { + ...attachmentMessage[0], + description: 'attachment not translated', + translationProvider: 'provider', + translations: { + en: 'attachment translated', + }, + }, + ]; + const descriptionAttachmentParsed: Root = [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'attachment translated', + }, + ], + }, + ]; + + expect(parseMessageAttachments(descriptionAttachment, parseOptions, enabledAutoTranslatedOptions)[0].md).toStrictEqual( + descriptionAttachmentParsed, + ); + }); + + it('should return correct attachment description parsed md when translate is active and auto translate language is undefined', () => { + const descriptionAttachment = [ + { + ...attachmentMessage[0], + description: 'attachment not translated', + translationProvider: 'provider', + translations: { + en: 'attachment translated', + }, + }, + ]; + const descriptionAttachmentParsed: Root = [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'attachment not translated', + }, + ], + }, + ]; + + expect( + parseMessageAttachments(descriptionAttachment, parseOptions, { + ...enabledAutoTranslatedOptions, + autoTranslateLanguage: undefined, + })[0].md, + ).toStrictEqual(descriptionAttachmentParsed); + }); + + it('should return correct attachment text translated parsed md when translate is active', () => { + const textAttachment = [ + { + ...attachmentMessage[0], + text: 'attachment not translated', + translationProvider: 'provider', + translations: { + en: 'attachment translated', + }, + }, + ]; + const textAttachmentParsed: Root = [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'attachment translated', + }, + ], + }, + ]; + + expect(parseMessageAttachments(textAttachment, parseOptions, enabledAutoTranslatedOptions)[0].md).toStrictEqual( + textAttachmentParsed, + ); + }); + + it('should return correct attachment text translated parsed md when translate is active and has multiple texts', () => { + const quote = { + author_name: 'authorName', + author_link: 'link', + author_icon: 'icon', + message_link: 'messageLink', + md: [], + text: 'text level 2', + translations: { en: 'text level 2 translated' }, + }; + const textAttachment = [ + { + ...quote, + text: 'attachment not translated', + translationProvider: 'provider', + translations: { + en: 'attachment translated', + }, + attachments: [quote], + }, + ]; + const textAttachmentParsed = { + ...textAttachment[0], + md: [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'attachment translated', + }, + ], + }, + ], + attachments: [ + { + ...quote, + text: 'text level 2', + translations: { + en: 'text level 2 translated', + }, + md: [ + { + type: 'PARAGRAPH', + value: [ + { + type: 'PLAIN_TEXT', + value: 'text level 2 translated', + }, + ], + }, + ], + }, + ], + }; + + expect(parseMessageAttachments(textAttachment, parseOptions, enabledAutoTranslatedOptions)[0]).toStrictEqual(textAttachmentParsed); + }); + }); + }); +}); diff --git a/apps/meteor/client/lib/utils/isRTLScriptLanguage.spec.ts b/apps/meteor/client/lib/utils/isRTLScriptLanguage.spec.ts new file mode 100644 index 000000000000..127ad4cf1274 --- /dev/null +++ b/apps/meteor/client/lib/utils/isRTLScriptLanguage.spec.ts @@ -0,0 +1,26 @@ +import { isRTLScriptLanguage } from './isRTLScriptLanguage'; + +const testCases = [ + ['en', false], + ['ar', true], + ['dv', true], + ['fa', true], + ['he', true], + ['ku', true], + ['ps', true], + ['sd', true], + ['ug', true], + ['ur', true], + ['yi', true], + ['ar', true], + ['ar-LY', true], + ['dv-MV', true], + ['', false], +] as const; + +testCases.forEach(([parameter, expectedResult]) => { + it(`should return ${JSON.stringify(expectedResult)} for ${JSON.stringify(parameter)}`, () => { + const result = isRTLScriptLanguage(parameter); + expect(result).toBe(expectedResult); + }); +}); diff --git a/apps/meteor/client/lib/utils/waitForElement.spec.ts b/apps/meteor/client/lib/utils/waitForElement.spec.ts new file mode 100644 index 000000000000..ca1ebb67e4d9 --- /dev/null +++ b/apps/meteor/client/lib/utils/waitForElement.spec.ts @@ -0,0 +1,18 @@ +import { waitForElement } from './waitForElement'; + +beforeEach(() => { + document.body.innerHTML = ``; +}); + +it('should return the element when it is already in the dom', async () => { + expect(await waitForElement('.ready')).toBe(document.querySelector('.ready')); +}); + +it('should await until the element be in the dom and return it', async () => { + setTimeout(() => { + const element = document.createElement('div'); + element.setAttribute('class', 'not-ready'); + document.body.appendChild(element); + }, 5); + expect(await waitForElement('.not-ready')).toBe(document.querySelector('.not-ready')); +}); diff --git a/apps/meteor/tests/unit/client/providers/CallProvider/lib/parseStringToIceServers.spec.ts b/apps/meteor/client/providers/CallProvider/lib/parseStringToIceServers.spec.ts similarity index 93% rename from apps/meteor/tests/unit/client/providers/CallProvider/lib/parseStringToIceServers.spec.ts rename to apps/meteor/client/providers/CallProvider/lib/parseStringToIceServers.spec.ts index 1c134f71780c..b24564bfb165 100644 --- a/apps/meteor/tests/unit/client/providers/CallProvider/lib/parseStringToIceServers.spec.ts +++ b/apps/meteor/client/providers/CallProvider/lib/parseStringToIceServers.spec.ts @@ -1,7 +1,4 @@ -import { - parseStringToIceServers, - parseStringToIceServer, -} from '../../../../../../client/providers/CallProvider/lib/parseStringToIceServers'; +import { parseStringToIceServers, parseStringToIceServer } from './parseStringToIceServers'; describe('parseStringToIceServers', () => { describe('parseStringToIceServers', () => { diff --git a/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx b/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx index ea062c324807..fd82af587760 100644 --- a/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx +++ b/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx @@ -8,10 +8,10 @@ import { imperativeModal } from '../../lib/imperativeModal'; import ModalRegion from '../../views/modal/ModalRegion'; import ModalProvider from './ModalProvider'; import ModalProviderWithRegion from './ModalProviderWithRegion'; -import '@testing-library/jest-dom'; const renderWithSuspense = (ui: ReactElement) => render(ui, { + legacyRoot: true, wrapper: ({ children }) => {children}, }); diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx index b4ddbf32419d..eae8a91015a8 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx @@ -28,9 +28,8 @@ const FederatedRoomList = ({ serverName, roomName, count }: FederatedRoomListPro const { mutate: onClickJoin, isLoading: isLoadingMutation } = useMutation( ['federation/joinExternalPublicRoom'], - async ({ id, pageToken }: IFederationPublicRooms) => { - return joinExternalPublicRoom({ externalRoomId: id as `!${string}:${string}`, roomName, pageToken }); - }, + async ({ id, pageToken }: IFederationPublicRooms) => + joinExternalPublicRoom({ externalRoomId: id as `!${string}:${string}`, roomName, pageToken }), { onSuccess: (_, data) => { dispatchToastMessage({ diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx index dfaa79ed44de..01cb22c2e1c5 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomListItem.tsx @@ -1,5 +1,6 @@ import { css } from '@rocket.chat/css-in-js'; import { Box, Button, Icon } from '@rocket.chat/fuselage'; +import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import type { IFederationPublicRooms } from '@rocket.chat/rest-typings'; import { useTranslation } from '@rocket.chat/ui-contexts'; import React from 'react'; @@ -23,11 +24,12 @@ const FederatedRoomListItem = ({ disabled, }: FederatedRoomListItemProps) => { const t = useTranslation(); + const nameId = useUniqueId(); return ( - + - + {name} {canJoin && ( diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx index e3c953dcb950..6909a2cacae0 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx @@ -1,4 +1,5 @@ -import { Divider, Modal, ButtonGroup, Button, Field, TextInput, FieldLabel, FieldRow, FieldError, FieldHint } from '@rocket.chat/fuselage'; +import { Divider, Modal, ButtonGroup, Button, Field, FieldLabel, FieldRow, FieldError, FieldHint, TextInput } from '@rocket.chat/fuselage'; +import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import { useSetModal, useTranslation, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import { useMutation, useQueryClient } from '@tanstack/react-query'; @@ -55,17 +56,21 @@ const MatrixFederationAddServerModal = ({ onClickClose }: MatrixFederationAddSer const { data, isLoading: isLoadingServerList } = useMatrixServerList(); + const titleId = useUniqueId(); + const serverNameId = useUniqueId(); + return ( - + - {t('Manage_servers')} + {t('Manage_servers')} - {t('Server_name')} + {t('Server_name')} ) => { @@ -76,7 +81,7 @@ const MatrixFederationAddServerModal = ({ onClickClose }: MatrixFederationAddSer }} mie={4} /> - diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationRemoveServerList.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationRemoveServerList.tsx index 361950cd39c9..88867313a5bc 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationRemoveServerList.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationRemoveServerList.tsx @@ -1,5 +1,5 @@ import { css } from '@rocket.chat/css-in-js'; -import { Box, Option, Icon } from '@rocket.chat/fuselage'; +import { Box, Option, IconButton } from '@rocket.chat/fuselage'; import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import React from 'react'; @@ -44,11 +44,13 @@ const MatrixFederationRemoveServerList = ({ servers }: MatrixFederationRemoveSer {servers.map(({ name, default: isDefault }) => ( diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.spec.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.spec.tsx new file mode 100644 index 000000000000..5072a1310228 --- /dev/null +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.spec.tsx @@ -0,0 +1,154 @@ +import { mockAppRoot } from '@rocket.chat/mock-providers'; +import { render, screen, within } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import React from 'react'; +import { VirtuosoMockContext } from 'react-virtuoso'; + +import MatrixFederationSearch from './MatrixFederationSearch'; + +jest.mock('../../../lib/rooms/roomCoordinator', () => ({ + roomCoordinator: {}, +})); + +const renderMatrixFederationSearch = ( + serverList = [ + { name: `server-1`, default: true, local: false }, + { name: `server-2`, default: false, local: false }, + { name: `server-3`, default: false, local: false }, + ], +) => { + return render(<>, { + legacyRoot: true, + wrapper: mockAppRoot() + .withEndpoint('GET', '/v1/federation/listServersByUser', () => ({ + servers: serverList, + })) + .withEndpoint('GET', '/v1/federation/searchPublicRooms', ({ serverName, roomName, count }) => ({ + rooms: Array.from({ length: count || 100 }, (_, index) => ({ + id: `Matrix${index}`, + name: `${roomName || 'Matrix'}${index + 1}`, + canJoin: true, + canonicalAlias: `#${serverName}:matrix.org`, + joinedMembers: 44461, + topic: + 'The Official Matrix HQ - chat about Matrix here! | https://matrix.org | https://spec.matrix.org | To support Matrix.org development: https://patreon.com/matrixdotorg | Code of Conduct: https://matrix.org/legal/code-of-conduct/ | This is an English speaking room | The Official Matrix HQ - chat about Matrix here! | https://matrix.org | https://spec.matrix.org | To support Matrix.org development: https://patreon.com/matrixdotorg | Code of Conduct: https://matrix.org/legal/code-of-conduct/ | This is an English speaking room The Official Matrix HQ - chat about Matrix here! | https://matrix.org | https://spec.matrix.org | To support Matrix.org development: https://patreon.com/matrixdotorg | Code of Conduct: https://matrix.org/legal/code-of-conduct/ | This is an English speaking room | The Official Matrix HQ - chat about Matrix here! | https://matrix.org | https://spec.matrix.org | To support Matrix.org development: https://patreon.com/matrixdotorg | Code of Conduct: https://matrix.org/legal/code-of-conduct/ | This is an English speaking room', + })), + count: 1, + total: 73080, + nextPageToken: 'g6FtzZa3oXK+IUpkemFiTlVQUFh6bENKQWhFbDpmYWJyaWMucHVioWTD', + })) + .withEndpoint('POST', '/v1/federation/joinExternalPublicRoom', () => null) + .withEndpoint('POST', '/v1/federation/addServerByUser', ({ serverName }) => { + serverList.push({ name: serverName, default: false, local: false }); + return null; + }) + .withEndpoint('POST', '/v1/federation/removeServerByUser', ({ serverName }) => { + serverList = serverList.filter((server) => server.name !== serverName); + return null; + }) + .withOpenModal() + .wrap((children) => ( + {children} + )) + .build(), + }); +}; + +const openManageServers = async () => { + const manageServerLink = await screen.findByRole('button', { name: 'Manage_server_list' }); + await userEvent.click(manageServerLink); +}; + +it('should render Federated Room search modal', async () => { + renderMatrixFederationSearch(); + + expect(await screen.findByRole('dialog', { name: 'Federation_Federated_room_search' })).toBeInTheDocument(); + + expect(await screen.findByRole('listitem', { name: 'Matrix1' }, { timeout: 2000 })).toBeInTheDocument(); // TODO: remove flakyness + expect(await screen.findByRole('listitem', { name: 'Matrix2' })).toBeInTheDocument(); +}); + +it('should search for rooms', async () => { + renderMatrixFederationSearch(); + + const input = await screen.findByRole('searchbox', { name: 'Search_rooms' }); + expect(input).toBeInTheDocument(); + await userEvent.type(input, 'NotMatrix'); + + expect(await screen.findByRole('listitem', { name: 'NotMatrix1' }, { timeout: 2000 })).toBeInTheDocument(); // TODO: remove flakyness + expect(await screen.findByRole('listitem', { name: 'NotMatrix2' })).toBeInTheDocument(); +}); + +it('should close the modal when joining a room', async () => { + renderMatrixFederationSearch(); + + const firstListItem = await screen.findByRole('listitem', { name: 'Matrix1' }); + const joinButton = await within(firstListItem).findByRole('button', { name: 'Join' }); + + await userEvent.click(joinButton); + + expect(screen.queryByRole('dialog')).not.toBeInTheDocument(); +}); + +// TODO: should be a unit test for `MatrixFederationAddServerModal` +describe('server management', () => { + it('should open the manage server modal', async () => { + renderMatrixFederationSearch(); + + await openManageServers(); + + expect(await screen.findByRole('dialog', { name: 'Manage_servers' })).toBeInTheDocument(); + + expect(await screen.findByText('server-1')).toBeInTheDocument(); + expect(await screen.findByText('server-2')).toBeInTheDocument(); + expect(await screen.findByText('server-3')).toBeInTheDocument(); + }); + + it('should return to the Search modal when clicking cancel', async () => { + renderMatrixFederationSearch(); + + await openManageServers(); + + const cancelButton = await screen.findByRole('button', { name: 'Cancel' }); + await userEvent.click(cancelButton); + + expect(await screen.findByRole('dialog', { name: 'Federation_Federated_room_search' })).toBeInTheDocument(); + }); + + it('should return to the Search modal with the new server selected', async () => { + renderMatrixFederationSearch(); + + await openManageServers(); + + const input = await screen.findByRole('textbox', { name: 'Server_name' }); + await userEvent.type(input, 'server-4'); + + const addButton = await screen.findByRole('button', { name: 'Add' }); + await userEvent.click(addButton); + + expect(await screen.findByRole('dialog', { name: 'Federation_Federated_room_search' })).toBeInTheDocument(); + expect(await screen.findByRole('button', { name: 'server-4' })).toBeInTheDocument(); + }); + + it('should remove servers from the list', async () => { + renderMatrixFederationSearch([ + { name: `server-1`, default: true, local: false }, + { name: `server-2`, default: false, local: false }, + { name: `server-3`, default: false, local: false }, + { name: `server-4`, default: false, local: false }, + ]); + + await openManageServers(); + + const defaultItem = await screen.findByRole('listitem', { name: 'server-1' }); + await userEvent.hover(defaultItem); + expect(within(defaultItem).queryByRole('button', { name: 'Remove' })).not.toBeInTheDocument(); + + const lastItem = await screen.findByRole('listitem', { name: 'server-4' }); + await userEvent.hover(lastItem); + const removeButton = await within(lastItem).findByRole('button', { name: 'Remove' }); + await userEvent.click(removeButton); + + expect(screen.queryByRole('listitem', { name: 'server-4' })).not.toBeInTheDocument(); + }); +}); diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx index f3dc779d28c1..741eadf7bc7e 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearch.tsx @@ -1,4 +1,5 @@ import { Modal, Skeleton } from '@rocket.chat/fuselage'; +import { useUniqueId } from '@rocket.chat/fuselage-hooks'; import { useTranslation } from '@rocket.chat/ui-contexts'; import React from 'react'; @@ -13,11 +14,12 @@ type MatrixFederationSearchProps = { const MatrixFederationSearch = ({ onClose, defaultSelectedServer }: MatrixFederationSearchProps) => { const t = useTranslation(); const { data, isLoading } = useMatrixServerList(); + const titleId = useUniqueId(); return ( - + - {t('Federation_Federated_room_search')} + {t('Federation_Federated_room_search')} diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx index ec6396a83440..878a019fc059 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx @@ -1,5 +1,5 @@ import type { SelectOption } from '@rocket.chat/fuselage'; -import { Box, Select, TextInput } from '@rocket.chat/fuselage'; +import { Box, SearchInput, Select } from '@rocket.chat/fuselage'; import { useDebouncedValue } from '@rocket.chat/fuselage-hooks'; import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts'; import type { FormEvent } from 'react'; @@ -33,7 +33,7 @@ const MatrixFederationSearchModalContent = ({ defaultSelectedServer, servers }: const t = useTranslation(); - const serverOptions = useMemo>(() => servers.map((server): SelectOption => [server.name, server.name]), [servers]); + const serverOptions = useMemo(() => servers.map((server): SelectOption => [server.name, server.name]), [servers]); const manageServers = useCallback(() => { setModal( @@ -47,7 +47,8 @@ const MatrixFederationSearchModalContent = ({ defaultSelectedServer, servers }: