Merge pull request #4503 from Ginger-Automation/Merge-Master-to-Official-Release

Merge master to official release

Author: rathimayur

.github/workflows/Test.yml

@@ -126,9 +126,9 @@ jobs:
 # ------------------------------------------------------------------------------------------------------
 # Run .Net Framework tests using powershell and publish the results
 # ------------------------------------------------------------------------------------------------------
-        -   name: Run tests for Ginger .NetFramework *Test Dlls for Windows
-            if: (success() || failure()) && (runner.os == 'Windows')        # run this step even if previous step failed and if the OS is Windows
-            run: powershell -file "TestDotNetFrameworkGithub.ps1"
+        # -   name: Run tests for Ginger .NetFramework *Test Dlls for Windows
+            # if: (success() || failure()) && (runner.os == 'Windows')        # run this step even if previous step failed and if the OS is Windows
+            # run: powershell -file "TestDotNetFrameworkGithub.ps1"
 
 # ------------------------------------------------------------------------------------------------------
 # Run Standalone CLI Test

Ginger/Ginger/Actions/ActionEditPages/ActTableEditPage.xaml

@@ -18,17 +18,20 @@
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="80"/>
             <ColumnDefinition Width="130"/>
-            <ColumnDefinition Width="130"/>
+            <ColumnDefinition Width="330"/>
             <ColumnDefinition Width="460"/>
         </Grid.ColumnDefinitions>
         <StackPanel Grid.Row="0" Grid.Column="0" Margin="0,10,0,17">
             <Label HorizontalAlignment="Left" Style="{StaticResource @LabelStyle}" VerticalAlignment="Center">Column:</Label>
         </StackPanel>
         <StackPanel Grid.Row="0" Grid.Column="1" Margin="0,10,0,17">            
-            <ComboBox x:Name="cmbColSelectorValue" Height="25"  SelectionChanged="ColSelectorValue_SelectionChanged" Style="{StaticResource $FlatInputComboBoxStyle}"/>
+            <ComboBox x:Name="cmbColSelectorValue" Height="25" SelectionChanged="ColSelectorValue_SelectionChanged" Style="{StaticResource $FlatInputComboBoxStyle}"/>
         </StackPanel>
-        <StackPanel Grid.Row="0" Grid.Column="2" Margin="0,10,0,17" >
-            <ComboBox x:Name="cmbColumnValue" Grid.Column="1" Height="25" IsEditable="True" Margin="10,0,0,0" Style="{StaticResource $FlatInputComboBoxStyle}" SelectionChanged="ColumnValue_SelectionChanged" LostKeyboardFocus="ColumnValue_LostKeyboardFocus"/>
+        <StackPanel Grid.Row="0" Grid.Column="2" Margin="0,10,15,17">
+            <DockPanel >
+                <Button x:Name="ColumnValueVE" DockPanel.Dock="Right" Content="..." Click="ColumnValueVE_Click" VerticalAlignment="Center" Style="{StaticResource @InputButtonStyle}" Margin="1,0,0,0" Width="30" Height="24"/>
+                <ComboBox x:Name="cmbColumnValue" Height="25" IsEditable="True" Margin="10,0,0,0" Style="{StaticResource $FlatInputComboBoxStyle}" SelectionChanged="ColumnValue_SelectionChanged" LostKeyboardFocus="ColumnValue_LostKeyboardFocus"/>
+            </DockPanel>
         </StackPanel>
         <StackPanel Grid.Row="1" Grid.Column="0">
             <Label HorizontalAlignment="Left" Style="{StaticResource @LabelStyle}" VerticalAlignment="Top">Row:</Label>
@@ -39,12 +42,11 @@
             <RadioButton Name="BySelectedRow" Content="Selected Row" Checked="BySelectedRow_Checked" Margin="0,5,0,5"/>
             <RadioButton Name="Where" Content="Where..." Checked="Where_Checked" Unchecked="Where_Unchecked" Margin="0,5,0,5"/>
         </StackPanel>
-        <StackPanel Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Orientation="Horizontal" VerticalAlignment="Top">
+        <StackPanel Grid.Row="1" Grid.Column="2" >
             <DockPanel>
