Skip to content

Commit

Permalink
Merge pull request #3739 from Ginger-Automation/Feature/CentralizedDB…
Browse files Browse the repository at this point in the history 
…ReportLinkForALMs

Ginger Runset Execution Report DB Link to ALM
  • Loading branch information
@Maheshkale447
Maheshkale447 committed Jun 8, 2024
2 parents c0343a5 + ebbd1d7 commit 2ebcc69
Show file tree
Hide file tree
Showing 24 changed files with 311 additions and 169 deletions.
Binary file added Ginger/Ginger/DLLs/Ginger.ExecuterService.Contracts.dll
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion Ginger/Ginger/Ginger.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,6 @@
<PackageReference Include="FontAwesome6.Fonts" Version="2.5.1" />
<PackageReference Include="FontAwesome6.Svg" Version="2.5.1" />
<PackageReference Include="Gherkin" Version="5.1.0" />
<PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.6" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
<PackageReference Include="LiteDB" Version="5.0.17" />
<PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
Expand Down Expand Up @@ -772,6 +771,9 @@
<Reference Include="CredentialManagement">
<HintPath>DLLs\CredentialManagement.dll</HintPath>
</Reference>
<Reference Include="Ginger.ExecuterService.Contracts">
<HintPath>DLLs\Ginger.ExecuterService.Contracts.dll</HintPath>
</Reference>
<Reference Include="GingerExternal">
<HintPath>..\GingerCoreNET\DLLS\GingerExternal.dll</HintPath>
</Reference>
Expand Down
14 changes: 7 additions & 7 deletions Ginger/Ginger/MainWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@
<!--Main Menu- Solution Selection-->
<StackPanel x:Name="xSolutionSelectionPnl" Orientation="Horizontal" DockPanel.Dock="Left" >
<TextBlock x:Name="xSolutionNameTextBlock" TextTrimming="CharacterEllipsis" MaxWidth="300" TextWrapping="NoWrap" Margin="0,0,0,0" Text="Please Load Solution" VerticalAlignment="Center" HorizontalAlignment="Left" FontFamily="Open Sans" FontSize="20" FontWeight="Normal" Foreground="{StaticResource $SelectionColor_Pink}" ></TextBlock>
<Menu x:Name="xSolutionSelectionMenu" Background="{StaticResource $BackgroundColor_Black}" Margin="5,0,0,0" VerticalAlignment="Center" >
<Menu x:Name="xSolutionSelectionMenu" Background="{StaticResource $BackgroundColor_Black}" Margin="0,0,0,0" VerticalAlignment="Center" >
<MenuItem x:Name="xSolutionSelectionMainMenuItem" Style="{StaticResource $MenuItemStyle_ButtonMenu}" ToolTip="Solution Selection" Margin="0,0,0,0" StaysOpenOnClick="True">
<MenuItem.Icon>
<usercontrols:ImageMakerControl SetAsFontImageWithSize="18" ImageType="ArrowDown" Width="16" Height="20" Margin="0,0,0,0"/>
<usercontrols:ImageMakerControl SetAsFontImageWithSize="18" ImageType="ArrowDown" Height="20" Margin="5,0,-6,-4"/>
</MenuItem.Icon>
<MenuItem x:Name="xRecentSolutionsMenuItem" Header="Recently Used Solutions" Style="{StaticResource $MenuItemStyle_ButtonMenuItem}" Click="xRecentSolutionsMenuItem_Click" StaysOpenOnClick="True" Visibility="Collapsed" >
<MenuItem.Icon>
<usercontrols:ImageMakerControl HorizontalAlignment="Center" SetAsFontImageWithSize="15" ImageType="History" Margin="0,0,0,0"/>
<usercontrols:ImageMakerControl HorizontalAlignment="Center" SetAsFontImageWithSize="15" ImageType="History" Margin="5,0,-5,0"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem x:Name="xOpenSolutionMenuItem" Header="Open Existing Solution" Style="{StaticResource $MenuItemStyle_ButtonMenuItem}" Click="xOpenSolutionMenuItem_Click">
<MenuItem.Icon>
<usercontrols:ImageMakerControl SetAsFontImageWithSize="15" ImageType="OpenFolder" Margin="0,0,0,0" HorizontalAlignment="Center"/>
<usercontrols:ImageMakerControl SetAsFontImageWithSize="15" ImageType="OpenFolder" Margin="5,0,-5,0"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem x:Name="xDownloadSolutionMenuItem" Header="Download Existing Solution" Style="{StaticResource $MenuItemStyle_ButtonMenuItem}" Click="xDownloadSolutionMenuItem_Click">
<MenuItem.Icon>
<usercontrols:ImageMakerControl SetAsFontImageWithSize="13" ImageType="Download" Margin="0,0,0,0"/>
<usercontrols:ImageMakerControl SetAsFontImageWithSize="13" ImageType="Download" Margin="5,0,-5,0"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem x:Name="xCreateNewSolutionMenuItem" Header="Create New Solution" Style="{StaticResource $MenuItemStyle_ButtonMenuItem}" Click="xCreateNewSolutionMenuItem_Click">
<MenuItem.Icon>
<usercontrols:ImageMakerControl HorizontalAlignment="Center" SetAsFontImageWithSize="14" ImageType="Add" Margin="0,0,0,0"/>
<usercontrols:ImageMakerControl HorizontalAlignment="Center" SetAsFontImageWithSize="14" ImageType="Add" Margin="5,0,-5,0"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
Expand Down Expand Up @@ -345,7 +345,7 @@
</DockPanel>
</Border>
</Grid>

