Skip to content

Commit 0312c39

Browse files
committed
fix: gender default value
1 parent 2fd8a9a commit 0312c39

2 files changed

Lines changed: 37 additions & 21 deletions

File tree

src/components/provider/TanstackProvider/index.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@
22

33
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
44

5-
const queryClient = new QueryClient();
5+
const queryClient = new QueryClient({
6+
defaultOptions: {
7+
queries: {
8+
retry: false,
9+
staleTime: 5 * 60 * 1000,
10+
},
11+
mutations: {
12+
retry: false,
13+
},
14+
},
15+
});
616

717
const TanstackProvider = ({ children }: { children: React.ReactNode }) => {
818
return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;

src/features/profile/components/ProfileForm.tsx

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { CalendarIcon } from "lucide-react";
66
import { useTranslations } from "next-intl";
77
import { Button } from "@/components/ui/Button";
88
import { Input } from "@/components/ui/Input";
9-
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/Select";
9+
import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/Select";
1010
import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/Form";
1111
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/Popover";
1212
import { Calendar } from "@/components/ui/Calendar";
@@ -43,7 +43,7 @@ const ProfileForm = ({ activeTab }: ProfileFormProps) => {
4343

4444
useEffect(() => {
4545
if (data) {
46-
form.reset({
46+
const resetData = {
4747
username: data.username || "",
4848
fullname: data.fullname || "",
4949
date_of_birth: data.date_of_birth || "",
@@ -53,7 +53,9 @@ const ProfileForm = ({ activeTab }: ProfileFormProps) => {
5353
github: data.github || "",
5454
linkedin: data.linkedin || "",
5555
personal_web: data.personal_web || "",
56-
});
56+
};
57+
58+
form.reset(resetData);
5759
}
5860
}, [data]);
5961

@@ -141,23 +143,27 @@ const ProfileForm = ({ activeTab }: ProfileFormProps) => {
141143
<FormField
142144
control={form.control}
143145
name="gender"
144-
render={({ field }) => (
145-
<FormItem>
146-
<FormLabel>{t("form.label.gender")}</FormLabel>
147-
<FormControl>
148-
<Select onValueChange={field.onChange} value={field.value}>
149-
<SelectTrigger>
150-
<SelectValue placeholder={t("form.placeholder.gender")} />
151-
</SelectTrigger>
152-
<SelectContent>
153-
<SelectItem value="Male">{t("gender.male")}</SelectItem>
154-
<SelectItem value="Female">{t("gender.female")}</SelectItem>
155-
</SelectContent>
156-
</Select>
157-
</FormControl>
158-
<FormMessage />
159-
</FormItem>
160-
)}
146+
render={({ field }) => {
147+
return (
148+
<FormItem>
149+
<FormLabel>{t("form.label.gender")}</FormLabel>
150+
<FormControl>
151+
<Select defaultValue={data?.gender || ""} onValueChange={field.onChange}>
152+
<SelectTrigger>
153+
<SelectValue placeholder={t("form.placeholder.gender")} />
154+
</SelectTrigger>
155+
<SelectContent>
156+
<SelectGroup>
157+
<SelectItem value="Male">{t("gender.male")}</SelectItem>
158+
<SelectItem value="Female">{t("gender.female")}</SelectItem>
159+
</SelectGroup>
160+
</SelectContent>
161+
</Select>
162+
</FormControl>
163+
<FormMessage />
164+
</FormItem>
165+
);
166+
}}
161167
/>
162168

163169
<FormField

0 commit comments

Comments
 (0)