feat(memberships, profiles, clubs): enhance active club membership handling
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
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.
This commit is contained in:
1 parent
624c19dcba
commit
24c70c5ea0
19 files changed
+238
-47
No files matched your search
@@ -1,5 +1,5 @@
|
||||
import { useAuth } from '../context/AuthContext'
|
||||
import { getResolvedActiveClubIdForUi } from '../utils/activeClub'
|
||||
import { activeClubMemberships, getResolvedActiveClubIdForUi } from '../utils/activeClub'
|
||||
|
||||
/**
|
||||
* Zeigt einen Vereins-Umschalter, wenn der Nutzer mehreren Vereinen zugeordnet ist.
|
||||
@@ -7,7 +7,7 @@ import { getResolvedActiveClubIdForUi } from '../utils/activeClub'
|
||||
*/
|
||||
export default function ActiveClubSwitcher({ variant = 'sidebar' }) {
|
||||
const { user, setActiveClub } = useAuth()
|
||||
const clubs = user?.clubs || []
|
||||
const clubs = activeClubMemberships(user?.clubs)
|
||||
if (clubs.length <= 1) return null
|
||||
|
||||
const selectClubId = getResolvedActiveClubIdForUi(user)
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
import { useAuth } from '../context/AuthContext'
|
||||
|
||||
/**
|
||||
* Hinweis, wenn der Vereinszugang (Mitgliedschaft) deaktiviert wurde — Login bleibt möglich.
|
||||
*/
|
||||
export default function InactiveMembershipBanner() {
|
||||
const { user } = useAuth()
|
||||
const inactive = (user?.clubs || []).filter(
|
||||
(c) => (c.membership_status || '').toString().trim().toLowerCase() === 'inactive'
|
||||
)
|
||||
if (!inactive.length) return null
|
||||
|
||||
const names = inactive.map((c) => c.name || `Verein #${c.id}`).join(', ')
|
||||
|
||||
return (
|
||||
<div
|
||||
role="status"
|
||||
className="inactive-membership-banner"
|
||||
style={{
|
||||
marginBottom: '0.75rem',
|
||||
padding: '0.65rem 0.85rem',
|
||||
borderRadius: '8px',
|
||||
background: 'var(--surface2, #2a2a2a)',
|
||||
border: '1px solid color-mix(in srgb, var(--warning, #d4a012) 45%, transparent)',
|
||||
color: 'var(--text1)',
|
||||
fontSize: '0.88rem',
|
||||
lineHeight: 1.45,
|
||||
}}
|
||||
>
|
||||
<strong>Vereinszugang vorübergehend deaktiviert</strong>
|
||||
<span style={{ display: 'block', marginTop: '0.35rem' }}>
|
||||
Für {inactive.length === 1 ? 'den Verein' : 'die Vereine'}{' '}
|
||||
<strong>{names}</strong>{' '}
|
||||
ist der Zugang zu Vereinsinhalten ausgesetzt — du kannst dich weiterhin anmelden und z. B.
|
||||
öffentliche Inhalte oder andere Vereine nutzen. Bei Fragen wende dich an eine:n Vereinsadministrator:in.
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,13 +1,13 @@
|
||||
import { Link, useLocation, useNavigate } from 'react-router-dom'
|
||||
import { useAuth } from '../context/AuthContext'
|
||||
import { getResolvedActiveClubIdForUi } from '../utils/activeClub'
|
||||
import { getResolvedActiveClubIdForUi, activeClubMemberships } from '../utils/activeClub'
|
||||
|
||||
function Navigation() {
|
||||
const location = useLocation()
|
||||
const navigate = useNavigate()
|
||||
const { user, logout, setActiveClub } = useAuth()
|
||||
|
||||
const clubs = user?.clubs || []
|
||||
const clubs = activeClubMemberships(user?.clubs)
|
||||
const selectClubId = getResolvedActiveClubIdForUi(user)
|
||||
|
||||
const handleLogout = async () => {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import React, { useCallback, useMemo, useState } from 'react'
|
||||
import { Link } from 'react-router-dom'
|
||||
import api from '../utils/api'
|
||||
import { activeClubMemberships } from '../utils/activeClub'
|
||||
|
||||
const VIS_LABELS = {
|
||||
private: 'Privat',
|
||||
@@ -48,7 +49,7 @@ function userMayPromote(user, targetClubId, createdBy) {
|
||||
const role = String(user.role || '').toLowerCase()
|
||||
if (role === 'admin' || role === 'superadmin') return true
|
||||
if (createdBy != null && Number(createdBy) === Number(user.id)) return true
|
||||
const row = (user.clubs || []).find((c) => Number(c.id) === Number(targetClubId))
|
||||
const row = activeClubMemberships(user?.clubs).find((c) => Number(c.id) === Number(targetClubId))
|
||||
if (!row || !Array.isArray(row.roles)) return false
|
||||
return row.roles.includes('club_admin')
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user