Comments - fixes

Ginger-Automation · Jun 7, 2024 · 15b1ea3 · 15b1ea3
1 parent 09f3c1e
commit 15b1ea3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs b/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs
@@ -66,7 +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(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),

diff --git a/Ginger/GingerCoreCommon/Run/RunSetActions/RunSetActionPublishToQC.cs b/Ginger/GingerCoreCommon/Run/RunSetActions/RunSetActionPublishToQC.cs
@@ -45,20 +45,20 @@ public class RunSetActionPublishToQC : RunSetActionBase, INotifyPropertyChanged
         public bool toAttachActivitiesGroupReport { get { return mtoAttachActivitiesGroupReport; } set { if (mtoAttachActivitiesGroupReport != value) { mtoAttachActivitiesGroupReport = value; OnPropertyChanged(nameof(toAttachActivitiesGroupReport)); } } }
 
 
-        private bool mtoExportReportLink;
+        private bool mToExportReportLink;
         [IsSerializedForLocalRepository]
-        public bool toExportReportLink
+        public bool ToExportReportLink
         { 
             get
             {
-                return mtoExportReportLink;
+                return mToExportReportLink;
             }
             set
             {
-                if(mtoExportReportLink != value)
+                if(mToExportReportLink != value)
                 {
-                    mtoExportReportLink = value;
-                    OnPropertyChanged(nameof(toExportReportLink));
+                    mToExportReportLink = value;
+                    OnPropertyChanged(nameof(ToExportReportLink));
                 }
             }
         }

diff --git a/Ginger/GingerCoreNET/ALMLib/JIRA/Bll/JiraExportManager.cs b/Ginger/GingerCoreNET/ALMLib/JIRA/Bll/JiraExportManager.cs
@@ -27,6 +27,7 @@ limitations under the License.
 using GingerCore.ALM.JIRA.Data_Contracts;
 using GingerCore.Variables;
 using GingerCoreNET.ALMLib;
+using GingerCoreNET.GeneralLib;
 using JiraRepositoryStd;
 using JiraRepositoryStd.BLL;
 using JiraRepositoryStd.Data_Contracts;
@@ -378,8 +379,8 @@ public bool ExecuteDataToJira(BusinessFlow bizFlow, PublishToALMConfig publishTo
                         {
                             if (!string.IsNullOrEmpty(publishToALMConfig.HtmlReportUrl))
                             {
-                                string reportLink = publishToALMConfig.HtmlReportUrl + "#/BusinessFlow/" + $"{ publishToALMConfig.ExecutionId}/" + bizFlow.InstanceGuid;
-                                reportLink = $"[Ginger Report Link|{reportLink}]";
+                                string reportLink = General.CreateReportLinkPerFlow(HtmlReportUrl: publishToALMConfig.HtmlReportUrl, ExecutionId: publishToALMConfig.ExecutionId, BusinessFlowInstanceGuid: bizFlow.InstanceGuid.ToString());
+\                               reportLink = $"[Ginger Report Link|{reportLink}]";
 
                                 if (this.jiraRepObj.AddComment(ALMCore.DefaultAlmConfig.ALMUserName, ALMCore.DefaultAlmConfig.ALMPassword, ALMCore.DefaultAlmConfig.ALMServerURL, relevantTcRun.TestExecutionId, reportLink) == null)
                                 {

diff --git a/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs b/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs
@@ -64,7 +64,7 @@ private void SetExportToALMConfig()
         {
             PublishToALMConfig.IsVariableInTCRunUsed = RunSetActionPublishToQC.isVariableInTCRunUsed;
             PublishToALMConfig.ToAttachActivitiesGroupReport = RunSetActionPublishToQC.toAttachActivitiesGroupReport;
-            PublishToALMConfig.ToExportReportLink = RunSetActionPublishToQC.toExportReportLink;
+            PublishToALMConfig.ToExportReportLink = RunSetActionPublishToQC.ToExportReportLink;
             PublishToALMConfig.VariableForTCRunName = RunSetActionPublishToQC.VariableForTCRunName;
             PublishToALMConfig.CalculateTCRunName(mVE);
             PublishToALMConfig.FilterStatus = RunSetActionPublishToQC.FilterStatus;

diff --git a/Ginger/GingerCoreNET/RunLib/DynamicExecutionLib/DynamicExecutionManager.cs b/Ginger/GingerCoreNET/RunLib/DynamicExecutionLib/DynamicExecutionManager.cs
@@ -868,7 +868,7 @@ private static GingerExecConfig GetGingerExecConfigurationObject(Solution soluti
                     operationConfigPublishToALM.AttachActivitiesGroupsReport = publishToQCAction.toAttachActivitiesGroupReport;
                     operationConfigPublishToALM.UseUserVariableInRunInstanceName = publishToQCAction.isVariableInTCRunUsed;
                     operationConfigPublishToALM.UserVariableInRunInstance = publishToQCAction.VariableForTCRunName;
-                    operationConfigPublishToALM.ExportReportLink = publishToQCAction.toExportReportLink;
+                    operationConfigPublishToALM.ExportReportLink = publishToQCAction.ToExportReportLink;
 
                     if (publishToQCAction.AlmFields != null && publishToQCAction.AlmFields.Count > 0)
                     {