Skip to content

Commit

Permalink
Merge branch 'develop' into attachmentMessage
Browse files Browse the repository at this point in the history
* develop: (71 commits)
  fix: search room not reactive after room name changes (#32123)
  test: fix `should edit name of targetChannel` flaky test (#32121)
  fix: UI allowing to mark room as favorite despite room was not a `default` room (#32063)
  chore: Remove duplicated `ChannelDeletionTable` (#32114)
  test(livechat): fix Department flaky test (#32102)
  test(livechat): File upload settings (#32060)
  test: contact center after hook calling wrong endpoint (#32094)
  fix(livechat): registering guest multiple times cause message loss (#32069)
  test: allow csp for livechat tests (#32116)
  chore: Move portals to the portals folder (#32090)
  test: `InitialData.insertAdminUserFromEnv` (#32066)
  fix: `CSP` error right after `setInlineScriptsAllowed` (#32108)
  chore: Create/Edit room consistency (#31960)
  chore: Remove references to EE code from the app events (#31926)
  test(Livechat): Clean up after registerGuest() test (#32092)
  test: make presence api tests fully independent (#31782)
  test: make roles fully independent (#31783)
  chore: bump version to 7.0.0-develop
  test: make login api tests fully independent (#31786)
  fix!: api login should not suggest which credential is wrong (#32086)
  ...
  • Loading branch information
gabriellsh committed Apr 4, 2024
2 parents 867195a + 3c5d4ff commit dc83009
Show file tree
Hide file tree
Showing 300 changed files with 6,336 additions and 1,625 deletions.
11 changes: 11 additions & 0 deletions .changeset/clean-cars-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/core-typings": minor
"@rocket.chat/livechat": minor
---

**Added the ability for premium workspaces to hide Rocket.Chat's watermark as well as change the Livechat widget's logo**

The new settings (named below) can be found in the Omnichannel workspace settings within the livechat section.
- Hide "powered by Rocket.Chat"
- Livechat widget logo (svg, png, jpg)
6 changes: 6 additions & 0 deletions .changeset/cyan-shoes-fly.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/livechat": minor
---

Added Livechat setting `Hide system messages` & API method `setHiddenSystemMessages`, to customize system message visibility within the widget.
7 changes: 7 additions & 0 deletions .changeset/fuzzy-cherries-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": major
---

Api login should not suggest which credential is wrong (password/username)

Failed login attemps will always return `Unauthorized` instead of the internal fail reason
16 changes: 16 additions & 0 deletions .changeset/fuzzy-vans-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/livechat": minor
---

Improved Livechat's theming capabilities


| Name (`setTheme`, `initialize`) | Workspace setting | Default value | Description |
|---------------------------------|----------------------------------------|---------------|-------------|
| `position` | Livechat widget position on the screen | `right` | Changes the widget position on the screen. Can be `left` or `right` |
| `background` | Livechat background | `N/A` | Changes the message list background. Accepts the same values as the CSS property [background](https://developer.mozilla.org/en-US/docs/Web/CSS/background) |
| `guestBubbleBackgroundColor` | `N/A` | `N/A` | Changes the guest's message bubble background color |
| `agentBubbleBackgroundColor` | `N/A` | `N/A` | Changes the agent's message bubble background color |
| `hideGuestAvatar` | `N/A` | `false` | Hides/shows the guest avatar |
| `hideAgentAvatar` | `N/A` | `true` | Hides/shows the agent avatar |
13 changes: 13 additions & 0 deletions .changeset/good-baboons-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/rest-typings": minor
---

**Added Livechat's new theming settings to Appearance page (available for Premium workspaces)**

Newly added settings are:
- `Livechat widget position on the screen`: Changes the widget position between left or right of the viewport
- `Livechat background`: Changes the message list background. Receives the same value as the CSS's background property.
- `Hide system messages`: Changes the visibility of system messages displayed on the widget.
- `Hide "powered by Rocket.Chat"`: Changes the visibility of Rocket.Chat's watermark on the widget.

6 changes: 6 additions & 0 deletions .changeset/happy-pillows-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/model-typings": patch
---

Changed logic that process custom fields from visitors when updating its data, making the process more reliable and faster.
5 changes: 5 additions & 0 deletions .changeset/long-phones-reflect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixed a small issue that was causing the room layout to shift when loading apps messages
5 changes: 5 additions & 0 deletions .changeset/lovely-berries-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Allowed upload of `lst` files
6 changes: 6 additions & 0 deletions .changeset/nine-houses-reply.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/livechat": patch
---

Livechat: A registered user loses their messages if 'registerGuest' is called using the same token.
6 changes: 6 additions & 0 deletions .changeset/pink-ants-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
---

Fixed a UI issue that allowed a user to "mark" a room as favorite even when a room was not default. The Back-End was correctly ignoring the `favorite` property from being updated when the room was not default, but the UI still allowed users to try.
As UI allowed but changes were not saved, this gave the impression that the function was not working.
6 changes: 6 additions & 0 deletions .changeset/polite-cars-love.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/livechat": patch
---

Fixes issue where the livechat offline form would render even when disabled
5 changes: 5 additions & 0 deletions .changeset/strong-bananas-flash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed duplicate API calls during livechat room forwarding by adding loading state for submit button
5 changes: 5 additions & 0 deletions .changeset/sweet-books-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixed search room not showing the new name room name changes
8 changes: 8 additions & 0 deletions .changeset/thirty-berries-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@rocket.chat/meteor": patch
---

**Added tag to premium settings in CE workspaces**

A premium tag will be displayed alongside the setting label for premium exclusive settings in CE workspaces.
This will bring visibility for users of our premium features while also informing them of the reason why the setting is currently disabled.
5 changes: 5 additions & 0 deletions .changeset/thirty-ducks-smell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/models": patch
---

Fix proxified model props were missing context before attribution
9 changes: 9 additions & 0 deletions .changeset/tough-doors-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@rocket.chat/meteor": patch
---

Introduced a new step to the queue worker: when an inquiry that's on an improper status is selected for processing, queue worker will first check its status and will attempt to fix it.
For example, if an inquiry points to a closed room, there's no point in processing, system will now remove the inquiry
If an inquiry is already taken, the inquiry will be updated to reflect the new status and clean the queue.

This prevents issues where the queue worker attempted to process an inquiry _forever_ because it was in an improper state.
5 changes: 5 additions & 0 deletions .changeset/twenty-dolls-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fix error during migration 304. Throwing `Cannot read property 'finally' of undefined` error.
6 changes: 6 additions & 0 deletions .changeset/two-suns-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

feat: `ConnectionStatusBar` redesign
1 change: 0 additions & 1 deletion .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,5 @@ runs:
cache: 'yarn'

- name: yarn install
if: steps.cache-node-modules.outputs.cache-hit != 'true'
shell: bash
run: yarn
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"oauthapps",
"omnichannel",
"photoswipe",
"proxify",
"searchbox",
"tmid",
"tshow"
Expand Down
184 changes: 184 additions & 0 deletions apps/meteor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,189 @@
# @rocket.chat/meteor

## 6.6.6

### Patch Changes

- Bump @rocket.chat/meteor version.

- Bump @rocket.chat/meteor version.

- ([#32064](https://github.com/RocketChat/Rocket.Chat/pull/32064)) Fix an issue affecting Rocket.Chat Apps utilizing the OAuth 2 library from Apps Engine, ensuring that apps like Google Drive and Google Calendar are operational once more.

- ([#32056](https://github.com/RocketChat/Rocket.Chat/pull/32056)) Fix error during migration 304. Throwing `Cannot read property 'finally' of undefined` error.

- <details><summary>Updated dependencies [ada096901a]:</summary>

- @rocket.chat/models@0.0.34
- @rocket.chat/omnichannel-services@0.1.10
- @rocket.chat/presence@0.1.10
- @rocket.chat/core-services@0.3.10
- @rocket.chat/cron@0.0.30
- @rocket.chat/instance-status@0.0.34
- @rocket.chat/core-typings@6.6.6
- @rocket.chat/rest-typings@6.6.6
- @rocket.chat/api-client@0.1.28
- @rocket.chat/license@0.1.10
- @rocket.chat/pdf-worker@0.0.34
- @rocket.chat/gazzodown@4.0.6
- @rocket.chat/model-typings@0.3.6
- @rocket.chat/ui-contexts@4.0.6
- @rocket.chat/server-cloud-communication@0.0.2
- @rocket.chat/fuselage-ui-kit@4.0.6
- @rocket.chat/ui-theming@0.1.2
- @rocket.chat/ui-client@4.0.6
- @rocket.chat/ui-video-conf@4.0.6
- @rocket.chat/web-ui-registration@4.0.6
</details>

## 6.6.5

### Patch Changes

- Bump @rocket.chat/meteor version.

- Bump @rocket.chat/meteor version.

- ([#31998](https://github.com/RocketChat/Rocket.Chat/pull/31998)) Introduced a new step to the queue worker: when an inquiry that's on an improper status is selected for processing, queue worker will first check its status and will attempt to fix it.
For example, if an inquiry points to a closed room, there's no point in processing, system will now remove the inquiry
If an inquiry is already taken, the inquiry will be updated to reflect the new status and clean the queue.

This prevents issues where the queue worker attempted to process an inquiry _forever_ because it was in an improper state.

- <details><summary>Updated dependencies []:</summary>

- @rocket.chat/ui-contexts@4.0.5
- @rocket.chat/ui-theming@0.1.2
- @rocket.chat/fuselage-ui-kit@4.0.5
- @rocket.chat/gazzodown@4.0.5
- @rocket.chat/ui-client@4.0.5
- @rocket.chat/ui-video-conf@4.0.5
- @rocket.chat/web-ui-registration@4.0.5
- @rocket.chat/core-typings@6.6.5
- @rocket.chat/rest-typings@6.6.5
- @rocket.chat/api-client@0.1.27
- @rocket.chat/license@0.1.9
- @rocket.chat/omnichannel-services@0.1.9
- @rocket.chat/pdf-worker@0.0.33
- @rocket.chat/presence@0.1.9
- @rocket.chat/core-services@0.3.9
- @rocket.chat/cron@0.0.29
- @rocket.chat/model-typings@0.3.5
- @rocket.chat/server-cloud-communication@0.0.2
- @rocket.chat/models@0.0.33
- @rocket.chat/instance-status@0.0.33
</details>

## 6.6.4

### Patch Changes

- Bump @rocket.chat/meteor version.

- Bump @rocket.chat/meteor version.

- ([#31700](https://github.com/RocketChat/Rocket.Chat/pull/31700)) Fixed matrix homeserver domain setting not being visible in admin panel

- ([#32012](https://github.com/RocketChat/Rocket.Chat/pull/32012)) Don't use the registration.yaml file to configure Matrix Federation anymore.

- ([#31927](https://github.com/RocketChat/Rocket.Chat/pull/31927)) `stopped` lifecycle method was unexpectedly synchronous when using microservices, causing our code to create race conditions.

- <details><summary>Updated dependencies [c2872a93f2]:</summary>

- @rocket.chat/core-services@0.3.8
- @rocket.chat/omnichannel-services@0.1.8
- @rocket.chat/presence@0.1.8
- @rocket.chat/core-typings@6.6.4
- @rocket.chat/rest-typings@6.6.4
- @rocket.chat/api-client@0.1.26
- @rocket.chat/license@0.1.8
- @rocket.chat/pdf-worker@0.0.32
- @rocket.chat/cron@0.0.28
- @rocket.chat/gazzodown@4.0.4
- @rocket.chat/model-typings@0.3.4
- @rocket.chat/ui-contexts@4.0.4
- @rocket.chat/server-cloud-communication@0.0.2
- @rocket.chat/fuselage-ui-kit@4.0.4
- @rocket.chat/models@0.0.32
- @rocket.chat/ui-theming@0.1.2
- @rocket.chat/ui-client@4.0.4
- @rocket.chat/ui-video-conf@4.0.4
- @rocket.chat/web-ui-registration@4.0.4
- @rocket.chat/instance-status@0.0.32
</details>

## 6.6.3

### Patch Changes

- Bump @rocket.chat/meteor version.

- Bump @rocket.chat/meteor version.

- ([#31895](https://github.com/RocketChat/Rocket.Chat/pull/31895)) Fix users presence stuck as online after connecting using mobile apps

- <details><summary>Updated dependencies []:</summary>

- @rocket.chat/core-typings@6.6.3
- @rocket.chat/rest-typings@6.6.3
- @rocket.chat/api-client@0.1.25
- @rocket.chat/license@0.1.7
- @rocket.chat/omnichannel-services@0.1.7
- @rocket.chat/pdf-worker@0.0.31
- @rocket.chat/presence@0.1.7
- @rocket.chat/core-services@0.3.7
- @rocket.chat/cron@0.0.27
- @rocket.chat/gazzodown@4.0.3
- @rocket.chat/model-typings@0.3.3
- @rocket.chat/ui-contexts@4.0.3
- @rocket.chat/server-cloud-communication@0.0.2
- @rocket.chat/fuselage-ui-kit@4.0.3
- @rocket.chat/models@0.0.31
- @rocket.chat/ui-theming@0.1.2
- @rocket.chat/ui-client@4.0.3
- @rocket.chat/ui-video-conf@4.0.3
- @rocket.chat/web-ui-registration@4.0.3
- @rocket.chat/instance-status@0.0.31
</details>

## 6.6.2

### Patch Changes

- Bump @rocket.chat/meteor version.

- Bump @rocket.chat/meteor version.

- ([#31844](https://github.com/RocketChat/Rocket.Chat/pull/31844)) Fixed Federation not working with Microservice deployments

- ([#31823](https://github.com/RocketChat/Rocket.Chat/pull/31823)) Revert unintentional changes real time presence data payload

- ([#31833](https://github.com/RocketChat/Rocket.Chat/pull/31833)) Fix web UI not showing users presence updating to offline

- <details><summary>Updated dependencies []:</summary>

- @rocket.chat/ui-contexts@4.0.2
- @rocket.chat/ui-theming@0.1.2
- @rocket.chat/fuselage-ui-kit@4.0.2
- @rocket.chat/gazzodown@4.0.2
- @rocket.chat/ui-client@4.0.2
- @rocket.chat/ui-video-conf@4.0.2
- @rocket.chat/web-ui-registration@4.0.2
- @rocket.chat/core-typings@6.6.2
- @rocket.chat/rest-typings@6.6.2
- @rocket.chat/api-client@0.1.24
- @rocket.chat/license@0.1.6
- @rocket.chat/omnichannel-services@0.1.6
- @rocket.chat/pdf-worker@0.0.30
- @rocket.chat/presence@0.1.6
- @rocket.chat/core-services@0.3.6
- @rocket.chat/cron@0.0.26
- @rocket.chat/model-typings@0.3.2
- @rocket.chat/server-cloud-communication@0.0.2
- @rocket.chat/models@0.0.30
- @rocket.chat/instance-status@0.0.30
</details>

## 6.6.1

### Patch Changes
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/app/api/server/v1/rooms.ts
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ API.v1.addRoute(
{
async post() {
// eslint-disable-next-line @typescript-eslint/naming-convention
const { prid, pmid, reply, t_name, users, encrypted } = this.bodyParams;
const { prid, pmid, reply, t_name, users, encrypted, topic } = this.bodyParams;
if (!prid) {
return API.v1.failure('Body parameter "prid" is required.');
}
Expand All @@ -346,6 +346,7 @@ API.v1.addRoute(
reply,
users: users?.filter(isTruthy) || [],
encrypted,
topic,
});

return API.v1.success({ discussion });
Expand Down
Loading

0 comments on commit dc83009

Please sign in to comment.