From f80b1999807c7aeb9b88f9d3ec42da70637bd9f2 Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Sun, 11 Aug 2024 16:11:01 -0400
Subject: [PATCH 1/4] added discard button feature

---
 .../app/components/admin/PreferencesComponent.tsx  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index 5a5de41ec..e1a30bece 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -38,6 +38,10 @@ export default function PreferencesComponent() {
 		setLocalAdminPref({ ...localAdminPref, [key]: value });
 	};
 
+	const discardChanges = () => {
+		setLocalAdminPref(cloneDeep(adminPreferences));
+	};
+
 	return (
 		<div className='d-flex flex-column '>
 			<UnsavedWarningComponent
@@ -316,7 +320,15 @@ export default function PreferencesComponent() {
 					onChange={e => makeLocalChanges('defaultHelpUrl', e.target.value)}
 				/>
 			</div>
-
+			
+			<Button
+					type='button'
+					onClick={discardChanges}
+					disabled={!hasChanges}
+					className='mr-2'
+				>
+					{translate('discard')}
+				</Button>
 			<Button
 				type='submit'
 				onClick={() =>

From 937ba2d993419a5e8e686e47e96d5d9202c7908f Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Sun, 11 Aug 2024 16:16:21 -0400
Subject: [PATCH 2/4] Formatting reset button by using a flex container then
 adding custom style to add correct spacing

---
 .../components/admin/PreferencesComponent.tsx | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index e1a30bece..3e3e6c667 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -320,32 +320,32 @@ export default function PreferencesComponent() {
 					onChange={e => makeLocalChanges('defaultHelpUrl', e.target.value)}
 				/>
 			</div>
-			
-			<Button
-					type='button'
-					onClick={discardChanges}
-					disabled={!hasChanges}
-					className='mr-2'
-				>
-					{translate('discard')}
-				</Button>
-			<Button
-				type='submit'
-				onClick={() =>
-					submitPreferences(localAdminPref)
-						.unwrap()
-						.then(() => {
-							showSuccessNotification(translate('updated.preferences'));
-						})
-						.catch(() => {
-							showErrorNotification(translate('failed.to.submit.changes'));
-						})
-				}
-				disabled={!hasChanges}
-				className='align-self-end mt-3'
-			>
-				{translate('submit')}
-			</Button>
+			<div className='d-flex justify-content-end mt-3'>
+					<Button
+							type='button'
+							onClick={discardChanges}
+							disabled={!hasChanges}
+							style={{ marginRight: '20px' }}
+						>
+							{translate('discard')}
+					</Button>
+					<Button
+						type='submit'
+						onClick={() =>
+							submitPreferences(localAdminPref)
+								.unwrap()
+								.then(() => {
+									showSuccessNotification(translate('updated.preferences'));
+								})
+								.catch(() => {
+									showErrorNotification(translate('failed.to.submit.changes'));
+								})
+						}
+						disabled={!hasChanges}
+					>
+						{translate('submit')}
+					</Button>
+				</div>
 		</div >
 	);
 }

From 400efc1238e3199b7c7f697dc1b7609c7200f0ea Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Sun, 11 Aug 2024 17:21:05 -0400
Subject: [PATCH 3/4] fixing spacing so run-checks-test/build is sucessful

---
 .../components/admin/PreferencesComponent.tsx | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index 3e3e6c667..7e995f97b 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -321,31 +321,31 @@ export default function PreferencesComponent() {
 				/>
 			</div>
 			<div className='d-flex justify-content-end mt-3'>
-					<Button
-							type='button'
-							onClick={discardChanges}
-							disabled={!hasChanges}
-							style={{ marginRight: '20px' }}
-						>
-							{translate('discard')}
-					</Button>
-					<Button
-						type='submit'
-						onClick={() =>
-							submitPreferences(localAdminPref)
-								.unwrap()
-								.then(() => {
-									showSuccessNotification(translate('updated.preferences'));
-								})
-								.catch(() => {
-									showErrorNotification(translate('failed.to.submit.changes'));
-								})
-						}
-						disabled={!hasChanges}
-					>
-						{translate('submit')}
-					</Button>
-				</div>
+				<Button
+					type='button'
+					onClick={discardChanges}
+					disabled={!hasChanges}
+					style={{ marginRight: '20px' }}
+				>
+					{translate('discard')}
+				</Button>
+				<Button
+					type='submit'
+					onClick={() =>
+						submitPreferences(localAdminPref)
+							.unwrap()
+							.then(() => {
+								showSuccessNotification(translate('updated.preferences'));
+							})
+							.catch(() => {
+								showErrorNotification(translate('failed.to.submit.changes'));
+							})
+					}
+					disabled={!hasChanges}
+				>
+					{translate('submit')}
+				</Button>
+			</div>
 		</div >
 	);
 }

From eb3b904c284d345a13c4a3a7a04200494731c98f Mon Sep 17 00:00:00 2001
From: William Wu <105890943+williamw04@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:31:26 -0400
Subject: [PATCH 4/4] Changed translated text to fit convention

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

diff --git a/src/client/app/components/admin/PreferencesComponent.tsx b/src/client/app/components/admin/PreferencesComponent.tsx
index 7e995f97b..825c8b758 100644
--- a/src/client/app/components/admin/PreferencesComponent.tsx
+++ b/src/client/app/components/admin/PreferencesComponent.tsx
@@ -327,7 +327,7 @@ export default function PreferencesComponent() {
 					disabled={!hasChanges}
 					style={{ marginRight: '20px' }}
 				>
-					{translate('discard')}
+					{translate('discard.changes')}
 				</Button>
 				<Button
 					type='submit'