Merge branch 'Releases/Official-Release' into Upgrade-Appium-Solution

Ginger-Automation · Sep 23, 2024 · 137b93c · 137b93c
2 parents fcd6097 + db948a1
commit 137b93c
Show file tree

Hide file tree

Showing 25 changed files with 511 additions and 93 deletions.
diff --git a/Ginger/Ginger/Activities/ActivitiesListViewHelper.cs b/Ginger/Ginger/Activities/ActivitiesListViewHelper.cs
@@ -376,6 +376,18 @@ public List<ListItemNotification> GetItemNotificationsList(object item)
 
                 notificationsList.Add(sharedRepoInd);
             }
+            if (mActivity.AIGenerated)
+            {
+                ListItemNotification aIGeneratedInd = new ListItemNotification();
+                aIGeneratedInd.AutomationID = "aIGeneratedInd";
+                aIGeneratedInd.ImageType = Amdocs.Ginger.Common.Enums.eImageType.AIActivity;
+                aIGeneratedInd.ToolTip = string.Format("{0} is AI Generated", GingerDicser.GetTermResValue(eTermResKey.Activity));
+                aIGeneratedInd.ImageSize = 16;
+                aIGeneratedInd.BindingObject = mActivity;
+                aIGeneratedInd.BindingFieldName = nameof(RepositoryItemBase.AIGenerated);
+                aIGeneratedInd.BindingConverter = new BoolVisibilityConverter();
+                notificationsList.Add(aIGeneratedInd);
+            }
             return notificationsList;
         }
 

diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs
@@ -4,7 +4,6 @@
 using GingerCore.Environments;
 using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
 using GingerWPF.WizardLib;
-using OpenQA.Selenium;
 
 namespace Ginger.Environments.GingerAnalyticsEnvWizardLib
 {
@@ -37,7 +36,7 @@ public override void Finish()
             foreach(var appPlatform in tempAppPlat)
             {
                 WorkSpace.Instance.Solution.ApplicationPlatforms.Add(appPlatform);
-            }
+            }            
 
             foreach (ProjEnvironment item in ImportedEnvs)
             {

diff --git a/Ginger/Ginger/Ginger.csproj b/Ginger/Ginger/Ginger.csproj
@@ -589,6 +589,7 @@
     <None Remove="RunSetLib\CreateAutoRunWizardLib\AutoRunIntroduction.md" />
     <None Remove="StaticDrivers\selenium-server-standalone.jar" />
     <None Remove="TestLib\WizardLib\Intro.md" />
+    <None Remove="UserControlsLib\ImageMakerLib\Images\AIBrain.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\android.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\androidOutline.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\androidWhite.png" />
@@ -626,6 +627,7 @@
     <None Remove="UserControlsLib\ImageMakerLib\Images\SealightsLogo.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\send.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\sendArrow.png" />
+    <None Remove="UserControlsLib\ImageMakerLib\Images\smart.svg" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\VRTLogo.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\xml.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\xml.svg" />
@@ -2436,7 +2438,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     <Resource Include="TestLib\WizardLib\Intro.md" />
-    <Resource Include="UserControlsLib\ImageMakerLib\Images\android.png">
+    <Resource Include="UserControlsLib\ImageMakerLib\Images\AIBrain.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+     <Resource Include="UserControlsLib\ImageMakerLib\Images\android.png">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Resource>
     <Resource Include="UserControlsLib\ImageMakerLib\Images\androidOutline.png">
@@ -2521,7 +2526,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     <Resource Include="UserControlsLib\ImageMakerLib\Images\VRTLogo.png">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
     <Resource Include="UserControlsLib\ImageMakerLib\Images\xml.png">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>

diff --git a/Ginger/Ginger/SourceControl/SourceControlProjectsPage.xaml.cs b/Ginger/Ginger/SourceControl/SourceControlProjectsPage.xaml.cs
@@ -351,7 +351,7 @@ public static void SourceControlInit()
             }
             else if (WorkSpace.Instance.UserProfile.SourceControlType == SourceControlBase.eSourceControlType.None)
             {
-                mSourceControl = new SVNSourceControl();
+                mSourceControl = new GITSourceControl();
             }
 
             if (mSourceControl != null)

