Lars
24c70c5ea0
All checks were successful
Deploy Development / deploy (push) Successful in 40s
Test Suite / pytest-backend (push) Successful in 25s
Test Suite / lint-backend (push) Successful in 0s
Test Suite / build-frontend (push) Successful in 7s
Test Suite / playwright-tests (push) Successful in 23s
- Introduced a new utility function to filter and return only active club memberships, improving role management and access control. - Updated various components and pages to utilize the new active club memberships function, ensuring only relevant memberships are considered. - Enhanced user interface elements to reflect the status of club memberships, including visual indicators for inactive memberships. - Improved backend logic for resolving tenant contexts and managing club roles based on active memberships.
40 lines
1.1 KiB
JavaScript
40 lines
1.1 KiB
JavaScript
import { ACTIVE_CLUB_STORAGE_KEY } from './api'
|
|
|
|
/** Nur Mitgliedschaften mit aktivem Vereinszugang (Backend: club_members.status). */
|
|
export function activeClubMemberships(clubs) {
|
|
return (clubs || []).filter(
|
|
(c) => (c.membership_status || 'active').toString().trim().toLowerCase() === 'active'
|
|
)
|
|
}
|
|
|
|
/**
|
|
* Einheitliche Anzeige des aktiven Vereins: Abgleich mit effective_club_id, active_club_id,
|
|
* LocalStorage (Request-Header-Quelle), sonst erster **aktiver** Verein der Liste.
|
|
*/
|
|
export function getResolvedActiveClubIdForUi(user) {
|
|
const clubs = activeClubMemberships(user?.clubs)
|
|
if (!clubs.length) return null
|
|
|
|
const idInClubs = (id) =>
|
|
id != null &&
|
|
id !== '' &&
|
|
clubs.some((c) => Number(c.id) === Number(id))
|
|
|
|
const eff = user?.effective_club_id
|
|
if (idInClubs(eff)) return Number(eff)
|
|
|
|
const ac = user?.active_club_id
|
|
if (idInClubs(ac)) return Number(ac)
|
|
|
|
try {
|
|
const ls = localStorage.getItem(ACTIVE_CLUB_STORAGE_KEY)
|
|
if (ls && /^\d+$/.test(ls.trim()) && clubs.some((c) => String(c.id) === ls.trim())) {
|
|
return Number(ls.trim())
|
|
}
|
|
} catch {
|
|
/* ignore */
|
|
}
|
|
|
|
return Number(clubs[0].id)
|
|
}
|