Skip to content

Commit e1347e7

Browse files
Merge branch 'develop' into user-info-Migration
2 parents 0cfda21 + 3c30636 commit e1347e7

406 files changed

Lines changed: 8509 additions & 9975 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/little-eyes-kneel.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
---
2+
'@rocket.chat/eslint-config': minor
3+
'@rocket.chat/server-cloud-communication': patch
4+
'@rocket.chat/omnichannel-services': patch
5+
'@rocket.chat/omnichannel-transcript': patch
6+
'@rocket.chat/authorization-service': patch
7+
'@rocket.chat/federation-matrix': patch
8+
'@rocket.chat/web-ui-registration': patch
9+
'@rocket.chat/network-broker': patch
10+
'@rocket.chat/password-policies': patch
11+
'@rocket.chat/release-changelog': patch
12+
'@rocket.chat/storybook-config': patch
13+
'@rocket.chat/presence-service': patch
14+
'@rocket.chat/omni-core-ee': patch
15+
'@rocket.chat/fuselage-ui-kit': patch
16+
'@rocket.chat/instance-status': patch
17+
'@rocket.chat/media-signaling': patch
18+
'@rocket.chat/patch-injection': patch
19+
'@rocket.chat/account-service': patch
20+
'@rocket.chat/media-calls': patch
21+
'@rocket.chat/message-parser': patch
22+
'@rocket.chat/mock-providers': patch
23+
'@rocket.chat/release-action': patch
24+
'@rocket.chat/pdf-worker': patch
25+
'@rocket.chat/ui-theming': patch
26+
'@rocket.chat/account-utils': patch
27+
'@rocket.chat/core-services': patch
28+
'@rocket.chat/message-types': patch
29+
'@rocket.chat/model-typings': patch
30+
'@rocket.chat/mongo-adapter': patch
31+
'@rocket.chat/ui-video-conf': patch
32+
'@rocket.chat/uikit-playground': patch
33+
'@rocket.chat/cas-validate': patch
34+
'@rocket.chat/core-typings': patch
35+
'@rocket.chat/jest-presets': patch
36+
'@rocket.chat/peggy-loader': patch
37+
'@rocket.chat/rest-typings': patch
38+
'@rocket.chat/server-fetch': patch
39+
'@rocket.chat/ddp-streamer': patch
40+
'@rocket.chat/queue-worker': patch
41+
'@rocket.chat/presence': patch
42+
'@rocket.chat/apps-engine': patch
43+
'@rocket.chat/desktop-api': patch
44+
'@rocket.chat/http-router': patch
45+
'@rocket.chat/poplib': patch
46+
'@rocket.chat/ui-composer': patch
47+
'@rocket.chat/ui-contexts': patch
48+
'@rocket.chat/license': patch
49+
'@rocket.chat/api-client': patch
50+
'@rocket.chat/ddp-client': patch
51+
'@rocket.chat/log-format': patch
52+
'@rocket.chat/gazzodown': patch
53+
'@rocket.chat/omni-core': patch
54+
'@rocket.chat/ui-avatar': patch
55+
'@rocket.chat/ui-client': patch
56+
'@rocket.chat/livechat': patch
57+
'@rocket.chat/abac': patch
58+
'@rocket.chat/favicon': patch
59+
'@rocket.chat/tracing': patch
60+
'@rocket.chat/ui-voip': patch
61+
'@rocket.chat/agenda': patch
62+
'@rocket.chat/base64': patch
63+
'@rocket.chat/logger': patch
64+
'@rocket.chat/models': patch
65+
'@rocket.chat/random': patch
66+
'@rocket.chat/sha256': patch
67+
'@rocket.chat/ui-kit': patch
68+
'@rocket.chat/tools': patch
69+
'@rocket.chat/apps': patch
70+
'@rocket.chat/cron': patch
71+
'@rocket.chat/i18n': patch
72+
'@rocket.chat/jwt': patch
73+
'@rocket.chat/meteor': patch
74+
---
75+
76+
chore(eslint): Upgrades ESLint and its configuration

.changeset/nine-otters-hug.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/rest-typings': minor
3+
'@rocket.chat/meteor': minor
4+
---
5+
6+
migrated rooms.delete endpoint to new OpenAPI pattern with AJV validation

.changeset/pretty-jobs-juggle.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@rocket.chat/rest-typings': minor
3+
'@rocket.chat/meteor': minor
4+
---
5+
6+
Adds OpenAPI support for the Rocket.Chat e2e.updateGroupKey endpoints by migrating to a modern chained route definition syntax and utilizing shared AJV schemas for validation to enhance API documentation and ensure type safety through response validation.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@rocket.chat/meteor": minor
3+
"@rocket.chat/rest-typings": minor
4+
---
5+
6+
Add OpenAPI support for the Rocket.Chat e2e.fetchMyKeys endpoints by migrating to a modern chained route definition syntax and utilizing shared AJV schemas for validation to enhance API documentation and ensure type safety through response validation.

.changeset/tough-steaks-beam.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@rocket.chat/meteor': patch
3+
---
4+
5+
Fixes reactivity of Custom Sounds and Custom Emojis storage settings

.github/actions/update-version-durability/package-lock.json

Lines changed: 18 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/ci-code-check.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- uses: rharkor/caching-for-turbo@v1.8
4545