-                <ComboBox x:Name="RowSelectorValue" Width="250" Margin="10,0,0,0" IsEditable="True" IsEnabled="True" Style="{StaticResource $FlatInputComboBoxStyle}"  SelectionChanged="RowSelectorValue_SelectionChanged" LostKeyboardFocus="RowSelectorValue_LostKeyboardFocus"/>
-                <Button x:Name="RowSelectorValueVE" Content="..." Click="RowSelectorValueVE_Click" HorizontalAlignment="Left" DockPanel.Dock="Left" VerticalAlignment="Center" Style="{StaticResource @InputButtonStyle}" Margin="1,0,5,0" Width="30" Height="24"></Button>
+                <Button x:Name="RowSelectorValueVE" DockPanel.Dock="Right" Content="..." Click="RowSelectorValueVE_Click" VerticalAlignment="Center" Style="{StaticResource @InputButtonStyle}" Margin="1,0,0,0" Width="30" Height="24"/>
+                <ComboBox x:Name="RowSelectorValue" Margin="10,0,0,0" IsEditable="True" IsEnabled="True" Style="{StaticResource $FlatInputComboBoxStyle}" SelectionChanged="RowSelectorValue_SelectionChanged" LostKeyboardFocus="RowSelectorValue_LostKeyboardFocus"/>
             </DockPanel>
-            
         </StackPanel>
         <StackPanel Grid.Row="2" Grid.Column="1" x:Name="WherePanel" Visibility="Collapsed" Grid.RowSpan="1" Grid.ColumnSpan="3">
             <Grid Margin="0,5,0,0">
@@ -57,30 +59,32 @@
                     <ColumnDefinition Width="130"/>
                     <ColumnDefinition Width="200"/>
                 </Grid.ColumnDefinitions>
-                <ComboBox x:Name="WhereColumn"  Grid.Row="0" Grid.Column="0" Style="{StaticResource $FlatInputComboBoxStyle}" Height="25" SelectionChanged="WhereColumn_SelectionChanged" Margin="10,5,0,0" />
-                <ComboBox x:Name="WhereColumnTitle" Grid.Row="0" Grid.Column="1" Style="{StaticResource $FlatInputComboBoxStyle}" IsEditable="True" Height="25" Margin="10,5,0,0"   VerticalAlignment="Top" LostKeyboardFocus="WhereColumnTitle_LostKeyboardFocus" SelectionChanged="WhereColumnTitle_SelectionChanged"/>
-                <ComboBox x:Name="WhereProperty" Grid.Row="1" Grid.Column="0" Style="{StaticResource $FlatInputComboBoxStyle}" Height="25" Margin="10,5,0,0" SelectionChanged="WhereProperty_SelectionChanged"/>
-                <ComboBox x:Name="WhereOperator" Grid.Row="1" Grid.Column="1" Style="{StaticResource $FlatInputComboBoxStyle}" Height="25" Margin="10,5,0,0" SelectionChanged="WhereOperator_SelectionChanged"/>
-                
-                <Actions:UCValueExpression x:Name="WhereColumnValue" Grid.Row="1" Grid.Column="2" Height="25"  Margin="10,5,0,0" LostFocus="WhereColumnValue_LostFocus" ToolTip="Enter the Value to be search by given Condition"/>
+                <ComboBox x:Name="WhereColumn" Grid.Row="0" Grid.Column="0" Style="{StaticResource $FlatInputComboBoxStyle}" Height="25" SelectionChanged="WhereColumn_SelectionChanged" Margin="12,5,0,0"/>
+                <DockPanel Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Margin="12,5,0,0">
+                    <Button x:Name="WhereColumnTitleVE" DockPanel.Dock="Right" Content="..." Click="WhereColumnTitleVE_Click" VerticalAlignment="Center" Style="{StaticResource @InputButtonStyle}" Margin="1,0,0,0" Width="30" Height="24"/>
+                    <ComboBox x:Name="WhereColumnTitle" Style="{StaticResource $FlatInputComboBoxStyle}" IsEditable="True" Height="25" VerticalAlignment="Top" LostKeyboardFocus="WhereColumnTitle_LostKeyboardFocus" SelectionChanged="WhereColumnTitle_SelectionChanged"/>
+                </DockPanel>
+                <ComboBox x:Name="WhereProperty" Grid.Row="1" Grid.Column="0" Style="{StaticResource $FlatInputComboBoxStyle}" Height="25" Margin="12,0,0,0" SelectionChanged="WhereProperty_SelectionChanged"/>
+                <ComboBox x:Name="WhereOperator" Grid.Row="1" Grid.Column="1" Style="{StaticResource $FlatInputComboBoxStyle}" Height="25" Margin="12,0,0,0" SelectionChanged="WhereOperator_SelectionChanged"/>
+                <Actions:UCValueExpression x:Name="WhereColumnValue" Grid.Row="1" Grid.Column="2" Height="25" Margin="12,12,12,12" LostFocus="WhereColumnValue_LostFocus" ToolTip="Enter the Value to be search by given Condition"/>
             </Grid>
         </StackPanel>