diff --git a/Ginger/Ginger/UserControlsLib/ImageMakerLib/ImageMakerControl.xaml.cs b/Ginger/Ginger/UserControlsLib/ImageMakerLib/ImageMakerControl.xaml.cs
@@ -235,6 +235,9 @@ private void SetImage()
                 case eImageType.Activity:
                     SetAsFontAwesomeIcon(EFontAwesomeIcon.Solid_Bars);
                     break;
+                case eImageType.AIActivity:
+                    SetAsStaticImage("AIBrain.png");                    
+                    break;
                 case eImageType.Action:
                     SetAsFontAwesomeIcon(EFontAwesomeIcon.Solid_Bolt);
                     break;

diff --git a/Ginger/Ginger/UserControlsLib/ImageMakerLib/Images/AIBrain.png b/Ginger/Ginger/UserControlsLib/ImageMakerLib/Images/AIBrain.png
diff --git a/Ginger/Ginger/UserControlsLib/ucGridView/ucGrid.xaml.cs b/Ginger/Ginger/UserControlsLib/ucGridView/ucGrid.xaml.cs
@@ -1227,7 +1227,14 @@ public RadioButton AddRadioButton(string content, string groupName, RoutedEventH
         #region ##### Internal Methods
         private void ObjListPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            GingerCore.General.DoEvents();
+            try
+            {
+                GingerCore.General.DoEvents();
+            }
+            catch(Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.DEBUG, "Error on object list change", ex);
+            }
             if (e.PropertyName == "CurrentItem")
             {
                 this.Dispatcher.Invoke(() =>

diff --git a/Ginger/Ginger/ValueExpression/ValueExpressionEditorPage.xaml b/Ginger/Ginger/ValueExpression/ValueExpressionEditorPage.xaml
@@ -48,6 +48,7 @@
             <StackPanel Grid.Column="1" Grid.Row="0"  Background="{StaticResource $BackgroundColor_White}" Margin="0,27,0,0">
                 <UserControls:ucButton x:Name="xClearButton" ButtonType="ImageButton" HorizontalAlignment="Center" VerticalAlignment="Center" ButtonFontImageSize="16" ButtonImageType="Delete" Click="xClearButton_Click" ToolTip="Clear Expression" Margin="-1,-5,0,0"/>
                 <UserControls:ucButton x:Name="xTestButton" ButtonType="ImageButton" HorizontalAlignment="Center" VerticalAlignment="Center" ButtonFontImageSize="16" ButtonImageType="Run" Click="xTestButton_Click" ToolTip="Calculate Expression" Margin="0,-5,0,0"/>
+                <UserControls:ucButton x:Name="xCopyButton" ButtonType="ImageButton" HorizontalAlignment="Center" VerticalAlignment="Center" ButtonFontImageSize="16" ButtonImageType="Copy" Click="xCopyExpressionButton_Click" ToolTip="Copy Expression" Margin="0,-5,0,0"/>
             </StackPanel>
 
             <!--<GridSplitter ResizeDirection="Rows" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" Height="1" Background="Transparent"  VerticalAlignment="Top" HorizontalAlignment="Stretch" IsEnabled="True" Margin="0,0,0,0"/>-->
@@ -59,9 +60,10 @@
                 </DockPanel>
             </Border>
 
-            <DockPanel Grid.Column="1" Grid.Row="1"  Margin="0,0,0,0">
-                <UserControls:ucButton x:Name="xClearCalculatedButton" ButtonType="ImageButton" HorizontalAlignment="Center" VerticalAlignment="Top" ButtonFontImageSize="16" ButtonImageType="Delete" Click="xClearCalculatedButton_Click" ToolTip="Clear Calculation" DockPanel.Dock="Top"  Margin="0,20,0,0"/>
-            </DockPanel>
+            <StackPanel Grid.Column="1" Grid.Row="1"  Background="{StaticResource $BackgroundColor_White}" Margin="0,30,0,0">
+                <UserControls:ucButton x:Name="xClearCalculatedButton" ButtonType="ImageButton" HorizontalAlignment="Center" VerticalAlignment="Center" ButtonFontImageSize="16" ButtonImageType="Delete" Click="xClearCalculatedButton_Click" ToolTip="Clear Calculation" Margin="0,0,0,0"/>
+                <UserControls:ucButton x:Name="xCopyCalculatedButton" ButtonType="ImageButton" HorizontalAlignment="Center" VerticalAlignment="Center" ButtonFontImageSize="16" ButtonImageType="Copy" Click="xCopyCalculatedButton_Click" ToolTip="Copy Calculation" Margin="0,-5,0,0"/>
+            </StackPanel>
         </Grid>
     </Grid>
 </Page>
diff --git a/Ginger/Ginger/ValueExpression/ValueExpressionEditorPage.xaml.cs b/Ginger/Ginger/ValueExpression/ValueExpressionEditorPage.xaml.cs
@@ -978,6 +978,7 @@ private void xTestButton_Click(object sender, RoutedEventArgs e)
             mVE.Value = this.xExpressionUCTextEditor.textEditor.Text;
             xCalculatedTextBox.Text = mVE.ValueCalculated;
         }
+
         /// <summary>
         /// Finds the selected environment from the total list of environments
         /// </summary>
@@ -987,7 +988,6 @@ private void xTestButton_Click(object sender, RoutedEventArgs e)
             return mEnvs.FirstOrDefault((mEnv) => mEnv.Guid == WorkSpace.Instance.UserProfile.RecentEnvironment);
         }
 
