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

Make it work

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

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

@ -14,6 +14,7 @@ import ConfirmButton, {
ConfirmButtonTransitionState
} from "@saleor/components/ConfirmButton";
import FormSpacer from "@saleor/components/FormSpacer";
import useModalDialogErrors from "@saleor/hooks/useModalDialogErrors";
interface StaffPasswordResetDialogFormData {
password: string;
@ -38,6 +39,7 @@ const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({
onSubmit
}) => {
const intl = useIntl();
const dialogErrors = useModalDialogErrors(apiErrors, open);
return (
<Dialog onClose={onClose} open={open} fullWidth maxWidth="sm">
@ -47,7 +49,7 @@ const StaffPasswordResetDialog: React.FC<StaffPasswordResetDialogProps> = ({
description="dialog header"
/>
</DialogTitle>
<Form errors={apiErrors} initial={initialForm} onSubmit={onSubmit}>
<Form errors={dialogErrors} initial={initialForm} onSubmit={onSubmit}>
{({ change, data, errors, submit }) => (
<>
<DialogContent>

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

@ -15,7 +15,8 @@ import {
TypedStaffAvatarDeleteMutation,
TypedStaffAvatarUpdateMutation,
TypedStaffMemberDeleteMutation,
TypedStaffMemberUpdateMutation
TypedStaffMemberUpdateMutation,
useChangeStaffPassword
} from "../mutations";
import { TypedStaffMemberDetailsQuery } from "../queries";
import { StaffAvatarDelete } from "../types/StaffAvatarDelete";
@ -28,6 +29,7 @@ import {
StaffMemberDetailsUrlQueryParams
} from "../urls";
import StaffPasswordResetDialog from "../components/StaffPasswordResetDialog";
import { ChangeStaffPassword } from "../types/ChangeStaffPassword";
interface OrderListProps {
id: string;
@ -49,6 +51,24 @@ export const StaffDetails: React.FC<OrderListProps> = ({ id, params }) => {
})
);
const handleChangePassword = (data: ChangeStaffPassword) => {
if (data.passwordChange.errors.length === 0) {
notify({
text: intl.formatMessage(commonMessages.savedChanges)
});
closeModal();
}
};
const [changePassword, changePasswordOpts] = useChangeStaffPassword({
onCompleted: handleChangePassword
});
const changePasswordTransitionState = getMutationState(
changePasswordOpts.called,
changePasswordOpts.loading,
maybe(() => changePasswordOpts.data.passwordChange.errors)
);
return (
<TypedStaffMemberDetailsQuery
displayLoader
@ -228,11 +248,25 @@ export const StaffDetails: React.FC<OrderListProps> = ({ id, params }) => {
</DialogContentText>
</ActionDialog>
<StaffPasswordResetDialog
confirmButtonState="default"
errors={[]}
confirmButtonState={
changePasswordTransitionState
}
errors={maybe(
() =>
changePasswordOpts.data.passwordChange
.errors,
[]
)}
open={params.action === "change-password"}
onClose={closeModal}
onSubmit={() => undefined}
onSubmit={data =>
changePassword({
variables: {
newPassword: data.password,
oldPassword: data.previousPassword
}
})
}
/>
</>
);