style: do inputs design modification
This commit is contained in:
@@ -2,12 +2,8 @@
|
||||
|
||||
import { useMemo } from 'react';
|
||||
import type { ColumnDef } from '@tanstack/react-table';
|
||||
import { Edit, Trash2 } from 'lucide-react';
|
||||
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { PERMISSIONS } from '@/constants/permissions';
|
||||
import { usePermissions } from '@/hooks/usePermissions';
|
||||
import type { Tenant } from '@/types';
|
||||
|
||||
function formatDate(value?: string | null) {
|
||||
@@ -19,23 +15,9 @@ function formatDate(value?: string | null) {
|
||||
}).format(new Date(value));
|
||||
}
|
||||
|
||||
interface UseTenantColumnsParams {
|
||||
onEdit: (tenant: Tenant) => void;
|
||||
onDelete: (tenant: Tenant) => void;
|
||||
pendingDeleteId?: number;
|
||||
}
|
||||
|
||||
export function useTenantColumns({
|
||||
onEdit,
|
||||
onDelete,
|
||||
pendingDeleteId,
|
||||
}: UseTenantColumnsParams): ColumnDef<Tenant>[] {
|
||||
const { hasPermission } = usePermissions();
|
||||
const canEdit = hasPermission(PERMISSIONS.TENANT.UPDATE);
|
||||
const canDelete = hasPermission(PERMISSIONS.TENANT.DELETE);
|
||||
|
||||
export function useTenantColumns(): ColumnDef<Tenant>[] {
|
||||
return useMemo(() => {
|
||||
const columns: ColumnDef<Tenant>[] = [
|
||||
return [
|
||||
{
|
||||
accessorKey: 'name',
|
||||
header: 'Tenant',
|
||||
@@ -76,37 +58,5 @@ export function useTenantColumns({
|
||||
),
|
||||
},
|
||||
];
|
||||
|
||||
if (!canEdit && !canDelete) return columns;
|
||||
|
||||
columns.push({
|
||||
id: 'actions',
|
||||
header: () => <div className="text-right">Actions</div>,
|
||||
enableSorting: false,
|
||||
cell: ({ row }) => {
|
||||
const tenant = row.original;
|
||||
return (
|
||||
<div className="flex justify-end gap-2">
|
||||
{canEdit ? (
|
||||
<Button variant="outline" size="sm" onClick={() => onEdit(tenant)}>
|
||||
<Edit className="size-4" />
|
||||
</Button>
|
||||
) : null}
|
||||
{canDelete ? (
|
||||
<Button
|
||||
variant="outline"
|
||||
size="sm"
|
||||
disabled={pendingDeleteId === tenant.id}
|
||||
onClick={() => onDelete(tenant)}
|
||||
>
|
||||
<Trash2 className="size-4" />
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
return columns;
|
||||
}, [canDelete, canEdit, onDelete, onEdit, pendingDeleteId]);
|
||||
}, []);
|
||||
}
|
||||
|
||||
@@ -108,7 +108,9 @@ export function TenantSheet({
|
||||
<Label>Client</Label>
|
||||
<Select value={clientId} onValueChange={onClientChange} disabled={isLookupsLoading}>
|
||||
<SelectTrigger>
|
||||
<SelectValue placeholder={isLookupsLoading ? 'Loading clients...' : 'Select client'} />
|
||||
<SelectValue
|
||||
placeholder={isLookupsLoading ? 'Loading clients...' : 'Select client'}
|
||||
/>
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{clients.map((client) => (
|
||||
@@ -123,7 +125,9 @@ export function TenantSheet({
|
||||
<Label>Subscription Plan</Label>
|
||||
<Select value={planId} onValueChange={onPlanChange} disabled={isLookupsLoading}>
|
||||
<SelectTrigger>
|
||||
<SelectValue placeholder={isLookupsLoading ? 'Loading plans...' : 'Select plan'} />
|
||||
<SelectValue
|
||||
placeholder={isLookupsLoading ? 'Loading plans...' : 'Select plan'}
|
||||
/>
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{plans.map((plan) => (
|
||||
@@ -147,7 +151,7 @@ export function TenantSheet({
|
||||
id="tenant-description"
|
||||
placeholder="North zone operations"
|
||||
{...register('description')}
|
||||
className="min-h-20 w-full rounded-md border border-input bg-background px-3 py-2 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
|
||||
className="min-h-20 w-full rounded-md border border-input bg-background px-3 py-2 outline-none focus-visible:border-ring"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,8 +2,10 @@
|
||||
|
||||
import type { ReactNode } from 'react';
|
||||
import type { ColumnDef, SortingState } from '@tanstack/react-table';
|
||||
import { Edit, Trash2 } from 'lucide-react';
|
||||
|
||||
import { DataTable } from '@/components/data-table';
|
||||
import { PERMISSIONS } from '@/constants/permissions';
|
||||
import type { Tenant } from '@/types';
|
||||
|
||||
interface TenantTableProps {
|
||||
@@ -18,6 +20,9 @@ interface TenantTableProps {
|
||||
onPageChange: (skip: number) => void;
|
||||
onLimitChange: (limit: number) => void;
|
||||
onSortingChange: (sorting: SortingState) => void;
|
||||
onEdit: (tenant: Tenant) => void;
|
||||
onDelete: (tenant: Tenant) => void;
|
||||
pendingDeleteId?: number;
|
||||
}
|
||||
|
||||
export function TenantTable({
|
||||
@@ -32,6 +37,9 @@ export function TenantTable({
|
||||
onPageChange,
|
||||
onLimitChange,
|
||||
onSortingChange,
|
||||
onEdit,
|
||||
onDelete,
|
||||
pendingDeleteId,
|
||||
}: TenantTableProps) {
|
||||
return (
|
||||
<DataTable
|
||||
@@ -41,6 +49,22 @@ export function TenantTable({
|
||||
isLoading={isLoading}
|
||||
toolbar={toolbar}
|
||||
emptyTitle="No tenants found."
|
||||
actions={[
|
||||
{
|
||||
label: 'Edit',
|
||||
icon: <Edit className="size-4" />,
|
||||
permission: PERMISSIONS.TENANT.UPDATE,
|
||||
onClick: onEdit,
|
||||
},
|
||||
{
|
||||
label: 'Delete',
|
||||
icon: <Trash2 className="size-4" />,
|
||||
permission: PERMISSIONS.TENANT.DELETE,
|
||||
className: 'text-destructive',
|
||||
disabled: (tenant) => pendingDeleteId === tenant.id,
|
||||
onClick: onDelete,
|
||||
},
|
||||
]}
|
||||
pagination={{
|
||||
skip,
|
||||
limit,
|
||||
|
||||
@@ -116,11 +116,7 @@ export default function TenantsPage() {
|
||||
[deleteMutation],
|
||||
);
|
||||
|
||||
const columns = useTenantColumns({
|
||||
onEdit: openEdit,
|
||||
onDelete: handleDelete,
|
||||
pendingDeleteId: deleteMutation.isPending ? deleteMutation.variables : undefined,
|
||||
});
|
||||
const columns = useTenantColumns();
|
||||
|
||||
const tenants = tenantsQuery.data?.items ?? [];
|
||||
const total = tenantsQuery.data?.total ?? 0;
|
||||
@@ -169,6 +165,9 @@ export default function TenantsPage() {
|
||||
onPageChange={setSkip}
|
||||
onLimitChange={setLimit}
|
||||
onSortingChange={setSorting}
|
||||
onEdit={openEdit}
|
||||
onDelete={handleDelete}
|
||||
pendingDeleteId={deleteMutation.isPending ? deleteMutation.variables : undefined}
|
||||
/>
|
||||
</main>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user