-        <Label  Grid.Row="3" Grid.Column="0" Content="Description:" Style="{StaticResource @LabelStyle}"  HorizontalAlignment="Stretch" Margin="0,10,0,0"/>
+        <Label Grid.Row="3" Grid.Column="0" Content="Description:" Style="{StaticResource @LabelStyle}" HorizontalAlignment="Stretch" Margin="0,10,0,0"/>
         <StackPanel Grid.Row="3" Grid.Column="1" x:Name="DescriptionPanel" Visibility="Visible" Margin="0,10,0,0" Grid.RowSpan="1" Grid.ColumnSpan="3">
             <Grid Margin="0,0,0,0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="70"/>
                 </Grid.RowDefinitions>
-                <DockPanel x:Name="Description" Background="{StaticResource $BackgroundColor_White}" Grid.Row="1" >                    
+                <DockPanel x:Name="Description" Background="{StaticResource $BackgroundColor_White}" Grid.Row="1">
                     <ScrollViewer Background="White">
-                        <TextBlock x:Name="txtDescription" TextWrapping="Wrap" Style="{StaticResource @TextBlockStyle}" DockPanel.Dock="Top" Background="#FFEFEFF2"></TextBlock>
+                        <TextBlock x:Name="txtDescription" TextWrapping="Wrap" Style="{StaticResource @TextBlockStyle}" DockPanel.Dock="Top" Background="#FFEFEFF2"/>
                     </ScrollViewer>
                 </DockPanel>
             </Grid>
         </StackPanel>
         <StackPanel x:Name="ControlActionPanle" Grid.Row="4" Grid.ColumnSpan="3">
             <Label HorizontalAlignment="Left" Style="{StaticResource @LabelStyle}">Selected Operation:</Label>
-            <ComboBox x:Name="ControlActionComboBox" Style="{StaticResource $FlatInputComboBoxStyle}"></ComboBox>
+            <ComboBox x:Name="ControlActionComboBox" Style="{StaticResource $FlatInputComboBoxStyle}"/>
         </StackPanel>
     </Grid>
 </Page>

Ginger/Ginger/Actions/ActionEditPages/ActTableEditPage.xaml.cs

@@ -793,5 +793,29 @@ private void RowSelectorValueVE_Click(object sender, RoutedEventArgs e)
             w.ShowAsWindow(eWindowShowStyle.Dialog);
             RowSelectorValue.Text = mAct.LocateRowValue;
         }
+
+        private void ColumnValueVE_Click(object sender, RoutedEventArgs e)
+        {
+            ValueExpressionEditorPage w = new ValueExpressionEditorPage(mAct, ActTableElement.Fields.LocateColTitle, Context.GetAsContext(mAct.Context));
+            w.ShowAsWindow(eWindowShowStyle.Dialog);
+            cmbColumnValue.Text = mAct.LocateColTitle;
+            SetDescriptionDetails();
+            if (eBaseWindow.Equals(BaseWindow.WindowExplorer))
+            {
+                UpdateRelatedActions();
+            }
+        }
+
+        private void WhereColumnTitleVE_Click(object sender, RoutedEventArgs e)
+        {
+            ValueExpressionEditorPage w = new ValueExpressionEditorPage(mAct, ActTableElement.Fields.WhereColumnTitle, Context.GetAsContext(mAct.Context));
+            w.ShowAsWindow(eWindowShowStyle.Dialog);
+            WhereColumnTitle.Text = mAct.WhereColumnTitle;
+            SetDescriptionDetails();
+            if (eBaseWindow.Equals(BaseWindow.WindowExplorer))
+            {
+                UpdateRelatedActions();
+            }
+        }
     }
 }

Ginger/Ginger/Drivers/DriversConfigsEditPages/UFTCredentialsDialog.xaml

@@ -270,7 +270,7 @@
                                 <StackPanel Orientation="Vertical" Margin="0,0,12,0">
                                     <Label Content="OS Type" Style="{StaticResource $LabelStyle}" />
                                     <ComboBox x:Name="xAppOsTypeCombo" Width="160" SelectionChanged="AppFilters_SelectionChanged" Style="{StaticResource $FlatInputComboBoxStyle}" />
-                        </StackPanel>
+                                </StackPanel>
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom">
                                     <UserControls:ucButton x:Name="xRefreshAppsBtn"
                                                            ButtonType="RoundTextAndImageButton"
@@ -415,9 +415,9 @@
                                                 </ListBox.ItemTemplate>
                                             </ListBox>
                                         </StackPanel>
-                </Border>
-            </StackPanel>
-        </ScrollViewer>
+                                    </Border>
+                                </StackPanel>
+                            </ScrollViewer>
 
                         </StackPanel>
                     </TabItem>

Ginger/Ginger/Ginger.csproj

@@ -749,7 +749,7 @@
     <PackageReference Include="LiteDB" Version="5.0.21" />
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.8" />
     <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.13.0" />
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.13.1" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="10.3.0" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.15.0" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.15.0" />

