mirror of
https://github.com/documenso/documenso.git
synced 2025-11-13 08:13:56 +10:00
Compare commits
1 Commits
v2.0.10
...
fix/team-m
| Author | SHA1 | Date | |
|---|---|---|---|
| 8e443b1795 |
@ -65,7 +65,9 @@ export const createTeamMemberInvites = async ({
|
|||||||
});
|
});
|
||||||
|
|
||||||
const teamMemberEmails = team.members.map((member) => member.user.email);
|
const teamMemberEmails = team.members.map((member) => member.user.email);
|
||||||
const teamMemberInviteEmails = team.invites.map((invite) => invite.email);
|
const teamMemberInviteEmails = team.invites
|
||||||
|
.filter((invite) => invite.status === TeamMemberInviteStatus.PENDING)
|
||||||
|
.map((invite) => invite.email);
|
||||||
const currentTeamMember = team.members.find((member) => member.user.id === userId);
|
const currentTeamMember = team.members.find((member) => member.user.id === userId);
|
||||||
|
|
||||||
if (!currentTeamMember) {
|
if (!currentTeamMember) {
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
import type { TeamMemberInvite } from '@prisma/client';
|
import type { TeamMemberInvite } from '@prisma/client';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma, TeamMemberInviteStatus } from '@prisma/client';
|
||||||
import { P, match } from 'ts-pattern';
|
import { P, match } from 'ts-pattern';
|
||||||
import type { z } from 'zod';
|
import type { z } from 'zod';
|
||||||
|
|
||||||
@ -71,6 +71,7 @@ export const findTeamMemberInvites = async ({
|
|||||||
const whereClause: Prisma.TeamMemberInviteWhereInput = {
|
const whereClause: Prisma.TeamMemberInviteWhereInput = {
|
||||||
...termFilters,
|
...termFilters,
|
||||||
teamId: userTeam.id,
|
teamId: userTeam.id,
|
||||||
|
status: TeamMemberInviteStatus.PENDING,
|
||||||
};
|
};
|
||||||
|
|
||||||
const [data, count] = await Promise.all([
|
const [data, count] = await Promise.all([
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
import { TeamMemberInviteStatus } from '@prisma/client';
|
||||||
import type { z } from 'zod';
|
import type { z } from 'zod';
|
||||||
|
|
||||||
import { prisma } from '@documenso/prisma';
|
import { prisma } from '@documenso/prisma';
|
||||||
@ -25,6 +26,7 @@ export const getTeamInvitations = async ({
|
|||||||
return await prisma.teamMemberInvite.findMany({
|
return await prisma.teamMemberInvite.findMany({
|
||||||
where: {
|
where: {
|
||||||
email,
|
email,
|
||||||
|
status: TeamMemberInviteStatus.PENDING,
|
||||||
},
|
},
|
||||||
include: {
|
include: {
|
||||||
team: {
|
team: {
|
||||||
|
|||||||
@ -647,8 +647,6 @@ model TeamMemberInvite {
|
|||||||
role TeamMemberRole
|
role TeamMemberRole
|
||||||
token String @unique
|
token String @unique
|
||||||
team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
|
team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)
|
||||||
|
|
||||||
@@unique([teamId, email])
|
|
||||||
}
|
}
|
||||||
|
|
||||||
enum TemplateType {
|
enum TemplateType {
|
||||||
|
|||||||
Reference in New Issue
Block a user