Merge pull request #1764 from Ginger-Automation/BugFix/GingerIntegrat…

…ionWithSplunk Ginger integration with Splunk
Ginger-Automation · Nov 30, 2020 · cda5df1 · cda5df1
2 parents cd52bb8 + 79cf2b5
commit cda5df1
Show file tree

Hide file tree

Showing 22 changed files with 1,637 additions and 291 deletions.
diff --git a/Ginger/Ginger/Ginger.csproj b/Ginger/Ginger/Ginger.csproj
@@ -701,6 +701,9 @@
     <Compile Include="RunSetPageLib\RunsetRunnersConfigPage.xaml.cs">
       <DependentUpon>RunsetRunnersConfigPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Run\RunSetActions\RunSetActionSendDataToExternalSourceEditPage.xaml.cs">
+      <DependentUpon>RunSetActionSendDataToExternalSourceEditPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UserControlsLib\TextEditor\ValueExpression\ValueExpressionFlowDetailsEditorPage.xaml.cs">
       <DependentUpon>ValueExpressionFlowDetailsEditorPage.xaml</DependentUpon>
     </Compile>
@@ -2147,6 +2150,7 @@
     <Resource Include="ApplicationModelsLib\APIModels\ApiActionsConversionWizard\ApiActionsConversionIntro.md" />
     <Resource Include="UserControlsLib\ImageMakerLib\Images\GingerByAmdocsLogoWhiteSmall.png" />
     <Resource Include="Images\%40AddFile_16x16.png" />
+    <Resource Include="Images\%40AddSendExecutionData_16x16.png" />
     <Content Include="StaticDrivers\selenium-server-standalone.jar">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -3060,6 +3064,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Run\RunSetActions\RunSetActionSendDataToExternalSourceEditPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="UserControlsLib\ucShowItemID.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/Ginger/Ginger/Images/@AddSendExecutionData_16x16.png b/Ginger/Ginger/Images/@AddSendExecutionData_16x16.png
diff --git a/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml b/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml
diff --git a/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml.cs b/Ginger/Ginger/Reports/HTMLReportTemplatePage.xaml.cs
@@ -118,6 +118,12 @@ private void SetHTMLReportsConfigFieldsGridsView()
             grdSummaryViewFields.SetAllColumnsDefaultView(viewSummaryView);
             grdSummaryViewFields.InitViewItems();
 
+            //Remove collapsed column for source field
+            viewSummaryView.GridColsView.Remove(viewSummaryView.GridColsView.Where(x => x.Field == HTMLReportConfigFieldToSelect.Fields.IsSectionCollapsed.ToString()).FirstOrDefault());
+            grdRunsetViewSourceFields.SetAllColumnsDefaultView(viewSummaryView);
+            grdRunsetViewSourceFields.InitViewItems();
+
+
             GridViewDef viewGingers = new GridViewDef(GridViewDef.DefaultViewName);
             viewGingers.GridColsView = new ObservableList<GridColView>();
             viewGingers.GridColsView.Add(new GridColView() { Field = HTMLReportConfigFieldToSelect.Fields.FieldName, WidthWeight = 65, ReadOnly = true, Header = "Field Name" });
@@ -127,6 +133,10 @@ private void SetHTMLReportsConfigFieldsGridsView()
             grdGingersFields.SetAllColumnsDefaultView(viewGingers);
             grdGingersFields.InitViewItems();
 
+            viewGingers.GridColsView.Remove(viewGingers.GridColsView.Where(x => x.Field == HTMLReportConfigFieldToSelect.Fields.IsSectionCollapsed.ToString()).FirstOrDefault());
+            grdRunnerViewSourceFields.SetAllColumnsDefaultView(viewGingers);
+            grdRunnerViewSourceFields.InitViewItems();
+
             GridViewDef viewBusinessFlow = new GridViewDef(GridViewDef.DefaultViewName);
             viewBusinessFlow.GridColsView = new ObservableList<GridColView>();
             viewBusinessFlow.GridColsView.Add(new GridColView() { Field = HTMLReportConfigFieldToSelect.Fields.FieldName, WidthWeight = 65, ReadOnly = true, Header = "Field Name" });
@@ -136,6 +146,10 @@ private void SetHTMLReportsConfigFieldsGridsView()
             grdBusinessFlowFields.SetAllColumnsDefaultView(viewBusinessFlow);
             grdBusinessFlowFields.InitViewItems();
 
+            viewBusinessFlow.GridColsView.Remove(viewBusinessFlow.GridColsView.Where(x => x.Field == HTMLReportConfigFieldToSelect.Fields.IsSectionCollapsed.ToString()).FirstOrDefault());
+            grdBusinessFlowViewSourceFields.SetAllColumnsDefaultView(viewBusinessFlow);
+            grdBusinessFlowViewSourceFields.InitViewItems();
+
             GridViewDef viewActivities = new GridViewDef(GridViewDef.DefaultViewName);
             viewActivities.GridColsView = new ObservableList<GridColView>();
             viewActivities.GridColsView.Add(new GridColView() { Field = HTMLReportConfigFieldToSelect.Fields.FieldName, WidthWeight = 65, ReadOnly = true, Header = "Field Name" });
