Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🐛 Fix language preference resetting after save (#2664)
Luke Vella8021eed00d05
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsxindex f61253ee6..dd5bd846d 100644--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx@@ -15,9 +15,10 @@ import Link from "next/link";import { useForm } from "react-hook-form";import * as z from "zod";import { LanguageSelect } from "@/components/language-selector";+import { updateLocalizationAction } from "@/features/user/actions";import { Trans } from "@/i18n/client";import { useLocale } from "@/lib/locale/client";-import { trpc } from "@/trpc/client";+import { useSafeAction } from "@/lib/safe-action/client";const formSchema = z.object({language: z.string(),@@ -28,12 +29,8 @@ export const LanguagePreference = ({}: {defaultValue?: string;}) => {- const { locale, changeLocale } = useLocale();- const updateLocale = trpc.user.updateLocale.useMutation({- onSuccess: (_data, variables) => {- changeLocale(variables.locale);- },- });+ const { locale } = useLocale();+ const updateLocalization = useSafeAction(updateLocalizationAction);const form = useForm({defaultValues: {language: defaultValue ?? locale,@@ -45,7 +42,12 @@ export const LanguagePreference = ({<Form {...form}><formonSubmit={form.handleSubmit(async (data) => {- await updateLocale.mutateAsync({ locale: data.language });+ const result = await updateLocalization.executeAsync({+ locale: data.language,+ });+ if (!result?.serverError && !result?.validationErrors) {+ form.reset({ language: data.language });+ }})}><FormFielddiff --git a/apps/web/src/features/user/actions.ts b/apps/web/src/features/user/actions.tsindex 54bab9e14..8eaf74fda 100644--- a/apps/web/src/features/user/actions.ts+++ b/apps/web/src/features/user/actions.ts@@ -1,12 +1,14 @@"use server";import { subject } from "@casl/ability";import { prisma } from "@rallly/database";+import { supportedLngs } from "@rallly/languages";import { headers } from "next/headers";import * as z from "zod";import { banUser, unbanUser, updateUserRole } from "@/features/user/mutations";import authLib from "@/lib/auth";import { timeFormatSchema, weekStartSchema } from "@/lib/datetime/schema";import { AppError } from "@/lib/errors/app-error";+import { setLocaleCookie } from "@/lib/locale/cookie";import {adminActionClient,authActionClient,@@ -43,6 +45,10 @@ export const updateLocalizationAction = authActionClient.metadata({ actionName: "update_localization" }).inputSchema(z.object({+ locale: z+ .string()+ .refine((value) => supportedLngs.includes(value))+ .optional(),timeZone: timezoneSchema.optional(),timeFormat: timeFormatSchema.optional(),weekStart: weekStartSchema.optional(),@@ -51,12 +57,17 @@ export const updateLocalizationAction = authActionClient.action(async ({ parsedInput }) => {await authLib.api.updateUser({body: {+ locale: parsedInput.locale,timeZone: parsedInput.timeZone,timeFormat: parsedInput.timeFormat,weekStart: parsedInput.weekStart,},headers: await headers(),});++ if (parsedInput.locale) {+ await setLocaleCookie(parsedInput.locale);+ }});export const getAvatarUploadUrlAction = authActionClientdiff --git a/apps/web/src/lib/locale/client.tsx b/apps/web/src/lib/locale/client.tsxindex 0d5aa0476..21979d0db 100644--- a/apps/web/src/lib/locale/client.tsx+++ b/apps/web/src/lib/locale/client.tsx@@ -4,7 +4,10 @@ import Cookies from "js-cookie";import { useParams, useRouter } from "next/navigation";import React from "react";import { useTranslation } from "@/i18n/client";-import { LOCALE_COOKIE_NAME } from "@/lib/locale/constants";+import {+ LOCALE_COOKIE_NAME,+ LOCALE_COOKIE_OPTIONS,+} from "@/lib/locale/constants";export function LocaleSync({ userLocale }: { userLocale?: string }) {const { locale } = useLocale();@@ -34,22 +37,14 @@ export function LocaleSync({ userLocale }: { userLocale?: string }) {return null;}-export function setLocaleCookie(locale: string) {- Cookies.set(LOCALE_COOKIE_NAME, locale, {- path: "/",- domain: process.env.NEXT_PUBLIC_COOKIE_DOMAIN,- });+function setLocaleCookie(locale: string) {+ Cookies.set(LOCALE_COOKIE_NAME, locale, LOCALE_COOKIE_OPTIONS);}export function useLocale() {const { locale } = useParams();- const router = useRouter();return {locale: locale as string,- changeLocale: (locale: string) => {- setLocaleCookie(locale);- router.refresh();- },};}diff --git a/apps/web/src/lib/locale/constants.ts b/apps/web/src/lib/locale/constants.tsindex 3279c0e43..d9660f845 100644--- a/apps/web/src/lib/locale/constants.ts+++ b/apps/web/src/lib/locale/constants.ts@@ -1 +1,8 @@export const LOCALE_COOKIE_NAME = "rallly_locale";++// Read via process.env: this module is imported from the proxy (edge) and+// client bundles, where `@/env` is unavailable.+export const LOCALE_COOKIE_OPTIONS = {+ path: "/",+ domain: process.env.NEXT_PUBLIC_COOKIE_DOMAIN,+};diff --git a/apps/web/src/lib/locale/cookie.ts b/apps/web/src/lib/locale/cookie.tsnew file mode 100644index 000000000..c2eb43b8c--- /dev/null+++ b/apps/web/src/lib/locale/cookie.ts@@ -0,0 +1,18 @@+import "server-only";+import { supportedLngs } from "@rallly/languages";+import { cookies } from "next/headers";+import {+ LOCALE_COOKIE_NAME,+ LOCALE_COOKIE_OPTIONS,+} from "@/lib/locale/constants";++export async function getLocaleCookie() {+ const cookieStore = await cookies();+ const locale = cookieStore.get(LOCALE_COOKIE_NAME)?.value;+ return locale && supportedLngs.includes(locale) ? locale : undefined;+}++export async function setLocaleCookie(locale: string) {+ const cookieStore = await cookies();+ cookieStore.set(LOCALE_COOKIE_NAME, locale, LOCALE_COOKIE_OPTIONS);+}diff --git a/apps/web/src/trpc/routers/user.ts b/apps/web/src/trpc/routers/user.tsindex 15cf636e4..ae575625d 100644--- a/apps/web/src/trpc/routers/user.ts+++ b/apps/web/src/trpc/routers/user.ts@@ -110,14 +110,6 @@ export const user = router({},});}),- updateLocale: privateProcedure- .input(z.object({ locale: z.string() }))- .mutation(async ({ input, ctx }) => {- await prisma.user.update({- where: { id: ctx.user.id },- data: { locale: input.locale },- });- }),submitFeedback: privateProcedure.use(createRateLimitMiddleware("submit_feedback", 5, "1 h")).input(feedbackSchema)