From 0c3b1e3e53c4e52c7898a2f8637884c0f07e118a Mon Sep 17 00:00:00 2001
From: amhsirak <karishmashuklaa@gmail.com>
Date: Sun, 15 Dec 2024 05:29:30 +0530
Subject: [PATCH] feat: paass listSelect

---
 .../workflow-management/classes/Generator.ts  |  2 +-
 server/src/workflow-management/selector.ts    | 40 ++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/server/src/workflow-management/classes/Generator.ts b/server/src/workflow-management/classes/Generator.ts
index 2ab54753..31775261 100644
--- a/server/src/workflow-management/classes/Generator.ts
+++ b/server/src/workflow-management/classes/Generator.ts
@@ -543,7 +543,7 @@ export class WorkflowGenerator {
   private generateSelector = async (page: Page, coordinates: Coordinates, action: ActionType) => {
     const elementInfo = await getElementInformation(page, coordinates, this.listSelector, this.getList);
     const selectorBasedOnCustomAction = (this.getList === true)
-      ? await getNonUniqueSelectors(page, coordinates)
+      ? await getNonUniqueSelectors(page, coordinates, this.listSelector)
       : await getSelectors(page, coordinates);
 
     const bestSelector = getBestSelectorForAction(
diff --git a/server/src/workflow-management/selector.ts b/server/src/workflow-management/selector.ts
index 699cb669..527a800f 100644
--- a/server/src/workflow-management/selector.ts
+++ b/server/src/workflow-management/selector.ts
@@ -852,7 +852,7 @@ interface SelectorResult {
  * @returns {Promise<Selectors|null|undefined>}
  */
 
-export const getNonUniqueSelectors = async (page: Page, coordinates: Coordinates): Promise<SelectorResult> => {
+export const getNonUniqueSelectors = async (page: Page, coordinates: Coordinates, listSelector: string): Promise<SelectorResult> => {
   try {
     const selectors = await page.evaluate(({ x, y }: { x: number, y: number }) => {
       function getNonUniqueSelector(element: HTMLElement): string {
@@ -891,24 +891,26 @@ export const getNonUniqueSelectors = async (page: Page, coordinates: Coordinates
 
       let element = originalEl;
 
-      while (element.parentElement) {
-        const parentRect = element.parentElement.getBoundingClientRect();
-        const childRect = element.getBoundingClientRect();
-
-        const fullyContained =
-          parentRect.left <= childRect.left &&
-          parentRect.right >= childRect.right &&
-          parentRect.top <= childRect.top &&
-          parentRect.bottom >= childRect.bottom;
-
-        const significantOverlap =
-          (childRect.width * childRect.height) /
-          (parentRect.width * parentRect.height) > 0.5;
-
-        if (fullyContained && significantOverlap) {
-          element = element.parentElement;
-        } else {
-          break;
+      if (listSelector === '') {
+        while (element.parentElement) {
+          const parentRect = element.parentElement.getBoundingClientRect();
+          const childRect = element.getBoundingClientRect();
+  
+          const fullyContained =
+            parentRect.left <= childRect.left &&
+            parentRect.right >= childRect.right &&
+            parentRect.top <= childRect.top &&
+            parentRect.bottom >= childRect.bottom;
+  
+          const significantOverlap =
+            (childRect.width * childRect.height) /
+            (parentRect.width * parentRect.height) > 0.5;
+  
+          if (fullyContained && significantOverlap) {
+            element = element.parentElement;
+          } else {
+            break;
+          }
         }
       }