## Description Added ESLint rule to force blank lines between statements. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10924926728> > Commit: 34f57714a1575ee04e94e03cbcaf95e57a96c86c > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10924926728&attempt=1&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: @tag.All > Spec: > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/ClientSide/Anvil/AnvilModal_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts</ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. > <hr>Wed, 18 Sep 2024 16:33:36 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --------- Co-authored-by: Valera Melnikov <valera@appsmith.com>
256 lines
7.2 KiB
TypeScript
256 lines
7.2 KiB
TypeScript
import React, { useLayoutEffect } from "react";
|
|
import type { AppState } from "ee/reducers";
|
|
import type { RouteComponentProps } from "react-router-dom";
|
|
import { withRouter } from "react-router-dom";
|
|
import { connect } from "react-redux";
|
|
import type { InjectedFormProps } from "redux-form";
|
|
import { reduxForm, Field } from "redux-form";
|
|
import { RESET_PASSWORD_FORM_NAME } from "ee/constants/forms";
|
|
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
|
|
import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors";
|
|
import FormTextField from "components/utils/ReduxFormTextField";
|
|
import { Button, Callout, Icon, Link } from "@appsmith/ads";
|
|
import Spinner from "components/editorComponents/Spinner";
|
|
import StyledForm from "components/editorComponents/Form";
|
|
import { isEmptyString, isStrongPassword } from "utils/formhelpers";
|
|
import type { ResetPasswordFormValues } from "./helpers";
|
|
import { resetPasswordSubmitHandler } from "./helpers";
|
|
import { FormActions, StyledFormGroup } from "./StyledComponents";
|
|
import { AUTH_LOGIN_URL, FORGOT_PASSWORD_URL } from "constants/routes";
|
|
import {
|
|
RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL,
|
|
RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER,
|
|
RESET_PASSWORD_SUBMIT_BUTTON_TEXT,
|
|
RESET_PASSWORD_PAGE_TITLE,
|
|
FORM_VALIDATION_INVALID_PASSWORD,
|
|
FORM_VALIDATION_EMPTY_PASSWORD,
|
|
RESET_PASSWORD_EXPIRED_TOKEN,
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
RESET_PASSWORD_INVALID_TOKEN,
|
|
RESET_PASSWORD_RESET_SUCCESS,
|
|
RESET_PASSWORD_RESET_SUCCESS_LOGIN_LINK,
|
|
createMessage,
|
|
} from "ee/constants/messages";
|
|
import Container from "./Container";
|
|
import type { CalloutProps } from "@appsmith/ads";
|
|
|
|
const validate = (values: ResetPasswordFormValues) => {
|
|
const errors: ResetPasswordFormValues = {};
|
|
|
|
if (!values.password || isEmptyString(values.password)) {
|
|
errors.password = createMessage(FORM_VALIDATION_EMPTY_PASSWORD);
|
|
} else if (!isStrongPassword(values.password)) {
|
|
errors.password = createMessage(FORM_VALIDATION_INVALID_PASSWORD);
|
|
}
|
|
|
|
return errors;
|
|
};
|
|
|
|
type ResetPasswordProps = InjectedFormProps<
|
|
ResetPasswordFormValues,
|
|
{
|
|
verifyToken: (token: string) => void;
|
|
isTokenValid: boolean;
|
|
validatingToken: boolean;
|
|
}
|
|
> & {
|
|
verifyToken: (token: string) => void;
|
|
isTokenValid: boolean;
|
|
validatingToken: boolean;
|
|
} & RouteComponentProps<{ email: string; token: string }>;
|
|
|
|
export function ResetPassword(props: ResetPasswordProps) {
|
|
const {
|
|
error,
|
|
handleSubmit,
|
|
initialValues,
|
|
isTokenValid,
|
|
pristine,
|
|
submitFailed,
|
|
submitSucceeded,
|
|
submitting,
|
|
validatingToken,
|
|
verifyToken,
|
|
} = props;
|
|
|
|
useLayoutEffect(() => {
|
|
if (initialValues.token) verifyToken(initialValues.token);
|
|
}, [initialValues.token, verifyToken]);
|
|
|
|
const showInvalidMessage = !initialValues.token;
|
|
const showExpiredMessage = !isTokenValid && !validatingToken;
|
|
const showSuccessMessage = submitSucceeded && !pristine;
|
|
const showFailureMessage = submitFailed && !!error;
|
|
|
|
let message = "";
|
|
let messageActions = undefined;
|
|
|
|
if (showExpiredMessage || showInvalidMessage) {
|
|
const messageActionText = createMessage(
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
);
|
|
|
|
messageActions = [
|
|
{
|
|
to: FORGOT_PASSWORD_URL,
|
|
children: messageActionText,
|
|
target: "_self",
|
|
},
|
|
];
|
|
}
|
|
|
|
if (showExpiredMessage) {
|
|
message = createMessage(RESET_PASSWORD_EXPIRED_TOKEN);
|
|
}
|
|
|
|
if (showInvalidMessage) {
|
|
message = createMessage(RESET_PASSWORD_INVALID_TOKEN);
|
|
}
|
|
|
|
if (showSuccessMessage) {
|
|
const messageActionText = createMessage(
|
|
RESET_PASSWORD_RESET_SUCCESS_LOGIN_LINK,
|
|
);
|
|
|
|
message = createMessage(RESET_PASSWORD_RESET_SUCCESS);
|
|
messageActions = [
|
|
{
|
|
to: AUTH_LOGIN_URL,
|
|
children: messageActionText,
|
|
target: "_self",
|
|
},
|
|
];
|
|
}
|
|
|
|
if (showFailureMessage) {
|
|
message = error;
|
|
|
|
if (
|
|
message
|
|
.toLowerCase()
|
|
.includes(
|
|
createMessage(RESET_PASSWORD_FORGOT_PASSWORD_LINK).toLowerCase(),
|
|
)
|
|
) {
|
|
const messageActionText = createMessage(
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
);
|
|
|
|
messageActions = [
|
|
{
|
|
to: FORGOT_PASSWORD_URL,
|
|
children: messageActionText,
|
|
target: "_self",
|
|
},
|
|
];
|
|
}
|
|
}
|
|
|
|
const messageTagProps: CalloutProps = {
|
|
kind:
|
|
showInvalidMessage || showExpiredMessage || showFailureMessage
|
|
? "error"
|
|
: "success",
|
|
links: messageActions,
|
|
children: message,
|
|
};
|
|
|
|
if (showInvalidMessage || showExpiredMessage) {
|
|
return <Callout {...messageTagProps} />;
|
|
}
|
|
|
|
if (!isTokenValid && validatingToken) {
|
|
return <Spinner />;
|
|
}
|
|
|
|
const footerSection = (
|
|
<div className="px-2 flex items-center justify-center text-center text-[color:var(--ads-v2\-color-fg)] text-[14px]">
|
|
<Icon name="arrow-left-line" size="md" />
|
|
Back to
|
|
<Link
|
|
className="text-sm justify-center"
|
|
kind="primary"
|
|
target="_self"
|
|
to={AUTH_LOGIN_URL}
|
|
>
|
|
Sign in
|
|
</Link>
|
|
</div>
|
|
);
|
|
|
|
return (
|
|
<Container
|
|
footer={footerSection}
|
|
title={createMessage(RESET_PASSWORD_PAGE_TITLE)}
|
|
>
|
|
{(showSuccessMessage || showFailureMessage) && (
|
|
<Callout {...messageTagProps} />
|
|
)}
|
|
<StyledForm onSubmit={handleSubmit(resetPasswordSubmitHandler)}>
|
|
<StyledFormGroup
|
|
className="text-[color:var(--ads-v2\-color-fg)]"
|
|
intent={error ? "danger" : "none"}
|
|
label={createMessage(RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL)}
|
|
>
|
|
<FormTextField
|
|
disabled={submitSucceeded}
|
|
name="password"
|
|
placeholder={createMessage(
|
|
RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER,
|
|
)}
|
|
type="password"
|
|
/>
|
|
</StyledFormGroup>
|
|
<Field component="input" name="email" type="hidden" />
|
|
<Field component="input" name="token" type="hidden" />
|
|
<FormActions>
|
|
<Button
|
|
isDisabled={pristine || submitSucceeded}
|
|
isLoading={submitting}
|
|
size="md"
|
|
type="submit"
|
|
>
|
|
{createMessage(RESET_PASSWORD_SUBMIT_BUTTON_TEXT)}
|
|
</Button>
|
|
</FormActions>
|
|
</StyledForm>
|
|
</Container>
|
|
);
|
|
}
|
|
|
|
export default connect(
|
|
(state: AppState, props: ResetPasswordProps) => {
|
|
const queryParams = new URLSearchParams(props.location.search);
|
|
|
|
return {
|
|
initialValues: {
|
|
token: queryParams.get("token") || undefined,
|
|
},
|
|
isTokenValid: getIsTokenValid(state),
|
|
validatingToken: getIsValidatingToken(state),
|
|
};
|
|
},
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
(dispatch: any) => ({
|
|
verifyToken: (token: string) =>
|
|
dispatch({
|
|
type: ReduxActionTypes.RESET_PASSWORD_VERIFY_TOKEN_INIT,
|
|
payload: { token },
|
|
}),
|
|
}),
|
|
)(
|
|
reduxForm<
|
|
ResetPasswordFormValues,
|
|
{
|
|
verifyToken: (token: string) => void;
|
|
validatingToken: boolean;
|
|
isTokenValid: boolean;
|
|
}
|
|
>({
|
|
validate,
|
|
form: RESET_PASSWORD_FORM_NAME,
|
|
touchOnBlur: true,
|
|
})(withRouter(ResetPassword)),
|
|
);
|