From fb63ef9d305dae5feeda1f1e4f1bf5c28bcc374a Mon Sep 17 00:00:00 2001
From: cproudlock <cproudlock@localhost>
Date: Thu, 3 Sep 2026 15:33:21 -0400
Subject: [PATCH] Make a retired asset findable and restorable from the product

The retire dialog says "History and relationships are kept, and it can be
restored." The API always kept that promise - ?active=false lists retired rows,
PUT {"isactive": true} restores one - and no screen in the product could reach
either. A retired asset simply vanished: the lists filtered it out, global
search missed it, and its detail page still rendered Edit and Retire with
nothing anywhere saying it was retired.

Five list pages gained a "Show retired" toggle that passes active=false, and a
retired row now carries a badge. Five detail pages gained a banner saying the
record is retired and what that means, a Restore button, and the suppression of
Edit and Retire while it is retired - offering Retire on an already-retired
record was the part that made the state invisible.

Verified end to end in a browser: retire a machine, the detail page says so and
offers Restore, the list hides it until the toggle is ticked and badges it when
shown, and Restore puts it back (isactive true again on the API).

One thing this does NOT do: global search still does not reach a retired asset.
That is a separate surface with its own filter, and worth deciding on
deliberately rather than sliding in here - a search that returns retired
records by default would change every result page.

Scope: product
---
 plugins/computers/frontend/views/PCDetail.vue | 31 ++++++++++++++-
 plugins/computers/frontend/views/PCsList.vue  | 12 +++++-
 .../machines/frontend/views/MachineDetail.vue | 38 +++++++++++++++++--
 .../machines/frontend/views/MachinesList.vue  | 12 ++++++
 .../frontend/views/MeasuringToolDetail.vue    | 33 +++++++++++++++-
 .../frontend/views/MeasuringToolsList.vue     | 12 +++++-
 .../frontend/views/NetworkDevicesList.vue     | 12 +++++-
 .../printers/frontend/views/PrinterDetail.vue | 33 +++++++++++++++-
 .../printers/frontend/views/PrintersList.vue  | 12 +++++-
 9 files changed, 182 insertions(+), 13 deletions(-)

diff --git a/plugins/computers/frontend/views/PCDetail.vue b/plugins/computers/frontend/views/PCDetail.vue
index af6986d2..6af38998 100644
--- a/plugins/computers/frontend/views/PCDetail.vue
+++ b/plugins/computers/frontend/views/PCDetail.vue
@@ -10,11 +10,21 @@
       <div class="header-actions">
         <router-link :to="`/print/asset-label/computer/${$route.params.id}`" class="btn btn-secondary" target="_blank">Print Label</router-link>
         <router-link :to="`/pcs/${$route.params.id}/edit${fromQuery}`" class="btn btn-primary">Edit</router-link>
-        <button @click="confirmRetire" class="btn btn-danger">Retire</button>
+        <button v-if="!isRetired" @click="confirmRetire" class="btn btn-danger">Retire</button>
+        <!-- A retired record offered Edit and Retire exactly like a live
+             one, and nothing said it was retired. Restoring it was possible
+             through the API and nowhere in the product. -->
+        <button v-if="isRetired" @click="restore" class="btn btn-primary">Restore</button>
         <router-link :to="returnTo" class="btn btn-secondary">{{ returnLabel }}</router-link>
       </div>
     </div>
 
+    <div v-if="computer && computer.isactive === false" class="retired-banner card">
+      <strong>This PC is retired.</strong>
+      It stays out of every list and report, and its history and relationships
+      are intact. Restore puts it back.
+    </div>
+
     <div v-if="loading" class="loading">Loading...</div>
 
     <template v-else-if="computer">