4646
- name: Restore packages build
47-
uses: actions/download-artifact@v7
47+
uses: actions/download-artifact@v8
4848
with:
4949
name: packages-build
5050
path: /tmp
@@ -56,7 +56,6 @@ jobs:
5656
5757
- name: Cache TypeCheck
5858
uses: actions/cache@v5
59-
if: matrix.check == 'ts'
6059
with:
6160
path: ./apps/meteor/tsconfig.typecheck.tsbuildinfo
6261
key: typecheck-cache-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}-${{ github.event.issue.number }}
@@ -66,7 +65,6 @@ jobs:
6665
typecheck-cache
6766
6867
- name: Install Meteor
69-
if: matrix.check == 'ts'
7068
shell: bash
7169
run: |
7270
# Restore bin from cache

.github/workflows/ci-test-e2e.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
# if building for production on develop branch or release, add suffix for coverage images
7575
DOCKER_TAG_SUFFIX_ROCKETCHAT: ${{ inputs.coverage == matrix.mongodb-version && (github.event_name == 'release' || github.ref == 'refs/heads/develop') && '-cov' || '' }}
7676
MONGODB_VERSION: ${{ matrix.mongodb-version }}
77-
COVERAGE_DIR: '/tmp/coverage/${{ inputs.type }}'
77+
COVERAGE_DIR: '/tmp/coverage/${{ startsWith(inputs.type, ''api'') && ''api'' || inputs.type }}'
7878
COVERAGE_FILE_NAME: '${{ inputs.type }}-${{ matrix.shard }}.json'
7979
COVERAGE_REPORTER: ${{ inputs.coverage == matrix.mongodb-version && 'json' || '' }}
8080

@@ -126,7 +126,7 @@ jobs:
126126
- uses: rharkor/caching-for-turbo@v1.8
127127

128128
- name: Restore packages build
129-
uses: actions/download-artifact@v7
129+
uses: actions/download-artifact@v8
130130
with:
131131
name: packages-build
132132
path: /tmp
@@ -138,7 +138,7 @@ jobs:
138138
139139
# Download Docker images from build artifacts
140140
- name: Download Docker images
141-
uses: actions/download-artifact@v7
141+
uses: actions/download-artifact@v8
142142
if: github.event.pull_request.head.repo.full_name != github.repository && github.event_name != 'release' && github.ref != 'refs/heads/develop'
143143
with:
144144
pattern: ${{ inputs.release == 'ce' && 'docker-image-rocketchat-amd64-coverage' || 'docker-image-*-amd64-coverage' }}
@@ -169,7 +169,7 @@ jobs:
169169
run: echo "DEBUG_LOG_LEVEL=2" >> $GITHUB_ENV
170170

171171
- name: Start httpbin container and wait for it to be ready
172-
if: inputs.type == 'api'
172+
if: inputs.type == 'api' || inputs.type == 'api-livechat'
173173
run: |
174174
docker compose -f docker-compose-ci.yml up -d httpbin
175175
@@ -227,6 +227,22 @@ jobs:
227227
ls -la $COVERAGE_DIR
228228
exit $s
229229
230+
- name: E2E Test API (Livechat)
231+
if: inputs.type == 'api-livechat'
232+
working-directory: ./apps/meteor
233+
env:
234+
WEBHOOK_TEST_URL: 'http://httpbin'
235+
IS_EE: ${{ inputs.release == 'ee' && 'true' || '' }}
236+
run: |
237+
set -o xtrace
238+
239+
npm run testapi:livechat
240+
241+
docker compose -f ../../docker-compose-ci.yml stop
242+
243+
ls -la $COVERAGE_DIR
244+
exit $s
245+
230246
- name: E2E Test UI (${{ matrix.shard }}/${{ inputs.total-shard }})
231247
if: inputs.type == 'ui'
232248
env:
@@ -263,7 +279,7 @@ jobs:
263279
264280
- name: Store playwright test trace
265281
if: inputs.type == 'ui' && always()
266-
uses: actions/upload-artifact@v6
282+
uses: actions/upload-artifact@v7
267283
with:
268284
name: playwright-test-trace-${{ inputs.release }}-${{ matrix.mongodb-version }}-${{ matrix.shard }}${{ inputs.db-watcher-disabled == 'true' && '-no-watcher' || '' }}
269285
path: ./apps/meteor/tests/e2e/.playwright*
@@ -279,7 +295,7 @@ jobs:
279295

280296
- name: Store coverage
281297
if: inputs.coverage == matrix.mongodb-version
282-
uses: actions/upload-artifact@v6
298+
uses: actions/upload-artifact@v7
283299
with:
284300
name: coverage-${{ inputs.type }}-${{ matrix.shard }}
285301
path: /tmp/coverage

.github/workflows/ci-test-storybook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: rharkor/caching-for-turbo@v1.8
3939

4040
- name: Restore packages build
41-
uses: actions/download-artifact@v7
41+
uses: actions/download-artifact@v8
4242
with:
4343
name: packages-build
4444
path: /tmp

.github/workflows/ci-test-unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- uses: rharkor/caching-for-turbo@v1.8
4343

4444
- name: Restore packages build
45-
uses: actions/download-artifact@v7
45+
uses: actions/download-artifact@v8
4646
with:
4747
name: packages-build
4848
path: /tmp

0 commit comments

Comments
 (0)