81ad221e6a
Reported from the floor: somebody types the employee's whole name into the notification or recognition picker and presses Enter instead of clicking the suggestion, and the entry does not pull from the employee database. Two causes, one symptom. The search matched the WHOLE query against first name or last name, so "Dana Reyes" found nobody - no single column holds that string. Typing a full name is what a person does before pressing Enter, and it was the one thing guaranteed to return an empty list. A multi-word query is now treated as a full name: every word must appear somewhere in the name, in either column, so "Reyes Dana" works too, and "Dana Reyes" does not also return Sam Reyes. A single word still searches broadly, and an SSO still resolves. Both directory backends changed, the self-hosted tables and the external HR database. With no suggestion to click, the form then turned the typed text into `NAME:<text>` - a label linked to nothing. On screen that chip is identical to a real selection; the difference only shows up later as no photo, no directory link, and a recognition the person it is about cannot be found by. Both pickers (the notifications form and the shared EmployeeSearch component) now look a typed name up before deciding it is free text, through one helper. An exact full-name match wins over a longer partial one, because somebody typing "Dana Reyes" means that person and not "Dana Reyes-Smith". A genuinely ambiguous name is NOT guessed at - the candidates are shown and the operator picks, which is exactly when picking wrong matters most. A directory that cannot be reached reports failure rather than silently producing a label. Eleven tests. The search rules verified by planting the single-term query back. One note for whoever reads the spec: the failure-branch test uses a thenable that rejects rather than a mock returning a rejected promise. The runner collects such a promise as an unhandled error even when the code under test catches it, and fails the very test that proves the catch works. Scope: product
823 lines
28 KiB
Vue
823 lines
28 KiB
Vue
<template>
|
|
<div>
|
|
<div class="page-header">
|
|
<h2>{{ isEdit ? 'Edit PC' : 'New PC' }}</h2>
|
|
</div>
|
|
|
|
<div class="card">
|
|
<div v-if="loading" class="loading">Loading...</div>
|
|
|
|
<form v-else @submit.prevent="savePC">
|
|
<div class="form-row">
|
|
<div class="form-group">
|
|
<label for="machinenumber">PC Number *</label>
|
|
<input
|
|
id="machinenumber"
|
|
v-model="form.machinenumber"
|
|
type="text"
|
|
class="form-control"
|
|
required
|
|
@input="onPcNumberInput"
|
|
/>
|
|
<small class="form-hint">Defaults to the serial number; editable</small>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="alias">Alias</label>
|
|
<input
|
|
id="alias"
|
|
v-model="form.alias"
|
|
type="text"
|
|
class="form-control"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-row">
|
|
<div class="form-group" v-if="isEnabled('fqdn', 'computer')">
|
|
<label for="hostname">Hostname</label>
|
|
<input
|
|
id="hostname"
|
|
v-model="form.hostname"
|
|
type="text"
|
|
class="form-control"
|
|
/>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="serialnumber">Serial Number</label>
|
|
<input
|
|
id="serialnumber"
|
|
v-model="form.serialnumber"
|
|
type="text"
|
|
class="form-control"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-row" v-if="isEnabled('gaugelabreference', 'computer') || isEnabled('maintenancereference', 'computer')">
|
|
<div class="form-group" v-if="isEnabled('gaugelabreference', 'computer')">
|
|
<label for="gaugelabreference">Gauge Lab Reference</label>
|
|
<input
|
|
id="gaugelabreference"
|
|
v-model="form.gaugelabreference"
|
|
type="text"
|
|
class="form-control"
|
|
/>
|
|
</div>
|
|
|
|
<div class="form-group" v-if="isEnabled('maintenancereference', 'computer')">
|
|
<label for="maintenancereference">Maintenance Reference</label>
|
|
<input
|
|
id="maintenancereference"
|
|
v-model="form.maintenancereference"
|
|
type="text"
|
|
class="form-control"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-row">
|
|
<div class="form-group">
|
|
<label for="machinetypeid">PC Type *</label>
|
|
<select
|
|
id="machinetypeid"
|
|
v-model="form.machinetypeid"
|
|
class="form-control"
|
|
required
|
|
@change="form.modelnumberid = ''"
|
|
>
|
|
<option value="">Select type...</option>
|
|
<option
|
|
v-for="pt in pcTypes"
|
|
:key="pt.computertypeid"
|
|
:value="pt.computertypeid"
|
|
>
|
|
{{ pt.computertype }}
|
|
</option>
|
|
</select>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="osid">Operating System</label>
|
|
<select
|
|
id="osid"
|
|
v-model="form.osid"
|
|
class="form-control"
|
|
>
|
|
<option value="">Select OS...</option>
|
|
<option
|
|
v-for="os in operatingsystems"
|
|
:key="os.osid"
|
|
:value="os.osid"
|
|
>
|
|
{{ os.osname }}
|
|
</option>
|
|
</select>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-row">
|
|
<div class="form-group">
|
|
<label for="statusid">Status</label>
|
|
<select
|
|
id="statusid"
|
|
v-model="form.statusid"
|
|
class="form-control"
|
|
>
|
|
<option value="">Select status...</option>
|
|
<option
|
|
v-for="s in statuses"
|
|
:key="s.statusid"
|
|
:value="s.statusid"
|
|
>
|
|
{{ s.status }}
|
|
</option>
|
|
</select>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="locationid">Location</label>
|
|
<select
|
|
id="locationid"
|
|
v-model="form.locationid"
|
|
class="form-control"
|
|
>
|
|
<!-- Blank means "no location of its own", which is a real state:
|
|
the PC then follows whatever it is attached to. The hint
|
|
below says where that currently resolves to, so leaving the
|
|
box empty is an informed choice rather than a missing one. -->
|
|
<option value="">Select location...</option>
|
|
<option
|
|
v-for="l in locations"
|
|
:key="l.locationid"
|
|
:value="l.locationid"
|
|
>
|
|
{{ l.locationname }}
|
|
</option>
|
|
</select>
|
|
<small v-if="!form.locationid && inheritedLocation" class="input-hint">
|
|
No location of its own. It currently shows
|
|
<strong>{{ inheritedLocation.locationname }}</strong>, inherited
|
|
from {{ inheritedLocation.inheritedfrom }}. Pick one here only to
|
|
override that.
|
|
</small>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-row">
|
|
<div class="form-group">
|
|
<label for="vendorid">Vendor</label>
|
|
<select
|
|
id="vendorid"
|
|
v-model="form.vendorid"
|
|
class="form-control"
|
|
@change="form.modelnumberid = ''"
|
|
>
|
|
<option value="">Select vendor...</option>
|
|
<option
|
|
v-for="v in filteredVendors"
|
|
:key="v.vendorid"
|
|
:value="v.vendorid"
|
|
>
|
|
{{ v.vendor }}
|
|
</option>
|
|
</select>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="modelnumberid">Model</label>
|
|
<select
|
|
id="modelnumberid"
|
|
v-model="form.modelnumberid"
|
|
class="form-control"
|
|
>
|
|
<option value="">Select model...</option>
|
|
<option
|
|
v-for="m in filteredModels"
|
|
:key="m.modelnumberid"
|
|
:value="m.modelnumberid"
|
|
>
|
|
{{ m.modelnumber }}
|
|
</option>
|
|
</select>
|
|
<small v-if="!form.vendorid && !form.machinetypeid" class="form-hint">
|
|
Select vendor or PC type to filter models
|
|
</small>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- PC-specific fields -->
|
|
<h4 style="margin-top: 1.5rem; margin-bottom: 1rem;">Network Settings</h4>
|
|
|
|
<div class="form-row">
|
|
<div class="form-group">
|
|
<label for="ipaddress">IP Address</label>
|
|
<input
|
|
id="ipaddress"
|
|
v-model="form.ipaddress"
|
|
type="text"
|
|
class="form-control"
|
|
placeholder="e.g., 192.168.1.100"
|
|
/>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="loggedinuser">Logged In User</label>
|
|
<input
|
|
id="loggedinuser"
|
|
v-model="form.loggedinuser"
|
|
type="text"
|
|
class="form-control"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="azuredeviceid">Azure Device ID</label>
|
|
<input
|
|
id="azuredeviceid"
|
|
v-model="form.azuredeviceid"
|
|
type="text"
|
|
class="form-control"
|
|
placeholder="Entra deviceId GUID (set by the Azure import)"
|
|
/>
|
|
<small class="muted">Opens the device in Intune from the PC page.</small>
|
|
</div>
|
|
|
|
<!-- The OBJECT id, not the device id. Entra gives a device both and
|
|
they address different places: deviceId opens Intune, objectId
|
|
opens the Entra device record. The import populates both, so a
|
|
page showing only one left the other uneditable when it was
|
|
wrong. -->
|
|
<div class="form-group">
|
|
<label for="azureobjectid">Azure Object ID</label>
|
|
<input
|
|
id="azureobjectid"
|
|
v-model="form.azureobjectid"
|
|
type="text"
|
|
class="form-control"
|
|
placeholder="Entra objectId GUID (set by the Azure import)"
|
|
/>
|
|
<small class="muted">Opens the device in Entra from the PC page.</small>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label for="azuredevicecategory">Azure Device Category</label>
|
|
<input
|
|
id="azuredevicecategory"
|
|
v-model="form.azuredevicecategory"
|
|
type="text"
|
|
class="form-control"
|
|
placeholder="Entra device category or group label"
|
|
/>
|
|
</div>
|
|
|
|
<div class="form-group">
|
|
<label>Remote Access Protocols</label>
|
|
<div class="protocol-list">
|
|
<label v-for="p in protocols" :key="p.protocolid" class="protocol-item">
|
|
<input type="checkbox" :checked="isProtocolOn(p.protocolid)" @change="toggleProtocol(p.protocolid, $event.target.checked)" />
|
|
<span>{{ p.name }}</span>
|
|
<input
|
|
v-if="isProtocolOn(p.protocolid)"
|
|
type="number"
|
|
class="port-override"
|
|
:value="protocolPort(p.protocolid)"
|
|
:placeholder="p.defaultport || 'port'"
|
|
min="1"
|
|
max="65535"
|
|
title="Port override (blank = default)"
|
|
@input="setProtocolPort(p.protocolid, $event.target.value)"
|
|
/>
|
|
</label>
|
|
<span v-if="!protocols.length" class="muted">No protocols defined. Add them under Settings > PC Access Protocols.</span>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Printers assigned to this PC ITSELF, which replace whatever the
|
|
machine it controls is assigned. Same component the machine form
|
|
uses: two copies of this UI would drift, and the two ends of an
|
|
override disagreeing is the bug nobody would spot. -->
|
|
<PrinterAssignmentPicker ref="printerPickerRef" :assetid="currentAssetId" scope="pc" />
|
|
|
|
<div class="form-group">
|
|
<label for="notes">Notes</label>
|
|
<textarea
|
|
id="notes"
|
|
v-model="form.notes"
|
|
class="form-control"
|
|
rows="3"
|
|
></textarea>
|
|
</div>
|
|
|
|
<!-- Map Location Picker -->
|
|
<div class="form-group">
|
|
<label>Map Location</label>
|
|
<div class="map-location-control">
|
|
<div v-if="form.mapx !== null && form.mapy !== null" class="current-position">
|
|
Position: {{ form.mapx }}, {{ form.mapy }}
|
|
<span v-if="form.levelid" class="position-level">on {{ levelName(form.levelid) }}</span>
|
|
<span v-else class="position-level position-level-missing">level not set</span>
|
|
<button type="button" class="btn btn-sm btn-secondary" @click="clearMapPosition">Clear</button>
|
|
</div>
|
|
<button type="button" class="btn btn-secondary" @click="openMapPicker">
|
|
Set Location on Map
|
|
</button>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Map Picker Modal -->
|
|
<Modal v-model="showMapPicker" title="Select Location on Map" size="fullscreen">
|
|
<div class="map-modal-content">
|
|
<div v-if="levelOptions().length > 1" class="map-level-picker">
|
|
<label>Level</label>
|
|
<select v-model.number="pickerLevelId" class="form-control">
|
|
<option v-for="option in levelOptions()" :key="option.levelid"
|
|
:value="option.levelid">{{ option.label }}</option>
|
|
</select>
|
|
<span class="input-hint">
|
|
The position is pixels on this drawing, so pick the level first.
|
|
</span>
|
|
</div>
|
|
<ShopFloorMap
|
|
:pickerMode="true"
|
|
:levelid="pickerLevelId"
|
|
:initialPosition="form.mapx !== null ? { left: form.mapx, top: form.mapy } : null"
|
|
:theme="currentTheme"
|
|
@positionPicked="handlePositionPicked"
|
|
/>
|
|
</div>
|
|
<template #footer>
|
|
<button class="btn btn-secondary" @click="showMapPicker = false">Cancel</button>
|
|
<button class="btn btn-primary" @click="confirmMapPosition">Confirm Location</button>
|
|
</template>
|
|
</Modal>
|
|
|
|
<!-- Site-defined custom fields for computers -->
|
|
<CustomFieldsInputs ref="customFieldsRef" :assettypeid="COMPUTER_ASSETTYPEID" :assetid="currentAssetId" />
|
|
|
|
<div v-if="error" class="error-message">{{ error }}</div>
|
|
|
|
<div style="display: flex; gap: 0.5rem; margin-top: 1.5rem;">
|
|
<button type="submit" class="btn btn-primary" :disabled="saving">
|
|
{{ saving ? 'Saving...' : 'Save PC' }}
|
|
</button>
|
|
<router-link :to="returnTo" class="btn btn-secondary">Cancel</router-link>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup>
|
|
import { ref, onMounted, computed, watch } from 'vue'
|
|
import { useRoute, useRouter } from 'vue-router'
|
|
import { computersApi, assetsApi, vendorsApi, locationsApi, modelsApi, operatingsystemsApi,
|
|
printersApi, relationshipTypesApi } from '@/api'
|
|
import ShopFloorMap from '@/components/ShopFloorMap.vue'
|
|
import { loadMapConfig, levelOptions, levelName, state as mapConfig }
|
|
from '@/composables/mapConfig'
|
|
import Modal from '@/components/Modal.vue'
|
|
import CustomFieldsInputs from '@/components/CustomFieldsInputs.vue'
|
|
import PrinterAssignmentPicker from '@/components/PrinterAssignmentPicker.vue'
|
|
import { currentTheme } from '@/stores/theme'
|
|
import { useIdentifierFlags } from '@/composables/identifierSettings'
|
|
import { loadAssetTypeIds, assetTypeId } from '@/composables/assetTypeIds'
|
|
import { isPluginEnabled, loadEnabledPlugins } from '@/composables/enabledPlugins'
|
|
import { useToast } from '@/composables/toast'
|
|
import { apiError } from '@/utils/apiError'
|
|
|
|
const toast = useToast()
|
|
const { isEnabled } = useIdentifierFlags()
|
|
|
|
const route = useRoute()
|
|
const router = useRouter()
|
|
|
|
const isEdit = computed(() => !!route.params.id)
|
|
|
|
// Return-navigation origin, threaded through from Fleet via ?from=fleet so
|
|
// Cancel and a successful Save land back on Fleet; every other entry path
|
|
// falls back to the PCs list.
|
|
const returnTo = computed(() => (route.query.from === 'fleet' ? '/endpoints' : '/pcs'))
|
|
|
|
// Resolved by NAME at load, never hardcoded: the id comes from seed
|
|
// order, so the constant that used to live here pointed at a different
|
|
// asset type on a differently-seeded site - the form then rendered THAT
|
|
// type's custom fields and dropped whatever was typed into them.
|
|
const COMPUTER_ASSETTYPEID = computed(() => assetTypeId('computer'))
|
|
const customFieldsRef = ref(null)
|
|
const printerPickerRef = ref(null)
|
|
const currentAssetId = ref(null)
|
|
|
|
// What this PC resolves to today when it owns no location, captured at load.
|
|
// Read-only: the form must never post it back as the record's own, which is
|
|
// exactly what binding the location select to the merged `locationid` did.
|
|
const inheritedLocation = ref(null)
|
|
|
|
// PC Number (assetnumber) defaults to the serial number while the user hasn't
|
|
// typed their own. Editable; only auto-fills on a new PC.
|
|
const manualPcNumber = ref(false)
|
|
function onPcNumberInput() {
|
|
manualPcNumber.value = true
|
|
}
|
|
|
|
const loading = ref(true)
|
|
const saving = ref(false)
|
|
const error = ref('')
|
|
const showMapPicker = ref(false)
|
|
// Which drawing the picker shows, and therefore which level the coordinates it
|
|
// returns belong to (ADR-017). Opens on the position's existing level so editing
|
|
// a marker does not silently move it to the default one.
|
|
const pickerLevelId = ref(null)
|
|
const tempMapPosition = ref(null)
|
|
|
|
const form = ref({
|
|
machinenumber: '',
|
|
alias: '',
|
|
hostname: '',
|
|
serialnumber: '',
|
|
gaugelabreference: '',
|
|
maintenancereference: '',
|
|
machinetypeid: '',
|
|
statusid: '',
|
|
vendorid: '',
|
|
modelnumberid: '',
|
|
locationid: '',
|
|
osid: '',
|
|
loggedinuser: '',
|
|
azuredeviceid: '',
|
|
azureobjectid: '',
|
|
azuredevicecategory: '',
|
|
accessmethods: [],
|
|
notes: '',
|
|
mapx: null,
|
|
mapy: null,
|
|
levelid: null,
|
|
ipaddress: ''
|
|
})
|
|
|
|
const pcTypes = ref([])
|
|
const protocols = ref([])
|
|
const statuses = ref([])
|
|
|
|
// Access-method editor helpers (form.accessmethods = [{protocolid, portoverride}])
|
|
function isProtocolOn(protocolid) {
|
|
return form.value.accessmethods.some(a => a.protocolid === protocolid)
|
|
}
|
|
function protocolPort(protocolid) {
|
|
const found = form.value.accessmethods.find(a => a.protocolid === protocolid)
|
|
return found && found.portoverride != null ? found.portoverride : ''
|
|
}
|
|
function toggleProtocol(protocolid, on) {
|
|
if (on) {
|
|
if (!isProtocolOn(protocolid)) {
|
|
form.value.accessmethods.push({ protocolid, portoverride: null })
|
|
}
|
|
} else {
|
|
form.value.accessmethods = form.value.accessmethods.filter(a => a.protocolid !== protocolid)
|
|
}
|
|
}
|
|
function setProtocolPort(protocolid, value) {
|
|
const found = form.value.accessmethods.find(a => a.protocolid === protocolid)
|
|
if (found) {
|
|
const n = parseInt(value, 10)
|
|
found.portoverride = Number.isFinite(n) ? n : null
|
|
}
|
|
}
|
|
const vendors = ref([])
|
|
const models = ref([])
|
|
const locations = ref([])
|
|
const operatingsystems = ref([])
|
|
|
|
|
|
// Default PC Number to serial while the user hasn't typed their own (new PC only)
|
|
watch(() => form.value.serialnumber, (serial) => {
|
|
if (!isEdit.value && !manualPcNumber.value && serial) {
|
|
form.value.machinenumber = serial
|
|
}
|
|
})
|
|
|
|
// Ensure a saved model id is present in models.value even when the filtered
|
|
// list (category PC) excluded it because it has no modeltype. Fetches the
|
|
// single row by id and appends it; a no-op when already present or blank.
|
|
async function ensureModelLoaded(modelId) {
|
|
if (!modelId) return
|
|
if (models.value.some(m => m.modelnumberid === modelId)) return
|
|
try {
|
|
const response = await modelsApi.get(modelId)
|
|
const model = response.data.data
|
|
if (model) models.value = [...models.value, model]
|
|
} catch (e) {
|
|
// Leave it absent; the select shows blank but we did not invent a value.
|
|
}
|
|
}
|
|
|
|
// Filter models by selected vendor and PC type. Keep the record's own saved
|
|
// model even if it is untyped or a different vendor, so editing an existing PC
|
|
// never renders a blank select that clears the field on save.
|
|
const filteredModels = computed(() => {
|
|
// filter by vendor only (PC type now maps to computertypeid, a different id
|
|
// space than a model's machinetypeid)
|
|
const savedId = form.value.modelnumberid
|
|
if (!form.value.vendorid) return models.value
|
|
return models.value.filter(
|
|
m => m.vendorid === form.value.vendorid || m.modelnumberid === savedId)
|
|
})
|
|
|
|
// Only offer vendors that actually have PC-category models. models is already
|
|
// scoped to category PC at load, so its vendorids are the PC vendor set. Keep
|
|
// the record's own vendor even if it falls outside that set, so editing an
|
|
// existing PC never silently drops its saved vendor.
|
|
const filteredVendors = computed(() => {
|
|
const pcVendorIds = new Set(models.value.map(m => m.vendorid))
|
|
return vendors.value.filter(
|
|
v => pcVendorIds.has(v.vendorid) || v.vendorid === form.value.vendorid
|
|
)
|
|
})
|
|
|
|
onMounted(async () => {
|
|
await loadAssetTypeIds()
|
|
try {
|
|
// Load reference data
|
|
// perpage 100 so dropdowns aren't truncated to the default 20-row page
|
|
const [ptRes, statusRes, vendorRes, allModels, locRes, osRes, protoRes] = await Promise.all([
|
|
computersApi.types.list({ perpage: 100 }),
|
|
assetsApi.statuses.list(),
|
|
vendorsApi.list({ perpage: 100 }),
|
|
modelsApi.listAll({ category: 'PC' }), // backend caps perpage at 100; page through all
|
|
locationsApi.listAll(), // backend caps perpage at 100; page through all
|
|
operatingsystemsApi.list({ perpage: 100 }),
|
|
computersApi.protocols.list(),
|
|
// Handles its own failure: a site without printers still gets a form.
|
|
])
|
|
|
|
pcTypes.value = ptRes.data.data || []
|
|
statuses.value = statusRes.data.data || []
|
|
vendors.value = vendorRes.data.data || []
|
|
models.value = allModels
|
|
locations.value = locRes || []
|
|
operatingsystems.value = osRes.data.data || []
|
|
protocols.value = protoRes.data.data || []
|
|
|
|
// Load PC if editing (asset-based shape: extension under pc.computer)
|
|
if (isEdit.value) {
|
|
const response = await computersApi.get(route.params.id)
|
|
const pc = response.data.data
|
|
const ext = pc.computer || {}
|
|
currentAssetId.value = pc.assetid || null
|
|
|
|
const primaryComm = pc.communications?.find(c => c.isprimary) || pc.communications?.[0]
|
|
|
|
inheritedLocation.value = pc.inheritedlocation || null
|
|
form.value = {
|
|
machinenumber: pc.assetnumber || '',
|
|
alias: pc.name && pc.name.toUpperCase() !== 'NONE' ? pc.name : '',
|
|
hostname: ext.hostname || '',
|
|
serialnumber: pc.serialnumber || '',
|
|
gaugelabreference: pc.gaugelabreference || '',
|
|
maintenancereference: pc.maintenancereference || '',
|
|
machinetypeid: ext.computertypeid || '',
|
|
statusid: pc.statusid || '',
|
|
vendorid: ext.vendorid || '',
|
|
modelnumberid: ext.modelnumberid || '',
|
|
// The OWN location, not the resolved one. Binding to `locationid`
|
|
// meant the form pre-selected a location this PC had inherited from a
|
|
// machine, and saving wrote it back as the PC's own - so an edit that
|
|
// never touched location silently stopped the PC following its parent.
|
|
locationid: pc.ownlocationid || '',
|
|
osid: ext.osid || '',
|
|
loggedinuser: ext.loggedinuser || '',
|
|
azuredeviceid: ext.azuredeviceid || '',
|
|
azureobjectid: ext.azureobjectid || '',
|
|
azuredevicecategory: ext.azuredevicecategory || '',
|
|
accessmethods: (pc.accessmethods || []).map(a => ({
|
|
protocolid: a.protocolid,
|
|
portoverride: a.portoverride ?? null
|
|
})),
|
|
notes: pc.notes || '',
|
|
mapx: pc.ownmapx ?? null,
|
|
mapy: pc.ownmapy ?? null,
|
|
levelid: pc.ownlevelid ?? null,
|
|
ipaddress: primaryComm?.ipaddress || ''
|
|
}
|
|
|
|
// The model list is loaded filtered to category PC, which the backend
|
|
// inner-joins against ModelType - so an untyped model is absent. If this
|
|
// PC's saved model is one of those rows, fetch it by id and merge it in,
|
|
// or its dropdown would render blank and saving would clear the field.
|
|
await ensureModelLoaded(form.value.modelnumberid)
|
|
}
|
|
} catch (err) {
|
|
console.error('Error loading data:', err)
|
|
error.value = 'Failed to load data'
|
|
} finally {
|
|
loading.value = false
|
|
}
|
|
})
|
|
|
|
function handlePositionPicked(position) {
|
|
tempMapPosition.value = position
|
|
}
|
|
|
|
function openMapPicker() {
|
|
loadMapConfig().then(() => {
|
|
pickerLevelId.value = form.value.levelid || mapConfig.defaultlevelid
|
|
showMapPicker.value = true
|
|
})
|
|
}
|
|
|
|
function confirmMapPosition() {
|
|
if (tempMapPosition.value) {
|
|
form.value.mapx = tempMapPosition.value.left
|
|
form.value.mapy = tempMapPosition.value.top
|
|
// Never one without the other: coordinates saved with no level render as
|
|
// "level unknown", and coordinates saved against the wrong level render
|
|
// convincingly in the wrong place.
|
|
form.value.levelid = pickerLevelId.value
|
|
}
|
|
showMapPicker.value = false
|
|
}
|
|
|
|
function clearMapPosition() {
|
|
form.value.mapx = null
|
|
form.value.mapy = null
|
|
form.value.levelid = null
|
|
tempMapPosition.value = null
|
|
}
|
|
|
|
async function savePC() {
|
|
error.value = ''
|
|
saving.value = true
|
|
|
|
try {
|
|
// One payload for the computers plugin (asset core + computer extension +
|
|
// primary IP). "PC Number" is the business identifier (assetnumber).
|
|
const payload = {
|
|
assetnumber: form.value.machinenumber,
|
|
hostname: form.value.hostname || null,
|
|
serialnumber: form.value.serialnumber || null,
|
|
gaugelabreference: form.value.gaugelabreference || null,
|
|
maintenancereference: form.value.maintenancereference || null,
|
|
computertypeid: form.value.machinetypeid || null,
|
|
statusid: form.value.statusid || null,
|
|
vendorid: form.value.vendorid || null,
|
|
modelnumberid: form.value.modelnumberid || null,
|
|
locationid: form.value.locationid || null,
|
|
osid: form.value.osid || null,
|
|
loggedinuser: form.value.loggedinuser || null,
|
|
azuredeviceid: form.value.azuredeviceid || null,
|
|
azureobjectid: form.value.azureobjectid || null,
|
|
azuredevicecategory: form.value.azuredevicecategory || null,
|
|
accessmethods: form.value.accessmethods,
|
|
notes: form.value.notes || null,
|
|
ipaddress: form.value.ipaddress || null,
|
|
mapx: form.value.mapx,
|
|
mapy: form.value.mapy,
|
|
// ADR-017: a position without its level cannot be drawn on the right
|
|
// floor plan. The picker sets all three and this payload sent two, so a
|
|
// picked pin saved a levelid of null and then rendered nowhere - the
|
|
// form even showed "Position: x, y" back, because it kept the value it
|
|
// had never sent.
|
|
levelid: form.value.levelid
|
|
}
|
|
// An emptied alias has to be SENT, or it cannot be cleared: the payload
|
|
// simply omitted `name`, the old value survived, and the form came back
|
|
// showing the alias the operator had just deleted, with no error and no
|
|
// toast. On CREATE the field is still omitted when blank, because there
|
|
// the server may fill it in and sending null would overwrite that.
|
|
if (isEdit.value) {
|
|
payload.name = form.value.alias || null
|
|
} else if (form.value.alias) {
|
|
payload.name = form.value.alias
|
|
}
|
|
|
|
let assetId = currentAssetId.value
|
|
if (isEdit.value) {
|
|
const response = await computersApi.update(route.params.id, payload)
|
|
assetId = assetId || response.data?.data?.assetid || response.data?.data?.asset?.assetid
|
|
} else {
|
|
const response = await computersApi.create(payload)
|
|
assetId = response.data?.data?.assetid || response.data?.data?.asset?.assetid
|
|
}
|
|
|
|
// Persist any custom-field values now that we have an asset id.
|
|
if (assetId && customFieldsRef.value) {
|
|
try {
|
|
await customFieldsRef.value.save(assetId)
|
|
} catch (cfErr) {
|
|
console.error('Error saving custom fields:', cfErr)
|
|
}
|
|
}
|
|
|
|
// Printer assignment through the shared picker, which reconciles the whole
|
|
// set in one call rather than row at a time.
|
|
//
|
|
// Toasted, not thrown: the PC itself is saved by now, so staying on a form
|
|
// whose Save would create a second PC is the worse failure - but an
|
|
// assignment that quietly did not happen is the bug this feature exists to
|
|
// stop, so it has to be said out loud.
|
|
if (assetId && printerPickerRef.value) {
|
|
try {
|
|
await printerPickerRef.value.save(assetId)
|
|
} catch (printerError) {
|
|
console.error('Error saving printer assignment:', printerError)
|
|
toast.error(apiError(printerError, 'PC saved, but the printer assignment did not'))
|
|
}
|
|
}
|
|
|
|
router.push(returnTo.value)
|
|
} catch (err) {
|
|
console.error('Error saving PC:', err)
|
|
error.value = apiError(err, 'Failed to save PC')
|
|
} finally {
|
|
saving.value = false
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<style scoped>
|
|
.protocol-list {
|
|
display: flex;
|
|
flex-wrap: wrap;
|
|
gap: 14px;
|
|
}
|
|
.protocol-item {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 6px;
|
|
}
|
|
.protocol-item .port-override {
|
|
width: 78px;
|
|
padding: 4px 6px;
|
|
border: 1px solid var(--border);
|
|
border-radius: 6px;
|
|
background: var(--bg);
|
|
color: var(--text);
|
|
}
|
|
.muted {
|
|
color: var(--text-light);
|
|
}
|
|
|
|
/* Scrolls rather than pushing the rest of the form off screen: a site can hold
|
|
dozens of printers. */
|
|
.printer-list {
|
|
display: flex;
|
|
flex-direction: column;
|
|
gap: 6px;
|
|
max-height: 220px;
|
|
overflow-y: auto;
|
|
margin-top: 0.5rem;
|
|
padding: 0.5rem 0.75rem;
|
|
border: 1px solid var(--border);
|
|
border-radius: 6px;
|
|
background: var(--bg);
|
|
}
|
|
.printer-item {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 8px;
|
|
}
|
|
.printer-meta {
|
|
color: var(--text-light);
|
|
font-size: 0.85rem;
|
|
}
|
|
|
|
.map-location-control {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 1rem;
|
|
}
|
|
|
|
.current-position {
|
|
display: flex;
|
|
align-items: center;
|
|
gap: 0.5rem;
|
|
padding: 0.5rem 1rem;
|
|
background: var(--bg);
|
|
border: 1px solid var(--border);
|
|
border-radius: 4px;
|
|
font-family: monospace;
|
|
color: var(--text);
|
|
}
|
|
|
|
.map-modal-content {
|
|
height: calc(90vh - 140px);
|
|
}
|
|
|
|
.map-modal-content :deep(.shopfloor-map) {
|
|
height: 100%;
|
|
}
|
|
|
|
.map-modal-content :deep(.map-container) {
|
|
height: calc(100% - 50px);
|
|
}
|
|
|
|
.form-hint {
|
|
display: block;
|
|
margin-top: 0.25rem;
|
|
font-size: 0.8rem;
|
|
color: var(--text-light, #666);
|
|
}
|
|
</style>
|