Merge pull request #4083 from Ginger-Automation/BugFix/ReportTemplate…

…Error Report Template preview issue
Ginger-Automation · Feb 4, 2025 · 2234fdd · 2234fdd
2 parents c8b3ad8 + a37eef1
commit 2234fdd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml b/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml
@@ -55,7 +55,7 @@
                                             </DockPanel>
 
                                             <StackPanel Margin="5,0,0,0" Orientation="Horizontal" >
-                                                <TextBox x:Name="NewTemplateNameTextBox"  Width="484px" Style="{StaticResource @TextBoxStyle}" TextChanged="NewTemplateName_TextChanged" ></TextBox>
+                                                <TextBox x:Name="NewTemplateNameTextBox"  Width="484px" Style="{StaticResource @TextBoxStyle}" TextChanged="NewTemplateName_TextChanged" LostFocus="NewTemplateNameTextBox_LostFocus"></TextBox>
                                             </StackPanel>
                                         </StackPanel>
                                         <StackPanel x:Name="TemplateDescription" Margin="10,10,0,0" HorizontalAlignment="Left">

diff --git a/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml.cs b/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml.cs
@@ -51,6 +51,7 @@ public partial class HTMLReportTemplatePage : GingerUIPage
 
         private string mPreviewDummyReportDataPath = string.Empty;
         private string mPreviewDummyReportPath = string.Empty;
+        private string mDefaultReportTemplateName = string.Empty;
 
         public HTMLReportConfiguration newHTMLReportConfiguration
         {
@@ -277,6 +278,7 @@ private void SetControls()
         {
             SetIsDefualtImage();
             NewTemplateNameTextBox.Text = _HTMLReportConfiguration.Name.ToString();
+            mDefaultReportTemplateName = _HTMLReportConfiguration.Name.ToString();
             xShowIDUC.Init(_HTMLReportConfiguration);
             TemplateDescriptionTextBox.BindControl(_HTMLReportConfiguration, nameof(HTMLReportConfiguration.Description));
             htmlShowFirstIterationOnRadioBtn.IsChecked = _HTMLReportConfiguration.ShowAllIterationsElements;
@@ -354,6 +356,7 @@ private void SetControlsNewTemplate()
             SetIsDefualtImage();
             NewTemplateNameTextBox.Text = _HTMLReportConfiguration.Name.ToString();
             TemplateDescriptionTextBox.Text = _HTMLReportConfiguration.Description.ToString();
+            mDefaultReportTemplateName = _HTMLReportConfiguration.Name.ToString();
             //htmlDefaultOnRadioBtn.IsChecked = _HTMLReportConfiguration.IsDefault;
             //htmlDefaultOffRadioBtn.IsChecked = !_HTMLReportConfiguration.IsDefault;
             htmlShowFirstIterationOnRadioBtn.IsChecked = _HTMLReportConfiguration.ShowAllIterationsElements;
@@ -1031,6 +1034,14 @@ private void _HTMLReportConfiguration_PropertyChanged(object sender, System.Comp
                 SetIsDefualtImage();
             }
         }
-
+
+        private void NewTemplateNameTextBox_LostFocus(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(NewTemplateNameTextBox.Text))
+            {
+                NewTemplateNameTextBox.Text = mDefaultReportTemplateName;
+            }
+        }
+
     }
 }
diff --git a/Ginger/GingerCoreNET/Reports/ActionReport.cs b/Ginger/GingerCoreNET/Reports/ActionReport.cs
@@ -290,7 +290,15 @@ public DataTable OutputValuesDT
                     dr["ActualValue"] = elementsAfter[1];
                     dr["ExpectedValue"] = elementsAfter[2];
                     dr["Status"] = elementsAfter[3];
-                    dr["Description"] = elementsAfter[4];
+                    if (elementsAfter.Length > 4)
+                    {
+                        dr["Description"] = elementsAfter[4];
+                    }
+                    else
+                    {
+                        dr["Description"] = string.Empty;
+                    }
+
                     dt.Rows.Add(dr);
                 }
                 return dt;