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

fix: handle custom org limits with member invite

Browse Source
This commit is contained in:
Lucas Smith
2025-10-30 14:31:58 +11:00
parent 37ae6a86fd
commit e4e9e749e5
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/remix/app/components/dialogs/organisation-member-invite-dialog.tsx
View File

@ -185,6 +185,10 @@ export const OrganisationMemberInviteDialog = ({
return 'form';
}
if (fullOrganisation.members.length < fullOrganisation.organisationClaim.memberCount) {
return 'form';
}
// This is probably going to screw us over in the future.
if (fullOrganisation.organisationClaim.originalSubscriptionClaimId !== INTERNAL_CLAIM_ID.TEAM) {
return 'alert';

5
packages/trpc/server/organisation-router/get-organisation.ts
View File

@ -52,6 +52,11 @@ export const getOrganisation = async ({
organisationGlobalSettings: true,
subscription: true,
organisationClaim: true,
members: {
select: {
id: true,
},
},
teams: {
where: {
teamGroups: {

6
packages/trpc/server/organisation-router/get-organisation.types.ts
View File

@ -3,6 +3,7 @@ import { z } from 'zod';
import { ZOrganisationSchema } from '@documenso/lib/types/organisation';
import OrganisationClaimSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationClaimSchema';
import OrganisationGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationGlobalSettingsSchema';
import OrganisationMemberSchema from '@documenso/prisma/generated/zod/modelSchema/OrganisationMemberSchema';
import SubscriptionSchema from '@documenso/prisma/generated/zod/modelSchema/SubscriptionSchema';
import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
@ -24,6 +25,11 @@ export const ZGetOrganisationResponseSchema = ZOrganisationSchema.extend({
organisationGlobalSettings: OrganisationGlobalSettingsSchema,
organisationClaim: OrganisationClaimSchema,
subscription: SubscriptionSchema.nullable(),
members: z.array(
OrganisationMemberSchema.pick({
id: true,
}),
),
teams: z.array(
TeamSchema.pick({
id: true,