From a18702813b0a768317916fbefa9c672d90814cc2 Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Tue, 3 Oct 2023 20:20:52 +0000
Subject: [PATCH 01/30] added a delete button

---
 .../app/components/unit/EditUnitModalComponent.tsx     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index b6c2ff08d..b758cdc5b 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -14,6 +14,7 @@ import TooltipHelpContainer from '../../containers/TooltipHelpContainer';
 import '../../styles/modal.css';
 import { removeUnsavedChanges } from '../../actions/unsavedWarning';
 import { submitEditedUnit } from '../../actions/units';
+import { State } from '../types/redux/state';
 import { UnitData, DisplayableType, UnitRepresentType, UnitType } from '../../types/redux/units';
 import { TrueFalseType } from '../../types/items';
 import { notifyUser } from '../../utils/input'
@@ -65,6 +66,12 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		setState({ ...state, [e.target.name]: Number(e.target.value) });
 	}
 
+	const handleDeleteUnit = () => {
+		// Closes the warning modal
+		// Do not call the handler function because we do not want to open the parent modal
+		// Delete the conversion using the state object, it should only require the source and destination ids set
+	}
+
 	/* Edit Unit Validation:
 		Name cannot be blank
 		Sec in Rate must be greater than zero
@@ -315,6 +322,9 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 					</FormGroup>
 				</Container></ModalBody>
 				<ModalFooter>
+					<Button variant="warning" color='danger' onClick={handleDeleteUnit}>
+						<FormattedMessage id="discard.changes" />
+					</Button>
 					{/* Hides the modal */}
 					<Button color='secondary' onClick={handleClose}>
 						<FormattedMessage id="discard.changes" />

From 0ae1f43922abd893555764084e339a1dd9490aa9 Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 6 Oct 2023 22:54:51 +0000
Subject: [PATCH 02/30] unit usage detection logic

---
 .../groups/EditGroupModalComponent.tsx        |  2 +-
 .../unit/EditUnitModalComponent.tsx           | 37 +++++++++++++++----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/client/app/components/groups/EditGroupModalComponent.tsx b/src/client/app/components/groups/EditGroupModalComponent.tsx
index 5842ee309..813b65844 100644
--- a/src/client/app/components/groups/EditGroupModalComponent.tsx
+++ b/src/client/app/components/groups/EditGroupModalComponent.tsx
@@ -129,7 +129,7 @@ export default function EditGroupModalComponent(props: EditGroupModalComponentPr
 		Group must have at least one child (i.e has deep child meters)
 	*/
 	const [validGroup, setValidGroup] = useState(false);
-	useEffect(() => {
+	useEffect(() => {deleteConfirmText
 		setValidGroup(
 			groupState.name !== '' &&
 			(groupState.area === 0 || (groupState.area > 0 && groupState.areaUnit !== AreaUnitType.none)) &&
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index b758cdc5b..e8cb367e6 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
 import store from '../../index';
 //Realize that * is already imported from react
 import { useEffect, useState } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader, Row } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
 import translate from '../../utils/translate';
@@ -14,7 +14,7 @@ import TooltipHelpContainer from '../../containers/TooltipHelpContainer';
 import '../../styles/modal.css';
 import { removeUnsavedChanges } from '../../actions/unsavedWarning';
 import { submitEditedUnit } from '../../actions/units';
-import { State } from '../types/redux/state';
+import { State } from 'types/redux/state';
 import { UnitData, DisplayableType, UnitRepresentType, UnitType } from '../../types/redux/units';
 import { TrueFalseType } from '../../types/items';
 import { notifyUser } from '../../utils/input'
@@ -66,12 +66,33 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		setState({ ...state, [e.target.name]: Number(e.target.value) });
 	}
 
+
+
+	// Log the Redux state to the console
+	const meterState = useSelector((state: State) => state.meters.byMeterID);
+	const groups = useSelector((state: State) => state.groups.byGroupID);
+
 	const handleDeleteUnit = () => {
-		// Closes the warning modal
+		// Access the Redux store state
+		for (const [key, value] of Object.entries(groups)) {
+			for(let i = 0;i<value.deepMeters.length;i++)
+			{
+				if(meterState[value.deepMeters[i]].unitId == state.id)
+				{
+					console.log('WARNING: unit ', state.id,  'is being used in meter',  meterState[value.deepMeters[i]].name);
+				}
+			}
+		}
+
+
+		//	object[1]
+		//  object.1
+		//
+		//
+		// Close the warning modal
 		// Do not call the handler function because we do not want to open the parent modal
 		// Delete the conversion using the state object, it should only require the source and destination ids set
-	}
-
+	};
 	/* Edit Unit Validation:
 		Name cannot be blank
 		Sec in Rate must be greater than zero
@@ -154,7 +175,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 				|| (props.unit.secInRate !== state.secInRate
 					&& (props.unit.unitRepresent === UnitRepresentType.flow || props.unit.unitRepresent === UnitRepresentType.raw));
 			// set displayable to none if unit is meter
-			if(state.typeOfUnit == UnitType.meter && state.displayable != DisplayableType.none) {
+			if (state.typeOfUnit == UnitType.meter && state.displayable != DisplayableType.none) {
 				state.displayable = DisplayableType.none;
 			}
 			// Save our changes by dispatching the submitEditedUnit action
@@ -208,7 +229,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 								autoComplete='on'
 								onChange={e => handleStringChange(e)}
 								value={state.name}
-								invalid={state.name === ''}/>
+								invalid={state.name === ''} />
 							<FormFeedback>
 								<FormattedMessage id="error.required" />
 							</FormFeedback>
@@ -294,7 +315,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 								min='1'
 								invalid={state.secInRate <= 0} />
 							<FormFeedback>
-								<FormattedMessage id="error.greater" values={{ min: '0'}}  />
+								<FormattedMessage id="error.greater" values={{ min: '0' }} />
 							</FormFeedback>
 						</FormGroup></Col>
 						{/* Suffix input */}

From ecfd397878e5dd064f68e20044a924c286c5948e Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Tue, 10 Oct 2023 21:37:38 +0000
Subject: [PATCH 03/30] react alert instead of logging on the console

---
 .../components/unit/EditUnitModalComponent.tsx  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index e8cb367e6..da2cb2ab6 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -20,6 +20,7 @@ import { TrueFalseType } from '../../types/items';
 import { notifyUser } from '../../utils/input'
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 
+
 interface EditUnitModalComponentProps {
 	show: boolean;
 	unit: UnitData;
@@ -74,19 +75,21 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 
 	const handleDeleteUnit = () => {
 		// Access the Redux store state
+		let error_message = '';
 		for (const [key, value] of Object.entries(groups)) {
-			for(let i = 0;i<value.deepMeters.length;i++)
-			{
-				if(meterState[value.deepMeters[i]].unitId == state.id)
-				{
-					console.log('WARNING: unit ', state.id,  'is being used in meter',  meterState[value.deepMeters[i]].name);
+			for (let i = 0; i < value.deepMeters.length; i++) {
+				if (meterState[value.deepMeters[i]].unitId == state.id) {
+					error_message += 'WARNING: unit '+ state.id + ' is being used in meter ' + meterState[value.deepMeters[i]].name + ' \n';
+
 				}
 			}
 		}
+		if(error_message)
+		{
+			alert(error_message);
+		}
 
 
-		//	object[1]
-		//  object.1
 		//
 		//
 		// Close the warning modal

From 01fd7562cb917d0df6bd7636a722cc311b800bcb Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 13 Oct 2023 20:52:35 +0000
Subject: [PATCH 04/30] translate error messages into french and spanish

---
 src/client/app/components/unit/EditUnitModalComponent.tsx | 6 ++++--
 src/client/app/translations/data.js                       | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index da2cb2ab6..905eb8384 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -79,17 +79,19 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		for (const [key, value] of Object.entries(groups)) {
 			for (let i = 0; i < value.deepMeters.length; i++) {
 				if (meterState[value.deepMeters[i]].unitId == state.id) {
-					error_message += 'WARNING: unit '+ state.id + ' is being used in meter ' + meterState[value.deepMeters[i]].name + ' \n';
+					error_message += translate('group') + value.name + ' uses ' + translate('meter') + ' "' + meterState[value.deepMeters[i]].name + '" \n';
 
 				}
 			}
 		}
+		//finish meter graphicalUnitId and UnitId
+		//finish conversion check both source or destination unit
 		if(error_message)
 		{
+			error_message = translate('unit.failed.to.delete.unit') + '\n' +  error_message;
 			alert(error_message);
 		}
 
-
 		//
 		//
 		// Close the warning modal
diff --git a/src/client/app/translations/data.js b/src/client/app/translations/data.js
index 9efe38f1f..c200455c7 100644
--- a/src/client/app/translations/data.js
+++ b/src/client/app/translations/data.js
@@ -414,6 +414,7 @@ const localeData = {
 		"unit.dropdown.displayable.option.all": "All",
 		"unit.dropdown.displayable.option.admin": "admin",
 		"unit.failed.to.create.unit": "Failed to create a unit.",
+		"unit.failed.to.delete.unit": "Delete cannot be done because it is used by the following:",
 		"unit.failed.to.edit.unit": "Failed to edit unit.",
 		"unit.id": "ID:",
 		"unit.identifier": "Identifier:",
@@ -867,6 +868,7 @@ const localeData = {
 		"unit.dropdown.displayable.option.all": "(Need French) All",
 		"unit.dropdown.displayable.option.admin": "(Need French) admin",
 		"unit.failed.to.create.unit": "(Need French) Failed to create a unit.",
+		"unit.failed.to.delete.unit": "(Need French) Delete cannot be done because it is used by the following:",
 		"unit.failed.to.edit.unit": "(Need French) Failed to edit unit.",
 		"unit.id": "(Need French) ID:",
 		"unit.identifier": "(Need French) Identifier:",
@@ -1320,6 +1322,7 @@ const localeData = {
 		"unit.dropdown.displayable.option.all": "(Need Spanish) All",
 		"unit.dropdown.displayable.option.admin": "(Need Spanish) admin",
 		"unit.failed.to.create.unit": "(Need Spanish) Failed to create a unit.",
+		"unit.failed.to.delete.unit": "(Need Spanish) Delete cannot be done because it is used by the following:",
 		"unit.failed.to.edit.unit": "(Need Spanish) Failed to edit unit.",
 		"unit.id": "(Need Spanish) ID:",
 		"unit.identifier": "(Need Spanish) Identifier:",

From 45eb93c39da131a674b6131d431bee765f408986 Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 13 Oct 2023 21:07:42 +0000
Subject: [PATCH 05/30] i fixed a dumb bug that wasn't giving me problems

---
 .../meters/EditMeterModalComponent.tsx        | 146 ++++++++++--------
 .../unit/EditUnitModalComponent.tsx           |   3 +-
 2 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index af4939d97..16a22e3c5 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -149,6 +149,9 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 		props.handleClose();
 		resetState();
 	}
+	const metersByID = useSelector((state: State) => state.meters.byMeterID);
+	const groups = useSelector((state: State) => state.groups.byGroupID);
+
 
 	// Save changes
 	// Currently using the old functionality which is to compare inherited prop values to state values
@@ -192,6 +195,19 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				props.meter.areaUnit != state.areaUnit ||
 				props.meter.readingFrequency != state.readingFrequency
 			);
+		let error_message = '';
+		for (const [key, value] of Object.entries(groups)) {
+			for (let i = 0; i < value.deepMeters.length; i++) {
+				if (metersByID[value.deepMeters[i]].unitId == props.meter.unitId) {
+					error_message += key + ' '  + translate('group') + value.name + ' uses ' + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
+				}
+			}
+		}
+
+		if (error_message) {
+			error_message = 'Are you sure you want to change this unit? ' + '\n' + error_message;
+			alert(error_message);
+		}
 
 		// Only validate and store if any changes.
 		if (meterHasChanges) {
@@ -578,20 +594,20 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								})}
 							</Input>
 						</FormGroup>
-						{/* cumulativeReset input */}
-						<FormGroup>
-							<Label for='cumulativeReset'>{translate('meter.cumulativeReset')}</Label>
-							<Input
-								id='cumulativeReset'
-								name='cumulativeReset'
-								type='select'
-								value={state.cumulativeReset?.toString()}
-								onChange={e => handleBooleanChange(e)}>
-								{Object.keys(TrueFalseType).map(key => {
-									return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>)
-								})}
-							</Input>
-						</FormGroup></Col>
+							{/* cumulativeReset input */}
+							<FormGroup>
+								<Label for='cumulativeReset'>{translate('meter.cumulativeReset')}</Label>
+								<Input
+									id='cumulativeReset'
+									name='cumulativeReset'
+									type='select'
+									value={state.cumulativeReset?.toString()}
+									onChange={e => handleBooleanChange(e)}>
+									{Object.keys(TrueFalseType).map(key => {
+										return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>)
+									})}
+								</Input>
+							</FormGroup></Col>
 						{/* cumulativeResetStart input */}
 						<Col><FormGroup>
 							<Label for='cumulativeResetStart'>{translate('meter.cumulativeResetStart')}</Label>
@@ -604,18 +620,18 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								value={state.cumulativeResetStart}
 								placeholder='HH:MM:SS' />
 						</FormGroup>
-						{/* cumulativeResetEnd input */}
-						<FormGroup>
-							<Label for='cumulativeResetEnd'>{translate('meter.cumulativeResetEnd')}</Label>
-							<Input
-								id='cumulativeResetEnd'
-								name='cumulativeResetEnd'
-								type='text'
-								autoComplete='off'
-								onChange={e => handleStringChange(e)}
-								value={state?.cumulativeResetEnd}
-								placeholder='HH:MM:SS' />
-						</FormGroup></Col>
+							{/* cumulativeResetEnd input */}
+							<FormGroup>
+								<Label for='cumulativeResetEnd'>{translate('meter.cumulativeResetEnd')}</Label>
+								<Input
+									id='cumulativeResetEnd'
+									name='cumulativeResetEnd'
+									type='text'
+									autoComplete='off'
+									onChange={e => handleStringChange(e)}
+									value={state?.cumulativeResetEnd}
+									placeholder='HH:MM:SS' />
+							</FormGroup></Col>
 					</Row>
 					<Row xs='1' lg='2'>
 						{/* endOnlyTime input */}
@@ -699,21 +715,21 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								})}
 							</Input>
 						</FormGroup>
