From ad45f757beee4a5c1d3d37463d9156d179ae6679 Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Fri, 12 Aug 2022 11:45:29 -0600 Subject: [PATCH 1/6] Chore: update codeowners for omnichannel (#25771) --- .github/CODEOWNERS | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a3ae6a000b42..96b1f62f3f96 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,3 +10,17 @@ /apps/meteor/client/ @RocketChat/frontend /apps/meteor/tests/ @RocketChat/chat-engine /apps/meteor/app/apps/ @RocketChat/apps + +/apps/meteor/app/livechat @RocketChat/omnichannel +/apps/meteor/app/voip @RocketChat/omnichannel +/apps/meteor/app/sms @RocketChat/omnichannel +/apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel +/apps/meteor/server/services/voip @RocketChat/omnichannel +/apps/meteor/server/services/omnichannel-voip @RocketChat/omnichannel +/apps/meteor/server/features/EmailInbox @RocketChat/omnichannel +/apps/meteor/ee/app/canned-responses @RocketChat/omnichannel +/apps/meteor/ee/app/livechat @RocketChat/omnichannel +/apps/meteor/ee/app/livechat-enterprise @RocketChat/omnichannel +/apps/meteor/ee/client/omnichannel @RocketChat/omnichannel +/apps/meteor/client/components/omnichannel @RocketChat/omnichannel +/apps/meteor/client/components/voip @RocketChat/omnichannel \ No newline at end of file From df2e77557f19c0f15e147fb59693cc3fed3a499b Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Fri, 12 Aug 2022 14:52:19 -0300 Subject: [PATCH 2/6] Chore: Add translations code owner (#26560) --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 96b1f62f3f96..7ce022d91f52 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,11 +10,11 @@ /apps/meteor/client/ @RocketChat/frontend /apps/meteor/tests/ @RocketChat/chat-engine /apps/meteor/app/apps/ @RocketChat/apps - /apps/meteor/app/livechat @RocketChat/omnichannel /apps/meteor/app/voip @RocketChat/omnichannel /apps/meteor/app/sms @RocketChat/omnichannel /apps/meteor/packages/rocketchat-livechat @RocketChat/omnichannel +/apps/meteor/packages/rocketchat-i18n @RocketChat/translation /apps/meteor/server/services/voip @RocketChat/omnichannel /apps/meteor/server/services/omnichannel-voip @RocketChat/omnichannel /apps/meteor/server/features/EmailInbox @RocketChat/omnichannel @@ -23,4 +23,4 @@ /apps/meteor/ee/app/livechat-enterprise @RocketChat/omnichannel /apps/meteor/ee/client/omnichannel @RocketChat/omnichannel /apps/meteor/client/components/omnichannel @RocketChat/omnichannel -/apps/meteor/client/components/voip @RocketChat/omnichannel \ No newline at end of file +/apps/meteor/client/components/voip @RocketChat/omnichannel From 69475aae53f8ab582cc487872b22c38f113fca62 Mon Sep 17 00:00:00 2001 From: Weslley Campos <30299972+weslley543@users.noreply.github.com> Date: Fri, 12 Aug 2022 15:01:25 -0300 Subject: [PATCH 3/6] Chore: test for change avatar (#26543) --- .../UserAvatarEditor/UserAvatarEditor.js | 17 ++++++++++++-- .../tests/e2e/fixtures/files/test-image.jpeg | Bin 0 -> 40326 bytes .../tests/e2e/page-objects/account-profile.ts | 12 ++++++++++ .../e2e/settings-account-profile.spec.ts | 21 ++++++++++++++++++ 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 apps/meteor/tests/e2e/fixtures/files/test-image.jpeg diff --git a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.js b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.js index 5e2b2418e5c6..584950be5e94 100644 --- a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.js +++ b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.js @@ -76,7 +76,14 @@ function UserAvatarEditor({ currentUsername, username, setAvatarObj, suggestions - + {suggestions && ( {t('Use_url_for_avatar')} - + diff --git a/apps/meteor/tests/e2e/fixtures/files/test-image.jpeg b/apps/meteor/tests/e2e/fixtures/files/test-image.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..4391d6feae9a5018660d86e73ed74554f809955a GIT binary patch literal 40326 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 { await expect(page.locator('.rcx-toastbar.rcx-toastbar--success')).toBeVisible(); }); }); + + test.describe('Change avatar', () => { + test.beforeEach(async () => { + await poHomeChannel.sidenav.goToMyAccount(); + }); + + test('expect change avatar image by upload', async ({ page }) => { + await poAccountProfile.inputImageFile.setInputFiles('./tests/e2e/fixtures/files/test-image.jpeg'); + + await poAccountProfile.btnSubmit.click(); + await expect(page.locator('.rcx-toastbar.rcx-toastbar--success').first()).toBeVisible(); + }); + + test('expect set image from url', async ({ page }) => { + await poAccountProfile.inputAvatarLink.fill('https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50'); + await poAccountProfile.btnSetAvatarLink.click(); + + await poAccountProfile.btnSubmit.click(); + await expect(page.locator('.rcx-toastbar.rcx-toastbar--success').first()).toBeVisible(); + }); + }); }); From 5d5c0604b8a118ba70141cdcdd59ed97efdeb39c Mon Sep 17 00:00:00 2001 From: Sangyong Gwak Date: Sat, 13 Aug 2022 03:47:12 +0900 Subject: [PATCH 4/6] i18n: Fix Korean set role translation (#24966) Co-authored-by: dougfabris --- apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json index f1c9d60a054e..bafcc64b024c 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json @@ -4,7 +4,7 @@ "__count__empty_rooms_will_be_removed_automatically": "__count__ 빈 대화방은 자동으로 제거됩니다.", "__count__empty_rooms_will_be_removed_automatically__rooms__": "__count__ 빈 대화방은 자동으로 제거됩니다 :
__rooms__.", "__username__is_no_longer__role__defined_by__user_by_": "__user_by__님이 __username__님을 __role__ 역할에서 제외시켰습니다.", - "__username__was_set__role__by__user_by_": "__user_by__님이 __username__님에 의해 __role__에 지정됨", + "__username__was_set__role__by__user_by_": "__username__님이 __user_by__님에 의해 __role__에 지정됨", "This_room_encryption_has_been_enabled_by__username_": "__username__님이 방 암호화를 활성화함", "This_room_encryption_has_been_disabled_by__username_": "__username__님이 방 암호화를 비활성화함", "@username": "@사용자명", From 662ffb816f59d155cd516d2af880125b99678f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Felchar?= <11652381+cauefcr@users.noreply.github.com> Date: Fri, 12 Aug 2022 16:34:54 -0300 Subject: [PATCH 5/6] [FIX] - Incoming SMSs no longer clash with ongoing livechat conversations by the same visitor (#26307) --- apps/meteor/app/livechat/imports/server/rest/sms.js | 4 ++-- apps/meteor/app/models/server/models/LivechatRooms.js | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/meteor/app/livechat/imports/server/rest/sms.js b/apps/meteor/app/livechat/imports/server/rest/sms.js index fc5eb34ceb9c..00a02915d077 100644 --- a/apps/meteor/app/livechat/imports/server/rest/sms.js +++ b/apps/meteor/app/livechat/imports/server/rest/sms.js @@ -36,7 +36,7 @@ const defineDepartment = (idOrName) => { }; const defineVisitor = async (smsNumber, targetDepartment) => { - const visitor = LivechatVisitors.findOneVisitorByPhone(smsNumber); + const visitor = await LivechatVisitors.findOneVisitorByPhone(smsNumber); let data = { token: (visitor && visitor.token) || Random.id(), }; @@ -86,7 +86,7 @@ API.v1.addRoute('livechat/sms-incoming/:service', { const visitor = await defineVisitor(sms.from, targetDepartment); const { token } = visitor; - const room = LivechatRooms.findOneOpenByVisitorTokenAndDepartmentId(token, targetDepartment); + const room = LivechatRooms.findOneOpenByVisitorTokenAndDepartmentIdAndSource(token, targetDepartment, OmnichannelSourceType.SMS); const roomExists = !!room; const location = normalizeLocationSharing(sms); const rid = (room && room._id) || Random.id(); diff --git a/apps/meteor/app/models/server/models/LivechatRooms.js b/apps/meteor/app/models/server/models/LivechatRooms.js index 25239366f589..6d17be960dbf 100644 --- a/apps/meteor/app/models/server/models/LivechatRooms.js +++ b/apps/meteor/app/models/server/models/LivechatRooms.js @@ -288,13 +288,16 @@ export class LivechatRooms extends Base { return this.findOne(query, options); } - findOneOpenByVisitorTokenAndDepartmentId(visitorToken, departmentId, options) { + findOneOpenByVisitorTokenAndDepartmentIdAndSource(visitorToken, departmentId, source, options) { const query = { 't': 'l', 'open': true, 'v.token': visitorToken, departmentId, }; + if (source) { + query['source.type'] = source; + } return this.findOne(query, options); } From 955751377f734af22a03ec345cbd310fc0b51440 Mon Sep 17 00:00:00 2001 From: Douglas Fabris Date: Fri, 12 Aug 2022 17:36:50 -0300 Subject: [PATCH 6/6] Chore: Replace timeAgo on WebdavFilePickerTable (#26564) --- .../webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx index beea93ef00d9..63f0fe1cf888 100644 --- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx +++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx @@ -3,7 +3,6 @@ import { Box, Icon, States, StatesIcon, StatesTitle } from '@rocket.chat/fuselag import { useTranslation } from '@rocket.chat/ui-contexts'; import React, { ReactElement, ComponentProps } from 'react'; -import { timeAgo } from '../../../../../app/ui/client/views/app/helpers'; import { GenericTable, GenericTableBody, @@ -13,6 +12,7 @@ import { GenericTableLoadingRow, GenericTableRow, } from '../../../../components/GenericTable'; +import { timeAgo } from '../../../../lib/utils/timeAgo'; import type { WebdavSortOptions } from './WebdavFilePickerModal'; import { getNodeFileSize } from './lib/getNodeFileSize'; import { getNodeIconType } from './lib/getNodeIconType'; @@ -83,7 +83,7 @@ const WebdavFilePickerTable = ({ {getNodeFileSize(webdavNode.type, webdavNode?.size)} - {timeAgo(new Date(), t)} + {timeAgo(new Date())} );