From fc0ec12afea6d0f922da25f580d8afb97204cbf1 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 29 Sep 2025 13:09:20 +1000 Subject: [PATCH] [UI] Icon improvements (#10423) * [UI] Icon improvements - Improve build output icons for "scrap" and "cancel" * Update docs --- docs/docs/manufacturing/output.md | 8 ++++---- src/frontend/src/functions/icons.tsx | 8 +++++--- src/frontend/src/tables/build/BuildOutputTable.tsx | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docs/docs/manufacturing/output.md b/docs/docs/manufacturing/output.md index a4a9d56f49..f93de5107c 100644 --- a/docs/docs/manufacturing/output.md +++ b/docs/docs/manufacturing/output.md @@ -95,13 +95,13 @@ The following options are available when scrapping a build order: | Notes | Any additional notes associated with the scrapping of these outputs | | Discard Allocations | If selected, any installed BOM items will be removed first, before marking the build output as scrapped. Use this option if the installed items are recoverable and can be used elsewhere | -## Delete Build Output +## Cancel Build Output -*Deleting* a build output causes the build output to be cancelled, and removed from the database entirely. Use this option when the build output does not physically exist (or was never built) and should not be tracked in the database. +*Cancelling* a build output causes the build output to be deleted, and removed from the database entirely. Use this option when the build output does not physically exist (or was never built) and should not be tracked in the database. -{{ image("build/build_output_delete.png", "Delete build output") }} +{{ image("build/build_output_delete.png", "Cancel build output") }} -Marking the build output(s) as deleted performs the following actions: +Marking the build output(s) as cancelled performs the following actions: - Any allocated stock items are returned to stock - The build output is removed from the database diff --git a/src/frontend/src/functions/icons.tsx b/src/frontend/src/functions/icons.tsx index f411c20f95..a771428a78 100644 --- a/src/frontend/src/functions/icons.tsx +++ b/src/frontend/src/functions/icons.tsx @@ -18,6 +18,7 @@ import { IconCalendarStats, IconCalendarTime, IconCalendarX, + IconCancel, IconCheck, IconCircleCheck, IconCircleMinus, @@ -149,10 +150,11 @@ const icons: InvenTreeIconType = { suppliers: IconBuilding, customers: IconBuildingStore, purchase_orders: IconShoppingCart, - sales_orders: IconTruckDelivery, return_orders: IconTruckReturn, - shipment: IconTruckDelivery, + sales_orders: IconTruckDelivery, scheduling: IconCalendarStats, + scrap: IconCircleX, + shipment: IconTruckDelivery, test_templates: IconTestPipe, test: IconTestPipe, related_parts: IconLayersLinked, @@ -172,7 +174,7 @@ const icons: InvenTreeIconType = { install: IconTransitionRight, plus: IconCirclePlus, minus: IconCircleMinus, - cancel: IconCircleX, + cancel: IconCancel, hold: IconHandStop, issue: IconBrandTelegram, complete: IconCircleCheck, diff --git a/src/frontend/src/tables/build/BuildOutputTable.tsx b/src/frontend/src/tables/build/BuildOutputTable.tsx index 80235310dc..89a20e47e2 100644 --- a/src/frontend/src/tables/build/BuildOutputTable.tsx +++ b/src/frontend/src/tables/build/BuildOutputTable.tsx @@ -455,7 +455,7 @@ export default function BuildOutputTable({ } + icon={} color='red' disabled={!table.hasSelectedRecords} onClick={() => { @@ -559,7 +559,7 @@ export default function BuildOutputTable({ { title: t`Scrap`, tooltip: t`Scrap build output`, - icon: , + icon: , color: 'red', onClick: () => { setSelectedOutputs([record]);