-						{/* Timezone input */}
-						<FormGroup>
-							<Label>{translate('meter.time.zone')}</Label>
-							<TimeZoneSelect current={state.timeZone} handleClick={timeZone => handleTimeZoneChange(timeZone)} />
-						</FormGroup>
-						{/* reading input */}
-						<FormGroup>
-							<Label for='reading'>{translate('meter.reading')}</Label>
-							<Input
-								id='reading'
-								name='reading'
-								type='number'
-								onChange={e => handleNumberChange(e)}
-								defaultValue={state?.reading} />
-						</FormGroup></Col>
+							{/* Timezone input */}
+							<FormGroup>
+								<Label>{translate('meter.time.zone')}</Label>
+								<TimeZoneSelect current={state.timeZone} handleClick={timeZone => handleTimeZoneChange(timeZone)} />
+							</FormGroup>
+							{/* reading input */}
+							<FormGroup>
+								<Label for='reading'>{translate('meter.reading')}</Label>
+								<Input
+									id='reading'
+									name='reading'
+									type='number'
+									onChange={e => handleNumberChange(e)}
+									defaultValue={state?.reading} />
+							</FormGroup></Col>
 						{/* startTimestamp input */}
 						<Col><FormGroup>
 							<Label for='startTimestamp'>{translate('meter.startTimeStamp')}</Label>
@@ -726,30 +742,30 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								placeholder='YYYY-MM-DD HH:MM:SS'
 								value={state?.startTimestamp} />
 						</FormGroup>
-						{/* endTimestamp input */}
-						<FormGroup>
-							<Label for='endTimestamp'>{translate('meter.endTimeStamp')}</Label>
-							<Input
-								id='endTimestamp'
-								name='endTimestamp'
-								type='text'
-								autoComplete='on'
-								onChange={e => handleStringChange(e)}
-								placeholder='YYYY-MM-DD HH:MM:SS'
-								value={state?.endTimestamp} />
-						</FormGroup>
-						{/* previousEnd input */}
-						<FormGroup>
-							<Label for='previousEnd'>{translate('meter.previousEnd')}</Label>
-							<Input
-								id='previousEnd'
-								name='previousEnd'
-								type='text'
-								autoComplete='on'
-								onChange={e => handleStringChange(e)}
-								placeholder='YYYY-MM-DD HH:MM:SS'
-								value={state?.previousEnd} />
-						</FormGroup></Col>
+							{/* endTimestamp input */}
+							<FormGroup>
+								<Label for='endTimestamp'>{translate('meter.endTimeStamp')}</Label>
+								<Input
+									id='endTimestamp'
+									name='endTimestamp'
+									type='text'
+									autoComplete='on'
+									onChange={e => handleStringChange(e)}
+									placeholder='YYYY-MM-DD HH:MM:SS'
+									value={state?.endTimestamp} />
+							</FormGroup>
+							{/* previousEnd input */}
+							<FormGroup>
+								<Label for='previousEnd'>{translate('meter.previousEnd')}</Label>
+								<Input
+									id='previousEnd'
+									name='previousEnd'
+									type='text'
+									autoComplete='on'
+									onChange={e => handleStringChange(e)}
+									placeholder='YYYY-MM-DD HH:MM:SS'
+									value={state?.previousEnd} />
+							</FormGroup></Col>
 					</Row>
 				</Container></ModalBody>
 				<ModalFooter>
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 905eb8384..453f3a825 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -79,7 +79,8 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		for (const [key, value] of Object.entries(groups)) {
 			for (let i = 0; i < value.deepMeters.length; i++) {
 				if (meterState[value.deepMeters[i]].unitId == state.id) {
-					error_message += translate('group') + value.name + ' uses ' + translate('meter') + ' "' + meterState[value.deepMeters[i]].name + '" \n';
+					error_message += key + ' '  + translate('group') +' '+ value.name + ' uses ' + translate('meter') + ' "' + 
+					meterState[value.deepMeters[i]].name + '" \n';
 
 				}
 			}

From 21cc8fac49bf0a46af202abdd70b6858b707259f Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 13 Oct 2023 21:31:17 +0000
Subject: [PATCH 06/30] completely redesigned the function based on Steve

---
 .../unit/EditUnitModalComponent.tsx           | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 453f3a825..c9e5cbfdc 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -71,18 +71,23 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 
 	// Log the Redux state to the console
 	const meterState = useSelector((state: State) => state.meters.byMeterID);
-	const groups = useSelector((state: State) => state.groups.byGroupID);
+	const conversions = useSelector((state: State) => state.conversions.conversions)
 
 	const handleDeleteUnit = () => {
 		// Access the Redux store state
 		let error_message = '';
-		for (const [key, value] of Object.entries(groups)) {
-			for (let i = 0; i < value.deepMeters.length; i++) {
-				if (meterState[value.deepMeters[i]].unitId == state.id) {
-					error_message += key + ' '  + translate('group') +' '+ value.name + ' uses ' + translate('meter') + ' "' + 
-					meterState[value.deepMeters[i]].name + '" \n';
+		for (const [key, value] of Object.entries(meterState)) {
+			if(value.unitId==state.id){
+				error_message += translate('meter') + value.name + ' uses ' + translate('unit') + ' "' + state.id+ '" \n';
+			}
+		}
+		for(let i=0;i<conversions.length;i++){
+			if(conversions[i].sourceId==state.id){
+				error_message += translate('conversion') + conversions[i].note + 'uses ' + translate('unit') + ' "' + state.id+ '"as a source unit\n';
+			}
 
-				}
+			if(conversions[i].destinationId==state.id){
+				error_message += translate('conversion') + conversions[i].note + 'uses ' + translate('unit') + ' "' + state.id+ '"as a destination unit\n';
 			}
 		}
 		//finish meter graphicalUnitId and UnitId
@@ -93,6 +98,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 			alert(error_message);
 		}
 
+
 		//
 		//
 		// Close the warning modal

From 31b284b883f613c8765897678ccbe7b8069738da Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 20 Oct 2023 20:31:46 +0000
Subject: [PATCH 07/30] i did not write this code

---
 .../meters/EditMeterModalComponent.tsx        | 81 -------------------
 1 file changed, 81 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index c83cb7326..f71fc36cb 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -641,23 +641,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 									return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>)
 								})}
 							</Input>
-<<<<<<< HEAD
-						</FormGroup>
-							{/* cumulativeReset input */}
-							<FormGroup>
-								<Label for='cumulativeReset'>{translate('meter.cumulativeReset')}</Label>
-								<Input
-									id='cumulativeReset'
-									name='cumulativeReset'
-									type='select'
-									value={state.cumulativeReset?.toString()}
-									onChange={e => handleBooleanChange(e)}>
-									{Object.keys(TrueFalseType).map(key => {
-										return (<option value={key} key={key}>{translate(`TrueFalseType.${key}`)}</option>)
-									})}
-								</Input>
-							</FormGroup></Col>
-=======
 						</FormGroup></Col>
 						{/* cumulativeReset input */}
 						<Col><FormGroup>
@@ -675,7 +658,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 						</FormGroup></Col>
 					</Row>
 					<Row xs='1' lg='2'>
->>>>>>> 6d21ed3028bd5245f5f483beaa5457bfe4301261
 						{/* cumulativeResetStart input */}
 						<Col><FormGroup>
 							<Label for='cumulativeResetStart'>{translate('meter.cumulativeResetStart')}</Label>
@@ -687,21 +669,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								onChange={e => handleStringChange(e)}
 								value={state.cumulativeResetStart}
 								placeholder='HH:MM:SS' />