<Canvas x:Name="xHelpLayoutCanvas" Panel.ZIndex="2" MouseLeftButtonDown="xHelpLayoutCanvas_MouseLeftButtonDown" Background="Transparent" Visibility="Collapsed" >
<Rectangle x:Name="xHelpLayoutRectangleLeft" Fill="Black" Opacity="0.7" />
<Rectangle x:Name="xHelpLayoutRectangleTop" Fill="Black" Opacity="0.7" />
Expand Down
1 change: 1 addition & 0 deletions Ginger/Ginger/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,7 @@ private void AddSubMenuItem(MenuItem parentMenuItem, string itemHeader, object i
imageMaker.SetAsFontImageWithSize = 16;
imageMaker.ImageType = iconType;
subMenuItem.Icon = imageMaker;
imageMaker.Margin = new Thickness(5,0,-5,0);
}
parentMenuItem.Items.Insert(insertIndex, subMenuItem);
}
Expand Down
79 changes: 44 additions & 35 deletions Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--//# Status=Cleaned; Comment=Cleaned on 05/23/18-->
<Page x:Class="Ginger.Run.ExportResultsToALMConfigPage"
<Page x:Class="Ginger.Run.ExportResultsToALMConfigPage"
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"
Expand All @@ -9,33 +9,33 @@
xmlns:UserControlsLib="clr-namespace:Ginger.UserControlsLib"
xmlns:GingerCore="clr-namespace:GingerCore;assembly=GingerCore"
mc:Ignorable="d"
d:DesignHeight="210" d:DesignWidth="600"
d:DesignHeight="241.8" d:DesignWidth="570"
Title="RunSetActionPublishToQCEditPage">
<ScrollViewer VerticalScrollBarVisibility="Auto">
<Grid>
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">ALM Type:</Label>
<DockPanel>
<UserControlsLib:UCComboBox x:Name="xALMTypeCbx" ContextMenu="{x:Null}" Margin="170,0,0,0" Width="300" HorizontalAlignment="Left" ></UserControlsLib:UCComboBox>
<usercontrols:ucButton x:Name="xSetFieldsBtn" ButtonType="RoundTextAndImageButton" HorizontalAlignment="Left" Margin="20,0,0,0" ButtonText="Set Fields" ButtonImageType="ALM" ButtonFontImageSize="15" ButtonImageWidth="15" ButtonImageHeight="15" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}" Click="xSetFieldsBtn_Click"/>
</DockPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">ALM Test Set Level:</Label>
<UserControlsLib:UCComboBox x:Name="xALMTestSetLevelCbx" Margin="120,0,0,0" Width="300" HorizontalAlignment="Left"></UserControlsLib:UCComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" x:Name="xExportTypePanel" Visibility="Collapsed">
<Label Style="{StaticResource @LabelStyle}">Export Type:</Label>
<UserControlsLib:UCComboBox x:Name="xExportTypeCbx" ContextMenu="{x:Null}" Margin="155,0,0,0" Width="300" HorizontalAlignment="Left"></UserControlsLib:UCComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">ALM Type:</Label>
<DockPanel>
<UserControlsLib:UCComboBox x:Name="xALMTypeCbx" ContextMenu="{x:Null}" Margin="170,0,0,0" Width="300" HorizontalAlignment="Left" ></UserControlsLib:UCComboBox>
<usercontrols:ucButton x:Name="xSetFieldsBtn" ButtonType="RoundTextAndImageButton" HorizontalAlignment="Left" Margin="20,0,0,0" ButtonText="Set Fields" ButtonImageType="ALM" ButtonFontImageSize="15" ButtonImageWidth="15" ButtonImageHeight="15" ButtonStyle="{StaticResource $RoundTextAndImageButtonStyle}" Click="xSetFieldsBtn_Click"/>
</DockPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">ALM Test Set Level:</Label>
<UserControlsLib:UCComboBox x:Name="xALMTestSetLevelCbx" Margin="120,0,0,0" Width="300" HorizontalAlignment="Left"></UserControlsLib:UCComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" x:Name="xExportTypePanel" Visibility="Collapsed">
<Label Style="{StaticResource @LabelStyle}">Export Type:</Label>
<UserControlsLib:UCComboBox x:Name="xExportTypeCbx" ContextMenu="{x:Null}" Margin="155,0,0,0" Width="300" HorizontalAlignment="Left"></UserControlsLib:UCComboBox>
</StackPanel>
<StackPanel x:Name="SearchALMEntityByNamePnl" Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">Search By Name:</Label>
<CheckBox x:Name="SearchALMEntityByName" Style="{StaticResource @CheckBoxStyle}" Margin="130,5,0,0">
</CheckBox>
</StackPanel>
<StackPanel x:Name="xExportDestinationFolder" Visibility="Collapsed">
</StackPanel>

