Updated Code According code rabbit suggestion

Ginger-Automation · Nov 28, 2024 · 4d77b16 · 4d77b16
1 parent 0393cdd
commit 4d77b16
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 14 deletions.
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/ActionHandlers/ActBrowserElementHandler.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/ActionHandlers/ActBrowserElementHandler.cs
@@ -686,7 +686,7 @@ private async Task HandleStopMonitoringNetworkLogOperationAsync()
         {
             try
             {
-                ((PlaywrightBrowserTab)_browser!.CurrentWindow.CurrentTab).StopCaptureNetworkLog(_act);
+                await ((PlaywrightBrowserTab)_browser!.CurrentWindow.CurrentTab).StopCaptureNetworkLog(_act);
             }
             catch (Exception ex)
             {

diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightBrowserTab.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Playwright/PlaywrightBrowserTab.cs
@@ -26,6 +26,7 @@ limitations under the License.
 using GingerCore.Actions;
 using Microsoft.Playwright;
 using Newtonsoft.Json;
+using OpenQA.Selenium.Support.UI;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -693,7 +694,7 @@ await Task.Run(() =>
         /// </summary>
         /// <param name="act"></param>
 
-        public async void StopCaptureNetworkLog(ActBrowserElement act)
+        public async Task StopCaptureNetworkLog(ActBrowserElement act)
         {
             try
             {
@@ -770,7 +771,7 @@ private async void OnNetworkResponseReceived(object? sender, IResponse response)
             await response.FinishedAsync();
             try
             {
-                if (response.BodyAsync() != null)
+                if (response != null)
                 {
                     string monitorType = _act.GetOrCreateInputParam(nameof(ActBrowserElement.eMonitorUrl)).Value;
                     if (_BrowserHelper.IsToMonitorAllUrls(_act) || _BrowserHelper.IsToMonitorOnlySelectedUrls(_act,response.Url))
@@ -813,9 +814,7 @@ private async void OnPlaywrightDialog(object? sender, IDialog e)
         {
             try
             {
-                await Task.Run(() => {
-                    dialogs = e;
-                });
+               dialogs = e;
             }
             catch (Exception ex)
             {
@@ -830,7 +829,14 @@ public async Task AcceptMessageBox()
         {
             try
             {
-                await dialogs.AcceptAsync();
+                if (dialogs != null)
+                {
+                    await dialogs.AcceptAsync();
+                }
+                else
+                {
+                    Reporter.ToLog(eLogLevel.WARN, "No dialog to accept.");
+                }
             }
             catch (Exception ex)
             {
@@ -846,8 +852,15 @@ public async Task DismissMessageBox()
         {
             try
             {
-                await dialogs.DismissAsync();
-
+                if (dialogs != null)
+                {
+                    await dialogs.DismissAsync();
+                }
+                else
+                {
+                    Reporter.ToLog(eLogLevel.WARN, "No dialog to dismiss.");
+                }
+
             }
             catch (Exception ex)
             {
@@ -863,7 +876,15 @@ public string GetMessageBoxText()
         {
             try
             {
-                return dialogs.Message;
+                if (dialogs != null)
+                {
+                    return dialogs.Message;
+                }
+                else
+                {
+                    Reporter.ToLog(eLogLevel.WARN, "No dialog to get message.");
+                    return string.Empty;
+                }
             }
             catch (Exception ex)
             {
@@ -881,7 +902,15 @@ public async Task SetMessageBoxText(string MessageBoxText)
         {
             try
             {
-                await dialogs.AcceptAsync(promptText:MessageBoxText);
+                if (dialogs != null)
+                {
+                    await dialogs.AcceptAsync(promptText: MessageBoxText);
+                }
+                else
+                {
+                    Reporter.ToLog(eLogLevel.WARN, "No dialog to accept.");
+
+                }
             }
             catch (Exception ex)
             {

diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
@@ -10933,8 +10933,6 @@ public async Task GetNetworkLogAsync(ActBrowserElement act)
         {
             try
             {
-                await Task.Run(() =>
-                {
                     if (isNetworkLogMonitoringStarted)
                     {
                         act.AddOrUpdateReturnParamActual("Raw Request", Newtonsoft.Json.JsonConvert.SerializeObject(networkRequestLogList.Select(x => x.Item2).ToList()));
@@ -10954,7 +10952,6 @@ await Task.Run(() =>
                         act.ExInfo = $"Action is skipped,{nameof(ActBrowserElement.eControlAction.StartMonitoringNetworkLog)} Action is not started";
                         act.Status = Amdocs.Ginger.CoreNET.Execution.eRunStatus.Skipped;
                     }
-                });
             }
             catch(Exception ex)
             {
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 try
                 {
-                    ((PlaywrightBrowserTab)_browser!.CurrentWindow.CurrentTab).StopCaptureNetworkLog(_act);
+                    await ((PlaywrightBrowserTab)_browser!.CurrentWindow.CurrentTab).StopCaptureNetworkLog(_act);
                 }
                 catch (Exception ex)
                 {
@@ Expand Down @@