-<<<<<<< HEAD
-						</FormGroup>
-							{/* cumulativeResetEnd input */}
-							<FormGroup>
-								<Label for='cumulativeResetEnd'>{translate('meter.cumulativeResetEnd')}</Label>
-								<Input
-									id='cumulativeResetEnd'
-									name='cumulativeResetEnd'
-									type='text'
-									autoComplete='off'
-									onChange={e => handleStringChange(e)}
-									value={state?.cumulativeResetEnd}
-									placeholder='HH:MM:SS' />
-							</FormGroup></Col>
-=======
 						</FormGroup></Col>
 						{/* cumulativeResetEnd input */}
 						<Col><FormGroup>
@@ -715,7 +682,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								value={state?.cumulativeResetEnd}
 								placeholder='HH:MM:SS' />
 						</FormGroup></Col>
->>>>>>> 6d21ed3028bd5245f5f483beaa5457bfe4301261
 					</Row>
 					<Row xs='1' lg='2'>
 						{/* endOnlyTime input */}
@@ -798,24 +764,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 									return (<option value={key} key={key}>{translate(`TimeSortTypes.${key}`)}</option>)
 								})}
 							</Input>
-<<<<<<< HEAD
-						</FormGroup>
-							{/* Timezone input */}
-							<FormGroup>
-								<Label>{translate('meter.time.zone')}</Label>
-								<TimeZoneSelect current={state.timeZone} handleClick={timeZone => handleTimeZoneChange(timeZone)} />
-							</FormGroup>
-							{/* reading input */}
-							<FormGroup>
-								<Label for='reading'>{translate('meter.reading')}</Label>
-								<Input
-									id='reading'
-									name='reading'
-									type='number'
-									onChange={e => handleNumberChange(e)}
-									defaultValue={state?.reading} />
-							</FormGroup></Col>
-=======
 						</FormGroup></Col>
 						{/* Timezone input */}
 						<Col><FormGroup>
@@ -939,7 +887,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								onChange={e => handleNumberChange(e)}
 								defaultValue={state?.reading} />
 						</FormGroup></Col>
->>>>>>> 6d21ed3028bd5245f5f483beaa5457bfe4301261
 						{/* startTimestamp input */}
 						<Col><FormGroup>
 							<Label for='startTimestamp'>{translate('meter.startTimeStamp')}</Label>
@@ -951,33 +898,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								onChange={e => handleStringChange(e)}
 								placeholder='YYYY-MM-DD HH:MM:SS'
 								value={state?.startTimestamp} />
-<<<<<<< HEAD
-						</FormGroup>
-							{/* endTimestamp input */}
-							<FormGroup>
-								<Label for='endTimestamp'>{translate('meter.endTimeStamp')}</Label>
-								<Input
-									id='endTimestamp'
-									name='endTimestamp'
-									type='text'
-									autoComplete='on'
-									onChange={e => handleStringChange(e)}
-									placeholder='YYYY-MM-DD HH:MM:SS'
-									value={state?.endTimestamp} />
-							</FormGroup>
-							{/* previousEnd input */}
-							<FormGroup>
-								<Label for='previousEnd'>{translate('meter.previousEnd')}</Label>
-								<Input
-									id='previousEnd'
-									name='previousEnd'
-									type='text'
-									autoComplete='on'
-									onChange={e => handleStringChange(e)}
-									placeholder='YYYY-MM-DD HH:MM:SS'
-									value={state?.previousEnd} />
-							</FormGroup></Col>
-=======
 						</FormGroup></Col>
 					</Row>
 					<Row xs='1' lg='2'>
@@ -1005,7 +925,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 								placeholder='YYYY-MM-DD HH:MM:SS'
 								value={state?.previousEnd} />
 						</FormGroup></Col>
->>>>>>> 6d21ed3028bd5245f5f483beaa5457bfe4301261
 					</Row>
 				</Container></ModalBody>
 				<ModalFooter>

From 9b55fccf209355a107bbc07777782a976a2ee228 Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 20 Oct 2023 21:04:12 +0000
Subject: [PATCH 08/30] cleanup

---
 .../app/components/meters/EditMeterModalComponent.tsx    | 9 ++++++---
 .../app/components/unit/EditUnitModalComponent.tsx       | 5 ++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index f71fc36cb..50763e8c5 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -244,13 +244,16 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				props.meter.disableChecks != state.disableChecks
 			);
 		let error_message = '';