<StackPanel x:Name="xExportDestinationFolder" Visibility="Collapsed">
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}" Margin="0,10,0,0">Test Set Export Folder:</Label>
<Actions:UCValueExpression x:Name="xTestSetFolderDestination" Margin="100,10,0,0" Width="300" HorizontalAlignment="Left"/>
Expand All @@ -44,12 +44,12 @@
<Label Style="{StaticResource @LabelStyle}" Margin="0,10,0,0">Test Cases Export Folder:</Label>
<Actions:UCValueExpression x:Name="xTestCaseFolderDestination" Margin="85,10,0,0" Width="300" HorizontalAlignment="Left"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}" Margin="0,10,0,0">Test Cases Results to Export :</Label>
<ComboBox x:Name="xFilterByStatusDroplist" ContextMenu="{x:Null}" Width="300" HorizontalAlignment="Left" Margin="65,0,0,0" Style="{DynamicResource $FlatEditInputComboBoxStyle}"></ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal">
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}" Margin="0,10,0,0">Test Cases Results to Export :</Label>
<ComboBox x:Name="xFilterByStatusDroplist" ContextMenu="{x:Null}" Width="300" HorizontalAlignment="Left" Margin="65,0,0,0" Style="{DynamicResource $FlatEditInputComboBoxStyle}"></ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">
<Label.Content>
<GingerCore:ucTextDicResource Text="Attach [ActivitiesGroups] Report to TC's:"/>
Expand All @@ -58,20 +58,29 @@
<CheckBox x:Name="AttachActivitiesGroupReportCbx" Style="{StaticResource @CheckBoxStyle}" Margin="10,6,0,0" Checked="AttachActivitiesGroupReportCbx_Checked" Unchecked="AttachActivitiesGroupReportCbx_Unchecked">
</CheckBox>