@@ -644,6 +654,21 @@ async function confirmRestart() {
 // Retire, not delete: the server deactivates the asset, so the PC
 // leaves every list and report while its history and relationships stay put.
 // Reversible by an admin setting isactive back to true.
+const isRetired = computed(() => computer.value?.isactive === false)
+
+async function restore() {
+  const label = computer.value?.assetnumber || computer.value?.name || 'this PC'
+  try {
+    await computersApi.update(route.params.id, { isactive: true })
+    toast.success(`Restored ${label}`)
+    const response = await computersApi.get(route.params.id)
+    computer.value = response.data.data
+  } catch (error) {
+    console.error('Error restoring:', error)
+    toast.error(apiError(error, 'Failed to restore'))
+  }
+}
+
 async function confirmRetire() {
   const label = computer.value?.assetnumber || computer.value?.name || 'this PC'
   if (!confirm(`Retire ${label}?\n\nIt will no longer appear in ShopDB. `
@@ -660,6 +685,10 @@ async function confirmRetire() {
 </script>
 
 <style scoped>
+.retired-banner {
+  border-left: 3px solid var(--warning);
+  margin-bottom: 1rem;
+}
 .portal-link {
   font-size: 0.78rem;
   margin-left: 0.5rem;
diff --git a/plugins/computers/frontend/views/PCsList.vue b/plugins/computers/frontend/views/PCsList.vue
index 361c2c20..51f2a1f5 100644
--- a/plugins/computers/frontend/views/PCsList.vue
+++ b/plugins/computers/frontend/views/PCsList.vue
@@ -15,7 +15,14 @@
         placeholder="Search computers..."
         @input="debouncedSearch"
       />
-    </div>
+          <!-- Retire is a soft delete and the confirm dialog promises the record
+           "can be restored". The API kept that promise (?active=false lists
+           them, PUT isactive restores); nothing in the UI could reach it. -->
+      <label class="checkbox-label">
+        <input type="checkbox" v-model="showRetired" @change="loadComputers" />
+        Show retired
+      </label>
+</div>
 
     <div class="card">
       <div v-if="loading" class="loading">Loading...</div>
@@ -106,6 +113,7 @@ function applySuggestion(word) {
   setSearch(word)
   loadComputers()
 }
+const showRetired = ref(false)
 const totalPages = ref(1)
 const perPage = ref(20)
 
@@ -123,6 +131,8 @@ async function loadComputers() {
       perpage: perPage.value
     }
     if (search.value) params.search = search.value
+    // active=false means "include retired", matching the API.
+    if (showRetired.value) params.active = 'false'
 
     const response = await computersApi.list(params)
     computers.value = response.data.data || []
diff --git a/plugins/machines/frontend/views/MachineDetail.vue b/plugins/machines/frontend/views/MachineDetail.vue
index b7e0867d..65f9f05a 100644
--- a/plugins/machines/frontend/views/MachineDetail.vue
+++ b/plugins/machines/frontend/views/MachineDetail.vue
@@ -9,14 +9,24 @@
         <router-link :to="`/print/asset-label/machine/${machine?.machine?.machineid}`" class="btn btn-secondary" v-if="machine" target="_blank">
           Print Label
         </router-link>
-        <router-link :to="`/machines/${machine?.machine?.machineid}/edit`" class="btn btn-primary" v-if="machine">
+        <router-link :to="`/machines/${machine?.machine?.machineid}/edit`" class="btn btn-primary" v-if="machine && !isRetired">
           Edit
         </router-link>
-        <button @click="confirmRetire" class="btn btn-danger" v-if="machine">Retire</button>
+        <button @click="confirmRetire" class="btn btn-danger" v-if="machine && !isRetired">Retire</button>
+        <!-- A retired record offered Edit and Retire exactly like a live one,
+             with nothing on the page saying it was retired. Restoring it was
+             possible through the API and nowhere in the product. -->
+        <button @click="restore" class="btn btn-primary" v-if="machine && isRetired">Restore</button>
         <router-link to="/machines" class="btn btn-secondary">Back to List</router-link>
       </div>
     </div>
 
+    <div v-if="machine && isRetired" class="retired-banner card">
+      <strong>This machine is retired.</strong>
+      It stays out of every list and report, and its history and relationships
+      are intact. Restore puts it back.
+    </div>
+
     <div v-if="loading" class="loading">Loading...</div>
 
     <template v-else-if="machine">
@@ -295,7 +305,7 @@ const { heroWarranty, warrantyDate } = useWarrantyBadge(() => machine.value?.ass
 
 // relationships render via the shared AssetRelationships card
 
-onMounted(async () => {
+async function loadMachine() {
   try {
     const response = await machinesApi.get(route.params.id)
     machine.value = response.data.data
@@ -305,7 +315,9 @@ onMounted(async () => {
   } finally {
     loading.value = false
   }
-})
+}
+
+onMounted(loadMachine)
 
 function getStatusClass(status) {
   if (!status) return 'badge-info'
@@ -324,6 +336,20 @@ function formatDate(dateStr) {
 // Retire, not delete: the server deactivates the asset, so the machine
 // leaves every list and report while its history and relationships stay put.
 // Reversible by an admin setting isactive back to true.
+const isRetired = computed(() => machine.value?.isactive === false)
+
+async function restore() {
+  const label = machine.value?.assetnumber || machine.value?.name || 'this machine'
+  try {
+    await machinesApi.update(machine.value?.machine?.machineid, { isactive: true })
+    toast.success(`Restored ${label}`)
+    await loadMachine()
+  } catch (error) {
+    console.error('Error restoring machine:', error)
+    toast.error(apiError(error, 'Failed to restore machine'))
+  }
+}
+
 async function confirmRetire() {
   const label = machine.value?.assetnumber || machine.value?.name || 'this machine'
   if (!confirm(`Retire ${label}?\n\nIt will no longer appear in ShopDB. `
@@ -340,6 +366,10 @@ async function confirmRetire() {
 </script>
 
 <style scoped>
+.retired-banner {
+  border-left: 3px solid var(--warning);
+  margin-bottom: 1rem;
+}
 .mono {
   font-family: 'SF Mono', 'Monaco', 'Consolas', monospace;
 }
diff --git a/plugins/machines/frontend/views/MachinesList.vue b/plugins/machines/frontend/views/MachinesList.vue
index 158d45a8..4797e947 100644
--- a/plugins/machines/frontend/views/MachinesList.vue
+++ b/plugins/machines/frontend/views/MachinesList.vue
@@ -15,6 +15,14 @@
         placeholder="Search machines..."
         @input="debouncedSearch"
       />
+      <!-- Retire is a soft delete and the confirm dialog promises the record
+           "can be restored". The API kept that promise all along (?active=false
+           lists them, PUT isactive restores) but nothing in the UI could reach
+           it, so a retired machine was simply gone. -->
+      <label class="checkbox-label">
+        <input type="checkbox" v-model="showRetired" @change="loadMachines" />
+        Show retired
+      </label>
     </div>
 
     <div class="card">
@@ -41,6 +49,7 @@
                   @click="item.machine?.machineid && $router.push(`/machines/${item.machine.machineid}`)">
                 <td>
                   {{ item.assetnumber }}<template v-if="item.dualpathpartner"> / {{ item.dualpathpartner.assetnumber }}</template>
+                  <span v-if="item.isactive === false" class="badge badge-secondary">retired</span>
                 </td>
                 <td>{{ item.name || '-' }}</td>
                 <td class="mono">{{ item.serialnumber || '-' }}</td>
@@ -122,6 +131,7 @@ function applySuggestion(word) {
   // search page documents. Load directly.
   loadMachines()
 }
+const showRetired = ref(false)
 const totalPages = ref(1)
 const perPage = ref(20)
 
@@ -139,6 +149,8 @@ async function loadMachines() {
       perpage: perPage.value
     }
     if (search.value) params.search = search.value
+    // active=false means "include retired", matching the API.
+    if (showRetired.value) params.active = 'false'
 
     const response = await machinesApi.list(params)
     machines.value = response.data.data || []
diff --git a/plugins/measuringtools/frontend/views/MeasuringToolDetail.vue b/plugins/measuringtools/frontend/views/MeasuringToolDetail.vue
index a8b6fa89..cd0dcd66 100644
--- a/plugins/measuringtools/frontend/views/MeasuringToolDetail.vue
+++ b/plugins/measuringtools/frontend/views/MeasuringToolDetail.vue
@@ -9,11 +9,21 @@
         <router-link :to="`/measuringtools/${tool?.measuringtool?.measuringtoolid}/edit`" class="btn btn-primary" v-if="tool">
           Edit
         </router-link>
-        <button @click="confirmRetire" class="btn btn-danger" v-if="tool">Retire</button>
+        <button v-if="tool && !isRetired" @click="confirmRetire" class="btn btn-danger">Retire</button>
+        <!-- A retired record offered Edit and Retire exactly like a live
+             one, and nothing said it was retired. Restoring it was possible
+             through the API and nowhere in the product. -->
+        <button v-if="tool && isRetired" @click="restore" class="btn btn-primary">Restore</button>
         <router-link to="/measuringtools" class="btn btn-secondary">Back to List</router-link>
       </div>
     </div>
 
+    <div v-if="tool && tool.isactive === false" class="retired-banner card">
+      <strong>This measuring tool is retired.</strong>
+      It stays out of every list and report, and its history and relationships
+      are intact. Restore puts it back.
+    </div>
+
     <div v-if="loading" class="loading">Loading...</div>
 
     <template v-else-if="tool">
@@ -181,7 +191,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { colorStyle } from '@/utils/colorStyle'
 import { measuringtoolsApi } from '@/api'
@@ -227,6 +237,21 @@ onMounted(async () => {
 // Retire, not delete: the server deactivates the asset, so the measuring tool
 // leaves every list and report while its history and relationships stay put.
 // Reversible by an admin setting isactive back to true.
+const isRetired = computed(() => tool.value?.isactive === false)
+
+async function restore() {
+  const label = tool.value?.assetnumber || tool.value?.name || 'this tool'
+  try {
+    await measuringtoolsApi.update(route.params.id, { isactive: true })
+    toast.success(`Restored ${label}`)
+    const response = await measuringtoolsApi.get(route.params.id)
+    tool.value = response.data.data
+  } catch (error) {
+    console.error('Error restoring:', error)
+    toast.error(apiError(error, 'Failed to restore'))
+  }
+}
+
 async function confirmRetire() {
   const label = tool.value?.assetnumber || tool.value?.name || 'this measuring tool'
   if (!confirm(`Retire ${label}?\n\nIt will no longer appear in ShopDB. `
@@ -243,6 +268,10 @@ async function confirmRetire() {
 </script>
 
 <style scoped>
+.retired-banner {
+  border-left: 3px solid var(--warning);
+  margin-bottom: 1rem;
+}
 .mono {
   font-family: 'SF Mono', 'Monaco', 'Consolas', monospace;
 }
diff --git a/plugins/measuringtools/frontend/views/MeasuringToolsList.vue b/plugins/measuringtools/frontend/views/MeasuringToolsList.vue
index 856c8fc1..14be7716 100644
--- a/plugins/measuringtools/frontend/views/MeasuringToolsList.vue
+++ b/plugins/measuringtools/frontend/views/MeasuringToolsList.vue
@@ -28,7 +28,14 @@
         <option value="current">Current</option>
         <option value="unknown">Unknown</option>
       </select>
-    </div>
+          <!-- Retire is a soft delete and the confirm dialog promises the record
+           "can be restored". The API kept that promise (?active=false lists
+           them, PUT isactive restores); nothing in the UI could reach it. -->
+      <label class="checkbox-label">
+        <input type="checkbox" v-model="showRetired" @change="loadTools" />
+        Show retired
+      </label>
+</div>
 
     <div class="card">
       <div v-if="loading" class="loading">Loading...</div>
@@ -115,6 +122,7 @@ function applySuggestion(word) {
 }
 const typeid = ref('')
 const calibrationstatus = ref('')
+const showRetired = ref(false)
 const totalPages = ref(1)
 const perPage = ref(20)
 
@@ -139,6 +147,8 @@ async function loadTools() {
   try {
     const params = { page: page.value, perpage: perPage.value }
     if (search.value) params.search = search.value
+    // active=false means "include retired", matching the API.
+    if (showRetired.value) params.active = 'false'
     if (typeid.value) params.typeid = typeid.value
     if (calibrationstatus.value) params.calibrationstatus = calibrationstatus.value
 
diff --git a/plugins/network/frontend/views/NetworkDevicesList.vue b/plugins/network/frontend/views/NetworkDevicesList.vue
index efcfd68d..5d0a009d 100644
--- a/plugins/network/frontend/views/NetworkDevicesList.vue
+++ b/plugins/network/frontend/views/NetworkDevicesList.vue
@@ -45,7 +45,14 @@
           {{ loc.locationname }}
         </option>
       </select>
-    </div>
+          <!-- Retire is a soft delete and the confirm dialog promises the record
+           "can be restored". The API kept that promise (?active=false lists
+           them, PUT isactive restores); nothing in the UI could reach it. -->
+      <label class="checkbox-label">
+        <input type="checkbox" v-model="showRetired" @change="loadDevices" />
+        Show retired
+      </label>
+</div>
 
     <div class="card">
       <div v-if="loading" class="loading">Loading...</div>
@@ -143,6 +150,7 @@ function applySuggestion(word) {
 const selectedType = ref(null)
 const vendorFilter = ref('')
 const locationFilter = ref('')
+const showRetired = ref(false)
 const totalPages = ref(1)
 const perPage = ref(25)
 const totalCount = ref(0)
@@ -225,6 +233,8 @@ async function loadDevices() {
       perpage: perPage.value
     }
     if (search.value) params.search = search.value
+    // active=false means "include retired", matching the API.
+    if (showRetired.value) params.active = 'false'
     if (selectedType.value) params.typeid = selectedType.value
     if (vendorFilter.value) params.vendorid = vendorFilter.value
     if (locationFilter.value) params.locationid = locationFilter.value
diff --git a/plugins/printers/frontend/views/PrinterDetail.vue b/plugins/printers/frontend/views/PrinterDetail.vue
index 89979167..796393a5 100644
--- a/plugins/printers/frontend/views/PrinterDetail.vue
+++ b/plugins/printers/frontend/views/PrinterDetail.vue
@@ -10,11 +10,21 @@
           Print Label
         </router-link>
         <router-link :to="`/printers/${$route.params.id}/edit`" class="btn btn-primary">Edit</router-link>
-        <button @click="confirmRetire" class="btn btn-danger">Retire</button>
+        <button v-if="!isRetired" @click="confirmRetire" class="btn btn-danger">Retire</button>
+        <!-- A retired record offered Edit and Retire exactly like a live
+             one, and nothing said it was retired. Restoring it was possible
+             through the API and nowhere in the product. -->
+        <button v-if="isRetired" @click="restore" class="btn btn-primary">Restore</button>
         <router-link to="/printers" class="btn btn-secondary">Back to List</router-link>
       </div>
     </div>
 
+    <div v-if="printer && printer.isactive === false" class="retired-banner card">
+      <strong>This printer is retired.</strong>
+      It stays out of every list and report, and its history and relationships
+      are intact. Restore puts it back.
+    </div>
+
     <div v-if="loading" class="loading">Loading...</div>
 
     <template v-else-if="printer">
@@ -306,7 +316,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, computed } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { printersApi } from '@/api'
 import { withBase } from '@/utils/basePath'
@@ -406,6 +416,21 @@ function formatDate(dateStr) {
 // Retire, not delete: the server deactivates the asset, so the printer
 // leaves every list and report while its history and relationships stay put.
 // Reversible by an admin setting isactive back to true.
+const isRetired = computed(() => printer.value?.isactive === false)
+
+async function restore() {
+  const label = printer.value?.assetnumber || printer.value?.name || 'this printer'
+  try {
+    await printersApi.update(route.params.id, { isactive: true })
+    toast.success(`Restored ${label}`)
+    const response = await printersApi.get(route.params.id)
+    printer.value = response.data.data
+  } catch (error) {
+    console.error('Error restoring:', error)
+    toast.error(apiError(error, 'Failed to restore'))
+  }
+}
+
 async function confirmRetire() {
   const label = displayTitle.value || 'this printer'
   if (!confirm(`Retire ${label}?\n\nIt will no longer appear in ShopDB. `
@@ -422,6 +447,10 @@ async function confirmRetire() {
 </script>
 
 <style scoped>
+.retired-banner {
+  border-left: 3px solid var(--warning);
+  margin-bottom: 1rem;
+}
 /* Printer-specific styles - shared styles are in global style.css */
 
 .empty-state {
diff --git a/plugins/printers/frontend/views/PrintersList.vue b/plugins/printers/frontend/views/PrintersList.vue
index adc92675..8a37c14e 100644
--- a/plugins/printers/frontend/views/PrintersList.vue
+++ b/plugins/printers/frontend/views/PrintersList.vue
@@ -25,7 +25,14 @@
           {{ pt.printertype }}
         </option>
       </select>
-    </div>
+          <!-- Retire is a soft delete and the confirm dialog promises the record
+           "can be restored". The API kept that promise (?active=false lists
+           them, PUT isactive restores); nothing in the UI could reach it. -->
+      <label class="checkbox-label">
+        <input type="checkbox" v-model="showRetired" @change="loadPrinters" />
+        Show retired
+      </label>
+</div>
 
     <div class="card">
       <div v-if="loading" class="loading">Loading...</div>
@@ -111,6 +118,7 @@ function applySuggestion(word) {
   // search page documents. Load directly.
   loadPrinters()
 }
+const showRetired = ref(false)
 const totalPages = ref(1)
 const perPage = ref(20)
 
@@ -134,6 +142,8 @@ async function loadPrinters() {
       perpage: perPage.value
     }
     if (search.value) params.search = search.value
+    // active=false means "include retired", matching the API.
+    if (showRetired.value) params.active = 'false'
     if (typeFilter.value) params.typeid = typeFilter.value
 
     const response = await printersApi.list(params)