@@ -145,6 +159,10 @@ private void SetHTMLReportsConfigFieldsGridsView()
             grdActivitiesFields.SetAllColumnsDefaultView(viewActivities);
             grdActivitiesFields.InitViewItems();
 
+            viewActivities.GridColsView.Remove(viewActivities.GridColsView.Where(x => x.Field == HTMLReportConfigFieldToSelect.Fields.IsSectionCollapsed.ToString()).FirstOrDefault());
+            grdActivityViewSourceFields.SetAllColumnsDefaultView(viewActivities);
+            grdActivityViewSourceFields.InitViewItems();
+
             GridViewDef viewActivityGroups = new GridViewDef(GridViewDef.DefaultViewName);
             viewActivityGroups.GridColsView = new ObservableList<GridColView>();
             viewActivityGroups.GridColsView.Add(new GridColView() { Field = HTMLReportConfigFieldToSelect.Fields.FieldName, WidthWeight = 65, ReadOnly = true, Header = "Field Name" });
@@ -154,6 +172,10 @@ private void SetHTMLReportsConfigFieldsGridsView()
             grdActivityGroupsFields.SetAllColumnsDefaultView(viewActivityGroups);
             grdActivityGroupsFields.InitViewItems();
 
+            viewActivityGroups.GridColsView.Remove(viewActivityGroups.GridColsView.Where(x => x.Field == HTMLReportConfigFieldToSelect.Fields.IsSectionCollapsed.ToString()).FirstOrDefault());
+            grdActivityGroupsViewSourceFields.SetAllColumnsDefaultView(viewActivityGroups);
+            grdActivityGroupsViewSourceFields.InitViewItems();
+
             GridViewDef viewActions = new GridViewDef(GridViewDef.DefaultViewName);
             viewActions.GridColsView = new ObservableList<GridColView>();
             viewActions.GridColsView.Add(new GridColView() { Field = HTMLReportConfigFieldToSelect.Fields.FieldName, WidthWeight = 65, ReadOnly = true, Header = "Field Name" });
@@ -163,6 +185,10 @@ private void SetHTMLReportsConfigFieldsGridsView()
             grdActionsFields.SetAllColumnsDefaultView(viewActions);
             grdActionsFields.InitViewItems();
 
+            viewActions.GridColsView.Remove(viewActions.GridColsView.Where(x => x.Field == HTMLReportConfigFieldToSelect.Fields.IsSectionCollapsed.ToString()).FirstOrDefault());
+            grdActionViewSourceFields.SetAllColumnsDefaultView(viewActions);
+            grdActionViewSourceFields.InitViewItems();
+
             GridViewDef viewEmailSummaryView = new GridViewDef(GridViewDef.DefaultViewName);
             viewEmailSummaryView.GridColsView = new ObservableList<GridColView>();
             viewEmailSummaryView.GridColsView.Add(new GridColView() { Field = HTMLReportConfigFieldToSelect.Fields.FieldName, WidthWeight = 65, ReadOnly = true, Header = "Field Name" });
@@ -182,6 +208,14 @@ private void SetHTMLReportsConfigFieldsGridsData(HTMLReportConfiguration HTMLRep
             grdActivityGroupsFields.DataSourceList = HTMLReportConfiguration.ActivityGroupFieldsToSelect;
             grdActivitiesFields.DataSourceList = HTMLReportConfiguration.ActivityFieldsToSelect;
             grdActionsFields.DataSourceList = HTMLReportConfiguration.ActionFieldsToSelect;
+
+
+            grdRunsetViewSourceFields.DataSourceList = HTMLReportConfiguration.RunSetSourceFieldsToSelect;
+            grdRunnerViewSourceFields.DataSourceList = HTMLReportConfiguration.GingerRunnerSourceFieldsToSelect;
+            grdBusinessFlowViewSourceFields.DataSourceList = HTMLReportConfiguration.BusinessFlowSourceFieldsToSelect;
+            grdActivityGroupsViewSourceFields.DataSourceList = HTMLReportConfiguration.ActivityGroupSourceFieldsToSelect;
+            grdActivityViewSourceFields.DataSourceList = HTMLReportConfiguration.ActivitySourceFieldsToSelect;
+            grdActionViewSourceFields.DataSourceList = HTMLReportConfiguration.ActionSourceFieldsToSelect;
         }
 
         private static ObservableList<HTMLReportConfigFieldToSelect> GetReportLevelMembers(Type reportLevelType)
