2022-08-22 05:09:39 +00:00
|
|
|
import React from "react";
|
2023-05-19 18:37:06 +00:00
|
|
|
import { FormGroup as StyledFormGroup } from "design-system-old";
|
|
|
|
|
import { Button } from "design-system";
|
2022-10-05 11:06:49 +00:00
|
|
|
import FormTextField from "components/utils/ReduxFormTextField";
|
2021-10-21 05:36:17 +00:00
|
|
|
import {
|
|
|
|
|
WELCOME_FORM_ROLE_FIELD_NAME,
|
|
|
|
|
WELCOME_FORM_ROLE_NAME_FIELD_NAME,
|
|
|
|
|
WELCOME_FORM_USECASE_FIELD_NAME,
|
|
|
|
|
WELCOME_NON_SUPER_FORM_NAME,
|
2022-09-02 17:15:08 +00:00
|
|
|
} from "@appsmith/constants/forms";
|
2021-10-21 05:36:17 +00:00
|
|
|
import {
|
|
|
|
|
createMessage,
|
|
|
|
|
WELCOME_ACTION,
|
|
|
|
|
WELCOME_FORM_NON_SUPER_USER_ROLE_DROPDOWN,
|
|
|
|
|
WELCOME_FORM_NON_SUPER_USER_USE_CASE,
|
|
|
|
|
WELCOME_FORM_ROLE,
|
2022-02-11 18:08:46 +00:00
|
|
|
} from "@appsmith/constants/messages";
|
2021-10-21 05:36:17 +00:00
|
|
|
import { connect } from "react-redux";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### 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
- [x] 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
- [x] 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: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { AppState } from "@appsmith/reducers";
|
|
|
|
|
import type { InjectedFormProps } from "redux-form";
|
|
|
|
|
import { Field, formValueSelector, reduxForm } from "redux-form";
|
2021-10-21 05:36:17 +00:00
|
|
|
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
|
2021-10-29 09:10:30 +00:00
|
|
|
className="t--welcome-form-get-started"
|
2021-10-21 05:36:17 +00:00
|
|
|
onClick={() => props.onGetStarted && props.onGetStarted()}
|
2023-05-19 18:37:06 +00:00
|
|
|
size="md"
|
|
|
|
|
>
|
|
|
|
|
{createMessage(WELCOME_ACTION)}
|
|
|
|
|
</StyledButton>
|
2021-10-21 05:36:17 +00:00
|
|
|
</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,
|
|
|
|
|
) {
|
2023-04-17 06:50:12 +00:00
|
|
|
const onSubmit = (data: NonSuperUserFormData) => {
|
|
|
|
|
props.onGetStarted &&
|
|
|
|
|
props.onGetStarted(
|
|
|
|
|
data.role !== "other" ? data.role : props.role_name,
|
|
|
|
|
data.useCase,
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
2021-10-21 05:36:17 +00:00
|
|
|
return (
|
2023-04-17 06:50:12 +00:00
|
|
|
<StyledNonSuperUserForm onSubmit={props.handleSubmit(onSubmit)}>
|
2021-10-21 05:36:17 +00:00
|
|
|
<Space />
|
|
|
|
|
<DropdownWrapper
|
|
|
|
|
label={createMessage(WELCOME_FORM_NON_SUPER_USER_ROLE_DROPDOWN)}
|
|
|
|
|
>
|
|
|
|
|
<Field
|
|
|
|
|
asyncControl
|
2023-05-19 18:37:06 +00:00
|
|
|
component={withDropdown(roleOptions)}
|
2021-10-21 05:36:17 +00:00
|
|
|
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
|
2023-05-19 18:37:06 +00:00
|
|
|
component={withDropdown(useCaseOptions)}
|
2021-10-21 05:36:17 +00:00
|
|
|
name="useCase"
|
|
|
|
|
placeholder=""
|
|
|
|
|
type="text"
|
|
|
|
|
/>
|
|
|
|
|
</DropdownWrapper>
|
|
|
|
|
<ActionContainer>
|
|
|
|
|
<StyledButton
|
|
|
|
|
className="t--get-started-button"
|
2023-05-19 18:37:06 +00:00
|
|
|
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>
|
2021-10-21 05:36:17 +00:00
|
|
|
</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),
|
|
|
|
|
);
|