chore: (2) settings/my-account - remove pages router and use app router

apps/web/app/future/settings/(settings)/my-account/general/page.tsx → apps/web/app/settings/(settings-layout)/my-account/general/page.tsx

@@ -1,5 +1,6 @@
 import { _generateMetadata } from "app/_utils";
 import { getFixedT } from "app/_utils";
+import { revalidatePath } from "next/cache";
 
 import { getServerSessionForAppDir } from "@calcom/feature-auth/lib/get-server-session-for-app-dir";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
@@ -16,9 +17,14 @@ const Page = async () => {
   const session = await getServerSessionForAppDir();
 
   const t = await getFixedT(session?.user.locale || "en");
+  const revalidatePage = async () => {
+    "use server";
+    revalidatePath("settings/my-account/general");
+  };
+
   return (
     <SettingsHeader title={t("general")} description={t("general_description")} borderInShellHeader={true}>
-      <GeneralQueryView />
+      <GeneralQueryView revalidatePage={revalidatePage} />
     </SettingsHeader>
   );
 };

apps/web/modules/settings/my-account/general-view.tsx

@@ -68,9 +68,14 @@ interface GeneralViewProps {
   localeProp: string;
   user: RouterOutputs["viewer"]["me"];
   travelSchedules: RouterOutputs["viewer"]["getTravelSchedules"];
+  revalidatePage: GeneralQueryViewProps["revalidatePage"];
 }
 
-const GeneralQueryView = () => {
+type GeneralQueryViewProps = {
+  revalidatePage: () => Promise<void>;
+};
+
+const GeneralQueryView = ({ revalidatePage }: GeneralQueryViewProps) => {
   const { t } = useLocale();
 
   const { data: user, isPending } = trpc.viewer.me.useQuery();
@@ -82,10 +87,17 @@ const GeneralQueryView = () => {
   if (!user) {
     throw new Error(t("something_went_wrong"));
   }
-  return <GeneralView user={user} travelSchedules={travelSchedules || []} localeProp={user.locale} />;
+  return (
+    <GeneralView
+      user={user}
+      travelSchedules={travelSchedules || []}
+      localeProp={user.locale}
+      revalidatePage={revalidatePage}
+    />
+  );
 };
 
-const GeneralView = ({ localeProp, user, travelSchedules }: GeneralViewProps) => {
+const GeneralView = ({ localeProp, user, travelSchedules, revalidatePage }: GeneralViewProps) => {
   const utils = trpc.useContext();
   const {
     t,
@@ -105,6 +117,7 @@ const GeneralView = ({ localeProp, user, travelSchedules }: GeneralViewProps) =>
       if (res.locale) {
         window.calNewLocale = res.locale;
       }
+      await revalidatePage();
     },
     onError: () => {
       showToast(t("error_updating_settings"), "error");
@@ -177,7 +190,7 @@ const GeneralView = ({ localeProp, user, travelSchedules }: GeneralViewProps) =>
     <div>
       <Form
         form={formMethods}
-        handleSubmit={(values) => {
+        handleSubmit={async (values) => {
           setIsUpdateBtnLoading(true);
           mutation.mutate({
             ...values,

apps/web/next.config.js

@@ -178,6 +178,7 @@ const nextConfig = {
     serverComponentsExternalPackages: ["next-i18next"],
     optimizePackageImports: ["@calcom/ui"],
     instrumentationHook: true,
+    serverActions: true,
   },
   i18n: {
     ...i18n,