From c594633b74a6346ab94d7fd1843420a32df41193 Mon Sep 17 00:00:00 2001
From: karishmas6 <carishmashukla28@gmail.com>
Date: Wed, 4 Sep 2024 05:32:39 +0530
Subject: [PATCH] feat: reset getList state after emitting settings

---
 src/components/organisms/BrowserWindow.tsx  | 31 +++++++++++++++------
 src/components/organisms/RightSidePanel.tsx | 10 +++++++
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/components/organisms/BrowserWindow.tsx b/src/components/organisms/BrowserWindow.tsx
index b685281e..ab532320 100644
--- a/src/components/organisms/BrowserWindow.tsx
+++ b/src/components/organisms/BrowserWindow.tsx
@@ -54,6 +54,8 @@ export const BrowserWindow = () => {
     const [showAttributeModal, setShowAttributeModal] = useState(false);
     const [attributeOptions, setAttributeOptions] = useState<AttributeOption[]>([]);
     const [selectedElement, setSelectedElement] = useState<{ selector: string, info: ElementInfo | null } | null>(null);
+    const [currentListId, setCurrentListId] = useState<number | null>(null);
+
     const [listSelector, setListSelector] = useState<string | null>(null);
     const [fields, setFields] = useState<Record<string, TextStep>>({});
 
@@ -77,6 +79,18 @@ export const BrowserWindow = () => {
         }
     };
 
+    const resetListState = useCallback(() => {
+        setListSelector(null);
+        setFields({});
+        setCurrentListId(null);
+    }, []);
+
+    useEffect(() => {
+        if (!getList) {
+            resetListState();
+        }
+    }, [getList, resetListState]);
+
     const screencastHandler = useCallback((data: string) => {
         setScreenShot(data);
     }, [screenShot]);
@@ -139,12 +153,6 @@ export const BrowserWindow = () => {
                 clickY >= highlightRect.top &&
                 clickY <= highlightRect.bottom
             ) {
-                // Check if the selected element is one of the childSelectors (if applicable)
-                if (highlighterData.childSelectors && highlighterData.childSelectors.length > 0) {
-                    if (!highlighterData.childSelectors.includes(highlighterData.selector)) {
-                        return;
-                    }
-                }
 
                 const options = getAttributeOptions(highlighterData.elementInfo?.tagName || '', highlighterData.elementInfo);
 
@@ -174,7 +182,10 @@ export const BrowserWindow = () => {
 
                 if (getList === true && !listSelector) {
                     setListSelector(highlighterData.selector);
-                } else if (getList === true && listSelector) {
+                    console.log('After set',listSelector)
+                    setCurrentListId(Date.now());
+                    setFields({});
+                } else if (getList === true && listSelector && currentListId) {
                     if (options.length === 1) {
                         // Handle directly without showing the modal
                         const attribute = options[0].value;
@@ -199,8 +210,10 @@ export const BrowserWindow = () => {
                         });
 
                         if (listSelector) {
-                            addListStep(listSelector, { ...fields, [newField.label]: newField });
+                            addListStep(listSelector, { ...fields, [newField.label]: newField }, currentListId || 0);
                         }
+
+                        console.log('end',listSelector)
                     } else {
                         // Show the modal if there are multiple options
                         setAttributeOptions(options);
@@ -258,7 +271,7 @@ export const BrowserWindow = () => {
                     });
 
                     if (listSelector) {
-                        addListStep(listSelector, { ...fields, [newField.label]: newField });
+                        addListStep(listSelector, { ...fields, [newField.label]: newField }, currentListId || 0);
                     }
                 }
             }
diff --git a/src/components/organisms/RightSidePanel.tsx b/src/components/organisms/RightSidePanel.tsx
index a3434ffe..ee8dce7b 100644
--- a/src/components/organisms/RightSidePanel.tsx
+++ b/src/components/organisms/RightSidePanel.tsx
@@ -121,6 +121,16 @@ export const RightSidePanel = () => {
     return settings;
   }, [browserSteps, selectedPaginationSetting]);
 
+  const resetListState = useCallback(() => {
+        setShowPaginationOptions(false);
+        setSelectedPaginationSetting(null);
+    }, []);
+
+    const handleStopGetList = useCallback(() => {
+        stopGetList();
+        resetListState();
+    }, [stopGetList, resetListState]);
+
 
   const stopCaptureAndEmitGetListSettings = useCallback(() => {
     stopGetList();