-
         private void OKButton_Click(object sender, RoutedEventArgs e)
         {
             string value = xExpressionUCTextEditor.textEditor.Text;
@@ -1176,5 +1176,31 @@ private void XObjectsTreeView_LostFocus(object sender, RoutedEventArgs e)
 
             //}
         }
+
+        /// <summary>
+        /// Copies the text from the calculated text box to the clipboard.
+        /// </summary>
+        /// <param name="sender">The button that triggered the event.</param>
+        /// <param name="e">The event arguments.</param>
+        private void xCopyCalculatedButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(xCalculatedTextBox.Text))
+            {
+                GingerCore.General.SetClipboardText(xCalculatedTextBox.Text);
+            }
+        }
+
+        /// <summary>
+        /// Copies the text from the expression text editor to the clipboard.
+        /// </summary>
+        /// <param name="sender">The button that triggered the event.</param>
+        /// <param name="e">The event arguments.</param>
+        private void xCopyExpressionButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(xExpressionUCTextEditor.textEditor.Text))
+            {
+                GingerCore.General.SetClipboardText(xExpressionUCTextEditor.textEditor.Text);
+            }
+        }
     }
 }
diff --git a/Ginger/GingerCoreCommon/EnumsLib/eImageType.cs b/Ginger/GingerCoreCommon/EnumsLib/eImageType.cs
@@ -58,6 +58,7 @@ public enum eImageType
         BusinessFlow,
         ActivitiesGroup,
         Activity,
+        AIActivity,
         Action,
         Agent,
         RunSet,

