## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
158 lines
4.3 KiB
TypeScript
158 lines
4.3 KiB
TypeScript
import React from "react";
|
|
import { FormGroup as StyledFormGroup } from "design-system-old";
|
|
import { Button } from "design-system";
|
|
import FormTextField from "components/utils/ReduxFormTextField";
|
|
import {
|
|
WELCOME_FORM_ROLE_FIELD_NAME,
|
|
WELCOME_FORM_ROLE_NAME_FIELD_NAME,
|
|
WELCOME_FORM_USECASE_FIELD_NAME,
|
|
WELCOME_NON_SUPER_FORM_NAME,
|
|
} from "@appsmith/constants/forms";
|
|
import {
|
|
createMessage,
|
|
WELCOME_ACTION,
|
|
WELCOME_FORM_NON_SUPER_USER_ROLE_DROPDOWN,
|
|
WELCOME_FORM_NON_SUPER_USER_USE_CASE,
|
|
WELCOME_FORM_ROLE,
|
|
} from "@appsmith/constants/messages";
|
|
import { connect } from "react-redux";
|
|
import type { AppState } from "@appsmith/reducers";
|
|
import type { InjectedFormProps } from "redux-form";
|
|
import { Field, formValueSelector, reduxForm } from "redux-form";
|
|
import styled from "styled-components";
|
|
import { DropdownWrapper, withDropdown } from "./common";
|
|
import { roleOptions, useCaseOptions } from "./constants";
|
|
|
|
const ActionContainer = styled.div`
|
|
margin-top: ${(props) => props.theme.spaces[15]}px;
|
|
`;
|
|
|
|
const StyledButton = styled(Button)`
|
|
margin-top: ${(props) => props.theme.spaces[3]}px;
|
|
`;
|
|
|
|
type UserFormProps = {
|
|
onGetStarted?: (role?: string, useCase?: string) => void;
|
|
};
|
|
|
|
type NonSuperUserFormData = {
|
|
role?: string;
|
|
useCase?: string;
|
|
role_name?: string;
|
|
};
|
|
|
|
export function SuperUserForm(props: UserFormProps) {
|
|
return (
|
|
<ActionContainer>
|
|
<StyledButton
|
|
className="t--welcome-form-get-started"
|
|
onClick={() => props.onGetStarted && props.onGetStarted()}
|
|
size="md"
|
|
>
|
|
{createMessage(WELCOME_ACTION)}
|
|
</StyledButton>
|
|
</ActionContainer>
|
|
);
|
|
}
|
|
|
|
const StyledNonSuperUserForm = styled.form`
|
|
width: 400px;
|
|
`;
|
|
|
|
const Space = styled.div`
|
|
height: 20px;
|
|
`;
|
|
|
|
const validate = (values: any) => {
|
|
const errors: any = {};
|
|
|
|
if (!values.role) {
|
|
errors.role = "Please select a role";
|
|
}
|
|
if (values.role === "other" && !values.role_name) {
|
|
errors.role_name = "Please enter a role";
|
|
}
|
|
if (!values.useCase) {
|
|
errors.useCase = "Please select an useCase";
|
|
}
|
|
|
|
return errors;
|
|
};
|
|
|
|
function NonSuperUser(
|
|
props: InjectedFormProps & UserFormProps & NonSuperUserFormData,
|
|
) {
|
|
const onSubmit = (data: NonSuperUserFormData) => {
|
|
props.onGetStarted &&
|
|
props.onGetStarted(
|
|
data.role !== "other" ? data.role : props.role_name,
|
|
data.useCase,
|
|
);
|
|
};
|
|
|
|
return (
|
|
<StyledNonSuperUserForm onSubmit={props.handleSubmit(onSubmit)}>
|
|
<Space />
|
|
<DropdownWrapper
|
|
label={createMessage(WELCOME_FORM_NON_SUPER_USER_ROLE_DROPDOWN)}
|
|
>
|
|
<Field
|
|
asyncControl
|
|
component={withDropdown(roleOptions)}
|
|
name="role"
|
|
placeholder=""
|
|
type="text"
|
|
/>
|
|
</DropdownWrapper>
|
|
{props.role == "other" && (
|
|
<StyledFormGroup label={createMessage(WELCOME_FORM_ROLE)}>
|
|
<FormTextField name="role_name" placeholder="" type="text" />
|
|
</StyledFormGroup>
|
|
)}
|
|
<DropdownWrapper
|
|
label={createMessage(WELCOME_FORM_NON_SUPER_USER_USE_CASE)}
|
|
>
|
|
<Field
|
|
asyncControl
|
|
component={withDropdown(useCaseOptions)}
|
|
name="useCase"
|
|
placeholder=""
|
|
type="text"
|
|
/>
|
|
</DropdownWrapper>
|
|
<ActionContainer>
|
|
<StyledButton
|
|
className="t--get-started-button"
|
|
isDisabled={props.invalid}
|
|
onClick={() =>
|
|
!props.invalid && // temp fix - design system needs to be fixed for disabling click
|
|
props.onGetStarted &&
|
|
props.onGetStarted(
|
|
props.role !== "other" ? props.role : props.role_name,
|
|
props.useCase,
|
|
)
|
|
}
|
|
size="md"
|
|
>
|
|
{createMessage(WELCOME_ACTION)}
|
|
</StyledButton>
|
|
</ActionContainer>
|
|
</StyledNonSuperUserForm>
|
|
);
|
|
}
|
|
|
|
const selector = formValueSelector(WELCOME_NON_SUPER_FORM_NAME);
|
|
export default connect((state: AppState) => {
|
|
return {
|
|
role: selector(state, WELCOME_FORM_ROLE_FIELD_NAME),
|
|
role_name: selector(state, WELCOME_FORM_ROLE_NAME_FIELD_NAME),
|
|
useCase: selector(state, WELCOME_FORM_USECASE_FIELD_NAME),
|
|
};
|
|
}, null)(
|
|
reduxForm<NonSuperUserFormData, UserFormProps>({
|
|
validate,
|
|
form: WELCOME_NON_SUPER_FORM_NAME,
|
|
touchOnBlur: true,
|
|
})(NonSuperUser),
|
|
);
|