diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx index de6d6ff..f657d84 100644 --- a/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx +++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid/route.tsx @@ -71,7 +71,7 @@ export default function Route({ loaderData }: Route.ComponentProps) {
diff --git a/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/columns.tsx b/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/columns.tsx index f09606f..82ac55e 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/columns.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/columns.tsx @@ -27,12 +27,14 @@ export const columns: ColumnDef[] = [ { id: 'select', header: DataTableColumnHeaderSelect, - cell: DataTableColumnHeaderSelect + cell: DataTableColumnHeaderSelect, + meta: { className: 'w-8' } }, ...columns_, { - id: 'actions', - cell: ActionMenu + id: 'action', + cell: ActionMenu, + meta: { className: 'w-12' } } ] diff --git a/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx index 2253838..b5332f5 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.enrollments._index/route.tsx @@ -77,6 +77,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) { {({ hits, page, hitsPerPage, totalHits }) => ( [] = [ { id: 'select', header: DataTableColumnHeaderSelect, - cell: DataTableColumnSelect + cell: DataTableColumnSelect, + meta: { className: 'w-8' } }, { header: 'Empresa', @@ -65,8 +65,9 @@ export const columns: ColumnDef[] = [ cell: DataTableColumnDatetime }, { - id: 'actions', - cell: ActionMenu + id: 'action', + cell: ActionMenu, + meta: { className: 'w-12' } } ] diff --git a/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx index 059772a..1032d80 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.orgs._index/route.tsx @@ -48,6 +48,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) { return ( [] = [ { id: 'select', header: DataTableColumnHeaderSelect, - cell: DataTableColumnSelect + cell: DataTableColumnSelect, + meta: { className: 'w-8' } }, { header: 'Comprador', @@ -28,7 +38,7 @@ export const columns: ColumnDef[] = [ return (
- {initials(name)} + {initials(name)}
    @@ -50,5 +60,32 @@ export const columns: ColumnDef[] = [ accessorFn: ({ cpf, cnpj }) => cpf ?? cnpj, cell: DataTableColumnCpfCnpj }, - ...columns_ + ...columns_, + { + id: 'action', + cell: ActionMenu, + meta: { className: 'w-12' } + } ] + +function ActionMenu({ row }: { row: any }) { + return ( +
    + + + + + + + + +
    + ) +} diff --git a/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx index a53cc4d..936ffb9 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.payments._index/route.tsx @@ -42,6 +42,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) { return ( [] = [ { id: 'select', header: DataTableColumnHeaderSelect, - cell: DataTableColumnSelect + cell: DataTableColumnSelect, + meta: { className: 'w-8' } }, ...columns_, { - id: 'actions', - cell: ActionMenu + id: 'action', + cell: ActionMenu, + meta: { className: 'w-12' } } ] diff --git a/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx b/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx index 2193795..93be124 100644 --- a/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx +++ b/apps/insights.saladeaula.digital/app/routes/_app.users._index/route.tsx @@ -52,6 +52,7 @@ export default function Route({ loaderData: { data } }) { return ( ({ isPinned === 'right' && 'right-0', 'p-2.5', // Override the shadcn class - '[&:has([role=checkbox])]:pr-2.5', + '[&:has([role=checkbox])]:px-1.5', // @ts-ignore header.column.columnDef.meta?.className )} @@ -285,6 +285,8 @@ export function DataTable({ isPinned && isSelected && 'bg-muted', isPinned === 'left' && 'left-0', isPinned === 'right' && 'right-0', + // Override the shadcn class + '[&:has([role=checkbox])]:px-1.5', 'p-2.5', // @ts-ignore cell.column.columnDef.meta?.className diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index 5adb4b7..7cf3e44 100644 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -8,6 +8,8 @@ "module": "ES2022", "moduleResolution": "bundler", "jsx": "react-jsx", + "sourceMap": true, + "inlineSources": true, "baseUrl": ".", "paths": { "@/*": ["./src/*"]