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,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