rsp2k/headplane
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into next

Browse source
This commit is contained in:
Aarnav Tale 2025-08-20 15:14:17 -04:00 • committed by GitHub
commit 82f6294499
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/routes/machines/components/machine-row.tsx
View file

@ -65,7 +65,7 @@ export default function MachineRow({
{node.givenName}
</p>
<p className="text-sm opacity-50">
{node.user.name || node.user.email}
{node.user.name || node.user.displayName || node.user.email || node.user.id}
</p>
<div className="flex gap-1 flex-wrap mt-1.5">
{mapTagsToComponents(node, uiTags)}

2
app/routes/machines/dialogs/move.tsx
View file

@ -34,7 +34,7 @@ export default function Move({ machine, users, isOpen, setIsOpen }: MoveProps) {
}}
>
{users.map((user) => (
<Select.Item key={user.id}>{user.name}</Select.Item>
<Select.Item key={user.id}>{user.name || user.displayName || user.email || user.id}</Select.Item>
))}
</Select>
</Dialog.Panel>

2
app/routes/machines/dialogs/new.tsx
View file

@ -46,7 +46,7 @@ export default function NewMachine(data: NewMachineProps) {
placeholder="Select a user"
>
{data.users.map((user) => (
<Select.Item key={user.id}>{user.name}</Select.Item>
<Select.Item key={user.id}>{user.name || user.displayName || user.email || user.id}</Select.Item>
))}
</Select>
</Dialog.Panel>

4
app/routes/machines/machine.tsx
View file

@ -108,7 +108,7 @@ export default function Page() {
</span>
<div className="flex items-center gap-x-2.5 mt-1">
<UserCircle />
{node.user.name || node.user.email}
{node.user.name || node.user.displayName || node.user.email || node.user.id}
</div>
</div>
<div className="p-2 pl-4">
@ -253,7 +253,7 @@ export default function Page() {
variant="flat"
>
<div className="flex flex-col gap-1">
<Attribute name="Creator" value={node.user.name || node.user.email} />
<Attribute name="Creator" value={node.user.name || node.user.displayName || node.user.email || node.user.id} />
<Attribute name="Machine name" value={node.givenName} />
<Attribute
name="OS hostname"