Skip to content

Commit

Permalink
Merge branch 'feat/new-user-panel-pending' into feat/new-user-panel-a…
Browse files Browse the repository at this point in the history
…ctive
  • Loading branch information
rique223 authored Apr 8, 2024
2 parents 8721bda + a142a57 commit a5c9fa0
Show file tree
Hide file tree
Showing 355 changed files with 6,853 additions and 1,956 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.
2 changes: 1 addition & 1 deletion .changeset/fifty-cups-sort.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/rest-typings": patch
"@rocket.chat/rest-typings": minor
---

Created a new endpoint to get a filtered and paginated list of users.
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.

5 changes: 5 additions & 0 deletions .changeset/good-ghosts-doubt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Introduces a resizable Contextualbar allowing users to change the width just by dragging it
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
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.
2 changes: 1 addition & 1 deletion .changeset/pink-parrots-end.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/rest-typings": patch
"@rocket.chat/rest-typings": minor
---

Created a new endpoint to resend the welcome email to a given user
5 changes: 5 additions & 0 deletions .changeset/smart-squids-begin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes the missing space between name and user name on system messages
8 changes: 8 additions & 0 deletions .changeset/strange-rivers-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@rocket.chat/core-typings': minor
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Added support for allowing agents to forward inquiries to departments that may not have any online agents given that `Allow department to receive forwarded inquiries even when there's no available agents` is set to `true` in the department configuration.
This configuration empowers agents to seamlessly direct incoming requests to the designated department, ensuring efficient handling of queries even when departmental resources are not actively online. When an agent becomes available, any pending inquiries will be automatically routed to them if the routing algorithm supports it.
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
5 changes: 5 additions & 0 deletions .changeset/wild-keys-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/livechat": patch
---

Fixes issue causing a desync in different browser windows when a chat is closed and started again
16 changes: 6 additions & 10 deletions .github/actions/build-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ inputs:
required: false
description: 'Platform'
type: string
build-containers:
required: false
description: 'Containers to build along with Rocket.Chat'
type: string

runs:
using: composite
Expand Down Expand Up @@ -54,22 +58,14 @@ runs:
- name: Build Docker images
shell: bash
run: |
args=(rocketchat)
if [[ '${{ inputs.platform }}' = 'alpine' ]]; then
args+=($SERVICES_PUBLISH)
fi;
args=(rocketchat ${{ inputs.build-containers }})
docker compose -f docker-compose-ci.yml build "${args[@]}"
- name: Publish Docker images to GitHub Container Registry
if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
shell: bash
run: |
args=(rocketchat)
if [[ '${{ inputs.platform }}' = 'alpine' ]]; then
args+=($SERVICES_PUBLISH)
fi;
args=(rocketchat ${{ inputs.build-containers }})
docker compose -f docker-compose-ci.yml push "${args[@]}"
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
8 changes: 8 additions & 0 deletions .github/workflows/ci-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ jobs:
name: MongoDB ${{ matrix.mongodb-version }} (${{ matrix.shard }}/${{ inputs.total-shard }})

steps:
- name: Login to GitHub Container Registry
if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ secrets.CR_USER }}
password: ${{ secrets.CR_PAT }}

- name: Launch MongoDB
uses: supercharge/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ jobs:
RC_DOCKER_TAG: ${{ matrix.platform == 'alpine' && needs.release-versions.outputs.rc-docker-tag-alpine || needs.release-versions.outputs.rc-docker-tag }}
DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }}
LOWERCASE_REPOSITORY: ${{ needs.release-versions.outputs.lowercase-repo }}
SERVICES_PUBLISH: 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service'

strategy:
fail-fast: false
Expand All @@ -237,6 +236,7 @@ jobs:
CR_PAT: ${{ secrets.CR_PAT }}
node-version: ${{ needs.release-versions.outputs.node-version }}
platform: ${{ matrix.platform }}
build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}

build-gh-docker:
name: 🚢 Build Docker Images for Production
Expand All @@ -248,7 +248,6 @@ jobs:
RC_DOCKER_TAG: ${{ matrix.platform == 'alpine' && needs.release-versions.outputs.rc-docker-tag-alpine || needs.release-versions.outputs.rc-docker-tag }}
DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }}
LOWERCASE_REPOSITORY: ${{ needs.release-versions.outputs.lowercase-repo }}
SERVICES_PUBLISH: 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service'

strategy:
fail-fast: false
Expand All @@ -264,6 +263,7 @@ jobs:
CR_PAT: ${{ secrets.CR_PAT }}
node-version: ${{ needs.release-versions.outputs.node-version }}
platform: ${{ matrix.platform }}
build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}

- name: Rename official Docker tag to GitHub Container Registry
if: matrix.platform == 'official'
Expand Down
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
Loading

0 comments on commit a5c9fa0

Please sign in to comment.