Skip to content

Commit

Permalink
Merge branch 'develop' into feat/push-stats
Browse files Browse the repository at this point in the history
  • Loading branch information
matheusbsilva137 authored Sep 11, 2023
2 parents 643c35c + be98f53 commit e31d2f2
Show file tree
Hide file tree
Showing 257 changed files with 3,161 additions and 1,804 deletions.
5 changes: 5 additions & 0 deletions .changeset/breezy-bugs-jam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Managers allowed to make deactivated agent's available
5 changes: 5 additions & 0 deletions .changeset/forty-hotels-pretend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Prevent `RoomProvider.useEffect` from subscribing to room-data stream multiple times
5 changes: 5 additions & 0 deletions .changeset/four-parents-cheer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

load sounds right before playing them
5 changes: 5 additions & 0 deletions .changeset/gold-moose-press.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fix moment timestamps language change
5 changes: 5 additions & 0 deletions .changeset/honest-glasses-roll.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

chore: Add danger variant to apps action button menus
6 changes: 6 additions & 0 deletions .changeset/importer-progress-bar.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
---

Fixed Importer Progress Bar progress indicator

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

New helper for Apps to notify users via a Direct Message
5 changes: 5 additions & 0 deletions .changeset/lucky-balloons-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fix engagement dashboard not showing data
5 changes: 5 additions & 0 deletions .changeset/odd-elephants-promise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fix LinkedIn OAuth broken
6 changes: 6 additions & 0 deletions .changeset/seven-jobs-tickle.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: agent role being removed upon user deactivation
5 changes: 5 additions & 0 deletions .changeset/three-birds-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

chore: Increase cache time from 5s to 10s on `getUnits` helpers. This should reduce the number of DB calls made by this method to fetch the unit limitations for a user.
7 changes: 7 additions & 0 deletions .changeset/tough-candles-heal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/core-typings": patch
"@rocket.chat/model-typings": patch
---

Fixes a problem where the calculated time for considering the visitor abandonment was the first message from the visitor and not the visitor's reply to the agent.
6 changes: 6 additions & 0 deletions .changeset/yellow-buttons-agree.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/ui-client': minor
'@rocket.chat/meteor': minor
---

feat: add ChangePassword field to Account/Security
73 changes: 73 additions & 0 deletions .github/actions/build-docker/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: 'Meteor Docker'

inputs:
CR_USER:
required: true
CR_PAT:
required: true
node-version:
required: true
description: 'Node version'
type: string
platform:
required: false
description: 'Platform'
type: string

runs:
using: composite

steps:
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ inputs.CR_USER }}
password: ${{ inputs.CR_PAT }}

- name: Restore build
uses: actions/download-artifact@v3
with:
name: build
path: /tmp/build

- name: Unpack build
shell: bash
run: |
cd /tmp/build
tar xzf Rocket.Chat.tar.gz
rm Rocket.Chat.tar.gz
- uses: dtinth/setup-github-actions-caching-for-turbo@v1

- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: ${{ inputs.node-version }}
cache-modules: true
install: true

- run: yarn build
shell: bash

- name: Build Docker images
shell: bash
run: |
args=(rocketchat)
if [[ '${{ inputs.platform }}' = 'alpine' ]]; then
args+=($SERVICES_PUBLISH)
fi;
docker compose -f docker-compose-ci.yml build "${args[@]}"
- name: Publish Docker images to GitHub Container Registry
shell: bash
run: |
args=(rocketchat)
if [[ '${{ inputs.platform }}' = 'alpine' ]]; then
args+=($SERVICES_PUBLISH)
fi;
docker compose -f docker-compose-ci.yml push "${args[@]}"
129 changes: 129 additions & 0 deletions .github/actions/meteor-build/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
name: 'Meteor Build'

inputs:
coverage:
required: false
description: 'Enable coverage'
type: boolean
reset-meteor:
required: false
description: 'Reset Meteor'
type: boolean
node-version:
required: true
description: 'Node version'
type: string

runs:
using: composite

steps:
- name: Set Swap Space
uses: pierotofy/set-swap-space@master
with:
swap-size-gb: 4

- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: ${{ inputs.node-version }}
cache-modules: true
install: true