@@ -325,6 +359,25 @@ private void FieldIsAddedToReport_Checked(object sender, RoutedEventArgs e)
                 case "grdActions_FieldSelection":
                     _HTMLReportConfiguration.ActionFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActionsFields.CurrentItem).FieldKey)).FirstOrDefault().IsSelected = (bool)(sender as CheckBox).IsChecked;
                     break;
+
+                case "grdActionViewSourceFields_FieldSelection":
+                    _HTMLReportConfiguration.ActionSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActionsFields.CurrentItem).FieldKey)).FirstOrDefault().IsSelected = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdActivityViewSourceFields_FieldSelection":
+                    _HTMLReportConfiguration.ActivitySourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActivitiesFields.CurrentItem).FieldKey)).FirstOrDefault().IsSelected = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdActivityGroupsViewSourceFields_FieldSelection":
+                    _HTMLReportConfiguration.ActivityGroupSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActivityGroupsFields.CurrentItem).FieldKey)).FirstOrDefault().IsSelected = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdBusinessFlowViewSourceFields_FieldSelection":
+                    _HTMLReportConfiguration.BusinessFlowSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdBusinessFlowFields.CurrentItem).FieldKey)).FirstOrDefault().IsSelected = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdRunnerViewSourceFields_FieldSelection":
+                    _HTMLReportConfiguration.GingerRunnerSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdGingersFields.CurrentItem).FieldKey)).FirstOrDefault().IsSelected = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdRensetViewSourceFields_FieldSelection":
+                    _HTMLReportConfiguration.RunSetSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdSummaryViewFields.CurrentItem).FieldKey)).FirstOrDefault().IsSelected = (bool)(sender as CheckBox).IsChecked;
+                    break;
             }
         }
 
@@ -350,6 +403,25 @@ private void SectionCollapsed_Checked(object sender, RoutedEventArgs e)
                 case "grdActions_SectionCollapsed":
                     _HTMLReportConfiguration.ActionFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActionsFields.CurrentItem).FieldKey)).FirstOrDefault().IsSectionCollapsed = (bool)(sender as CheckBox).IsChecked;
                     break;
+
+                case "grdActionViewSourceFields_SectionCollapsed":
+                    _HTMLReportConfiguration.ActionSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActionsFields.CurrentItem).FieldKey)).FirstOrDefault().IsSectionCollapsed = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdActivityViewSourceFields_SectionCollapsed":
+                    _HTMLReportConfiguration.ActivitySourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActivitiesFields.CurrentItem).FieldKey)).FirstOrDefault().IsSectionCollapsed = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdActivityGroupsViewSourceFields_SectionCollapsed":
+                    _HTMLReportConfiguration.ActivityGroupSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdActivitiesFields.CurrentItem).FieldKey)).FirstOrDefault().IsSectionCollapsed = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdBusinessFlowViewSourceFields_SectionCollapsed":
+                    _HTMLReportConfiguration.BusinessFlowSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdBusinessFlowFields.CurrentItem).FieldKey)).FirstOrDefault().IsSectionCollapsed = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdRunnerViewSourceFields_SectionCollapsed":
+                    _HTMLReportConfiguration.GingerRunnerSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdGingersFields.CurrentItem).FieldKey)).FirstOrDefault().IsSectionCollapsed = (bool)(sender as CheckBox).IsChecked;
+                    break;
+                case "grdRensetViewSourceFields_SectionCollapsed":
+                    _HTMLReportConfiguration.RunSetSourceFieldsToSelect.Where(x => (x.FieldKey == ((HTMLReportConfigFieldToSelect)grdSummaryViewFields.CurrentItem).FieldKey)).FirstOrDefault().IsSectionCollapsed = (bool)(sender as CheckBox).IsChecked;
+                    break;
             }
         }
 

diff --git a/Ginger/Ginger/Run/RunSetActions/RunSetActionEditPage.xaml b/Ginger/Ginger/Run/RunSetActions/RunSetActionEditPage.xaml
@@ -8,7 +8,7 @@
       d:DesignHeight="300" d:DesignWidth="600"
 	Title="RunSetActionEditPage" Background="{StaticResource $BackgroundColor_LightGray}">
 
-    <Grid Margin="0" Background="{StaticResource $BackgroundColor_LightGray}">        
+    <Grid Background="{StaticResource $BackgroundColor_LightGray}" Margin="10,0,10,0">        
         <Grid.RowDefinitions>
             <RowDefinition Height="60"/>                        
             <RowDefinition Height="150*"/>            
@@ -48,7 +48,7 @@
 
             <TabItem Header="Execution" Background="{StaticResource $BackgroundColor_LightGray}">
                 <ScrollViewer>
