Skip to content

fix: Delete button loader to show only on deleting card #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Delete button loader to show only on deleting card #476

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 75 additions & 59 deletions app/admin/dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { useActionState } from 'react';
import { useState, useTransition } from 'react';
import { Button } from '@/components/ui/button';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
import { Trash2, Loader2 } from 'lucide-react';
Expand Down Expand Up @@ -37,14 +37,72 @@ function DashboardHeader() {
);
}

function TenantCard({
tenant,
onDelete
}: {
tenant: Tenant;
onDelete: (result: DeleteState) => void;
}) {
const [isPending, startTransition] = useTransition();

const handleDelete = () => {
startTransition(async () => {
const formData = new FormData();
formData.append('subdomain', tenant.subdomain);
const result = await deleteSubdomainAction({}, formData);
onDelete(result);
});
};

return (
<Card>
<CardHeader className="pb-2">
<div className="flex items-center justify-between">
<CardTitle className="text-xl">{tenant.subdomain}</CardTitle>
<Button
variant="ghost"
size="icon"
onClick={handleDelete}
disabled={isPending}
className="text-gray-500 hover:text-gray-700 hover:bg-gray-50"
>
{isPending ? (
<Loader2 className="h-5 w-5 animate-spin" />
) : (
<Trash2 className="h-5 w-5" />
)}
</Button>
</div>
</CardHeader>
<CardContent>
<div className="flex items-center justify-between">
<div className="text-4xl">{tenant.emoji}</div>
<div className="text-sm text-gray-500">
Created: {new Date(tenant.createdAt).toLocaleDateString()}
</div>
</div>
<div className="mt-4">
<a
href={`${protocol}://${tenant.subdomain}.${rootDomain}`}
target="_blank"
rel="noopener noreferrer"
className="text-blue-500 hover:underline text-sm"
>
Visit subdomain →
</a>
</div>
</CardContent>
</Card>
);
}

function TenantGrid({
tenants,
action,
isPending
onDelete
}: {
tenants: Tenant[];
action: (formData: FormData) => void;
isPending: boolean;
onDelete: (result: DeleteState) => void;
}) {
if (tenants.length === 0) {
return (
Expand All @@ -59,76 +117,34 @@ function TenantGrid({
return (
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
{tenants.map((tenant) => (
<Card key={tenant.subdomain}>
<CardHeader className="pb-2">
<div className="flex items-center justify-between">
<CardTitle className="text-xl">{tenant.subdomain}</CardTitle>
<form action={action}>
<input
type="hidden"
name="subdomain"
value={tenant.subdomain}
/>
<Button
variant="ghost"
size="icon"
type="submit"
disabled={isPending}
className="text-gray-500 hover:text-gray-700 hover:bg-gray-50"
>
{isPending ? (
<Loader2 className="h-5 w-5 animate-spin" />
) : (
<Trash2 className="h-5 w-5" />
)}
</Button>
</form>
</div>
</CardHeader>
<CardContent>
<div className="flex items-center justify-between">
<div className="text-4xl">{tenant.emoji}</div>
<div className="text-sm text-gray-500">
Created: {new Date(tenant.createdAt).toLocaleDateString()}
</div>
</div>
<div className="mt-4">
<a
href={`${protocol}://${tenant.subdomain}.${rootDomain}`}
target="_blank"
rel="noopener noreferrer"
className="text-blue-500 hover:underline text-sm"
>
Visit subdomain →
</a>
</div>
</CardContent>
</Card>
<TenantCard key={tenant.subdomain} tenant={tenant} onDelete={onDelete} />
))}
</div>
);
}

export function AdminDashboard({ tenants }: { tenants: Tenant[] }) {
const [state, action, isPending] = useActionState<DeleteState, FormData>(
deleteSubdomainAction,
{}
);
const [message, setMessage] = useState<DeleteState>({});

const handleDelete = (result: DeleteState) => {
setMessage(result);
setTimeout(() => setMessage({}), 3000);
};

return (
<div className="space-y-6 relative p-4 md:p-8">
<DashboardHeader />
<TenantGrid tenants={tenants} action={action} isPending={isPending} />
<TenantGrid tenants={tenants} onDelete={handleDelete} />

{state.error && (
{message.error && (
<div className="fixed bottom-4 right-4 bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded shadow-md">
{state.error}
{message.error}
</div>
)}

{state.success && (
{message.success && (
<div className="fixed bottom-4 right-4 bg-green-100 border border-green-400 text-green-700 px-4 py-3 rounded shadow-md">
{state.success}
{message.success}
</div>
)}
</div>
Expand Down