mirror of
https://github.com/tale/headplane.git
synced 2026-08-27 15:37:04 +00:00
fix: update user filtering to use user name instead of user ID
This commit is contained in:
@@ -94,7 +94,7 @@ export function MachineFilters({ users, populatedNodes }: MachineFiltersProps):
|
|||||||
const tagOwnedExists = populatedNodes.some((n) => !n.user);
|
const tagOwnedExists = populatedNodes.some((n) => !n.user);
|
||||||
const userOptions = [
|
const userOptions = [
|
||||||
...(tagOwnedExists ? [{ value: "tag-owned", label: "Tag-owned" }] : []),
|
...(tagOwnedExists ? [{ value: "tag-owned", label: "Tag-owned" }] : []),
|
||||||
...users.map((u) => ({ value: u.id, label: getUserDisplayName(u) })),
|
...users.map((u) => ({ value: u.name, label: getUserDisplayName(u) })),
|
||||||
];
|
];
|
||||||
|
|
||||||
const tagOptions = Array.from(new Set(populatedNodes.flatMap((n) => n.tags)))
|
const tagOptions = Array.from(new Set(populatedNodes.flatMap((n) => n.tags)))
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ export default function Page({ loaderData }: Route.ComponentProps) {
|
|||||||
node.givenName.toLowerCase().includes(query) ||
|
node.givenName.toLowerCase().includes(query) ||
|
||||||
node.ipAddresses.some((ip) => ip.toLowerCase().includes(query))) &&
|
node.ipAddresses.some((ip) => ip.toLowerCase().includes(query))) &&
|
||||||
(filterUser === null ||
|
(filterUser === null ||
|
||||||
(filterUser === "tag-owned" ? !node.user : node.user?.id === filterUser)) &&
|
(filterUser === "tag-owned" ? !node.user : node.user?.name === filterUser)) &&
|
||||||
(filterTag === null || (node.tags?.includes(filterTag) ?? false)) &&
|
(filterTag === null || (node.tags?.includes(filterTag) ?? false)) &&
|
||||||
(filterStatus === null || STATUS_MATCH[filterStatus](node)) &&
|
(filterStatus === null || STATUS_MATCH[filterStatus](node)) &&
|
||||||
(filterRoute === null || ROUTE_MATCH[filterRoute](node)),
|
(filterRoute === null || ROUTE_MATCH[filterRoute](node)),
|
||||||
|
|||||||
Reference in New Issue
Block a user