Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-14 00:32:43 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: build errors

Browse Source
This commit is contained in:
Mythie
2023-10-16 17:38:41 +11:00
parent 652af26754
commit 6ba4ff1c17
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/marketing/src/pages/api/claim-plan/index.ts
View File

@ -41,7 +41,7 @@ export default async function handler(
}, },
}); });
if (user && user.Subscription.length > 0) { if (user && user.Subscription) {
return res.status(200).json({ return res.status(200).json({
redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`, redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`,
}); });

16
apps/web/src/app/(dashboard)/admin/users/data-table-users.tsx
View File

@ -19,7 +19,7 @@ interface User {
name: string | null; name: string | null;
email: string; email: string;
roles: Role[]; roles: Role[];
Subscription: SubscriptionLite[]; Subscription?: SubscriptionLite | null;
Document: DocumentLite[]; Document: DocumentLite[];
} }
@ -100,19 +100,7 @@ export const UsersDataTable = ({ users, totalPages, perPage, page }: UsersDataTa
{ {
header: 'Subscription', header: 'Subscription',
accessorKey: 'subscription', accessorKey: 'subscription',
cell: ({ row }) => { cell: ({ row }) => row.original.Subscription?.status ?? 'NONE',
if (row.original.Subscription && row.original.Subscription.length > 0) {
return (
<>
{row.original.Subscription.map((subscription: SubscriptionLite, i: number) => {
return <span key={i}>{subscription.status}</span>;
})}
</>
);
} else {
return <span>NONE</span>;
}
},
}, },
{ {
header: 'Documents', header: 'Documents',

2
apps/web/src/pages/api/claim-plan/index.ts
View File

@ -41,7 +41,7 @@ export default async function handler(
}, },
}); });
if (user && user.Subscription.length > 0) { if (user && user.Subscription) {
return res.status(200).json({ return res.status(200).json({
redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`, redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`,
}); });

2
packages/lib/server-only/admin/get-users-stats.ts
View File

@ -9,10 +9,8 @@ export const getUsersWithSubscriptionsCount = async () => {
return await prisma.user.count({ return await prisma.user.count({
where: { where: {
Subscription: { Subscription: {
some: {
status: SubscriptionStatus.ACTIVE, status: SubscriptionStatus.ACTIVE,
}, },
}, },
},
}); });
}; };