public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

useForm defaultValues should be available initially (#4863) 

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
pull/4876/head
Hariom Balhara 2022-10-06 19:07:52 +05:30 committed by GitHub
parent 6f811f4f0a
commit 50904d2588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/web/pages/v2/settings/my-account/general.tsx
View File

@ -4,7 +4,7 @@ import { useForm, Controller } from "react-hook-form";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { setIs24hClockInLocalStorage } from "@calcom/lib/timeFormat";
import { trpc } from "@calcom/trpc/react";
import { inferQueryOutput, trpc } from "@calcom/trpc/react";
import { Button } from "@calcom/ui/v2/core/Button";
import Meta from "@calcom/ui/v2/core/Meta";
import TimezoneSelect from "@calcom/ui/v2/core/TimezoneSelect";
@ -34,25 +34,32 @@ const SkeletonLoader = () => {
interface GeneralViewProps {
localeProp: string;
user: inferQueryOutput<"viewer.me">;
}
const WithQuery = withQuery(["viewer.public.i18n"], { trpc: { context: { skipBatch: true } } });
const GeneralQueryView = () => {
const { t } = useLocale();
const { data: user, isLoading } = trpc.useQuery(["viewer.me"]);
if (isLoading) return <SkeletonLoader />;
if (!user) {
throw new Error(t("something_went_wrong"));
}
return (
<WithQuery
success={({ data }) => <GeneralView localeProp={data.locale} />}
success={({ data }) => <GeneralView user={user} localeProp={data.locale} />}
customLoader={<SkeletonLoader />}
/>
);
};
const GeneralView = ({ localeProp }: GeneralViewProps) => {
const GeneralView = ({ localeProp, user }: GeneralViewProps) => {
const router = useRouter();
const utils = trpc.useContext();
const { t } = useLocale();
const { data: user, isLoading } = trpc.useQuery(["viewer.me"]);
const mutation = trpc.useMutation("viewer.updateProfile", {
onSuccess: () => {
showToast(t("settings_updated_successfully"), "success");
@ -93,20 +100,18 @@ const GeneralView = ({ localeProp }: GeneralViewProps) => {
value: localeProp || "",
label: localeOptions.find((option) => option.value === localeProp)?.label || "",
},
timeZone: user?.timeZone || "",
timeZone: user.timeZone || "",
timeFormat: {
value: user?.timeFormat || 12,
label: timeFormatOptions.find((option) => option.value === user?.timeFormat)?.label || 12,
value: user.timeFormat || 12,
label: timeFormatOptions.find((option) => option.value === user.timeFormat)?.label || 12,
},
weekStart: {
value: user?.weekStart,
label: nameOfDay(localeProp, user?.weekStart === "Sunday" ? 0 : 1),
value: user.weekStart,
label: nameOfDay(localeProp, user.weekStart === "Sunday" ? 0 : 1),
},
},
});
if (isLoading) return <SkeletonLoader />;
return (
<Form
form={formMethods}