diff --git a/src/modules/admin/pages/user_groups/ViewGroup.jsx b/src/modules/admin/pages/user_groups/ViewGroup.jsx index 39515fe..20d0480 100644 --- a/src/modules/admin/pages/user_groups/ViewGroup.jsx +++ b/src/modules/admin/pages/user_groups/ViewGroup.jsx @@ -30,6 +30,7 @@ import { ScrollArea } from "@/components/ui/scroll-area"; import { cn } from "@/lib/utils"; import { useUserGroups } from "@/contexts/AdminUserGroupContext"; +import { useUsers } from "@/contexts/AdminUserContext"; import { useDateFormat } from "@/hooks/useDateFormat"; import { buildDataColumns, columnPinning } from "../../config/user_groups/view/columns.config"; @@ -297,12 +298,16 @@ export default function ViewGroup() { loading, fetchGroups, fetchGroup, - fetchGroupFieldValues, fetchUsersNotInGroup, addUsersToGroup, removeUsersFromGroup, } = useUserGroups(); + // Members belong to the Users model (full_name, DOB, occupation, createdBy…), + // not UserGroups — the group-level field-values endpoint doesn't know these + // fields at all, so filter picklists must come from the Users endpoint. + const { fetchUserFieldValues } = useUsers(); + const isNoGroup = group?.group_code === 'NOGRP'; useEffect(() => { @@ -332,7 +337,7 @@ export default function ViewGroup() { const toolbarActions = buildToolbarActions({ fetchGroup, - groupId, + gid: groupId, pagination, exportConfig, onAddMember: () => setAddMemberOpen(true), @@ -475,7 +480,7 @@ export default function ViewGroup() { setPagination={setPagination} loading={loading} onFetch={handleFetch} - onFetchFilterData={fetchGroupFieldValues} + onFetchFilterData={fetchUserFieldValues} onRefsReady={handleRefsReady} renderFilterSheet={({ open, onOpenChange, column, attr, data, loading }) => (