Skip to content

Commit

Permalink
Merge branch 'RocketChat:develop' into PRTour1
Browse files Browse the repository at this point in the history
  • Loading branch information
AdityaSingh-02 authored Jul 23, 2023
2 parents cb2980a + b011c17 commit 2ba4dd0
Show file tree
Hide file tree
Showing 1,251 changed files with 21,216 additions and 17,084 deletions.
5 changes: 5 additions & 0 deletions .changeset/call-management-permission.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

fix: Permission to start conference calls was not being considered
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "RocketChat/Rocket.Chat" }],
"changelog": "@changesets/changelog-git",
"commit": false,
"fixed": [
["@rocket.chat/meteor", "@rocket.chat/core-typings", "@rocket.chat/rest-typings"]
Expand Down
6 changes: 6 additions & 0 deletions .changeset/cuddly-ties-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/fuselage-ui-kit": minor
"@rocket.chat/uikit-playground": minor
---

feat: Add missing variants to UIKit button
5 changes: 5 additions & 0 deletions .changeset/dirty-crabs-deliver.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Prevent app's bridges from overriding the lastMsg prop which further was affecting Omni-Visitor abandonment feature for app
6 changes: 6 additions & 0 deletions .changeset/dirty-singers-promise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/rest-typings": minor
---

feat: Add custom OAuth setting to allow merging users to others from distinct services
5 changes: 5 additions & 0 deletions .changeset/dull-rockets-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

regression: `onLogin` hook not destructuring user prop
5 changes: 5 additions & 0 deletions .changeset/empty-ants-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

fix: Wrong toast message while creating a new custom sound with an existing name
6 changes: 6 additions & 0 deletions .changeset/fair-rivers-occur.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/rest-typings': minor
'@rocket.chat/meteor': minor
---

feat: Introduce Feature Preview page
5 changes: 5 additions & 0 deletions .changeset/friendly-glasses-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

fix: Time format of Retention Policy
6 changes: 6 additions & 0 deletions .changeset/funny-coins-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/model-typings": patch
---

Fixed a problem where disabled department agent's where still being activated when applicable business hours met.
5 changes: 5 additions & 0 deletions .changeset/fuzzy-parents-drop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Fix Toggle message box formatting toolbar on click
6 changes: 6 additions & 0 deletions .changeset/great-brooms-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/rest-typings": patch
---

fix: Omnichannel Tags available to be used in the wrong department
5 changes: 5 additions & 0 deletions .changeset/green-icons-smash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Avatar is reset in the UI when username is changed
5 changes: 5 additions & 0 deletions .changeset/hip-hornets-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixed `room-opened` event not dispatching when navigating cached rooms
5 changes: 5 additions & 0 deletions .changeset/hip-mugs-promise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

improve: System messages for omni-visitor abandonment feature
5 changes: 5 additions & 0 deletions .changeset/itchy-hotels-care.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixed video message button disabled on iOS browsers
5 changes: 5 additions & 0 deletions .changeset/kind-coats-worry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed Canned Response custom tags breaking the GUI on enterprise
5 changes: 5 additions & 0 deletions .changeset/lazy-ghosts-design.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed misleading of 'total' in team members list inside Channel
6 changes: 6 additions & 0 deletions .changeset/loud-sheep-try.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/fuselage-ui-kit": minor
"@rocket.chat/uikit-playground": minor
---

feat: Adding new UIKit components: Callout, Checkbox, Radio Button, Time Picker, Toast Bar, Toggle Switch, Tab Navigation
6 changes: 6 additions & 0 deletions .changeset/mentions-emoji-emphasis.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/gazzodown': minor
---

Fixed mentions and emojis inside inside bold, italic or strikethrough texts

5 changes: 5 additions & 0 deletions .changeset/modern-geese-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Last message appears in extended view after deletion
5 changes: 5 additions & 0 deletions .changeset/nine-yaks-draw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/release-action': minor
---

Use `release-automation` branch to perform the release
5 changes: 5 additions & 0 deletions .changeset/olive-pears-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/ui-client': patch
---

Fixed required custom fields considering blank spaces as valid.
7 changes: 7 additions & 0 deletions .changeset/popular-donkeys-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/fuselage-ui-kit": minor
"@rocket.chat/uikit-playground": minor
---

feat: Introduce contextualBar surface renderer for UiKit blocks
6 changes: 6 additions & 0 deletions .changeset/quick-coats-protect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/model-typings": patch
---

fix: newly added agent not following business hours
5 changes: 5 additions & 0 deletions .changeset/rare-dingos-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Close message composer popup on sending message
6 changes: 6 additions & 0 deletions .changeset/rotten-spoons-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/model-typings": patch
---

Fixed logic around Default Business Hours where agents from disabled/archived departments where being omitted from processing at closing time
6 changes: 6 additions & 0 deletions .changeset/rude-insects-speak.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/fuselage-ui-kit': minor
'@rocket.chat/meteor': minor
---

Introducing i18n to UiKit text renderers
5 changes: 5 additions & 0 deletions .changeset/silver-mugs-unite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: show requested filters only on requested apps view
5 changes: 5 additions & 0 deletions .changeset/smooth-hotels-hunt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed Canned Responses text editor having no contrast in dark mode.
5 changes: 5 additions & 0 deletions .changeset/soft-yaks-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

feat: return all broken password policies at once
5 changes: 5 additions & 0 deletions .changeset/spicy-kiwis-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Omnichannel queue not running for all queues
5 changes: 5 additions & 0 deletions .changeset/strong-trains-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/livechat': patch
---

Storybook adjustments, TypeScript migration, and minor fixes
5 changes: 5 additions & 0 deletions .changeset/thin-hats-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Avoid updating a user's livechat status on login when its status is set to offline
6 changes: 6 additions & 0 deletions .changeset/thirty-lobsters-vanish.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/model-typings": patch
---

Update database query to only update online & unavailable agents when opening & closing business hours
5 changes: 5 additions & 0 deletions .changeset/tidy-bears-camp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Introduced upsells for the engagement dashboard and device management admin sidebar items in CE workspaces. Additionally, restructured the admin sidebar items to enhance organization.
5 changes: 5 additions & 0 deletions .changeset/timeFormat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed different time formats at different places
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
/apps/meteor/app/sms @RocketChat/omnichannel
/apps/meteor/server @RocketChat/backend
/apps/meteor/server/models @RocketChat/Architecture
apps/meteor/server/startup/migrations @RocketChat/Architecture
/apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel
/apps/meteor/server/services/voip @RocketChat/omnichannel
/apps/meteor/server/services/omnichannel-voip @RocketChat/omnichannel
Expand Down
51 changes: 0 additions & 51 deletions .github/workflows/changesets.yml

This file was deleted.

11 changes: 11 additions & 0 deletions .github/workflows/ci-code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,17 @@ jobs:
if: matrix.check == 'ts'
run: yarn turbo run typecheck

- name: Cache eslint
uses: actions/cache@v3
if: matrix.check == 'lint'
with:
path: ./apps/meteor/.eslintcache
key: eslintcache-cache-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}-${{ github.event.issue.number }}
restore-keys: |
eslintcache-cache-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}
eslintcache-cache-${{ runner.OS }}
eslintcache-cache
- name: Lint
if: matrix.check == 'lint'
run: yarn lint
9 changes: 9 additions & 0 deletions .github/workflows/ci-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ on:
required: true
QASE_API_TOKEN:
required: false
REPORTER_ROCKETCHAT_URL:
required: false
REPORTER_ROCKETCHAT_API_KEY:
required: false

