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 10, 2023
2 parents ad72919 + 3df4d26 commit 6bd32a6
Show file tree
Hide file tree
Showing 776 changed files with 14,657 additions and 9,804 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/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
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
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/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
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/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/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/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
Validating CODEOWNERS rules …
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.

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
17 changes: 1 addition & 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 Down
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
rc-docker-tag-alpine: '${{ steps.docker.outputs.gh-docker-tag }}.alpine'
node-version: ${{ steps.var.outputs.node-version }}
# this is 100% intentional, secrets are not available for forks, so ee-tests will always fail
# to avoid this, we are using a dummy license, expiring at 2023-06-30
enterprise-license: Z2Dg0RC3kyxjuklSE6qfqyvD2xSD+oTYcS9OesJG0523r7rSPjv59LTQqPcp5E61qQYM3MOKoW3mDrurw4h78nVbsfrF2DoJZeNjRFQfIbgwcdPwtmnqPpDvAslszHY16VzM7O7EYqAqp/9mlnRzs1iJY+W3w1r6HWBlVMb9u41bl5HBSpX6Nxw8YxL4mizwOpjxewQbPQvNTLJNAW6w0nCzF5A3CKBhD9fziadedVMLOuXBuR8kIl8zbIAfqpHmL8SvakvQAbZEjWWQshmH+C9CKA5PppkmA8Q1DNWQoVtHSiYDK8RRjAEx+0oGflklzFyhJFDvD+ohZduNtNCgrJmxP5VFrVrLSK4BXgTSwwnaSKa2N+Qx0CmuRfu7nCPc1Cf6h6+k2TXvzkE4Z0ZJnDV1khu611glAr99bHdwF+bMX3XZI66bS8KqnHEukCt5xei25iKJ2xrfmGuiAkAuKHKzBmTEmXM0pGhkfDhA9jhxG3Atoj1A5y8vdrs88voF+UuNFZ6k9sKtdvrWIWClnkatPE+41ggbzCsOhFz07BvRWaEtw2Kenipl4Vtag4qmFpUaUfsuouH99M3gDlysDZO3x5aH8yfzvFeL5WDMvsmdEHNLpHl89WsPCONvx0JjRSdwcCA1NrRuVy1Ncu0S0bRByn7HZqoY9u6HPkXKBxQ=
# to avoid this, we are using a dummy license, expiring at 2024-06-30
enterprise-license: WMa5i+/t/LZbYOj8u3XUkivRhWBtWO6ycUjaZoVAw2DxMfdyBIAa2gMMI4x7Z2BrTZIZhFEImfOxcXcgD0QbXHGBJaMI+eYG+eofnVWi2VA7RWbpvWTULgPFgyJ4UEFeCOzVjcBLTQbmMSam3u0RlekWJkfAO0KnmLtsaEYNNA2rz1U+CLI/CdNGfdqrBu5PZZbGkH0KEzyIZMaykOjzvX+C6vd7fRxh23HecwhkBbqE8eQsCBt2ad0qC4MoVXsDaSOmSzGW+aXjuXt/9zjvrLlsmWQTSlkrEHdNkdywm0UkGxqz3+CP99n0WggUBioUiChjMuNMoceWvDvmxYP9Ml2NpYU7SnfhjmMFyXOah8ofzv8w509Y7XODvQBz+iB4Co9YnF3vT96HDDQyAV5t4jATE+0t37EAXmwjTi3qqyP7DLGK/revl+mlcwJ5kS4zZBsm1E4519FkXQOZSyWRnPdjqvh4mCLqoispZ49wKvklDvjPxCSP9us6cVXLDg7NTJr/4pfxLPOkvv7qCgugDvlDx17bXpQFPSDxmpw66FLzvb5Id0dkWjOzrRYSXb0bFWoUQjtHFzmcpFkyVhOKrQ9zA9+Zm7vXmU9Y2l2dK79EloOuHMSYAqsPEag8GMW6vI/cT4iIjHGGDePKnD0HblvTEKzql11cfT/abf2IiaY=
steps:
- uses: Bhacaz/checkout-files@v2
with:
Expand Down Expand Up @@ -259,6 +259,8 @@ jobs:
CR_USER: ${{ secrets.CR_USER }}
CR_PAT: ${{ secrets.CR_PAT }}
QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}

test-api-ee:
name: 🔨 Test API (EE)
Expand Down Expand Up @@ -307,6 +309,8 @@ jobs:
CR_USER: ${{ secrets.CR_USER }}
CR_PAT: ${{ secrets.CR_PAT }}
QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
REPORTER_ROCKETCHAT_API_KEY: ${{ secrets.REPORTER_ROCKETCHAT_API_KEY }}
REPORTER_ROCKETCHAT_URL: ${{ secrets.REPORTER_ROCKETCHAT_URL }}

tests-done:
name: ✅ Tests Done
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish Final Release
on:
push:
branches:
- master
- release-automation

concurrency: ${{ github.workflow }}-${{ github.ref }}

Expand All @@ -18,6 +18,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v3
with:
fetch-depth: 0
token: ${{ secrets.CI_PAT }}

- name: Setup NodeJS
Expand Down
32 changes: 14 additions & 18 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
name: Stale Questions

name: Close inactive issues
on:
schedule:
- cron: "0 */6 * * *"
- cron: "0 */6 * * *"

jobs:
no-response:
close-issues:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- uses: actions/stale@v4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 10
days-before-close: 4
only-labels: 'stat: need more info,stat: waiting response'
stale-issue-message: >-
This issue has been marked as stale because there has been
no further activity in the last 10 days. If the issue remains
stale for the next 4 days (a total of two weeks with no activity),
then it will be assumed that the question has been resolved and
the issue will be automatically closed.
stale-issue-label: 'stat: no response'
operations-per-run: 40
- uses: actions/stale@v5
with:
days-before-issue-stale: 10
days-before-issue-close: 4
any-of-labels: 'stat: need more info,stat: waiting response'
stale-issue-label: "stat: no response"
stale-issue-message: "This issue has been marked as stale because there has been no further activity in the last 10 days. If the issue remains stale for the next 4 days (a total of 14 days with no activity), then it will be assumed that the question has been resolved and the issue will be automatically closed."
close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
repo-token: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"typescript.tsdk": "./node_modules/typescript/lib",
"cSpell.words": [
"autotranslate",
"Contextualbar",
"fname",
"Gazzodown",
"katex",
Expand Down
13 changes: 13 additions & 0 deletions .yarn/patches/preact-npm-10.15.1-bd458de913.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/index.d.ts b/src/index.d.ts
index c57fcb6f6f3734d182313c324de9b28e6dcee68d..b7602c71e9f4b4254f4056fb598ef72ab157c921 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -110,7 +110,7 @@ export interface ComponentConstructor<P = {}, S = {}>
// Type alias for a component instance considered generally, whether stateless or stateful.
export type AnyComponent<P = {}, S = {}> =
| FunctionComponent<P>
- | Component<P, S>;
+ | ComponentConstructor<P, S>;

export interface Component<P = {}, S = {}> {
componentWillMount?(): void;
Loading

0 comments on commit 6bd32a6

Please sign in to comment.