-                    <DockPanel>
+                    <DockPanel Background="{StaticResource $BackgroundColor_LightGray}">
                         <StackPanel Orientation="Horizontal" DockPanel.Dock="Top" Margin="0,10,0,0">
                             <Label Style="{StaticResource @LabelStyle}">Status:</Label>
                             <TextBox x:Name="StatusTextBox" Width="150" Style="{StaticResource @TextBoxStyle}" Margin="7,0,0,0"/>

diff --git a/Ginger/Ginger/Run/RunSetActions/RunSetActionSendDataToExternalSourceEditPage.xaml b/Ginger/Ginger/Run/RunSetActions/RunSetActionSendDataToExternalSourceEditPage.xaml
@@ -0,0 +1,66 @@
+<Page x:Class="Ginger.Run.RunSetActions.RunSetActionSendDataToExternalSourceEditPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:Actions="clr-namespace:Ginger.Actions"
+      mc:Ignorable="d" 
+      xmlns:GingerCore="clr-namespace:GingerCore;assembly=GingerCore" xmlns:Ginger="clr-namespace:Ginger"
+      d:DesignHeight="550" d:DesignWidth="600"
+	Title="RunSetActionSendDataToExternalSourceEditPage">
+
+    <Grid x:Name="pageGrid" Background="{StaticResource $BackgroundColor_LightGray}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="600"/>
+        </Grid.ColumnDefinitions>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="350*" />
+        </Grid.RowDefinitions>
+        <StackPanel>
+            <StackPanel Orientation="Vertical">
+                <Label Style="{StaticResource @LabelStyle}" Content="Select Report Template:"/>
+                <ComboBox x:Name="CurrentTemplatePickerCbx"  ContextMenu="{x:Null}" Style="{DynamicResource @InputComboBoxStyle}" SelectionChanged="CurrentTemplatePickerCbx_SelectionChanged" ></ComboBox>
+                <Label Style="{StaticResource @LabelStyle}" x:Name="LabelEndPoint" Content="End Point URL:" />
+                <Actions:UCValueExpression x:Name="xEndPointURLTextBox" ToolTip="EndPoint" />
+
+            </StackPanel>
+            <StackPanel Orientation="Vertical">
+                <Label Style="{StaticResource @LabelStyle}" x:Name="LabelHeader" Content="Request Header:" />
+                <Grid  x:Name="RequestHeadersGrid">
+                    <Label Style="{StaticResource @LabelStyle}" x:Name="LabelHeaders" Content="Request Headers:" />
+                    <Ginger:ucGrid x:Name="grdRequestHeaders" DockPanel.Dock="Top" Title="Request Headers" ShowEdit="Collapsed" ShowSearch="Visible" ShowAdd="Visible" ShowClearAll="Visible" ShowDelete="Visible" ShowRefresh="Collapsed" ShowUpDown="Visible" />
+                    <Grid.Resources>
+                        <DataTemplate x:Key="HeaderValueExpressionButton">
+                            <Button x:Name="HeaderGridVEButton" Content="..." Click="HeaderGridVEButton_Click"  Style="{DynamicResource DataGridCellButtonStyle}"/>
+                        </DataTemplate>
+                    </Grid.Resources>
+                </Grid>
+            </StackPanel>
+            <StackPanel Orientation="Vertical">
+                <Label Style="{StaticResource @LabelStyle}" x:Name="LabelBody" Content="Request Body:" />
+                <TabControl x:Name="tabRequestBody" SelectionChanged="tabRequestBody_SelectionChanged">
+                    <TabItem x:Name="tabListView">
+                        <TabItem.Header>
+                            <Label Content="List View" HorizontalAlignment="Stretch"/>
+                        </TabItem.Header>
+                        <Grid  x:Name="RequestBodyGrid">
+                            <Ginger:ucGrid x:Name="grdRequestBody" DockPanel.Dock="Top" Title="Request Body" ShowEdit="Collapsed" ShowSearch="Visible" ShowAdd="Visible" ShowClearAll="Visible" ShowDelete="Visible" ShowRefresh="Collapsed" ShowUpDown="Visible" />
+                            <Grid.Resources>
+                                <DataTemplate x:Key="BodyValueExpressionButton">
+                                    <Button x:Name="BodyGridVEButton" Content="..." Click="BodyGridVEButton_Click"  Style="{DynamicResource DataGridCellButtonStyle}"/>
+                                </DataTemplate>
+                            </Grid.Resources>
+                        </Grid>
+                    </TabItem>
+                    <TabItem x:Name="tabJsonView" >
+                        <TabItem.Header>
+                            <Label Content="JSON View" HorizontalAlignment="Stretch"/>
+                        </TabItem.Header>
+                        <Actions:UCValueExpression x:Name="xJsonBodyTextBox" ToolTip="EndPoint" ScrollViewer.VerticalScrollBarVisibility="Auto" />
+                    </TabItem>
+                </TabControl>
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Page>