@@ -60,7 +83,7 @@ function GroupCheckList({ allGroups, selectedIds, onChange }) {
}
// ── All Groups tab ────────────────────────────────────────────────────────────
-function AllGroupsTab({ allUsers, onRefresh, isMobile = false, onIF, onIB }) {
+function AllGroupsTab({ allUsers, onRefresh, isMobile = false, onIF, onIB, playersGroupId }) {
const toast = useToast();
const [groups, setGroups] = useState([]);
const [selected, setSelected] = useState(null);
@@ -68,6 +91,8 @@ function AllGroupsTab({ allUsers, onRefresh, isMobile = false, onIF, onIB }) {
const [members, setMembers] = useState(new Set());
const [fullMembers, setFullMembers] = useState([]); // full member objects including deleted
const [aliasMembers, setAliasMembers] = useState([]); // child aliases in this group
+ const [allAliases, setAllAliases] = useState([]); // all aliases for players group management
+ const [aliasSelection, setAliasSelection] = useState(new Set()); // selected alias ids for players group
const [editName, setEditName] = useState('');
const [noDm, setNoDm] = useState(false);
const [saving, setSaving] = useState(false);
@@ -89,12 +114,25 @@ function AllGroupsTab({ allUsers, onRefresh, isMobile = false, onIF, onIB }) {
setAliasMembers(aliases || []);
// No DM → checkbox enabled+checked; has DM → checkbox disabled+unchecked
setNoDm(!g.dm_group_id);
+ // Players group: load all aliases for alias-based membership management
+ if (playersGroupId && g.id === playersGroupId) {
+ api.getAllAliases().then(({ aliases: all }) => {
+ setAllAliases(all || []);
+ setAliasSelection(new Set((aliases || []).map(a => a.id)));
+ }).catch(() => {});
+ } else {
+ setAllAliases([]);
+ setAliasSelection(new Set());
+ }
};
const clearSelection = () => {
setSelected(null); setEditName(''); setMembers(new Set()); setSavedMembers(new Set());
setShowDelete(false); setFullMembers([]); setAliasMembers([]); setNoDm(false);
+ setAllAliases([]); setAliasSelection(new Set());
};
+ const isPlayersGroup = !!(playersGroupId && selected?.id === playersGroupId);
+
const handleSave = async () => {
if (!editName.trim()) return toast('Name required', 'error');
setSaving(true);
@@ -102,11 +140,18 @@ function AllGroupsTab({ allUsers, onRefresh, isMobile = false, onIF, onIB }) {
if (selected) {
// createDm=true when the group has no DM and the user unchecked "Do not create Group DM"
const createDm = !selected.dm_group_id && !noDm;
- const { group: updated } = await api.updateUserGroup(selected.id, { name: editName.trim(), memberIds: [...members], createDm });
+ const body = isPlayersGroup
+ ? { name: editName.trim(), memberIds: [], aliasMemberIds: [...aliasSelection], createDm }
+ : { name: editName.trim(), memberIds: [...members], createDm };
+ const { group: updated } = await api.updateUserGroup(selected.id, body);
toast('Group updated', 'success');
const { members: fresh, aliasMembers: freshAliases } = await api.getUserGroup(selected.id);
const freshIds = new Set(fresh.map(m => m.id));
setSavedMembers(freshIds); setMembers(freshIds); setFullMembers(fresh); setAliasMembers(freshAliases || []);
+ if (isPlayersGroup) {
+ setAliasSelection(new Set((freshAliases || []).map(a => a.id)));
+ setAllAliases(prev => prev); // keep existing list
+ }
// Reflect new dm_group_id if a DM was just created
setSelected(prev => ({ ...prev, name: editName.trim(), dm_group_id: updated?.dm_group_id ?? prev.dm_group_id }));
if (createDm) setNoDm(false);
@@ -218,11 +263,20 @@ function AllGroupsTab({ allUsers, onRefresh, isMobile = false, onIF, onIB }) {
{selected && selected.dm_group_id &&
Group DM already exists — cannot be removed.
}
@@ -699,6 +753,7 @@ export default function GroupManagerPage({ isMobile = false, onProfile, onHelp,
const [allUserGroups, setAllUserGroups] = useState([]);
const [refreshKey, setRefreshKey] = useState(0);
const [inputFocused, setInputFocused] = useState(false);
+ const [playersGroupId, setPlayersGroupId] = useState(null);
const onIF = () => setInputFocused(true);
const onIB = () => setInputFocused(false);
const onRefresh = () => setRefreshKey(k => k+1);
@@ -706,6 +761,10 @@ export default function GroupManagerPage({ isMobile = false, onProfile, onHelp,
useEffect(() => {
api.searchUsers('').then(({ users }) => setAllUsers(users.filter(u => u.status==='active').sort((a, b) => (a.display_name||a.name).localeCompare(b.display_name||b.name)))).catch(() => {});
api.getUserGroups().then(({ groups }) => setAllUserGroups([...(groups||[])].sort((a, b) => a.name.localeCompare(b.name)))).catch(() => {});
+ api.getSettings().then(({ settings }) => {
+ const pgid = (settings || []).find(s => s.key === 'feature_players_group_id')?.value;
+ setPlayersGroupId(pgid ? parseInt(pgid) : null);
+ }).catch(() => {});
}, [refreshKey]);
// Nav item helper — matches Schedule page style
@@ -758,7 +817,7 @@ export default function GroupManagerPage({ isMobile = false, onProfile, onHelp,
{/* Content */}
- {tab==='all' &&
}
+ {tab==='all' &&
}
{tab==='dm' &&
}
{tab==='u2u' &&
}
diff --git a/frontend/src/utils/api.js b/frontend/src/utils/api.js
index e3a4488..9c848ef 100644
--- a/frontend/src/utils/api.js
+++ b/frontend/src/utils/api.js
@@ -75,6 +75,7 @@ export const api = {
linkMinor: (minorId) => req('PATCH', `/users/me/link-minor/${minorId}`),
// Guardian aliases
getAliases: () => req('GET', '/users/me/aliases'),
+ getAllAliases: () => req('GET', '/users/aliases-all'),
createAlias: (body) => req('POST', '/users/me/aliases', body),
updateAlias: (id, body) => req('PATCH', `/users/me/aliases/${id}`, body),
deleteAlias: (id) => req('DELETE', `/users/me/aliases/${id}`),