From 4d22ed044a82daf21044df49f54e7396e7f5101f Mon Sep 17 00:00:00 2001 From: Aleksander Nicacio da Silva Date: Mon, 6 Mar 2023 11:52:34 -0300 Subject: [PATCH 1/6] Regression: Adjusted departments upsell modal message (#28258) --- .../Omnichannel/modals/EnterpriseDepartmentsModal.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx index de1a606fdfd3..8ef394b43149 100644 --- a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx +++ b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx @@ -23,8 +23,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): closeModal(); }; - const tabTypeIsUpgradeYourPlan = - tabType === 'go-fully-featured' || tabType === 'go-fully-featured-registered' || tabType === 'upgrade-your-plan'; + const isTypeUpgradeYourPlan = ['go-fully-featured', 'go-fully-featured-registered'].includes(tabType || ''); const talkToExpertLink = 'https://www.rocket.chat/sales-contact?utm_source=rocketchat_app&utm_medium=multiple_queues&utm_campaign=in_product_ctas'; @@ -48,9 +47,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): {t('Enterprise_Departments_title')} - {tabType === 'go-fully-featured' || tabType === 'go-fully-featured-registered' || tabType === 'upgrade-your-plan' - ? t('Enterprise_Departments_description_upgrade') - : t('Enterprise_Departments_description_free_trial')} + {isTypeUpgradeYourPlan ? t('Enterprise_Departments_description_free_trial') : t('Enterprise_Departments_description_upgrade')} {hasPermission('view-statistics') ? ( @@ -58,7 +55,7 @@ const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): - {tabTypeIsUpgradeYourPlan ? ( + {isTypeUpgradeYourPlan ? ( From 625f93def735b4a34caddcbb4ddc8d9f9109a540 Mon Sep 17 00:00:00 2001 From: Douglas Gubert Date: Mon, 6 Mar 2023 12:55:32 -0300 Subject: [PATCH 2/6] Regression: Disabled grandfathered apps must have the option to be enabled (#28266) --- apps/meteor/client/views/marketplace/AppMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/marketplace/AppMenu.js b/apps/meteor/client/views/marketplace/AppMenu.js index 0bfe0948e5a1..9754f099afa8 100644 --- a/apps/meteor/client/views/marketplace/AppMenu.js +++ b/apps/meteor/client/views/marketplace/AppMenu.js @@ -344,7 +344,7 @@ function AppMenu({ app, isAppDetailsPage, ...props }) { {t('Enable')} ), - disabled: !appCountQuery?.data?.hasUnlimitedApps && appCountQuery?.data?.enabled >= appCountQuery?.data?.limit, + disabled: !app.migrated && !appCountQuery?.data?.hasUnlimitedApps && appCountQuery?.data?.enabled >= appCountQuery?.data?.limit, action: handleEnable, }, }), From a751fe280dd0778c99b857a5356b02307f4015e2 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Mon, 6 Mar 2023 13:06:36 -0300 Subject: [PATCH 3/6] Chore: Fix Email Inbox flaky test (#28294) --- apps/meteor/tests/e2e/email-inboxes.spec.ts | 2 +- apps/meteor/tests/e2e/page-objects/admin-email-inboxes.ts | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/meteor/tests/e2e/email-inboxes.spec.ts b/apps/meteor/tests/e2e/email-inboxes.spec.ts index 6b7b5d43138a..871a81e9a7b6 100644 --- a/apps/meteor/tests/e2e/email-inboxes.spec.ts +++ b/apps/meteor/tests/e2e/email-inboxes.spec.ts @@ -43,7 +43,7 @@ test.describe.serial('email-inboxes', () => { }); test('expect delete an email inbox', async () => { - await poAdminEmailInboxes.findEmailInbox(email).click(); + await poAdminEmailInboxes.itemRow(email).click(); await poAdminEmailInboxes.btnDelete.click(); await poUtils.btnModalConfirmDelete.click(); await expect(poUtils.toastBarSuccess).toBeVisible(); diff --git a/apps/meteor/tests/e2e/page-objects/admin-email-inboxes.ts b/apps/meteor/tests/e2e/page-objects/admin-email-inboxes.ts index b71bc730426b..911da84da44b 100644 --- a/apps/meteor/tests/e2e/page-objects/admin-email-inboxes.ts +++ b/apps/meteor/tests/e2e/page-objects/admin-email-inboxes.ts @@ -62,10 +62,6 @@ export class AdminEmailInboxes { } itemRow(name: string): Locator { - return this.page.locator(`td >> text=${name}`); - } - - findEmailInbox(email: string): Locator { - return this.page.locator(`td >> text=${email}`); + return this.page.locator(`td >> text="${name}"`); } } From 5edf7ce106321488309cf69cdbf70e4a0e1c867e Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Mon, 6 Mar 2023 14:08:19 -0300 Subject: [PATCH 4/6] Regression: Creating Custom status (#28292) --- .../customUserStatus/CustomUserStatusForm.tsx | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx index 6e3067f869a1..b328cdc0170e 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx @@ -1,6 +1,6 @@ import type { IUserStatus } from '@rocket.chat/core-typings'; import type { SelectOption } from '@rocket.chat/fuselage'; -import { Button, ButtonGroup, TextInput, Field, Select, Icon } from '@rocket.chat/fuselage'; +import { FieldGroup, Button, ButtonGroup, TextInput, Field, Select, Icon } from '@rocket.chat/fuselage'; import { useSetModal, useRoute, useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import React, { useCallback } from 'react'; @@ -87,47 +87,49 @@ const CustomUserStatusForm = ({ onClose, onReload, status }: CustomUserStatusFor return ( - - {t('Name')} - - - - {errors?.name && {t('error-the-field-is-required', { field: t('Name') })}} - - - {t('Presence')} - - } + /> + + {errors?.statusType && {t('error-the-field-is-required', { field: t('Presence') })}} + - + - )} + {_id && ( + + + + + + + + )} + ); }; From de9a843116a98163c56f4c2095d3316f35293f13 Mon Sep 17 00:00:00 2001 From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com> Date: Tue, 7 Mar 2023 00:01:16 +0530 Subject: [PATCH 5/6] Regression: Decrypt thread main message for room (#28262) --- .../room/contextualBar/Threads/hooks/useGetMessageByID.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useGetMessageByID.ts b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useGetMessageByID.ts index e145d2c47e27..64a6fcb50bc5 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useGetMessageByID.ts +++ b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useGetMessageByID.ts @@ -3,6 +3,7 @@ import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useCallback } from 'react'; import { Messages } from '../../../../../../app/models/client'; +import { onClientMessageReceived } from '../../../../../lib/onClientMessageReceived'; import { mapMessageFromApi } from '../../../../../lib/utils/mapMessageFromApi'; export const useGetMessageByID = () => { @@ -12,7 +13,8 @@ export const useGetMessageByID = () => { async (mid: IMessage['_id']) => { try { const { message: rawMessage } = await getMessage({ msgId: mid }); - const message = mapMessageFromApi(rawMessage); + const mappedMessage = mapMessageFromApi(rawMessage); + const message = (await onClientMessageReceived(mappedMessage)) || mappedMessage; Messages.upsert({ _id: message._id }, { $set: message }); return message; } catch (error) { From a2537e49d52d525fa7db7d529f2bece72ea31566 Mon Sep 17 00:00:00 2001 From: Hugo Costa Date: Mon, 6 Mar 2023 16:10:47 -0300 Subject: [PATCH 6/6] Regression: Fix remove user from room shows skeleton (#28247) Co-authored-by: Guilherme Jun Grillo <48109548+guijun13@users.noreply.github.com> --- apps/meteor/client/views/room/providers/RoomProvider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx index 64a20119de32..8f877cd490ed 100644 --- a/apps/meteor/client/views/room/providers/RoomProvider.tsx +++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx @@ -25,7 +25,7 @@ type RoomProviderProps = { const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => { useRoomRolesManagement(rid); - const roomQuery = useReactiveQuery(['rooms', rid], ({ rooms }) => rooms.findOne({ _id: rid }) ?? null); + const roomQuery = useReactiveQuery(['rooms', rid], ({ rooms }) => rooms.findOne({ _id: rid })); // TODO: the following effect is a workaround while we don't have a general and definitive solution for it const homeRoute = useRoute('home');