-		for (const [key, value] of Object.entries(groups)) {
+		for (const value of Object.values(groups)) {
 			for (let i = 0; i < value.deepMeters.length; i++) {
-				if (metersByID[value.deepMeters[i]].unitId == props.meter.unitId) {
-					error_message += key + ' '  + translate('group') + value.name + ' uses ' + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
+				console.log(metersByID[value.deepMeters[i]].name, props.meter.name)
+				if(metersByID[value.deepMeters[i]].name== props.meter.name)
+				{
+					error_message += translate('group') + value.name + ' uses ' + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
 				}
 			}
 		}
+		state.unitId = props.meter.unitId;
 
 		if (error_message) {
 			error_message = 'Are you sure you want to change this unit? ' + '\n' + error_message;
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index a61a06314..d94e8b47b 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -5,7 +5,7 @@ import * as React from 'react';
 import store from '../../index';
 //Realize that * is already imported from react
 import { useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch} from 'react-redux';
 import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader, Row } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
 import translate from '../../utils/translate';
@@ -14,7 +14,6 @@ import TooltipHelpContainer from '../../containers/TooltipHelpContainer';
 import '../../styles/modal.css';
 import { removeUnsavedChanges } from '../../actions/unsavedWarning';
 import { submitEditedUnit } from '../../actions/units';
-import { State } from 'types/redux/state';
 import { UnitData, DisplayableType, UnitRepresentType, UnitType } from '../../types/redux/units';
 import { TrueFalseType } from '../../types/items';
 import { notifyUser } from '../../utils/input'
@@ -80,7 +79,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 	const handleDeleteUnit = () => {
 		// Access the Redux store state
 		let error_message = '';
-		for (const [key, value] of Object.entries(meterState)) {
+		for (const value of Object.values(meterState)) {
 			if(value.unitId==state.id){
 				error_message += translate('meter') + value.name + ' uses ' + translate('unit') + ' "' + state.id+ '" \n';
 			}

From f84afec5601f1c9f48474240c41609f083f66c34 Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 20 Oct 2023 21:23:49 +0000
Subject: [PATCH 09/30] small changes

---
 src/client/app/components/unit/EditUnitModalComponent.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index d94e8b47b..af1b0076b 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -90,7 +90,8 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 			}
 
 			if(conversions[i].destinationId==state.id){
-				error_message += translate('conversion') + conversions[i].note + 'uses ' + translate('unit') + ' "' + state.id+ '"as a destination unit\n';
+				error_message += translate('conversion') + conversions[i].sourceId + '→' + conversions[i].destinationId + ' uses '
+				+ translate('unit') + ' "' + state.id+ '" as a destination unit\n';
 			}
 		}
 		//finish meter graphicalUnitId and UnitId

From 89aeaf6dede6a392a580d5d9e024d921844ff570 Mon Sep 17 00:00:00 2001
From: sparakala21 <sravanparakala@gmail.com>
Date: Fri, 27 Oct 2023 21:31:01 +0000
Subject: [PATCH 10/30] bug fix

---
 src/client/app/components/meters/EditMeterModalComponent.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 50763e8c5..d376e5fd9 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -246,8 +246,8 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 		let error_message = '';
 		for (const value of Object.values(groups)) {
 			for (let i = 0; i < value.deepMeters.length; i++) {
-				console.log(metersByID[value.deepMeters[i]].name, props.meter.name)
-				if(metersByID[value.deepMeters[i]].name== props.meter.name)
+				console.log(value.deepMeters[i], props.meter.id)
+				if(value.deepMeters[i]== props.meter.id)
 				{
 					error_message += translate('group') + value.name + ' uses ' + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
 				}

From fb7a7ef3847c20ace3c184d35b4276c5e1732fbd Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Tue, 7 Nov 2023 20:30:08 +0000
Subject: [PATCH 11/30] translations

---
 src/client/app/components/meters/EditMeterModalComponent.tsx | 2 +-
 src/client/app/translations/data.js                          | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index d376e5fd9..5c9853995 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -256,7 +256,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 		state.unitId = props.meter.unitId;
 
 		if (error_message) {
-			error_message = 'Are you sure you want to change this unit? ' + '\n' + error_message;
+			error_message = translate('meter.is.not.editable') + '\n' + error_message;
 			alert(error_message);
 		}
 
diff --git a/src/client/app/translations/data.js b/src/client/app/translations/data.js
index 212ffe14f..1678c7fa9 100644
--- a/src/client/app/translations/data.js
+++ b/src/client/app/translations/data.js
@@ -334,7 +334,7 @@ const localeData = {
 		"meter.is.enabled": "Updates Enabled",
 		"meter.is.not.displayable": "Display Disabled",
 		"meter.is.not.enabled": "Updates Disabled",
-		"meter.previousEnd": "Previous End Time Stamp:",
+				"meter.previousEnd": "Previous End Time Stamp:",
 		"meter.reading": "Reading:",
 		"meter.readingDuplication": "Reading Duplication:",
 		"meter.readingFrequency": "Reading Frequency",
@@ -786,6 +786,7 @@ const localeData = {
 		"meter.is.enabled": "Mises à Jour Activées",
 		"meter.is.not.displayable": "Affichage Désactivé",
 		"meter.is.not.enabled": "Mises à Jour Désactivées",
+		"meter.is.not.editable": "(need French) This meter cannot be changed",
 		"meter.previousEnd": "(need French) Previous End Time Stamp:",
 		"meter.reading": "(need French) Reading:",
 		"meter.readingDuplication": "(need French) Reading Duplication:",
@@ -1238,6 +1239,7 @@ const localeData = {
 		"meter.is.enabled": "Actualizaciones Habilitado",
 		"meter.is.not.displayable": "El medidor es visualizable",
 		"meter.is.not.enabled": "El medidor no esta activada",
+		"meter.is.not.editable": "(need Spanish) This meter cannot be changed",
 		"meter.previousEnd": "(need Spanish) Previous End Time Stamp:",
 		"meter.reading": "(need Spanish) Reading:",
 		"meter.readingDuplication": "(need Spanish) Reading Duplication:",

From 5f895be4883d29d7ea0e130f681ccdd6808c9664 Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Tue, 7 Nov 2023 20:50:14 +0000
Subject: [PATCH 12/30] the button said Discard changes instead Delete Changes

---
 src/client/app/components/unit/EditUnitModalComponent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index af1b0076b..71f47b0d1 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -373,7 +373,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 				</Container></ModalBody>
 				<ModalFooter>
 					<Button variant="warning" color='danger' onClick={handleDeleteUnit}>
-						<FormattedMessage id="discard.changes" />
+						<FormattedMessage id="Delete Changes" />
 					</Button>
 					{/* Hides the modal */}
 					<Button color='secondary' onClick={handleClose}>

From 9bbba6cb8d22f0bcef37978e97b86da98d08ac52 Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Wed, 22 Nov 2023 01:01:30 +0000
Subject: [PATCH 13/30] small fixes

---
 .../meters/EditMeterModalComponent.tsx        | 19 +++++++++++--------
 src/client/app/translations/data.js           |  3 +++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 5c9853995..56c80df7b 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -6,6 +6,7 @@ import * as React from 'react';
 import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader, Row } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
 import translate from '../../utils/translate';
+import { showErrorNotification, showSuccessNotification } from '../../utils/notifications';
 import { useDispatch, useSelector } from 'react-redux';
 import { useState, useEffect } from 'react';
 import { State } from 'types/redux/state';
@@ -243,23 +244,25 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				props.meter.maxError != state.maxError ||
 				props.meter.disableChecks != state.disableChecks
 			);
+		// Check if any deep meters in the redux state depend on the meter being edited
 		let error_message = '';
-		for (const value of Object.values(groups)) {
-			for (let i = 0; i < value.deepMeters.length; i++) {
-				console.log(value.deepMeters[i], props.meter.id)
-				if(value.deepMeters[i]== props.meter.id)
-				{
-					error_message += translate('group') + value.name + ' uses ' + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
+		if (state.unitId != props.meter.unitId) {
+			for (const value of Object.values(groups)) {
+				for (let i = 0; i < value.deepMeters.length; i++) {
+					if (value.deepMeters[i] == props.meter.id) {
+						error_message += translate('group') + value.name + translate('uses') + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
+					}
 				}
 			}
 		}
 		state.unitId = props.meter.unitId;
-
+		// Display an error message if there are dependent deep meters
 		if (error_message) {
 			error_message = translate('meter.is.not.editable') + '\n' + error_message;
-			alert(error_message);
+			showErrorNotification(error_message);
 		}
 
+
 		// Only validate and store if any changes.
 		if (meterHasChanges) {
 			// Set default identifier as name if left blank
diff --git a/src/client/app/translations/data.js b/src/client/app/translations/data.js
index 1678c7fa9..129ccf642 100644
--- a/src/client/app/translations/data.js
+++ b/src/client/app/translations/data.js
@@ -452,6 +452,7 @@ const localeData = {
 		"users.successfully.create.user": "Successfully created a user.",
 		"users.successfully.delete.user": "Successfully deleted user.",
 		"users.successfully.edit.users": "Successfully edited users.",
+		"uses":"uses",
 		"view.groups": "View Groups",
 		"visit": " or visit our ",
 		"website": "website",
@@ -905,6 +906,7 @@ const localeData = {
 		"users.successfully.create.user": "(Need French) Successfully created a user.",
 		"users.successfully.delete.user": "(Need French) Successfully deleted user.",
 		"users.successfully.edit.users": "(Need French) Successfully edited users.",
+		"uses":"(Need French) uses",
 		"view.groups": "Visionner les groupes",
 		"visit": " ou visitez notre ",
 		"website": "site web",
@@ -1358,6 +1360,7 @@ const localeData = {
 		"users.successfully.create.user": "Usario creado con éxito.",
 		"users.successfully.delete.user": "Usario borrado con éxito.",
 		"users.successfully.edit.users": "Usarios editados con éxito.",
+		"uses":"(Need Spanish) uses",
 		"view.groups": "Ver grupos",
 		"visit": " o visite nuestra ",
 		"website": "sitio web",

From 6f42171e6d46193649416d0eabd416b755c5d061 Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Wed, 22 Nov 2023 23:40:35 +0000
Subject: [PATCH 14/30] i didnt use success notification

---
 src/client/app/components/meters/EditMeterModalComponent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 56c80df7b..c22a16cf4 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -6,7 +6,7 @@ import * as React from 'react';
 import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader, Row } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
 import translate from '../../utils/translate';
-import { showErrorNotification, showSuccessNotification } from '../../utils/notifications';
+import { showErrorNotification} from '../../utils/notifications';
 import { useDispatch, useSelector } from 'react-redux';
 import { useState, useEffect } from 'react';
 import { State } from 'types/redux/state';

From 76f5c06a83e4da32f26d6942cf4b49f773199396 Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Thu, 23 Nov 2023 00:07:31 +0000
Subject: [PATCH 15/30] some more fixes

---
 .../app/components/unit/EditUnitModalComponent.tsx | 14 +++-----------
 src/client/app/translations/data.js                |  3 ++-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 71f47b0d1..7ef5c30c5 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -22,7 +22,6 @@ import { Dispatch } from 'types/redux/actions';
 import { useSelector } from 'react-redux';
 import { State } from 'types/redux/state';
 
-
 interface EditUnitModalComponentProps {
 	show: boolean;
 	unit: UnitData;
@@ -71,7 +70,6 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 	}
 
 
-
 	// Log the Redux state to the console
 	const meterState = useSelector((state: State) => state.meters.byMeterID);
 	const conversions = useSelector((state: State) => state.conversions.conversions)
@@ -81,12 +79,12 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		let error_message = '';
 		for (const value of Object.values(meterState)) {
 			if(value.unitId==state.id){
-				error_message += translate('meter') + value.name + ' uses ' + translate('unit') + ' "' + state.id+ '" \n';
+				error_message += translate('meter') + value.name + ' uses ' + translate('unit') + ' "' + state.identifier+ '" \n';
 			}
 		}
 		for(let i=0;i<conversions.length;i++){
 			if(conversions[i].sourceId==state.id){
-				error_message += translate('conversion') + conversions[i].note + 'uses ' + translate('unit') + ' "' + state.id+ '"as a source unit\n';
+				error_message += translate('conversion') + conversions[i].note + 'uses ' + translate('unit') + ' "' + state.identifier+ '"as a source unit\n';
 			}
 
 			if(conversions[i].destinationId==state.id){
@@ -94,8 +92,6 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 				+ translate('unit') + ' "' + state.id+ '" as a destination unit\n';
 			}
 		}
-		//finish meter graphicalUnitId and UnitId
-		//finish conversion check both source or destination unit
 		if(error_message)
 		{
 			error_message = translate('unit.failed.to.delete.unit') + '\n' +  error_message;
@@ -103,11 +99,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		}
 
 
-		//
-		//
-		// Close the warning modal
-		// Do not call the handler function because we do not want to open the parent modal
-		// Delete the conversion using the state object, it should only require the source and destination ids set
+
 	};
 	/* Edit Unit Validation:
 		Name cannot be blank
diff --git a/src/client/app/translations/data.js b/src/client/app/translations/data.js
index 129ccf642..32b9dfb78 100644
--- a/src/client/app/translations/data.js
+++ b/src/client/app/translations/data.js
@@ -334,7 +334,8 @@ const localeData = {
 		"meter.is.enabled": "Updates Enabled",
 		"meter.is.not.displayable": "Display Disabled",
 		"meter.is.not.enabled": "Updates Disabled",
-				"meter.previousEnd": "Previous End Time Stamp:",
+		"meter.is.not.editable": "This meter cannot be changed",
+		"meter.previousEnd": "Previous End Time Stamp:",
 		"meter.reading": "Reading:",
 		"meter.readingDuplication": "Reading Duplication:",
 		"meter.readingFrequency": "Reading Frequency",

From 5379a64dc7f36b5b186efe599a6207b8f310afa3 Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Fri, 24 Nov 2023 17:03:21 +0000
Subject: [PATCH 16/30] stop using alerts in Edit Unit

---
 src/client/app/components/unit/EditUnitModalComponent.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 7ef5c30c5..43b90d78e 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -9,6 +9,7 @@ import { useDispatch} from 'react-redux';
 import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader, Row } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
 import translate from '../../utils/translate';
+import { showErrorNotification} from '../../utils/notifications';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
 import TooltipHelpContainer from '../../containers/TooltipHelpContainer';
 import '../../styles/modal.css';
@@ -72,7 +73,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 
 	// Log the Redux state to the console
 	const meterState = useSelector((state: State) => state.meters.byMeterID);
-	const conversions = useSelector((state: State) => state.conversions.conversions)
+	const conversions = useSelector((state: State) => state.conversions.conversions);
 
 	const handleDeleteUnit = () => {
 		// Access the Redux store state
@@ -95,7 +96,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		if(error_message)
 		{
 			error_message = translate('unit.failed.to.delete.unit') + '\n' +  error_message;
-			alert(error_message);
+			showErrorNotification(error_message);
 		}
 
 

From 23ace406406b83d8f54c374e13eed79a462ccfe0 Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Fri, 1 Dec 2023 21:31:24 +0000
Subject: [PATCH 17/30] alert->notifyUser

---
 .../meters/EditMeterModalComponent.tsx        | 19 ++++++++++---------
 src/client/app/utils/calibration.ts           |  4 +++-
 src/client/app/utils/input.ts                 |  4 +++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index c22a16cf4..45bd769cc 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -6,7 +6,7 @@ import * as React from 'react';
 import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader, Row } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
 import translate from '../../utils/translate';
-import { showErrorNotification} from '../../utils/notifications';
+import { showErrorNotification } from '../../utils/notifications';
 import { useDispatch, useSelector } from 'react-redux';
 import { useState, useEffect } from 'react';
 import { State } from 'types/redux/state';
@@ -250,18 +250,12 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 			for (const value of Object.values(groups)) {
 				for (let i = 0; i < value.deepMeters.length; i++) {
 					if (value.deepMeters[i] == props.meter.id) {
+						inputOk = false;
 						error_message += translate('group') + value.name + translate('uses') + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
 					}
 				}
 			}
 		}
-		state.unitId = props.meter.unitId;
-		// Display an error message if there are dependent deep meters
-		if (error_message) {
-			error_message = translate('meter.is.not.editable') + '\n' + error_message;
-			showErrorNotification(error_message);
-		}
-
 
 		// Only validate and store if any changes.
 		if (meterHasChanges) {
@@ -292,6 +286,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 					// so leaving code commented out.
 					// notifyUser(translate('input.gps.range') + state.gps + '.');
 					inputOk = false;
+					setState({...state, ['gps']: props.meter.gps});
 				}
 			}
 
@@ -313,7 +308,13 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				// Submit new meter if checks where ok.
 				dispatch(submitEditedMeter(submitState, shouldRefreshReadingViews));
 				dispatch(removeUnsavedChanges());
-			} else {
+			} else if (error_message) {
+				// Display an error message if there are dependent deep meters
+				// state.unitId = props.meter.unitId;
+				setState({...state, ['unitId']: props.meter.unitId});
+				error_message = translate('meter.is.not.editable') + '\n' + error_message;
+				showErrorNotification(error_message);
+			} else{
 				// Tell user that not going to update due to input issues.
 				notifyUser(translate('meter.input.error'));
 			}
diff --git a/src/client/app/utils/calibration.ts b/src/client/app/utils/calibration.ts
index cd4f7fd99..737206c2a 100644
--- a/src/client/app/utils/calibration.ts
+++ b/src/client/app/utils/calibration.ts
@@ -5,7 +5,9 @@
 import { MapMetadata } from '../types/redux/map';
 import { logToServer } from '../actions/logs';
 import { DataType } from '../types/Datasources';
+import { showErrorNotification } from './notifications';
 import translate from './translate';
+import { notifyUser } from './input';
 
 /**
  * Defines a Cartesian Point with x & y
@@ -121,7 +123,7 @@ export function isValidGPSInput(input: string): boolean {
 	const result = latitudeConstraint && longitudeConstraint;
 	if (!result) {
 		// TODO It would be nice to return the error and then notify as desired.
-		window.alert(translate('input.gps.range') + input);
+		notifyUser(translate('input.gps.range') + input);
 	}
 	return result;
 }
diff --git a/src/client/app/utils/input.ts b/src/client/app/utils/input.ts
index bd86b3342..d11a8a06a 100644
--- a/src/client/app/utils/input.ts
+++ b/src/client/app/utils/input.ts
@@ -5,6 +5,7 @@
 import { GPSPoint } from './calibration';
 import { UnitData, DisplayableType, UnitRepresentType, UnitType, UnitDataById } from '../types/redux/units';
 import translate from './translate';
+import { showErrorNotification } from './notifications';
 import * as _ from 'lodash';
 
 // Notifies user of msg.
@@ -16,7 +17,8 @@ import * as _ from 'lodash';
  * @param msg message to display
  */
 export function notifyUser(msg: string) {
-	window.alert(msg);
+	// window.alert(msg);
+	showErrorNotification(msg);
 }
 
 /**

From f5d82d1ead56357b36e53ff76db08da40237e43c Mon Sep 17 00:00:00 2001
From: sravan parakala <sravanparakala@gmail.com>
Date: Fri, 1 Dec 2023 21:46:47 +0000
Subject: [PATCH 18/30] delete unused import+mistake with groups

---
 src/client/app/components/groups/EditGroupModalComponent.tsx | 2 +-
 src/client/app/utils/calibration.ts                          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/client/app/components/groups/EditGroupModalComponent.tsx b/src/client/app/components/groups/EditGroupModalComponent.tsx
index 8f420d322..050ef0f06 100644
--- a/src/client/app/components/groups/EditGroupModalComponent.tsx
+++ b/src/client/app/components/groups/EditGroupModalComponent.tsx
@@ -132,7 +132,7 @@ export default function EditGroupModalComponent(props: EditGroupModalComponentPr
 		Group must have at least one child (i.e has deep child meters)
 	*/
 	const [validGroup, setValidGroup] = useState(false);
-	useEffect(() => {deleteConfirmText
+	useEffect(() => {
 		setValidGroup(
 			groupState.name !== '' &&
 			(groupState.area === 0 || (groupState.area > 0 && groupState.areaUnit !== AreaUnitType.none)) &&
diff --git a/src/client/app/utils/calibration.ts b/src/client/app/utils/calibration.ts
index 737206c2a..5d9ef89dc 100644
--- a/src/client/app/utils/calibration.ts
+++ b/src/client/app/utils/calibration.ts
@@ -5,7 +5,6 @@
 import { MapMetadata } from '../types/redux/map';
 import { logToServer } from '../actions/logs';
 import { DataType } from '../types/Datasources';
-import { showErrorNotification } from './notifications';
 import translate from './translate';
 import { notifyUser } from './input';
 

From 71b538546ff513356e687c87fe3b1b4a036138ee Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Mon, 11 Dec 2023 13:01:44 -0500
Subject: [PATCH 19/30] formatting; msg format

The newly used error notification does not honor formatting.
A TODO was added and msg made okay without line breaks.
---
 .../components/meters/EditMeterModalComponent.tsx  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 45bd769cc..67881987a 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -251,7 +251,8 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				for (let i = 0; i < value.deepMeters.length; i++) {
 					if (value.deepMeters[i] == props.meter.id) {
 						inputOk = false;
-						error_message += translate('group') + value.name + translate('uses') + translate('meter') + ' "' + metersByID[value.deepMeters[i]].name + '" \n';
+						// error_message += `${translate('group')} ${value.name} ${translate('uses')} ${translate('meter')} "${metersByID[value.deepMeters[i]].name}"\n`;
+						error_message += `${translate('group')} ${value.name} ${translate('uses')} ${translate('meter')} "${metersByID[value.deepMeters[i]].name}"; `;
 					}
 				}
 			}
@@ -286,7 +287,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 					// so leaving code commented out.
 					// notifyUser(translate('input.gps.range') + state.gps + '.');
 					inputOk = false;
-					setState({...state, ['gps']: props.meter.gps});
+					setState({ ...state, ['gps']: props.meter.gps });
 				}
 			}
 
@@ -311,10 +312,13 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 			} else if (error_message) {
 				// Display an error message if there are dependent deep meters
 				// state.unitId = props.meter.unitId;
-				setState({...state, ['unitId']: props.meter.unitId});
-				error_message = translate('meter.is.not.editable') + '\n' + error_message;
+				setState({ ...state, ['unitId']: props.meter.unitId });
+				// error_message = translate('meter.is.not.editable') + '\n' + error_message;
+				error_message = translate('meter.is.not.editable') + ': ' + error_message;
+				// TODO Attempts to add a line break with \n, <br />, etc. failed when using showErrorNotification.
+				// This is going to be a general problem.
 				showErrorNotification(error_message);
-			} else{
+			} else {
 				// Tell user that not going to update due to input issues.
 				notifyUser(translate('meter.input.error'));
 			}

From 7e9cc04bb092b72d87d6cd1af41d588eb3065851 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Sun, 21 Jan 2024 08:14:36 -0600
Subject: [PATCH 20/30] PR 1065

---
 .../unit/EditUnitModalComponent.tsx           | 44 +++++++++++--------
 src/client/app/translations/data.js           | 15 +++++--
 2 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 43b90d78e..698c784c2 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -5,11 +5,11 @@ import * as React from 'react';
 import store from '../../index';
 //Realize that * is already imported from react
 import { useEffect, useState } from 'react';
-import { useDispatch} from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader, Row } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
 import translate from '../../utils/translate';
-import { showErrorNotification} from '../../utils/notifications';
+import { showErrorNotification } from '../../utils/notifications';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
 import TooltipHelpContainer from '../../containers/TooltipHelpContainer';
 import '../../styles/modal.css';
@@ -74,34 +74,42 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 	// Log the Redux state to the console
 	const meterState = useSelector((state: State) => state.meters.byMeterID);
 	const conversions = useSelector((state: State) => state.conversions.conversions);
+	const units = useSelector((state: State) => state.units.units);
 
 	const handleDeleteUnit = () => {
-		// Access the Redux store state
 		let error_message = '';
 		for (const value of Object.values(meterState)) {
-			if(value.unitId==state.id){
-				error_message += translate('meter') + value.name + ' uses ' + translate('unit') + ' "' + state.identifier+ '" \n';
+			// This unit is used by a meter so cannot be deleted.
+			if (value.unitId == state.id) {
+				// TODO see EditMeterModalComponent for issue with line breaks. Same issue in strings below.
+				error_message += ` ${translate('meter')} "${value.name}" ${translate('uses')} ${translate('unit')} "${state.name}";`;
 			}
+			// TODO check default graphic unit**************
 		}
-		for(let i=0;i<conversions.length;i++){
-			if(conversions[i].sourceId==state.id){
-				error_message += translate('conversion') + conversions[i].note + 'uses ' + translate('unit') + ' "' + state.identifier+ '"as a source unit\n';
+		for (let i = 0; i < conversions.length; i++) {
+			if (conversions[i].sourceId == state.id) {
+				// This unit is the source of a conversion so cannot be deleted.
+				error_message += ` ${translate('conversion')} ${units[conversions[i].sourceId].name} ${translate('uses')} ${translate('unit')}` +
+					` "${state.name}" ${translate('unit.source.error')};`;
 			}
 
-			if(conversions[i].destinationId==state.id){
-				error_message += translate('conversion') + conversions[i].sourceId + '→' + conversions[i].destinationId + ' uses '
-				+ translate('unit') + ' "' + state.id+ '" as a destination unit\n';
+			if (conversions[i].destinationId == state.id) {
+				// This unit is the destination of a conversion so cannot be deleted.
+				// TODO use source -> destination to identify*****************
+				error_message += ` ${translate('conversion')} ${units[conversions[i].destinationId].name} ${translate('uses')} ${translate('unit')}` +
+					` "${state.name}" ${translate('unit.destination.error')};`;
 			}
 		}
-		if(error_message)
-		{
-			error_message = translate('unit.failed.to.delete.unit') + '\n' +  error_message;
+		if (error_message) {
+			// TODO see EditMeterModalComponent for issue with line breaks.
+			error_message = `${translate('unit.failed.to.delete.unit')}: ${error_message}`;
 			showErrorNotification(error_message);
+		} else {
+			// It is okay to delete this unit.
+			// TODO delete unit
 		}
-
-
-
 	};
+
 	/* Edit Unit Validation:
 		Name cannot be blank
 		Sec in Rate must be greater than zero
@@ -366,7 +374,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 				</Container></ModalBody>
 				<ModalFooter>
 					<Button variant="warning" color='danger' onClick={handleDeleteUnit}>
-						<FormattedMessage id="Delete Changes" />
+						<FormattedMessage id="unit.delete.unit" />
 					</Button>
 					{/* Hides the modal */}
 					<Button color='secondary' onClick={handleClose}>
diff --git a/src/client/app/translations/data.js b/src/client/app/translations/data.js
index 32b9dfb78..6479f0f84 100644
--- a/src/client/app/translations/data.js
+++ b/src/client/app/translations/data.js
@@ -417,17 +417,20 @@ const localeData = {
 		"UnitType.unit": "unit",
 		"UnitType.meter": "meter",
 		"UnitType.suffix": "suffix",
+		"unit.delete.unit": "Delete Unit",
+		"unit.destination.error": "as the destination unit",
 		"unit.dropdown.displayable.option.none": "None",
 		"unit.dropdown.displayable.option.all": "All",
 		"unit.dropdown.displayable.option.admin": "admin",
 		"unit.failed.to.create.unit": "Failed to create a unit.",
-		"unit.failed.to.delete.unit": "Delete cannot be done because it is used by the following:",
+		"unit.failed.to.delete.unit": "Delete cannot be done because this unit is used by the following",
 		"unit.failed.to.edit.unit": "Failed to edit unit.",
 		"unit.input.error": "Input invalid so unit not created or edited.",
 		"unit.none": "no unit",
 		"unit.preferred.display": "Preferred Display:",
 		"unit.represent": "Unit Represent:",
 		"unit.sec.in.rate": "Sec in Rate:",
+		"unit.source.error": "as the source unit",
 		"unit.submit.new.unit": "Submit New Unit",
 		"unit.successfully.create.unit": "Successfully created a unit.",
 		"unit.successfully.edited.unit": "Successfully edited unit.",
@@ -871,17 +874,20 @@ const localeData = {
 		"UnitType.unit": "(Need French) unit",
 		"UnitType.meter": "(Need French) meter",
 		"UnitType.suffix": "(Need French) suffix",
+		"unit.delete.unit": "(Need French) Delete Unit",
+		"unit.destination.error": "(Need French) as the destination unit",
 		"unit.dropdown.displayable.option.none": "(Need French) None",
 		"unit.dropdown.displayable.option.all": "(Need French) All",
 		"unit.dropdown.displayable.option.admin": "(Need French) admin",
 		"unit.failed.to.create.unit": "(Need French) Failed to create a unit.",
-		"unit.failed.to.delete.unit": "(Need French) Delete cannot be done because it is used by the following:",
+		"unit.failed.to.delete.unit": "(Need French) Delete cannot be done because this unit is used by the following",
 		"unit.failed.to.edit.unit": "(Need French) Failed to edit unit.",
 		"unit.input.error": "(Need French) Input invalid so unit not created or edited.",
 		"unit.none": "(Need French) no unit",
 		"unit.preferred.display": "(Need French) Preferred Display:",
 		"unit.represent": "(Need French) Unit Represent:",
 		"unit.sec.in.rate": "(Need French) Sec in Rate:",
+		"unit.source.error": "(Need French) as the source unit",
 		"unit.submit.new.unit": "(Need French) Submit New Unit",
 		"unit.successfully.create.unit": "(Need French) Successfully created a unit.",
 		"unit.successfully.edited.unit": "(Need French) Successfully edited unit.",
@@ -1325,17 +1331,20 @@ const localeData = {
 		"UnitType.unit": "(Need Spanish) unit",
 		"UnitType.meter": "(Need Spanish) meter",
 		"UnitType.suffix": "(Need Spanish) suffix",
+		"unit.delete.unit": "(Need Spanish) Delete Unit",
+		"unit.destination.error": "(Need Spanish) as the destination unit",
 		"unit.dropdown.displayable.option.none": "(Need Spanish) None",
 		"unit.dropdown.displayable.option.all": "(Need Spanish) All",
 		"unit.dropdown.displayable.option.admin": "(Need Spanish) admin",
 		"unit.failed.to.create.unit": "(Need Spanish) Failed to create a unit.",
-		"unit.failed.to.delete.unit": "(Need Spanish) Delete cannot be done because it is used by the following:",
+		"unit.failed.to.delete.unit": "(Need Spanish) Delete cannot be done because this unit is used by the following",
 		"unit.failed.to.edit.unit": "(Need Spanish) Failed to edit unit.",
 		"unit.input.error": "(Need Spanish) Input invalid so unit not created or edited.",
 		"unit.none": "(Need Spanish) no unit",
 		"unit.preferred.display": "(Need Spanish) Preferred Display:",
 		"unit.represent": "(Need Spanish) Unit Represent:",
 		"unit.sec.in.rate": "(Need Spanish) Sec in Rate:",
+		"unit.source.error": "(Need Spanish) as the source unit",
 		"unit.submit.new.unit": "(Need Spanish) Submit New Unit",
 		"unit.successfully.create.unit": "(Need Spanish) Successfully created a unit.",
 		"unit.successfully.edited.unit": "(Need Spanish) Successfully edited unit.",

From 9a23683c5a965fe01c3d18605041440ab022f33d Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Fri, 8 Mar 2024 13:29:26 -0600
Subject: [PATCH 21/30] fix conversion in unit delete

- Fixes issue with unit state.
- Create function to give arrow for conversion display
---
 .../conversion/ConversionViewComponent.tsx    | 16 ++++++----------
 .../meters/EditMeterModalComponent.tsx        |  3 ++-
 .../unit/EditUnitModalComponent.tsx           | 14 +++++++++-----
 src/client/app/utils/conversionArrow.ts       | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 src/client/app/utils/conversionArrow.ts

diff --git a/src/client/app/components/conversion/ConversionViewComponent.tsx b/src/client/app/components/conversion/ConversionViewComponent.tsx
index dc1be42ff..450d8c7bc 100644
--- a/src/client/app/components/conversion/ConversionViewComponent.tsx
+++ b/src/client/app/components/conversion/ConversionViewComponent.tsx
@@ -8,11 +8,12 @@ import { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Button } from 'reactstrap';
 import { ConversionData } from 'types/redux/conversions';
+import { selectUnitDataById } from '../../redux/api/unitsApi';
+import { useAppSelector } from '../../redux/reduxHooks';
 import '../../styles/card-page.css';
+import { conversionArrow } from '../../utils/conversionArrow';
 import translate from '../../utils/translate';
 import EditConversionModalComponent from './EditConversionModalComponent';
-import { useAppSelector } from '../../redux/reduxHooks';
-import { selectUnitDataById } from '../../redux/api/unitsApi';
 
 interface ConversionViewComponentProps {
 	conversion: ConversionData;
@@ -37,15 +38,10 @@ export default function ConversionViewComponent(props: ConversionViewComponentPr
 	const handleClose = () => {
 		setShowEditModal(false);
 	};
+
 	// Create header from sourceId, destinationId identifiers
-	// Arrow is bidirectional if conversion is bidirectional and one way if not.
-	let arrowShown: string;
-	if (props.conversion.bidirectional) {
-		arrowShown = ' ↔ ';
-	} else {
-		arrowShown = ' → ';
-	}
-	const header = String(unitDataById[props.conversion.sourceId]?.identifier + arrowShown + unitDataById[props.conversion.destinationId]?.identifier);
+	const header = String(unitDataById[props.conversion.sourceId]?.identifier + conversionArrow(props.conversion.bidirectional) +
+		unitDataById[props.conversion.destinationId]?.identifier);
 
 	// Unlike the details component, we don't check if units are loaded since must come through that page.
 
diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 5c6499716..c76610d25 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -155,7 +155,8 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				// error_message = translate('meter.is.not.editable') + '\n' + error_message;
 				error_message = translate('meter.is.not.editable') + ': ' + error_message;
 				// TODO Attempts to add a line break with \n, <br />, etc. failed when using showErrorNotification.
-				// This is going to be a general problem.
+				// This is going to be a general problem. See https://github.com/fkhadra/react-toastify/issues/687
+				// and https://github.com/fkhadra/react-toastify/issues/201.
 				showErrorNotification(error_message);
 			} else {
 				// Tell user that not going to update due to input issues.
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 83bcaa624..fbe29ea01 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -10,14 +10,14 @@ import { Button, Col, Container, FormFeedback, FormGroup, Input, Label, Modal, M
 import TooltipHelpComponent from '../../components/TooltipHelpComponent';
 import { selectConversionsDetails } from '../../redux/api/conversionsApi';
 import { selectMeterDataById } from '../../redux/api/metersApi';
-import { selectAllUnits } from '../../redux/api/unitsApi';
-import { unitsApi } from '../../redux/api/unitsApi';
+import { selectUnitDataById, unitsApi } from '../../redux/api/unitsApi';
 import { useTranslate } from '../../redux/componentHooks';
 import { useAppSelector } from '../../redux/reduxHooks';
 import '../../styles/modal.css';
 import { tooltipBaseStyle } from '../../styles/modalStyle';
 import { TrueFalseType } from '../../types/items';
 import { DisplayableType, UnitData, UnitRepresentType, UnitType } from '../../types/redux/units';
+import { conversionArrow } from '../../utils/conversionArrow';
 import { showErrorNotification, showSuccessNotification } from '../../utils/notifications';
 import TooltipMarkerComponent from '../TooltipMarkerComponent';
 
@@ -56,7 +56,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 	const [state, setState] = useState(values);
 	const conversionData = useAppSelector(selectConversionsDetails);
 	const meterDataByID = useAppSelector(selectMeterDataById);
-	const unitData = useAppSelector(selectAllUnits);
+	const unitDataByID = useAppSelector(selectUnitDataById);
 
 	const handleStringChange = (e: React.ChangeEvent<HTMLInputElement>) => {
 		setState({ ...state, [e.target.name]: e.target.value });
@@ -83,14 +83,18 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 		for (let i = 0; i < conversionData.length; i++) {
 			if (conversionData[i].sourceId == state.id) {
 				// This unit is the source of a conversion so cannot be deleted.
-				error_message += ` ${translate('conversion')} ${unitData[conversionData[i].sourceId].name} ${translate('uses')} ${translate('unit')}` +
+				error_message += ` ${translate('conversion')} ${unitDataByID[conversionData[i].sourceId].name}` +
+					`${conversionArrow(conversionData[i].bidirectional)}` +
+					`${unitDataByID[conversionData[i].destinationId].name} ${translate('uses')} ${translate('unit')}` +
 					` "${state.name}" ${translate('unit.source.error')};`;
 			}
 
 			if (conversionData[i].destinationId == state.id) {
 				// This unit is the destination of a conversion so cannot be deleted.
 				// TODO use source -> destination to identify*****************
-				error_message += ` ${translate('conversion')} ${unitData[conversionData[i].destinationId].name} ${translate('uses')} ${translate('unit')}` +
+				error_message += ` ${translate('conversion')} ${unitDataByID[conversionData[i].sourceId].name}` +
+					`${conversionArrow(conversionData[i].bidirectional)}` +
+					`${unitDataByID[conversionData[i].destinationId].name} ${translate('uses')} ${translate('unit')}` +
 					` "${state.name}" ${translate('unit.destination.error')};`;
 			}
 		}
diff --git a/src/client/app/utils/conversionArrow.ts b/src/client/app/utils/conversionArrow.ts
new file mode 100644
index 000000000..b8be7fd24
--- /dev/null
+++ b/src/client/app/utils/conversionArrow.ts
@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ /**
+  * Returns proper string to use for conversion representation of direction
+  * @param bidirectional if the conversion is bidirectional (true) or not (false)
+  * @returns double-ended arrow if bidirectional or single if not
+  */
+export function conversionArrow(bidirectional: boolean) {
+	// Arrow is bidirectional if conversion is bidirectional and one way if not.
+	let arrowShown: string;
+	if (bidirectional) {
+		arrowShown = ' ↔ ';
+	} else {
+		arrowShown = ' → ';
+	}
+	return arrowShown;
+}

From dc690608b7cc728b50cee4d8380142ec292914a6 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Fri, 8 Mar 2024 13:45:17 -0600
Subject: [PATCH 22/30] add check of unit use as DGU when delete

---
 .../app/components/unit/EditUnitModalComponent.tsx       | 9 ++++++---
 src/client/app/translations/data.ts                      | 6 ++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index fbe29ea01..9551af652 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -76,9 +76,13 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 			// This unit is used by a meter so cannot be deleted.
 			if (value.unitId == state.id) {
 				// TODO see EditMeterModalComponent for issue with line breaks. Same issue in strings below.
-				error_message += ` ${translate('meter')} "${value.name}" ${translate('uses')} ${translate('unit')} "${state.name}";`;
+				error_message += ` ${translate('meter')} "${value.name}" ${translate('uses')} ${translate('unit')} ` +
+					`"${state.name}" ${translate('as.meter.unit')};`;
+			}
+			if (value.defaultGraphicUnit == state.id) {
+				error_message += ` ${translate('meter')} "${value.name}" ${translate('uses')} ${translate('unit')} ` +
+					`"${state.name}" ${translate('as.meter.defaultgraphicunit')};`;
 			}
-			// TODO check default graphic unit**************
 		}
 		for (let i = 0; i < conversionData.length; i++) {
 			if (conversionData[i].sourceId == state.id) {
@@ -91,7 +95,6 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 
 			if (conversionData[i].destinationId == state.id) {
 				// This unit is the destination of a conversion so cannot be deleted.
-				// TODO use source -> destination to identify*****************
 				error_message += ` ${translate('conversion')} ${unitDataByID[conversionData[i].sourceId].name}` +
 					`${conversionArrow(conversionData[i].bidirectional)}` +
 					`${unitDataByID[conversionData[i].destinationId].name} ${translate('uses')} ${translate('unit')}` +
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index ebf0df5f5..8efe21710 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -26,6 +26,8 @@ const LocaleTranslationData = {
 		"AreaUnitType.meters": "sq. meters",
 		"AreaUnitType.none": "no unit",
 		"ascending": "Ascending",
+		"as.meter.unit": "as meter unit",
+		"as.meter.defaultgraphicunit": "as meter unit",
 		"bar": "Bar",
 		"bar.interval": "Bar Interval",
 		"bar.raw": "Cannot create bar graph on raw units such as temperature",
@@ -512,6 +514,8 @@ const LocaleTranslationData = {
 		"AreaUnitType.meters": "mètre carré",
 		"AreaUnitType.none": "(Need French) no unit",
 		"ascending": "Ascendant",
+		"as.meter.unit": "(Need French) as meter unit",
+		"as.meter.defaultgraphicunit": "(Need French) as meter unit",
 		"bar": "Bande",
 		"bar.interval": "Intervalle du Diagramme à Bandes",
 		"bar.raw": "(Need French) Cannot create bar graph on raw units such as temperature",
@@ -998,6 +1002,8 @@ const LocaleTranslationData = {
 		"AreaUnitType.meters": "metros cuadrados",
 		"AreaUnitType.none": "sin unidad",
 		"ascending": "Ascendente",
+		"as.meter.unit": "(Need Spanish) as meter unit",
+		"as.meter.defaultgraphicunit": "(Need Spanish) as meter unit",
 		"bar": "Barra",
 		"bar.interval": "Intervalo de barra",
 		"bar.raw": "No se puede crear un gráfico de barras con unidades crudas como temperatura",

From d4a3409397065a04a715d3894940f78e85e14048 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Fri, 8 Mar 2024 16:58:34 -0600
Subject: [PATCH 23/30] add delete of unit

Any error is not being shown to admin
---
 .../unit/EditUnitModalComponent.tsx           |  4 ++-
 src/client/app/redux/api/unitsApi.ts          | 10 ++++++
 src/server/models/Unit.js                     | 10 ++++++
 src/server/routes/units.js                    | 34 +++++++++++++++++++
 src/server/sql/unit/delete_unit.sql           |  8 +++++
 5 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 src/server/sql/unit/delete_unit.sql

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 9551af652..b5161f3be 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -35,6 +35,7 @@ interface EditUnitModalComponentProps {
  */
 export default function EditUnitModalComponent(props: EditUnitModalComponentProps) {
 	const [submitEditedUnit] = unitsApi.useEditUnitMutation();
+	const [deleteUnit] = unitsApi.useDeleteUnitMutation();
 	const translate = useTranslate();
 
 	// Set existing unit values
@@ -107,7 +108,8 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 			showErrorNotification(error_message);
 		} else {
 			// It is okay to delete this unit.
-			// TODO delete unit
+			// TODO ***** need to get the returned error if happened
+			deleteUnit(state.id);
 		}
 	};
 
diff --git a/src/client/app/redux/api/unitsApi.ts b/src/client/app/redux/api/unitsApi.ts
index f16bff0f8..eae58d7a4 100644
--- a/src/client/app/redux/api/unitsApi.ts
+++ b/src/client/app/redux/api/unitsApi.ts
@@ -57,6 +57,16 @@ export const unitsApi = baseApi.injectEndpoints({
 					});
 			},
 			invalidatesTags: ['Units']
+		}),
+		deleteUnit: builder.mutation<void, number>({
+			query: unitId => ({
+				url: 'api/units/delete',
+				method: 'POST',
+				body: { id: unitId }
+			}),
+			// You should not be able to delete a unit that is used in a meter or conversion
+			// so no invalidation for those.
+			invalidatesTags: ['Units']
 		})
 	})
 });
diff --git a/src/server/models/Unit.js b/src/server/models/Unit.js
index a502ad08e..fff20750e 100644
--- a/src/server/models/Unit.js
+++ b/src/server/models/Unit.js
@@ -217,6 +217,16 @@ class Unit {
 			log.warn(`Automatically set identifier of the unit "${unit.name}" to "${unit.name}"`);
 		}
 	}
+
+	/**
+	 * Returns a promise to delete a unit
+	 * @param mapID The ID of the unit to be deleted
+	 * @param conn the connection to be used.
+	 * @returns {Promise.<void>}
+	 */
+	static async delete(unitID, conn) {
+		await conn.none(sqlFile('unit/delete_unit.sql'), { id: unitID });
+	}
 }
 
 Unit.unitType = Object.freeze({
diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index 55728d106..2d2b0b74c 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -193,4 +193,38 @@ router.post('/addUnit', async (req, res) => {
 	}
 });
 
+/**
+ * Route for POST, delete unit.
+ */
+router.post('/delete', async (req, res) => {
+	const validParams = {
+		type: 'object',
+		maxProperties: 1,
+		required: ['id'],
+		properties: {
+			id: { type: 'integer' }
+		}
+	};
+
+	// Ensure delete request is valid
+	const validatorResult = validate(req.body, validParams);
+	if (!validatorResult.valid) {
+		const errorMsg = `Got request to delete a unit with invalid data, error(s):  ${validatorResult.errors}`;
+		log.warn(errorMsg);
+		failure(res, 400, errorMsg);
+	} else {
+		const conn = getConnection();
+		try {
+			// Don't worry about checking if the unit already exists
+			// Just try to delete it to save the extra database call, since the database will return an error anyway if the row does not exist
+			await Unit.delete(req.body.id, conn);
+		} catch (err) {
+			const errorMsg = `Error while deleting conversion with error(s): ${err}`;
+			log.error(errorMsg);
+			failure(res, 500, errorMsg);
+		}
+		success(res, `Successfully deleted conversion ${req.body.sourceId} -> ${req.body.destinationId}`);
+	}
+});
+
 module.exports = router;
diff --git a/src/server/sql/unit/delete_unit.sql b/src/server/sql/unit/delete_unit.sql
new file mode 100644
index 000000000..00d259b0f
--- /dev/null
+++ b/src/server/sql/unit/delete_unit.sql
@@ -0,0 +1,8 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+DELETE FROM units
+	WHERE id = ${id};

From 8f3cf8890ff57b715c146dffa0ac97730cd22844 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Fri, 8 Mar 2024 17:12:25 -0600
Subject: [PATCH 24/30] fix formatting

---
 src/client/app/utils/conversionArrow.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/client/app/utils/conversionArrow.ts b/src/client/app/utils/conversionArrow.ts
index b8be7fd24..349e57e64 100644
--- a/src/client/app/utils/conversionArrow.ts
+++ b/src/client/app/utils/conversionArrow.ts
@@ -2,11 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
- /**
-  * Returns proper string to use for conversion representation of direction
-  * @param bidirectional if the conversion is bidirectional (true) or not (false)
-  * @returns double-ended arrow if bidirectional or single if not
-  */
+/**
+ * Returns proper string to use for conversion representation of direction
+ * @param bidirectional if the conversion is bidirectional (true) or not (false)
+ * @returns double-ended arrow if bidirectional or single if not
+ */
 export function conversionArrow(bidirectional: boolean) {
 	// Arrow is bidirectional if conversion is bidirectional and one way if not.
 	let arrowShown: string;

From 92675fe9ac2905a627e8847356fbb191c9bb8548 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Sat, 9 Mar 2024 08:17:38 -0600
Subject: [PATCH 25/30] show admin delete unit msg

---
 src/client/app/components/unit/EditUnitModalComponent.tsx | 7 ++++---
 src/client/app/translations/data.ts                       | 6 ++++++
 src/server/routes/units.js                                | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index b5161f3be..67526b145 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -103,13 +103,14 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 			}
 		}
 		if (error_message) {
-			// TODO see EditMeterModalComponent for issue with line breaks.
 			error_message = `${translate('unit.failed.to.delete.unit')}: ${error_message}`;
 			showErrorNotification(error_message);
 		} else {
 			// It is okay to delete this unit.
-			// TODO ***** need to get the returned error if happened
-			deleteUnit(state.id);
+			deleteUnit(state.id)
+				.unwrap()
+				.then(() => { showSuccessNotification(translate('unit.delete.success')); })
+				.catch(error => { showErrorNotification(translate('unit.delete.failure') + error.data); });
 		}
 	};
 
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 8efe21710..520fe89d5 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -442,6 +442,8 @@ const LocaleTranslationData = {
 		"UnitType.unit": "unit",
 		"UnitType.meter": "meter",
 		"UnitType.suffix": "suffix",
+		"unit.delete.failure": "Failed to deleted unit with error: ",
+		"unit.delete.success": "Successfully deleted unit",
 		"unit.delete.unit": "Delete Unit",
 		"unit.destination.error": "as the destination unit",
 		"unit.dropdown.displayable.option.none": "None",
@@ -930,6 +932,8 @@ const LocaleTranslationData = {
 		"UnitType.unit": "(Need French) unit",
 		"UnitType.meter": "(Need French) meter",
 		"UnitType.suffix": "(Need French) suffix",
+		"unit.delete.failure": "(Need French) Failed to deleted unit with error: ",
+		"unit.delete.success": "(Need French) Successfully deleted unit",
 		"unit.delete.unit": "(Need French) Delete Unit",
 		"unit.destination.error": "(Need French) as the destination unit",
 		"unit.dropdown.displayable.option.none": "(Need French) None",
@@ -1416,6 +1420,8 @@ const LocaleTranslationData = {
 		"UnitType.unit": "unidad",
 		"UnitType.meter": "medidor",
 		"UnitType.suffix": "sufijo",
+		"unit.delete.failure": "(Need Spanish) Failed to deleted unit with error: ",
+		"unit.delete.success": "(Need Spanish) Successfully deleted unit",
 		"unit.delete.unit": "(Need Spanish) Delete Unit",
 		"unit.destination.error": "(Need Spanish) as the destination unit",
 		"unit.dropdown.displayable.option.none": "Nada",
diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index 2d2b0b74c..0b1d22c34 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -223,7 +223,7 @@ router.post('/delete', async (req, res) => {
 			log.error(errorMsg);
 			failure(res, 500, errorMsg);
 		}
-		success(res, `Successfully deleted conversion ${req.body.sourceId} -> ${req.body.destinationId}`);
+		success(res, `Successfully deleted conversion ${req.body.id}`);
 	}
 });
 

From 9994e8f350c083bc3d2e61353258feb103ec30ca Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Sat, 9 Mar 2024 08:24:03 -0600
Subject: [PATCH 26/30] try to remove CodeQL warning

---
 src/server/routes/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index 0b1d22c34..cd9a07177 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -223,7 +223,7 @@ router.post('/delete', async (req, res) => {
 			log.error(errorMsg);
 			failure(res, 500, errorMsg);
 		}
-		success(res, `Successfully deleted conversion ${req.body.id}`);
+		success(res, 'Successfully deleted conversion' + req.body.id);
 	}
 });
 

From d12468fc76f2da6bc347f006949d80c931332a80 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Sat, 9 Mar 2024 08:35:56 -0600
Subject: [PATCH 27/30] fix variable name

---
 src/server/routes/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index cd9a07177..0de4aa6c7 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -165,8 +165,8 @@ router.post('/addUnit', async (req, res) => {
 	};
 	const validationResult = validate(req.body, validUnit);
 	if (!validationResult.valid) {
-        log.error(`Got request to edit units with invalid unit data, errors:${validatorResult.errors}`);
-        failure(res, 400, `Got request to add units with invalid unit data, errors:${validatorResult.errors}`);
+        log.error(`Got request to edit units with invalid unit data, errors: ${validationResult.errors}`);
+        failure(res, 400, `Got request to add units with invalid unit data, errors: ${validationResult.errors}`);
 	} else {
 		const conn = getConnection();
 		try {

From 6edaadfa4809157d2d4d2e5441652388db22bacd Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Sat, 9 Mar 2024 08:43:34 -0600
Subject: [PATCH 28/30] apply fix to for CodeQL to other places

---
 src/server/routes/conversions.js | 2 +-
 src/server/routes/units.js       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/routes/conversions.js b/src/server/routes/conversions.js
index 7c5a1f44d..a1856f617 100644
--- a/src/server/routes/conversions.js
+++ b/src/server/routes/conversions.js
@@ -182,7 +182,7 @@ router.post('/delete', async (req, res) => {
 			log.error(`Error while deleting conversion with error(s): ${err}`);
 			failure(res, 500, `Error while deleting conversion with errors(s): ${err}`);
 		}
-		success(res, `Successfully deleted conversion ${req.body.sourceId} -> ${req.body.destinationId}`);
+		success(res, 'Successfully deleted conversion');
 	}
 });
 
diff --git a/src/server/routes/units.js b/src/server/routes/units.js
index 0de4aa6c7..b5e9c6392 100644
--- a/src/server/routes/units.js
+++ b/src/server/routes/units.js
@@ -105,9 +105,9 @@ router.post('/edit', async (req, res) => {
 			await unit.update(conn);
 		} catch (err) {
 			log.error('Failed to edit unit', err);
-            failure(res, 500, 'Unable to edit units ' + err.toString());
+            failure(res, 500, 'Unable to edit unit ' + err.toString());
 		}
-		success(res, `Successfully edited units ${req.body.identifier}`);
+		success(res, `Successfully edited unit`);
 	}
 });
 
@@ -223,7 +223,7 @@ router.post('/delete', async (req, res) => {
 			log.error(errorMsg);
 			failure(res, 500, errorMsg);
 		}
-		success(res, 'Successfully deleted conversion' + req.body.id);
+		success(res, 'Successfully deleted conversion');
 	}
 });
 

From 3b7f99342b76cd7bcf52a2be4a8c2166be187582 Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Sat, 9 Mar 2024 12:26:22 -0600
Subject: [PATCH 29/30] fix up edit meter

Only stops meter unit change if group uses meter.
Also only does check if meter has changes.
---
 .../meters/EditMeterModalComponent.tsx        | 40 ++++++++++---------
 .../unit/EditUnitModalComponent.tsx           |  2 +-
 src/client/app/translations/data.ts           |  6 +--
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index c76610d25..6708b4f97 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -83,19 +83,6 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 
 		// Check for changes by comparing state to props
 		const meterHasChanges = !_.isEqual(meterState, localMeterEdits);
-		// Check if any deep meters in the redux state depend on the meter being edited
-		let error_message = '';
-		if (localMeterEdits.unitId != props.meter.unitId) {
-			for (const value of Object.values(groupDataByID)) {
-				for (let i = 0; i < value.deepMeters.length; i++) {
-					if (value.deepMeters[i] == props.meter.id) {
-						inputOk = false;
-						// error_message += `${translate('group')} ${value.name} ${translate('uses')} ${translate('meter')} "${metersByID[value.deepMeters[i]].name}"\n`;
-						error_message += `${translate('group')} ${value.name} ${translate('uses')} ${translate('meter')} "${meterDataByID[value.deepMeters[i]].name}"; `;
-					}
-				}
-			}
-		}
 
 		// Only validate and store if any changes.
 		if (meterHasChanges) {
@@ -130,6 +117,23 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				}
 			}
 
+			// The message if issue with meter and groups. If blank then no issue.
+			let error_message = '';
+			// See if the meter unit changed since only allowed if not already in a group.
+			if (meterState.unitId !== localMeterEdits.unitId) {
+				// Check if the deep meters of any group in the redux state depend on the meter being edited.
+				// If so, the meter should not be edited.
+				for (const value of Object.values(groupDataByID)) {
+					for (let i = 0; i < value.deepMeters.length; i++) {
+						if (value.deepMeters[i] == props.meter.id) {
+							inputOk = false;
+							// TODO Would like line break between messages. See below on issue.
+							error_message += `${translate('group')} "${value.name}" ${translate('uses')} ${translate('meter')} "${meterDataByID[value.deepMeters[i]].name}"; `;
+						}
+					}
+				}
+			}
+
 			if (inputOk) {
 				// The input passed validation.
 				// GPS may have been updated so create updated state to submit.
@@ -148,12 +152,10 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 				// Submit new meter if checks where ok.
 				editMeter({ meterData: submitState, shouldRefreshViews: shouldRefreshReadingViews });
 			} else if (error_message) {
-				// Display an error message if there are dependent deep meters
-				// state.unitId = props.meter.unitId;
-				// TODO ****************what is this doing???????????????????????????????
-				// setState({ ...state, ['unitId']: props.meter.unitId });
-				// error_message = translate('meter.is.not.editable') + '\n' + error_message;
-				error_message = translate('meter.is.not.editable') + ': ' + error_message;
+				// Display an error message if there are dependent deep meters and checked.
+				// Undo the unit change.
+				setLocalMeterEdits({ ...localMeterEdits, ['unitId']:  props.meter.unitId });
+				error_message = translate('meter.unit.is.not.editable') + error_message;
 				// TODO Attempts to add a line break with \n, <br />, etc. failed when using showErrorNotification.
 				// This is going to be a general problem. See https://github.com/fkhadra/react-toastify/issues/687
 				// and https://github.com/fkhadra/react-toastify/issues/201.
diff --git a/src/client/app/components/unit/EditUnitModalComponent.tsx b/src/client/app/components/unit/EditUnitModalComponent.tsx
index 67526b145..b17dff101 100644
--- a/src/client/app/components/unit/EditUnitModalComponent.tsx
+++ b/src/client/app/components/unit/EditUnitModalComponent.tsx
@@ -74,7 +74,7 @@ export default function EditUnitModalComponent(props: EditUnitModalComponentProp
 	const handleDeleteUnit = () => {
 		let error_message = '';
 		for (const value of Object.values(meterDataByID)) {
-			// This unit is used by a meter so cannot be deleted.
+			// This unit is used by a meter so cannot be deleted. Note if in a group then in a meter so covers both.
 			if (value.unitId == state.id) {
 				// TODO see EditMeterModalComponent for issue with line breaks. Same issue in strings below.
 				error_message += ` ${translate('meter')} "${value.name}" ${translate('uses')} ${translate('unit')} ` +
diff --git a/src/client/app/translations/data.ts b/src/client/app/translations/data.ts
index 520fe89d5..306cfd2d6 100644
--- a/src/client/app/translations/data.ts
+++ b/src/client/app/translations/data.ts
@@ -345,7 +345,7 @@ const LocaleTranslationData = {
 		"meter.is.enabled": "Updates Enabled",
 		"meter.is.not.displayable": "Display Disabled",
 		"meter.is.not.enabled": "Updates Disabled",
-		"meter.is.not.editable": "This meter cannot be changed",
+		"meter.unit.is.not.editable": "This meter's unit cannot be changed and was put back to the original value because: ",
 		"meter.previousEnd": "Previous End Time Stamp:",
 		"meter.reading": "Reading:",
 		"meter.readingDuplication": "Reading Duplication:",
@@ -835,7 +835,7 @@ const LocaleTranslationData = {
 		"meter.is.enabled": "Mises à Jour Activées",
 		"meter.is.not.displayable": "Affichage Désactivé",
 		"meter.is.not.enabled": "Mises à Jour Désactivées",
-		"meter.is.not.editable": "(need French) This meter cannot be changed",
+		"meter.unit.is.not.editable": "(need French) This meter's unit cannot be changed and was put back to the original value because: ",
 		"meter.previousEnd": "(need French) Previous End Time Stamp:",
 		"meter.reading": "(need French) Reading:",
 		"meter.readingDuplication": "(need French) Reading Duplication:",
@@ -1322,7 +1322,7 @@ const LocaleTranslationData = {
 		"meter.is.enabled": "Actualizaciones Habilitado",
 		"meter.is.not.displayable": "El medidor es visualizable",
 		"meter.is.not.enabled": "El medidor no está activada",
-		"meter.is.not.editable": "(need Spanish) This meter cannot be changed",
+		"meter.unit.is.not.editable": "(need Spanish) This meter's unit cannot be changed and was put back to the original value because: ",
 		"meter.previousEnd": "Marca de tiempo de fin previo:",
 		"meter.reading": "Lectura:",
 		"meter.readingDuplication": "Duplicación de Lectura:",

From 02bcf0b9a6112503ecca36c0a6589d1a63fb988f Mon Sep 17 00:00:00 2001
From: Steven Huss-Lederman <huss@beloit.edu>
Date: Sat, 9 Mar 2024 12:43:16 -0600
Subject: [PATCH 30/30] format/comment

---
 src/client/app/components/meters/EditMeterModalComponent.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/app/components/meters/EditMeterModalComponent.tsx b/src/client/app/components/meters/EditMeterModalComponent.tsx
index 6708b4f97..f5a2d0c77 100644
--- a/src/client/app/components/meters/EditMeterModalComponent.tsx
+++ b/src/client/app/components/meters/EditMeterModalComponent.tsx
@@ -121,7 +121,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 			let error_message = '';
 			// See if the meter unit changed since only allowed if not already in a group.
 			if (meterState.unitId !== localMeterEdits.unitId) {
-				// Check if the deep meters of any group in the redux state depend on the meter being edited.
+				// Check if the deep meters of groups in the redux state depend on the meter being edited.
 				// If so, the meter should not be edited.
 				for (const value of Object.values(groupDataByID)) {
 					for (let i = 0; i < value.deepMeters.length; i++) {
@@ -154,7 +154,7 @@ export default function EditMeterModalComponent(props: EditMeterModalComponentPr
 			} else if (error_message) {
 				// Display an error message if there are dependent deep meters and checked.
 				// Undo the unit change.
-				setLocalMeterEdits({ ...localMeterEdits, ['unitId']:  props.meter.unitId });
+				setLocalMeterEdits({ ...localMeterEdits, ['unitId']: props.meter.unitId });
 				error_message = translate('meter.unit.is.not.editable') + error_message;
 				// TODO Attempts to add a line break with \n, <br />, etc. failed when using showErrorNotification.
 				// This is going to be a general problem. See https://github.com/fkhadra/react-toastify/issues/687