Merge branch 'improve/call-contact-id' of github.com:RocketChat/Rocke…

…t.Chat into improve/call-contact-id
RocketChat · Aug 25, 2022 · 26b5ed4 · 26b5ed4
2 parents 9b8ae32 + 80d79ef
commit 26b5ed4
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 251 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -268,7 +268,6 @@ jobs:
         env:
           MONGO_URL: 'mongodb://host.docker.internal:27017/rocketchat?replicaSet=rs0&directConnection=true'
           MONGO_OPLOG_URL: 'mongodb://mongodb:27017/local?replicaSet=rs0&directConnection=true'
-          VOIP_MANAGEMENT_SERVER_PWD: ${{ secrets.VOIP_MANAGEMENT_SERVER_PWD }}
         run: |
           export LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 
@@ -447,7 +446,6 @@ jobs:
           DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }}
           TRANSPORTER: nats://nats:4222
           ENTERPRISE_LICENSE: ${{ secrets.ENTERPRISE_LICENSE }}
-          VOIP_MANAGEMENT_SERVER_PWD: ${{ secrets.VOIP_MANAGEMENT_SERVER_PWD }}
         run: |
           export LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
 

diff --git a/apps/meteor/server/models/raw/LivechatInquiry.ts b/apps/meteor/server/models/raw/LivechatInquiry.ts
@@ -5,6 +5,7 @@ import { LivechatInquiryStatus } from '@rocket.chat/core-typings';
 
 import { BaseRaw } from './BaseRaw';
 
+// @ts-ignore Circular reference on field 'attachments'
 export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implements ILivechatInquiryModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatInquiryRecord>>) {
 		super(db, 'livechat_inquiry', trash);

diff --git a/apps/meteor/tests/e2e/omnichannel-voip-footer.spec.ts b/apps/meteor/tests/e2e/omnichannel-voip-footer.spec.ts
diff --git a/apps/meteor/tests/e2e/page-objects/index.ts b/apps/meteor/tests/e2e/page-objects/index.ts
@@ -9,6 +9,3 @@ export * from './omnichannel-agents';
 export * from './omnichannel-departments';
 export * from './omnichannel-current-chats';
 export * from './omnichannel-livechat';
-export * from './omnichannel-section';
-export * from './omnichannel-voip-footer';
-export * from './omnichannel-dialpad-modal';
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-dialpad-modal.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-dialpad-modal.ts
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-section.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-section.ts
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-voip-footer.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-voip-footer.ts
diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -14,7 +14,6 @@ services:
       - 'TRANSPORTER=${TRANSPORTER}'
       - MOLECULER_LOG_LEVEL=info
       - 'ROCKETCHAT_LICENSE=${ENTERPRISE_LICENSE}'
-      - 'OVERWRITE_SETTING_VoIP_Management_Server_Password=${VOIP_MANAGEMENT_SERVER_PWD}'
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     depends_on: