Fix drag and drop not passing correct step data to element locator

Author: nasif-z

Framework/Built_In_Automation/Web/Playwright/BuiltInFunctions.py

@@ -48,10 +48,14 @@
 
 def _get_frame_locator():
     """Helper function to get current frame locator from shared variables."""
-    frame_locator = sr.Get_Shared_Variables("playwright_frame")
-    if frame_locator in failed_tag_list:
+    try:
+        frame_locator = sr.Get_Shared_Variables("playwright_frame")
+        if frame_locator in failed_tag_list:
+            return None
+        return frame_locator
+    except:
+        # Variable doesn't exist yet
         return None
-    return frame_locator
 
 #########################
 #                       #
@@ -1977,18 +1981,18 @@ async def drag_and_drop(step_data):
             mid_l = mid.strip().lower()
             if "element parameter" in mid_l:
                 if mid_l.startswith("dst"):
-                    target_param = left.strip()
+                    target_param = (left, mid, right)
                 elif mid_l.startswith("src"):
-                    source_param = left.strip()
+                    source_param = (left, mid, right)
 
         # Get source element
-        source_locator = await PlaywrightLocator.Get_Element(source_param, current_page, frame_locator=_get_frame_locator())
+        source_locator = await PlaywrightLocator.Get_Element([source_param], current_page, frame_locator=_get_frame_locator())
         if source_locator == "zeuz_failed":
             CommonUtil.ExecLog(sModuleInfo, "Source element not found", 3)
             return "zeuz_failed"
 
         # Get target element
-        target_locator = await PlaywrightLocator.Get_Element(target_param, current_page, frame_locator=_get_frame_locator())
+        target_locator = await PlaywrightLocator.Get_Element([target_param], current_page, frame_locator=_get_frame_locator())
         if target_locator == "zeuz_failed":
             CommonUtil.ExecLog(sModuleInfo, "Target element not found", 3)
             return "zeuz_failed"

Framework/Built_In_Automation/Web/Playwright/locator.py

@@ -199,7 +199,7 @@ def _parse_element_params(step_data):
                 params['wait'] = float(right_stripped)
 
         # Element parameters
-        elif mid_lower == "element parameter":
+        elif mid_lower == "element parameter" or "element parameter" in mid_lower:
             if left_lower == "index":
                 try:
                     params['index'] = int(right_stripped)
@@ -303,8 +303,8 @@ def _build_locator(page, step_data, params, frame_locator=None):
         if left_lower in ("css", "css selector", "css_selector"):
             return base_locator.locator(right)
 
-    # Strategy 2: Check for unique parameters
-    for left, right in params['unique_params']:
+    # Strategy 2: Check for unique parameters and element parameters
+    for left, right in params['unique_params'] + params['element_params']:
         left_lower = left.lower()
 
         if left_lower == "id":