env:
MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
Expand Down Expand Up @@ -243,6 +247,11 @@ jobs:
env:
E2E_COVERAGE: ${{ inputs.release == 'ee' && 'true' || '' }}
IS_EE: ${{ inputs.release == 'ee' && 'true' || '' }}
REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}
REPORTER_ROCKETCHAT_REPORT: ${{ github.ref == 'refs/heads/develop' && 'true' || '' }}
REPORTER_ROCKETCHAT_BRANCH: ${{ github.ref }}
REPORTER_ROCKETCHAT_DRAFT: ${{ github.event.pull_request.draft }}
QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
QASE_REPORT: ${{ github.ref == 'refs/heads/develop' && 'true' || '' }}
working-directory: ./apps/meteor
Expand Down
22 changes: 6 additions & 16 deletions .github/workflows/ci-test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ on:
node-version:
required: true
type: string
mongodb-version:
default: "['4.4', '6.0']"
required: false
type: string

env:
MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
Expand All @@ -19,20 +15,9 @@ jobs:
test:
runs-on: ubuntu-20.04

strategy:
fail-fast: false
matrix:
mongodb-version: ${{ fromJSON(inputs.mongodb-version) }}

name: MongoDB ${{ matrix.mongodb-version }}
name: Unit Tests

steps:
- name: Launch MongoDB
uses: supercharge/[email protected]
with:
mongodb-version: ${{ matrix.mongodb-version }}
mongodb-replica-set: rs0

- uses: actions/checkout@v3

- name: Setup NodeJS
Expand All @@ -46,3 +31,8 @@ jobs:

- name: Unit Test
run: yarn testunit

- uses: codecov/codecov-action@v3
with:
flags: unit
verbose: true
Loading

0 comments on commit 2ba4dd0

Please sign in to comment.