# - name: Free disk space
# run: |
# sudo apt clean
# docker rmi $(docker image ls -aq)
# df -h

- name: Cache vite
uses: actions/cache@v3
with:
path: ./node_modules/.vite
key: vite-local-cache-${{ runner.OS }}-${{ hashFiles('package.json') }}
restore-keys: |
vite-local-cache-${{ runner.os }}-
- name: Cache meteor local
uses: actions/cache@v3
with:
path: ./apps/meteor/.meteor/local
key: meteor-local-cache-${{ runner.OS }}-${{ hashFiles('apps/meteor/.meteor/versions') }}
restore-keys: |
meteor-local-cache-${{ runner.os }}-
- name: Cache meteor
uses: actions/cache@v3
with:
path: ~/.meteor
key: meteor-cache-${{ runner.OS }}-${{ hashFiles('apps/meteor/.meteor/release') }}
restore-keys: |
meteor-cache-${{ runner.os }}-
- name: Install Meteor
shell: bash
run: |
# Restore bin from cache
set +e
METEOR_SYMLINK_TARGET=$(readlink ~/.meteor/meteor)
METEOR_TOOL_DIRECTORY=$(dirname "$METEOR_SYMLINK_TARGET")
set -e
LAUNCHER=$HOME/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor
if [ -e $LAUNCHER ]
then
echo "Cached Meteor bin found, restoring it"
sudo cp "$LAUNCHER" "/usr/local/bin/meteor"
else
echo "No cached Meteor bin found."
fi
# only install meteor if bin isn't found
command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh
- name: Versions
shell: bash
run: |
npm --versions
yarn -v
node -v
meteor --version
meteor npm --versions
meteor node -v
git version
- uses: dtinth/setup-github-actions-caching-for-turbo@v1

- name: Translation check
shell: bash
run: yarn turbo run translation-check

- name: Reset Meteor
shell: bash
if: ${{ inputs.reset-meteor == 'true' }}
working-directory: ./apps/meteor
run: meteor reset

- name: Build Rocket.Chat From Pull Request
shell: bash
if: startsWith(github.ref, 'refs/pull/') == true
env:
METEOR_PROFILE: 1000
BABEL_ENV: ${{ inputs.coverage == 'true' && 'coverage' || '' }}
run: yarn build:ci -- --directory /tmp/dist

- name: Build Rocket.Chat
shell: bash
if: startsWith(github.ref, 'refs/pull/') != true
run: yarn build:ci -- --directory /tmp/dist

- name: Prepare build
shell: bash
run: |
cd /tmp/dist
tar czf /tmp/Rocket.Chat.tar.gz bundle
- name: Store build
uses: actions/upload-artifact@v3
with:
name: build
path: /tmp/Rocket.Chat.tar.gz
8 changes: 7 additions & 1 deletion .github/workflows/ci-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ on:
required: false
REPORTER_ROCKETCHAT_API_KEY:
required: false
CODECOV_TOKEN:
required: false

env:
MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
Expand Down Expand Up @@ -209,8 +211,11 @@ jobs:
REPORTER_ROCKETCHAT_DRAFT: ${{ github.event.pull_request.draft }}
QASE_API_TOKEN: ${{ secrets.QASE_API_TOKEN }}
QASE_REPORT: ${{ github.ref == 'refs/heads/develop' && 'true' || '' }}
CI: true
working-directory: ./apps/meteor
run: yarn test:e2e --shard=${{ matrix.shard }}/${{ inputs.total-shard }}
run: |
yarn prepare
yarn test:e2e --shard=${{ matrix.shard }}/${{ inputs.total-shard }}
- name: Store playwright test trace
if: inputs.type == 'ui' && always()
Expand All @@ -234,6 +239,7 @@ jobs:
directory: ./apps/meteor
flags: e2e
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}

- name: Store e2e-ee-coverage
if: inputs.type == 'ui' && inputs.release == 'ee'
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/ci-test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
node-version:
required: true
type: string
secrets:
CODECOV_TOKEN:
required: false

env:
MONGO_URL: mongodb://localhost:27017/rocketchat?replicaSet=rs0&directConnection=true
Expand Down Expand Up @@ -36,3 +39,4 @@ jobs:
with:
flags: unit
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}
Loading

0 comments on commit e31d2f2

Please sign in to comment.