Merge pull request #3576 from Ginger-Automation/Beta/BugFix/RQMCLIFix

For ALM Added ExternalID Filed on CLI Dynamic Json
Ginger-Automation · Apr 4, 2024 · 651f56a · 651f56a
2 parents d17ddf6 + 5d14e86
commit 651f56a
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 6 deletions.
diff --git a/Ginger/Ginger/Ginger.csproj b/Ginger/Ginger/Ginger.csproj
@@ -690,6 +690,7 @@
     <PackageReference Include="EPPlus" Version="6.0.4" />
     <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="Gherkin" Version="5.1.0" />
+    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.3" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />

diff --git a/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml b/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml
@@ -29,7 +29,7 @@
                 <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">
+                <StackPanel x:Name="SearchALMEntityByNamePnl" Orientation="Horizontal">
                     <Label Style="{StaticResource @LabelStyle}">Search ALM Entity By Name:</Label>
                     <CheckBox x:Name="SearchALMEntityByName" Style="{StaticResource @CheckBoxStyle}" Margin="70,5,0,0">
                     </CheckBox>

diff --git a/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs b/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs
@@ -265,6 +265,7 @@ private void xALMTestSetLevelCbx_SelectionChanged(object sender, SelectionChange
             {
                 xExportTypePanel.Visibility = Visibility.Collapsed;
                 xExportDestinationFolder.Visibility = Visibility.Collapsed;
+                SearchALMEntityByNamePnl.Visibility = Visibility.Collapsed;
                 SearchALMEntityByName.Visibility = Visibility.Collapsed;
                 return;
             }
@@ -276,11 +277,13 @@ private void xExportTypeCbx_SelectionChanged(object sender, SelectionChangedEven
             if (xExportTypeCbx.ComboBoxSelectedValue is null) //&& xExportTypeCbx.ComboBoxSelectedValue.ToString().Equals(eExportType.ResultsOnly.ToString()))
             {
                 xExportDestinationFolder.Visibility = Visibility.Collapsed;
+                SearchALMEntityByNamePnl.Visibility = Visibility.Collapsed;
                 SearchALMEntityByName.Visibility = Visibility.Collapsed;
                 return;
             }
             xExportDestinationFolder.Visibility = Visibility.Visible;
             xExportTypeCbx.ComboBox.SelectedValue = eExportType.EntitiesAndResults;
+            SearchALMEntityByNamePnl.Visibility = Visibility.Visible;
             SearchALMEntityByName.Visibility = Visibility.Visible;
             xExportTypeCbx.IsEnabled = false;
         }

diff --git a/Ginger/GingerCore/DLLs/RQMExportStd.dll b/Ginger/GingerCore/DLLs/RQMExportStd.dll
diff --git a/Ginger/GingerCore/GingerCore.csproj b/Ginger/GingerCore/GingerCore.csproj
@@ -563,7 +563,7 @@
     <PackageReference Include="Freeware.Pdf2Png">
       <Version>1.0.1</Version>
     </PackageReference>
-    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.2" />
+    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.3" />
     <PackageReference Include="Google.Protobuf">
       <Version>3.15.0</Version>
     </PackageReference>

diff --git a/Ginger/GingerCoreNET/DLLS/RQMExportStd.dll b/Ginger/GingerCoreNET/DLLS/RQMExportStd.dll
diff --git a/Ginger/GingerCoreNET/GingerCoreNET.csproj b/Ginger/GingerCoreNET/GingerCoreNET.csproj
@@ -255,7 +255,7 @@
 
     <PackageReference Include="Ginger.AccountReport.Contracts" Version="4.2.3" />
 
-    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.2" />
+    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.3" />
 
     <PackageReference Include="HBaseNet" Version="0.1.0" />
 

diff --git a/Ginger/GingerCoreNET/Run/GingerExecutionEngine.cs b/Ginger/GingerCoreNET/Run/GingerExecutionEngine.cs
@@ -446,6 +446,7 @@ public void UpdateBusinessFlowsRunList()
                     BusinessFlowIsMandatory = bf.Mandatory,
                     BusinessFlowInstanceGuid = bf.InstanceGuid,
                     BusinessFlowRunDescription = bf.RunDescription,
+                    ExternalID = bf.ExternalID,
                     BFFlowControls = bf.BFFlowControls
                 };
 

