From e37b78259f78acd25eb498288f31a1c3c1038793 Mon Sep 17 00:00:00 2001 From: csuarez Date: Mon, 13 Feb 2023 15:45:39 -0500 Subject: [PATCH 1/3] fix: add error label, add success message and fix doc link --- .../admin/cloud/modals/RegisterWorkspaceModal.tsx | 5 ++++- .../RegisterWorkspaceSetupStepTwoModal.tsx | 14 +++++++++++++- .../cloud/modals/RegisterWorkspaceTokenModal.tsx | 4 ++++ .../packages/rocketchat-i18n/i18n/en.i18n.json | 3 ++- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx index 638ec69145d73..d41de2c8d3b57 100644 --- a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx +++ b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx @@ -12,6 +12,9 @@ type RegisterWorkspaceModalProps = { isConnectedToCloud?: boolean | string; }; +const documentationLink = + 'https://docs.rocket.chat/setup-and-configure/accessing-your-workspace/rocket.chat-setup-wizard#information-collected-for-registered-workspaces'; + const RegisterWorkspaceModal = ({ onClose, onStatusChange, isConnectedToCloud = false, ...props }: RegisterWorkspaceModalProps) => { const setModal = useSetModal(); const bulletFeatures = useFeatureBullets(); @@ -59,7 +62,7 @@ const RegisterWorkspaceModal = ({ onClose, onStatusChange, isConnectedToCloud = - + {t('Learn_more')} diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx index 2415eb2df7c29..dc1c3c5f82272 100644 --- a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx +++ b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx @@ -1,6 +1,7 @@ import { Modal, Box, Field, TextInput } from '@rocket.chat/fuselage'; import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; import React, { useCallback, useEffect } from 'react'; +import { Trans } from 'react-i18next'; type Props = { email: string; @@ -29,6 +30,7 @@ const RegisterWorkspaceSetupStepTwoModal = ({ email, step, setStep, onClose, int const handleResendRegistrationEmail = async () => { try { await createRegistrationIntent({ resend: true, email }); + dispatchToastMessage({ type: 'success', message: t('Email_sent') }); } catch (error: unknown) { dispatchToastMessage({ type: 'error', message: error }); } @@ -66,7 +68,17 @@ const RegisterWorkspaceSetupStepTwoModal = ({ email, step, setStep, onClose, int - {t('RegisterWorkspace_Setup_Email_Confirmation', { email })} + + + + Email sent to{' '} + + {email} + + with a confirmation link.{' '} + + + {t('RegisterWorkspace_Setup_Email_Verification')} {t('Security_code')} diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx index c535713ea588e..4a79d1472fd18 100644 --- a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx +++ b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx @@ -20,6 +20,7 @@ const RegisterWorkspaceTokenModal = ({ onClose, onStatusChange, isConnectedToClo const [token, setToken] = useState(''); const [processing, setProcessing] = useState(false); + const [error, setError] = useState(false); const handleBackAction = (): void => { const handleModalClose = (): void => setModal(null); @@ -34,6 +35,7 @@ const RegisterWorkspaceTokenModal = ({ onClose, onStatusChange, isConnectedToClo const handleConnectButtonClick = async () => { setProcessing(true); + setError(false); try { const isConnected = await connectWorkspace(token); @@ -47,6 +49,7 @@ const RegisterWorkspaceTokenModal = ({ onClose, onStatusChange, isConnectedToClo dispatchToastMessage({ type: 'success', message: t('Connected') }); } catch (error) { dispatchToastMessage({ type: 'error', message: error }); + setError(true); } finally { await (onStatusChange && onStatusChange()); setProcessing(false); @@ -81,6 +84,7 @@ const RegisterWorkspaceTokenModal = ({ onClose, onStatusChange, isConnectedToClo + {error && {t('Token_Not_Recognized')}} diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json index 49912a13f6968..0b3a2094b1ad2 100644 --- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json @@ -5527,6 +5527,7 @@ "ConnectWorkspace_Button": "Connect workspace", "Workspace_registered": "Workspace registered", "Workspace_not_connected": "Workspace not connected", + "Token_Not_Recognized": "Token not recognized", "RegisterWorkspace_Registered_Description": "These services are available", "RegisterWorkspace_Registered_Subtitle": "Because this workspace is registered the following is available", "RegisterWorkspace_Registered_Benefits": "Registration allows automatic license updates, notifications of critical vulnerabilities and access to Rocket.Chat Cloud services. No sensitive workspace data is shared with Rocket.Chat.", @@ -5559,7 +5560,7 @@ "RegisterWorkspace_Setup_Have_Account_Subtitle": "Enter your Cloud account email to associate this workspace with your account.", "RegisterWorkspace_Setup_No_Account_Title": "Don't have an account?", "RegisterWorkspace_Setup_No_Account_Subtitle": "Enter your email to create a new Cloud account and associate this workspace.", - "RegisterWorkspace_Setup_Email_Confirmation": "Email sent to __email__ with a confirmation link.", + "cloud.RegisterWorkspace_Setup_Email_Confirmation": "Email sent to <1>email with a confirmation link.", "RegisterWorkspace_Setup_Email_Verification": "Please verify that the security code below matches the one in the email.", "RegisterWorkspace_Syncing_Error": "An error occured syncing your workspace", "RegisterWorkspace_Syncing_Complete": "Sync Complete", From 18bd60732a4e600c6073605b1b22eaf09516a4bf Mon Sep 17 00:00:00 2001 From: csuarez Date: Mon, 13 Feb 2023 16:59:39 -0500 Subject: [PATCH 2/3] chore: add gorocketchat link --- .../admin/cloud/modals/RegisterWorkspaceModal.tsx | 8 +++----- .../RegisterWorkspaceSetupStepOneModal.tsx | 12 ++++-------- .../RegisterWorkspaceSetupStepTwoModal.tsx | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx index d41de2c8d3b57..62f8aa6a154f9 100644 --- a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx +++ b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceModal.tsx @@ -1,4 +1,5 @@ import { Box, Button, ButtonGroup, Modal } from '@rocket.chat/fuselage'; +import { ExternalLink } from '@rocket.chat/ui-client'; import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts'; import React from 'react'; @@ -12,8 +13,7 @@ type RegisterWorkspaceModalProps = { isConnectedToCloud?: boolean | string; }; -const documentationLink = - 'https://docs.rocket.chat/setup-and-configure/accessing-your-workspace/rocket.chat-setup-wizard#information-collected-for-registered-workspaces'; +const documentationLink = 'https://go.rocket.chat/i/register-info-collected'; const RegisterWorkspaceModal = ({ onClose, onStatusChange, isConnectedToCloud = false, ...props }: RegisterWorkspaceModalProps) => { const setModal = useSetModal(); @@ -62,9 +62,7 @@ const RegisterWorkspaceModal = ({ onClose, onStatusChange, isConnectedToCloud = - - {t('Learn_more')} - + {t('Learn_more')}