From 3c684579bb394bc475d25d2742ae422e7c8e56f6 Mon Sep 17 00:00:00 2001 From: danielshid Date: Wed, 5 Mar 2025 23:02:10 -0500 Subject: [PATCH] changed action when deleting conversion involving two units of type unit --- .../EditConversionModalComponent.tsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/client/app/components/conversion/EditConversionModalComponent.tsx b/src/client/app/components/conversion/EditConversionModalComponent.tsx index 0acb5e4e8..e7b638bee 100644 --- a/src/client/app/components/conversion/EditConversionModalComponent.tsx +++ b/src/client/app/components/conversion/EditConversionModalComponent.tsx @@ -119,16 +119,20 @@ export default function EditConversionModalComponent(props: EditConversionModalC msg += `${translate('conversion.delete.suffix.disable')} "${source.name}".\n`; } } else if (source.typeOfUnit === UnitType.unit && dest.typeOfUnit === UnitType.unit) { - const destCount = getConversionCount(dest, conversionDetails); - if (destCount === 1) { + const destConversions = conversionDetails.filter(conversion => + (conversion.sourceId === dest.id) || + (conversion.bidirectional && conversion.destinationId === dest.id) + ); + + const remainingDestConversions = destConversions.filter(conversion => + !(conversion.sourceId === source.id && conversion.destinationId === dest.id) + ); + + if (remainingDestConversions.length === 0) { msg += `${translate('conversion.delete.unit.orphan')} "${dest.name}".\n`; + cancel = true; } - if (state.bidirectional) { - const srcCount = getConversionCount(source, conversionDetails); - if (srcCount === 1) { - msg += `${translate('conversion.delete.unit.orphan')} "${dest.name}".\n`; - } - } + if (msg === '') { msg += `${translate('conversion.delete.unit')}\n`; // TODO: Check after deleting the conversion to see if a change happens.