- Add utility function for cascading hideBranding logic - Update all getServerSideProps files to check organization hideBranding as fallback - Ensure team queries include parent hideBranding data - Fix hideBranding not working for organization members and teams Fixes the issue where organization-level branding settings were not being applied to user and team event pages when the direct entity didn't have hideBranding enabled. Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
144 lines
3.3 KiB
TypeScript
144 lines
3.3 KiB
TypeScript
import logger from "./logger";
|
|
import { ProfileRepository } from "./server/repository/profile";
|
|
|
|
const log = logger.getSubLogger({ name: "hideBranding" });
|
|
type Team = {
|
|
hideBranding: boolean | null;
|
|
parent: {
|
|
hideBranding: boolean | null;
|
|
} | null;
|
|
};
|
|
|
|
type Profile = {
|
|
organization: {
|
|
hideBranding: boolean | null;
|
|
} | null;
|
|
};
|
|
|
|
type UserWithoutProfile = {
|
|
id: number;
|
|
hideBranding: boolean | null;
|
|
};
|
|
|
|
type UserWithProfile = UserWithoutProfile & {
|
|
profile: Profile | null;
|
|
};
|
|
|
|
type OrgSlug = string | null;
|
|
|
|
/**
|
|
* Determines if branding should be hidden by checking entity and organization settings
|
|
*/
|
|
function resolveHideBranding(options: {
|
|
entityHideBranding: boolean | null;
|
|
organizationHideBranding: boolean | null;
|
|
}): boolean {
|
|
// If the organization has branding hidden, we should hide branding for the entity regardless of its own setting
|
|
if (options.organizationHideBranding) {
|
|
return true;
|
|
}
|
|
|
|
return options.entityHideBranding ?? false;
|
|
}
|
|
|
|
/**
|
|
* Determines if branding should be hidden for an event that could be a team event or user event
|
|
*/
|
|
export function shouldHideBrandingForEventUsingProfile({
|
|
eventTypeId,
|
|
owner,
|
|
team,
|
|
}: {
|
|
owner: UserWithProfile | null;
|
|
team: Team | null;
|
|
eventTypeId: number;
|
|
}) {
|
|
let hideBranding;
|
|
if (team) {
|
|
hideBranding = resolveHideBranding({
|
|
entityHideBranding: team.hideBranding ?? null,
|
|
organizationHideBranding: team.parent?.hideBranding ?? null,
|
|
});
|
|
} else if (owner) {
|
|
hideBranding = resolveHideBranding({
|
|
entityHideBranding: owner.hideBranding ?? null,
|
|
organizationHideBranding: owner.profile?.organization?.hideBranding ?? null,
|
|
});
|
|
} else {
|
|
log.error(`No owner or team found for event: ${eventTypeId}`);
|
|
return false;
|
|
}
|
|
return hideBranding;
|
|
}
|
|
|
|
/**
|
|
* A wrapper over shouldHideBrandingForEventUsingProfile that fetches the profile itself
|
|
* Use it when you don't have user's profile
|
|
*/
|
|
export async function shouldHideBrandingForEvent({
|
|
eventTypeId,
|
|
team,
|
|
owner,
|
|
orgSlug,
|
|
}: {
|
|
eventTypeId: number;
|
|
team: Team | null;
|
|
owner: UserWithoutProfile | null;
|
|
orgSlug: OrgSlug;
|
|
}) {
|
|
let ownerProfile = null;
|
|
if (team) {
|
|
return shouldHideBrandingForTeamEvent({
|
|
team,
|
|
eventTypeId,
|
|
});
|
|
} else if (owner) {
|
|
// Needed only for User events, not for Team events
|
|
ownerProfile = orgSlug
|
|
? await ProfileRepository.findByUserIdAndOrgSlug({
|
|
userId: owner.id,
|
|
orgSlug,
|
|
})
|
|
: null;
|
|
|
|
return shouldHideBrandingForUserEvent({
|
|
eventTypeId,
|
|
owner: {
|
|
...owner,
|
|
profile: ownerProfile,
|
|
},
|
|
});
|
|
} else {
|
|
log.error(`No owner or team found for event: ${eventTypeId}`);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* A convenience wrapper for shouldHideBrandingForEventUsingProfile to use for Team events
|
|
*/
|
|
export function shouldHideBrandingForTeamEvent({ eventTypeId, team }: { eventTypeId: number; team: Team }) {
|
|
return shouldHideBrandingForEventUsingProfile({
|
|
owner: null,
|
|
team,
|
|
eventTypeId,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* A convenience wrapper for shouldHideBrandingForEventUsingProfile to use for User events
|
|
*/
|
|
export function shouldHideBrandingForUserEvent({
|
|
eventTypeId,
|
|
owner,
|
|
}: {
|
|
eventTypeId: number;
|
|
owner: UserWithProfile;
|
|
}) {
|
|
return shouldHideBrandingForEventUsingProfile({
|
|
owner,
|
|
team: null,
|
|
eventTypeId,
|
|
});
|
|
}
|