From 3d436ceb6b462014e9b0621c2c98e2af57a44407 Mon Sep 17 00:00:00 2001 From: brayn003 Date: Tue, 17 Sep 2024 17:13:27 +0800 Subject: [PATCH] fix: fixing cta for git import modal --- app/client/src/ce/constants/messages.ts | 1 + .../Editor/gitSync/Tabs/GitConnectionV2/index.tsx | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 8407a185902a..caef7eaad6c4 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -825,6 +825,7 @@ export const GIT_DISCONNECT_POPUP_MAIN_HEADING = () => `Are you sure?`; export const CONFIGURE_GIT = () => "Configure Git"; export const IMPORT_APP = () => "Import app via Git"; export const SETTINGS_GIT = () => "Settings"; +export const IMPORT_APP_CTA = () => "Import app"; export const GIT_CONNECTION = () => "Git connection"; export const GIT_IMPORT = () => "Git import"; diff --git a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx index 79378e85abb4..c55a5f1a0c3b 100644 --- a/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx +++ b/app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx @@ -20,6 +20,7 @@ import { GENERATE_SSH_KEY_STEP, GIT_CONNECT_WAITING, GIT_IMPORT_WAITING, + IMPORT_APP_CTA, PREVIOUS_STEP, createMessage, } from "ee/constants/messages"; @@ -83,12 +84,6 @@ const steps = [ const possibleSteps = steps.map((s) => s.key); -const nextStepText = { - [GIT_CONNECT_STEPS.CHOOSE_PROVIDER]: createMessage(CONFIGURE_GIT), - [GIT_CONNECT_STEPS.GENERATE_SSH_KEY]: createMessage(GENERATE_SSH_KEY_STEP), - [GIT_CONNECT_STEPS.ADD_DEPLOY_KEY]: createMessage(CONNECT_GIT_TEXT), -}; - interface FormDataState { gitProvider?: GitProvider; gitEmptyRepoExists?: string; @@ -109,6 +104,14 @@ function GitConnectionV2({ isImport = false }: GitConnectionV2Props) { const isImportingViaGit = useSelector(getIsImportingApplicationViaGit); const dispatch = useDispatch(); + const nextStepText = { + [GIT_CONNECT_STEPS.CHOOSE_PROVIDER]: createMessage(CONFIGURE_GIT), + [GIT_CONNECT_STEPS.GENERATE_SSH_KEY]: createMessage(GENERATE_SSH_KEY_STEP), + [GIT_CONNECT_STEPS.ADD_DEPLOY_KEY]: createMessage( + isImport ? IMPORT_APP_CTA : CONNECT_GIT_TEXT, + ), + }; + const [formData, setFormData] = useState({ gitProvider: undefined, gitEmptyRepoExists: undefined,