Skip to content
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.

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

FIX: Fix user dropdown for AP devices and reorder navigation buttons #3319

Merged
merged 2 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/layouts/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ export const nativeMenuItems = [
{ title: "Users", path: "/identity/administration/users" },
{ title: "Risky Users", path: "/identity/administration/risky-users" },
{ title: "Groups", path: "/identity/administration/groups" },
{ title: "Devices", path: "/identity/administration/devices" },
{
title: "Group Templates",
path: "/identity/administration/group-templates",
},
{ title: "Devices", path: "/identity/administration/devices" },
{ title: "Deleted Items", path: "/identity/administration/deleted-items" },
{ title: "Roles", path: "/identity/administration/roles" },
{ title: "JIT Admin", path: "/identity/administration/jit-admin" },
Expand Down Expand Up @@ -468,7 +468,7 @@ export const nativeMenuItems = [
title: "Timers",
path: "/cipp/advanced/timers",
roles: ["superadmin"],
}
},
],
},
],
Expand Down
36 changes: 21 additions & 15 deletions src/pages/endpoint/autopilot/list-devices/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,35 @@ const Page = () => {
type: "POST",
url: "/api/ExecAssignAPDevice",
data: {
TenantFilter: "Tenant",
userid: "id",
message: "message",
Device: "id",
device: "id",
serialNumber: "serialNumber",
},
confirmText: "Select the user to assign",
modalDropdown: {
url: "/api/listUsers",
labelField: "userPrincipalName",
valueField: "id",
addedField: {
userPrincipalName: "userPrincipalName",
addressableUserName: "displayName",
groupName: "displayName",
confirmText: "Select the user to assign the device to",
fields: [
{
type: "autoComplete",
name: "user",
label: "Select User",
multiple: false,
creatable: false,
api: {
url: "/api/listUsers",
labelField: (user) => `${user.displayName} (${user.userPrincipalName})`,
valueField: "userPrincipalName",
addedField: {
userPrincipalName: "userPrincipalName",
addressableUserName: "displayName",
},
},
},
},
],
color: "info",
},
{
label: "Delete Device",
type: "POST",
url: "/api/RemoveAPDevice",
data: { ID: "id", tenantFilter: "Tenant" },
data: { ID: "id" },
confirmText: "Are you sure you want to delete this device?",
color: "danger",
},
Expand Down
Loading