Skip to content

The Open Source DocuSign Alternative.

fix: admin org sorting (#2694)

David Nguyenbc82b2e70e23
diff --git a/packages/trpc/server/admin-router/find-admin-organisations.ts b/packages/trpc/server/admin-router/find-admin-organisations.ts
index e1a47566c..9e82bbec1 100644
--- a/packages/trpc/server/admin-router/find-admin-organisations.ts
+++ b/packages/trpc/server/admin-router/find-admin-organisations.ts
@@ -120,14 +120,16 @@ export const findAdminOrganisations = async ({
};
}
+ const orderBy: Prisma.OrganisationOrderByWithRelationInput[] = query
+ ? [{ subscription: { status: 'asc' } }, { name: 'asc' }]
+ : [{ createdAt: 'desc' }];
+
const [data, count] = await Promise.all([
prisma.organisation.findMany({
where: whereClause,
skip: Math.max(page - 1, 0) * perPage,
take: perPage,
- orderBy: {
- createdAt: 'desc',
- },
+ orderBy,
select: {
id: true,
createdAt: true,