fix(hub,web): stop machines from showing raw id prefixes as names

Hub: getOrCreateMachine now merges incoming machine-owned metadata over
the stored row (first-write-wins previously kept rows registered without
a host name nameless forever; hub-only fields like displayName survive).

Web: session-list machine labels are cached in localStorage so machines
whose row is gone or whose query has not loaded yet keep their last
known name instead of flickering to the 8-char id prefix.
This commit is contained in:
weishu
2026-07-27 13:10:45 +08:00
parent bb5275a333
commit f4be735cb5
5 changed files with 214 additions and 14 deletions
+57
View File
@@ -0,0 +1,57 @@
import { beforeEach, describe, expect, it } from 'vitest'
import { renderHook } from '@testing-library/react'
import type { Machine } from '@/types/api'
import { getMachineTitle, useMachineLabels } from './useMachineLabels'
function makeMachine(id: string, metadata: Machine['metadata']): Machine {
return {
id,
namespace: 'default',
seq: 1,
createdAt: 0,
updatedAt: 0,
active: true,
activeAt: 0,
metadata,
metadataVersion: 1,
runnerState: null,
runnerStateVersion: 0,
}
}
describe('getMachineTitle', () => {
it('prefers displayName, then host, then the id prefix', () => {
expect(getMachineTitle(makeMachine('abcdef123456', { displayName: 'Work', host: 'mac' } as Machine['metadata']))).toBe('Work')
expect(getMachineTitle(makeMachine('abcdef123456', { host: 'mac' } as Machine['metadata']))).toBe('mac')
expect(getMachineTitle(makeMachine('abcdef123456', null))).toBe('abcdef12')
})
})
describe('useMachineLabels', () => {
beforeEach(() => {
window.localStorage.clear()
})
it('returns live titles and caches them', () => {
const machines = [makeMachine('machine-1', { host: 'MacBook Pro' } as Machine['metadata'])]
const { result } = renderHook(() => useMachineLabels(machines))
expect(result.current['machine-1']).toBe('MacBook Pro')
expect(JSON.parse(window.localStorage.getItem('hapi-machine-labels')!)).toEqual({ 'machine-1': 'MacBook Pro' })
})
it('keeps the cached label when the machine is absent from the list', () => {
window.localStorage.setItem('hapi-machine-labels', JSON.stringify({ 'gone-machine': 'MacBook Pro' }))
const { result } = renderHook(() => useMachineLabels([]))
expect(result.current['gone-machine']).toBe('MacBook Pro')
})
it('prefers the live title over a stale cached one', () => {
window.localStorage.setItem('hapi-machine-labels', JSON.stringify({ 'machine-1': 'old-name' }))
const machines = [makeMachine('machine-1', { host: 'new-name' } as Machine['metadata'])]
const { result } = renderHook(() => useMachineLabels(machines))
expect(result.current['machine-1']).toBe('new-name')
})
})