maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: event-type filters (#11552) 

Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
This commit is contained in:
Somay Chauhan 2023-09-28 18:03:31 +05:30 committed by GitHub
parent 2021b641ce
commit 57e712dd9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/trpc/server/routers/viewer/eventTypes/getByViewer.handler.ts
View File

@ -196,20 +196,22 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
const image = user?.username ? `${CAL_URL}/${user.username}/avatar.png` : undefined;
eventTypeGroups.push({
teamId: null,
membershipRole: null,
profile: {
slug: user.username,
name: user.name,
image,
},
eventTypes: orderBy(unmanagedEventTypes, ["position", "id"], ["desc", "asc"]),
metadata: {
membershipCount: 1,
readOnly: false,
},
});
if (!input?.filters || !hasFilter(input?.filters) || input?.filters?.userIds?.includes(user.id)) {
eventTypeGroups.push({
teamId: null,
membershipRole: null,
profile: {
slug: user.username,
name: user.name,
image,
},
eventTypes: orderBy(unmanagedEventTypes, ["position", "id"], ["desc", "asc"]),
metadata: {
membershipCount: 1,
readOnly: false,
},
});
}
const teamMemberships = user.teams.map((membership) => ({
teamId: membership.team.id,
@ -222,13 +224,19 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
}
return input?.filters?.teamIds?.includes(eventType?.team?.id || 0) ?? false;
};
eventTypeGroups = ([] as EventTypeGroup[]).concat(
eventTypeGroups,
user.teams
.filter((mmship) => {
const metadata = teamMetadataSchema.parse(mmship.team.metadata);
return !metadata?.isOrganization;
if (metadata?.isOrganization) {
return false;
} else {
if (!input?.filters || !hasFilter(input?.filters)) {
return true;
}
return input?.filters?.teamIds?.includes(mmship?.team?.id || 0) ?? false;
}
})
.map((membership) => {
const orgMembership = teamMemberships.find(