Fix bugs with new tournament adding
Some checks are pending
E2E Tests / e2e (push) Waiting to run
Tests and checks on push / run-checks-and-tests (push) Waiting to run
Updates translation progress / update-translation-progress-issue (push) Waiting to run

This commit is contained in:
Kalle
2025-11-02 17:53:49 +02:00
parent b9b0231b74
commit 2c25ef6561

View File

@@ -65,8 +65,21 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
const managedBadges = await BadgeRepository.findManagedByUserId(user.id);
const organizations = (
await findValidOrganizations(
user.id,
user.roles.includes("TOURNAMENT_ADDER"),
)
).concat(
eventToEdit?.tournament?.ctx.organization
? eventToEdit.tournament.ctx.organization
: [],
);
const canAddTournaments = organizations.length > 0;
const eventToCopyRaw =
user.roles.includes("TOURNAMENT_ADDER") && !eventToEdit
canAddTournaments && !eventToEdit
? await eventWithTournament("copyEventId")
: undefined;
@@ -89,19 +102,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
eventToEdit: canEditEvent ? eventToEdit : undefined,
eventToCopy,
recentTournaments:
user.roles.includes("TOURNAMENT_ADDER") && !eventToEdit
canAddTournaments && !eventToEdit
? await CalendarRepository.findRecentTournamentsByAuthorId(user.id)
: undefined,
organizations: (
await findValidOrganizations(
user.id,
user.roles.includes("TOURNAMENT_ADDER"),
)
).concat(
eventToEdit?.tournament?.ctx.organization
? eventToEdit.tournament.ctx.organization
: [],
),
organizations,
};
};
@@ -110,7 +114,7 @@ export async function findValidOrganizations(
isTournamentAdder: boolean,
) {
const orgs = await TournamentOrganizationRepository.findByUserId(userId, {
roles: ["ADMIN"],
roles: ["ADMIN", "ORGANIZER"],
});
if (isTournamentAdder) {