</StackPanel>
<StackPanel Orientation="Horizontal">
</StackPanel>
<StackPanel Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">
<Label.Content>
<GingerCore:ucTextDicResource Text="Use User [Variable] TC Run Instance:"/>
<GingerCore:ucTextDicResource Text="Use User [Variable] TC Run Instance:"/>
</Label.Content>
</Label>
<CheckBox x:Name="UseVariableInTCRunNameCbx" Style="{StaticResource @CheckBoxStyle}" Margin="30,8,0,0" Checked="UseVariableInTCRunNameCbx_Checked" Unchecked="UseVariableInTCRunNameCbx_Unchecked">
<CheckBox x:Name="UseVariableInTCRunNameCbx" Style="{StaticResource @CheckBoxStyle}" Margin="32,8,0,0" Checked="UseVariableInTCRunNameCbx_Checked" Unchecked="UseVariableInTCRunNameCbx_Unchecked">
</CheckBox>
</StackPanel>
<StackPanel Margin="5,0,0,15" x:Name="VariableForTCRunNamePanel" Orientation="Horizontal" IsEnabled="False">
<Label Style="{StaticResource @LabelStyle}" Margin="0,10,0,0">TC Run Instance Name:</Label>
<Actions:UCValueExpression x:Name="VariableForTCRunName" Margin="90,0,0,0" Width="300" ToolTip="From"/>
</StackPanel>
</StackPanel>
<StackPanel x:Name="xExportReportStack" Visibility="Visible" Orientation="Horizontal">
<Label Style="{StaticResource @LabelStyle}">
<Label.Content>
<GingerCore:ucTextDicResource Text="Export Execution Report Link :"/>
</Label.Content>
</Label>
<CheckBox x:Name="ExportReportLink" Style="{StaticResource @CheckBoxStyle}" Margin="60,8,0,0">
</CheckBox>
</StackPanel>
<StackPanel x:Name="VariableForTCRunNamePanel" Orientation="Horizontal" IsEnabled="False">
<Label Style="{StaticResource @LabelStyle}" Margin="0,10,8,0">TC Run Instance Name:</Label>
<Actions:UCValueExpression x:Name="VariableForTCRunName" Margin="90,10,10,0" Width="300" ToolTip="From" Height="25"/>
</StackPanel>