Ginger/GingerCoreCommon/GingerCoreCommon.csproj

@@ -11,15 +11,15 @@
     <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>Amdocs.Ginger.Common</RootNamespace>
 
-    <AssemblyVersion>26.5.0.0</AssemblyVersion>
-    <FileVersion>26.5.0.0</FileVersion>
+    <AssemblyVersion>26.6.0.0</AssemblyVersion>
+    <FileVersion>26.6.0.0</FileVersion>
 
     <PackageId>Ginger.Core.Common</PackageId>
     <Authors>Amdocs</Authors>
     <Company>Amdocs</Company>
     <Product>Ginger by Amdocs</Product>
     <Copyright>Copyright © 2014-2026 European Support Limited</Copyright>
-    <Version>2026.5.0.0</Version>
+    <Version>2026.6.0.0</Version>
     <Title>Ginger Core Common</Title>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
   </PropertyGroup>

Ginger/GingerCoreNET/Database/DatabaseOperations.cs

@@ -417,25 +417,35 @@ public Boolean Connect(bool displayErrorPopup = false)
                         break;
 
                     case eDBTypes.PostgreSQL:
-                        string postgreSQLHost = TNSCalculated;
-                        int? port = null;
-                        if (TNSCalculated.Contains(':', StringComparison.Ordinal))
+                        var pg = new NpgsqlConnectionStringBuilder();
+                        if (string.IsNullOrEmpty(ConnectionStringCalculated))
                         {
-                            var parts = TNSCalculated.Split(':', 2);
-                            postgreSQLHost = parts[0];
-                            if (int.TryParse(parts[1], out int p)) port = p;
-                        }
-                        ValidateHostPort(postgreSQLHost, port);
+                            string postgreSQLHost = TNSCalculated;
+                            int? port = null;
+                            if (TNSCalculated.Contains(':', StringComparison.Ordinal))
+                            {
+                                var parts = TNSCalculated.Split(':', 2);
+                                postgreSQLHost = parts[0];
+                                if (int.TryParse(parts[1], out int p)) port = p;
+                            }
+                            ValidateHostPort(postgreSQLHost, port);
 
-                        var pg = new NpgsqlConnectionStringBuilder
+                            pg = new NpgsqlConnectionStringBuilder
+                            {
+                                Host = postgreSQLHost,
+                                Database = Database.Name ?? string.Empty,
+                                Username = UserCalculated,
+                                Password = EncryptionHandler.DecryptwithKey(PassCalculated)
+                            };
+                            if (port.HasValue) pg.Port = port.Value;
+                        }
+                        else
                         {
-                            Host = postgreSQLHost,
-                            Database = Database.Name ?? string.Empty,
-                            Username = UserCalculated,
-                            Password = EncryptionHandler.DecryptwithKey(PassCalculated)
-                        };
-                        if (port.HasValue) pg.Port = port.Value;
-                        Database.ConnectionString = pg.ConnectionString;
+                            pg = new NpgsqlConnectionStringBuilder
+                            {
+                                ConnectionString = GetConnectionString()
+                            };
+                        }
 
                         oConn = new NpgsqlConnection(pg.ConnectionString);
                         oConn.Open();
@@ -1045,4 +1055,4 @@ public string GetRecordCount(string SQL)
         }
 
     }
-}
+}

Ginger/GingerCoreNET/GingerCoreNET.csproj

@@ -293,7 +293,7 @@
 
     <PackageReference Include="log4net" Version="2.0.15" />
 
-    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.13.0" />
+    <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.13.1" />
 
     <PackageReference Include="MailKit" Version="4.14.1" />
 

Ginger/GingerCoreNET/Run/GingerExecutionEngine.cs

@@ -4515,6 +4515,7 @@ public void RunBusinessFlow(BusinessFlow businessFlow, bool standaloneExecution
 
                 if (standaloneExecution)
                 {
+                    WorkSpace.Instance.PlugInsManager.CloseAllRunningPluginProcesses();
                     IsRunning = false;
                     Status = RunsetStatus;
                 }

Ginger/GingerCoreNET/Run/RunsetExecutor.cs

@@ -730,6 +730,7 @@ public async Task RunRunset(bool doContinueRun = false)
                 Reporter.ToLog(eLogLevel.INFO, string.Format("######## Doing {0} Execution Cleanup", GingerDicser.GetTermResValue(eTermResKey.RunSet)));
                 //CloseAllAgents();
                 CloseAllEnvironments();
+                WorkSpace.Instance.PlugInsManager.CloseAllRunningPluginProcesses();
                 Reporter.ToLog(eLogLevel.INFO, string.Format("########################## {0} Execution Ended", GingerDicser.GetTermResValue(eTermResKey.RunSet)));
             }
             catch (Exception ex)