djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
dominik-zeglen 2019-12-03 17:42:27 +01:00
parent 1bded89d1e
commit 01a83f8aa1
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/staff/components/StaffPasswordResetDialog/StaffPasswordResetDialog.tsx
View file

@ -17,8 +17,8 @@ import FormSpacer from "@saleor/components/FormSpacer";
import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors"; import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors";
interface StaffPasswordResetDialogFormData { interface StaffPasswordResetDialogFormData {
password: string; newPassword: string;
previousPassword: string; oldPassword: string;
} }
export interface StaffPasswordResetDialogProps extends DialogProps { export interface StaffPasswordResetDialogProps extends DialogProps {
confirmButtonState: ConfirmButtonTransitionState; confirmButtonState: ConfirmButtonTransitionState;
@ -27,8 +27,8 @@ export interface StaffPasswordResetDialogProps extends DialogProps {
} }
const initialForm: StaffPasswordResetDialogFormData = { const initialForm: StaffPasswordResetDialogFormData = {
password: "", newPassword: "",
previousPassword: "" oldPassword: ""
}; };
const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({ const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({
@ -54,33 +54,33 @@ const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({
<> <>
<DialogContent> <DialogContent>
<TextField <TextField
error={!!errors.previousPassword} error={!!errors.oldPassword}
fullWidth fullWidth
helperText={errors.previousPassword} helperText={errors.oldPassword}
label={intl.formatMessage({ label={intl.formatMessage({
defaultMessage: "Previous Password", defaultMessage: "Previous Password",
description: "input label" description: "input label"
})} })}
name="previousPassword" name="oldPassword"
type="password" type="password"
onChange={change} onChange={change}
/> />
<FormSpacer /> <FormSpacer />
<TextField <TextField
error={!!errors.password} error={!!errors.newPassword}
fullWidth fullWidth
helperText={ helperText={
errors.password || errors.newPassword ||
intl.formatMessage({ intl.formatMessage({
defaultMessage: defaultMessage:
"New password must be at least 5 characters long" "New newPassword must be at least 8 characters long"
}) })
} }
label={intl.formatMessage({ label={intl.formatMessage({
defaultMessage: "New Password", defaultMessage: "New Password",
description: "input label" description: "input label"
})} })}
name="password" name="newPassword"
type="password" type="password"
onChange={change} onChange={change}
/> />
@ -90,7 +90,7 @@ const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({
<FormattedMessage {...buttonMessages.back} /> <FormattedMessage {...buttonMessages.back} />
</Button> </Button>
<ConfirmButton <ConfirmButton
disabled={data.password.length <= 4} disabled={!(data.newPassword.length >= 8)}
transitionState={confirmButtonState} transitionState={confirmButtonState}
color="primary" color="primary"
variant="contained" variant="contained"

5
src/staff/views/StaffDetails.tsx
View file

@ -261,10 +261,7 @@ export const StaffDetails: React.FC<OrderListProps> = ({ id, params }) => {
onClose={closeModal} onClose={closeModal}
onSubmit={data => onSubmit={data =>
changePassword({ changePassword({
variables: { variables: data
newPassword: data.password,
oldPassword: data.previousPassword
}
}) })
} }
/> />