<Button x:Name="xExportToALMBtn" Content="Export To ALM" Style="{StaticResource @WindowButtonStyle}" Width="100" Margin="5 0 0 0" HorizontalAlignment="Left" Visibility="Collapsed" Click="xExportToALMBtn_Click"></Button>
</StackPanel>
Expand Down
7 changes: 6 additions & 1 deletion Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ limitations under the License.
using Amdocs.Ginger.Repository;
using Amdocs.Ginger.UserControls;
using Ginger.ALM;
using Ginger.Reports;
using Ginger.Run.RunSetActions;
using GingerCore;
using GingerCore.ALM;
Expand All @@ -47,6 +48,7 @@ public partial class ExportResultsToALMConfigPage : Page
GenericWindow genWin = null;
ObservableList<BusinessFlow> mBfs = new ObservableList<BusinessFlow>();
PublishToALMConfig mPublishToALMConfig = new PublishToALMConfig();
ExecutionLoggerConfiguration mExecutionLoggerConfiguration = new ExecutionLoggerConfiguration();
public bool IsProcessing = false;
ImageMakerControl loaderElement;
ValueExpression mVE = null;
Expand All @@ -64,6 +66,7 @@ public ExportResultsToALMConfigPage(RunSetActionPublishToQC runSetActionPublishT
BindingHandler.ObjFieldBinding(VariableForTCRunName, TextBox.TextProperty, runSetActionPublishToQC, nameof(RunSetActionPublishToQC.VariableForTCRunName));
BindingHandler.ObjFieldBinding(UseVariableInTCRunNameCbx, CheckBox.IsCheckedProperty, runSetActionPublishToQC, nameof(RunSetActionPublishToQC.isVariableInTCRunUsed));
BindingHandler.ObjFieldBinding(AttachActivitiesGroupReportCbx, CheckBox.IsCheckedProperty, runSetActionPublishToQC, nameof(RunSetActionPublishToQC.toAttachActivitiesGroupReport));
BindingHandler.ObjFieldBinding(ExportReportLink, CheckBox.IsCheckedProperty, runSetActionPublishToQC, nameof(RunSetActionPublishToQC.ToExportReportLink));
BindingHandler.ObjFieldBinding(SearchALMEntityByName, CheckBox.IsCheckedProperty, runSetActionPublishToQC, nameof(RunSetActionPublishToQC.SearchALMEntityByName));
xFilterByStatusDroplist.BindControl(runSetActionPublishToQC, nameof(RunSetActionPublishToQC.FilterStatus));
xALMTypeCbx.Init(runSetActionPublishToQC, nameof(RunSetActionPublishToQC.PublishALMType),
Expand All @@ -79,6 +82,7 @@ public ExportResultsToALMConfigPage(RunSetActionPublishToQC runSetActionPublishT
xALMTypeCbx_SelectionChanged(this, null);
SetTestLevelComboBoxList(runSetActionPublishToQC.RunAt);
PropertyChangedEventManager.AddHandler(runSetActionPublishToQC, RunAt_PropertyChanged, string.Empty);

}

private ExportResultsToALMConfigPage()
Expand All @@ -93,6 +97,7 @@ private ExportResultsToALMConfigPage()
GingerCore.GeneralLib.BindingHandler.ObjFieldBinding(VariableForTCRunName, TextBox.TextProperty, mPublishToALMConfig, nameof(PublishToALMConfig.VariableForTCRunName));
GingerCore.GeneralLib.BindingHandler.ObjFieldBinding(UseVariableInTCRunNameCbx, CheckBox.IsCheckedProperty, mPublishToALMConfig, nameof(PublishToALMConfig.IsVariableInTCRunUsed));
GingerCore.GeneralLib.BindingHandler.ObjFieldBinding(AttachActivitiesGroupReportCbx, CheckBox.IsCheckedProperty, mPublishToALMConfig, nameof(PublishToALMConfig.ToAttachActivitiesGroupReport));
GingerCore.GeneralLib.BindingHandler.ObjFieldBinding(ExportReportLink, CheckBox.IsCheckedProperty, mPublishToALMConfig, nameof(PublishToALMConfig.ToExportReportLink));
xFilterByStatusDroplist.BindControl(mPublishToALMConfig, nameof(PublishToALMConfig.FilterStatus));
}

Expand Down Expand Up @@ -124,7 +129,7 @@ public bool Init(ObservableList<BusinessFlow> bfs, ValueExpression VE, Context C
xALMTypeCbx.IsEnabled = false;
mBfs = bfs;
mVE = VE;
mContext = Context;
mContext = Context;
return true;
}
else
Expand Down
12 changes: 8 additions & 4 deletions Ginger/GingerCore/ALM/RQM/ExportToRQM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,12 +534,16 @@ private ExecutionResult GetExeResultforActivityGroup(BusinessFlow businessFlow,
exeResult.ExecutionRecordExportID = exeRecordId;
exeResult.StartDate = businessFlow.StartTimeStamp.ToString("o");
exeResult.EndDate = businessFlow.EndTimeStamp.ToString("o");
if (!string.IsNullOrEmpty(publishToALMConfig.HtmlReportUrl))
if (publishToALMConfig.ToExportReportLink)
{
exeResult.HtmlReportUrl = publishToALMConfig.HtmlReportUrl;
exeResult.ExecutionId = publishToALMConfig.ExecutionId;
exeResult.ExecutionInstanceId = businessFlow.InstanceGuid.ToString();
if (!string.IsNullOrEmpty(publishToALMConfig.HtmlReportUrl))
{
exeResult.HtmlReportUrl = publishToALMConfig.HtmlReportUrl;
exeResult.ExecutionId = publishToALMConfig.ExecutionId;
exeResult.ExecutionInstanceId = businessFlow.InstanceGuid.ToString();
}
}

int i = 1;
StringBuilder errors;
var relevantActivities = businessFlow.Activities.Where(x => x.ActivitiesGroupID == activGroup.FileName);
Expand Down
Loading

0 comments on commit 2ebcc69

Please sign in to comment.