From 725c28e3aab768f4ee8d84593de04fcbde3a89f7 Mon Sep 17 00:00:00 2001 From: Ankita Kinger Date: Fri, 23 Dec 2022 10:01:46 +0530 Subject: [PATCH] chore: Splitting messages to support cloud messages (#19142) --- app/client/src/ce/constants/messages.ts | 6 +++++- app/client/src/ce/pages/workspace/Members.tsx | 7 ++++++- .../pages/workspace/WorkspaceInviteUsersForm.tsx | 14 ++++++++++---- app/client/src/pages/AppViewer/AppViewerHeader.tsx | 10 ++++++++-- app/client/src/pages/AppViewer/PageMenu.tsx | 11 ++++++++--- app/client/src/pages/Applications/index.tsx | 13 +++++++++++-- app/client/src/pages/Editor/EditorHeader.tsx | 10 ++++++++-- app/client/src/pages/workspace/settings.tsx | 5 ++++- 8 files changed, 60 insertions(+), 16 deletions(-) diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 0bf36950d7..85310eee0f 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -1348,7 +1348,11 @@ export const CLEAN_URL_UPDATE = { "Existing references to appsmith.URL.fullpath and appsmith.URL.pathname properties will behave differently.", }; -export const MEMBERS_TAB_TITLE = (length: number) => `Users (${length})`; +export const MEMBERS_TAB_TITLE = ( + length: number, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + cloudHosting?: boolean, +) => `Users (${length})`; export const CREATE_PAGE = () => "New Blank Page"; export const CANVAS_NEW_PAGE_CARD = () => "Create New Page"; diff --git a/app/client/src/ce/pages/workspace/Members.tsx b/app/client/src/ce/pages/workspace/Members.tsx index 2877562f4f..4f8acb6dba 100644 --- a/app/client/src/ce/pages/workspace/Members.tsx +++ b/app/client/src/ce/pages/workspace/Members.tsx @@ -40,6 +40,9 @@ import { MEMBERS_TAB_TITLE, NO_SEARCH_DATA_TEXT, } from "@appsmith/constants/messages"; +import { getAppsmithConfigs } from "@appsmith/configs"; + +const { cloudHosting } = getAppsmithConfigs(); export type PageProps = RouteComponentProps<{ workspaceId: string; @@ -327,7 +330,9 @@ export default function MemberSettings(props: PageProps) { const columns = [ { - Header: createMessage(() => MEMBERS_TAB_TITLE(filteredData?.length)), + Header: createMessage(() => + MEMBERS_TAB_TITLE(filteredData?.length, cloudHosting), + ), accessor: "users", Cell: function UserCell(props: any) { const member = props.cell.row.original; diff --git a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx index 5d1c68f64b..c0738a399d 100644 --- a/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx +++ b/app/client/src/ce/pages/workspace/WorkspaceInviteUsersForm.tsx @@ -66,6 +66,8 @@ import { useHistory } from "react-router-dom"; import { Tooltip } from "@blueprintjs/core"; import { isEllipsisActive } from "utils/helpers"; +const { cloudHosting, mailEnabled } = getAppsmithConfigs(); + export const CommonTitleTextStyle = css` color: ${Colors.CHARCOAL}; font-weight: normal; @@ -262,7 +264,10 @@ const validateFormValues = (values: { _users.forEach((user) => { if (!isEmail(user)) { throw new SubmissionError({ - _error: createMessage(INVITE_USERS_VALIDATION_EMAIL_LIST), + _error: createMessage( + INVITE_USERS_VALIDATION_EMAIL_LIST, + cloudHosting, + ), }); } }); @@ -294,15 +299,16 @@ const validate = (values: any) => { _users.forEach((user: string) => { if (!isEmail(user)) { - errors["users"] = createMessage(INVITE_USERS_VALIDATION_EMAIL_LIST); + errors["users"] = createMessage( + INVITE_USERS_VALIDATION_EMAIL_LIST, + cloudHosting, + ); } }); } return errors; }; -export const { mailEnabled } = getAppsmithConfigs(); - export const InviteButtonWidth = "88px"; function WorkspaceInviteUsersForm(props: any) { diff --git a/app/client/src/pages/AppViewer/AppViewerHeader.tsx b/app/client/src/pages/AppViewer/AppViewerHeader.tsx index 9cde3e8c6e..5aaa93650b 100644 --- a/app/client/src/pages/AppViewer/AppViewerHeader.tsx +++ b/app/client/src/pages/AppViewer/AppViewerHeader.tsx @@ -39,6 +39,9 @@ import { INVITE_USERS_MESSAGE, INVITE_USERS_PLACEHOLDER, } from "@appsmith/constants/messages"; +import { getAppsmithConfigs } from "@appsmith/configs"; + +const { cloudHosting } = getAppsmithConfigs(); /** * ---------------------------------------------------------------------------- @@ -134,8 +137,11 @@ export function AppViewerHeader(props: AppViewerHeaderProps) { bgColor: "transparent", }} isOpen={showAppInviteUsersDialog} - message={createMessage(INVITE_USERS_MESSAGE)} - placeholder={createMessage(INVITE_USERS_PLACEHOLDER)} + message={createMessage(INVITE_USERS_MESSAGE, cloudHosting)} + placeholder={createMessage( + INVITE_USERS_PLACEHOLDER, + cloudHosting, + )} title={currentApplicationDetails.name} trigger={