Reciprocal controls links, dead chip links, and a resumable legacy import
The machine page now shows the PC that controls it. The endpoint was correct all along and returned both directions; AssetTriageBand discarded every peer whose type was not 'machine' and was mounted only on the PC page. The counterpart type, label and relationship types are now props. Fixed while adopting it more widely: every band chip linked to /assets/<id>, and there is no such route. The resolver that AssetRelationships.vue kept privately is now frontend/src/utils/assetRoute.js, used by both - and its type lookup is case-insensitive, because seed data capitalises the type names while this site's database does not. The legacy import is now safe to resume. The 409-resolve asked for per_page=10000 against a server that clamps to 100, so it silently searched the first 100 rows and dropped links past that on every re-run. The crosswalk is now bound to the database it describes, so one carried across a rebuild is refused rather than attaching rows to the wrong assets. Source database names are resolved from the environment, so the loader can be aimed without editing it. Full suite 2178 passed, frontend 280 passed.
This commit is contained in:
43
frontend/src/utils/assetRoute.js
Normal file
43
frontend/src/utils/assetRoute.js
Normal file
@@ -0,0 +1,43 @@
|
||||
/**
|
||||
* Where an asset's detail page lives.
|
||||
*
|
||||
* Extracted from AssetRelationships.vue because a second caller appeared (the
|
||||
* triage band) and got it wrong: it linked to `/assets/<assetid>`, which is not
|
||||
* a route. There is no `/assets/:id` page and no catch-all, so every chip was a
|
||||
* dead link. One copy, so a third caller cannot repeat it.
|
||||
*
|
||||
* Two ids are in play and they are not interchangeable. `assetid` is the core
|
||||
* row; the detail routes key on `pluginid`, the id of the extension-table row
|
||||
* (machineid, computerid, printerid). Sending assetid to /machines/:id opens
|
||||
* the wrong machine, or none.
|
||||
*/
|
||||
|
||||
// Asset type NAME to route base. The names are seed data, and seeding is not
|
||||
// consistent about case: shopdb/core/services/csvimport.py seeds 'Computer'
|
||||
// and 'Machine' capitalised, while this site's database holds them lowercase.
|
||||
// The lookup is therefore lowercased on both sides - a case-sensitive match
|
||||
// silently produced dead links at whichever site seeded the other way.
|
||||
const ROUTE_BY_TYPE = {
|
||||
machine: '/machines',
|
||||
computer: '/pcs',
|
||||
printer: '/printers',
|
||||
network_device: '/network',
|
||||
'network device': '/network',
|
||||
measuring_tool: '/measuringtools',
|
||||
'measuring tool': '/measuringtools'
|
||||
}
|
||||
|
||||
export function assetRoute(asset) {
|
||||
if (!asset) return '#'
|
||||
|
||||
const typename = String(asset.assettypename || asset.assettype || '').toLowerCase()
|
||||
const basePath = ROUTE_BY_TYPE[typename] || '/assets'
|
||||
|
||||
const id = asset.pluginid
|
||||
|| asset.typedata?.networkdeviceid
|
||||
|| asset.typedata?.machineid
|
||||
|| asset.assetid
|
||||
return `${basePath}/${id}`
|
||||
}
|
||||
|
||||
export default assetRoute
|
||||
54
frontend/src/utils/assetRoute.spec.js
Normal file
54
frontend/src/utils/assetRoute.spec.js
Normal file
@@ -0,0 +1,54 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { assetRoute } from './assetRoute'
|
||||
|
||||
describe('assetRoute', () => {
|
||||
// The bug this file exists to prevent: the triage band linked to
|
||||
// /assets/<assetid>, and there is no /assets/:id route and no catch-all,
|
||||
// so every chip was a dead link on five detail pages.
|
||||
it('routes by asset type, never to /assets', () => {
|
||||
expect(assetRoute({ assettypename: 'machine', pluginid: 223, assetid: 313 }))
|
||||
.toBe('/machines/223')
|
||||
expect(assetRoute({ assettypename: 'computer', pluginid: 279, assetid: 304 }))
|
||||
.toBe('/pcs/279')
|
||||
expect(assetRoute({ assettypename: 'printer', pluginid: 1, assetid: 594 }))
|
||||
.toBe('/printers/1')
|
||||
})
|
||||
|
||||
it('uses pluginid, not assetid - they are different rows', () => {
|
||||
// /machines/:id keys on machineid. Passing assetid opens the wrong
|
||||
// machine, or none, and looks like a data problem rather than a link bug.
|
||||
const route = assetRoute({ assettypename: 'machine', pluginid: 223, assetid: 313 })
|
||||
expect(route).toBe('/machines/223')
|
||||
expect(route).not.toContain('313')
|
||||
})
|
||||
|
||||
it('matches the type name whatever case the site seeded it in', () => {
|
||||
// csvimport.py seeds 'Computer' and 'Machine' capitalised; this site's
|
||||
// database holds them lowercase. A case-sensitive lookup produced dead
|
||||
// links at whichever site seeded the other way.
|
||||
expect(assetRoute({ assettypename: 'Computer', pluginid: 7 })).toBe('/pcs/7')
|
||||
expect(assetRoute({ assettypename: 'MACHINE', pluginid: 8 })).toBe('/machines/8')
|
||||
})
|
||||
|
||||
it('accepts the older assettype key as well as assettypename', () => {
|
||||
expect(assetRoute({ assettype: 'printer', pluginid: 4 })).toBe('/printers/4')
|
||||
})
|
||||
|
||||
it('falls back through typedata when pluginid is absent', () => {
|
||||
expect(assetRoute({ assettypename: 'network_device', typedata: { networkdeviceid: 12 } }))
|
||||
.toBe('/network/12')
|
||||
expect(assetRoute({ assettypename: 'machine', typedata: { machineid: 30 } }))
|
||||
.toBe('/machines/30')
|
||||
})
|
||||
|
||||
it('returns a harmless anchor for nothing', () => {
|
||||
expect(assetRoute(null)).toBe('#')
|
||||
expect(assetRoute(undefined)).toBe('#')
|
||||
})
|
||||
|
||||
it('handles both spellings of the multiword type names', () => {
|
||||
expect(assetRoute({ assettypename: 'network device', pluginid: 2 })).toBe('/network/2')
|
||||
expect(assetRoute({ assettypename: 'measuring_tool', pluginid: 3 })).toBe('/measuringtools/3')
|
||||
expect(assetRoute({ assettypename: 'measuring tool', pluginid: 3 })).toBe('/measuringtools/3')
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user