Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor account settings components and enhance delete account functionality

Bill Yang19c845e8a9da
diff --git a/client/src/app/settings/account/components/AccountInner.tsx b/client/src/app/settings/account/components/AccountInner.tsx
index 9e5e86559..39ea22100 100644
--- a/client/src/app/settings/account/components/AccountInner.tsx
+++ b/client/src/app/settings/account/components/AccountInner.tsx
@@ -1,20 +1,20 @@
"use client";
import { authClient } from "@/lib/auth";
+import { useQueryClient } from "@tanstack/react-query";
+import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { toast } from "sonner";
+import { useUpdateAccountSettings } from "../../../../api/admin/accountSettings";
import { Button } from "../../../../components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "../../../../components/ui/card";
import { Input } from "../../../../components/ui/input";
-import { ChangePassword } from "./ChangePassword";
-import { DeleteAccount } from "./DeleteAccount";
-import { validateEmail } from "../../../../lib/auth-utils";
-import { useRouter } from "next/navigation";
-import { useQueryClient } from "@tanstack/react-query";
import { Switch } from "../../../../components/ui/switch";
-import { useUpdateAccountSettings } from "../../../../api/admin/accountSettings";
+import { validateEmail } from "../../../../lib/auth-utils";
import { IS_CLOUD } from "../../../../lib/const";
import { ApiKeyManager } from "./ApiKeyManager";
+import { ChangePassword } from "./ChangePassword";
+import { DeleteAccount } from "./DeleteAccount";
export function AccountInner() {
const session = authClient.useSession();
diff --git a/client/src/app/settings/account/components/DeleteAccount.tsx b/client/src/app/settings/account/components/DeleteAccount.tsx
index 874bc8d14..0f7929bf8 100644
--- a/client/src/app/settings/account/components/DeleteAccount.tsx
+++ b/client/src/app/settings/account/components/DeleteAccount.tsx
@@ -18,8 +18,10 @@ import {
} from "../../../../components/ui/alert-dialog";
import { Button } from "../../../../components/ui/button";
import { authClient } from "../../../../lib/auth";
+import { useStripeSubscription } from "../../../../lib/subscription/useStripeSubscription";
export function DeleteAccount() {
+ const { data: subscription } = useStripeSubscription();
const [isDeleting, setIsDeleting] = useState(false);
const [isOpen, setIsOpen] = useState(false);
const router = useRouter();
@@ -49,6 +51,9 @@ export function DeleteAccount() {
setIsOpen(false);
};
+ const accountNotDeletable =
+ isDeleting || subscription?.planName.startsWith("standard") || subscription?.planName.startsWith("pro");
+
return (
<AlertDialog open={isOpen} onOpenChange={setIsOpen}>
<AlertDialogTrigger asChild>
@@ -60,11 +65,12 @@ export function DeleteAccount() {
<AlertDialogHeader>
<AlertDialogTitle className="flex items-center gap-2">
<AlertTriangle className="h-5 w-5" color="hsl(var(--red-500))" />
- Delete your account?
+ {accountNotDeletable ? "Cannot delete account" : "Delete your account?"}
</AlertDialogTitle>
<AlertDialogDescription>
- This action cannot be undone. This will permanently delete your account and remove all your data from our
- servers.
+ {accountNotDeletable
+ ? "You have an active subscription. Please cancel your subscription before deleting your account."
+ : "This action cannot be undone. This will permanently delete your account and remove all your data from our servers."}
</AlertDialogDescription>
</AlertDialogHeader>
@@ -72,16 +78,18 @@ export function DeleteAccount() {
<AlertDialogCancel onClick={handleClose} disabled={isDeleting}>
Cancel
</AlertDialogCancel>
- <AlertDialogAction
- onClick={e => {
- e.preventDefault();
- handleAccountDeletion();
- }}
- variant="destructive"
- disabled={isDeleting}
- >
- {isDeleting ? "Deleting..." : "Delete Account"}
- </AlertDialogAction>
+ {!accountNotDeletable && (
+ <AlertDialogAction
+ onClick={e => {
+ e.preventDefault();
+ handleAccountDeletion();
+ }}
+ variant="destructive"
+ disabled={isDeleting}
+ >
+ {isDeleting ? "Deleting..." : "Delete Account"}
+ </AlertDialogAction>
+ )}
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
diff --git a/client/src/hooks/useTrack.ts b/client/src/hooks/useTrack.ts
index bbf7b9c41..eb6dd22b2 100644
--- a/client/src/hooks/useTrack.ts
+++ b/client/src/hooks/useTrack.ts
@@ -23,12 +23,5 @@ export function useTrack() {
sites: sites?.sites.map(site => site.domain),
});
}
- }, [
- user.data?.user?.id,
- window?.rybbit,
- subscription?.planName,
- isLoading,
- isPendingActiveOrganization,
- isPendingSites,
- ]);
+ }, [user.data?.user?.id, subscription?.planName, isLoading, isPendingActiveOrganization, isPendingSites]);
}