From fb9c3e97419697633459e25e558fccb002e628d5 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Thu, 25 Jul 2024 13:49:23 +0000 Subject: [PATCH 01/23] Release 6.11.0-rc.0 --- .changeset/pre.json | 113 +++++++++++++++ apps/meteor/CHANGELOG.md | 133 ++++++++++++++++++ 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 | 16 +++ packages/web-ui-registration/package.json | 6 +- yarn.lock | 20 +-- 76 files changed, 814 insertions(+), 60 deletions(-) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 000000000000..e565d2ec661e --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,113 @@ +{ + "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", + "chatty-hounds-hammer", + "chilled-yaks-beg", + "chilly-papayas-march", + "cuddly-brooms-approve", + "dry-pumas-draw", + "empty-readers-teach", + "fast-buttons-shake", + "fifty-mails-admire", + "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/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 75ffb7f02d7a..7756483611ef 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,138 @@ # @rocket.chat/meteor +## 6.11.0-rc.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 + +- ([#32570](https://github.com/RocketChat/Rocket.Chat/pull/32570)) Login services button was not respecting the button color and text color settings. Implemented a fix to respect these settings and change the button colors accordingly. + + Added a warning on all settings which allow admins to change OAuth button colors, so that they can be alerted about WCAG (Web Content Accessibility Guidelines) compliance. + +- ([#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 + +- ([#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, 15664127be, 25da5280a5, 1b7b1161cf, 439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 3ffe4a2944, 3b4b19cfc5, 4e8aa575a6, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.0 + - @rocket.chat/i18n@0.6.0-rc.0 + - @rocket.chat/tools@0.2.2-rc.0 + - @rocket.chat/web-ui-registration@9.0.0-rc.0 + - @rocket.chat/ui-client@9.0.0-rc.0 + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/omnichannel-services@0.3.0-rc.0 + - @rocket.chat/pdf-worker@0.2.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/ui-video-conf@9.0.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/ui-contexts@9.0.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/ui-kit@0.36.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 + - @rocket.chat/apps@0.1.2-rc.0 + - @rocket.chat/presence@0.2.2-rc.0 + - @rocket.chat/gazzodown@9.0.0-rc.0 + - @rocket.chat/api-client@0.2.2-rc.0 + - @rocket.chat/license@0.2.2-rc.0 + - @rocket.chat/cron@0.1.2-rc.0 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.0 + - @rocket.chat/instance-status@0.1.2-rc.0 + - @rocket.chat/server-cloud-communication@0.0.2 +
+ ## 6.10.1 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index ef7c8e5717c9..61392e3ccb74 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-develop" + "version": "6.11.0-rc.0" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index f53b5ae10ee6..f4fd84238c00 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-rc.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-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/ui-kit@0.36.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 +
+ ## 1.2.1 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 4c987885c9c0..c7578eb4c03f 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.2.1", + "version": "1.3.0-rc.0", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 8c7c641c4bc2..69f7f23fcf64 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-develop", + "version": "6.11.0-rc.0", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 238e83e92d97..6cbfe21d69e5 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.2-rc.0 + +### 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-rc.0 + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index d52253fa2f94..7c907fcbd160 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.1", + "version": "0.4.2-rc.0", "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 f216f11428d8..3f27adca0381 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.2-rc.0 + +### Patch Changes + +-
Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 6eef0c30f9a7..96055b894e9b 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.1", + "version": "0.4.2-rc.0", "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 f43ecec49734..69f278445764 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.2-rc.0 + +### 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-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/ui-contexts@9.0.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 + - @rocket.chat/instance-status@0.1.2-rc.0 +
+ ## 0.3.1 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 19d69091e453..5d9a2528c503 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.1", + "version": "0.3.2-rc.0", "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 4666d1a632d9..f2b0fd842ca0 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.2-rc.0 + +### Patch Changes + +-
Updated dependencies [8fc6ca8b4e, 439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/tools@0.2.2-rc.0 + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/omnichannel-services@0.3.0-rc.0 + - @rocket.chat/pdf-worker@0.2.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index cbbfeedda398..ecaa0ebb7092 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.1", + "version": "0.4.2-rc.0", "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 338c584f29da..924d8cd1a8bd 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.2-rc.0 + +### Patch Changes + +-
Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/presence@0.2.2-rc.0 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 2bc89c48fdaf..462d72366599 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.1", + "version": "0.4.2-rc.0", "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 ccda9ae96e56..b3c05128dd7f 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.2-rc.0 + +### Patch Changes + +-
Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/omnichannel-services@0.3.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index be7ac1376935..f2f06cc1f6dc 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.1", + "version": "0.4.2-rc.0", "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 cf5790099785..a9ff2f20f33a 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.2-rc.0 + +### Patch Changes + +-
Updated dependencies [439faa87d3, 03c8b066f9, 2d89a0c448, 439faa87d3, 24f7df4894, 03c8b066f9, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index e75f32b27d43..2dce26dee9c9 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.1", + "version": "0.4.2-rc.0", "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 d8c8b8a88e86..19b2c336399e 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.2-rc.0 + +### Patch Changes + +-
Updated dependencies [2d89a0c448, 24f7df4894, 264d7d5496, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 0e17632218e2..b23626ff2b64 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.1", + "version": "0.2.2-rc.0", "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 38a500223ce2..b91f935a238e 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.2-rc.0 + +### Patch Changes + +-
Updated dependencies [264d7d5496, b8e5887fb9]: + + - @rocket.chat/rest-typings@6.11.0-rc.0 + - @rocket.chat/api-client@0.2.2-rc.0 +
+ ## 0.3.1 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 9daeb0414ffe..7190c9694ebb 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.1", + "version": "0.3.2-rc.0", "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 b4f56765a6bf..d5444f907cb7 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.2-rc.0 + +### Patch Changes + +-
Updated dependencies [2d89a0c448, 24f7df4894, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0-rc.0 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 9edae84c766d..e9631f9d66c4 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.1", + "version": "0.2.2-rc.0", "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 2e6e007ee6da..1530fd5d36c5 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-rc.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-rc.0 + - @rocket.chat/model-typings@0.6.0-rc.0 + - @rocket.chat/pdf-worker@0.2.0-rc.0 + - @rocket.chat/core-services@0.5.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 77f06f3354a6..20d8978393f2 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.2.1", + "version": "0.3.0-rc.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 303b1439c8ce..5cc4ff9d1afc 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-rc.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-rc.0 +
+ ## 0.1.1 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index a2232520921d..e09c5833bd46 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.1.1", + "version": "0.2.0-rc.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 22ea508bd15c..f14d17fc17ba 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,18 @@ # @rocket.chat/presence +## 0.2.2-rc.0 + +### 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-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 8f65fb638eaf..8e58b25302de 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.1", + "version": "0.2.2-rc.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index f5a9cdcb9353..8ad4bd36b085 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-develop", + "version": "6.11.0-rc.0", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index 606c404b9dc7..72c3a7aaee4d 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/apps +## 0.1.2-rc.0 + +### 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-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index a2f0e1c0c8d0..215f6a43bd0a 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.1", + "version": "0.1.2-rc.0", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index ae47a828656c..7536d69b2577 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,30 @@ # @rocket.chat/core-services +## 0.5.0-rc.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-rc.0 + - @rocket.chat/models@0.2.0-rc.0 + - @rocket.chat/ui-kit@0.36.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 +
+ ## 0.4.1 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 6ab8444cd5a7..9e8375b70563 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.4.1", + "version": "0.5.0-rc.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 40578e341608..7385371ccc92 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,23 @@ # @rocket.chat/core-typings +## 6.11.0-rc.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-rc.0 +
+ ## 6.10.1 ## 6.10.0 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 7932b00b7e5f..e59e299a76b2 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-develop", + "version": "6.11.0-rc.0", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 1ec9a7497714..dbbe492863db 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.2-rc.0 + +### Patch Changes + +-
Updated dependencies [2d89a0c448, 24f7df4894, b8e5887fb9]: + + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/models@0.2.0-rc.0 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 5f44c96d58a6..525665d43626 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.1", + "version": "0.1.2-rc.0", "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 d96d8d2bc1ee..0549c4045bed 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,23 @@ # Change Log +## 9.0.0-rc.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-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/ui-contexts@9.0.0-rc.0 + - @rocket.chat/ui-kit@0.36.0-rc.0 + - @rocket.chat/gazzodown@9.0.0-rc.0 + - @rocket.chat/ui-avatar@5.0.0-rc.0 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 61a0a9a93fba..4c907490e122 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": "8.0.1", + "version": "9.0.0-rc.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": "4.0.1", - "@rocket.chat/ui-contexts": "8.0.1", - "@rocket.chat/ui-kit": "0.35.0", - "@rocket.chat/ui-video-conf": "8.0.1", + "@rocket.chat/ui-avatar": "5.0.0-rc.0", + "@rocket.chat/ui-contexts": "9.0.0-rc.0", + "@rocket.chat/ui-kit": "0.36.0-rc.0", + "@rocket.chat/ui-video-conf": "9.0.0-rc.0", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 44d587ce6b5a..e71aeadaa5d7 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0-rc.0 + +### Patch Changes + +-
Updated dependencies [1b7b1161cf, 2d89a0c448, 24f7df4894, 3ffe4a2944, 4e8aa575a6, b8e5887fb9]: + + - @rocket.chat/ui-client@9.0.0-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/ui-contexts@9.0.0-rc.0 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index c90bc13b6367..29b59a1e494e 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "8.0.1", + "version": "9.0.0-rc.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": "8.0.1", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-client": "9.0.0-rc.0", + "@rocket.chat/ui-contexts": "9.0.0-rc.0", "katex": "*", "react": "*" }, diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md index 0b2df52c6042..39691d4d3a15 100644 --- a/packages/i18n/CHANGELOG.md +++ b/packages/i18n/CHANGELOG.md @@ -1,5 +1,27 @@ # @rocket.chat/i18n +## 0.6.0-rc.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.5.0 ### Minor Changes diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 91b74ef36cfa..3053af284604 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/i18n", - "version": "0.5.0", + "version": "0.6.0-rc.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 094ad838096a..44ee20dc271f 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.2-rc.0 + +### Patch Changes + +-
Updated dependencies [2d89a0c448]: + + - @rocket.chat/models@0.2.0-rc.0 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 1da979b011a1..2393fec218b8 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.1", + "version": "0.1.2-rc.0", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 293cc48779c0..e9ef176be185 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,25 @@ # @rocket.chat/livechat Change Log +## 1.19.0-rc.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-rc.0 + - @rocket.chat/gazzodown@9.0.0-rc.0 +
+ ## 1.18.1 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 418c927a5ce8..af433d9eb982 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.18.1", + "version": "1.19.0-rc.0", "files": [ "/build" ], diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md index cbf328eda950..430c5d8a0ee5 100644 --- a/packages/mock-providers/CHANGELOG.md +++ b/packages/mock-providers/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/mock-providers +## 0.1.1-rc.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 [b4bbcbfc9a, 25da5280a5, 1b7b1161cf, 03c8b066f9, 2d89a0c448, 3ffe4a2944, 3b4b19cfc5]: + + - @rocket.chat/i18n@0.6.0-rc.0 +
+ ## 0.1.0 ### Minor Changes diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json index 9adbce01c624..3fb288102aa9 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.0", + "version": "0.1.1-rc.0", "private": true, "dependencies": { "@rocket.chat/i18n": "workspace:~", diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 0b8121fc77a1..8501ee74cd44 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,28 @@ # @rocket.chat/model-typings +## 0.6.0-rc.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-rc.0 +
+ ## 0.5.1 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 3127475ad161..8daea618c8d8 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.5.1", + "version": "0.6.0-rc.0", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 3bb8885897be..bc7040dc2f96 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/models +## 0.2.0-rc.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-rc.0 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 89197d6796aa..13901b040362 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.1.1", + "version": "0.2.0-rc.0", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 5bb9404f1b0a..721e2d5a7c68 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,21 @@ # @rocket.chat/rest-typings +## 6.11.0-rc.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-rc.0 + - @rocket.chat/ui-kit@0.36.0-rc.0 +
+ ## 6.10.1 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 9be27e7634cb..456d368ac49d 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-develop", + "version": "6.11.0-rc.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 86ecb2a3c6ec..bda8e7510825 100644 --- a/packages/tools/CHANGELOG.md +++ b/packages/tools/CHANGELOG.md @@ -1,5 +1,12 @@ # @rocket.chat/tools +## 0.2.2-rc.0 + +### 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.1 ### Patch Changes diff --git a/packages/tools/package.json b/packages/tools/package.json index ac79955314b8..d1d1a2aad3cf 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/tools", - "version": "0.2.1", + "version": "0.2.2-rc.0", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md index 8b37dbb7fd02..b7063c5de622 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.0 + +### Patch Changes + +-
Updated dependencies [2d89a0c448, 4e8aa575a6]: + + - @rocket.chat/ui-contexts@9.0.0-rc.0 +
+ ## 4.0.1 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 2c3a4d75b018..cf10f0951d5c 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-avatar", - "version": "4.0.1", + "version": "5.0.0-rc.0", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-contexts": "9.0.0-rc.0", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index c5cd6a2cce8f..024389dd6f68 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,20 @@ # @rocket.chat/ui-client +## 9.0.0-rc.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-rc.0 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 9b73e9814f8c..aeced09dbd37 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "8.0.1", + "version": "9.0.0-rc.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": "8.0.1", + "@rocket.chat/ui-contexts": "9.0.0-rc.0", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 9315b5fbe66a..f06aa97e73a4 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,24 @@ # @rocket.chat/ui-contexts +## 9.0.0-rc.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-rc.0 + - @rocket.chat/core-typings@6.11.0-rc.0 + - @rocket.chat/rest-typings@6.11.0-rc.0 + - @rocket.chat/ddp-client@0.3.2-rc.0 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 06311c2b501a..55ee4446d61c 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "8.0.1", + "version": "9.0.0-rc.0", "private": true, "devDependencies": { "@rocket.chat/core-typings": "workspace:^", diff --git a/packages/ui-kit/CHANGELOG.md b/packages/ui-kit/CHANGELOG.md index 1e920681e13d..c82da29ef930 100644 --- a/packages/ui-kit/CHANGELOG.md +++ b/packages/ui-kit/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## 0.36.0-rc.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.35.0 ### Minor Changes diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json index b4819ef4311c..4caa12f09530 100644 --- a/packages/ui-kit/package.json +++ b/packages/ui-kit/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-kit", - "version": "0.35.0", + "version": "0.36.0-rc.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 0849b46fc58b..15926e115406 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-rc.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-rc.0 + - @rocket.chat/ui-avatar@5.0.0-rc.0 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index dd34ff30d7a5..477e4af786e2 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": "8.0.1", + "version": "9.0.0-rc.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": "4.0.1", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-avatar": "5.0.0-rc.0", + "@rocket.chat/ui-contexts": "9.0.0-rc.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 7750377da8a2..de359f9bbc65 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.2-rc.0 + +### Patch Changes + +-
Updated dependencies [88e5219bd2, 2d89a0c448, 4e8aa575a6, b8e5887fb9]: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.0 + - @rocket.chat/ui-contexts@9.0.0-rc.0 + - @rocket.chat/ui-avatar@5.0.0-rc.0 +
+ ## 0.3.1 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index d33cba9aeebc..c23e3c49fb9f 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.1", + "version": "0.3.2-rc.0", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 447b861cc456..1581b12f3d5e 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,21 @@ # @rocket.chat/web-ui-registration +## 9.0.0-rc.0 + +### Patch Changes + +- ([#32570](https://github.com/RocketChat/Rocket.Chat/pull/32570)) Login services button was not respecting the button color and text color settings. Implemented a fix to respect these settings and change the button colors accordingly. + + Added a warning on all settings which allow admins to change OAuth button colors, so that they can be alerted about WCAG (Web Content Accessibility Guidelines) compliance. + +- ([#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-rc.0 + - @rocket.chat/ui-contexts@9.0.0-rc.0 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index f4e462649679..187fe80cd1bd 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": "8.0.1", + "version": "9.0.0-rc.0", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -50,8 +50,8 @@ }, "peerDependencies": { "@rocket.chat/layout": "*", - "@rocket.chat/tools": "0.2.1", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/tools": "0.2.2-rc.0", + "@rocket.chat/ui-contexts": "9.0.0-rc.0", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 05788b5fed94..51de045dc430 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": 4.0.0 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-avatar": 4.0.1 + "@rocket.chat/ui-contexts": 8.0.1 "@rocket.chat/ui-kit": 0.35.0 - "@rocket.chat/ui-video-conf": 8.0.0 + "@rocket.chat/ui-video-conf": 8.0.1 "@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": 8.0.0 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-client": 8.0.1 + "@rocket.chat/ui-contexts": 8.0.1 katex: "*" react: "*" languageName: unknown @@ -10281,7 +10281,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-contexts": 8.0.1 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": 8.0.0 + "@rocket.chat/ui-contexts": 8.0.1 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": 4.0.0 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-avatar": 4.0.1 + "@rocket.chat/ui-contexts": 8.0.1 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.1 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-contexts": 8.0.1 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From d26eb5b1ce562159e281714d0e934767018bbd1a Mon Sep 17 00:00:00 2001 From: gabriellsh <40830821+gabriellsh@users.noreply.github.com> Date: Fri, 26 Jul 2024 15:44:33 -0300 Subject: [PATCH 02/23] regression: Messagebox sending message instead of just selecting popup suggestion (#32890) --- .../composer/hooks/useComposerBoxPopup.ts | 8 ++--- .../meteor/tests/e2e/message-composer.spec.ts | 35 +++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts index fc65ed84ca02..c47f1a5ddab4 100644 --- a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts +++ b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts @@ -175,7 +175,7 @@ export const useComposerBoxPopup = ({ setPopup(undefined); setFocused(undefined); event.preventDefault(); - event.stopPropagation(); + event.stopImmediatePropagation(); } }); @@ -192,7 +192,7 @@ export const useComposerBoxPopup = ({ select(focused); event.preventDefault(); - event.stopPropagation(); + event.stopImmediatePropagation(); return true; } if (event.which === keys.ARROW_UP && !(event.shiftKey || event.ctrlKey || event.altKey || event.metaKey)) { @@ -211,7 +211,7 @@ export const useComposerBoxPopup = ({ return (focusedIndex > 0 ? list[focusedIndex - 1] : list[list.length - 1]) as T; }); event.preventDefault(); - event.stopPropagation(); + event.stopImmediatePropagation(); return true; } if (event.which === keys.ARROW_DOWN && !(event.shiftKey || event.ctrlKey || event.altKey || event.metaKey)) { @@ -230,7 +230,7 @@ export const useComposerBoxPopup = ({ return (focusedIndex < list.length - 1 ? list[focusedIndex + 1] : list[0]) as T; }); event.preventDefault(); - event.stopPropagation(); + event.stopImmediatePropagation(); return true; } }); diff --git a/apps/meteor/tests/e2e/message-composer.spec.ts b/apps/meteor/tests/e2e/message-composer.spec.ts index e68d82daf78f..2ed3bcbb238e 100644 --- a/apps/meteor/tests/e2e/message-composer.spec.ts +++ b/apps/meteor/tests/e2e/message-composer.spec.ts @@ -69,4 +69,39 @@ test.describe.serial('message-composer', () => { await expect(poHomeChannel.composer).toHaveValue(`[hello composer](${url})`); }); + + test('should select popup item and not send the message when pressing enter', async ({ page }) => { + await poHomeChannel.sidenav.openChat(targetChannel); + await poHomeChannel.content.sendMessage('hello composer'); + + await test.step('mention popup', async () => { + await page.keyboard.type('hello composer @all'); + + await page.keyboard.press('Enter'); + + await expect(poHomeChannel.composer).toHaveValue('hello composer @all '); + + await poHomeChannel.composer.fill(''); + }); + + await test.step('emoji popup', async () => { + await page.keyboard.type('hello composer :flag_br'); + + await page.keyboard.press('Enter'); + + await expect(poHomeChannel.composer).toHaveValue('hello composer :flag_br: '); + + await poHomeChannel.composer.fill(''); + }); + + await test.step('slash command', async () => { + await page.keyboard.type('/gim'); + + await page.keyboard.press('Enter'); + + await expect(poHomeChannel.composer).toHaveValue('/gimme '); + + await poHomeChannel.composer.fill(''); + }); + }); }); From 4468ca54a71771f099a465ac959b3b18fc99539a Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 26 Jul 2024 20:30:38 -0300 Subject: [PATCH 03/23] regression: notify user properly on logout (#32920) --- apps/meteor/app/api/server/v1/users.ts | 2 +- apps/meteor/server/lib/resetUserE2EKey.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts index 26ef2fa30ff2..7ae585b89dfa 100644 --- a/apps/meteor/app/api/server/v1/users.ts +++ b/apps/meteor/app/api/server/v1/users.ts @@ -1216,7 +1216,7 @@ API.v1.addRoute( throw new Meteor.Error('error-invalid-user-id', 'Invalid user id'); } - void notifyOnUserChange({ clientAction: 'updated', id: this.userId, diff: { 'services.resume.loginTokens': [] } }); + void notifyOnUserChange({ clientAction: 'updated', id: userId, diff: { 'services.resume.loginTokens': [] } }); return API.v1.success({ message: `User ${userId} has been logged out!`, diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts index 3f30251dbb11..8535eee9a2cd 100644 --- a/apps/meteor/server/lib/resetUserE2EKey.ts +++ b/apps/meteor/server/lib/resetUserE2EKey.ts @@ -2,6 +2,7 @@ import { api } from '@rocket.chat/core-services'; import { Subscriptions, Users, Rooms } from '@rocket.chat/models'; import { Meteor } from 'meteor/meteor'; +import { notifyOnUserChange } from '../../app/lib/server/lib/notifyListener'; import * as Mailer from '../../app/mailer/server/api'; import { settings } from '../../app/settings/server'; import { i18n } from './i18n'; @@ -76,5 +77,7 @@ export async function resetUserE2EEncriptionKey(uid: string, notifyUser: boolean // Force the user to logout, so that the keys can be generated again await Users.unsetLoginTokens(uid); + void notifyOnUserChange({ clientAction: 'updated', id: uid, diff: { 'services.resume.loginTokens': [] } }); + return true; } From 0c3aa94b006faa1662137a1a5f6f15389a4f98db Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Sat, 27 Jul 2024 13:41:13 +0000 Subject: [PATCH 04/23] Release 6.11.0-rc.1 [no ci] --- .changeset/bump-patch-1722087664914.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 | 24 +++++++------- 69 files changed, 424 insertions(+), 56 deletions(-) create mode 100644 .changeset/bump-patch-1722087664914.md diff --git a/.changeset/bump-patch-1722087664914.md b/.changeset/bump-patch-1722087664914.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1722087664914.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 e565d2ec661e..286cc1290d04 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -63,6 +63,7 @@ }, "changesets": [ "afraid-guests-jog", + "bump-patch-1722087664914", "chatty-hounds-hammer", "chilled-yaks-beg", "chilly-papayas-march", diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 7756483611ef..01354d9167c1 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,37 @@ # @rocket.chat/meteor +## 6.11.0-rc.1 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/api-client@0.2.2-rc.1 + - @rocket.chat/license@0.2.2-rc.1 + - @rocket.chat/omnichannel-services@0.3.0-rc.1 + - @rocket.chat/pdf-worker@0.2.0-rc.1 + - @rocket.chat/presence@0.2.2-rc.1 + - @rocket.chat/apps@0.1.2-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/cron@0.1.2-rc.1 + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.1 + - @rocket.chat/gazzodown@9.0.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/ui-contexts@9.0.0-rc.1 + - @rocket.chat/server-cloud-communication@0.0.2 + - @rocket.chat/models@0.2.0-rc.1 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.1 + - @rocket.chat/ui-client@9.0.0-rc.1 + - @rocket.chat/ui-video-conf@9.0.0-rc.1 + - @rocket.chat/web-ui-registration@9.0.0-rc.1 + - @rocket.chat/instance-status@0.1.2-rc.1 +
+ ## 6.11.0-rc.0 ### Minor Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 61392e3ccb74..f9fed712adda 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-rc.0" + "version": "6.11.0-rc.1" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index f4fd84238c00..1b28ce774123 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 1.3.0-rc.0 ### Minor Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index c7578eb4c03f..a96748922921 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.0", + "version": "1.3.0-rc.1", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 69f7f23fcf64..43f70b2d4a60 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.0", + "version": "6.11.0-rc.1", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 6cbfe21d69e5..c1d7b0d921bd 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.4.2-rc.0 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 7c907fcbd160..7d5327387b8f 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.2-rc.0", + "version": "0.4.2-rc.1", "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 3f27adca0381..935eb0143dc7 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.4.2-rc.0 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 96055b894e9b..4451d5d42db1 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.2-rc.0", + "version": "0.4.2-rc.1", "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 69f278445764..f5dd8e9ef980 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/ui-contexts@9.0.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 + - @rocket.chat/instance-status@0.1.2-rc.1 +
+ ## 0.3.2-rc.0 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 5d9a2528c503..e86de941ab25 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.2-rc.0", + "version": "0.3.2-rc.1", "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 f2b0fd842ca0..c4b44b91c264 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/omnichannel-services@0.3.0-rc.1 + - @rocket.chat/pdf-worker@0.2.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.4.2-rc.0 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index ecaa0ebb7092..a0b725325ba1 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.2-rc.0", + "version": "0.4.2-rc.1", "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 924d8cd1a8bd..6fb818da127d 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/presence@0.2.2-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.4.2-rc.0 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 462d72366599..a5173bbcbb86 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.2-rc.0", + "version": "0.4.2-rc.1", "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 b3c05128dd7f..2d142ccbc666 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/omnichannel-services@0.3.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.4.2-rc.0 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index f2f06cc1f6dc..47ccbf4b415d 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.2-rc.0", + "version": "0.4.2-rc.1", "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 a9ff2f20f33a..a73e44885deb 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.4.2-rc.0 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 2dce26dee9c9..1d200420acd6 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.2-rc.0", + "version": "0.4.2-rc.1", "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 19b2c336399e..d933c4e4a171 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 +
+ ## 0.2.2-rc.0 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index b23626ff2b64..d820611a0f48 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.2-rc.0", + "version": "0.2.2-rc.1", "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 b91f935a238e..9591cfd1d5be 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.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/api-client@0.2.2-rc.1 +
+ ## 0.3.2-rc.0 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 7190c9694ebb..fa3376bcbee5 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.2-rc.0", + "version": "0.3.2-rc.1", "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 d5444f907cb7..40edb56c7519 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 +
+ ## 0.2.2-rc.0 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index e9631f9d66c4..43e2152e16b5 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.2-rc.0", + "version": "0.2.2-rc.1", "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 1530fd5d36c5..0a107027dd51 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/pdf-worker@0.2.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.3.0-rc.0 ### Minor Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 20d8978393f2..bde01b12b4d4 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.0", + "version": "0.3.0-rc.1", "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 5cc4ff9d1afc..8b5975f8e07a 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 +
+ ## 0.2.0-rc.0 ### Minor Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index e09c5833bd46..da77dec47a82 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.0", + "version": "0.2.0-rc.1", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index f14d17fc17ba..7bc42b08b934 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/presence +## 0.2.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/core-services@0.5.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.2.2-rc.0 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 8e58b25302de..da1af5225b12 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.2-rc.0", + "version": "0.2.2-rc.1", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 8ad4bd36b085..783be7f49ad8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-rc.0", + "version": "6.11.0-rc.1", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index 72c3a7aaee4d..05a8432dcd3d 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/apps +## 0.1.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/model-typings@0.6.0-rc.1 +
+ ## 0.1.2-rc.0 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index 215f6a43bd0a..9934bb3d131e 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.2-rc.0", + "version": "0.1.2-rc.1", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index 7536d69b2577..cf2874c000c0 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.5.0-rc.0 ### Minor Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 9e8375b70563..d996d662fba9 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.0", + "version": "0.5.0-rc.1", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 7385371ccc92..44f95de90496 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.1 + ## 6.11.0-rc.0 ### Minor Changes diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index e59e299a76b2..9838f54b4ebd 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.0", + "version": "6.11.0-rc.1", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index dbbe492863db..4771d0596f0f 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.1.2-rc.0 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 525665d43626..795d96fc23a7 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.2-rc.0", + "version": "0.1.2-rc.1", "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 0549c4045bed..17d7e711f736 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/gazzodown@9.0.0-rc.1 + - @rocket.chat/ui-contexts@9.0.0-rc.1 + - @rocket.chat/ui-avatar@5.0.0-rc.1 + - @rocket.chat/ui-video-conf@9.0.0-rc.1 +
+ ## 9.0.0-rc.0 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 4c907490e122..2b0ccab5cfc0 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.0", + "version": "9.0.0-rc.1", "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.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.0", + "@rocket.chat/ui-avatar": "5.0.0-rc.1", + "@rocket.chat/ui-contexts": "9.0.0-rc.1", "@rocket.chat/ui-kit": "0.36.0-rc.0", - "@rocket.chat/ui-video-conf": "9.0.0-rc.0", + "@rocket.chat/ui-video-conf": "9.0.0-rc.1", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index e71aeadaa5d7..4553bd1119f3 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/ui-contexts@9.0.0-rc.1 + - @rocket.chat/ui-client@9.0.0-rc.1 +
+ ## 9.0.0-rc.0 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 29b59a1e494e..1d41940214f6 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "9.0.0-rc.0", + "version": "9.0.0-rc.1", "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.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.0", + "@rocket.chat/ui-client": "9.0.0-rc.1", + "@rocket.chat/ui-contexts": "9.0.0-rc.1", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 44ee20dc271f..64d76269379f 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/models@0.2.0-rc.1 +
+ ## 0.1.2-rc.0 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 2393fec218b8..2eee0907d9ce 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.2-rc.0", + "version": "0.1.2-rc.1", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index e9ef176be185..fd2c0ccedf91 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/livechat Change Log +## 1.19.0-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/gazzodown@9.0.0-rc.1 +
+ ## 1.19.0-rc.0 ### Minor Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index af433d9eb982..3871bd8fd74f 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.19.0-rc.0", + "version": "1.19.0-rc.1", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 8501ee74cd44..79ec652bb381 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 +
+ ## 0.6.0-rc.0 ### Minor Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 8daea618c8d8..50dae0d5b545 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.0", + "version": "0.6.0-rc.1", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index bc7040dc2f96..ab3e4f4f884d 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/models +## 0.2.0-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/model-typings@0.6.0-rc.1 +
+ ## 0.2.0-rc.0 ### Minor Changes diff --git a/packages/models/package.json b/packages/models/package.json index 13901b040362..7dd1f0cf2ce6 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.2.0-rc.0", + "version": "0.2.0-rc.1", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 721e2d5a7c68..f317c1f3803b 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 +
+ ## 6.11.0-rc.0 ### Minor Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 456d368ac49d..bb54ff10758f 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.0", + "version": "6.11.0-rc.1", "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 b7063c5de622..b4894eea50c7 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.1 +
+ ## 5.0.0-rc.0 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index cf10f0951d5c..f44c42d9877d 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.0", + "version": "5.0.0-rc.1", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "9.0.0-rc.0", + "@rocket.chat/ui-contexts": "9.0.0-rc.1", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index 024389dd6f68..4046b4262f96 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.1 +
+ ## 9.0.0-rc.0 ### Minor Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index aeced09dbd37..beb0197a7c93 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.0", + "version": "9.0.0-rc.1", "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.0", + "@rocket.chat/ui-contexts": "9.0.0-rc.1", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index f06aa97e73a4..99da5ea0e5d8 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.1 + - @rocket.chat/rest-typings@6.11.0-rc.1 + - @rocket.chat/ddp-client@0.3.2-rc.1 +
+ ## 9.0.0-rc.0 ### Minor Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 55ee4446d61c..4f9ff4e8c1e5 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.0", + "version": "9.0.0-rc.1", "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 15926e115406..5534b646e412 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.1 + - @rocket.chat/ui-avatar@5.0.0-rc.1 +
+ ## 9.0.0-rc.0 ### Minor Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 477e4af786e2..d5746161bf91 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.0", + "version": "9.0.0-rc.1", "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.0", - "@rocket.chat/ui-contexts": "9.0.0-rc.0", + "@rocket.chat/ui-avatar": "5.0.0-rc.1", + "@rocket.chat/ui-contexts": "9.0.0-rc.1", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index de359f9bbc65..b5f1b65409c9 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.2-rc.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.1 + - @rocket.chat/ui-contexts@9.0.0-rc.1 + - @rocket.chat/ui-avatar@5.0.0-rc.1 +
+ ## 0.3.2-rc.0 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index c23e3c49fb9f..cccba227e5a2 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.2-rc.0", + "version": "0.3.2-rc.1", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 1581b12f3d5e..369d471526ad 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.1 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.1 +
+ ## 9.0.0-rc.0 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 187fe80cd1bd..524ed8eb4c2d 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.0", + "version": "9.0.0-rc.1", "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.0", + "@rocket.chat/ui-contexts": "9.0.0-rc.1", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", diff --git a/yarn.lock b/yarn.lock index 51de045dc430..5754137fde24 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": 4.0.1 - "@rocket.chat/ui-contexts": 8.0.1 - "@rocket.chat/ui-kit": 0.35.0 - "@rocket.chat/ui-video-conf": 8.0.1 + "@rocket.chat/ui-avatar": 5.0.0-rc.0 + "@rocket.chat/ui-contexts": 9.0.0-rc.0 + "@rocket.chat/ui-kit": 0.36.0-rc.0 + "@rocket.chat/ui-video-conf": 9.0.0-rc.0 "@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": 8.0.1 - "@rocket.chat/ui-contexts": 8.0.1 + "@rocket.chat/ui-client": 9.0.0-rc.0 + "@rocket.chat/ui-contexts": 9.0.0-rc.0 katex: "*" react: "*" languageName: unknown @@ -10281,7 +10281,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 8.0.1 + "@rocket.chat/ui-contexts": 9.0.0-rc.0 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": 8.0.1 + "@rocket.chat/ui-contexts": 9.0.0-rc.0 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": 4.0.1 - "@rocket.chat/ui-contexts": 8.0.1 + "@rocket.chat/ui-avatar": 5.0.0-rc.0 + "@rocket.chat/ui-contexts": 9.0.0-rc.0 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -10600,8 +10600,8 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/layout": "*" - "@rocket.chat/tools": 0.2.1 - "@rocket.chat/ui-contexts": 8.0.1 + "@rocket.chat/tools": 0.2.2-rc.0 + "@rocket.chat/ui-contexts": 9.0.0-rc.0 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From 5ddb8c3edd6bf3518d60847706e612b10f7612ce Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Mon, 29 Jul 2024 21:32:32 +0000 Subject: [PATCH 05/23] Bump 6.10.2 --- .changeset/bump-patch-1722288752329.md | 5 +++++ yarn.lock | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 .changeset/bump-patch-1722288752329.md diff --git a/.changeset/bump-patch-1722288752329.md b/.changeset/bump-patch-1722288752329.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1722288752329.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Bump @rocket.chat/meteor version. diff --git a/yarn.lock b/yarn.lock index 0db2fc4c65d8..f94e9b8e7add 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8967,10 +8967,10 @@ __metadata: "@rocket.chat/icons": "*" "@rocket.chat/prettier-config": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 4.0.0 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-avatar": 4.0.1 + "@rocket.chat/ui-contexts": 8.0.1 "@rocket.chat/ui-kit": 0.35.0 - "@rocket.chat/ui-video-conf": 8.0.0 + "@rocket.chat/ui-video-conf": 8.0.1 "@tanstack/react-query": "*" react: "*" react-dom: "*" @@ -9059,8 +9059,8 @@ __metadata: "@rocket.chat/fuselage-tokens": "*" "@rocket.chat/message-parser": 0.31.29 "@rocket.chat/styled": "*" - "@rocket.chat/ui-client": 8.0.0 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-client": 8.0.1 + "@rocket.chat/ui-contexts": 8.0.1 katex: "*" react: "*" languageName: unknown @@ -10278,7 +10278,7 @@ __metadata: typescript: ~5.3.3 peerDependencies: "@rocket.chat/fuselage": "*" - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-contexts": 8.0.1 react: ~17.0.2 languageName: unknown linkType: soft @@ -10331,7 +10331,7 @@ __metadata: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-contexts": 8.0.1 react: ~17.0.2 languageName: unknown linkType: soft @@ -10507,8 +10507,8 @@ __metadata: "@rocket.chat/fuselage-hooks": "*" "@rocket.chat/icons": "*" "@rocket.chat/styled": "*" - "@rocket.chat/ui-avatar": 4.0.0 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-avatar": 4.0.1 + "@rocket.chat/ui-contexts": 8.0.1 react: ^17.0.2 react-dom: ^17.0.2 languageName: unknown @@ -10598,7 +10598,7 @@ __metadata: peerDependencies: "@rocket.chat/layout": "*" "@rocket.chat/tools": 0.2.1 - "@rocket.chat/ui-contexts": 8.0.0 + "@rocket.chat/ui-contexts": 8.0.1 "@tanstack/react-query": "*" react: "*" react-hook-form: "*" From e1b4c28dde5f39a72d06f1310742ff42ce52c4ba Mon Sep 17 00:00:00 2001 From: "dionisio-bot[bot]" <117394943+dionisio-bot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 15:53:15 -0300 Subject: [PATCH 06/23] test: Remove mockDate and fix unit tests (#32947) (#32949) Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com> --- .../InfoPanel/RetentionPolicyCallout.spec.tsx | 7 ++++--- .../hooks/usePruneWarningMessage.spec.ts | 18 ++++-------------- .../room/body/RetentionPolicyWarning.spec.tsx | 7 ++++--- apps/meteor/tests/mocks/mockDate.ts | 12 ------------ 4 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 apps/meteor/tests/mocks/mockDate.ts diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx index 9a2e7eac4c45..fb97b0132f85 100644 --- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx +++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx @@ -4,21 +4,22 @@ import '@testing-library/jest-dom/extend-expect'; import { createRenteionPolicySettingsMock as createMock } from '../../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../../tests/mocks/data'; -import { setDate } from '../../../tests/mocks/mockDate'; import RetentionPolicyCallout from './RetentionPolicyCallout'; jest.useFakeTimers(); +beforeEach(() => { + jest.setSystemTime(new Date(2024, 5, 1, 0, 0, 0)); +}); + describe('RetentionPolicyCallout', () => { it('Should render callout if settings are valid', () => { - setDate(); const fakeRoom = createFakeRoom({ t: 'c' }); render(, { 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', () => { - setDate(); const fakeRoom = createFakeRoom({ t: 'c' }); render(, { wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, advancedPrecisionCron: '* * * 12 *', advancedPrecision: true }), diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts index 1ea3825c61ec..bb602cb81a3a 100644 --- a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts +++ b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts @@ -3,7 +3,6 @@ import { renderHook } from '@testing-library/react-hooks'; import { createRenteionPolicySettingsMock as createMock } from '../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../tests/mocks/data'; -import { setDate } from '../../tests/mocks/mockDate'; import { usePruneWarningMessage } from './usePruneWarningMessage'; jest.useFakeTimers(); @@ -22,10 +21,13 @@ const getRetentionRoomProps = (props: Partial { + jest.setSystemTime(new Date(2024, 5, 1, 0, 0, 0)); +}); + describe('usePruneWarningMessage hook', () => { describe('Cron timer and precision', () => { it('Should update the message after the nextRunDate has passaed', async () => { - setDate(); const fakeRoom = createFakeRoom({ t: 'c' }); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ @@ -40,7 +42,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with precision set to every_hour', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ appliesToChannels: true, @@ -53,7 +54,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with precision set to every_six_hours', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ appliesToChannels: true, @@ -66,7 +66,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with precision set to every_day', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ appliesToChannels: true, @@ -79,7 +78,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the default warning with advanced precision', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ appliesToChannels: true, @@ -95,7 +93,6 @@ describe('usePruneWarningMessage hook', () => { describe('No override', () => { it('Should return the default warning', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ appliesToChannels: true, @@ -107,7 +104,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the unpinned messages warning', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ appliesToChannels: true, @@ -120,7 +116,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the files only warning', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ @@ -134,7 +129,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the unpinned files only warning', () => { const fakeRoom = createFakeRoom({ t: 'c' }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock({ @@ -151,7 +145,6 @@ describe('usePruneWarningMessage hook', () => { describe('Overriden', () => { it('Should return the default warning', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps() }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock(), }); @@ -160,7 +153,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the unpinned messages warning', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true }) }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock(), }); @@ -169,7 +161,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the files only warning', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ filesOnly: true }) }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock(), @@ -179,7 +170,6 @@ describe('usePruneWarningMessage hook', () => { it('Should return the unpinned files only warning', () => { const fakeRoom = createFakeRoom({ t: 'p', ...getRetentionRoomProps({ excludePinned: true, filesOnly: true }) }); - setDate(); const { result } = renderHook(() => usePruneWarningMessage(fakeRoom), { wrapper: createMock(), diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx index 28a6eca3b283..a6c49c5537de 100644 --- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx +++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx @@ -4,21 +4,22 @@ import '@testing-library/jest-dom/extend-expect'; import { createRenteionPolicySettingsMock as createMock } from '../../../../tests/mocks/client/mockRetentionPolicySettings'; import { createFakeRoom } from '../../../../tests/mocks/data'; -import { setDate } from '../../../../tests/mocks/mockDate'; import RetentionPolicyWarning from './RetentionPolicyWarning'; jest.useFakeTimers(); +beforeEach(() => { + jest.setSystemTime(new Date(2024, 5, 1, 0, 0, 0)); +}); + describe('RetentionPolicyWarning', () => { it('Should render callout if settings are valid', () => { - setDate(); const fakeRoom = createFakeRoom({ t: 'c' }); render(, { 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', () => { - setDate(); const fakeRoom = createFakeRoom({ t: 'c' }); render(, { wrapper: createMock({ appliesToChannels: true, TTLChannels: 60000, advancedPrecisionCron: '* * * 12 *', advancedPrecision: true }), diff --git a/apps/meteor/tests/mocks/mockDate.ts b/apps/meteor/tests/mocks/mockDate.ts deleted file mode 100644 index 6591dfdf7b1b..000000000000 --- a/apps/meteor/tests/mocks/mockDate.ts +++ /dev/null @@ -1,12 +0,0 @@ -// you must use jest.useFakeTimers for this to work. -export const setDate = (minutes = 1, hours = 0, date = 1) => { - // June 12, 2024, 12:00 AM - const fakeDate = new Date(); - fakeDate.setFullYear(2024); - fakeDate.setMonth(5); - fakeDate.setDate(date); - fakeDate.setHours(hours); - fakeDate.setMinutes(minutes); - fakeDate.setSeconds(0); - jest.setSystemTime(fakeDate); -}; From ca6a9d8de80a187c8f9b3ba2809511e35e169de9 Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Wed, 31 Jul 2024 15:55:52 -0300 Subject: [PATCH 07/23] fix: Apps-Engine patch (#32935) --- .changeset/cold-chairs-wash.md | 13 +++++++++++ .changeset/early-trains-bow.md | 13 +++++++++++ .changeset/fair-wasps-switch.md | 13 +++++++++++ .changeset/soft-toys-invent.md | 13 +++++++++++ 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 ++++++++++----------- 14 files changed, 74 insertions(+), 22 deletions(-) create mode 100644 .changeset/cold-chairs-wash.md create mode 100644 .changeset/early-trains-bow.md create mode 100644 .changeset/fair-wasps-switch.md create mode 100644 .changeset/soft-toys-invent.md diff --git a/.changeset/cold-chairs-wash.md b/.changeset/cold-chairs-wash.md new file mode 100644 index 000000000000..89087deaee46 --- /dev/null +++ b/.changeset/cold-chairs-wash.md @@ -0,0 +1,13 @@ +--- +'rocketchat-services': patch +'@rocket.chat/fuselage-ui-kit': patch +'@rocket.chat/core-services': patch +'@rocket.chat/core-typings': patch +'@rocket.chat/rest-typings': patch +'@rocket.chat/ddp-streamer': patch +'@rocket.chat/presence': patch +'@rocket.chat/apps': patch +'@rocket.chat/meteor': patch +--- + +Fixed an issue that prevented apps from being updated or uninstalled in some cases diff --git a/.changeset/early-trains-bow.md b/.changeset/early-trains-bow.md new file mode 100644 index 000000000000..035eb4506188 --- /dev/null +++ b/.changeset/early-trains-bow.md @@ -0,0 +1,13 @@ +--- +'rocketchat-services': patch +'@rocket.chat/fuselage-ui-kit': patch +'@rocket.chat/core-services': patch +'@rocket.chat/core-typings': patch +'@rocket.chat/rest-typings': patch +'@rocket.chat/ddp-streamer': patch +'@rocket.chat/presence': patch +'@rocket.chat/apps': patch +'@rocket.chat/meteor': patch +--- + +Fixed an issue that prevented apps from handling errors during execution in some cases diff --git a/.changeset/fair-wasps-switch.md b/.changeset/fair-wasps-switch.md new file mode 100644 index 000000000000..34ae58397f9a --- /dev/null +++ b/.changeset/fair-wasps-switch.md @@ -0,0 +1,13 @@ +--- +'rocketchat-services': patch +'@rocket.chat/fuselage-ui-kit': patch +'@rocket.chat/core-services': patch +'@rocket.chat/core-typings': patch +'@rocket.chat/rest-typings': patch +'@rocket.chat/ddp-streamer': patch +'@rocket.chat/presence': patch +'@rocket.chat/apps': patch +'@rocket.chat/meteor': patch +--- + +Improved Apps-Engine installation to prevent start up errors on manual installation setups diff --git a/.changeset/soft-toys-invent.md b/.changeset/soft-toys-invent.md new file mode 100644 index 000000000000..6994ff349526 --- /dev/null +++ b/.changeset/soft-toys-invent.md @@ -0,0 +1,13 @@ +--- +'rocketchat-services': patch +'@rocket.chat/fuselage-ui-kit': patch +'@rocket.chat/core-services': patch +'@rocket.chat/core-typings': patch +'@rocket.chat/rest-typings': patch +'@rocket.chat/ddp-streamer': patch +'@rocket.chat/presence': patch +'@rocket.chat/apps': patch +'@rocket.chat/meteor': patch +--- + +Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index 735f155feaa5..c3f81b02e4b9 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": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@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 4c2ad51c5f14..4007f12f2230 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": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@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 013609f580d5..914ca3585729 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": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@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 b3298d31d856..86b9048947b8 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": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@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 cae747dc0570..f8c16c8fca6e 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -22,7 +22,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@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 3c57d3c6f3da..37de150c969c 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": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@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 3160b2223a5c..149cb50981ad 100644 --- a/packages/core-typings/package.json +++ b/packages/core-typings/package.json @@ -22,7 +22,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@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 d340189971ef..9377a9b80f59 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": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/fuselage": "^0.54.3", diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index 51a5499ac3d0..dcf862ca0da4 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -24,7 +24,7 @@ "/dist" ], "dependencies": { - "@rocket.chat/apps-engine": "1.43.0", + "@rocket.chat/apps-engine": "1.43.1", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/ui-kit": "workspace:~", diff --git a/yarn.lock b/yarn.lock index f94e9b8e7add..cb488238f2de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8508,9 +8508,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/apps-engine@npm:1.43.0": - version: 1.43.0 - resolution: "@rocket.chat/apps-engine@npm:1.43.0" +"@rocket.chat/apps-engine@npm:1.43.1": + version: 1.43.1 + resolution: "@rocket.chat/apps-engine@npm:1.43.1" dependencies: "@msgpack/msgpack": 3.0.0-beta2 adm-zip: ^0.5.9 @@ -8526,7 +8526,7 @@ __metadata: uuid: ~8.3.2 peerDependencies: "@rocket.chat/ui-kit": "*" - checksum: d2a4be96fd56bd7790459cbe82d87601ce8cb4e846a8cd5d1cddbc699ff776f3dcd07b3b22a7e74f12e2f1b0361b6c3cf4a415254f1f5d75d537f5c5730ce05e + checksum: 46dc87b92acbfe49ef4669920707cdf3a577e49ce04d3c139bb12e3666a6a1d4a536e7ab9ecf5b64c27dd73bd85fd0ccbb954eb97b55f6926600cf31b2fcb6fe languageName: node linkType: hard @@ -8534,7 +8534,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/apps@workspace:packages/apps" dependencies: - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/model-typings": "workspace:^" "@types/jest": ~29.5.7 @@ -8613,7 +8613,7 @@ __metadata: "@babel/core": ~7.22.20 "@babel/preset-env": ~7.22.20 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ^0.36.0 @@ -8639,7 +8639,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/core-typings@workspace:packages/core-typings" dependencies: - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/icons": ^0.36.0 "@rocket.chat/message-parser": "workspace:^" @@ -8716,7 +8716,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/ddp-streamer@workspace:ee/apps/ddp-streamer" dependencies: - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 @@ -8912,7 +8912,7 @@ __metadata: "@babel/preset-env": ~7.22.20 "@babel/preset-react": ~7.22.15 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/fuselage": ^0.54.3 @@ -9356,7 +9356,7 @@ __metadata: "@rocket.chat/agenda": "workspace:^" "@rocket.chat/api-client": "workspace:^" "@rocket.chat/apps": "workspace:^" - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/base64": "workspace:^" "@rocket.chat/cas-validate": "workspace:^" "@rocket.chat/core-services": "workspace:^" @@ -9994,7 +9994,7 @@ __metadata: "@babel/core": ~7.22.20 "@babel/preset-env": ~7.22.20 "@babel/preset-typescript": ~7.22.15 - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" @@ -10109,7 +10109,7 @@ __metadata: version: 0.0.0-use.local resolution: "@rocket.chat/rest-typings@workspace:packages/rest-typings" dependencies: - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" "@rocket.chat/message-parser": "workspace:^" @@ -37135,7 +37135,7 @@ __metadata: version: 0.0.0-use.local resolution: "rocketchat-services@workspace:apps/meteor/ee/server/services" dependencies: - "@rocket.chat/apps-engine": 1.43.0 + "@rocket.chat/apps-engine": 1.43.1 "@rocket.chat/core-services": "workspace:^" "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/emitter": ~0.31.25 From 7d9bb115cd4c360c3684b8825374dd77c85fbd69 Mon Sep 17 00:00:00 2001 From: "dionisio-bot[bot]" <117394943+dionisio-bot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:47:07 -0300 Subject: [PATCH 08/23] fix: Client crashing on firefox private window (#32950) Co-authored-by: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com> Co-authored-by: Diego Sampaio --- .changeset/new-balloons-speak.md | 7 ++++++ .../structure/AttachmentDownloadBase.tsx | 5 ++-- .../hooks/useDownloadFromServiceWorker.ts | 23 ++++++++++++------- .../RoomFiles/components/FileItemMenu.tsx | 22 ++++++++++++------ packages/i18n/src/locales/en.i18n.json | 1 + 5 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 .changeset/new-balloons-speak.md diff --git a/.changeset/new-balloons-speak.md b/.changeset/new-balloons-speak.md new file mode 100644 index 000000000000..cecaabe353ba --- /dev/null +++ b/.changeset/new-balloons-speak.md @@ -0,0 +1,7 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fixed a crash on web client due to service workers not being available, this can happen in multiple scenarios like on Firefox's private window or if the connection is not secure (non-HTTPS), [see more details](https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts). + +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/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx index 48c078b9146c..c9adc4533a97 100644 --- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx +++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownloadBase.tsx @@ -6,18 +6,19 @@ import Action from '../../Action'; type AttachmentDownloadBaseProps = Omit, 'icon'> & { title?: string | undefined; href: string }; -const AttachmentDownloadBase: FC = ({ title, href, ...props }) => { +const AttachmentDownloadBase: FC = ({ title, href, disabled, ...props }) => { const t = useTranslation(); return ( ); diff --git a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts index 5ab7f804fec7..199d1507e284 100644 --- a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts +++ b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts @@ -7,13 +7,15 @@ import { downloadAs } from '../lib/download'; const ee = new Emitter>(); -navigator.serviceWorker.addEventListener('message', (event) => { - if (event.data.type === 'attachment-download-result') { - const { result } = event.data as { result: ArrayBuffer; id: string }; +if ('serviceWorker' in navigator) { + navigator.serviceWorker.addEventListener('message', (event) => { + if (event.data.type === 'attachment-download-result') { + const { result } = event.data as { result: ArrayBuffer; id: string }; - ee.emit(event.data.id, { result, id: event.data.id }); - } -}); + ee.emit(event.data.id, { result, id: event.data.id }); + } + }); +} export const registerDownloadForUid = (uid: string, t: ReturnType['t'], title?: string) => { ee.once(uid, ({ result }) => { @@ -23,8 +25,13 @@ export const registerDownloadForUid = (uid: string, t: ReturnType { if (!controller) { - controller = navigator.serviceWorker.controller; + controller = navigator?.serviceWorker?.controller; + } + + if (!controller) { + return; } + controller?.postMessage({ type: 'attachment-download', url: href, @@ -33,7 +40,7 @@ export const forAttachmentDownload = (uid: string, href: string, controller?: Se }; export const useDownloadFromServiceWorker = (href: string, title?: string) => { - const { controller } = navigator.serviceWorker; + const { controller } = navigator?.serviceWorker || {}; const uid = useUniqueId(); diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx index 157df8d78027..4fbf2fc477f1 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItemMenu.tsx @@ -17,21 +17,24 @@ type FileItemMenuProps = { const ee = new Emitter>(); -navigator.serviceWorker.addEventListener('message', (event) => { - if (event.data.type === 'attachment-download-result') { - const { result } = event.data as { result: ArrayBuffer; id: string }; +if ('serviceWorker' in navigator) { + navigator.serviceWorker.addEventListener('message', (event) => { + if (event.data.type === 'attachment-download-result') { + const { result } = event.data as { result: ArrayBuffer; id: string }; - ee.emit(event.data.id, { result, id: event.data.id }); - } -}); + ee.emit(event.data.id, { result, id: event.data.id }); + } + }); +} const FileItemMenu = ({ fileData, onClickDelete }: FileItemMenuProps) => { const t = useTranslation(); const room = useRoom(); const userId = useUserId(); const isDeletionAllowed = useMessageDeletionIsAllowed(room._id, fileData, userId); + const canDownloadFile = !fileData.encryption || 'serviceWorker' in navigator; - const { controller } = navigator.serviceWorker; + const { controller } = navigator?.serviceWorker || {}; const uid = useUniqueId(); @@ -53,6 +56,10 @@ const FileItemMenu = ({ fileData, onClickDelete }: FileItemMenuProps) => { ), action: () => { if (fileData.path?.includes('/file-decrypt/')) { + if (!controller) { + return; + } + controller?.postMessage({ type: 'attachment-download', url: fileData.path, @@ -68,6 +75,7 @@ const FileItemMenu = ({ fileData, onClickDelete }: FileItemMenuProps) => { URL.revokeObjectURL(fileData.url); } }, + disabled: !canDownloadFile, }, ...(isDeletionAllowed && onClickDelete && { diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json index f9f29f1fcc30..e4d1c611aef6 100644 --- a/packages/i18n/src/locales/en.i18n.json +++ b/packages/i18n/src/locales/en.i18n.json @@ -1756,6 +1756,7 @@ "Dont_ask_me_again_list": "Don't ask me again list", "Download": "Download", "Download_Destkop_App": "Download Desktop App", + "Download_Disabled": "Download disabled", "Download_Info": "Download info", "Download_My_Data": "Download My Data (HTML)", "Download_Pending_Avatars": "Download Pending Avatars", From 822d32f76f8d9ffe39701187ac6f6faf129f750c Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Wed, 31 Jul 2024 23:10:11 +0000 Subject: [PATCH 09/23] Release 6.10.2 [no ci] --- .changeset/bump-patch-1722288752329.md | 5 -- .changeset/cold-chairs-wash.md | 13 ------ .changeset/early-trains-bow.md | 13 ------ .changeset/fair-wasps-switch.md | 13 ------ .changeset/new-balloons-speak.md | 7 --- .changeset/soft-toys-invent.md | 13 ------ apps/meteor/CHANGELOG.md | 46 +++++++++++++++++++ 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 | 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 | 23 ++++++++++ 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 | 19 ++++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/apps/CHANGELOG.md | 18 ++++++++ packages/apps/package.json | 2 +- packages/core-services/CHANGELOG.md | 19 ++++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 12 +++++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 10 ++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 21 +++++++++ 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 | 17 +++++++ 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 +- 72 files changed, 486 insertions(+), 108 deletions(-) delete mode 100644 .changeset/bump-patch-1722288752329.md delete mode 100644 .changeset/cold-chairs-wash.md delete mode 100644 .changeset/early-trains-bow.md delete mode 100644 .changeset/fair-wasps-switch.md delete mode 100644 .changeset/new-balloons-speak.md delete mode 100644 .changeset/soft-toys-invent.md diff --git a/.changeset/bump-patch-1722288752329.md b/.changeset/bump-patch-1722288752329.md deleted file mode 100644 index e1eaa7980afb..000000000000 --- a/.changeset/bump-patch-1722288752329.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Bump @rocket.chat/meteor version. diff --git a/.changeset/cold-chairs-wash.md b/.changeset/cold-chairs-wash.md deleted file mode 100644 index 89087deaee46..000000000000 --- a/.changeset/cold-chairs-wash.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -'rocketchat-services': patch -'@rocket.chat/fuselage-ui-kit': patch -'@rocket.chat/core-services': patch -'@rocket.chat/core-typings': patch -'@rocket.chat/rest-typings': patch -'@rocket.chat/ddp-streamer': patch -'@rocket.chat/presence': patch -'@rocket.chat/apps': patch -'@rocket.chat/meteor': patch ---- - -Fixed an issue that prevented apps from being updated or uninstalled in some cases diff --git a/.changeset/early-trains-bow.md b/.changeset/early-trains-bow.md deleted file mode 100644 index 035eb4506188..000000000000 --- a/.changeset/early-trains-bow.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -'rocketchat-services': patch -'@rocket.chat/fuselage-ui-kit': patch -'@rocket.chat/core-services': patch -'@rocket.chat/core-typings': patch -'@rocket.chat/rest-typings': patch -'@rocket.chat/ddp-streamer': patch -'@rocket.chat/presence': patch -'@rocket.chat/apps': patch -'@rocket.chat/meteor': patch ---- - -Fixed an issue that prevented apps from handling errors during execution in some cases diff --git a/.changeset/fair-wasps-switch.md b/.changeset/fair-wasps-switch.md deleted file mode 100644 index 34ae58397f9a..000000000000 --- a/.changeset/fair-wasps-switch.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -'rocketchat-services': patch -'@rocket.chat/fuselage-ui-kit': patch -'@rocket.chat/core-services': patch -'@rocket.chat/core-typings': patch -'@rocket.chat/rest-typings': patch -'@rocket.chat/ddp-streamer': patch -'@rocket.chat/presence': patch -'@rocket.chat/apps': patch -'@rocket.chat/meteor': patch ---- - -Improved Apps-Engine installation to prevent start up errors on manual installation setups diff --git a/.changeset/new-balloons-speak.md b/.changeset/new-balloons-speak.md deleted file mode 100644 index cecaabe353ba..000000000000 --- a/.changeset/new-balloons-speak.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@rocket.chat/meteor': patch ---- - -Fixed a crash on web client due to service workers not being available, this can happen in multiple scenarios like on Firefox's private window or if the connection is not secure (non-HTTPS), [see more details](https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts). - -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/soft-toys-invent.md b/.changeset/soft-toys-invent.md deleted file mode 100644 index 6994ff349526..000000000000 --- a/.changeset/soft-toys-invent.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -'rocketchat-services': patch -'@rocket.chat/fuselage-ui-kit': patch -'@rocket.chat/core-services': patch -'@rocket.chat/core-typings': patch -'@rocket.chat/rest-typings': patch -'@rocket.chat/ddp-streamer': patch -'@rocket.chat/presence': patch -'@rocket.chat/apps': patch -'@rocket.chat/meteor': patch ---- - -Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index 75ffb7f02d7a..f17422bbb318 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,5 +1,51 @@ # @rocket.chat/meteor +## 6.10.2 + +### Patch Changes + +- Bump @rocket.chat/meteor version. + +- Bump @rocket.chat/meteor version. + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32950](https://github.com/RocketChat/Rocket.Chat/pull/32950) by [@dionisio-bot](https://github.com/dionisio-bot)) Fixed a crash on web client due to service workers not being available, this can happen in multiple scenarios like on Firefox's private window or if the connection is not secure (non-HTTPS), [see more details](https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts). + + 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 + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/fuselage-ui-kit@8.0.2 + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/presence@0.2.2 + - @rocket.chat/apps@0.1.2 + - @rocket.chat/omnichannel-services@0.2.2 + - @rocket.chat/api-client@0.2.2 + - @rocket.chat/license@0.2.2 + - @rocket.chat/pdf-worker@0.1.2 + - @rocket.chat/cron@0.1.2 + - @rocket.chat/gazzodown@8.0.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/ui-contexts@8.0.2 + - @rocket.chat/server-cloud-communication@0.0.2 + - @rocket.chat/models@0.1.2 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@4.0.2 + - @rocket.chat/ui-client@8.0.2 + - @rocket.chat/ui-video-conf@8.0.2 + - @rocket.chat/web-ui-registration@8.0.2 + - @rocket.chat/instance-status@0.1.2 +
+ ## 6.10.1 ### Patch Changes diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index d66b95190b1e..3cb06b1e99ab 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.10.1" + "version": "6.10.2" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index f53b5ae10ee6..5da1c7dee35c 100644 --- a/apps/meteor/ee/server/services/CHANGELOG.md +++ b/apps/meteor/ee/server/services/CHANGELOG.md @@ -1,5 +1,26 @@ # rocketchat-services +## 1.2.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 1.2.1 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index c3f81b02e4b9..1c62f81ff240 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.2.1", + "version": "1.2.2", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 4007f12f2230..a7c7afa96f2c 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.10.1", + "version": "6.10.2", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 238e83e92d97..83638e76874f 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index b2e4eafd47d2..b28e0da61062 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.1", + "version": "0.4.2", "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 f216f11428d8..a6416aa95efe 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index 6eef0c30f9a7..87ade6ff5711 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.1", + "version": "0.4.2", "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 f43ecec49734..642759edb259 100644 --- a/ee/apps/ddp-streamer/CHANGELOG.md +++ b/ee/apps/ddp-streamer/CHANGELOG.md @@ -1,5 +1,28 @@ # @rocket.chat/ddp-streamer +## 0.3.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/ui-contexts@8.0.2 + - @rocket.chat/models@0.1.2 + - @rocket.chat/instance-status@0.1.2 +
+ ## 0.3.1 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 914ca3585729..b402bd207477 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.1", + "version": "0.3.2", "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 4666d1a632d9..71ff0a638919 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/omnichannel-services@0.2.2 + - @rocket.chat/pdf-worker@0.1.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index cbbfeedda398..8ba613e17765 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.1", + "version": "0.4.2", "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 338c584f29da..a5cd36d99609 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/presence@0.2.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 2bc89c48fdaf..f54bf8b5ab32 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.1", + "version": "0.4.2", "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 ccda9ae96e56..c6af1c23a1cd 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/omnichannel-services@0.2.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index be7ac1376935..875d8a365fd9 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.1", + "version": "0.4.2", "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 cf5790099785..354e8128a405 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.4.1 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index e75f32b27d43..bedf1a8b966b 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.1", + "version": "0.4.2", "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 d8c8b8a88e86..5b58fe71a941 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 0e17632218e2..606c7cc980e0 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.1", + "version": "0.2.2", "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 38a500223ce2..46e946c6f000 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.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/api-client@0.2.2 +
+ ## 0.3.1 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index 9daeb0414ffe..84cd515e685f 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.1", + "version": "0.3.2", "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 b4f56765a6bf..b40c1af7fdfa 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 9edae84c766d..4dbb871c4641 100644 --- a/ee/packages/license/package.json +++ b/ee/packages/license/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/license", - "version": "0.2.1", + "version": "0.2.2", "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 2e6e007ee6da..65c926bae845 100644 --- a/ee/packages/omnichannel-services/CHANGELOG.md +++ b/ee/packages/omnichannel-services/CHANGELOG.md @@ -1,5 +1,19 @@ # @rocket.chat/omnichannel-services +## 0.2.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/pdf-worker@0.1.2 + - @rocket.chat/model-typings@0.5.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index 4e78d913d2aa..a3d1b155f10f 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.2.1", + "version": "0.2.2", "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 303b1439c8ce..147ba55902fc 100644 --- a/ee/packages/pdf-worker/CHANGELOG.md +++ b/ee/packages/pdf-worker/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/pdf-worker +## 0.1.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 +
+ ## 0.1.1 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index a2232520921d..9049e0a8d2b5 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.1.1", + "version": "0.1.2", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 22ea508bd15c..7d7838a0943c 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,24 @@ # @rocket.chat/presence +## 0.2.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-services@0.4.2 + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.2.1 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index 86b9048947b8..5a9def3a72a3 100644 --- a/ee/packages/presence/package.json +++ b/ee/packages/presence/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/presence", - "version": "0.2.1", + "version": "0.2.2", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index fd8fdb660f95..2968b7380c14 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.10.1", + "version": "6.10.2", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index 606c404b9dc7..c776efa71f6e 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,23 @@ # @rocket.chat/apps +## 0.1.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/model-typings@0.5.2 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index f8c16c8fca6e..f3f39ddf1083 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.1", + "version": "0.1.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index ae47a828656c..f12811c17f20 100644 --- a/packages/core-services/CHANGELOG.md +++ b/packages/core-services/CHANGELOG.md @@ -1,5 +1,24 @@ # @rocket.chat/core-services +## 0.4.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.4.1 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 37de150c969c..fa420df6a176 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/core-services", - "version": "0.4.1", + "version": "0.4.2", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index 40578e341608..b6f96319bf00 100644 --- a/packages/core-typings/CHANGELOG.md +++ b/packages/core-typings/CHANGELOG.md @@ -1,5 +1,17 @@ # @rocket.chat/core-typings +## 6.10.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + ## 6.10.1 ## 6.10.0 diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 149cb50981ad..47e76033d71c 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.10.1", + "version": "6.10.2", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index 1ec9a7497714..3d2c51d66f23 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/models@0.1.2 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 5f44c96d58a6..15769222cf15 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.1", + "version": "0.1.2", "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 d96d8d2bc1ee..c131ad9b4b86 100644 --- a/packages/fuselage-ui-kit/CHANGELOG.md +++ b/packages/fuselage-ui-kit/CHANGELOG.md @@ -1,5 +1,26 @@ # Change Log +## 8.0.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/gazzodown@8.0.2 + - @rocket.chat/ui-contexts@8.0.2 + - @rocket.chat/ui-avatar@4.0.2 + - @rocket.chat/ui-video-conf@8.0.2 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 9377a9b80f59..5697e9052d50 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": "8.0.1", + "version": "8.0.2", "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": "4.0.1", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-avatar": "4.0.2", + "@rocket.chat/ui-contexts": "8.0.2", "@rocket.chat/ui-kit": "0.35.0", - "@rocket.chat/ui-video-conf": "8.0.1", + "@rocket.chat/ui-video-conf": "8.0.2", "@tanstack/react-query": "*", "react": "*", "react-dom": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 44d587ce6b5a..e053a9352f20 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 8.0.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/ui-contexts@8.0.2 + - @rocket.chat/ui-client@8.0.2 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 86b000824df0..448b82909013 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "8.0.1", + "version": "8.0.2", "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": "8.0.1", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-client": "8.0.2", + "@rocket.chat/ui-contexts": "8.0.2", "katex": "*", "react": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index 094ad838096a..c123558a4ea7 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/instance-status +## 0.1.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/models@0.1.2 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index 1da979b011a1..9a6e738b79b3 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.1", + "version": "0.1.2", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index 293cc48779c0..3e5253b4636c 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/livechat Change Log +## 1.18.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/gazzodown@8.0.2 +
+ ## 1.18.1 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 4ae68042f5ef..ab11f48e40ae 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.18.1", + "version": "1.18.2", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 0b8121fc77a1..9ef27c21b1bd 100644 --- a/packages/model-typings/CHANGELOG.md +++ b/packages/model-typings/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/model-typings +## 0.5.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 +
+ ## 0.5.1 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 3127475ad161..f6de32bcf7a3 100644 --- a/packages/model-typings/package.json +++ b/packages/model-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/model-typings", - "version": "0.5.1", + "version": "0.5.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 3bb8885897be..0386f5c00eaf 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/models +## 0.1.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/model-typings@0.5.2 +
+ ## 0.1.1 ### Patch Changes diff --git a/packages/models/package.json b/packages/models/package.json index 89197d6796aa..231998e6dd26 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.1.1", + "version": "0.1.2", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 5bb9404f1b0a..af021dc481fe 100644 --- a/packages/rest-typings/CHANGELOG.md +++ b/packages/rest-typings/CHANGELOG.md @@ -1,5 +1,22 @@ # @rocket.chat/rest-typings +## 6.10.2 + +### Patch Changes + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from being updated or uninstalled in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that prevented apps from handling errors during execution in some cases + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Improved Apps-Engine installation to prevent start up errors on manual installation setups + +- ([#32935](https://github.com/RocketChat/Rocket.Chat/pull/32935)) Fixed an issue that caused the video conference button on rooms to not recognize a video conference provider app in some cases + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 +
+ ## 6.10.1 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index dcf862ca0da4..93b82ee41433 100644 --- a/packages/rest-typings/package.json +++ b/packages/rest-typings/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/rest-typings", - "version": "6.10.1", + "version": "6.10.2", "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 8b37dbb7fd02..b67445ff3d38 100644 --- a/packages/ui-avatar/CHANGELOG.md +++ b/packages/ui-avatar/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-avatar +## 4.0.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@8.0.2 +
+ ## 4.0.1 ### Patch Changes diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 6286d9146a58..22272a617ea8 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-avatar", - "version": "4.0.1", + "version": "4.0.2", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "peerDependencies": { "@rocket.chat/fuselage": "*", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-contexts": "8.0.2", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index c5cd6a2cce8f..fed23a48167b 100644 --- a/packages/ui-client/CHANGELOG.md +++ b/packages/ui-client/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/ui-client +## 8.0.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@8.0.2 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 2bc5f299a92c..651c8982df63 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-client", - "version": "8.0.1", + "version": "8.0.2", "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": "8.0.1", + "@rocket.chat/ui-contexts": "8.0.2", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index 9315b5fbe66a..621d8f788590 100644 --- a/packages/ui-contexts/CHANGELOG.md +++ b/packages/ui-contexts/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/ui-contexts +## 8.0.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/core-typings@6.10.2 + - @rocket.chat/rest-typings@6.10.2 + - @rocket.chat/ddp-client@0.3.2 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 06311c2b501a..514fe3d0c2c8 100644 --- a/packages/ui-contexts/package.json +++ b/packages/ui-contexts/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/ui-contexts", - "version": "8.0.1", + "version": "8.0.2", "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 0849b46fc58b..138ba8d56a68 100644 --- a/packages/ui-video-conf/CHANGELOG.md +++ b/packages/ui-video-conf/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/ui-video-conf +## 8.0.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@8.0.2 + - @rocket.chat/ui-avatar@4.0.2 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 28f65ecf8291..ea753a706c14 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": "8.0.1", + "version": "8.0.2", "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": "4.0.1", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-avatar": "4.0.2", + "@rocket.chat/ui-contexts": "8.0.2", "react": "^17.0.2", "react-dom": "^17.0.2" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 7750377da8a2..5fa595be6570 100644 --- a/packages/uikit-playground/CHANGELOG.md +++ b/packages/uikit-playground/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/uikit-playground +## 0.3.2 + +### Patch Changes + +-
Updated dependencies [ca6a9d8de8, ca6a9d8de8, ca6a9d8de8, ca6a9d8de8]: + + - @rocket.chat/fuselage-ui-kit@8.0.2 + - @rocket.chat/ui-contexts@8.0.2 + - @rocket.chat/ui-avatar@4.0.2 +
+ ## 0.3.1 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index d37f85f460b0..fb730f37ccfb 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.1", + "version": "0.3.2", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 447b861cc456..0a2316ba4dc4 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/web-ui-registration +## 8.0.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@8.0.2 +
+ ## 8.0.1 ### Patch Changes diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 4d7e0abf9437..cccb7bebeac7 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": "8.0.1", + "version": "8.0.2", "private": true, "homepage": "https://rocket.chat", "main": "./dist/index.js", @@ -51,7 +51,7 @@ "peerDependencies": { "@rocket.chat/layout": "*", "@rocket.chat/tools": "0.2.1", - "@rocket.chat/ui-contexts": "8.0.1", + "@rocket.chat/ui-contexts": "8.0.2", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From c7b3dd74bee7be94cbd7971007d7707608cbe19a Mon Sep 17 00:00:00 2001 From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com> Date: Thu, 1 Aug 2024 19:52:58 +0530 Subject: [PATCH 10/23] Revert "fix: Login services button colors" (#32955) --- .changeset/fifty-mails-admire.md | 8 -------- .../app/meteor-accounts-saml/server/lib/settings.ts | 2 -- apps/meteor/server/lib/oauth/addOAuthService.ts | 2 -- apps/meteor/server/settings/cas.ts | 4 ++-- apps/meteor/server/settings/oauth.ts | 4 ---- apps/meteor/tests/e2e/page-objects/auth.ts | 2 +- apps/meteor/tests/e2e/saml.spec.ts | 7 ------- apps/meteor/tests/e2e/utils/convertHexToRGB.ts | 9 --------- packages/i18n/src/locales/en.i18n.json | 1 - packages/web-ui-registration/src/LoginServicesButton.tsx | 4 ---- 10 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 .changeset/fifty-mails-admire.md delete mode 100644 apps/meteor/tests/e2e/utils/convertHexToRGB.ts diff --git a/.changeset/fifty-mails-admire.md b/.changeset/fifty-mails-admire.md deleted file mode 100644 index b87fd11d47ee..000000000000 --- a/.changeset/fifty-mails-admire.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -'@rocket.chat/web-ui-registration': patch -"@rocket.chat/meteor": minor ---- - -Login services button was not respecting the button color and text color settings. Implemented a fix to respect these settings and change the button colors accordingly. - -Added a warning on all settings which allow admins to change OAuth button colors, so that they can be alerted about WCAG (Web Content Accessibility Guidelines) compliance. diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts index 5c16716720b0..bb9567260337 100644 --- a/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts +++ b/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts @@ -230,12 +230,10 @@ export const addSettings = async function (name: string): Promise { await this.add(`SAML_Custom_${name}_button_label_color`, '#FFFFFF', { type: 'string', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', - alert: 'OAuth_button_colors_alert', }); await this.add(`SAML_Custom_${name}_button_color`, '#1d74f5', { type: 'string', i18nLabel: 'Accounts_OAuth_Custom_Button_Color', - alert: 'OAuth_button_colors_alert', }); }); diff --git a/apps/meteor/server/lib/oauth/addOAuthService.ts b/apps/meteor/server/lib/oauth/addOAuthService.ts index db84cb467ffc..2a49a23a1f4e 100644 --- a/apps/meteor/server/lib/oauth/addOAuthService.ts +++ b/apps/meteor/server/lib/oauth/addOAuthService.ts @@ -118,7 +118,6 @@ export async function addOAuthService(name: string, values: { [k: string]: strin section: `Custom OAuth: ${name}`, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true, - alert: 'OAuth_button_colors_alert', }); await settingsRegistry.add(`Accounts_OAuth_Custom-${name}-button_color`, values.buttonColor || '#1d74f5', { type: 'string', @@ -126,7 +125,6 @@ export async function addOAuthService(name: string, values: { [k: string]: strin section: `Custom OAuth: ${name}`, i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true, - alert: 'OAuth_button_colors_alert', }); await settingsRegistry.add(`Accounts_OAuth_Custom-${name}-key_field`, values.keyField || 'username', { type: 'select', diff --git a/apps/meteor/server/settings/cas.ts b/apps/meteor/server/settings/cas.ts index f8ae4e6ca65a..48a13d8cbd9c 100644 --- a/apps/meteor/server/settings/cas.ts +++ b/apps/meteor/server/settings/cas.ts @@ -33,8 +33,8 @@ export const createCasSettings = () => await this.add('CAS_popup_width', 810, { type: 'int', group: 'CAS', public: true }); await this.add('CAS_popup_height', 610, { type: 'int', group: 'CAS', public: true }); await this.add('CAS_button_label_text', 'CAS', { type: 'string', group: 'CAS' }); - await this.add('CAS_button_label_color', '#FFFFFF', { type: 'color', group: 'CAS', alert: 'OAuth_button_colors_alert' }); - await this.add('CAS_button_color', '#1d74f5', { type: 'color', group: 'CAS', alert: 'OAuth_button_colors_alert' }); + await this.add('CAS_button_label_color', '#FFFFFF', { type: 'color', group: 'CAS' }); + await this.add('CAS_button_color', '#1d74f5', { type: 'color', group: 'CAS' }); await this.add('CAS_autoclose', true, { type: 'boolean', group: 'CAS' }); }); }); diff --git a/apps/meteor/server/settings/oauth.ts b/apps/meteor/server/settings/oauth.ts index acc397faa37d..c67286771a0a 100644 --- a/apps/meteor/server/settings/oauth.ts +++ b/apps/meteor/server/settings/oauth.ts @@ -115,14 +115,12 @@ export const createOauthSettings = () => public: true, i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true, - alert: 'OAuth_button_colors_alert', }); await this.add('Accounts_OAuth_Nextcloud_button_color', '#0082c9', { type: 'string', public: true, i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true, - alert: 'OAuth_button_colors_alert', }); }); @@ -275,13 +273,11 @@ export const createOauthSettings = () => type: 'string', i18nLabel: 'Accounts_OAuth_Custom_Button_Label_Color', persistent: true, - alert: 'OAuth_button_colors_alert', }); await this.add('Accounts_OAuth_Dolphin_button_color', '#1d74f5', { type: 'string', i18nLabel: 'Accounts_OAuth_Custom_Button_Color', persistent: true, - alert: 'OAuth_button_colors_alert', }); }); await this.section('Facebook', async function () { diff --git a/apps/meteor/tests/e2e/page-objects/auth.ts b/apps/meteor/tests/e2e/page-objects/auth.ts index 46ec7e1f38dc..8d5fe1edad20 100644 --- a/apps/meteor/tests/e2e/page-objects/auth.ts +++ b/apps/meteor/tests/e2e/page-objects/auth.ts @@ -20,7 +20,7 @@ export class Registration { } get btnLoginWithSaml(): Locator { - return this.page.locator('role=button[name="SAML test login button"]'); + return this.page.locator('role=button[name="SAML"]'); } get btnLoginWithGoogle(): Locator { diff --git a/apps/meteor/tests/e2e/saml.spec.ts b/apps/meteor/tests/e2e/saml.spec.ts index fe1295ca0b4b..3d5935107bb1 100644 --- a/apps/meteor/tests/e2e/saml.spec.ts +++ b/apps/meteor/tests/e2e/saml.spec.ts @@ -10,7 +10,6 @@ import * as constants from './config/constants'; import { createUserFixture } from './fixtures/collections/users'; import { Users } from './fixtures/userStates'; import { Registration } from './page-objects'; -import { convertHexToRGB } from './utils/convertHexToRGB'; import { createCustomRole, deleteCustomRole } from './utils/custom-role'; import { getUserInfo } from './utils/getUserInfo'; import { parseMeteorResponse } from './utils/parseMeteorResponse'; @@ -60,8 +59,6 @@ const resetTestData = async ({ api, cleanupOnly = false }: { api?: any; cleanupO { _id: 'SAML_Custom_Default_issuer', value: 'http://localhost:3000/_saml/metadata/test-sp' }, { _id: 'SAML_Custom_Default_entry_point', value: 'http://localhost:8080/simplesaml/saml2/idp/SSOService.php' }, { _id: 'SAML_Custom_Default_idp_slo_redirect_url', value: 'http://localhost:8080/simplesaml/saml2/idp/SingleLogoutService.php' }, - { _id: 'SAML_Custom_Default_button_label_text', value: 'SAML test login button' }, - { _id: 'SAML_Custom_Default_button_color', value: '#185925' }, ]; await Promise.all(settings.map(({ _id, value }) => setSettingValueById(api, _id, value))); @@ -155,10 +152,6 @@ test.describe('SAML', () => { await expect(poRegistration.btnLoginWithSaml).toBeVisible({ timeout: 10000 }); }); - await test.step('expect to have SAML login button to have the required background color', async () => { - await expect(poRegistration.btnLoginWithSaml).toHaveCSS('background-color', convertHexToRGB('#185925')); - }); - await test.step('expect to be redirected to the IdP for login', async () => { await poRegistration.btnLoginWithSaml.click(); diff --git a/apps/meteor/tests/e2e/utils/convertHexToRGB.ts b/apps/meteor/tests/e2e/utils/convertHexToRGB.ts deleted file mode 100644 index 9b20671cfcaa..000000000000 --- a/apps/meteor/tests/e2e/utils/convertHexToRGB.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const convertHexToRGB = (hex: string) => { - hex = hex.replace(/^#/, ''); - - const red = parseInt(hex.substring(0, 2), 16); - const green = parseInt(hex.substring(2, 4), 16); - const blue = parseInt(hex.substring(4, 6), 16); - - return `rgb(${red}, ${green}, ${blue})`; -}; diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json index 523888f0912a..82e48bc4fc3a 100644 --- a/packages/i18n/src/locales/en.i18n.json +++ b/packages/i18n/src/locales/en.i18n.json @@ -3964,7 +3964,6 @@ "OAuth": "OAuth", "OAuth_Description": "Configure authentication methods beyond just username and password.", "OAuth_Application": "OAuth Application", - "OAuth_button_colors_alert": "Changing the color may result in non-compliance with WCAG (Web Content Accessibility Guidelines) requirements. Please ensure that the new colors meet the recommended contrast and readability standards to maintain accessibility for all users.", "Objects": "Objects", "Off": "Off", "Off_the_record_conversation": "Off-the-Record Conversation", diff --git a/packages/web-ui-registration/src/LoginServicesButton.tsx b/packages/web-ui-registration/src/LoginServicesButton.tsx index ba16d360d9c1..d9f43b0e484c 100644 --- a/packages/web-ui-registration/src/LoginServicesButton.tsx +++ b/packages/web-ui-registration/src/LoginServicesButton.tsx @@ -15,8 +15,6 @@ const LoginServicesButton = ({ className, disabled, setError, - buttonColor, - buttonLabelColor, ...props }: T & { className?: string; @@ -45,8 +43,6 @@ const LoginServicesButton = ({ alignItems='center' display='flex' justifyContent='center' - color={buttonLabelColor} - backgroundColor={buttonColor} > {buttonLabelText || t('Sign_in_with__provider__', { provider: title })} From d12092ad5c9dffb77238fc8866180a0a5adf3a07 Mon Sep 17 00:00:00 2001 From: rocketchat-github-ci Date: Fri, 2 Aug 2024 00:51:19 +0000 Subject: [PATCH 11/23] Release 6.11.0-rc.2 [no ci] --- .changeset/bump-patch-1722559871139.md | 5 +++ .changeset/pre.json | 2 +- apps/meteor/CHANGELOG.md | 36 ++++++++++++++++++- apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/ee/server/services/CHANGELOG.md | 14 ++++++++ apps/meteor/ee/server/services/package.json | 2 +- apps/meteor/package.json | 2 +- ee/apps/account-service/CHANGELOG.md | 14 ++++++++ ee/apps/account-service/package.json | 2 +- ee/apps/authorization-service/CHANGELOG.md | 16 ++++++++- ee/apps/authorization-service/package.json | 2 +- ee/apps/ddp-streamer/CHANGELOG.md | 16 +++++++++ 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 | 14 ++++++++ ee/apps/presence-service/package.json | 2 +- ee/apps/queue-worker/CHANGELOG.md | 14 ++++++++ ee/apps/queue-worker/package.json | 2 +- ee/apps/stream-hub-service/CHANGELOG.md | 13 +++++++ ee/apps/stream-hub-service/package.json | 2 +- ee/packages/api-client/CHANGELOG.md | 11 ++++++ ee/packages/api-client/package.json | 2 +- ee/packages/ddp-client/CHANGELOG.md | 11 ++++++ ee/packages/ddp-client/package.json | 2 +- ee/packages/license/CHANGELOG.md | 10 ++++++ ee/packages/license/package.json | 2 +- ee/packages/omnichannel-services/CHANGELOG.md | 15 ++++++++ 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 | 12 +++++++ ee/packages/presence/package.json | 2 +- package.json | 2 +- packages/apps/CHANGELOG.md | 11 ++++++ packages/apps/package.json | 2 +- packages/core-services/CHANGELOG.md | 12 +++++++ packages/core-services/package.json | 2 +- packages/core-typings/CHANGELOG.md | 3 ++ packages/core-typings/package.json | 2 +- packages/cron/CHANGELOG.md | 11 ++++++ packages/cron/package.json | 2 +- packages/fuselage-ui-kit/CHANGELOG.md | 14 ++++++++ packages/fuselage-ui-kit/package.json | 8 ++--- packages/gazzodown/CHANGELOG.md | 12 +++++++ packages/gazzodown/package.json | 6 ++-- packages/instance-status/CHANGELOG.md | 11 ++++++ packages/instance-status/package.json | 2 +- packages/livechat/CHANGELOG.md | 12 ++++++- packages/livechat/package.json | 2 +- packages/model-typings/CHANGELOG.md | 10 ++++++ packages/model-typings/package.json | 2 +- packages/models/CHANGELOG.md | 11 ++++++ packages/models/package.json | 2 +- packages/rest-typings/CHANGELOG.md | 10 ++++++ packages/rest-typings/package.json | 2 +- packages/ui-avatar/CHANGELOG.md | 11 ++++++ packages/ui-avatar/package.json | 4 +-- packages/ui-client/CHANGELOG.md | 11 ++++++ packages/ui-client/package.json | 4 +-- packages/ui-contexts/CHANGELOG.md | 12 +++++++ packages/ui-contexts/package.json | 2 +- packages/ui-video-conf/CHANGELOG.md | 12 +++++++ packages/ui-video-conf/package.json | 6 ++-- packages/uikit-playground/CHANGELOG.md | 12 +++++++ packages/uikit-playground/package.json | 2 +- packages/web-ui-registration/CHANGELOG.md | 12 +++++++ packages/web-ui-registration/package.json | 4 +-- 68 files changed, 454 insertions(+), 48 deletions(-) create mode 100644 .changeset/bump-patch-1722559871139.md diff --git a/.changeset/bump-patch-1722559871139.md b/.changeset/bump-patch-1722559871139.md new file mode 100644 index 000000000000..e1eaa7980afb --- /dev/null +++ b/.changeset/bump-patch-1722559871139.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 286cc1290d04..38a7fe160e48 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -64,6 +64,7 @@ "changesets": [ "afraid-guests-jog", "bump-patch-1722087664914", + "bump-patch-1722559871139", "chatty-hounds-hammer", "chilled-yaks-beg", "chilly-papayas-march", @@ -71,7 +72,6 @@ "dry-pumas-draw", "empty-readers-teach", "fast-buttons-shake", - "fifty-mails-admire", "funny-snails-promise", "funny-wolves-tie", "grumpy-worms-appear", diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md index b0a8efae0fc3..c80c36bf4890 100644 --- a/apps/meteor/CHANGELOG.md +++ b/apps/meteor/CHANGELOG.md @@ -1,10 +1,42 @@ # @rocket.chat/meteor -## 6.11.0-rc.1 +## 6.11.0-rc.2 + ### Patch Changes - Bump @rocket.chat/meteor version. +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/api-client@0.2.3-rc.2 + - @rocket.chat/license@0.2.3-rc.2 + - @rocket.chat/omnichannel-services@0.3.0-rc.2 + - @rocket.chat/pdf-worker@0.2.0-rc.2 + - @rocket.chat/presence@0.2.3-rc.2 + - @rocket.chat/apps@0.1.3-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/cron@0.1.3-rc.2 + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.2 + - @rocket.chat/gazzodown@9.0.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/ui-contexts@9.0.0-rc.2 + - @rocket.chat/server-cloud-communication@0.0.2 + - @rocket.chat/models@0.2.0-rc.2 + - @rocket.chat/ui-theming@0.2.0 + - @rocket.chat/ui-avatar@5.0.0-rc.2 + - @rocket.chat/ui-client@9.0.0-rc.2 + - @rocket.chat/ui-video-conf@9.0.0-rc.2 + - @rocket.chat/web-ui-registration@9.0.0-rc.2 + - @rocket.chat/instance-status@0.1.3-rc.2 +
+ +## 6.11.0-rc.1 + +### Patch Changes + +- Bump @rocket.chat/meteor version. -
Updated dependencies []: @@ -163,7 +195,9 @@ - @rocket.chat/ui-avatar@5.0.0-rc.0 - @rocket.chat/instance-status@0.1.2-rc.0 - @rocket.chat/server-cloud-communication@0.0.2 + ## 6.10.2 + ### Patch Changes - Bump @rocket.chat/meteor version. diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index f9fed712adda..b2dc220a6d51 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.11.0-rc.1" + "version": "6.11.0-rc.2" } diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md index 50eae500d826..4f5beb9327cb 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 1.3.0-rc.1 ### Patch Changes @@ -32,6 +45,7 @@ - @rocket.chat/models@0.2.0-rc.0 - @rocket.chat/ui-kit@0.36.0-rc.0 - @rocket.chat/rest-typings@6.11.0-rc.0 + ## 1.2.2 ### Patch Changes diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json index a96748922921..b9b1523c0c04 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.1", + "version": "1.3.0-rc.2", "description": "Rocket.Chat Authorization service", "main": "index.js", "scripts": { diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 43f70b2d4a60..1e3ec0c70f0f 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.1", + "version": "6.11.0-rc.2", "private": true, "author": { "name": "Rocket.Chat", diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md index 38197c483832..13f5a86d0f67 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.4.3-rc.1 ### Patch Changes @@ -27,6 +40,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/models@0.2.0-rc.0 - @rocket.chat/rest-typings@6.11.0-rc.0 + ## 0.4.2 ### Patch Changes diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json index 8e736bc43569..a4a29c5f7aaa 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.1", + "version": "0.4.3-rc.2", "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 a14f9519a21d..3e65906e0c1b 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.4.3-rc.1 ### Patch Changes @@ -24,7 +37,8 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/models@0.2.0-rc.0 - @rocket.chat/rest-typings@6.11.0-rc.0 -
+ + ## 0.4.2 ### Patch Changes diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json index e1b9c92a8134..043d203cca88 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.1", + "version": "0.4.3-rc.2", "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 f5970889f109..cc5d65a49914 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/ui-contexts@9.0.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 + - @rocket.chat/instance-status@0.1.3-rc.2 +
+ ## 0.3.3-rc.1 ### Patch Changes @@ -31,6 +46,7 @@ - @rocket.chat/rest-typings@6.11.0-rc.0 - @rocket.chat/instance-status@0.1.2-rc.0 + ## 0.3.2 ### Patch Changes diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json index 9a8005da39cd..42a72b165b46 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.1", + "version": "0.3.3-rc.2", "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 539e051d23ef..e9d49967c49f 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/omnichannel-services@0.3.0-rc.2 + - @rocket.chat/pdf-worker@0.2.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.4.3-rc.1 ### Patch Changes @@ -28,6 +42,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/models@0.2.0-rc.0 + ## 0.4.2 ### Patch Changes diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json index 5e49d34aa73e..5976e940ea84 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.1", + "version": "0.4.3-rc.2", "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 22d4366fe6a0..40771ea7ca96 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/presence@0.2.3-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.4.3-rc.1 ### Patch Changes @@ -25,6 +38,7 @@ - @rocket.chat/models@0.2.0-rc.0 - @rocket.chat/presence@0.2.2-rc.0 + ## 0.4.2 ### Patch Changes diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json index 2038f00c4b72..1153188bffe1 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.1", + "version": "0.4.3-rc.2", "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 e8d84e0d3f06..bac927b65d20 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/omnichannel-services@0.3.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.4.3-rc.1 ### Patch Changes @@ -25,6 +38,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/models@0.2.0-rc.0 + ## 0.4.2 ### Patch Changes diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json index 6d273ce61051..c117382266a6 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.1", + "version": "0.4.3-rc.2", "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 63c213c91703..955104ad6cb3 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.4.3-rc.1 ### Patch Changes @@ -23,6 +35,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/models@0.2.0-rc.0 + ## 0.4.2 ### Patch Changes diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json index 688dafbe27ae..d3fb0d4b4950 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.1", + "version": "0.4.3-rc.2", "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 c6314ffbe29d..8c9a3c2b1cc6 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 +
+ ## 0.2.3-rc.1 ### Patch Changes @@ -19,6 +29,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/rest-typings@6.11.0-rc.0 + ## 0.2.2 ### Patch Changes diff --git a/ee/packages/api-client/package.json b/ee/packages/api-client/package.json index 5c661cc9e676..1bbd8d6b0b87 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.1", + "version": "0.2.3-rc.2", "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 d497f0c1f35d..ed49a458277e 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/api-client@0.2.3-rc.2 +
+ ## 0.3.3-rc.1 ### Patch Changes @@ -19,6 +29,7 @@ - @rocket.chat/rest-typings@6.11.0-rc.0 - @rocket.chat/api-client@0.2.2-rc.0 + ## 0.3.2 ### Patch Changes diff --git a/ee/packages/ddp-client/package.json b/ee/packages/ddp-client/package.json index a95c181aafac..2b57bb6bef78 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.1", + "version": "0.3.3-rc.2", "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 06cfe3614121..e29f97b6929c 100644 --- a/ee/packages/license/CHANGELOG.md +++ b/ee/packages/license/CHANGELOG.md @@ -1,5 +1,14 @@ # @rocket.chat/license +## 0.2.3-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 +
+ ## 0.2.3-rc.1 ### Patch Changes @@ -17,6 +26,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 + ## 0.2.2 ### Patch Changes diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json index 77e0651a2ebb..87da017b63fb 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.1", + "version": "0.2.3-rc.2", "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 be921c1cb046..457e8d0236c5 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/pdf-worker@0.2.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.3.0-rc.1 ### Patch Changes @@ -36,6 +50,7 @@ - @rocket.chat/models@0.2.0-rc.0 - @rocket.chat/rest-typings@6.11.0-rc.0 + ## 0.2.2 ### Patch Changes diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json index bde01b12b4d4..8729b1ac28d4 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.1", + "version": "0.3.0-rc.2", "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 03579278da2a..d5e341a2360d 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 +
+ ## 0.2.0-rc.1 ### Patch Changes diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json index da77dec47a82..938f6bc34432 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.1", + "version": "0.2.0-rc.2", "private": true, "devDependencies": { "@storybook/addon-essentials": "~6.5.16", diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md index 334ebf303f0a..d8c531e3d72d 100644 --- a/ee/packages/presence/CHANGELOG.md +++ b/ee/packages/presence/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/presence +## 0.2.3-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/core-services@0.5.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.2.3-rc.1 ### Patch Changes @@ -23,6 +34,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/models@0.2.0-rc.0 + ## 0.2.2 ### Patch Changes diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json index b1b9bfdfb116..09fd9db48b5f 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.1", + "version": "0.2.3-rc.2", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/package.json b/package.json index 783be7f49ad8..339a74271975 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.11.0-rc.1", + "version": "6.11.0-rc.2", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true, diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md index 949211344a16..0c686c073432 100644 --- a/packages/apps/CHANGELOG.md +++ b/packages/apps/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/apps +## 0.1.3-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/model-typings@0.6.0-rc.2 +
+ ## 0.1.3-rc.1 ### Patch Changes @@ -21,6 +31,7 @@ - @rocket.chat/model-typings@0.6.0-rc.0 - @rocket.chat/core-typings@6.11.0-rc.0 + ## 0.1.2 ### Patch Changes diff --git a/packages/apps/package.json b/packages/apps/package.json index 79035bedbf2c..ac0fa9589a26 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/apps", - "version": "0.1.3-rc.1", + "version": "0.1.3-rc.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md index e4d2e33dea61..286b003068d3 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.5.0-rc.1 ### Patch Changes @@ -35,6 +46,7 @@ - @rocket.chat/ui-kit@0.36.0-rc.0 - @rocket.chat/rest-typings@6.11.0-rc.0 + ## 0.4.2 ### Patch Changes diff --git a/packages/core-services/package.json b/packages/core-services/package.json index d996d662fba9..eb9f2fdf4c69 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.1", + "version": "0.5.0-rc.2", "private": true, "devDependencies": { "@babel/core": "~7.22.20", diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md index d9c775caf9a7..2d62b835be92 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.2 + ## 6.11.0-rc.1 ## 6.11.0-rc.0 @@ -19,6 +21,7 @@ - @rocket.chat/ui-kit@0.36.0-rc.0 + ## 6.10.2 ### Patch Changes diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json index 9838f54b4ebd..8d045fb2e4c8 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.1", + "version": "6.11.0-rc.2", "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", "eslint": "~8.45.0", diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md index e832ae454709..1fd83782f500 100644 --- a/packages/cron/CHANGELOG.md +++ b/packages/cron/CHANGELOG.md @@ -1,5 +1,15 @@ # @rocket.chat/cron +## 0.1.3-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.1.3-rc.1 ### Patch Changes @@ -19,6 +29,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/models@0.2.0-rc.0 + ## 0.1.2 ### Patch Changes diff --git a/packages/cron/package.json b/packages/cron/package.json index 49694a52163d..028de546744c 100644 --- a/packages/cron/package.json +++ b/packages/cron/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/cron", - "version": "0.1.3-rc.1", + "version": "0.1.3-rc.2", "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 22c129bc4f60..0009b0237063 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/gazzodown@9.0.0-rc.2 + - @rocket.chat/ui-contexts@9.0.0-rc.2 + - @rocket.chat/ui-avatar@5.0.0-rc.2 + - @rocket.chat/ui-video-conf@9.0.0-rc.2 +
+ ## 9.0.0-rc.1 ### Patch Changes @@ -30,6 +43,7 @@ - @rocket.chat/gazzodown@9.0.0-rc.0 - @rocket.chat/ui-avatar@5.0.0-rc.0 + ## 8.0.2 ### Patch Changes diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 2b0ccab5cfc0..001a5d08c065 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.1", + "version": "9.0.0-rc.2", "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.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": "*" diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md index 34410679910b..7e60bdcb4e5f 100644 --- a/packages/gazzodown/CHANGELOG.md +++ b/packages/gazzodown/CHANGELOG.md @@ -1,5 +1,16 @@ # @rocket.chat/gazzodown +## 9.0.0-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/ui-contexts@9.0.0-rc.2 + - @rocket.chat/ui-client@9.0.0-rc.2 +
+ ## 9.0.0-rc.1 ### Patch Changes @@ -21,6 +32,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/ui-contexts@9.0.0-rc.0 + ## 8.0.2 ### Patch Changes diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 1d41940214f6..a90d765208ad 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/gazzodown", - "version": "9.0.0-rc.1", + "version": "9.0.0-rc.2", "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.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": "*" }, diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md index b9eab5c53b73..77382a05d6a6 100644 --- a/packages/instance-status/CHANGELOG.md +++ b/packages/instance-status/CHANGELOG.md @@ -1,9 +1,20 @@ # @rocket.chat/instance-status +## 0.1.3-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/models@0.2.0-rc.2 +
+ ## 0.1.3-rc.1 + ### Patch Changes -
Updated dependencies []: + ## 0.1.2 ### Patch Changes diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json index bd54f8b38479..09d81c81b1e6 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.1", + "version": "0.1.3-rc.2", "private": true, "devDependencies": { "@rocket.chat/eslint-config": "workspace:^", diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md index c134a99b3bb6..c5e1fa9c91dc 100644 --- a/packages/livechat/CHANGELOG.md +++ b/packages/livechat/CHANGELOG.md @@ -1,10 +1,19 @@ # @rocket.chat/livechat Change Log -## 1.19.0-rc.1 +## 1.19.0-rc.2 + ### Patch Changes -
Updated dependencies []: + - @rocket.chat/gazzodown@9.0.0-rc.2 +
+ +## 1.19.0-rc.1 + +### Patch Changes + +-
Updated dependencies []: - @rocket.chat/gazzodown@9.0.0-rc.1
@@ -27,6 +36,7 @@ - @rocket.chat/ui-kit@0.36.0-rc.0 - @rocket.chat/gazzodown@9.0.0-rc.0 + ## 1.18.2 ### Patch Changes diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 3871bd8fd74f..af91b807ca2c 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/livechat", - "version": "1.19.0-rc.1", + "version": "1.19.0-rc.2", "files": [ "/build" ], diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md index 4e0b19cde602..9608c678e649 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 +
+ ## 0.6.0-rc.1 ### Patch Changes @@ -31,6 +40,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0
+ ## 0.5.2 ### Patch Changes diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json index 50dae0d5b545..ca0195079e91 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.1", + "version": "0.6.0-rc.2", "private": true, "devDependencies": { "@types/jest": "~29.5.7", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 02a0229f7a9b..375dd26f6aeb 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -1,6 +1,16 @@ # @rocket.chat/models +## 0.2.0-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/model-typings@0.6.0-rc.2 +
+ ## 0.2.0-rc.1 + ### Patch Changes -
Updated dependencies []: @@ -20,6 +30,7 @@ - @rocket.chat/model-typings@0.6.0-rc.0
+ ### Patch Changes -
Updated dependencies []: diff --git a/packages/models/package.json b/packages/models/package.json index 7dd1f0cf2ce6..8a7c50d8f2d0 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@rocket.chat/models", - "version": "0.2.0-rc.1", + "version": "0.2.0-rc.2", "private": true, "devDependencies": { "@swc/core": "^1.3.95", diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md index 433846ddbc5c..3be5f4643578 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 +
+ ## 6.11.0-rc.1 ### Patch Changes @@ -24,6 +33,7 @@ - @rocket.chat/core-typings@6.11.0-rc.0 - @rocket.chat/ui-kit@0.36.0-rc.0
+ ## 6.10.2 ### Patch Changes diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json index bb54ff10758f..3eaf55915a85 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.1", + "version": "6.11.0-rc.2", "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 6c9802eb212d..f0b0b7b7fe99 100644 --- a/packages/ui-avatar/CHANGELOG.md +++ b/packages/ui-avatar/CHANGELOG.md @@ -1,7 +1,16 @@ # @rocket.chat/ui-avatar +## 5.0.0-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.2 +
## 5.0.0-rc.1 + ### Patch Changes -
Updated dependencies []: @@ -17,7 +26,9 @@ - @rocket.chat/ui-contexts@9.0.0-rc.0
+ ## 4.0.2 + ### Patch Changes -
Updated dependencies []: diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index f44c42d9877d..77d7af5288d1 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.1", + "version": "5.0.0-rc.2", "private": true, "devDependencies": { "@babel/core": "~7.22.20", @@ -31,7 +31,7 @@ ], "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" }, "volta": { diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md index d243652b19a3..a08ff45507d9 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.2 +
+ ## 9.0.0-rc.1 ### Patch Changes @@ -23,7 +32,9 @@ - @rocket.chat/ui-contexts@9.0.0-rc.0
+ ## 8.0.2 + ### Patch Changes -
Updated dependencies []: diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index beb0197a7c93..feb8eabcda14 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.1", + "version": "9.0.0-rc.2", "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.1", + "@rocket.chat/ui-contexts": "9.0.0-rc.2", "react": "~17.0.2" }, "volta": { diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md index adb5bcdc8045..f2bbb77a501c 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/core-typings@6.11.0-rc.2 + - @rocket.chat/rest-typings@6.11.0-rc.2 + - @rocket.chat/ddp-client@0.3.3-rc.2 +
+ ## 9.0.0-rc.1 ### Patch Changes @@ -29,6 +40,7 @@ - @rocket.chat/rest-typings@6.11.0-rc.0 - @rocket.chat/ddp-client@0.3.2-rc.0
+ ## 8.0.2 ### Patch Changes diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json index 4f9ff4e8c1e5..f9833521673c 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.1", + "version": "9.0.0-rc.2", "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 12919c086fc2..4acd711bd304 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.2 + - @rocket.chat/ui-avatar@5.0.0-rc.2 +
+ ## 9.0.0-rc.1 ### Patch Changes @@ -24,7 +34,9 @@ - @rocket.chat/ui-contexts@9.0.0-rc.0 - @rocket.chat/ui-avatar@5.0.0-rc.0 + ## 8.0.2 + ### Patch Changes -
Updated dependencies []: diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index d5746161bf91..6991762ada03 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.1", + "version": "9.0.0-rc.2", "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.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" }, diff --git a/packages/uikit-playground/CHANGELOG.md b/packages/uikit-playground/CHANGELOG.md index 43327a9ffc21..d1aa257adf5c 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.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/fuselage-ui-kit@9.0.0-rc.2 + - @rocket.chat/ui-contexts@9.0.0-rc.2 + - @rocket.chat/ui-avatar@5.0.0-rc.2 +
+ ## 0.3.3-rc.1 ### Patch Changes @@ -21,6 +32,7 @@ - @rocket.chat/ui-contexts@9.0.0-rc.0 - @rocket.chat/ui-avatar@5.0.0-rc.0
+ ## 0.3.2 ### Patch Changes diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index a6d1f6209287..101e45a56559 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.1", + "version": "0.3.3-rc.2", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md index 88bb16eae0cb..e6d4fa500e47 100644 --- a/packages/web-ui-registration/CHANGELOG.md +++ b/packages/web-ui-registration/CHANGELOG.md @@ -1,6 +1,16 @@ # @rocket.chat/web-ui-registration +## 9.0.0-rc.2 + +### Patch Changes + +-
Updated dependencies []: + + - @rocket.chat/ui-contexts@9.0.0-rc.2 +
+ ## 9.0.0-rc.1 + ### Patch Changes -
Updated dependencies []: @@ -23,7 +33,9 @@ - @rocket.chat/tools@0.2.2-rc.0 - @rocket.chat/ui-contexts@9.0.0-rc.0
+ ## 8.0.2 + ### Patch Changes -
Updated dependencies []: diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json index 524ed8eb4c2d..3144b1a58176 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.1", + "version": "9.0.0-rc.2", "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.1", + "@rocket.chat/ui-contexts": "9.0.0-rc.2", "@tanstack/react-query": "*", "react": "*", "react-hook-form": "*", From 8ea6517c4e2c1ea4d2df8389401776ff98341333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?= <60678893+juliajforesti@users.noreply.github.com> Date: Fri, 2 Aug 2024 18:07:29 -0300 Subject: [PATCH 12/23] fix: `Menu` onPointerUp event behavior (#32968) --- .changeset/brown-crabs-chew.md | 13 +++++++++++++ apps/meteor/package.json | 2 +- ee/packages/ui-theming/package.json | 2 +- packages/fuselage-ui-kit/package.json | 2 +- packages/gazzodown/package.json | 2 +- packages/ui-avatar/package.json | 2 +- packages/ui-client/package.json | 2 +- packages/ui-composer/package.json | 2 +- packages/ui-video-conf/package.json | 2 +- packages/uikit-playground/package.json | 2 +- yarn.lock | 26 +++++++++++++------------- 11 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 .changeset/brown-crabs-chew.md diff --git a/.changeset/brown-crabs-chew.md b/.changeset/brown-crabs-chew.md new file mode 100644 index 000000000000..3291f18bf225 --- /dev/null +++ b/.changeset/brown-crabs-chew.md @@ -0,0 +1,13 @@ +--- +'@rocket.chat/uikit-playground': patch +'@rocket.chat/fuselage-ui-kit': patch +'@rocket.chat/ui-theming': patch +'@rocket.chat/ui-video-conf': patch +'@rocket.chat/ui-composer': patch +'@rocket.chat/gazzodown': patch +'@rocket.chat/ui-avatar': patch +'@rocket.chat/ui-client': patch +'@rocket.chat/meteor': patch +--- + +Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 5efb11ece098..a712ac548e36 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -243,7 +243,7 @@ "@rocket.chat/favicon": "workspace:^", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/fuselage-polyfills": "~0.31.25", "@rocket.chat/fuselage-toastbar": "^0.32.0", diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index 80e7e035924e..a1e7925968fb 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -4,7 +4,7 @@ "private": true, "devDependencies": { "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/icons": "^0.36.0", "@rocket.chat/ui-contexts": "workspace:~", diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index 71838606aba4..c9d47c87e4cf 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -66,7 +66,7 @@ "@rocket.chat/apps-engine": "alpha", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/fuselage-polyfills": "~0.31.25", "@rocket.chat/icons": "^0.36.0", diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index 7322ff2f97fd..8d5aaf3db812 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.20", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-tokens": "^0.33.1", "@rocket.chat/message-parser": "workspace:^", "@rocket.chat/styled": "~0.31.25", diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json index 77d7af5288d1..71a7d0e8bbf4 100644 --- a/packages/ui-avatar/package.json +++ b/packages/ui-avatar/package.json @@ -4,7 +4,7 @@ "private": true, "devDependencies": { "@babel/core": "~7.22.20", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/ui-contexts": "workspace:^", "@types/babel__core": "~7.20.3", "@types/react": "~17.0.69", diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 3de6088cae5e..0e0b3778993c 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.20", "@react-aria/toolbar": "^3.0.0-beta.1", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/icons": "^0.36.0", "@rocket.chat/mock-providers": "workspace:^", diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json index d738da4186c5..485f4d7ac725 100644 --- a/packages/ui-composer/package.json +++ b/packages/ui-composer/package.json @@ -20,7 +20,7 @@ "@babel/core": "~7.22.20", "@react-aria/toolbar": "^3.0.0-beta.1", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/icons": "^0.36.0", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 2a25410e2890..9b34b1de29ac 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.20", "@rocket.chat/css-in-js": "~0.31.25", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/icons": "^0.36.0", "@rocket.chat/styled": "~0.31.25", diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 101e45a56559..3c3c6405a75d 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -15,7 +15,7 @@ "@codemirror/tooltip": "^0.19.16", "@lezer/highlight": "^1.1.6", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "^0.56.0", + "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/fuselage-polyfills": "~0.31.25", "@rocket.chat/fuselage-toastbar": "^0.32.0", diff --git a/yarn.lock b/yarn.lock index ace9280ae3c2..49001cc21300 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8908,7 +8908,7 @@ __metadata: "@rocket.chat/apps-engine": alpha "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/fuselage-polyfills": ~0.31.25 "@rocket.chat/gazzodown": "workspace:^" @@ -8970,9 +8970,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/fuselage@npm:^0.56.0": - version: 0.56.0 - resolution: "@rocket.chat/fuselage@npm:0.56.0" +"@rocket.chat/fuselage@npm:^0.57.0": + version: 0.57.0 + resolution: "@rocket.chat/fuselage@npm:0.57.0" dependencies: "@rocket.chat/css-in-js": ^0.31.25 "@rocket.chat/css-supports": ^0.31.25 @@ -8990,7 +8990,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: 1817eb660c9581906a645b8d39cd0377395085ab7dc204d7afd3b2b1c1a36000ea3727a8263ff02dc3d51b8280e1b51e42d062587d685f7e0be1a7a6eb97c5bf + checksum: 80f49f79ca6655067f528a9b427a7bfabbcf1583d0c9f3ed40b79217c7a495e93e0335e15e29b23237bf2ccb5ee5fa063051b40bf4d539439f452ffd45fdb537 languageName: node linkType: hard @@ -9001,7 +9001,7 @@ __metadata: "@babel/core": ~7.22.20 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-tokens": ^0.33.1 "@rocket.chat/message-parser": "workspace:^" "@rocket.chat/styled": ~0.31.25 @@ -9382,7 +9382,7 @@ __metadata: "@rocket.chat/favicon": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3 - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/fuselage-polyfills": ~0.31.25 "@rocket.chat/fuselage-toastbar": ^0.32.0 @@ -10280,7 +10280,7 @@ __metadata: resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar" dependencies: "@babel/core": ~7.22.20 - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/ui-contexts": "workspace:^" "@types/babel__core": ~7.20.3 "@types/react": ~17.0.69 @@ -10306,7 +10306,7 @@ __metadata: "@babel/core": ~7.22.20 "@react-aria/toolbar": ^3.0.0-beta.1 "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/icons": ^0.36.0 "@rocket.chat/mock-providers": "workspace:^" @@ -10359,7 +10359,7 @@ __metadata: "@babel/core": ~7.22.20 "@react-aria/toolbar": ^3.0.0-beta.1 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/icons": ^0.36.0 "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 @@ -10456,7 +10456,7 @@ __metadata: resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming" dependencies: "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/icons": ^0.36.0 "@rocket.chat/ui-contexts": "workspace:~" @@ -10499,7 +10499,7 @@ __metadata: "@rocket.chat/css-in-js": ~0.31.25 "@rocket.chat/emitter": ~0.31.25 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/icons": ^0.36.0 "@rocket.chat/styled": ~0.31.25 @@ -10544,7 +10544,7 @@ __metadata: "@codemirror/tooltip": ^0.19.16 "@lezer/highlight": ^1.1.6 "@rocket.chat/css-in-js": ~0.31.25 - "@rocket.chat/fuselage": ^0.56.0 + "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/fuselage-polyfills": ~0.31.25 "@rocket.chat/fuselage-toastbar": ^0.32.0 From 24e99a24e198f8107911712d8579014cde3539c0 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 2 Aug 2024 19:22:03 -0300 Subject: [PATCH 13/23] chore: create `afterOmnichannelSaveMessage` (#32970) --- .../hooks/afterSaveOmnichannelMessage.ts | 16 ++++ .../app/livechat/server/hooks/leadCapture.ts | 10 +-- .../server/hooks/markRoomNotResponded.ts | 12 +-- .../server/hooks/markRoomResponded.ts | 10 +-- .../server/hooks/saveAnalyticsData.ts | 13 +--- .../server/hooks/saveLastMessageToInquiry.ts | 8 +- .../server/hooks/saveLastVisitorMessageTs.ts | 11 +-- .../app/livechat/server/hooks/sendToCRM.ts | 9 +-- apps/meteor/app/livechat/server/index.ts | 1 + .../app/livechat/server/sendMessageBySMS.ts | 8 +- .../server/hooks/resumeOnHold.ts | 63 ++++++++-------- .../server/hooks/scheduleAutoTransfer.ts | 74 +++++++++---------- .../setPredictedVisitorAbandonmentTime.ts | 10 +-- apps/meteor/lib/callbacks.ts | 1 + 14 files changed, 118 insertions(+), 128 deletions(-) create mode 100644 apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts diff --git a/apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts b/apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts new file mode 100644 index 000000000000..8badfb07177e --- /dev/null +++ b/apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts @@ -0,0 +1,16 @@ +import { isOmnichannelRoom } from '@rocket.chat/core-typings'; + +import { callbacks } from '../../../../lib/callbacks'; + +callbacks.add( + 'afterSaveMessage', + async (message, room) => { + // only call webhook if it is a livechat room + if (!isOmnichannelRoom(room)) { + return message; + } + return callbacks.run('afterOmnichannelSaveMessage', message, { room }); + }, + callbacks.priority.MEDIUM, + 'after-omnichannel-save-message', +); diff --git a/apps/meteor/app/livechat/server/hooks/leadCapture.ts b/apps/meteor/app/livechat/server/hooks/leadCapture.ts index 4b987c00c02e..6a3826b8ba11 100644 --- a/apps/meteor/app/livechat/server/hooks/leadCapture.ts +++ b/apps/meteor/app/livechat/server/hooks/leadCapture.ts @@ -1,5 +1,5 @@ import type { IMessage, IOmnichannelRoom } from '@rocket.chat/core-typings'; -import { isEditedMessage, isOmnichannelRoom } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatVisitors } from '@rocket.chat/models'; import { callbacks } from '../../../../lib/callbacks'; @@ -31,12 +31,8 @@ function validateMessage(message: IMessage, room: IOmnichannelRoom) { } callbacks.add( - 'afterSaveMessage', - async (message, room) => { - if (!isOmnichannelRoom(room)) { - return message; - } - + 'afterOmnichannelSaveMessage', + async (message, { room }) => { if (!validateMessage(message, room)) { return message; } diff --git a/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts b/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts index f0bfb8574e6a..23131cee60a2 100644 --- a/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts +++ b/apps/meteor/app/livechat/server/hooks/markRoomNotResponded.ts @@ -1,15 +1,11 @@ -import { isOmnichannelRoom, isEditedMessage } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatRooms } from '@rocket.chat/models'; import { callbacks } from '../../../../lib/callbacks'; callbacks.add( - 'afterSaveMessage', - async (message, room) => { - if (!isOmnichannelRoom(room)) { - return message; - } - + 'afterOmnichannelSaveMessage', + async (message, { room }) => { // skips this callback if the message was edited if (!message || isEditedMessage(message)) { return message; @@ -21,7 +17,7 @@ callbacks.add( } // check if room is yet awaiting for response - if (typeof room.t !== 'undefined' && room.t === 'l' && room.waitingResponse) { + if (room.waitingResponse) { return message; } diff --git a/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts b/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts index 48ec985aa42c..3e9164554d47 100644 --- a/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts +++ b/apps/meteor/app/livechat/server/hooks/markRoomResponded.ts @@ -1,5 +1,5 @@ import type { IOmnichannelRoom } from '@rocket.chat/core-typings'; -import { isOmnichannelRoom, isEditedMessage } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatRooms, LivechatVisitors, LivechatInquiry } from '@rocket.chat/models'; import moment from 'moment'; @@ -7,12 +7,8 @@ import { callbacks } from '../../../../lib/callbacks'; import { notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener'; callbacks.add( - 'afterSaveMessage', - async (message, room) => { - if (!isOmnichannelRoom(room)) { - return message; - } - + 'afterOmnichannelSaveMessage', + async (message, { room }) => { // skips this callback if the message was edited if (!message || isEditedMessage(message)) { return message; diff --git a/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts b/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts index e92e6b4d940b..7c7bff067f9a 100644 --- a/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts +++ b/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts @@ -1,24 +1,19 @@ -import { isEditedMessage, isOmnichannelRoom } from '@rocket.chat/core-typings'; +import { isEditedMessage, isMessageFromVisitor } from '@rocket.chat/core-typings'; import { LivechatRooms } from '@rocket.chat/models'; import { callbacks } from '../../../../lib/callbacks'; import { normalizeMessageFileUpload } from '../../../utils/server/functions/normalizeMessageFileUpload'; callbacks.add( - 'afterSaveMessage', - async (message, room) => { - // check if room is livechat - if (!isOmnichannelRoom(room)) { - return message; - } - + 'afterOmnichannelSaveMessage', + async (message, { room }) => { // skips this callback if the message was edited if (!message || isEditedMessage(message)) { return message; } // if the message has a token, it was sent by the visitor - if (message.token) { + if (isMessageFromVisitor(message)) { // When visitor sends a mesage, most metrics wont be calculated/served. // But, v.lq (last query) will be updated to the message time. This has to be done // As not doing it will cause the metrics to be crazy and not have real values. diff --git a/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts b/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts index e65f1d99b884..1925e135a562 100644 --- a/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts +++ b/apps/meteor/app/livechat/server/hooks/saveLastMessageToInquiry.ts @@ -1,4 +1,4 @@ -import { isOmnichannelRoom, isEditedMessage } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatInquiry } from '@rocket.chat/models'; import { callbacks } from '../../../../lib/callbacks'; @@ -7,9 +7,9 @@ import { settings } from '../../../settings/server'; import { RoutingManager } from '../lib/RoutingManager'; callbacks.add( - 'afterSaveMessage', - async (message, room) => { - if (!isOmnichannelRoom(room) || isEditedMessage(message) || message.t) { + 'afterOmnichannelSaveMessage', + async (message, { room }) => { + if (isEditedMessage(message) || message.t) { return message; } diff --git a/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts b/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts index 4bc28c3990ba..bdaedfed19f2 100644 --- a/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts +++ b/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts @@ -1,18 +1,15 @@ -import { isOmnichannelRoom } from '@rocket.chat/core-typings'; +import { isMessageFromVisitor } from '@rocket.chat/core-typings'; import { LivechatRooms } from '@rocket.chat/models'; import { callbacks } from '../../../../lib/callbacks'; callbacks.add( - 'afterSaveMessage', - async (message, room) => { - if (!(isOmnichannelRoom(room) && room.v.token)) { - return message; - } + 'afterOmnichannelSaveMessage', + async (message, { room }) => { if (message.t) { return message; } - if (!message.token) { + if (!isMessageFromVisitor(message)) { return message; } diff --git a/apps/meteor/app/livechat/server/hooks/sendToCRM.ts b/apps/meteor/app/livechat/server/hooks/sendToCRM.ts index 24e1d685a0e6..b3624bd3ecf6 100644 --- a/apps/meteor/app/livechat/server/hooks/sendToCRM.ts +++ b/apps/meteor/app/livechat/server/hooks/sendToCRM.ts @@ -261,13 +261,8 @@ callbacks.add( ); callbacks.add( - 'afterSaveMessage', - async (message, room) => { - // only call webhook if it is a livechat room - if (!isOmnichannelRoom(room) || !room?.v?.token) { - return message; - } - + 'afterOmnichannelSaveMessage', + async (message, { room }) => { // if the message has a token, it was sent from the visitor // if not, it was sent from the agent if (message.token && !settings.get('Livechat_webhook_on_visitor_message')) { diff --git a/apps/meteor/app/livechat/server/index.ts b/apps/meteor/app/livechat/server/index.ts index fc96f2a921a9..9a1f40238df5 100644 --- a/apps/meteor/app/livechat/server/index.ts +++ b/apps/meteor/app/livechat/server/index.ts @@ -16,6 +16,7 @@ import './hooks/saveContactLastChat'; import './hooks/saveLastMessageToInquiry'; import './hooks/afterUserActions'; import './hooks/afterAgentRemoved'; +import './hooks/afterSaveOmnichannelMessage'; import './methods/addAgent'; import './methods/addManager'; import './methods/changeLivechatStatus'; diff --git a/apps/meteor/app/livechat/server/sendMessageBySMS.ts b/apps/meteor/app/livechat/server/sendMessageBySMS.ts index 2557fcdeb83d..c7f88646158b 100644 --- a/apps/meteor/app/livechat/server/sendMessageBySMS.ts +++ b/apps/meteor/app/livechat/server/sendMessageBySMS.ts @@ -1,5 +1,5 @@ import { OmnichannelIntegration } from '@rocket.chat/core-services'; -import { isEditedMessage, isOmnichannelRoom } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatVisitors } from '@rocket.chat/models'; import { callbacks } from '../../../lib/callbacks'; @@ -8,8 +8,8 @@ import { normalizeMessageFileUpload } from '../../utils/server/functions/normali import { callbackLogger } from './lib/logger'; callbacks.add( - 'afterSaveMessage', - async (message, room) => { + 'afterOmnichannelSaveMessage', + async (message, { room }) => { // skips this callback if the message was edited if (isEditedMessage(message)) { return message; @@ -20,7 +20,7 @@ callbacks.add( } // only send the sms by SMS if it is a livechat room with SMS set to true - if (!(isOmnichannelRoom(room) && room.sms && room.v && room.v.token)) { + if (!(room.sms && room.v && room.v.token)) { return message; } diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/resumeOnHold.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/resumeOnHold.ts index 8a04166e1b72..249f988c7684 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/resumeOnHold.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/resumeOnHold.ts @@ -1,6 +1,6 @@ import { OmnichannelEEService } from '@rocket.chat/core-services'; -import type { ILivechatVisitor, IMessage, IOmnichannelRoom, IRoom, IUser } from '@rocket.chat/core-typings'; -import { isEditedMessage, isOmnichannelRoom } from '@rocket.chat/core-typings'; +import type { ILivechatVisitor, IMessage, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings'; +import { isMessageFromVisitor, isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatRooms, LivechatVisitors, Users } from '@rocket.chat/models'; import { callbackLogger } from '../../../../../app/livechat/server/lib/logger'; @@ -16,7 +16,7 @@ const resumeOnHoldCommentAndUser = async (room: IOmnichannelRoom): Promise<{ com projection: { name: 1, username: 1 }, }); if (!visitor) { - callbackLogger.error(`[afterSaveMessage] Visitor Not found for room ${rid} while trying to resume on hold`); + callbackLogger.error(`[afterOmnichannelSaveMessage] Visitor Not found for room ${rid} while trying to resume on hold`); throw new Error('Visitor not found while trying to resume on hold'); } @@ -26,43 +26,46 @@ const resumeOnHoldCommentAndUser = async (room: IOmnichannelRoom): Promise<{ com const resumedBy = await Users.findOneById('rocket.cat'); if (!resumedBy) { - callbackLogger.error(`[afterSaveMessage] User Not found for room ${rid} while trying to resume on hold`); + callbackLogger.error(`[afterOmnichannelSaveMessage] User Not found for room ${rid} while trying to resume on hold`); throw new Error(`User not found while trying to resume on hold`); } return { comment: resumeChatComment, resumedBy }; }; -const handleAfterSaveMessage = async (message: IMessage, room: IRoom) => { - if (isEditedMessage(message) || message.t || !isOmnichannelRoom(room)) { - return message; - } +callbacks.add( + 'afterOmnichannelSaveMessage', + async (message: IMessage, { room }) => { + if (isEditedMessage(message) || message.t) { + return message; + } - const { _id: rid, v: roomVisitor } = room; + const { _id: rid, v: roomVisitor } = room; - if (!roomVisitor?._id) { - return message; - } - - // Need to read the room every time, the room object is not updated - const updatedRoom = await LivechatRooms.findOneById(rid); - if (!updatedRoom) { - return message; - } - - if (message.token && room.onHold) { - callbackLogger.debug(`[afterSaveMessage] Room ${rid} is on hold, resuming it now since visitor sent a message`); + if (!roomVisitor?._id) { + return message; + } - try { - const { comment: resumeChatComment, resumedBy } = await resumeOnHoldCommentAndUser(updatedRoom); - await OmnichannelEEService.resumeRoomOnHold(updatedRoom, resumeChatComment, resumedBy); - } catch (error) { - callbackLogger.error(`[afterSaveMessage] Error while resuming room ${rid} on hold: Error: `, error); + // Need to read the room every time, the room object is not updated + const updatedRoom = await LivechatRooms.findOneById(rid); + if (!updatedRoom) { return message; } - } - return message; -}; + if (isMessageFromVisitor(message) && room.onHold) { + callbackLogger.debug(`[afterOmnichannelSaveMessage] Room ${rid} is on hold, resuming it now since visitor sent a message`); + + try { + const { comment: resumeChatComment, resumedBy } = await resumeOnHoldCommentAndUser(updatedRoom); + await OmnichannelEEService.resumeRoomOnHold(updatedRoom, resumeChatComment, resumedBy); + } catch (error) { + callbackLogger.error(`[afterOmnichannelSaveMessage] Error while resuming room ${rid} on hold: Error: `, error); + return message; + } + } -callbacks.add('afterSaveMessage', handleAfterSaveMessage, callbacks.priority.HIGH, 'livechat-resume-on-hold'); + return message; + }, + callbacks.priority.HIGH, + 'livechat-resume-on-hold', +); diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts index fdf980c311ab..c0f4b1b9da1d 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts @@ -1,5 +1,4 @@ -import type { IMessage, IOmnichannelRoom, IRoom } from '@rocket.chat/core-typings'; -import { isOmnichannelRoom } from '@rocket.chat/core-typings'; +import type { IMessage, IOmnichannelRoom } from '@rocket.chat/core-typings'; import type { CloseRoomParams } from '../../../../../app/livechat/server/lib/LivechatTyped'; import { settings } from '../../../../../app/settings/server'; @@ -14,40 +13,6 @@ type LivechatCloseCallbackParams = { let autoTransferTimeout = 0; -const handleAfterSaveMessage = async (message: IMessage, room: IRoom | undefined): Promise => { - if (!room || !isOmnichannelRoom(room)) { - return message; - } - - const { _id: rid, autoTransferredAt, autoTransferOngoing } = room; - const { token, t: messageType } = message; - - if (messageType) { - // ignore system messages - return message; - } - - if (!autoTransferTimeout || autoTransferTimeout <= 0) { - return message; - } - - if (!message || token) { - // ignore messages from visitors - return message; - } - - if (autoTransferredAt) { - return message; - } - - if (!autoTransferOngoing) { - return message; - } - - await AutoTransferChatScheduler.unscheduleRoom(rid); - return message; -}; - const handleAfterCloseRoom = async (params: LivechatCloseCallbackParams): Promise => { const { room } = params; @@ -73,7 +38,7 @@ settings.watch('Livechat_auto_transfer_chat_timeout', (value) => { autoTransferTimeout = value as number; if (!autoTransferTimeout || autoTransferTimeout === 0) { callbacks.remove('livechat.afterTakeInquiry', 'livechat-auto-transfer-job-inquiry'); - callbacks.remove('afterSaveMessage', 'livechat-cancel-auto-transfer-job-after-message'); + callbacks.remove('afterOmnichannelSaveMessage', 'livechat-cancel-auto-transfer-job-after-message'); callbacks.remove('livechat.closeRoom', 'livechat-cancel-auto-transfer-on-close-room'); return; } @@ -98,6 +63,39 @@ settings.watch('Livechat_auto_transfer_chat_timeout', (value) => { callbacks.priority.MEDIUM, 'livechat-auto-transfer-job-inquiry', ); - callbacks.add('afterSaveMessage', handleAfterSaveMessage, callbacks.priority.HIGH, 'livechat-cancel-auto-transfer-job-after-message'); + callbacks.add( + 'afterOmnichannelSaveMessage', + async (message: IMessage, { room }): Promise => { + const { _id: rid, autoTransferredAt, autoTransferOngoing } = room; + const { token, t: messageType } = message; + + if (messageType) { + // ignore system messages + return message; + } + + if (!autoTransferTimeout || autoTransferTimeout <= 0) { + return message; + } + + if (!message || token) { + // ignore messages from visitors + return message; + } + + if (autoTransferredAt) { + return message; + } + + if (!autoTransferOngoing) { + return message; + } + + await AutoTransferChatScheduler.unscheduleRoom(rid); + return message; + }, + callbacks.priority.HIGH, + 'livechat-cancel-auto-transfer-job-after-message', + ); callbacks.add('livechat.closeRoom', handleAfterCloseRoom, callbacks.priority.HIGH, 'livechat-cancel-auto-transfer-on-close-room'); }); diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.ts index 38238763e0ca..c244022689dc 100644 --- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.ts +++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/setPredictedVisitorAbandonmentTime.ts @@ -1,5 +1,5 @@ import type { IOmnichannelRoom } from '@rocket.chat/core-typings'; -import { isEditedMessage, isOmnichannelRoom } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; import { LivechatRooms } from '@rocket.chat/models'; import moment from 'moment'; @@ -8,12 +8,8 @@ import { callbacks } from '../../../../../lib/callbacks'; import { setPredictedVisitorAbandonmentTime } from '../lib/Helper'; callbacks.add( - 'afterSaveMessage', - async (message, room) => { - if (!isOmnichannelRoom(room)) { - return message; - } - + 'afterOmnichannelSaveMessage', + async (message, { room }) => { if ( !settings.get('Livechat_abandoned_rooms_action') || settings.get('Livechat_abandoned_rooms_action') === 'none' || diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts index 02e9162c8330..044e70580e5b 100644 --- a/apps/meteor/lib/callbacks.ts +++ b/apps/meteor/lib/callbacks.ts @@ -50,6 +50,7 @@ interface EventLikeCallbackSignatures { 'afterFileUpload': (params: { user: IUser; room: IRoom; message: IMessage }) => void; 'afterRoomNameChange': (params: { rid: string; name: string; oldName: string }) => void; 'afterSaveMessage': (message: IMessage, room: IRoom, uid?: string) => void; + 'afterOmnichannelSaveMessage': (message: IMessage, constant: { room: IOmnichannelRoom }) => void; 'livechat.removeAgentDepartment': (params: { departmentId: ILivechatDepartmentRecord['_id']; agentsId: ILivechatAgent['_id'][] }) => void; 'livechat.saveAgentDepartment': (params: { departmentId: ILivechatDepartmentRecord['_id']; agentsId: ILivechatAgent['_id'][] }) => void; 'livechat.closeRoom': (params: { room: IOmnichannelRoom; options: CloseRoomParams['options'] }) => void; From 46a502cc2447a0496cadedb9d3ad4c94ff811c25 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 2 Aug 2024 19:23:36 -0300 Subject: [PATCH 14/23] chore: create `orm` for specific cases (#32948) Co-authored-by: Diego Sampaio --- apps/meteor/server/models/raw/BaseRaw.ts | 7 +- packages/model-typings/src/index.ts | 1 + packages/model-typings/src/updater.ts | 36 +++++ packages/models/package.json | 2 +- packages/models/src/index.ts | 1 + packages/models/src/updater.spec.ts | 192 +++++++++++++++++++++++ packages/models/src/updater.ts | 84 ++++++++++ yarn.lock | 4 +- 8 files changed, 323 insertions(+), 4 deletions(-) create mode 100644 packages/model-typings/src/updater.ts create mode 100644 packages/models/src/updater.spec.ts create mode 100644 packages/models/src/updater.ts diff --git a/apps/meteor/server/models/raw/BaseRaw.ts b/apps/meteor/server/models/raw/BaseRaw.ts index 96f64b061ade..7d4c78697ecb 100644 --- a/apps/meteor/server/models/raw/BaseRaw.ts +++ b/apps/meteor/server/models/raw/BaseRaw.ts @@ -1,6 +1,7 @@ import type { RocketChatRecordDeleted } from '@rocket.chat/core-typings'; import type { IBaseModel, DefaultFields, ResultFields, FindPaginated, InsertionModel } from '@rocket.chat/model-typings'; -import { getCollectionName } from '@rocket.chat/models'; +import type { Updater } from '@rocket.chat/models'; +import { getCollectionName, UpdaterImpl } from '@rocket.chat/models'; import { ObjectId } from 'mongodb'; import type { BulkWriteOptions, @@ -109,6 +110,10 @@ export abstract class BaseRaw< return this.collectionName; } + protected getUpdater(): Updater { + return new UpdaterImpl(this.col as unknown as IBaseModel); + } + private doNotMixInclusionAndExclusionFields(options: FindOptions = {}): FindOptions { const optionsDef = this.ensureDefaultFields(options); if (optionsDef?.projection === undefined) { diff --git a/packages/model-typings/src/index.ts b/packages/model-typings/src/index.ts index 23e77ff1de29..61ad5d1f5c55 100644 --- a/packages/model-typings/src/index.ts +++ b/packages/model-typings/src/index.ts @@ -79,3 +79,4 @@ export * from './models/IAuditLogModel'; export * from './models/ICronHistoryModel'; export * from './models/IMigrationsModel'; export * from './models/IModerationReportsModel'; +export * from './updater'; diff --git a/packages/model-typings/src/updater.ts b/packages/model-typings/src/updater.ts new file mode 100644 index 000000000000..33ec78f4b86b --- /dev/null +++ b/packages/model-typings/src/updater.ts @@ -0,0 +1,36 @@ +/* eslint-disable @typescript-eslint/naming-convention */ +import type { Join, NestedPaths, PropertyType, ArrayElement, NestedPathsOfType, Filter } 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; + persist(query: Filter): Promise; + hasChanges(): boolean; +} + +export type SetProps = Readonly< + { + [Property in Join, '.'>]: PropertyType; + } & { + [Property in `${NestedPathsOfType}.$${`[${string}]` | ''}`]: ArrayElement< + PropertyType + >; + } & { + [Property in `${NestedPathsOfType[]>}.$${`[${string}]` | ''}.${string}`]: any; + } +>; + +type GetType = { + [Key in keyof T]: K extends T[Key] ? T[Key] : never; +}; + +type OmitNever = { [K in keyof T as T[K] extends never ? never : K]: T[K] }; + +// only allow optional properties +export type UnsetProps = OmitNever, undefined>>; + +export type IncProps = OmitNever, number>>; + +export type AddToSetProps = OmitNever, any[]>>; diff --git a/packages/models/package.json b/packages/models/package.json index a2ac3071147b..7ff6b9ee2b8f 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -7,7 +7,7 @@ "@swc/jest": "^0.2.29", "@types/jest": "~29.5.12", "eslint": "~8.45.0", - "jest": "~29.7.0", + "jest": "^29.7.0", "ts-jest": "~29.1.1", "typescript": "~5.3.3" }, diff --git a/packages/models/src/index.ts b/packages/models/src/index.ts index e1cf91f1b0ee..655a94923feb 100644 --- a/packages/models/src/index.ts +++ b/packages/models/src/index.ts @@ -88,6 +88,7 @@ export function getCollectionName(name: string): string { } export { registerModel } from './proxify'; +export { type Updater, UpdaterImpl } from './updater'; export const Apps = proxify('IAppsModel'); export const AppsTokens = proxify('IAppsTokensModel'); diff --git a/packages/models/src/updater.spec.ts b/packages/models/src/updater.spec.ts new file mode 100644 index 000000000000..4decc57d7c3b --- /dev/null +++ b/packages/models/src/updater.spec.ts @@ -0,0 +1,192 @@ +import { UpdaterImpl } from './updater'; + +test('updater typings', () => { + const updater = new UpdaterImpl<{ + _id: string; + t: 'l'; + a: { + b: string; + }; + c?: number; + + d?: { + e: string; + }; + e: string[]; + }>({} as any); + + updater.addToSet('e', 'a'); + + // @ts-expect-error + updater.addToSet('e', 1); + // @ts-expect-error + updater.addToSet('a', 'b'); + + // @ts-expect-error + updater.set('njame', 1); + // @ts-expect-error + updater.set('ttes', 1); + // @ts-expect-error + updater.set('t', 'a'); + updater.set('t', 'l'); + // @ts-expect-error + updater.set('a', 'b'); + // @ts-expect-error + updater.set('c', 'b'); + updater.set('c', 1); + + updater.set('a', { + b: 'set', + }); + updater.set('a.b', 'test'); + + // @ts-expect-error + updater.unset('a'); + + updater.unset('c'); + + updater.unset('d'); + + updater.unset('d.e'); + // @ts-expect-error + updater.inc('d', 1); + updater.inc('c', 1); +}); + +test('updater $set operations', async () => { + const updateOne = jest.fn(); + + const updater = new UpdaterImpl<{ + _id: string; + t: 'l'; + a: { + b: string; + }; + c?: number; + }>({ + updateOne, + } as any); + + updater.set('a', { + b: 'set', + }); + + await updater.persist({ + _id: 'test', + }); + + expect(updateOne).toBeCalledWith( + { + _id: 'test', + }, + { $set: { a: { b: 'set' } } }, + ); +}); + +test('updater $unset operations', async () => { + const updateOne = jest.fn(); + + const updater = new UpdaterImpl<{ + _id: string; + t: 'l'; + a: { + b: string; + }; + c?: number; + }>({ + updateOne, + } as any); + + updater.unset('c'); + + await updater.persist({ + _id: 'test', + }); + + expect(updateOne).toBeCalledWith( + { + _id: 'test', + }, + { $unset: { c: 1 } }, + ); +}); + +test('updater inc multiple operations', async () => { + const updateOne = jest.fn(); + + const updater = new UpdaterImpl<{ + _id: string; + t: 'l'; + a: { + b: string; + }; + c?: number; + }>({ + updateOne, + } as any); + + updater.inc('c', 1); + updater.inc('c', 1); + + await updater.persist({ + _id: 'test', + }); + + expect(updateOne).toBeCalledWith( + { + _id: 'test', + }, + { $inc: { c: 2 } }, + ); +}); + +test('it should add items to array', async () => { + const updateOne = jest.fn(); + const updater = new UpdaterImpl<{ + _id: string; + a: string[]; + }>({ + updateOne, + } as any); + + updater.addToSet('a', 'b'); + updater.addToSet('a', 'c'); + + await updater.persist({ + _id: 'test', + }); + + expect(updateOne).toBeCalledWith( + { + _id: 'test', + }, + { $addToSet: { $each: { a: ['b', 'c'] } } }, + ); +}); + +test('it should persist only once', async () => { + const updateOne = jest.fn(); + + const updater = new UpdaterImpl<{ + _id: string; + t: 'l'; + a: { + b: string; + }; + c?: number; + }>({ + updateOne, + } as any); + + updater.set('a', { + b: 'set', + }); + + await updater.persist({ + _id: 'test', + }); + + expect(updateOne).toBeCalledTimes(1); + + expect(() => updater.persist({ _id: 'test' })).rejects.toThrow(); +}); diff --git a/packages/models/src/updater.ts b/packages/models/src/updater.ts new file mode 100644 index 000000000000..ef163ea09e40 --- /dev/null +++ b/packages/models/src/updater.ts @@ -0,0 +1,84 @@ +/* eslint-disable @typescript-eslint/naming-convention */ +import type { IBaseModel, Updater, SetProps, UnsetProps, IncProps, AddToSetProps } from '@rocket.chat/model-typings'; +import type { UpdateFilter, Filter } from 'mongodb'; + +type ArrayElementType = T extends (infer E)[] ? E : T; + +type Keys = keyof SetProps; + +export class UpdaterImpl implements Updater { + private _set: Map, any> | undefined; + + private _unset: Set> | undefined; + + private _inc: Map, number> | undefined; + + private _addToSet: Map, any[]> | undefined; + + private dirty = false; + + constructor(private model: IBaseModel) {} + + set

, K extends keyof P>(key: K, value: P[K]) { + this._set = this._set ?? new Map, any>(); + this._set.set(key as Keys, value); + return this; + } + + unset>(key: K): Updater { + this._unset = this._unset ?? new Set>(); + this._unset.add(key); + return this; + } + + inc>(key: K, value: number): Updater { + this._inc = this._inc ?? new Map, number>(); + + const prev = this._inc.get(key) ?? 0; + this._inc.set(key, prev + value); + return this; + } + + addToSet>(key: K, value: ArrayElementType[K]>): Updater { + this._addToSet = this._addToSet ?? new Map, any[]>(); + + const prev = this._addToSet.get(key) ?? []; + this._addToSet.set(key, [...prev, value]); + return this; + } + + async persist(query: Filter): Promise { + if (this.dirty) { + throw new Error('Updater is not dirty'); + } + + if ((process.env.NODE_ENV === 'development' || process.env.TEST_MODE) && !this.hasChanges()) { + throw new Error('Nothing to update'); + } + + this.dirty = true; + + const update = this.getUpdateFilter(); + try { + await this.model.updateOne(query, update); + } catch (error) { + console.error('Failed to update', JSON.stringify(query), JSON.stringify(update, null, 2)); + throw error; + } + } + + hasChanges() { + return Object.keys(this.getUpdateFilter()).length > 0; + } + + private 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) } }), + } as unknown as UpdateFilter; + } +} + +export { Updater }; diff --git a/yarn.lock b/yarn.lock index 49001cc21300..cbaed225e131 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9774,7 +9774,7 @@ __metadata: "@swc/jest": ^0.2.29 "@types/jest": ~29.5.12 eslint: ~8.45.0 - jest: ~29.7.0 + jest: ^29.7.0 ts-jest: ~29.1.1 typescript: ~5.3.3 languageName: unknown @@ -28457,7 +28457,7 @@ __metadata: languageName: node linkType: hard -"jest@npm:~29.7.0": +"jest@npm:^29.7.0, jest@npm:~29.7.0": version: 29.7.0 resolution: "jest@npm:29.7.0" dependencies: From a38c3427770eb3e2ff2d9e80dd3e57d6e5224a51 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Fri, 2 Aug 2024 23:14:38 -0300 Subject: [PATCH 15/23] 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 41b1407804ce17bb54b79cda607554c474246f29 Mon Sep 17 00:00:00 2001 From: Ricardo Garim Date: Fri, 2 Aug 2024 23:19:08 -0300 Subject: [PATCH 16/23] chore: saveAnalyticsData with accumulator (#32961) Co-authored-by: Guilherme Gazzo --- .../server/hooks/saveAnalyticsData.ts | 121 +++++++++--------- .../meteor/server/models/raw/LivechatRooms.ts | 100 +++++++++------ packages/core-typings/src/IRoom.ts | 3 + .../src/models/ILivechatRoomsModel.ts | 8 +- 4 files changed, 131 insertions(+), 101 deletions(-) diff --git a/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts b/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts index 7c7bff067f9a..07802b75553c 100644 --- a/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts +++ b/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts @@ -1,79 +1,84 @@ -import { isEditedMessage, isMessageFromVisitor } from '@rocket.chat/core-typings'; +import { isEditedMessage } from '@rocket.chat/core-typings'; +import type { IOmnichannelRoom } from '@rocket.chat/core-typings'; import { LivechatRooms } from '@rocket.chat/models'; import { callbacks } from '../../../../lib/callbacks'; import { normalizeMessageFileUpload } from '../../../utils/server/functions/normalizeMessageFileUpload'; +const getMetricValue = (metric: T | undefined, defaultValue: T): T => metric ?? defaultValue; +const calculateTimeDifference = (startTime: T, now: Date): number => + (now.getTime() - new Date(startTime).getTime()) / 1000; +const calculateAvgResponseTime = (totalResponseTime: number, newResponseTime: number, responseCount: number) => + (totalResponseTime + newResponseTime) / (responseCount + 1); + +const getFirstResponseAnalytics = ( + visitorLastQuery: Date, + agentJoinTime: Date, + totalResponseTime: number, + responseCount: number, + now: Date, +) => { + const responseTime = calculateTimeDifference(visitorLastQuery, now); + const reactionTime = calculateTimeDifference(agentJoinTime, now); + const avgResponseTime = calculateAvgResponseTime(totalResponseTime, responseTime, responseCount); + + return { + firstResponseDate: now, + firstResponseTime: responseTime, + responseTime, + avgResponseTime, + firstReactionDate: now, + firstReactionTime: reactionTime, + reactionTime, + }; +}; + +const getSubsequentResponseAnalytics = (visitorLastQuery: Date, totalResponseTime: number, responseCount: number, now: Date) => { + const responseTime = calculateTimeDifference(visitorLastQuery, now); + const avgResponseTime = calculateAvgResponseTime(totalResponseTime, responseTime, responseCount); + + return { + responseTime, + avgResponseTime, + reactionTime: responseTime, + }; +}; + +const getAnalyticsData = (room: IOmnichannelRoom, now: Date): Record | undefined => { + const visitorLastQuery = getMetricValue(room.metrics?.v?.lq, room.ts); + const agentLastReply = getMetricValue(room.metrics?.servedBy?.lr, room.ts); + const agentJoinTime = getMetricValue(room.servedBy?.ts, room.ts); + const totalResponseTime = getMetricValue(room.metrics?.response?.tt, 0); + const responseCount = getMetricValue(room.metrics?.response?.total, 0); + + if (agentLastReply === room.ts) { + return getFirstResponseAnalytics(visitorLastQuery, agentJoinTime, totalResponseTime, responseCount, now); + } + if (visitorLastQuery > agentLastReply) { + return getSubsequentResponseAnalytics(visitorLastQuery, totalResponseTime, responseCount, now); + } +}; + callbacks.add( 'afterOmnichannelSaveMessage', async (message, { room }) => { - // skips this callback if the message was edited if (!message || isEditedMessage(message)) { return message; } - // if the message has a token, it was sent by the visitor - if (isMessageFromVisitor(message)) { - // When visitor sends a mesage, most metrics wont be calculated/served. - // But, v.lq (last query) will be updated to the message time. This has to be done - // As not doing it will cause the metrics to be crazy and not have real values. - await LivechatRooms.saveAnalyticsDataByRoomId(room, message); - return message; - } - if (message.file) { message = { ...(await normalizeMessageFileUpload(message)), ...{ _updatedAt: message._updatedAt } }; } - const now = new Date(); - let analyticsData; - - const visitorLastQuery = room.metrics?.v ? room.metrics.v.lq : room.ts; - const agentLastReply = room.metrics?.servedBy ? room.metrics.servedBy.lr : room.ts; - const agentJoinTime = room.servedBy?.ts ? room.servedBy.ts : room.ts; - - const isResponseTt = room.metrics?.response?.tt; - const isResponseTotal = room.metrics?.response?.total; - - if (agentLastReply === room.ts) { - // first response - const firstResponseDate = now; - const firstResponseTime = (now.getTime() - new Date(visitorLastQuery).getTime()) / 1000; - const responseTime = (now.getTime() - new Date(visitorLastQuery).getTime()) / 1000; - const avgResponseTime = - ((isResponseTt ? room.metrics?.response?.tt : 0) || 0 + responseTime) / - ((isResponseTotal ? room.metrics?.response?.total : 0) || 0 + 1); + const analyticsData = getAnalyticsData(room, new Date()); + const updater = await LivechatRooms.getAnalyticsUpdateQueryByRoomId(room, message, analyticsData); - const firstReactionDate = now; - const firstReactionTime = (now.getTime() - new Date(agentJoinTime).getTime()) / 1000; - const reactionTime = (now.getTime() - new Date(agentJoinTime).getTime()) / 1000; - - analyticsData = { - firstResponseDate, - firstResponseTime, - responseTime, - avgResponseTime, - firstReactionDate, - firstReactionTime, - reactionTime, - }; - } else if (visitorLastQuery > agentLastReply) { - // response, not first - const responseTime = (now.getTime() - new Date(visitorLastQuery).getTime()) / 1000; - const avgResponseTime = - ((isResponseTt ? room.metrics?.response?.tt : 0) || 0 + responseTime) / - ((isResponseTotal ? room.metrics?.response?.total : 0) || 0 + 1); - - const reactionTime = (now.getTime() - new Date(visitorLastQuery).getTime()) / 1000; - - analyticsData = { - responseTime, - avgResponseTime, - reactionTime, - }; - } // ignore, its continuing response + if (updater.hasChanges()) { + await updater.persist({ + _id: room._id, + }); + } - await LivechatRooms.saveAnalyticsDataByRoomId(room, message, analyticsData); return message; }, callbacks.priority.LOW, diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts index 648af95ed180..dfb0143cb984 100644 --- a/apps/meteor/server/models/raw/LivechatRooms.ts +++ b/apps/meteor/server/models/raw/LivechatRooms.ts @@ -9,8 +9,9 @@ import type { ReportResult, MACStats, } from '@rocket.chat/core-typings'; -import { UserStatus } from '@rocket.chat/core-typings'; +import { isMessageFromVisitor, UserStatus } from '@rocket.chat/core-typings'; import type { ILivechatRoomsModel } from '@rocket.chat/model-typings'; +import type { Updater } from '@rocket.chat/models'; import { Settings } from '@rocket.chat/models'; import { escapeRegExp } from '@rocket.chat/string-helpers'; import type { @@ -2020,52 +2021,71 @@ export class LivechatRoomsRaw extends BaseRaw implements ILive ); } - saveAnalyticsDataByRoomId(room: IOmnichannelRoom, message: IMessage, analyticsData: Record) { - const update: DeepWritable> = { - $set: { - ...(analyticsData && { - 'metrics.response.avg': analyticsData.avgResponseTime, - }), - ...(analyticsData?.firstResponseTime && { - 'metrics.reaction.fd': analyticsData.firstReactionDate, - 'metrics.reaction.ft': analyticsData.firstReactionTime, - 'metrics.response.fd': analyticsData.firstResponseDate, - 'metrics.response.ft': analyticsData.firstResponseTime, - }), - }, - ...(analyticsData && { - $inc: { - 'metrics.response.total': 1, - 'metrics.response.tt': analyticsData.responseTime as number, - 'metrics.reaction.tt': analyticsData.reactionTime as number, - }, - }), - }; + private getAnalyticsUpdateQuery( + analyticsData: Record | undefined, + updater: Updater = this.getUpdater(), + ) { + if (analyticsData) { + updater.set('metrics.response.avg', analyticsData.avgResponseTime); + updater.inc('metrics.response.total', 1); + updater.inc('metrics.response.tt', analyticsData.responseTime as number); + updater.inc('metrics.reaction.tt', analyticsData.reactionTime as number); + } + + if (analyticsData?.firstResponseTime) { + updater.set('metrics.reaction.fd', analyticsData.firstReactionDate); + updater.set('metrics.reaction.ft', analyticsData.firstReactionTime); + updater.set('metrics.response.fd', analyticsData.firstResponseDate); + updater.set('metrics.response.ft', analyticsData.firstResponseTime); + } + + return updater; + } + private getAnalyticsUpdateQueryBySentByAgent( + room: IOmnichannelRoom, + message: IMessage, + analyticsData: Record | undefined, + updater: Updater = this.getUpdater(), + ) { // livechat analytics : update last message timestamps const visitorLastQuery = room.metrics?.v ? room.metrics.v.lq : room.ts; const agentLastReply = room.metrics?.servedBy ? room.metrics.servedBy.lr : room.ts; - if (message.token) { - // update visitor timestamp, only if its new inquiry and not continuing message - if (agentLastReply >= visitorLastQuery) { - // if first query, not continuing query from visitor - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - update.$set!['metrics.v.lq'] = message.ts; - } - } else if (visitorLastQuery > agentLastReply) { - // update agent timestamp, if first response, not continuing - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - update.$set!['metrics.servedBy.lr'] = message.ts; + if (visitorLastQuery > agentLastReply) { + return this.getAnalyticsUpdateQuery(analyticsData, updater).set('metrics.servedBy.lr', message.ts); } - return this.updateOne( - { - _id: room._id, - t: 'l', - }, - update, - ); + return updater; + } + + private getAnalyticsUpdateQueryBySentByVisitor( + room: IOmnichannelRoom, + message: IMessage, + analyticsData: Record | undefined, + updater: Updater = this.getUpdater(), + ) { + // livechat analytics : update last message timestamps + const visitorLastQuery = room.metrics?.v ? room.metrics.v.lq : room.ts; + const agentLastReply = room.metrics?.servedBy ? room.metrics.servedBy.lr : room.ts; + + // update visitor timestamp, only if its new inquiry and not continuing message + if (agentLastReply >= visitorLastQuery) { + return this.getAnalyticsUpdateQuery(analyticsData).set('metrics.v.lq', message.ts); + } + + return updater; + } + + async getAnalyticsUpdateQueryByRoomId( + room: IOmnichannelRoom, + message: IMessage, + analyticsData: Record | undefined, + updater: Updater = this.getUpdater(), + ) { + return isMessageFromVisitor(message) + ? this.getAnalyticsUpdateQueryBySentByVisitor(room, message, analyticsData, updater) + : this.getAnalyticsUpdateQueryBySentByAgent(room, message, analyticsData, updater); } getTotalConversationsBetweenDate(t: 'l', date: { gte: Date; lt: Date }, { departmentId }: { departmentId?: string } = {}) { diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts index ac31c2cc6a3a..4bc07c5a8ad4 100644 --- a/packages/core-typings/src/IRoom.ts +++ b/packages/core-typings/src/IRoom.ts @@ -275,9 +275,12 @@ export interface IOmnichannelRoom extends IOmnichannelGenericRoom { total: number; avg: number; ft: number; + fd?: number; }; reaction?: { + tt: number; ft: number; + fd?: number; }; }; diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts index d4da1d7d8159..8f364ad66a89 100644 --- a/packages/model-typings/src/models/ILivechatRoomsModel.ts +++ b/packages/model-typings/src/models/ILivechatRoomsModel.ts @@ -9,6 +9,7 @@ import type { import type { FindCursor, UpdateResult, AggregationCursor, Document, FindOptions, DeleteResult, Filter } from 'mongodb'; import type { FindPaginated } from '..'; +import type { Updater } from '../updater'; import type { IBaseModel } from './IBaseModel'; type Period = { @@ -208,11 +209,12 @@ export interface ILivechatRoomsModel extends IBaseModel { setResponseByRoomId(roomId: string, responseBy: IOmnichannelRoom['responseBy']): Promise; setNotResponseByRoomId(roomId: string): Promise; setAgentLastMessageTs(roomId: string): Promise; - saveAnalyticsDataByRoomId( + getAnalyticsUpdateQueryByRoomId( room: IOmnichannelRoom, message: IMessage, - analyticsData?: Record, - ): Promise; + analyticsData: Record | undefined, + updater?: Updater, + ): Promise>; getTotalConversationsBetweenDate(t: 'l', date: { gte: Date; lt: Date }, data?: { departmentId: string }): Promise; getAnalyticsMetricsBetweenDate( t: 'l', From 2db5155c045dae7d5aefd83db3dbbba022fbe0bf Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Mon, 5 Aug 2024 13:10:13 -0300 Subject: [PATCH 17/23] feat: Upgrade `fuselage-toastbar` adding pause on hover (#32969) --- .changeset/strong-swans-double.md | 6 ++++++ apps/meteor/package.json | 2 +- packages/uikit-playground/package.json | 2 +- yarn.lock | 23 +++++++++++++++++------ 4 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 .changeset/strong-swans-double.md diff --git a/.changeset/strong-swans-double.md b/.changeset/strong-swans-double.md new file mode 100644 index 000000000000..db521aeeef0f --- /dev/null +++ b/.changeset/strong-swans-double.md @@ -0,0 +1,6 @@ +--- +'@rocket.chat/uikit-playground': minor +'@rocket.chat/meteor': minor +--- + +Upgrades fuselage-toastbar version in order to add pause on hover functionality diff --git a/apps/meteor/package.json b/apps/meteor/package.json index a712ac548e36..5e5c0cc6877e 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -246,7 +246,7 @@ "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/fuselage-polyfills": "~0.31.25", - "@rocket.chat/fuselage-toastbar": "^0.32.0", + "@rocket.chat/fuselage-toastbar": "^0.33.0", "@rocket.chat/fuselage-tokens": "^0.33.1", "@rocket.chat/fuselage-ui-kit": "workspace:^", "@rocket.chat/gazzodown": "workspace:^", diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index 3c3c6405a75d..7ffc102699bc 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -18,7 +18,7 @@ "@rocket.chat/fuselage": "^0.57.0", "@rocket.chat/fuselage-hooks": "^0.33.1", "@rocket.chat/fuselage-polyfills": "~0.31.25", - "@rocket.chat/fuselage-toastbar": "^0.32.0", + "@rocket.chat/fuselage-toastbar": "^0.33.0", "@rocket.chat/fuselage-tokens": "^0.33.1", "@rocket.chat/fuselage-ui-kit": "workspace:~", "@rocket.chat/icons": "^0.36.0", diff --git a/yarn.lock b/yarn.lock index cbaed225e131..56da32a6f5ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8876,9 +8876,11 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage-toastbar@npm:^0.32.0": - version: 0.32.0 - resolution: "@rocket.chat/fuselage-toastbar@npm:0.32.0" +"@rocket.chat/fuselage-toastbar@npm:^0.33.0": + version: 0.33.0 + resolution: "@rocket.chat/fuselage-toastbar@npm:0.33.0" + dependencies: + react-timing-hooks: ~4.0.2 peerDependencies: "@rocket.chat/fuselage": "*" "@rocket.chat/fuselage-hooks": "*" @@ -8886,7 +8888,7 @@ __metadata: "@rocket.chat/styled": "*" react: ^17.0.2 react-dom: ^17.0.2 - checksum: 5e78516aee6446da4c76dac10ff83adb4deeb86d6111c42419f0629c35ec64b19ae6ab563f20b5efa2600c9c723b9096edc3c166e960fd25cfda1f07c4df3f3f + checksum: 97993ad2acdc5a742b71c94f9d321e090769c4116ab52208c2103ca41d4455bc4cd15c0cd0a1f8545144910a8c7f7de645ee150c0d8fc6b746001244690de2ed languageName: node linkType: hard @@ -9385,7 +9387,7 @@ __metadata: "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/fuselage-polyfills": ~0.31.25 - "@rocket.chat/fuselage-toastbar": ^0.32.0 + "@rocket.chat/fuselage-toastbar": ^0.33.0 "@rocket.chat/fuselage-tokens": ^0.33.1 "@rocket.chat/fuselage-ui-kit": "workspace:^" "@rocket.chat/gazzodown": "workspace:^" @@ -10547,7 +10549,7 @@ __metadata: "@rocket.chat/fuselage": ^0.57.0 "@rocket.chat/fuselage-hooks": ^0.33.1 "@rocket.chat/fuselage-polyfills": ~0.31.25 - "@rocket.chat/fuselage-toastbar": ^0.32.0 + "@rocket.chat/fuselage-toastbar": ^0.33.0 "@rocket.chat/fuselage-tokens": ^0.33.1 "@rocket.chat/fuselage-ui-kit": "workspace:~" "@rocket.chat/icons": ^0.36.0 @@ -35804,6 +35806,15 @@ __metadata: languageName: node linkType: hard +"react-timing-hooks@npm:~4.0.2": + version: 4.0.2 + resolution: "react-timing-hooks@npm:4.0.2" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + checksum: 95ebcaffe400f3e1af32bd82eb92258c5e1473e43a7edf65879692117946105bb21f4e91046fdc85c8c737997be1d8148bffacfde8a8a9ee835d81415048119e + languageName: node + linkType: hard + "react-virtuoso@npm:^4.7.1": version: 4.7.1 resolution: "react-virtuoso@npm:4.7.1" From e2a750f316d72d8a7e6f33af195faa009bba8078 Mon Sep 17 00:00:00 2001 From: Ricardo Garim Date: Mon, 5 Aug 2024 15:19:28 -0300 Subject: [PATCH 18/23] chore: move afterOmnichannelSaveMessage hook to work with updater (#32978) Co-authored-by: Guilherme Gazzo --- .../server/hooks/afterSaveOmnichannelMessage.ts | 12 ++++++++++-- .../app/livechat/server/hooks/saveAnalyticsData.ts | 10 ++-------- apps/meteor/lib/callbacks.ts | 3 ++- apps/meteor/server/models/raw/LivechatRooms.ts | 10 +++++++--- .../model-typings/src/models/ILivechatRoomsModel.ts | 2 ++ 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts b/apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts index 8badfb07177e..372704d339bb 100644 --- a/apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts +++ b/apps/meteor/app/livechat/server/hooks/afterSaveOmnichannelMessage.ts @@ -1,15 +1,23 @@ import { isOmnichannelRoom } from '@rocket.chat/core-typings'; +import { LivechatRooms } from '@rocket.chat/models'; import { callbacks } from '../../../../lib/callbacks'; callbacks.add( 'afterSaveMessage', async (message, room) => { - // only call webhook if it is a livechat room if (!isOmnichannelRoom(room)) { return message; } - return callbacks.run('afterOmnichannelSaveMessage', message, { room }); + + const updater = LivechatRooms.getUpdater(); + const result = await callbacks.run('afterOmnichannelSaveMessage', message, { room, roomUpdater: updater }); + + if (updater.hasChanges()) { + await updater.persist({ _id: room._id }); + } + + return result; }, callbacks.priority.MEDIUM, 'after-omnichannel-save-message', diff --git a/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts b/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts index 07802b75553c..fef6ad0936f8 100644 --- a/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts +++ b/apps/meteor/app/livechat/server/hooks/saveAnalyticsData.ts @@ -61,7 +61,7 @@ const getAnalyticsData = (room: IOmnichannelRoom, now: Date): Record { + async (message, { room, roomUpdater }) => { if (!message || isEditedMessage(message)) { return message; } @@ -71,13 +71,7 @@ callbacks.add( } const analyticsData = getAnalyticsData(room, new Date()); - const updater = await LivechatRooms.getAnalyticsUpdateQueryByRoomId(room, message, analyticsData); - - if (updater.hasChanges()) { - await updater.persist({ - _id: room._id, - }); - } + await LivechatRooms.getAnalyticsUpdateQueryByRoomId(room, message, analyticsData, roomUpdater); return message; }, diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts index 044e70580e5b..eb8e032804f7 100644 --- a/apps/meteor/lib/callbacks.ts +++ b/apps/meteor/lib/callbacks.ts @@ -23,6 +23,7 @@ import type { MessageMention, OmnichannelSourceType, } from '@rocket.chat/core-typings'; +import type { Updater } from '@rocket.chat/models'; import type { FilterOperators } from 'mongodb'; import type { ILoginAttempt } from '../app/authentication/server/ILoginAttempt'; @@ -50,7 +51,7 @@ interface EventLikeCallbackSignatures { 'afterFileUpload': (params: { user: IUser; room: IRoom; message: IMessage }) => void; 'afterRoomNameChange': (params: { rid: string; name: string; oldName: string }) => void; 'afterSaveMessage': (message: IMessage, room: IRoom, uid?: string) => void; - 'afterOmnichannelSaveMessage': (message: IMessage, constant: { room: IOmnichannelRoom }) => void; + 'afterOmnichannelSaveMessage': (message: IMessage, constant: { room: IOmnichannelRoom; roomUpdater: Updater }) => void; 'livechat.removeAgentDepartment': (params: { departmentId: ILivechatDepartmentRecord['_id']; agentsId: ILivechatAgent['_id'][] }) => void; 'livechat.saveAgentDepartment': (params: { departmentId: ILivechatDepartmentRecord['_id']; agentsId: ILivechatAgent['_id'][] }) => void; 'livechat.closeRoom': (params: { room: IOmnichannelRoom; options: CloseRoomParams['options'] }) => void; diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts index dfb0143cb984..d6a6711d06c9 100644 --- a/apps/meteor/server/models/raw/LivechatRooms.ts +++ b/apps/meteor/server/models/raw/LivechatRooms.ts @@ -78,6 +78,10 @@ export class LivechatRoomsRaw extends BaseRaw implements ILive ]; } + getUpdater(): Updater { + return super.getUpdater(); + } + getQueueMetrics({ departmentId, agentId, @@ -2056,7 +2060,7 @@ export class LivechatRoomsRaw extends BaseRaw implements ILive return this.getAnalyticsUpdateQuery(analyticsData, updater).set('metrics.servedBy.lr', message.ts); } - return updater; + return this.getAnalyticsUpdateQuery(analyticsData, updater); } private getAnalyticsUpdateQueryBySentByVisitor( @@ -2071,10 +2075,10 @@ export class LivechatRoomsRaw extends BaseRaw implements ILive // update visitor timestamp, only if its new inquiry and not continuing message if (agentLastReply >= visitorLastQuery) { - return this.getAnalyticsUpdateQuery(analyticsData).set('metrics.v.lq', message.ts); + return this.getAnalyticsUpdateQuery(analyticsData, updater).set('metrics.v.lq', message.ts); } - return updater; + return this.getAnalyticsUpdateQuery(analyticsData, updater); } async getAnalyticsUpdateQueryByRoomId( diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts index 8f364ad66a89..32238ccb5602 100644 --- a/packages/model-typings/src/models/ILivechatRoomsModel.ts +++ b/packages/model-typings/src/models/ILivechatRoomsModel.ts @@ -31,6 +31,8 @@ type WithOptions = { // TODO: Fix types of model export interface ILivechatRoomsModel extends IBaseModel { + getUpdater(): Updater; + getQueueMetrics(params: { departmentId: any; agentId: any; includeOfflineAgents: any; options?: any }): any; findAllNumberOfAbandonedRooms(params: Period & WithDepartment & WithOnlyCount & WithOptions): Promise; From cf778f1651c2f8498abe821cba5208ca571ff4fb Mon Sep 17 00:00:00 2001 From: Ricardo Garim Date: Mon, 5 Aug 2024 18:26:49 -0300 Subject: [PATCH 19/23] chore: add updater on afterOmnichannelSaveMessage (save-last-visitor-message-timestamp) hook (#32977) --- .../server/hooks/saveLastVisitorMessageTs.ts | 11 +++++------ apps/meteor/server/models/raw/LivechatRooms.ts | 13 ++----------- .../model-typings/src/models/ILivechatRoomsModel.ts | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts b/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts index bdaedfed19f2..03dcfdbf81bd 100644 --- a/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts +++ b/apps/meteor/app/livechat/server/hooks/saveLastVisitorMessageTs.ts @@ -5,15 +5,14 @@ import { callbacks } from '../../../../lib/callbacks'; callbacks.add( 'afterOmnichannelSaveMessage', - async (message, { room }) => { - if (message.t) { - return message; - } - if (!isMessageFromVisitor(message)) { + async (message, { roomUpdater }) => { + if (message.t || !isMessageFromVisitor(message)) { return message; } - await LivechatRooms.setVisitorLastMessageTimestampByRoomId(room._id, message.ts); + await LivechatRooms.getVisitorLastMessageTsUpdateQueryByRoomId(message.ts, roomUpdater); + + return message; }, callbacks.priority.HIGH, 'save-last-visitor-message-timestamp', diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts index d6a6711d06c9..b88ae1eb767a 100644 --- a/apps/meteor/server/models/raw/LivechatRooms.ts +++ b/apps/meteor/server/models/raw/LivechatRooms.ts @@ -2403,17 +2403,8 @@ export class LivechatRoomsRaw extends BaseRaw implements ILive return this.deleteOne(query); } - setVisitorLastMessageTimestampByRoomId(roomId: string, lastMessageTs: Date) { - const query = { - _id: roomId, - }; - const update = { - $set: { - 'v.lastMessageTs': lastMessageTs, - }, - }; - - return this.updateOne(query, update); + getVisitorLastMessageTsUpdateQueryByRoomId(lastMessageTs: Date, updater: Updater = this.getUpdater()) { + return updater.set('v.lastMessageTs', lastMessageTs); } setVisitorInactivityInSecondsById(roomId: string, visitorInactivity: number) { diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts index 32238ccb5602..345ecb2d768d 100644 --- a/packages/model-typings/src/models/ILivechatRoomsModel.ts +++ b/packages/model-typings/src/models/ILivechatRoomsModel.ts @@ -244,7 +244,7 @@ export interface ILivechatRoomsModel extends IBaseModel { removeAgentByRoomId(roomId: string): Promise; removeByVisitorToken(token: string): Promise; removeById(_id: string): Promise; - setVisitorLastMessageTimestampByRoomId(roomId: string, lastMessageTs: Date): Promise; + getVisitorLastMessageTsUpdateQueryByRoomId(lastMessageTs: Date, updater?: Updater): Updater; setVisitorInactivityInSecondsById(roomId: string, visitorInactivity: any): Promise; changeVisitorByRoomId(roomId: string, visitor: { _id: string; username: string; token: string }): Promise; unarchiveOneById(roomId: string): Promise; From b4d8c14a3ee68c832359d3826fa2bc3d9f0cef00 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Tue, 6 Aug 2024 11:25:52 -0300 Subject: [PATCH 20/23] =?UTF-8?q?chore:=20replace=20`dtinth/setup-github-a?= =?UTF-8?q?ctions-caching-for-turbo`=20to=20use=20`rhark=E2=80=A6=20(#3299?= =?UTF-8?q?0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build-docker/action.yml | 2 +- .github/actions/meteor-build/action.yml | 2 +- .github/workflows/ci-code-check.yml | 2 +- .github/workflows/ci-test-e2e.yml | 2 +- .github/workflows/ci-test-unit.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/new-release.yml | 2 +- .github/workflows/pr-update-description.yml | 3 +- .github/workflows/publish-release.yml | 2 +- package.json | 2 +- yarn.lock | 60 ++++++++++----------- 11 files changed, 40 insertions(+), 41 deletions(-) diff --git a/.github/actions/build-docker/action.yml b/.github/actions/build-docker/action.yml index 364957ecdf01..dbc615da889a 100644 --- a/.github/actions/build-docker/action.yml +++ b/.github/actions/build-docker/action.yml @@ -43,7 +43,7 @@ runs: tar xzf Rocket.Chat.tar.gz rm Rocket.Chat.tar.gz - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Setup NodeJS uses: ./.github/actions/setup-node diff --git a/.github/actions/meteor-build/action.yml b/.github/actions/meteor-build/action.yml index d261000ceb87..c13703aeea46 100644 --- a/.github/actions/meteor-build/action.yml +++ b/.github/actions/meteor-build/action.yml @@ -91,7 +91,7 @@ runs: meteor node -v git version - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Translation check shell: bash diff --git a/.github/workflows/ci-code-check.yml b/.github/workflows/ci-code-check.yml index 75deb399d2f2..fd214bc39488 100644 --- a/.github/workflows/ci-code-check.yml +++ b/.github/workflows/ci-code-check.yml @@ -42,7 +42,7 @@ jobs: # docker rmi $(docker image ls -aq) # df -h - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Cache TypeCheck uses: actions/cache@v3 diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml index 6ac9d751fc7a..b31f56c7a7de 100644 --- a/.github/workflows/ci-test-e2e.yml +++ b/.github/workflows/ci-test-e2e.yml @@ -139,7 +139,7 @@ jobs: CR_PAT: ${{ secrets.CR_PAT }} node-version: ${{ inputs.node-version }} - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Start httpbin container and wait for it to be ready if: inputs.type == 'api' diff --git a/.github/workflows/ci-test-unit.yml b/.github/workflows/ci-test-unit.yml index bfb22ffa4e73..a32c1e575b8f 100644 --- a/.github/workflows/ci-test-unit.yml +++ b/.github/workflows/ci-test-unit.yml @@ -40,7 +40,7 @@ jobs: cache-modules: true install: true - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Unit Test run: yarn testunit diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 411aa2cc5b1a..77a8d648ae61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,7 +161,7 @@ jobs: restore-keys: | vite-local-cache-${{ runner.os }}- - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Build Rocket.Chat Packages run: yarn build diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml index f10578d5879f..5ef8027b1467 100644 --- a/.github/workflows/new-release.yml +++ b/.github/workflows/new-release.yml @@ -38,7 +38,7 @@ jobs: cache-modules: true install: true - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Build packages run: yarn build diff --git a/.github/workflows/pr-update-description.yml b/.github/workflows/pr-update-description.yml index 71b4ffeda801..e792127eac9d 100644 --- a/.github/workflows/pr-update-description.yml +++ b/.github/workflows/pr-update-description.yml @@ -25,7 +25,7 @@ jobs: cache-modules: true install: true - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Build packages run: yarn build @@ -36,4 +36,3 @@ jobs: action: update-pr-description env: GITHUB_TOKEN: ${{ secrets.CI_PAT }} - diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index e133a3153722..ccc3408e194e 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -28,7 +28,7 @@ jobs: cache-modules: true install: true - - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - uses: rharkor/caching-for-turbo@v1.5 - name: Build packages run: yarn build diff --git a/package.json b/package.json index 741623a582b7..6f7980d8bfc9 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@types/chart.js": "^2.9.39", "@types/js-yaml": "^4.0.8", "ts-node": "^10.9.2", - "turbo": "^2.0.9" + "turbo": "latest" }, "workspaces": [ "apps/*", diff --git a/yarn.lock b/yarn.lock index 56da32a6f5ed..41752957bbfe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36860,7 +36860,7 @@ __metadata: "@types/js-yaml": ^4.0.8 node-gyp: ^9.4.1 ts-node: ^10.9.2 - turbo: ^2.0.9 + turbo: latest languageName: unknown linkType: soft @@ -40393,58 +40393,58 @@ __metadata: languageName: node linkType: hard -"turbo-darwin-64@npm:2.0.9": - version: 2.0.9 - resolution: "turbo-darwin-64@npm:2.0.9" +"turbo-darwin-64@npm:2.0.11": + version: 2.0.11 + resolution: "turbo-darwin-64@npm:2.0.11" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"turbo-darwin-arm64@npm:2.0.9": - version: 2.0.9 - resolution: "turbo-darwin-arm64@npm:2.0.9" +"turbo-darwin-arm64@npm:2.0.11": + version: 2.0.11 + resolution: "turbo-darwin-arm64@npm:2.0.11" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"turbo-linux-64@npm:2.0.9": - version: 2.0.9 - resolution: "turbo-linux-64@npm:2.0.9" +"turbo-linux-64@npm:2.0.11": + version: 2.0.11 + resolution: "turbo-linux-64@npm:2.0.11" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"turbo-linux-arm64@npm:2.0.9": - version: 2.0.9 - resolution: "turbo-linux-arm64@npm:2.0.9" +"turbo-linux-arm64@npm:2.0.11": + version: 2.0.11 + resolution: "turbo-linux-arm64@npm:2.0.11" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"turbo-windows-64@npm:2.0.9": - version: 2.0.9 - resolution: "turbo-windows-64@npm:2.0.9" +"turbo-windows-64@npm:2.0.11": + version: 2.0.11 + resolution: "turbo-windows-64@npm:2.0.11" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"turbo-windows-arm64@npm:2.0.9": - version: 2.0.9 - resolution: "turbo-windows-arm64@npm:2.0.9" +"turbo-windows-arm64@npm:2.0.11": + version: 2.0.11 + resolution: "turbo-windows-arm64@npm:2.0.11" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"turbo@npm:^2.0.9": - version: 2.0.9 - resolution: "turbo@npm:2.0.9" - dependencies: - turbo-darwin-64: 2.0.9 - turbo-darwin-arm64: 2.0.9 - turbo-linux-64: 2.0.9 - turbo-linux-arm64: 2.0.9 - turbo-windows-64: 2.0.9 - turbo-windows-arm64: 2.0.9 +"turbo@npm:latest": + version: 2.0.11 + resolution: "turbo@npm:2.0.11" + dependencies: + turbo-darwin-64: 2.0.11 + turbo-darwin-arm64: 2.0.11 + turbo-linux-64: 2.0.11 + turbo-linux-arm64: 2.0.11 + turbo-windows-64: 2.0.11 + turbo-windows-arm64: 2.0.11 dependenciesMeta: turbo-darwin-64: optional: true @@ -40460,7 +40460,7 @@ __metadata: optional: true bin: turbo: bin/turbo - checksum: 11896c5ede91c081161cc481effb922733dbae234277345144e4f9f069aeed0f2c38f9f9d25116773c348ebfe149631374e204f256a8d74486943be983547214 + checksum: a2fcb17b2549102dcd912799319a5c31cbabc3fcb76241bac1d2231ee4e1911789cd4e6b4eb050f9e8548ef89143ee77be59eb35b1843cf12b42f136ef176a0c languageName: node linkType: hard From 9939508bb379063bd772a00f01d65d1ec32c4be6 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Tue, 6 Aug 2024 12:07:20 -0300 Subject: [PATCH 21/23] chore: don't mark room as read after sending message (#32941) --- .../client/lib/chats/flows/sendMessage.ts | 1 - .../tests/end-to-end/api/subscriptions.ts | 78 ++++++++++++++++++- 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/lib/chats/flows/sendMessage.ts b/apps/meteor/client/lib/chats/flows/sendMessage.ts index dbac8d808e4f..e025730682d5 100644 --- a/apps/meteor/client/lib/chats/flows/sendMessage.ts +++ b/apps/meteor/client/lib/chats/flows/sendMessage.ts @@ -57,7 +57,6 @@ export const sendMessage = async ( } chat.readStateManager.clearUnreadMark(); - await chat.readStateManager.debouncedMarkAsRead(); text = text.trim(); diff --git a/apps/meteor/tests/end-to-end/api/subscriptions.ts b/apps/meteor/tests/end-to-end/api/subscriptions.ts index c1df85bafccd..a03179569615 100644 --- a/apps/meteor/tests/end-to-end/api/subscriptions.ts +++ b/apps/meteor/tests/end-to-end/api/subscriptions.ts @@ -50,8 +50,36 @@ describe('[Subscriptions]', () => { .end(done); }); - it('/subscriptions.getOne:', () => { - it('subscriptions.getOne', (done) => { + describe('/subscriptions.getOne', () => { + it('should fail if no roomId provided', (done) => { + void request + .get(api('subscriptions.getOne')) + .set(credentials) + .expect('Content-Type', 'application/json') + .expect(400) + .expect((res) => { + expect(res.body).to.have.property('success', false); + expect(res.body).to.have.property('error', "must have required property 'roomId' [invalid-params]"); + }) + .end(done); + }); + + it('should fail if not logged in', (done) => { + void request + .get(api('subscriptions.getOne')) + .query({ + roomId: testChannel._id, + }) + .expect('Content-Type', 'application/json') + .expect(401) + .expect((res) => { + expect(res.body).to.have.property('status', 'error'); + expect(res.body).to.have.property('message'); + }) + .end(done); + }); + + it('should return the subscription with success', (done) => { void request .get(api('subscriptions.getOne')) .set(credentials) @@ -66,6 +94,52 @@ describe('[Subscriptions]', () => { }) .end(done); }); + + it('should keep subscription as read after sending a message', async () => { + await request + .get(api('subscriptions.getOne')) + .set(credentials) + .query({ + roomId: testChannel._id, + }) + .expect('Content-Type', 'application/json') + .expect(200) + .expect((res) => { + expect(res.body).to.have.property('success', true); + expect(res.body).to.have.property('subscription').and.to.be.an('object'); + expect(res.body.subscription).to.have.property('alert', false); + }); + + await request + .post(api('chat.sendMessage')) + .set(credentials) + .send({ + message: { + rid: testChannel._id, + msg: 'Sample message', + }, + }) + .expect('Content-Type', 'application/json') + .expect(200) + .expect((res) => { + expect(res.body).to.have.property('success', true); + expect(res.body).to.have.property('message').and.to.be.an('object'); + }); + + await request + .get(api('subscriptions.getOne')) + .set(credentials) + .query({ + roomId: testChannel._id, + }) + .expect('Content-Type', 'application/json') + .expect(200) + .expect((res) => { + expect(res.body).to.have.property('success', true); + expect(res.body).to.have.property('subscription').and.to.be.an('object'); + expect(res.body.subscription).to.have.property('alert', false); + }); + }); }); describe('[/subscriptions.read]', () => { From e28be46db7f70652f04a80b0422ed5acc1fd98c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?= <60678893+juliajforesti@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:22:55 -0300 Subject: [PATCH 22/23] feat: add `sidepanel` to teams api (#32868) --- .changeset/swift-maps-tickle.md | 9 +++ apps/meteor/app/api/server/v1/teams.ts | 9 ++- .../server/methods/saveRoomSettings.ts | 27 ++++++- .../app/lib/server/functions/createRoom.ts | 2 + apps/meteor/server/models/raw/Rooms.ts | 4 + apps/meteor/server/services/room/service.ts | 4 +- apps/meteor/server/services/team/service.ts | 6 +- apps/meteor/tests/end-to-end/api/rooms.ts | 70 ++++++++++++++++- apps/meteor/tests/end-to-end/api/teams.ts | 78 +++++++++++++++++++ .../core-services/src/types/IRoomService.ts | 1 + .../core-services/src/types/ITeamService.ts | 1 + packages/core-typings/src/IRoom.ts | 22 ++++++ .../model-typings/src/models/IRoomsModel.ts | 2 + packages/rest-typings/src/v1/teams/index.ts | 1 + 14 files changed, 229 insertions(+), 7 deletions(-) create mode 100644 .changeset/swift-maps-tickle.md diff --git a/.changeset/swift-maps-tickle.md b/.changeset/swift-maps-tickle.md new file mode 100644 index 000000000000..076ead1cea4c --- /dev/null +++ b/.changeset/swift-maps-tickle.md @@ -0,0 +1,9 @@ +--- +'@rocket.chat/core-services': minor +'@rocket.chat/model-typings': minor +'@rocket.chat/core-typings': minor +'@rocket.chat/rest-typings': minor +'@rocket.chat/meteor': minor +--- + +Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints diff --git a/apps/meteor/app/api/server/v1/teams.ts b/apps/meteor/app/api/server/v1/teams.ts index 4ea8f2a48f38..f64f8c820575 100644 --- a/apps/meteor/app/api/server/v1/teams.ts +++ b/apps/meteor/app/api/server/v1/teams.ts @@ -1,6 +1,6 @@ import { Team } from '@rocket.chat/core-services'; import type { ITeam, UserStatus } from '@rocket.chat/core-typings'; -import { TEAM_TYPE } from '@rocket.chat/core-typings'; +import { TEAM_TYPE, isValidSidepanel } from '@rocket.chat/core-typings'; import { Users, Rooms } from '@rocket.chat/models'; import { isTeamsConvertToChannelProps, @@ -85,7 +85,11 @@ API.v1.addRoute( }), ); - const { name, type, members, room, owner } = this.bodyParams; + const { name, type, members, room, owner, sidepanel } = this.bodyParams; + + if (sidepanel?.items && !isValidSidepanel(sidepanel)) { + throw new Error('error-invalid-sidepanel'); + } const team = await Team.create(this.userId, { team: { @@ -95,6 +99,7 @@ API.v1.addRoute( room, members, owner, + sidepanel, }); return API.v1.success({ team }); diff --git a/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts b/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts index e3f45daa5b18..44ad253d83ef 100644 --- a/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts +++ b/apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts @@ -1,6 +1,6 @@ import { Team } from '@rocket.chat/core-services'; import type { IRoom, IRoomWithRetentionPolicy, IUser, MessageTypesValues } from '@rocket.chat/core-typings'; -import { TEAM_TYPE } from '@rocket.chat/core-typings'; +import { TEAM_TYPE, isValidSidepanel } from '@rocket.chat/core-typings'; import type { ServerMethods } from '@rocket.chat/ddp-client'; import { Rooms, Users } from '@rocket.chat/models'; import { Match } from 'meteor/check'; @@ -49,6 +49,7 @@ type RoomSettings = { favorite: boolean; defaultValue: boolean; }; + sidepanel?: IRoom['sidepanel']; }; type RoomSettingsValidators = { @@ -80,6 +81,24 @@ const validators: RoomSettingsValidators = { }); } }, + async sidepanel({ room, userId, value }) { + if (!room.teamMain) { + throw new Meteor.Error('error-action-not-allowed', 'Invalid room', { + method: 'saveRoomSettings', + }); + } + + if (!(await hasPermissionAsync(userId, 'edit-team', room._id))) { + throw new Meteor.Error('error-action-not-allowed', 'You do not have permission to change sidepanel items', { + method: 'saveRoomSettings', + }); + } + + if (!isValidSidepanel(value)) { + throw new Meteor.Error('error-invalid-sidepanel'); + } + }, + async roomType({ userId, room, value }) { if (value === room.t) { return; @@ -213,6 +232,11 @@ const settingSavers: RoomSettingsSavers = { await saveRoomTopic(rid, value, user); } }, + async sidepanel({ value, rid, room }) { + if (JSON.stringify(value) !== JSON.stringify(room.sidepanel)) { + await Rooms.setSidepanelById(rid, value); + } + }, async roomAnnouncement({ value, room, rid, user }) { if (!value && !room.announcement) { return; @@ -339,6 +363,7 @@ const fields: (keyof RoomSettings)[] = [ 'retentionOverrideGlobal', 'encrypted', 'favorite', + 'sidepanel', ]; const validate = ( diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts index 19e5fb2f9489..183cb789051f 100644 --- a/apps/meteor/app/lib/server/functions/createRoom.ts +++ b/apps/meteor/app/lib/server/functions/createRoom.ts @@ -112,6 +112,7 @@ export const createRoom = async ( readOnly?: boolean, roomExtraData?: Partial, options?: ICreateRoomParams['options'], + sidepanel?: ICreateRoomParams['sidepanel'], ): Promise< ICreatedRoom & { rid: string; @@ -187,6 +188,7 @@ export const createRoom = async ( }, ts: now, ro: readOnly === true, + sidepanel, }; if (teamId) { diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts index a4cd19a1c30a..f967068158f9 100644 --- a/apps/meteor/server/models/raw/Rooms.ts +++ b/apps/meteor/server/models/raw/Rooms.ts @@ -662,6 +662,10 @@ export class RoomsRaw extends BaseRaw implements IRoomsModel { return this.updateOne({ _id: roomId }, { $set: { name } }); } + setSidepanelById(roomId: IRoom['_id'], sidepanel: IRoom['sidepanel']): Promise { + return this.updateOne({ _id: roomId }, { $set: { sidepanel } }); + } + setFnameById(_id: IRoom['_id'], fname: IRoom['fname']): Promise { const query: Filter = { _id }; diff --git a/apps/meteor/server/services/room/service.ts b/apps/meteor/server/services/room/service.ts index b09dc865f928..3ba47284ddee 100644 --- a/apps/meteor/server/services/room/service.ts +++ b/apps/meteor/server/services/room/service.ts @@ -16,7 +16,7 @@ export class RoomService extends ServiceClassInternal implements IRoomService { protected name = 'room'; async create(uid: string, params: ICreateRoomParams): Promise { - const { type, name, members = [], readOnly, extraData, options } = params; + const { type, name, members = [], readOnly, extraData, options, sidepanel } = params; const hasPermission = await Authorization.hasPermission(uid, `create-${type}`); if (!hasPermission) { @@ -29,7 +29,7 @@ export class RoomService extends ServiceClassInternal implements IRoomService { } // TODO convert `createRoom` function to "raw" and move to here - return createRoom(type, name, user, members, false, readOnly, extraData, options) as unknown as IRoom; + return createRoom(type, name, user, members, false, readOnly, extraData, options, sidepanel) as unknown as IRoom; } async createDirectMessage({ to, from }: { to: string; from: string }): Promise<{ rid: string }> { diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts index f898b1775ae9..bc4211322b66 100644 --- a/apps/meteor/server/services/team/service.ts +++ b/apps/meteor/server/services/team/service.ts @@ -37,7 +37,10 @@ import { settings } from '../../../app/settings/server'; export class TeamService extends ServiceClassInternal implements ITeamService { protected name = 'team'; - async create(uid: string, { team, room = { name: team.name, extraData: {} }, members, owner }: ITeamCreateParams): Promise { + async create( + uid: string, + { team, room = { name: team.name, extraData: {} }, members, owner, sidepanel }: ITeamCreateParams, + ): Promise { if (!(await checkUsernameAvailability(team.name))) { throw new Error('team-name-already-exists'); } @@ -120,6 +123,7 @@ export class TeamService extends ServiceClassInternal implements ITeamService { teamId, teamMain: true, }, + sidepanel, }; const createdRoom = await Room.create(owner || uid, newRoom); diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts index a8d64b1f4c7d..d59d3722f1a4 100644 --- a/apps/meteor/tests/end-to-end/api/rooms.ts +++ b/apps/meteor/tests/end-to-end/api/rooms.ts @@ -2129,12 +2129,15 @@ describe('[Rooms]', () => { describe('rooms.saveRoomSettings', () => { let testChannel: IRoom; const randomString = `randomString${Date.now()}`; + const teamName = `team-${Date.now()}`; let discussion: IRoom; + let testTeam: ITeam; before(async () => { const result = await createRoom({ type: 'c', name: `channel.test.${Date.now()}-${Math.random()}` }); testChannel = result.body.channel; + const resTeam = await request.post(api('teams.create')).set(credentials).send({ name: teamName, type: 0 }); const resDiscussion = await request .post(api('rooms.createDiscussion')) .set(credentials) @@ -2143,10 +2146,17 @@ describe('[Rooms]', () => { t_name: `discussion-create-from-tests-${testChannel.name}`, }); + testTeam = resTeam.body.team; discussion = resDiscussion.body.discussion; }); - after(() => Promise.all([deleteRoom({ type: 'p', roomId: discussion._id }), deleteRoom({ type: 'p', roomId: testChannel._id })])); + after(() => + Promise.all([ + deleteRoom({ type: 'p', roomId: discussion._id }), + deleteTeam(credentials, testTeam.name), + deleteRoom({ type: 'p', roomId: testChannel._id }), + ]), + ); it('should update the room settings', (done) => { const imageDataUri = `data:image/png;base64,${fs.readFileSync(path.join(process.cwd(), imgURL)).toString('base64')}`; @@ -2290,6 +2300,64 @@ describe('[Rooms]', () => { expect(res.body.room).to.not.have.property('favorite'); }); }); + it('should update the team sidepanel items to channels and discussions', async () => { + const sidepanelItems = ['channels', 'discussions']; + const response = await request + .post(api('rooms.saveRoomSettings')) + .set(credentials) + .send({ + rid: testTeam.roomId, + sidepanel: { items: sidepanelItems }, + }) + .expect('Content-Type', 'application/json') + .expect(200); + + expect(response.body).to.have.property('success', true); + + const channelInfoResponse = await request + .get(api('channels.info')) + .set(credentials) + .query({ roomId: response.body.rid }) + .expect('Content-Type', 'application/json') + .expect(200); + + expect(channelInfoResponse.body).to.have.property('success', true); + expect(channelInfoResponse.body.channel).to.have.property('sidepanel'); + expect(channelInfoResponse.body.channel.sidepanel).to.have.property('items').that.is.an('array').to.have.deep.members(sidepanelItems); + }); + it('should throw error when updating team sidepanel with incorrect items', async () => { + const sidepanelItems = ['wrong']; + await request + .post(api('rooms.saveRoomSettings')) + .set(credentials) + .send({ + rid: testTeam.roomId, + sidepanel: { items: sidepanelItems }, + }) + .expect(400); + }); + it('should throw error when updating team sidepanel with more than 2 items', async () => { + const sidepanelItems = ['channels', 'discussions', 'extra']; + await request + .post(api('rooms.saveRoomSettings')) + .set(credentials) + .send({ + rid: testTeam.roomId, + sidepanel: { items: sidepanelItems }, + }) + .expect(400); + }); + it('should throw error when updating team sidepanel with duplicated items', async () => { + const sidepanelItems = ['channels', 'channels']; + await request + .post(api('rooms.saveRoomSettings')) + .set(credentials) + .send({ + rid: testTeam.roomId, + sidepanel: { items: sidepanelItems }, + }) + .expect(400); + }); }); describe('rooms.images', () => { diff --git a/apps/meteor/tests/end-to-end/api/teams.ts b/apps/meteor/tests/end-to-end/api/teams.ts index 99689650384d..425d0039e502 100644 --- a/apps/meteor/tests/end-to-end/api/teams.ts +++ b/apps/meteor/tests/end-to-end/api/teams.ts @@ -172,6 +172,84 @@ describe('[Teams]', () => { }) .end(done); }); + + it('should create a team with sidepanel items containing channels', async () => { + const teamName = `test-team-with-sidepanel-${Date.now()}`; + const sidepanelItems = ['channels']; + + const response = await request + .post(api('teams.create')) + .set(credentials) + .send({ + name: teamName, + type: 0, + sidepanel: { + items: sidepanelItems, + }, + }) + .expect('Content-Type', 'application/json') + .expect(200) + .expect((res) => { + expect(res.body).to.have.property('success', true); + }); + + await request + .get(api('channels.info')) + .set(credentials) + .query({ roomId: response.body.team.roomId }) + .expect('Content-Type', 'application/json') + .expect(200) + .expect((response) => { + expect(response.body).to.have.property('success', true); + expect(response.body.channel).to.have.property('sidepanel'); + expect(response.body.channel.sidepanel).to.have.property('items').that.is.an('array').to.have.deep.members(sidepanelItems); + }); + await deleteTeam(credentials, teamName); + }); + + it('should throw error when creating a team with sidepanel with more than 2 items', async () => { + await request + .post(api('teams.create')) + .set(credentials) + .send({ + name: `test-team-with-sidepanel-error-${Date.now()}`, + type: 0, + sidepanel: { + items: ['channels', 'discussion', 'other'], + }, + }) + .expect('Content-Type', 'application/json') + .expect(400); + }); + + it('should throw error when creating a team with sidepanel with incorrect items', async () => { + await request + .post(api('teams.create')) + .set(credentials) + .send({ + name: `test-team-with-sidepanel-error-${Date.now()}`, + type: 0, + sidepanel: { + items: ['other'], + }, + }) + .expect('Content-Type', 'application/json') + .expect(400); + }); + it('should throw error when creating a team with sidepanel with duplicated items', async () => { + await request + .post(api('teams.create')) + .set(credentials) + .send({ + name: `test-team-with-sidepanel-error-${Date.now()}`, + type: 0, + sidepanel: { + items: ['channels', 'channels'], + }, + }) + .expect('Content-Type', 'application/json') + .expect(400); + }); }); describe('/teams.convertToChannel', () => { diff --git a/packages/core-services/src/types/IRoomService.ts b/packages/core-services/src/types/IRoomService.ts index 3acb7edbfcbe..23186590af50 100644 --- a/packages/core-services/src/types/IRoomService.ts +++ b/packages/core-services/src/types/IRoomService.ts @@ -24,6 +24,7 @@ export interface ICreateRoomParams { readOnly?: boolean; extraData?: Partial; options?: ICreateRoomOptions; + sidepanel?: IRoom['sidepanel']; } export interface IRoomService { addMember(uid: string, rid: string): Promise; diff --git a/packages/core-services/src/types/ITeamService.ts b/packages/core-services/src/types/ITeamService.ts index 98747a385b59..2d67bf515fca 100644 --- a/packages/core-services/src/types/ITeamService.ts +++ b/packages/core-services/src/types/ITeamService.ts @@ -23,6 +23,7 @@ export interface ITeamCreateParams { room: ITeamCreateRoom; members?: Array | null; // list of user _ids owner?: string | null; // the team owner. If not present, owner = requester + sidepanel?: IRoom['sidepanel']; } export interface ITeamMemberParams { diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts index 4bc07c5a8ad4..442cac45fada 100644 --- a/packages/core-typings/src/IRoom.ts +++ b/packages/core-typings/src/IRoom.ts @@ -7,6 +7,8 @@ import type { IUser, Username } from './IUser'; import type { RoomType } from './RoomType'; type CallStatus = 'ringing' | 'ended' | 'declined' | 'ongoing'; +const sidepanelItemValues = ['channels', 'discussions'] as const; +export type SidepanelItem = (typeof sidepanelItemValues)[number]; export type RoomID = string; export type ChannelName = string; @@ -95,8 +97,28 @@ export interface IRoom extends IRocketChatRecord { customFields?: Record; usersWaitingForE2EKeys?: { userId: IUser['_id']; ts: Date }[]; + + sidepanel?: { + items: [SidepanelItem, SidepanelItem?]; + }; } +export const isSidepanelItem = (item: any): item is SidepanelItem => { + return sidepanelItemValues.includes(item); +}; + +export const isValidSidepanel = (sidepanel: IRoom['sidepanel']) => { + if (!sidepanel?.items) { + return false; + } + return ( + Array.isArray(sidepanel.items) && + sidepanel.items.length && + sidepanel.items.every(isSidepanelItem) && + sidepanel.items.length === new Set(sidepanel.items).size + ); +}; + export const isRoomWithJoinCode = (room: Partial): room is IRoomWithJoinCode => 'joinCodeRequired' in room && (room as any).joinCodeRequired === true; diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts index f9daef91dece..a88a5bde7f4e 100644 --- a/packages/model-typings/src/models/IRoomsModel.ts +++ b/packages/model-typings/src/models/IRoomsModel.ts @@ -119,6 +119,8 @@ export interface IRoomsModel extends IBaseModel { setRoomNameById(roomId: IRoom['_id'], name: IRoom['name']): Promise; + setSidepanelById(roomId: IRoom['_id'], sidepanel: IRoom['sidepanel']): Promise; + setFnameById(_id: IRoom['_id'], fname: IRoom['fname']): Promise; setRoomTopicById(roomId: IRoom['_id'], topic: IRoom['description']): Promise; diff --git a/packages/rest-typings/src/v1/teams/index.ts b/packages/rest-typings/src/v1/teams/index.ts index 0a1583b66474..d63e6da8bd8a 100644 --- a/packages/rest-typings/src/v1/teams/index.ts +++ b/packages/rest-typings/src/v1/teams/index.ts @@ -89,6 +89,7 @@ export type TeamsEndpoints = { }; }; owner?: IUser['_id']; + sidepanel?: IRoom['sidepanel']; }) => { team: ITeam; }; From 5660be253d204401ff1c80b65625f12376385f3e Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Tue, 6 Aug 2024 16:32:21 -0300 Subject: [PATCH 23/23] chore: Renders back button through prop in admin settings (#32987) --- .../client/views/admin/settings/GroupPage.tsx | 15 +++--- .../views/admin/settings/GroupSelector.tsx | 13 ++--- .../views/admin/settings/SettingsRoute.tsx | 5 +- .../admin/settings/groups/AssetsGroupPage.tsx | 8 +-- .../settings/groups/GenericGroupPage.tsx | 8 +-- .../admin/settings/groups/LDAPGroupPage.tsx | 7 ++- .../admin/settings/groups/OAuthGroupPage.tsx | 7 ++- .../admin/settings/groups/TabbedGroupPage.tsx | 7 +-- .../admin/settings/groups/VoipGroupPage.tsx | 8 ++- .../tests/e2e/administration-settings.spec.ts | 52 +++++++++++++++++++ apps/meteor/tests/e2e/administration.spec.ts | 30 ----------- 11 files changed, 100 insertions(+), 60 deletions(-) create mode 100644 apps/meteor/tests/e2e/administration-settings.spec.ts diff --git a/apps/meteor/client/views/admin/settings/GroupPage.tsx b/apps/meteor/client/views/admin/settings/GroupPage.tsx index a68daff979c9..5946805a497e 100644 --- a/apps/meteor/client/views/admin/settings/GroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/GroupPage.tsx @@ -1,8 +1,8 @@ import type { ISetting, ISettingColor } from '@rocket.chat/core-typings'; import { Accordion, Box, Button, ButtonGroup } from '@rocket.chat/fuselage'; -import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; +import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; -import { useToastMessageDispatch, useSettingsDispatch, useSettings, useTranslation, useRoute } from '@rocket.chat/ui-contexts'; +import { useToastMessageDispatch, useSettingsDispatch, useSettings, useTranslation } from '@rocket.chat/ui-contexts'; import type { ReactNode, FormEvent, MouseEvent } from 'react'; import React, { useMemo, memo } from 'react'; @@ -14,6 +14,7 @@ import GroupPageSkeleton from './GroupPageSkeleton'; type GroupPageProps = { children: ReactNode; headerButtons?: ReactNode; + onClickBack?: () => void; _id: string; i18nLabel: string; i18nDescription?: string; @@ -24,6 +25,7 @@ type GroupPageProps = { const GroupPage = ({ children = undefined, headerButtons = undefined, + onClickBack, _id, i18nLabel, i18nDescription = undefined, @@ -31,7 +33,6 @@ const GroupPage = ({ isCustom = false, }: GroupPageProps) => { const t = useTranslation(); - const router = useRoute('admin-settings'); const dispatch = useSettingsDispatch(); const dispatchToastMessage = useToastMessageDispatch(); @@ -56,7 +57,7 @@ const GroupPage = ({ const isColorSetting = (setting: ISetting): setting is ISettingColor => setting.type === 'color'; - const save = useMutableCallback(async () => { + const save = useEffectEvent(async () => { const changes = changedEditableSettings.map((setting) => { if (isColorSetting(setting)) { return { @@ -86,7 +87,7 @@ const GroupPage = ({ const dispatchToEditing = useEditableSettingsDispatch(); - const cancel = useMutableCallback(() => { + const cancel = useEffectEvent(() => { const settingsToDispatch = changedEditableSettings .map(({ _id }) => originalSettings.find((setting) => setting._id === _id)) .map((setting) => { @@ -118,8 +119,6 @@ const GroupPage = ({ save(); }; - const handleBack = useMutableCallback(() => router.push({})); - const handleCancelClick = (event: MouseEvent): void => { event.preventDefault(); cancel(); @@ -139,7 +138,7 @@ const GroupPage = ({ return ( - + {headerButtons} {tabs} diff --git a/apps/meteor/client/views/admin/settings/GroupSelector.tsx b/apps/meteor/client/views/admin/settings/GroupSelector.tsx index defe2a0a9a45..6d6d90a566eb 100644 --- a/apps/meteor/client/views/admin/settings/GroupSelector.tsx +++ b/apps/meteor/client/views/admin/settings/GroupSelector.tsx @@ -11,9 +11,10 @@ import VoipGroupPage from './groups/VoipGroupPage'; type GroupSelectorProps = { groupId: GroupId; + onClickBack?: () => void; }; -const GroupSelector = ({ groupId }: GroupSelectorProps) => { +const GroupSelector = ({ groupId, onClickBack }: GroupSelectorProps) => { const group = useSettingStructure(groupId); if (!group) { @@ -21,22 +22,22 @@ const GroupSelector = ({ groupId }: GroupSelectorProps) => { } if (groupId === 'Assets') { - return ; + return ; } if (groupId === 'OAuth') { - return ; + return ; } if (groupId === 'LDAP') { - return ; + return ; } if (groupId === 'Call_Center') { - return ; + return ; } - return ; + return ; }; export default GroupSelector; diff --git a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx index d0c0c0003778..c03aced8b5a0 100644 --- a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx +++ b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx @@ -1,4 +1,4 @@ -import { useRouteParameter, useIsPrivilegedSettingsContext } from '@rocket.chat/ui-contexts'; +import { useRouteParameter, useIsPrivilegedSettingsContext, useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React from 'react'; @@ -10,6 +10,7 @@ import SettingsPage from './SettingsPage'; export const SettingsRoute = (): ReactElement => { const hasPermission = useIsPrivilegedSettingsContext(); const groupId = useRouteParameter('group'); + const router = useRouter(); if (!hasPermission) { return ; @@ -21,7 +22,7 @@ export const SettingsRoute = (): ReactElement => { return ( - + router.navigate('/admin/settings')} /> ); }; diff --git a/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx index 6d4bb90e3d12..a5935eb47bc8 100644 --- a/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/AssetsGroupPage.tsx @@ -6,14 +6,16 @@ import { useEditableSettingsGroupSections } from '../../EditableSettingsContext' import GroupPage from '../GroupPage'; import Section from '../Section'; -type AssetsGroupPageProps = ISetting; +type AssetsGroupPageProps = ISetting & { + onClickBack?: () => void; +}; -function AssetsGroupPage({ _id, ...group }: AssetsGroupPageProps): ReactElement { +function AssetsGroupPage({ _id, onClickBack, ...group }: AssetsGroupPageProps): ReactElement { const sections = useEditableSettingsGroupSections(_id); const solo = sections.length === 1; return ( - + {sections.map((sectionName) => (

))} diff --git a/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx index 6f71ec9c1333..c9148547b955 100644 --- a/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/GenericGroupPage.tsx @@ -6,14 +6,16 @@ import { useEditableSettingsGroupSections } from '../../EditableSettingsContext' import GroupPage from '../GroupPage'; import Section from '../Section'; -type GenericGroupPageProps = ISetting; +type GenericGroupPageProps = ISetting & { + onClickBack?: () => void; +}; -function GenericGroupPage({ _id, ...props }: GenericGroupPageProps): ReactElement { +function GenericGroupPage({ _id, onClickBack, ...props }: GenericGroupPageProps): ReactElement { const sections = useEditableSettingsGroupSections(_id); const solo = sections.length === 1; return ( - + {sections.map((sectionName) => (
))} diff --git a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx index bea9ccd76222..a497738b9541 100644 --- a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx @@ -10,7 +10,11 @@ import { useExternalLink } from '../../../../hooks/useExternalLink'; import { useEditableSettings } from '../../EditableSettingsContext'; import TabbedGroupPage from './TabbedGroupPage'; -function LDAPGroupPage({ _id, ...group }: ISetting): JSX.Element { +type LDAPGroupPageProps = ISetting & { + onClickBack?: () => void; +}; + +function LDAPGroupPage({ _id, onClickBack, ...group }: LDAPGroupPageProps) { const t = useTranslation(); const dispatchToastMessage = useToastMessageDispatch(); const testConnection = useEndpoint('POST', '/v1/ldap.testConnection'); @@ -127,6 +131,7 @@ function LDAPGroupPage({ _id, ...group }: ISetting): JSX.Element { return ( diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx index 0bd65a3ad533..713a26935994 100644 --- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage.tsx @@ -12,9 +12,11 @@ import GroupPage from '../GroupPage'; import Section from '../Section'; import CreateOAuthModal from './CreateOAuthModal'; -type OAuthGroupPageProps = ISetting; +type OAuthGroupPageProps = ISetting & { + onClickBack?: () => void; +}; -function OAuthGroupPage({ _id, ...group }: OAuthGroupPageProps): ReactElement { +function OAuthGroupPage({ _id, onClickBack, ...group }: OAuthGroupPageProps): ReactElement { const sections = useEditableSettingsGroupSections(_id); const solo = sections.length === 1; const t = useTranslation(); @@ -95,6 +97,7 @@ function OAuthGroupPage({ _id, ...group }: OAuthGroupPageProps): ReactElement { diff --git a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx index f3546f13d758..eeecf9cc3800 100644 --- a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx @@ -12,9 +12,10 @@ import GenericGroupPage from './GenericGroupPage'; type TabbedGroupPageProps = ISetting & { headerButtons?: ReactElement; + onClickBack?: () => void; }; -function TabbedGroupPage({ _id, ...props }: TabbedGroupPageProps): JSX.Element { +function TabbedGroupPage({ _id, onClickBack, ...props }: TabbedGroupPageProps): JSX.Element { const t = useTranslation(); const tabs = useEditableSettingsGroupTabs(_id); @@ -25,7 +26,7 @@ function TabbedGroupPage({ _id, ...props }: TabbedGroupPageProps): JSX.Element { const solo = sections.length === 1; if (!tabs.length || (tabs.length === 1 && !tabs[0])) { - return ; + return ; } if (!tab && tabs[0]) { @@ -43,7 +44,7 @@ function TabbedGroupPage({ _id, ...props }: TabbedGroupPageProps): JSX.Element { ); return ( - + {sections.map((sectionName) => (
))} diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx index 82b55a152563..3b7c873f2268 100644 --- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx +++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage.tsx @@ -11,7 +11,11 @@ import GroupPage from '../GroupPage'; import Section from '../Section'; import VoipExtensionsPage from './voip/VoipExtensionsPage'; -function VoipGroupPage({ _id, ...group }: ISetting): JSX.Element { +type VoipGroupPageProps = ISetting & { + onClickBack?: () => void; +}; + +function VoipGroupPage({ _id, onClickBack, ...group }: VoipGroupPageProps) { const t = useTranslation(); const voipEnabled = useSetting('VoIP_Enabled'); @@ -46,7 +50,7 @@ function VoipGroupPage({ _id, ...group }: ISetting): JSX.Element { ); return ( - + {tab === 'Extensions' ? ( ExtensionsPageComponent ) : ( diff --git a/apps/meteor/tests/e2e/administration-settings.spec.ts b/apps/meteor/tests/e2e/administration-settings.spec.ts new file mode 100644 index 000000000000..d2996d6eac88 --- /dev/null +++ b/apps/meteor/tests/e2e/administration-settings.spec.ts @@ -0,0 +1,52 @@ +import { Users } from './fixtures/userStates'; +import { Admin } from './page-objects'; +import { getSettingValueById } from './utils'; +import { test, expect } from './utils/test'; + +test.use({ storageState: Users.admin.state }); + +test.describe.parallel('administration-settings', () => { + let poAdmin: Admin; + + test.beforeEach(async ({ page }) => { + poAdmin = new Admin(page); + }); + + test.describe('General', () => { + let inputSiteURLSetting: string; + + test.beforeAll(async ({ api }) => { + inputSiteURLSetting = (await getSettingValueById(api, 'Site_Url')) as string; + }); + + test.beforeEach(async ({ page }) => { + await page.goto('/admin/settings/General'); + }); + + test('should be able to reset a setting after a change', async () => { + await poAdmin.inputSiteURL.fill('any_text'); + await poAdmin.btnResetSiteURL.click(); + + await expect(poAdmin.inputSiteURL).toHaveValue(inputSiteURLSetting); + }); + + test('should be able to go back to the settings page', async ({ page }) => { + await poAdmin.btnBack.click(); + + await expect(page).toHaveURL('/admin/settings'); + }); + }); + + test.describe('Layout', () => { + test.beforeEach(async ({ page }) => { + await page.goto('/admin/settings/Layout'); + }); + + test('should code mirror full screen be displayed correctly', async ({ page }) => { + await poAdmin.getAccordionBtnByName('Custom CSS').click(); + await poAdmin.btnFullScreen.click(); + + await expect(page.getByRole('code')).toHaveCSS('width', '920px'); + }); + }); +}); diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts index 703c4a4bd8b1..45fee011efc3 100644 --- a/apps/meteor/tests/e2e/administration.spec.ts +++ b/apps/meteor/tests/e2e/administration.spec.ts @@ -319,34 +319,4 @@ test.describe.parallel('administration', () => { await expect(poAdmin.getIntegrationByName(incomingIntegrationName)).not.toBeVisible(); }); }); - - test.describe('Settings', () => { - test.describe('General', () => { - test.beforeEach(async ({ page }) => { - await page.goto('/admin/settings/General'); - }); - - test.afterAll(async ({ api }) => { - await setSettingValueById(api, 'Language', 'en'); - }); - - test('expect be able to reset a setting after a change', async () => { - await poAdmin.inputSiteURL.type('any_text'); - await poAdmin.btnResetSiteURL.click(); - }); - }); - - test.describe('Layout', () => { - test.beforeEach(async ({ page }) => { - await page.goto('/admin/settings/Layout'); - }); - - test('should code mirror full screen be displayed correctly', async ({ page }) => { - await poAdmin.getAccordionBtnByName('Custom CSS').click(); - await poAdmin.btnFullScreen.click(); - - await expect(page.getByRole('code')).toHaveCSS('width', '920px'); - }); - }); - }); });