Skip to content
Extraits de code Groupes Projets
Valider 179c7493 rédigé par MarouaneSaoud's avatar MarouaneSaoud
Parcourir les fichiers

Add ability to edit user's first name in quick edit

parent 4a56b2ad
Branches
1 requête de fusion!417MYD-796 : Add ability to edit user's first name in quick edit
Pipeline #10552 réussi avec l'étape
in 6 minutes et 38 secondes
......@@ -40,7 +40,7 @@ NEXT_PUBLIC_DEFAULT_IMAGE_URL=https://mydressin-rec.s3.eu-west-3.amazonaws.com/I
#GATEWAY API URL
NEXT_PUBLIC_MYDRESSIN_GATEWAY_API_URL=https://api-gateway.mydressin-server.com/
NEXT_PUBLIC_MYDRESSIN_GATEWAY_API_URL=http://localhost:8080
NEXT_PUBLIC_MYDRESSIN_CLIENT_URL=https://app.mydressin-server.com/*
......
......@@ -139,7 +139,7 @@ export default function AccountGeneral() {
disabled
name="role"
label="Rôle"
value={user?.roles?.name || ""}
value={user?.roles?.value || ""}
InputProps={{ readOnly: true, style: { color: "#888" } }}
fullWidth
/>
......
......@@ -39,7 +39,8 @@ export default function UserQuickEditForm({
const [roleData, setRoleData] = useState<IRole[]>([]);
const NewUserSchema = Yup.object().shape({
name: Yup.string().required("Name is required"),
lastName: Yup.string().required("Name is required"),
firstName: Yup.string().required("Prénom is required"),
email: Yup.string()
.required("Email is required")
.email("Email must be a valid email address"),
......@@ -50,7 +51,8 @@ export default function UserQuickEditForm({
const defaultValues = useMemo(
() => ({
name: currentUser?.firstName || "",
lastName: currentUser?.lastName || "",
firstName: currentUser?.firstName || "",
email: currentUser?.email || "",
pseudo: currentUser?.pseudo || "",
status: currentUser?.status || "",
......@@ -90,8 +92,8 @@ export default function UserQuickEditForm({
uid,
password: currentUser?.password || "",
phoneNumber: currentUser?.phoneNumber || "",
firstName: data.name,
lastName: currentUser?.lastName || "",
firstName: data.firstName,
lastName: data.lastName || "",
imageUrl: currentUser?.imageUrl || "",
roles: selectedRole || { id: null, name: data.role },
status: data.status,
......@@ -123,7 +125,7 @@ export default function UserQuickEditForm({
}}
>
<FormProvider methods={methods} onSubmit={onSubmit}>
<DialogTitle>Quick Update</DialogTitle>
<DialogTitle>Édition rapide</DialogTitle>
<DialogContent>
<Box
......@@ -136,8 +138,7 @@ export default function UserQuickEditForm({
}}
sx={{ mt: 2 }}
>
{/* Affichage du champ status conditionné par le rôle CLIENT */}
<RHFSelect name="status" label="Status" disabled={defaultValues.role !== "CLIENT"}>
<RHFSelect name="status" label="Statut" disabled={defaultValues.role !== "CLIENT"}>
{USER_STATUS_OPTIONS.map((status) => (
<MenuItem key={status.value} value={status.value}>
{status.label}
......@@ -145,13 +146,14 @@ export default function UserQuickEditForm({
))}
</RHFSelect>
<RHFTextField name="name" label="Full Name" />
<RHFTextField disabled name="email" label="Email Address" />
<RHFTextField name="lastName" label="Nom" />
<RHFTextField name="firstName" label="prénom" />
<RHFTextField disabled name="email" label="Addresse Email" />
<RHFTextField name="pseudo" label="Pseudo" />
<RHFSelect
name="role"
label="Role"
label="Rôle"
defaultValue={defaultValues.role}
disabled={defaultValues.role === "CLIENT"}
>
......@@ -171,7 +173,7 @@ export default function UserQuickEditForm({
<DialogActions>
<Button variant="outlined" onClick={onClose}>
Cancel
Annuler
</Button>
<LoadingButton
......@@ -179,7 +181,7 @@ export default function UserQuickEditForm({
variant="contained"
loading={isSubmitting}
>
Update
Modifier
</LoadingButton>
</DialogActions>
</FormProvider>
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter