Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Use revalidatePath instead of client side refresh (#1802)
Luke Vella6bd24e7e1f27
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/actions.ts b/apps/web/src/app/[locale]/(space)/settings/profile/actions.tsindex 1163dedc5..0ae91251a 100644--- a/apps/web/src/app/[locale]/(space)/settings/profile/actions.ts+++ b/apps/web/src/app/[locale]/(space)/settings/profile/actions.ts@@ -1,6 +1,7 @@"use server";import { ActionError, authActionClient } from "@/features/safe-action/server";+import { signOut } from "@/next-auth";import { subject } from "@casl/ability";import { prisma } from "@rallly/database";@@ -33,6 +34,16 @@ export const deleteCurrentUserAction = authActionClient.action(},});+ ctx.posthog?.capture({+ event: "delete_account",+ distinctId: ctx.user.id,+ properties: {+ email: ctx.user.email,+ },+ });++ await signOut();+return {success: true,};diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsxindex 9b705fdf6..e05889369 100644--- a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx@@ -1,5 +1,4 @@"use client";-import { usePostHog } from "@rallly/posthog/client";import { Button } from "@rallly/ui/button";import type { DialogProps } from "@rallly/ui/dialog";import {@@ -13,7 +12,6 @@ import {} from "@rallly/ui/dialog";import { Form, FormField, FormItem, FormMessage } from "@rallly/ui/form";import { Input } from "@rallly/ui/input";-import { signOut } from "next-auth/react";import { useForm } from "react-hook-form";import { Trans } from "@/components/trans";@@ -34,16 +32,7 @@ export function DeleteAccountDialog({},});- const posthog = usePostHog();-- const deleteUser = useSafeAction(deleteCurrentUserAction, {- onSuccess: () => {- posthog?.capture("delete account");- signOut({- redirectTo: "/login",- });- },- });+ const deleteUser = useSafeAction(deleteCurrentUserAction);const { t } = useTranslation();return (diff --git a/apps/web/src/app/[locale]/admin-setup/actions.ts b/apps/web/src/app/[locale]/admin-setup/actions.tsindex 6d162fc89..d9a3ef17a 100644--- a/apps/web/src/app/[locale]/admin-setup/actions.ts+++ b/apps/web/src/app/[locale]/admin-setup/actions.ts@@ -3,6 +3,7 @@ import { authActionClient } from "@/features/safe-action/server";import { ActionError } from "@/features/safe-action/server";import { subject } from "@casl/ability";import { prisma } from "@rallly/database";+import { redirect } from "next/navigation";export const makeMeAdminAction = authActionClient.action(async ({ ctx }) => {if (ctx.ability.cannot("update", subject("User", ctx.user), "role")) {@@ -20,4 +21,6 @@ export const makeMeAdminAction = authActionClient.action(async ({ ctx }) => {role: "admin",},});++ redirect("/control-panel");});diff --git a/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx b/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsxindex 3e120fb3c..e056286d3 100644--- a/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx+++ b/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx@@ -3,16 +3,10 @@import { Trans } from "@/components/trans";import { useSafeAction } from "@/features/safe-action/client";import { Button } from "@rallly/ui/button";-import { useRouter } from "next/navigation";import { makeMeAdminAction } from "./actions";export function MakeMeAdminButton() {- const router = useRouter();- const makeMeAdmin = useSafeAction(makeMeAdminAction, {- onSuccess: () => {- router.replace("/control-panel");- },- });+ const makeMeAdmin = useSafeAction(makeMeAdminAction);return (<ButtononClick={async () => {diff --git a/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx b/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsxindex dc05972bc..eeb57f4d9 100644--- a/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx+++ b/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx@@ -24,7 +24,6 @@ import {FormMessage,} from "@rallly/ui/form";import { Input } from "@rallly/ui/input";-import { useRouter } from "next/navigation";import { useForm } from "react-hook-form";import { z } from "zod";@@ -53,7 +52,6 @@ export function DeleteUserDialog({open: boolean;onOpenChange: (open: boolean) => void;}) {- const router = useRouter();const schema = useSchema(email);const form = useForm({resolver: zodResolver(schema),@@ -64,7 +62,6 @@ export function DeleteUserDialog({const deleteUser = useSafeAction(deleteUserAction, {onSuccess: () => {- router.refresh();onOpenChange(false);},});diff --git a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx b/apps/web/src/app/[locale]/control-panel/users/user-row.tsxindex b9999a3d1..d52a9278f 100644--- a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx+++ b/apps/web/src/app/[locale]/control-panel/users/user-row.tsx@@ -23,7 +23,6 @@ import {} from "@rallly/ui/dropdown-menu";import { Icon } from "@rallly/ui/icon";import { MoreHorizontal, TrashIcon, UserPenIcon } from "lucide-react";-import { useRouter } from "next/navigation";import { useTransition } from "react";import { DeleteUserDialog } from "./dialogs/delete-user-dialog";@@ -40,12 +39,7 @@ export function UserRow({image?: string;role: "admin" | "user";}) {- const router = useRouter();- const changeRole = useSafeAction(changeRoleAction, {- onSuccess: () => {- router.refresh();- },- });+ const changeRole = useSafeAction(changeRoleAction);const [isPending, startTransition] = useTransition();const { user } = useUser();diff --git a/apps/web/src/features/user/actions.ts b/apps/web/src/features/user/actions.tsindex e4703c690..8b6588d3d 100644--- a/apps/web/src/features/user/actions.ts+++ b/apps/web/src/features/user/actions.ts@@ -2,6 +2,7 @@import { ActionError, authActionClient } from "@/features/safe-action/server";import { subject } from "@casl/ability";import { prisma } from "@rallly/database";+import { revalidatePath } from "next/cache";import { z } from "zod";import { getUser } from "./queries";@@ -46,6 +47,8 @@ export const changeRoleAction = authActionClientrole,},});++ revalidatePath("/control-panel");});export const deleteUserAction = authActionClient@@ -83,6 +86,8 @@ export const deleteUserAction = authActionClient},});+ revalidatePath("/control-panel");+return {success: true,};