diff --git a/...oreNET/Run/RunListenerLib/CenteralizedExecutionLogger/AccountReportEntitiesDataMapping.cs b/...oreNET/Run/RunListenerLib/CenteralizedExecutionLogger/AccountReportEntitiesDataMapping.cs
@@ -370,6 +370,7 @@ public static AccountReportRunSet MapRunsetStartData(RunSetConfig runSetConfig,
             valueExpression.Value = runSetConfig.RunDescription;
             accountReportRunSet.RunDescription = valueExpression.ValueCalculated;
             accountReportRunSet.IsPublished = runSetConfig.Publish;
+            accountReportRunSet.ExternalID = runSetConfig.ExternalID;
             SetRunSetChildCounts(runSetConfig, accountReportRunSet, true);
             return accountReportRunSet;
         }

diff --git a/Ginger/GingerCoreNET/RunLib/DynamicExecutionLib/DynamicExecutionManager.cs b/Ginger/GingerCoreNET/RunLib/DynamicExecutionLib/DynamicExecutionManager.cs
@@ -569,6 +569,10 @@ private static GingerExecConfig GetGingerExecConfigurationObject(Solution soluti
             runset.RunAnalyzer = cliHelper.RunAnalyzer;
             runset.RunInParallel = runsetExecutor.RunSetConfig.RunModeParallel;
             runset.StopRunnersOnFailure = runsetExecutor.RunSetConfig.StopRunnersOnFailure;
+            if (!string.IsNullOrEmpty(runsetExecutor.RunSetConfig.ExternalID))
+            {
+                runset.ExternalID = runsetExecutor.RunSetConfig.ExternalID;
+            }
             ///////////////
             ///
             RerunConfig rerunconfiguration = new RerunConfig()
@@ -659,6 +663,11 @@ private static GingerExecConfig GetGingerExecConfigurationObject(Solution soluti
                     businessFlow.Name = businessFlowRun.BusinessFlowName;
                     businessFlow.ID = businessFlowRun.BusinessFlowGuid;
                     businessFlow.InstanceID = businessFlowRun.BusinessFlowInstanceGuid;
+                    if (!string.IsNullOrEmpty(businessFlowRun.ExternalID))
+                    { 
+                        businessFlow.ExternalID = businessFlowRun.ExternalID; 
+                    }
+
                     businessFlow.Exist = true;
                     if (gingerRunner.BusinessFlowsRunList.Where(x => x.BusinessFlowGuid == businessFlowRun.BusinessFlowGuid).ToList().Count > 1)
                     {
@@ -1003,6 +1012,11 @@ public static RunSetConfig LoadRunsetFromExecutionConfig(GingerExecConfig ginger
                 runSetConfig.Description = gingerExecConfig.Runset.Description;
             }
 
+            if(!String.IsNullOrEmpty(gingerExecConfig.Runset.ExternalID))
+            {
+                runSetConfig.ExternalID = gingerExecConfig.Runset.ExternalID;
+            }
+
             if (dynamicRunsetConfigs.RunAnalyzer != null)
             {
                 runSetConfig.RunWithAnalyzer = (bool)dynamicRunsetConfigs.RunAnalyzer;
@@ -1160,7 +1174,7 @@ public static RunSetConfig LoadRunsetFromExecutionConfig(GingerExecConfig ginger
                             else
                             {
                                 //using Virtual BF
-                                bf = new BusinessFlow() { Name = businessFlowConfig.Name };
+                                bf = new BusinessFlow() { Name = businessFlowConfig.Name,ExternalID = businessFlowConfig.ExternalID };
                                 ///Add Shared Activities 
                                 if (businessFlowConfig.SharedActivities != null && businessFlowConfig.SharedActivities.Count > 0)
                                 {

diff --git a/Ginger/GingerCoreNETUnitTest/GingerCoreNETUnitTest.csproj b/Ginger/GingerCoreNETUnitTest/GingerCoreNETUnitTest.csproj
@@ -86,7 +86,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.2" />
+    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.3" />
     <PackageReference Include="GingerTestHelper" Version="2.0.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.Scripting" Version="3.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />

diff --git a/Ginger/GingerRuntime/GingerRuntime.csproj b/Ginger/GingerRuntime/GingerRuntime.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.2" />
+    <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.2.3" />
     <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="3.21.100" />
     <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
     <PackageReference Include="System.Resources.Extensions" Version="8.0.0" />