Skip to content

fix: fixing cta for git import modal #36364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brayn003 merged 2 commits into from
Sep 20, 2024
Merged

fix: fixing cta for git import modal #36364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d436ce
fix: fixing cta for git import modal
Sep 17, 2024
3a4468f
Merge branch 'release' of github.com:appsmithorg/appsmith into fix/gi…
Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/client/src/ce/constants/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
15 changes: 9 additions & 6 deletions app/client/src/pages/Editor/gitSync/Tabs/GitConnectionV2/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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;
Expand All @@ -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<FormDataState>({
gitProvider: undefined,
gitEmptyRepoExists: undefined,
Expand Down