diff --git a/Ginger/GingerCoreCommon/GeneralLib/General.cs b/Ginger/GingerCoreCommon/GeneralLib/General.cs
@@ -1,4 +1,4 @@
-#region License
+#region License
 /*
 Copyright © 2014-2024 European Support Limited
 
@@ -504,6 +504,13 @@ public static Dictionary<string, object> DeserializeJson(string json)
                 return dictionary;
             }
         }
-
+
+        /// <summary>
+        /// Represents a minimal record of a variable, including its name, initial value, and current value.
+        /// </summary>
+        /// <param name="Name">The name of the variable.</param>
+        /// <param name="InitialValue">The initial value of the variable.</param>
+        /// <param name="CurrentValue">The current value of the variable.</param>
+        public record VariableMinimalRecord(string Name, string InitialValue, string CurrentValue);
     }
 }
diff --git a/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/Activity.cs b/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/Activity.cs
@@ -32,10 +32,9 @@ limitations under the License.
 using GingerCore.Actions;
 using GingerCore.Activities;
 using GingerCore.FlowControlLib;
-using GingerCore.Platforms;
 using GingerCore.Variables;
 using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
-
+using Microsoft.CodeAnalysis;
 
 //TODO: change add core
 namespace GingerCore
@@ -950,9 +949,9 @@ public static Activity CopySharedRepositoryActivity(Activity srActivity, bool or
             return copy;
         }
 
-        public override void UpdateInstance(RepositoryItemBase instance, string partToUpdate, RepositoryItemBase hostItem = null, object extradetails=null)
+        public override void UpdateInstance(RepositoryItemBase instance, string partToUpdate, RepositoryItemBase hostItem = null, object extradetails = null)
         {
-            
+
             Activity activityInstance = (Activity)instance;
             //Create new instance of source
             Activity newInstance = null;
@@ -966,7 +965,7 @@ public override void UpdateInstance(RepositoryItemBase instance, string partToUp
                 newInstance.Type = activityInstance.Type;
                 newInstance.Active = activityInstance.Active;
 
-                if(newInstance.Guid == this.Guid)
+                if (newInstance.Guid == this.Guid)
                 {
                     newInstance.DevelopmentTime = newInstance.DevelopmentTime.Add(this.DevelopmentTime);
                 }
@@ -986,12 +985,12 @@ public override void UpdateInstance(RepositoryItemBase instance, string partToUp
             else
             {
                 newInstance = CopySharedRepositoryActivity(this, originFromSharedRepository: false);
-                
+
                 if (this.Guid == activityInstance.Guid)
                 {
                     newInstance.DevelopmentTime = this.DevelopmentTime;
                 }
-                else 
+                else
                 {
                     newInstance.DevelopmentTime = activityInstance.DevelopmentTime;
                 }
@@ -1201,6 +1200,7 @@ public override bool IsTempItem
                     return false;
             }
         }
+
 
         public override bool IsLinkedItem
         {
@@ -1217,7 +1217,7 @@ public override eImageType ItemImageType
         {
             get
             {
-                return eImageType.Activity;
+                return AIGenerated ? eImageType.AIActivity : eImageType.Activity;
             }
         }
 
@@ -1268,5 +1268,22 @@ public override void PostSaveHandler()
         }
 
         public bool IsAutoLearned { get; set; }
+
+        /// <summary>
+        /// Gets the summary of variables in the activity.
+        /// </summary>
+        public List<General.VariableMinimalRecord> VariablesSummary
+        {
+            get
+            {
+                List<General.VariableMinimalRecord> variableDetails = [];
+                foreach (VariableBase variable in Variables)
+                {
+                    variableDetails.Add(new General.VariableMinimalRecord(variable.Name, variable.GetInitialValue(), variable.Value));
+                }
+                return variableDetails;
+            }
+        }
+
     }
 }
diff --git a/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/BusinessFlow.cs b/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/BusinessFlow.cs
@@ -2020,5 +2020,21 @@ public void CalculateExternalId(IValueExpression ve)
         public string ALMTestSetLevel { get; set; }
 
         public bool IsEntitySearchByName { get; set; }
+
+        /// <summary>
+        /// Gets the summary of variables in the Business flow.
+        /// </summary>
+        public List<General.VariableMinimalRecord> VariablesSummary
+        {
+            get
+            {
+                List<General.VariableMinimalRecord> variableDetails = [];
+                foreach (VariableBase variable in Variables)
+                {
+                    variableDetails.Add(new General.VariableMinimalRecord(variable.Name, variable.GetInitialValue(), variable.Value));
+                }
+                return variableDetails;
+            }
+        }
     }
 }
diff --git a/Ginger/GingerCoreCommon/VariablesLib/VariableBase.cs b/Ginger/GingerCoreCommon/VariablesLib/VariableBase.cs
@@ -701,5 +701,9 @@ public static ObservableList<VariableBase> SortByMandatoryInput(ObservableList<V
             }
             return variables;
         }
+
+        public virtual string GetInitialValue() { 
+            return string.Empty;
+        }
     }
 }
diff --git a/Ginger/GingerCoreCommon/VariablesLib/VariableDateTime.cs b/Ginger/GingerCoreCommon/VariablesLib/VariableDateTime.cs
@@ -252,5 +252,10 @@ public override void SetInitialValue(string InitialValue)
         {
             this.InitialDateTime = InitialValue;
         }
+
+        public override string GetInitialValue()
+        {
+            return InitialDateTime;
+        }
     }
 }
diff --git a/Ginger/GingerCoreCommon/VariablesLib/VariableList.cs b/Ginger/GingerCoreCommon/VariablesLib/VariableList.cs
@@ -148,5 +148,6 @@ public override void SetInitialValue(string InitialValue)
         {
             this.ValueList = InitialValue;
         }
+
     }
 }
diff --git a/Ginger/GingerCoreCommon/VariablesLib/VariableNumber.cs b/Ginger/GingerCoreCommon/VariablesLib/VariableNumber.cs
@@ -336,8 +336,12 @@ public bool CheckNumberInRange(float number)
 
         public override void SetInitialValue(string InitialValue)
         {
-
             this.InitialNumberValue = InitialValue;
         }
+
+        public override string GetInitialValue()
+        {
+            return InitialNumberValue;
+        }
     }
 }
diff --git a/Ginger/GingerCoreCommon/VariablesLib/VariableString.cs b/Ginger/GingerCoreCommon/VariablesLib/VariableString.cs
@@ -102,5 +102,10 @@ public override void SetInitialValue(string InitialValue)
         public override bool SupportResetValue { get { return true; } }
 
         public override bool SupportAutoValue { get { return false; } }
+
+        public override string GetInitialValue()
+        {
+            return InitialStringValue;
+        }
     }
 }
diff --git a/Ginger/GingerCoreNET/ActionsLib/ActCliOrchestration.cs b/Ginger/GingerCoreNET/ActionsLib/ActCliOrchestration.cs
@@ -122,20 +122,20 @@ private async Task ExecuteCliProcess()
             string actualApplicationPath = WorkSpace.Instance.Solution.SolutionOperations.ConvertSolutionRelativePath(this.FilePath);
             if ((Path.GetExtension(actualApplicationPath)).Equals(".vbs", StringComparison.InvariantCultureIgnoreCase) || (Path.GetExtension(actualApplicationPath)).Equals(".js",StringComparison.InvariantCultureIgnoreCase))
             {
-                arguments.Append(actualApplicationPath).Append(" ");
+                arguments.Append(actualApplicationPath).Append(' ');
                 actualApplicationPath = GetSystemDirectory() + $"{Path.DirectorySeparatorChar}cscript.exe";
             }
             else if((Path.GetExtension(actualApplicationPath)).Equals(".sh", StringComparison.InvariantCultureIgnoreCase))
             {
-                arguments.Append(actualApplicationPath).Append(" ");
+                arguments.Append(actualApplicationPath).Append(' ');
                 actualApplicationPath = $"{Path.DirectorySeparatorChar}bin{Path.DirectorySeparatorChar}bash";
             }
             foreach (var p in this.InputValues)
             {
-                arguments.Append(p.Param).Append(" ");
+                arguments.Append(p.Param).Append(' ');
                 if (!string.IsNullOrEmpty(p.ValueForDriver))
                 {
-                    arguments.Append(p.ValueForDriver).Append(" ");
+                    arguments.Append(p.ValueForDriver).Append(' ');
                 }
             }