From 492a222489956642f9b9d674473de6e637c29dfa Mon Sep 17 00:00:00 2001
From: Pedro Oliveira <pedro.oliveira@virtual-identity.com>
Date: Mon, 4 Mar 2024 18:12:10 +0000
Subject: [PATCH] feat: added topicGroupId to RegistrationProvider

- corrected bug where it would open unselected accordions if the topicIds matched
- added topicGroup to onOverlayOpen
---
 .../topicSelection/TopicSelection.tsx         | 35 +++++++++++--------
 .../provider/RegistrationProvider.tsx         |  1 +
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/components/registration/topicSelection/TopicSelection.tsx b/src/components/registration/topicSelection/TopicSelection.tsx
index 416e09e51..9837d0f7b 100644
--- a/src/components/registration/topicSelection/TopicSelection.tsx
+++ b/src/components/registration/topicSelection/TopicSelection.tsx
@@ -45,16 +45,14 @@ export const TopicSelection: VFC<{
 	const [topics, setTopics] = useState<TopicsDataInterface[]>([]);
 	const [isLoading, setIsLoading] = useState<boolean>(false);
 	const [listView, setListView] = useState<boolean>(false);
-	const [topicGroupId, setTopicGroupId] = useState<number>(0);
+	const [topicGroupId, setTopicGroupId] = useState<number>(
+		sessionStorageRegistrationData.topicGroupId || undefined
+	);
 
 	const getTopic = (mainTopicId: number) => {
 		return topics?.filter((topic) => topic?.id === mainTopicId)?.[0];
 	};
 
-	const getTopicInteraction = (topicGroupId: number) => {
-		setTopicGroupId(topicGroupId);
-	};
-
 	useEffect(() => {
 		if (
 			REGISTRATION_DATA_VALIDATION.mainTopicId.validation(
@@ -260,9 +258,11 @@ export const TopicSelection: VFC<{
 									))
 							: topicGroups.map((topicGroup) => (
 									<Accordion
-										defaultExpanded={topicGroup.topicIds.includes(
-											value
-										)}
+										defaultExpanded={
+											topicGroup.topicIds.includes(
+												value
+											) && topicGroup.id === topicGroupId
+										}
 										sx={{
 											'boxShadow': 'none',
 											'borderBottom': '1px solid #dddddd',
@@ -346,15 +346,17 @@ export const TopicSelection: VFC<{
 																		setValue(
 																			topic.id
 																		);
+																		setTopicGroupId(
+																			topicGroup.id
+																		);
 																		setDataForSessionStorage(
 																			{
 																				mainTopicId:
-																					topic?.id
+																					topic?.id,
+																				topicGroupId:
+																					topicGroup?.id
 																			}
 																		);
-																		getTopicInteraction(
-																			topicGroup.id
-																		);
 																	}}
 																	checked={
 																		value ===
@@ -408,12 +410,17 @@ export const TopicSelection: VFC<{
 																	setDataForSessionStorage(
 																		{
 																			mainTopicId:
-																				topic.id
+																				topic.id,
+																			topicGroupId:
+																				topicGroup.id
 																		}
 																	);
 																	setValue(
 																		topic.id
 																	);
+																	setTopicGroupId(
+																		topicGroup.id
+																	);
 																}}
 															/>
 														)}
@@ -421,7 +428,7 @@ export const TopicSelection: VFC<{
 												))}
 										</AccordionDetails>
 									</Accordion>
-							  ))}
+								))}
 					</RadioGroup>
 				</FormControl>
 			)}
diff --git a/src/globalState/provider/RegistrationProvider.tsx b/src/globalState/provider/RegistrationProvider.tsx
index 3b0067156..a3f8cbbfc 100644
--- a/src/globalState/provider/RegistrationProvider.tsx
+++ b/src/globalState/provider/RegistrationProvider.tsx
@@ -52,6 +52,7 @@ interface RegistrationSessionStorageData {
 	password: string;
 	agencyId: number;
 	mainTopicId: number;
+	topicGroupId?: number;
 	topicId?: number;
 	zipcode: string;
 }