fix: event-type filters (#11552)
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
This commit is contained in:
parent
2021b641ce
commit
57e712dd9e
|
@ -196,20 +196,22 @@ export const getByViewerHandler = async ({ ctx, input }: GetByViewerOptions) =>
|
||||||
|
|
||||||
const image = user?.username ? `${CAL_URL}/${user.username}/avatar.png` : undefined;
|
const image = user?.username ? `${CAL_URL}/${user.username}/avatar.png` : undefined;
|
||||||
|
|
||||||
eventTypeGroups.push({
|
if (!input?.filters || !hasFilter(input?.filters) || input?.filters?.userIds?.includes(user.id)) {
|
||||||
teamId: null,
|
eventTypeGroups.push({
|
||||||
membershipRole: null,
|
teamId: null,
|
||||||
profile: {
|
membershipRole: null,
|
||||||
slug: user.username,
|
profile: {
|
||||||
name: user.name,
|
slug: user.username,
|
||||||
image,
|
name: user.name,
|
||||||
},
|
image,
|
||||||
eventTypes: orderBy(unmanagedEventTypes, ["position", "id"], ["desc", "asc"]),
|
},
|
||||||
metadata: {
|
eventTypes: orderBy(unmanagedEventTypes, ["position", "id"], ["desc", "asc"]),
|
||||||
membershipCount: 1,
|
metadata: {
|
||||||
readOnly: false,
|
membershipCount: 1,
|
||||||
},
|
readOnly: false,
|
||||||
});
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const teamMemberships = user.teams.map((membership) => ({
|
const teamMemberships = user.teams.map((membership) => ({
|
||||||
teamId: membership.team.id,
|
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;
|
return input?.filters?.teamIds?.includes(eventType?.team?.id || 0) ?? false;
|
||||||
};
|
};
|
||||||
|
|
||||||
eventTypeGroups = ([] as EventTypeGroup[]).concat(
|
eventTypeGroups = ([] as EventTypeGroup[]).concat(
|
||||||
eventTypeGroups,
|
eventTypeGroups,
|
||||||
user.teams
|
user.teams
|
||||||
.filter((mmship) => {
|
.filter((mmship) => {
|
||||||
const metadata = teamMetadataSchema.parse(mmship.team.metadata);
|
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) => {
|
.map((membership) => {
|
||||||
const orgMembership = teamMemberships.find(
|
const orgMembership = teamMemberships.find(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user