Skip to content

CS-219 Hide devices of platform admin users on People/Devices tab #2447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Marfuen merged 2 commits into from
Apr 3, 2026
+18 −3
Merged

CS-219 Hide devices of platform admin users on People/Devices tab #2447

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f67bba
fix(app): hide platform admin devices on People/Devices tab
chasprowebdev Apr 3, 2026
760fa00
fix(app): add platform admin filtering from fleet device source
chasprowebdev Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions apps/app/src/app/(app)/[orgId]/people/devices/data/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,17 @@ export const getEmployeeDevicesFromDB: () => Promise<DeviceWithChecks[]> = async
}

const devices = await db.device.findMany({
where: { organizationId },
where: {
organizationId,
// Exclude devices for users whose User.role is platform admin (not org Member.role).
NOT: {
member: {
user: {
role: 'admin',
},
},
},
},
include: {
member: {
include: {
Expand Down Expand Up @@ -65,7 +75,7 @@ export const getEmployeeDevicesFromDB: () => Promise<DeviceWithChecks[]> = async

/**
* Fetches Fleet (legacy) devices for the current organization.
* Returns Host[] exactly as main branch — untouched Fleet logic.
* Excludes members whose User.role is platform admin (same as getEmployeeDevicesFromDB).
*/
export const getFleetHosts: () => Promise<Host[] | null> = async () => {
const session = await auth.api.getSession({
Expand All @@ -80,11 +90,16 @@ export const getFleetHosts: () => Promise<Host[] | null> = async () => {
return null;
}

// Find all members belonging to the organization.
// Members with Fleet labels (exclude platform admins — same filter as device-agent path).
const employees = await db.member.findMany({
where: {
organizationId,
deactivated: false,
NOT: {
user: {
role: 'admin',
},
},
},
include: {
user: true,
Expand Down
Loading