From 6e5b4818277aca02d058d1a10ca2bf85a742546b Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Fri, 23 Aug 2024 07:43:18 +0530
Subject: [PATCH 1/9] Ginger Analytics Config Page Changes

---
 .../GingerAnalyticsConfigurationPage.xaml     |  67 +++++++
 .../GingerAnalyticsConfigurationPage.xaml.cs  | 187 ++++++++++++++++++
 Ginger/Ginger/Ginger.csproj                   |   5 +
 Ginger/Ginger/MenusLib/ConfigurationsMenu.cs  |  16 +-
 .../ImageMakerLib/Images/GingerAnalytics.png  | Bin 0 -> 1122 bytes
 .../UserControlsLib/UCTreeView/TreeView1.xaml |   4 +-
 .../UCTreeView/TreeView1.xaml.cs              |  10 +-
 .../GingerCoreCommon/EnumsLib/eImageType.cs   |   1 +
 .../GingerAnalyticsConfiguration.cs           | 110 +++++++++++
 .../ReporterLib/UserMsgsPool.cs               |   5 +
 .../GingerCoreCommon/WorkSpaceLib/Solution.cs |   3 +
 11 files changed, 396 insertions(+), 12 deletions(-)
 create mode 100644 Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
 create mode 100644 Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
 create mode 100644 Ginger/Ginger/UserControlsLib/ImageMakerLib/Images/GingerAnalytics.png
 create mode 100644 Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs

diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
new file mode 100644
index 0000000000..0fae9ea3fa
--- /dev/null
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
@@ -0,0 +1,67 @@
+<UserControlsLib:GingerUIPage   x:Class="Ginger.ExternalConfigurations.GingerAnalyticsConfigurationPage"
+      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" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Ginger.ExternalConfigurations"
+      xmlns:usercontrols="clr-namespace:Amdocs.Ginger.UserControls"
+      xmlns:UserControlsLib="clr-namespace:Ginger.UserControlsLib"
+      xmlns:Activities="clr-namespace:Ginger.BusinessFlowWindows"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="GingerAnalyticsConfigurationPage">
+
+    <DockPanel Background="{StaticResource $BackgroundColor_White}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition  Height="30"/>
+                <RowDefinition  Height="1*"/>
+            </Grid.RowDefinitions>
+            <StackPanel Orientation="Horizontal" Grid.Row="0">
+                <Label Content="Ginger Analytics Configuration" Style="{StaticResource $HorizontalExpanderLabelStyle}"/>
+                <usercontrols:ImageMakerControl SetAsFontImageWithSize="16" ToolTip="Enterprise Feature" ImageType="Building"  Width="20" Height="16" Foreground="{StaticResource $BackgroundColor_Black}" />
+            </StackPanel>
+            <StackPanel Orientation="Vertical" Grid.Row="1">
+                <Grid Margin="10,10,0,0" x:Name="xAnalyticsGrid" >
+                    <Grid.RowDefinitions>
+                        <RowDefinition  Height="50"/>
+                        <RowDefinition  Height="50"/>
+                        <RowDefinition  Height="50"/>
+                        <RowDefinition  Height="50"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="230"/>
+                        <ColumnDefinition Width="350*"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="0">
+                        <Label x:Name="xGAAURLLabel" Content="Ginger Analytics Account URL:"   Style="{StaticResource @InputFieldLabelStyle}"  VerticalAlignment="Center" FontSize="12"/>
+                        <Label x:Name="xGAAURLLabelValidation" Content="*"   Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center" Foreground="Red" FontWeight="Bold" FontSize="12"/>
+                    </StackPanel>
+                    <Activities:UCValueExpression x:Name="xGAAURLTextBox" Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Ginger Analytics Account URL" Margin="10,0,0,0"  Width="400"/>
+
+                    <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="1">
+                        <Label x:Name="xISURLLabel" Content="Identity Service URL:" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center"  FontSize="12"/>
+                        <Label x:Name="xISURLLabelValidation" Content="*" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center" Foreground="Red" FontWeight="Bold" FontSize="12"/>
+                    </StackPanel>
+                    <Activities:UCValueExpression x:Name="xISURLTextBox" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Identiry Service URL" Margin="10,0,0,0"  Width="400"/>
+
+                    <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="2">
+                        <Label x:Name="xClientIdLabel" Content="Client Id:" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center"  FontSize="12"/>
+                        <Label x:Name="xClientIdLabelValidation" Content="*" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center" Foreground="Red" FontWeight="Bold" FontSize="12"/>
+                    </StackPanel>
+                    <Activities:UCValueExpression x:Name="xClientIdTextBox" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Client Id" Margin="10,0,0,0"  Width="400" LostKeyboardFocus="xClientIdTextBox_LostKeyboardFocus"/>
+
+                    <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="3">
+                        <Label x:Name="xClientSecretLabel" Content="Client Secret:" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center"  FontSize="12"/>
+                        <Label x:Name="xClientSecretValidation" Content="*" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center" Foreground="Red" FontWeight="Bold" FontSize="12"/>
+                    </StackPanel>
+                    <Activities:UCValueExpression x:Name="xClientSecretTextBox" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Client Secret" Margin="10,0,0,0" MinWidth="400"  Width="Auto" LostKeyboardFocus="xClientSecretTextBox_LostKeyboardFocus"/>
+                </Grid>
+                <Grid>
+                    <Button x:Name="xTestConBtn" Click="xTestConBtn_Click" Content="Test Connection" Width="100" Background="White" Style="{StaticResource $InputButtonStyle}" Margin="200,15,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                </Grid>
+            </StackPanel>
+        </Grid>
+    </DockPanel>
+</UserControlsLib:GingerUIPage>
diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
new file mode 100644
index 0000000000..18947ef096
--- /dev/null
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
@@ -0,0 +1,187 @@
+#region License
+/*
+Copyright © 2014-2024 European Support Limited
+
+Licensed under the Apache License, Version 2.0 (the "License")
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. 
+*/
+#endregion
+
+using Ginger.Configurations;
+using Ginger.UserControlsLib;
+using Amdocs.Ginger.Common;
+using System.Windows;
+using GingerCore;
+using amdocs.ginger.GingerCoreNET;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System;
+using IdentityModel.Client;
+using Ginger.ValidationRules;
+
+namespace Ginger.ExternalConfigurations
+    {
+    /// <summary>
+    /// Interaction logic for GingerAnalyticsConfigurationPage.xaml
+    /// </summary>
+    public partial class GingerAnalyticsConfigurationPage : GingerUIPage
+    {
+        private GingerAnalyticsConfiguration gingerAnalyticsUserConfig;
+
+        public GingerAnalyticsConfigurationPage()
+        {
+            InitializeComponent();
+            Init();
+        }
+        private void Init()
+        {
+            gingerAnalyticsUserConfig = WorkSpace.Instance.Solution.GingerAnalyticsConfiguration;
+
+            gingerAnalyticsUserConfig.StartDirtyTracking();
+            SetControls();
+
+        }
+
+        private void SetControls()
+        {
+            Context mContext = new();
+
+            xGAAURLTextBox.Init(mContext, gingerAnalyticsUserConfig, nameof(GingerAnalyticsConfiguration.AccountUrl));
+            xISURLTextBox.Init(mContext, gingerAnalyticsUserConfig, nameof(GingerAnalyticsConfiguration.IdentityServiceURL));
+            xClientIdTextBox.Init(mContext, gingerAnalyticsUserConfig, nameof(GingerAnalyticsConfiguration.ClientId));
+            xClientSecretTextBox.Init(mContext, gingerAnalyticsUserConfig, nameof(GingerAnalyticsConfiguration.ClientSecret));
+            ApplyValidationRules();
+
+        }
+
+    private void ApplyValidationRules()
+    {
+            // check if fields have been populated (font-end validation)
+            xGAAURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("URL cannot be empty"));
+            xISURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("URL cannot be empty"));
+            xClientIdTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("ClientID cannot be empty"));
+            xClientSecretTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("ClientSecret cannot be empty"));
+            //GingerAnalyticsConfigPropertyChange();
+    }
+
+        private void GingerAnalyticsConfigPropertyChange()
+        {
+            // need in order to trigger the validation's rules on init binding (load/init form)
+            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.AccountUrl));
+            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.IdentityServiceURL));
+            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.ClientId));
+            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.ClientSecret));
+        }
+
+        private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.AccountUrl) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.IdentityServiceURL)
+                || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientId) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientSecret))
+            {
+                Reporter.ToUser(eUserMsgKey.MissedMandatotryFields);
+                return;
+            }
+
+
+            if (gingerAnalyticsUserConfig != null && gingerAnalyticsUserConfig.Token.Equals("token"))
+            {
+                string clientId = EncryptionHandler.DecryptwithKey(gingerAnalyticsUserConfig.ClientId);
+
+                string clientSecret = EncryptionHandler.DecryptwithKey(gingerAnalyticsUserConfig.ClientSecret);
+
+                string address = gingerAnalyticsUserConfig.IdentityServiceURL;
+
+                bool isAuthorized = await RequestToken(clientId, clientSecret, address);
+
+                if (isAuthorized)
+                    {
+                    Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
+                    }
+                else
+                    {
+                    Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
+                    }
+            }
+            else if(gingerAnalyticsUserConfig != null && !gingerAnalyticsUserConfig.Token.Equals("token"))
+            {
+                Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
+            }
+            else
+            {
+            Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
+            }
+
+        }
+
+        private void xClientSecretTextBox_LostKeyboardFocus(object sender, System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+            if (!EncryptionHandler.IsStringEncrypted(xClientSecretTextBox.ValueTextBox.Text))
+            {
+                xClientSecretTextBox.ValueTextBox.Text = ValueExpression.IsThisAValueExpression(xClientSecretTextBox.ValueTextBox.Text) ? xClientSecretTextBox.ValueTextBox.Text : EncryptionHandler.EncryptwithKey(xClientSecretTextBox.ValueTextBox.Text);
+
+            }
+        }
+
+        private void xClientIdTextBox_LostKeyboardFocus(object sender, System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+            if (!EncryptionHandler.IsStringEncrypted(xClientIdTextBox.ValueTextBox.Text))
+            {
+                xClientIdTextBox.ValueTextBox.Text = ValueExpression.IsThisAValueExpression(xClientIdTextBox.ValueTextBox.Text) ? xClientIdTextBox.ValueTextBox.Text : EncryptionHandler.EncryptwithKey(xClientIdTextBox.ValueTextBox.Text);
+
+            }
+        }
+
+        public async Task<bool> RequestToken(string clientId, string clientSecret, string address)
+        {
+            try
+            {
+                HttpClientHandler handler = new HttpClientHandler() { UseProxy = false };
+
+                var client = new HttpClient(handler);
+
+                var disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
+                    {
+                    Address = address,
+                    Policy =
+                       {
+                       RequireHttps = true,
+                       ValidateIssuerName = true
+                       }
+                    });
+
+                var tokenResponse = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
+                {
+                    Address = disco.TokenEndpoint,
+
+                    ClientId = clientId,
+                    ClientSecret = clientSecret,
+                });
+
+                if (tokenResponse.HttpStatusCode == System.Net.HttpStatusCode.OK)
+                {
+                    gingerAnalyticsUserConfig.Token = tokenResponse.AccessToken;
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR,"Failed to connect to the server",ex);
+                return false;
+            }
+        }
+
+    }
+}
diff --git a/Ginger/Ginger/Ginger.csproj b/Ginger/Ginger/Ginger.csproj
index 3e98dc02bf..7e15ace7b8 100644
--- a/Ginger/Ginger/Ginger.csproj
+++ b/Ginger/Ginger/Ginger.csproj
@@ -599,6 +599,7 @@
     <None Remove="UserControlsLib\ImageMakerLib\Images\Environment.ico" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\Environment.svg" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\Ginger.png" />
+    <None Remove="UserControlsLib\ImageMakerLib\Images\GingerAnalytics.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\GingerByAmdocsLogo.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\GingerByAmdocsLogoGray.png" />
     <None Remove="UserControlsLib\ImageMakerLib\Images\GingerByAmdocsLogoWhiteSmall.png" />
@@ -707,6 +708,7 @@
     <PackageReference Include="Ginger.AccountReport.Contracts" Version="2024.4.1" />
     <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.3.1" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
+    <PackageReference Include="IdentityModel" Version="7.0.0" />
     <PackageReference Include="LiteDB" Version="5.0.17" />
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
     <PackageReference Include="log4net" Version="2.0.15" />
@@ -2461,6 +2463,9 @@
     <Resource Include="UserControlsLib\ImageMakerLib\Images\Ginger.png">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="UserControlsLib\ImageMakerLib\Images\GingerAnalytics.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="UserControlsLib\ImageMakerLib\Images\GingerByAmdocsLogo.png">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </Resource>
diff --git a/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs b/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs
index bea03e486b..fce1bca771 100644
--- a/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs
+++ b/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs
@@ -29,6 +29,7 @@ limitations under the License.
 using System;
 using System.Windows.Controls;
 using GingerCore;
+using Ginger.ExternalConfigurations;
 
 namespace Ginger.ConfigurationsLib
 {
@@ -90,12 +91,9 @@ private static TwoLevelMenu GetMenu()
             externalConfigMenu.Add(eImageType.Applitools, "Applitools Configuration", GetApplitoolsExteranalConfigsPage, ConsoleKey.X, "Applitools External Configurations", "Applitools Configuration AID");
             externalConfigMenu.Add(eImageType.Sealights, "Sealights Configuration", GetSealightsExteranalConfigsPage, ConsoleKey.X, "Sealights External Configurations", "Sealights Configuration AID");
             externalConfigMenu.Add(eImageType.Exchange, "Ask Lisa Configuration", GetAskLisaConfigsPage, ConsoleKey.X, "Ask Lisa Configurations", "Ask Lisa Configuration AID");
+            externalConfigMenu.Add(eImageType.GingerAnalytics, "Ginger Analytics Configuration", GetGingerAnalyticsPage, ConsoleKey.X, "Ginger Analytics Configuration", "Ginger Analytics Configuration AID");
             twoLevelMenu.Add(externalConfigMenu);
 
-            TopMenuItem accessiblityRulesMenu = new TopMenuItem(eImageType.Accessibility, $"{GingerCore.General.GetEnumValueDescription(typeof(eTermResKey), nameof(eTermResKey.AccessibilityRules))}", ConsoleKey.T, $"{GingerCore.General.GetEnumValueDescription(typeof(eTermResKey), nameof(eTermResKey.AccessibilityRules))}", "Name & rules of the Accessibility which been present current json");
-            accessiblityRulesMenu.Add(eImageType.Application, "", GetAccessibilityRulePage, ConsoleKey.T, "", "AID");
-            twoLevelMenu.Add(accessiblityRulesMenu);
-
             return twoLevelMenu;
         }
 
@@ -154,15 +152,15 @@ private static Page GetAskLisaConfigsPage()
         {
             return new AskLisaConfigurationsPage();
         }
+
+        private static Page GetGingerAnalyticsPage()
+        {
+            return new GingerAnalyticsConfigurationPage();
+        }
         //Remove when we add other pages
         private static Page OthersPage()
         {
             return new Page();
         }
-
-        private static Page GetAccessibilityRulePage()
-        {
-            return (new AccessibilityRulePage());
-        }
     }
 }
diff --git a/Ginger/Ginger/UserControlsLib/ImageMakerLib/Images/GingerAnalytics.png b/Ginger/Ginger/UserControlsLib/ImageMakerLib/Images/GingerAnalytics.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce3d95a379c88605459735b41fd788214ead9151
GIT binary patch
literal 1122
zcmV-o1fBbdP)<h;3K|Lk000e1NJLTq001KZ001Kh1^@s69@(>500001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1NTWpK~z{r?U#Ls
zR8<(ppF6XAXU5&x9ot>o#dJ5#-I^TSqKu*_l#&W5v_%BPh(0#)yRZnte-aEbw7>cg
zEYg-hQ;~uMD{4sy6NMGglw@00N7G4V$92cOr{_KQ&P>z2duMdh?T>xn$2sSIocqjs
z-t#dS)u=}GKT-v0C1KqfK}{!Th$7u2PDVsxBt^tXmeb^>8}c$TB8L2oWEslPWK2oC
z?9_)Xmyz0PsM~6x!e)UP;a`T#W<38|52nxD;9MA%az-ZA8|vewL6!U>sI0GTGP{H7
z=l6nY-Xj6GA=A7Q?Qi$usd;<ZE+d{YoU)k2$hRam=YcYOwlst>A${FbtG5nfed|Wx
z!*_sWPZEpQDD++I!>8{{Kj-bI+zL9SpK?a-Zz{*`6)}XB2@I5b(s@|n^(|=(grdNL
zWk6F)B_mUbP3vBQQU`R8*QtUW`EE&r8raaJNw05ID`rGhbtIs|<%XJ_h^WsO)vAh+
zksqdo%N5pcRtQD%L*^sDVVX?#lbAHdN6T?yRZH%Lb)9FhX0NPwMHFE0twE=OB$?)v
zF8P^xi>$S)z!Qxz?0V)drv==*<sgonzpU$<A8&@?(bF59zayE>IIW!8$wzjzPywg(
zQjb$=g)I|SDw^Z3%a(HoXsd5R+pTVDOwTMY==Y!UGqaU!x2r(!rA&dDc!eH4t^Fr6
znyzlE;F(naRp*JEHj!`as#|_$WT590ZRpU23pjT+ADuTF?n7AefqLwx@9`+<IG)Vi
z?>=qdRDZv|??{ZiLL`|zRcva@SnMEi3o0JYMDTFg?Z6ci<C)j9qj#Xn2q6)!!>cu|
zXph|kgZJeA#@;UM>pP`8p|VEuW9y+(7d<W_=rE1o+^@#9;i1q(`|1!nFwl#qlO4FC
z^eigLh^UlBPoyI>$mr}yAB|TJRw7|dKp;bp8LsXQitOw=iWgElkyd&Zm25;*YGks~
z5h8ONj4I43Ye93M4kovoKU4~Pt{%e?E4PGPlacF{7}`eiE3KPPh~MP+PvvLmrW(o0
z%h0fll$yX^(n(EZ%1E}#5-(fG4b728ryNRSNtIo7sm>`&Qn8TA&iDb5|3qBP^bRh=
zBdR44BFBO$MEa6b91k*BMC2W=kb1^uP1O+T$5X|o_G+?++)c!U<i!NiMa0M~B6%V^
zqI_6B^b2{Byi1-W@+a>kkqz=$vWx5^F8M`f45=qmNkT4AUy^fV9Ql#Rfl2fyk^GYb
z&adP*a+ZiBT0ammB=5)%xMoR6Z?UWTpf!oe2PFa$r8(q5BF|Nml_VSK8ARTZXXOVy
oM`T#rhz#ismHc}7_%H<g4R`5WU62HWQUCw|07*qoM6N<$f)ZmGEdT%j

literal 0
HcmV?d00001

diff --git a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml
index f347cd27c8..69085ae1c9 100644
--- a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml
+++ b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml
@@ -24,7 +24,9 @@
             <DockPanel x:Name="xTreeActionsIconsPnl" DockPanel.Dock="Right" Margin="15,0,0,0" MinWidth="60">
                 <usercontrols:ucButton x:Name="xRefreshButton" AutomationProperties.AutomationId="RefreshButton" ToolTip="Refresh Items" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="14" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="Refresh"  Visibility="Collapsed" Margin="-5,0,0,0"/>
                 <usercontrols:ucButton x:Name="xSaveAllButton" ToolTip="Save All Changed Items" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton" ButtonFontImageSize="16" ButtonImageHeight="16" ButtonImageWidth="16"  ButtonImageType="Save" Visibility="Collapsed" Margin="-5,0,0,0"></usercontrols:ucButton>
-                <usercontrols:ucButton x:Name="xAddButton" AutomationProperties.AutomationId="AddButton" ToolTip="Add Item" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="15" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="Add"  Visibility="Collapsed" Margin="-5,0,0,0"/>
+                <usercontrols:ucButton x:Name="xAddButton" AutomationProperties.AutomationId="AddButton" ToolTip="Add Item" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="15" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="Add"  Visibility="Collapsed" Margin="-5,0,0,0">
+               
+                </usercontrols:ucButton>
                 <usercontrols:ucButton x:Name="xAddActionButton" AutomationProperties.AutomationId="AddActionButton" ToolTip="Add Action" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="15" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="MoveLeft"  Visibility="Collapsed" Margin="0,0,0,0"/>
             </DockPanel>
         </DockPanel>
diff --git a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs
index a9831055dd..1bff7b8990 100644
--- a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs
+++ b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs
@@ -18,6 +18,7 @@ limitations under the License.
 
 using Amdocs.Ginger.Common;
 using Amdocs.Ginger.Common.Enums;
+using Amdocs.Ginger.UserControls;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -231,7 +232,7 @@ public void SetTopToolBarTools(RoutedEventHandler saveAllHandler = null, RoutedE
                 xAddActionButton.Visibility = Visibility.Collapsed;
             }
         }
-
+     
         private void xTreeViewTree_ItemSelected(object sender, EventArgs e)
         {
             if (xTreeViewTree.CurrentSelectedTreeViewItem != null & AllowTreeTools == true)
@@ -441,5 +442,10 @@ public void SetAddButtonToArrow()
         {
             this.xAddButton.ButtonImageType = eImageType.MoveLeft;
         }
-    }
+
+        private void MenuItem_Click(object sender, RoutedEventArgs e)
+            {
+
+            }
+        }
 }
\ No newline at end of file
diff --git a/Ginger/GingerCoreCommon/EnumsLib/eImageType.cs b/Ginger/GingerCoreCommon/EnumsLib/eImageType.cs
index 44478e9b54..9deb86e055 100644
--- a/Ginger/GingerCoreCommon/EnumsLib/eImageType.cs
+++ b/Ginger/GingerCoreCommon/EnumsLib/eImageType.cs
@@ -178,6 +178,7 @@ public enum eImageType
         ActiveAll,
         ExpandToFullScreen,
         Exchange,
+        GingerAnalytics,
         Export,
         Filter,
         ImportFile,
diff --git a/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs b/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
new file mode 100644
index 0000000000..d4e5faa073
--- /dev/null
+++ b/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
@@ -0,0 +1,110 @@
+#region License
+/*
+Copyright © 2014-2024 European Support Limited
+
+Licensed under the Apache License, Version 2.0 (the "License")
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. 
+*/
+#endregion
+
+using Amdocs.Ginger.Common;
+using Amdocs.Ginger.Common.WorkSpaceLib;
+using Amdocs.Ginger.Repository;
+using Microsoft.CodeAnalysis;
+using GingerCore.Activities;
+
+namespace Ginger.Configurations
+{
+
+    public class GingerAnalyticsConfiguration : RepositoryItemBase
+    {
+        public delegate void GingerAnalyticsConfigurationChangedEvent();
+
+        private string mAccountUrl;
+        [IsSerializedForLocalRepository]
+        public string AccountUrl
+        {
+            get
+            {
+                return mAccountUrl;
+            }
+            set
+            {
+                if (mAccountUrl != value)
+                {
+                    mAccountUrl = value;
+                    OnPropertyChanged(nameof(AccountUrl));
+                }
+            }
+        }
+
+        private string mIdentityServiceURL;
+        [IsSerializedForLocalRepository]
+        public string IdentityServiceURL
+        {
+            get
+            {
+                return mIdentityServiceURL;
+            }
+            set
+            {
+                if (mIdentityServiceURL != value)
+                {
+                    mIdentityServiceURL = value;
+                    OnPropertyChanged(nameof(IdentityServiceURL));
+                }
+            }
+        }
+
+        private string mClientId;
+        [IsSerializedForLocalRepository]
+        public string ClientId
+        {
+            get
+            {
+                return mClientId;
+            }
+            set
+            {
+                if (mClientId != value)
+                {
+                    mClientId = value;
+                    OnPropertyChanged(nameof(ClientId));
+                }
+            }
+        }
+
+        private string mClientSecret;
+        [IsSerializedForLocalRepository]
+        public string ClientSecret
+        {
+            get
+            {
+                return mClientSecret;
+            }
+            set
+            {
+                if (mClientSecret != value)
+                {
+                    mClientSecret = value;
+                    OnPropertyChanged(nameof(ClientSecret));
+                }
+            }
+        }
+
+        public string Token = "token";
+      
+
+        public override string ItemName { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
+
+    }
+}
diff --git a/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs b/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs
index e842239fdf..679d0b7705 100644
--- a/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs
+++ b/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs
@@ -169,6 +169,8 @@ public enum eUserMsgKey
         SourceControlBranchNameEmpty, DataSourceSheetNameHasSpace, DataSourceColumnHasSpace,
         DeleteRecoverFolderWarn,
         EnvParamNameExists,
+        GingerAnalyticsConnectionFail,
+        GingerAnalyticsConnectionSuccess,
         EnvParamNameEmpty,
         NoPublishRepositoryInfo,
         NotAllowedForMappedRuntimeValue,
@@ -866,6 +868,9 @@ public static void LoadUserMsgsPool()
             Reporter.UserMsgsPool.Add(eUserMsgKey.FindAndReplaceNoItemsToRepalce, new UserMsg(eUserMsgType.WARN, "No Suitable Items", "No suitable items selected to replace.", eUserMsgOption.OK, eUserMsgSelection.None));
             Reporter.UserMsgsPool.Add(eUserMsgKey.FindAndReplaceViewRunSetNotSupported, new UserMsg(eUserMsgType.INFO, "View " + GingerDicser.GetTermResValue(eTermResKey.RunSet), "View " + GingerDicser.GetTermResValue(eTermResKey.RunSet) + " is not supported.", eUserMsgOption.OK, eUserMsgSelection.None));
 
+            Reporter.UserMsgsPool.Add(eUserMsgKey.GingerAnalyticsConnectionSuccess, new UserMsg(eUserMsgType.INFO, "Ginger Analytics Connection Info" , " Ginger Analytics Connection is Successfull.", eUserMsgOption.OK, eUserMsgSelection.None));
+            Reporter.UserMsgsPool.Add(eUserMsgKey.GingerAnalyticsConnectionFail, new UserMsg(eUserMsgType.INFO, "Ginger Analytics Connection Info", " Ginger Analytics Connection is Failed, Please check credentials.", eUserMsgOption.OK, eUserMsgSelection.None));
+
             Reporter.UserMsgsPool.Add(eUserMsgKey.FileAlreadyExistWarn, new UserMsg(eUserMsgType.WARN, "File Already Exists", "File already exists, do you want to override?", eUserMsgOption.OKCancel, eUserMsgSelection.Cancel));
 
             Reporter.UserMsgsPool.Add(eUserMsgKey.SuccessfulConversionDone, new UserMsg(eUserMsgType.INFO, "Obsolete actions converted successfully", "The obsolete actions have been converted successfully" + Environment.NewLine + "Do you want to convert more actions?", eUserMsgOption.YesNo, eUserMsgSelection.No));
diff --git a/Ginger/GingerCoreCommon/WorkSpaceLib/Solution.cs b/Ginger/GingerCoreCommon/WorkSpaceLib/Solution.cs
index 9dbd9c5482..4d007f1898 100644
--- a/Ginger/GingerCoreCommon/WorkSpaceLib/Solution.cs
+++ b/Ginger/GingerCoreCommon/WorkSpaceLib/Solution.cs
@@ -585,5 +585,8 @@ public void SetSealightsOldConifurationsToNewObject()
 
         [IsSerializedForLocalRepository]
         public AskLisaConfiguration AskLisaConfiguration { get; set; } = new AskLisaConfiguration();
+
+        [IsSerializedForLocalRepository]
+        public GingerAnalyticsConfiguration GingerAnalyticsConfiguration { get; set; } = new GingerAnalyticsConfiguration();
     }
 }

From 176fb9e495c59cfa3b0c061a84fd996291b29fbd Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Fri, 23 Aug 2024 07:51:29 +0530
Subject: [PATCH 2/9] Undo Changes

---
 .../UserControlsLib/UCTreeView/TreeView1.xaml      |  4 +---
 .../UserControlsLib/UCTreeView/TreeView1.xaml.cs   | 14 ++++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml
index 69085ae1c9..f347cd27c8 100644
--- a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml
+++ b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml
@@ -24,9 +24,7 @@
             <DockPanel x:Name="xTreeActionsIconsPnl" DockPanel.Dock="Right" Margin="15,0,0,0" MinWidth="60">
                 <usercontrols:ucButton x:Name="xRefreshButton" AutomationProperties.AutomationId="RefreshButton" ToolTip="Refresh Items" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="14" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="Refresh"  Visibility="Collapsed" Margin="-5,0,0,0"/>
                 <usercontrols:ucButton x:Name="xSaveAllButton" ToolTip="Save All Changed Items" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton" ButtonFontImageSize="16" ButtonImageHeight="16" ButtonImageWidth="16"  ButtonImageType="Save" Visibility="Collapsed" Margin="-5,0,0,0"></usercontrols:ucButton>
-                <usercontrols:ucButton x:Name="xAddButton" AutomationProperties.AutomationId="AddButton" ToolTip="Add Item" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="15" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="Add"  Visibility="Collapsed" Margin="-5,0,0,0">
-               
-                </usercontrols:ucButton>
+                <usercontrols:ucButton x:Name="xAddButton" AutomationProperties.AutomationId="AddButton" ToolTip="Add Item" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="15" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="Add"  Visibility="Collapsed" Margin="-5,0,0,0"/>
                 <usercontrols:ucButton x:Name="xAddActionButton" AutomationProperties.AutomationId="AddActionButton" ToolTip="Add Action" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Right" ButtonType="CircleImageButton"  ButtonFontImageSize="15" ButtonImageHeight="16" ButtonImageWidth="16" ButtonImageType="MoveLeft"  Visibility="Collapsed" Margin="0,0,0,0"/>
             </DockPanel>
         </DockPanel>
diff --git a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs
index 1bff7b8990..c3cc0e14e0 100644
--- a/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs
+++ b/Ginger/Ginger/UserControlsLib/UCTreeView/TreeView1.xaml.cs
@@ -18,7 +18,6 @@ limitations under the License.
 
 using Amdocs.Ginger.Common;
 using Amdocs.Ginger.Common.Enums;
-using Amdocs.Ginger.UserControls;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -114,7 +113,7 @@ public object TreeTooltip
         public Visibility TreeTitleVisibility
         {
             get { return xTreeTitle.Visibility; }
-            set 
+            set
             {
                 xTreeItemHeaderPnl.Visibility = value;
                 if (value == Visibility.Collapsed)
@@ -232,7 +231,7 @@ public void SetTopToolBarTools(RoutedEventHandler saveAllHandler = null, RoutedE
                 xAddActionButton.Visibility = Visibility.Collapsed;
             }
         }
-     
+
         private void xTreeViewTree_ItemSelected(object sender, EventArgs e)
         {
             if (xTreeViewTree.CurrentSelectedTreeViewItem != null & AllowTreeTools == true)
@@ -381,7 +380,7 @@ private async Task SearchAsync()
                         }
                         else
                         {
-                             xTreeViewTree.FilterItemsByText(xTreeViewTree.TreeItemsCollection, mSearchString, mCancellationTokenSource.Token);
+                            xTreeViewTree.FilterItemsByText(xTreeViewTree.TreeItemsCollection, mSearchString, mCancellationTokenSource.Token);
                         }
                     }
                     catch (Exception ex)
@@ -442,10 +441,5 @@ public void SetAddButtonToArrow()
         {
             this.xAddButton.ButtonImageType = eImageType.MoveLeft;
         }
-
-        private void MenuItem_Click(object sender, RoutedEventArgs e)
-            {
-
-            }
-        }
+    }
 }
\ No newline at end of file

From b77a9215c0e83f6b53d8404800fe3479af8303f7 Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Fri, 23 Aug 2024 09:33:10 +0530
Subject: [PATCH 3/9] Codacy and some fixes

---
 .../GingerAnalyticsConfigurationPage.xaml     |   4 +-
 .../GingerAnalyticsConfigurationPage.xaml.cs  |  71 +++++++++++-------
 .../ImageMakerLib/ImageMakerControl.xaml.cs   |   3 +
 .../ImageMakerLib/Images/GingerAnalytics.png  | Bin 1122 -> 1281 bytes
 .../ReporterLib/UserMsgsPool.cs               |   2 +
 5 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
index 0fae9ea3fa..d9152f927b 100644
--- a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
@@ -56,10 +56,10 @@
                         <Label x:Name="xClientSecretLabel" Content="Client Secret:" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center"  FontSize="12"/>
                         <Label x:Name="xClientSecretValidation" Content="*" Style="{StaticResource @InputFieldLabelStyle}" VerticalAlignment="Center" Foreground="Red" FontWeight="Bold" FontSize="12"/>
                     </StackPanel>
-                    <Activities:UCValueExpression x:Name="xClientSecretTextBox" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Client Secret" Margin="10,0,0,0" MinWidth="400"  Width="Auto" LostKeyboardFocus="xClientSecretTextBox_LostKeyboardFocus"/>
+                    <Activities:UCValueExpression x:Name="xClientSecretTextBox" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Client Secret" Margin="10,0,0,0" Width="400" LostKeyboardFocus="xClientSecretTextBox_LostKeyboardFocus"/>
                 </Grid>
                 <Grid>
-                    <Button x:Name="xTestConBtn" Click="xTestConBtn_Click" Content="Test Connection" Width="100" Background="White" Style="{StaticResource $InputButtonStyle}" Margin="200,15,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <Button x:Name="xTestConBtn" Click="xTestConBtn_Click" Content="Test Connection" Width="100" Background="White" Style="{StaticResource $InputButtonStyle}" Margin="10,15,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
                 </Grid>
             </StackPanel>
         </Grid>
diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
index 18947ef096..c879914f56 100644
--- a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
@@ -29,14 +29,14 @@ limitations under the License.
 using Ginger.ValidationRules;
 
 namespace Ginger.ExternalConfigurations
-    {
+{
     /// <summary>
     /// Interaction logic for GingerAnalyticsConfigurationPage.xaml
     /// </summary>
     public partial class GingerAnalyticsConfigurationPage : GingerUIPage
     {
         private GingerAnalyticsConfiguration gingerAnalyticsUserConfig;
-
+        ValueExpression valueExpression;
         public GingerAnalyticsConfigurationPage()
         {
             InitializeComponent();
@@ -45,7 +45,7 @@ public GingerAnalyticsConfigurationPage()
         private void Init()
         {
             gingerAnalyticsUserConfig = WorkSpace.Instance.Solution.GingerAnalyticsConfiguration;
-
+            valueExpression = new ValueExpression();
             gingerAnalyticsUserConfig.StartDirtyTracking();
             SetControls();
 
@@ -63,23 +63,13 @@ private void SetControls()
 
         }
 
-    private void ApplyValidationRules()
-    {
+        private void ApplyValidationRules()
+        {
             // check if fields have been populated (font-end validation)
             xGAAURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("URL cannot be empty"));
             xISURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("URL cannot be empty"));
             xClientIdTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("ClientID cannot be empty"));
             xClientSecretTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("ClientSecret cannot be empty"));
-            //GingerAnalyticsConfigPropertyChange();
-    }
-
-        private void GingerAnalyticsConfigPropertyChange()
-        {
-            // need in order to trigger the validation's rules on init binding (load/init form)
-            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.AccountUrl));
-            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.IdentityServiceURL));
-            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.ClientId));
-            gingerAnalyticsUserConfig.OnPropertyChanged(nameof(GingerAnalyticsConfiguration.ClientSecret));
         }
 
         private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
@@ -87,37 +77,37 @@ private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
             if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.AccountUrl) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.IdentityServiceURL)
                 || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientId) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientSecret))
             {
-                Reporter.ToUser(eUserMsgKey.MissedMandatotryFields);
+                Reporter.ToUser(eUserMsgKey.RequiredFieldsEmpty);
                 return;
             }
 
 
             if (gingerAnalyticsUserConfig != null && gingerAnalyticsUserConfig.Token.Equals("token"))
             {
-                string clientId = EncryptionHandler.DecryptwithKey(gingerAnalyticsUserConfig.ClientId);
+                string clientId = CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientId);
 
-                string clientSecret = EncryptionHandler.DecryptwithKey(gingerAnalyticsUserConfig.ClientSecret);
+                string clientSecret = CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientSecret);
 
-                string address = gingerAnalyticsUserConfig.IdentityServiceURL;
+                string address = CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.IdentityServiceURL);
 
                 bool isAuthorized = await RequestToken(clientId, clientSecret, address);
 
                 if (isAuthorized)
-                    {
+                {
                     Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
-                    }
+                }
                 else
-                    {
+                {
                     Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
-                    }
+                }
             }
-            else if(gingerAnalyticsUserConfig != null && !gingerAnalyticsUserConfig.Token.Equals("token"))
+            else if (gingerAnalyticsUserConfig != null && !gingerAnalyticsUserConfig.Token.Equals("token"))
             {
                 Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
             }
             else
             {
-            Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
+                Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
             }
 
         }
@@ -149,14 +139,14 @@ public async Task<bool> RequestToken(string clientId, string clientSecret, strin
                 var client = new HttpClient(handler);
 
                 var disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
-                    {
+                {
                     Address = address,
                     Policy =
                        {
                        RequireHttps = true,
                        ValidateIssuerName = true
                        }
-                    });
+                });
 
                 var tokenResponse = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
                 {
@@ -178,10 +168,35 @@ public async Task<bool> RequestToken(string clientId, string clientSecret, strin
             }
             catch (Exception ex)
             {
-                Reporter.ToLog(eLogLevel.ERROR,"Failed to connect to the server",ex);
+                Reporter.ToLog(eLogLevel.ERROR, "Failed to connect to the server", ex);
                 return false;
             }
         }
+        /// <summary>
+        /// Calculates the actual value from the input string based on its type.
+        /// If the input is a value expression, it computes the expression to get the value.
+        /// If the input is an encrypted string, it decrypts the string to retrieve the original value.
+        /// Returns the input as is if it doesn't match the above conditions.
+        /// </summary>
+        /// <param name="value">The input string which might be a value expression or an encrypted string.</param>
+        /// <returns>The calculated or decrypted value, or the input string if no processing is needed.</returns>
+        private string CredentialsCalculation(string value)
+        {
+
+            if (ValueExpression.IsThisAValueExpression(value))
+            {
+                valueExpression.DecryptFlag = true;
+                value = valueExpression.Calculate(value);
+                valueExpression.DecryptFlag = false;
+                return value;
+            }
+            else if (EncryptionHandler.IsStringEncrypted(value))
+            {
+                value = EncryptionHandler.DecryptwithKey(value);
+                return value;
+            }
 
+            return value;
+        }
     }
 }
diff --git a/Ginger/Ginger/UserControlsLib/ImageMakerLib/ImageMakerControl.xaml.cs b/Ginger/Ginger/UserControlsLib/ImageMakerLib/ImageMakerControl.xaml.cs
index 6811cb0271..c4bc2d146e 100644
--- a/Ginger/Ginger/UserControlsLib/ImageMakerLib/ImageMakerControl.xaml.cs
+++ b/Ginger/Ginger/UserControlsLib/ImageMakerLib/ImageMakerControl.xaml.cs
@@ -205,6 +205,9 @@ private void SetImage()
                 case eImageType.Chatbot:
                     SetAsStaticImage("bot.png");
                     break;
+                case eImageType.GingerAnalytics:
+                    SetAsStaticImage("GingerAnalytics.png");
+                    break;
                 case eImageType.SendArrow:
                     SetAsStaticImage("sendArrow.png");
                     break;
diff --git a/Ginger/Ginger/UserControlsLib/ImageMakerLib/Images/GingerAnalytics.png b/Ginger/Ginger/UserControlsLib/ImageMakerLib/Images/GingerAnalytics.png
index ce3d95a379c88605459735b41fd788214ead9151..bdf01fea63e734bbdc98b92486c76f8450a6abdd 100644
GIT binary patch
delta 1260
zcmV<I1QYw>2!RSAiBL{Q4GJ0x0000DNk~Le0000U0000U2nGNE06Q?QqLCpde-d;6
z01|Wo-ew<o000D*Nkl<ZNK5UOZ%o@o7{|ZAmQrf}0Hw4nD?y+z=U|hNXab9{H%MaQ
zG&pt1LY9~;CKw|xT!M)@17!L_{!Dp;aU&RrykLqlF+oC1+=6j71QJ{d$Ugxsl=5e!
z?GM`X?l_>O6$&rr8$ZdV&)x6tfBD{BpL^~kLcxE4Li|2*{uh2^99cLJ2ng$F97(vQ
zrUpu-5|SjLv9VFK9ujt(4nuWyH9LMGrJ<oge2tz%3D?!tg^6yL=H_P6D+t*~Mn=a(
zC6uUzYinyG3I><@`g+lu;@==|eDM{z`pKuFA(W_u>3>QcOWgUpuS(>{f9n#te?ua_
zG)koHszjbWwI!^grLlpD2guv)T}1WT72<L&Z8_P)fx>JR%&FM`;`l6%kS+}&cY?}y
zwEPf9E}u^(c>P17rG1}x<ubvW*NFXrLwE^i->9a6gv!cF7&XAadq!j>#sf<RtWWE(
z^oI_slRCg<z^^~6(bBa5fB4t1e&ZWFh)=}_StjJ2$P%6+ASMt-aP+=kl1Kt|nS?ah
z$nZN>VoQ$M`F7>3ZpVfyj-b4f;A9@J?-%V6ZzsFmj{N+5ZmSd$+FpDd7fu<07zNIL
zK7zY{uEYG83fT#9Sn~y-iIt#IN?7x3V9@2|<F*+eA4f(;hN$fle{rjahlhm)#H(VU
z^BRB!w#`N^$|yOWggejW<J;1w(0=YT+KbPi=IIlNr4tRt;cy5ml!(IR<>g3DPUg1P
zAAr}bL0~Zfa3&y8MPrwukkwEw$Ah@_IOa9O>a)Ns8zBdFH_&FYp|rGA)Iy0U%u?at
z;2<n17ChYaW70_*e-{%GnAhT?jAwYC)~PAzzV5=Mdv-khTL-^09@F!??y|G9F)%P7
zYT@kr0&%%qC^%O{_kI$$GcO=Zod^Z>ZTBpo)9t|VSUoN!oP=Jf!m3}!3sbjo&oht0
z!b0@)^gyrI3s2!3`1Bba9mVq(U&fh1FKSFBu*H}_LlQ9(f1Lpxxk-nw6B!?`{e<gl
zcTrSaj4xYTk(!z+JVYj{H`mC>2wp0`2<>lw;Vo?uG89QLAPzG8m?6vfUj7|7<@;2$
z2)AzDLV9|-7`YEjI2vellC0BDvPlw~WFq+rE6I_L5gpXLt)Q@w%*@P)-Uk!4Fk^9X
zk(g5~TqwBEe?TIutE-|{bR0^UF*`d;%x3eBC_OTKLWku@?`n_7gQ}`3sMTuz8c~U}
z&0y}>aXb(v9Ep{c71H0|FKXc|FE0yg3#Zdbd_EspT8exP?&V)s+}75Hxw$!%m6gHm
zcEjuS!fLhhHdfbawfvm2w-?=dG&MD$qM`yrLqkYPe@a41N(xUx1qB5#8fl*2L&VI*
z=<Dm_$-Ske1$1@%;^^$`<gd%_?rtv1@^Ei&FW+)Dv5k!l&|SjB!~`}sH!(dujgF2E
z;V~5DHHxrzpb^SNS*|r04E(0DSS-lP%fr~%7;<uQkei#!Zyxq7Gc%KCIhHii($e^U
z%yK<zLSued+g>7WHCvT}<;DoevW(c+SZ>pE3zNwNjYb2%-_OS|(QTWpIymrl0saBJ
WG8L%%IN68*0000<MNUMnLSTZJu~^#x

delta 1100
zcmV-S1he~r3gQSMiBL{Q4GJ0x0000DNk~Le0000Z0000Z2nGNE03O-1S&<<pe-6U{
z01m?e$8V@)000B`Nkl<ZSV!%beTY<57{;GFvwLU8-Ps-6UE9TUH_hFe9NeOeq9~M-
z3MsTj1jUFxHu1Z#2*Q673^KI8`VcJAmOxXHf&?pSNeB~#715MrTUJNYNoB`%$GxZL
zJ@?K`)4h9VbkpsRec;DA=YE{~f6RN{^D!9Js7CcaQUz%xVci-*O($oFBHbiTMnqyH
zMZ`#!)8wWb@-i|ahWw0V8OqRPOi8@#)Q2sXk=kmg+iIc0W`P;uUxv(PJpWn`rqA5q
zTo{&eMkdu8>f@zBmHZ;8tgme{yMyZI_kwEPBLTM|)4UVyZ};M<d3)I|e<PkUoU)k2
z$hRam=YcYOwlst>A${FbtG5nfed|Wx!*_sWPZEpQDD++I!>8{{Kj-bI+zL9SpK?a-
zZz{*`6)}XB2@I5b(s@|n^(|=(grdNLWk6F)B_mUbP3vBQQU`R8*QtUW`EE&r8raaJ
zNw05ID`rGhbtIs|<%XJ_e~75h7uBkYkdYszh07JzZdM3I@<Zk$zhRn8_LG=2#z)I>
zVpU7-g>{{0ux78UcSRIn@U20ofh3vclrH(1d5f&ItH2YDG3<KgE~f?DyX7E`oWHE=
zn;&n6;nC9@oxdZQ&N!`{+Q~<DwNL@4^iq#gYK1KmRw|m~ugjKme+Ou*Z$jIxZfZ==
zEHCKypYk)am29`GK<}kYfth%P9zCu7Co`I^ZmZy#RR2}yiJUf(Z|tgDer9B#=M!z{
z(1i;)cQzlLHyiFlSn`2-?5FSXDCsz!%-!!kZQxXYzrOECjJ!f5nLSl(YRg#cAaM&S
z9?nGYaM|s^6%*r`f7i34cc97$ArY>_t2M1?kKF@<_vHS@-Y)FxJEc3JvPSY_>!DH?
zJuV{XFpc2cug10Eq0mJ8>JU0G(2J*&9k`<OEGo%}sFX!dq$4!Q=<G-zjaLs=B4JHH
zAVZHCuI>(s?Cd*=7g9TsR(ckdY(!LQWU|r`B6AyzD$FWte?fDg4kovoKU4~Pt{%e?
zE4PGPlacF{7}`eiE3KPPh~MP+PvvLmrW(o0%h0fll$yX^(n(EZ%1E}#5-(fG4b728
zryNRSNtIo7sm>`&Qn8TA&iDb5|3qBP^bRh=BdR44BFBO$MEa6b91k*BMC2W=kb1^u
zP1O+T$5X|ofA(s!hulrXgyh8p(nZ9`EFyU#JEDA8KJ*KDk-STuB=RTkB#{mBS+a}l
zBQE(xW(=t(Q%OQDP+yXBWE}aC$bm`pCz1S<1J1AHH*%JUBw9ZZF(mKE54dJYNN=&L
z`k*z5$Ok0?5~VrhK_bspla(YJ=@~@ck!R%xJx63%BHM@z=?#_qdinS;1pEzm>0Diq
S1cOol0000<MNUMnLSTZGrxkJl

diff --git a/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs b/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs
index 679d0b7705..7a710d6021 100644
--- a/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs
+++ b/Ginger/GingerCoreCommon/ReporterLib/UserMsgsPool.cs
@@ -171,6 +171,7 @@ public enum eUserMsgKey
         EnvParamNameExists,
         GingerAnalyticsConnectionFail,
         GingerAnalyticsConnectionSuccess,
+        RequiredFieldsEmpty,
         EnvParamNameEmpty,
         NoPublishRepositoryInfo,
         NotAllowedForMappedRuntimeValue,
@@ -828,6 +829,7 @@ public static void LoadUserMsgsPool()
             Reporter.UserMsgsPool.Add(eUserMsgKey.WizardCantMoveWhileInProcess, new UserMsg(eUserMsgType.WARN, "Process is Still Running", "Move '{0}' until the process will be finished or stopped." + Environment.NewLine + "Please wait for the process to be finished or stop it and then retry.", eUserMsgOption.OK, eUserMsgSelection.None));
             Reporter.UserMsgsPool.Add(eUserMsgKey.AskIfToCloseAgent, new UserMsg(eUserMsgType.QUESTION, "Close Agent?", "Close Agent '{0}'?", eUserMsgOption.YesNo, eUserMsgSelection.No));
             Reporter.UserMsgsPool.Add(eUserMsgKey.FolderNameTextBoxIsEmpty, new UserMsg(eUserMsgType.WARN, "Folders Names is Empty", "Please provide a proper folder name.", eUserMsgOption.OK, eUserMsgSelection.None));
+            Reporter.UserMsgsPool.Add(eUserMsgKey.RequiredFieldsEmpty, new UserMsg(eUserMsgType.WARN, "Required Fields Values Missing", "Please provide the values for required Fields.", eUserMsgOption.OK, eUserMsgSelection.None));
             Reporter.UserMsgsPool.Add(eUserMsgKey.UserHaveNoWritePermission, new UserMsg(eUserMsgType.WARN, "User Have No Write Permission On Folder", "User that currently in use have no write permission on selected folder. Pay attention that attachment at shared folder may be not created.", eUserMsgOption.OK, eUserMsgSelection.None));
             Reporter.UserMsgsPool.Add(eUserMsgKey.FolderNotExistOrNotAvailible, new UserMsg(eUserMsgType.WARN, "Folder Not Exist Or Not Available", "Folder Not Exist Or Not Available. Please select another one.", eUserMsgOption.OK, eUserMsgSelection.None));
             Reporter.UserMsgsPool.Add(eUserMsgKey.WizardSureWantToCancel, new UserMsg(eUserMsgType.QUESTION, "Cancel Wizard?", "Are you sure you want to cancel wizard and close?", eUserMsgOption.YesNo, eUserMsgSelection.No));

From 0eea4fb868a451dfa80f65e87cd3f2c5b50dc9c9 Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Thu, 5 Sep 2024 15:03:45 +0530
Subject: [PATCH 4/9] Some Fixes

---
 .../GingerAnalyticsConfigurationPage.xaml.cs  | 78 +++++++++++--------
 .../GingerAnalyticsConfiguration.cs           | 31 +++++++-
 .../ValueExpressionLib/ValueExpression.cs     | 27 +++++++
 3 files changed, 103 insertions(+), 33 deletions(-)

diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
index c879914f56..607fb97d52 100644
--- a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
@@ -27,6 +27,7 @@ limitations under the License.
 using System;
 using IdentityModel.Client;
 using Ginger.ValidationRules;
+using System.IdentityModel.Tokens.Jwt;
 
 namespace Ginger.ExternalConfigurations
 {
@@ -35,8 +36,9 @@ namespace Ginger.ExternalConfigurations
     /// </summary>
     public partial class GingerAnalyticsConfigurationPage : GingerUIPage
     {
+        public DateTime validTo;
+
         private GingerAnalyticsConfiguration gingerAnalyticsUserConfig;
-        ValueExpression valueExpression;
         public GingerAnalyticsConfigurationPage()
         {
             InitializeComponent();
@@ -45,7 +47,6 @@ public GingerAnalyticsConfigurationPage()
         private void Init()
         {
             gingerAnalyticsUserConfig = WorkSpace.Instance.Solution.GingerAnalyticsConfiguration;
-            valueExpression = new ValueExpression();
             gingerAnalyticsUserConfig.StartDirtyTracking();
             SetControls();
 
@@ -66,14 +67,20 @@ private void SetControls()
         private void ApplyValidationRules()
         {
             // check if fields have been populated (font-end validation)
-            xGAAURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("URL cannot be empty"));
-            xISURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("URL cannot be empty"));
+            xGAAURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("Report URL cannot be empty"));
+            xISURLTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("Identitiy Service URL cannot be empty"));
             xClientIdTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("ClientID cannot be empty"));
             xClientSecretTextBox.ValueTextBox.AddValidationRule(new ValidateEmptyValue("ClientSecret cannot be empty"));
         }
 
         private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
         {
+            if (IsTokenValid())
+            {
+                Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
+                return;
+            }
+
             if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.AccountUrl) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.IdentityServiceURL)
                 || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientId) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientSecret))
             {
@@ -82,15 +89,11 @@ private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
             }
 
 
-            if (gingerAnalyticsUserConfig != null && gingerAnalyticsUserConfig.Token.Equals("token"))
+            if (gingerAnalyticsUserConfig != null && string.IsNullOrEmpty(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.Token))
             {
-                string clientId = CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientId);
-
-                string clientSecret = CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientSecret);
-
-                string address = CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.IdentityServiceURL);
 
-                bool isAuthorized = await RequestToken(clientId, clientSecret, address);
+                bool isAuthorized = await RequestToken(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientId, WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientSecret,
+                        WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.IdentityServiceURL);
 
                 if (isAuthorized)
                 {
@@ -101,7 +104,7 @@ private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
                     Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
                 }
             }
-            else if (gingerAnalyticsUserConfig != null && !gingerAnalyticsUserConfig.Token.Equals("token"))
+            else if (gingerAnalyticsUserConfig != null && !string.IsNullOrEmpty(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.Token))
             {
                 Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
             }
@@ -138,6 +141,13 @@ public async Task<bool> RequestToken(string clientId, string clientSecret, strin
 
                 var client = new HttpClient(handler);
 
+
+                clientId = ValueExpression.CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientId);
+
+                clientSecret = ValueExpression.CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.ClientSecret);
+
+                address = ValueExpression.CredentialsCalculation(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.IdentityServiceURL);
+
                 var disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
                 {
                     Address = address,
@@ -158,7 +168,9 @@ public async Task<bool> RequestToken(string clientId, string clientSecret, strin
 
                 if (tokenResponse.HttpStatusCode == System.Net.HttpStatusCode.OK)
                 {
+                    validTo = DateTime.UtcNow.AddMinutes(60);
                     gingerAnalyticsUserConfig.Token = tokenResponse.AccessToken;
+                    //validTo = tokenResponse.ExpiresIn;
                     return true;
                 }
                 else
@@ -172,31 +184,33 @@ public async Task<bool> RequestToken(string clientId, string clientSecret, strin
                 return false;
             }
         }
-        /// <summary>
-        /// Calculates the actual value from the input string based on its type.
-        /// If the input is a value expression, it computes the expression to get the value.
-        /// If the input is an encrypted string, it decrypts the string to retrieve the original value.
-        /// Returns the input as is if it doesn't match the above conditions.
-        /// </summary>
-        /// <param name="value">The input string which might be a value expression or an encrypted string.</param>
-        /// <returns>The calculated or decrypted value, or the input string if no processing is needed.</returns>
-        private string CredentialsCalculation(string value)
-        {
 
-            if (ValueExpression.IsThisAValueExpression(value))
+        public bool IsTokenValid()
+        {
+            try
             {
-                valueExpression.DecryptFlag = true;
-                value = valueExpression.Calculate(value);
-                valueExpression.DecryptFlag = false;
-                return value;
+                if (string.IsNullOrEmpty(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.Token) || WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.Token.Split('.').Length != 3)
+                {
+                    return false;
+                }
+
+                var handler = new JwtSecurityTokenHandler();
+                var jwtToken = handler.ReadJwtToken(WorkSpace.Instance.Solution.GingerAnalyticsConfiguration.Token);
+                validTo = jwtToken.ValidTo;
+                if (DateTime.UtcNow < validTo)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
             }
-            else if (EncryptionHandler.IsStringEncrypted(value))
+            catch (Exception ex)
             {
-                value = EncryptionHandler.DecryptwithKey(value);
-                return value;
+                Reporter.ToLog(eLogLevel.ERROR, "Error occured in validate token", ex);
+                return false;
             }
-
-            return value;
         }
     }
 }
diff --git a/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs b/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
index d4e5faa073..e506ddaf8c 100644
--- a/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
+++ b/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
@@ -29,6 +29,23 @@ public class GingerAnalyticsConfiguration : RepositoryItemBase
     {
         public delegate void GingerAnalyticsConfigurationChangedEvent();
 
+
+        private string mName;
+
+        [IsSerializedForLocalRepository]
+        public string Name
+        {
+            get { return mName; }
+            set
+                {
+                if (mName != value)
+                    {
+                    mName = value;
+                    OnPropertyChanged(nameof(Name));
+                    }
+                }
+        }
+
         private string mAccountUrl;
         [IsSerializedForLocalRepository]
         public string AccountUrl
@@ -101,7 +118,19 @@ public string ClientSecret
             }
         }
 
-        public string Token = "token";
+        private string mToken = string.Empty;
+
+        public string Token
+        {
+            get { return mToken; }
+            set
+            {
+                if(mToken != value)
+                {
+                    mToken=value;
+                }
+            }
+        }
       
 
         public override string ItemName { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); }
diff --git a/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs b/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs
index e285e7aaa9..6b15b15e2b 100644
--- a/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs
+++ b/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs
@@ -1856,6 +1856,33 @@ public static string Calculate(ProjEnvironment ProjEnvironment, BusinessFlow Bus
             VE.Value = Value;
             return VE.ValueCalculated;
         }
+
+        /// <summary>
+        /// Calculates the actual value from the input string based on its type.
+        /// If the input is a value expression, it computes the expression to get the value.
+        /// If the input is an encrypted string, it decrypts the string to retrieve the original value.
+        /// Returns the input as is if it doesn't match the above conditions.
+        /// </summary>
+        /// <param name="value">The input string which might be a value expression or an encrypted string.</param>
+        /// <returns>The calculated or decrypted value, or the input string if no processing is needed.</returns>
+        public static string CredentialsCalculation(string value)
+        {
+            if (IsThisAValueExpression(value))
+            {
+                ValueExpression valueExpression = new();
+                valueExpression.DecryptFlag = true;
+                value = valueExpression.Calculate(value);
+                valueExpression.DecryptFlag = false;
+                return value;
+            }
+            else if (EncryptionHandler.IsStringEncrypted(value))
+            {
+                value = EncryptionHandler.DecryptwithKey(value);
+                return value;
+            }
+
+            return value;
+        }
     }
 
     public class Mockdata

From f720eaca4f337af0068143bd519ff0341ca80074 Mon Sep 17 00:00:00 2001
From: AMAN PRASAD <44187990+AmanPrasad43@users.noreply.github.com>
Date: Thu, 5 Sep 2024 15:17:25 +0530
Subject: [PATCH 5/9] Update Ginger.csproj

---
 Ginger/Ginger/Ginger.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ginger/Ginger/Ginger.csproj b/Ginger/Ginger/Ginger.csproj
index 7e15ace7b8..41e7b009ff 100644
--- a/Ginger/Ginger/Ginger.csproj
+++ b/Ginger/Ginger/Ginger.csproj
@@ -709,7 +709,7 @@
     <PackageReference Include="Ginger.ExecuterService.Contracts" Version="24.3.1" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.58" />
     <PackageReference Include="IdentityModel" Version="7.0.0" />
-    <PackageReference Include="LiteDB" Version="5.0.17" />
+    <PackageReference Include="LiteDB" Version="5.0.21" />
     <PackageReference Include="LiveCharts.Wpf.NetCore3" Version="0.9.7" />
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.5.0" />
@@ -725,7 +725,7 @@
     <PackageReference Include="Syncfusion.Shared.WPF" Version="20.1.0.55" />
     <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
     <PackageReference Include="System.Management" Version="8.0.0" />
     <PackageReference Include="System.Web.Services.Description" Version="8.0.0" />
     <PackageReference Include="System.Windows.Forms.DataVisualization" Version="1.0.0-prerelease.20110.1" />
@@ -2606,4 +2606,4 @@
     </None>
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>

From 630b928885a09fb260397e6d1ddb95ee972f61d7 Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Thu, 5 Sep 2024 19:55:23 +0530
Subject: [PATCH 6/9] Codacy issues fix

---
 .../GingerAnalyticsConfigurationPage.xaml.cs  | 131 ++++++++++--------
 1 file changed, 74 insertions(+), 57 deletions(-)

diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
index 5a60996eb9..9d9cffbb0a 100644
--- a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
@@ -29,6 +29,8 @@ limitations under the License.
 using Ginger.ValidationRules;
 using System.IdentityModel.Tokens.Jwt;
 using System.Linq;
+using Microsoft.IdentityModel.Tokens;
+using System.Text;
 
 namespace Ginger.ExternalConfigurations
 {
@@ -37,9 +39,8 @@ namespace Ginger.ExternalConfigurations
     /// </summary>
     public partial class GingerAnalyticsConfigurationPage : GingerUIPage
     {
-        public DateTime validTo;
-
-        private GingerAnalyticsConfiguration gingerAnalyticsUserConfig;
+        public DateTime validTo = DateTime.MinValue;
+        private GingerAnalyticsConfiguration gingerAnalyticsUserConfig = null;
         public GingerAnalyticsConfigurationPage()
         {
             InitializeComponent();
@@ -47,7 +48,7 @@ public GingerAnalyticsConfigurationPage()
         }
         private void Init()
         {
-            gingerAnalyticsUserConfig  = !WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<GingerAnalyticsConfiguration>().Any() ? new GingerAnalyticsConfiguration() : WorkSpace.Instance.SolutionRepository.GetFirstRepositoryItem<GingerAnalyticsConfiguration>();
+            gingerAnalyticsUserConfig  = WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<GingerAnalyticsConfiguration>().Count == 0 ? new GingerAnalyticsConfiguration() : WorkSpace.Instance.SolutionRepository.GetFirstRepositoryItem<GingerAnalyticsConfiguration>();
             gingerAnalyticsUserConfig.StartDirtyTracking();
             SetControls();
 
@@ -76,37 +77,45 @@ private void ApplyValidationRules()
 
         private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
         {
-            GingerCoreNET.GeneralLib.General.CreateGingerAnalyticsConfiguration(gingerAnalyticsUserConfig);
-            if (IsTokenValid())
+            if (AreRequiredFieldsEmpty())
             {
-                Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
+                Reporter.ToUser(eUserMsgKey.RequiredFieldsEmpty);
                 return;
             }
 
-            if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.AccountUrl) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.IdentityServiceURL)
-                || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientId) || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientSecret))
+            GingerCoreNET.GeneralLib.General.CreateGingerAnalyticsConfiguration(gingerAnalyticsUserConfig);
+
+            if (IsTokenValid())
             {
-                Reporter.ToUser(eUserMsgKey.RequiredFieldsEmpty);
+                Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
                 return;
             }
 
+            bool isAuthorized = await HandleTokenAuthorization();
+            ShowConnectionResult(isAuthorized);
+        }
 
-            if (gingerAnalyticsUserConfig != null && string.IsNullOrEmpty(gingerAnalyticsUserConfig.Token))
+        private bool AreRequiredFieldsEmpty()
+        {
+            return string.IsNullOrEmpty(gingerAnalyticsUserConfig.AccountUrl)
+                || string.IsNullOrEmpty(gingerAnalyticsUserConfig.IdentityServiceURL)
+                || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientId)
+                || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientSecret);
+        }
+
+        private async Task<bool> HandleTokenAuthorization()
+        {
+            if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.Token))
             {
+                return await RequestToken(gingerAnalyticsUserConfig.ClientId, gingerAnalyticsUserConfig.ClientSecret, gingerAnalyticsUserConfig.IdentityServiceURL);
+            }
 
-                bool isAuthorized = await RequestToken(gingerAnalyticsUserConfig.ClientId,gingerAnalyticsUserConfig.ClientSecret,
-                        gingerAnalyticsUserConfig.IdentityServiceURL);
+            return true;
+        }
 
-                if (isAuthorized)
-                {
-                    Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
-                }
-                else
-                {
-                    Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
-                }
-            }
-            else if (gingerAnalyticsUserConfig != null && !string.IsNullOrEmpty(gingerAnalyticsUserConfig.Token))
+        private static void ShowConnectionResult(bool isAuthorized)
+        {
+            if (isAuthorized)
             {
                 Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
             }
@@ -114,9 +123,9 @@ private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
             {
                 Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionFail);
             }
-
         }
 
+
         private void xClientSecretTextBox_LostKeyboardFocus(object sender, System.Windows.Input.KeyboardFocusChangedEventArgs e)
         {
             if (!EncryptionHandler.IsStringEncrypted(xClientSecretTextBox.ValueTextBox.Text))
@@ -135,53 +144,61 @@ private void xClientIdTextBox_LostKeyboardFocus(object sender, System.Windows.In
             }
         }
 
+
         public async Task<bool> RequestToken(string clientId, string clientSecret, string address)
         {
             try
             {
-                HttpClientHandler handler = new HttpClientHandler() { UseProxy = false };
-
-                var client = new HttpClient(handler);
-
-
-                clientId = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.ClientId);
-
-                clientSecret = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.ClientSecret);
-
-                address = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.IdentityServiceURL);
+                HttpClientHandler handler = new HttpClientHandler() { UseProxy = false};
 
-                var disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
+                using (var client = new HttpClient(handler))
                 {
-                    Address = address,
-                    Policy =
-                       {
-                       RequireHttps = true,
-                       ValidateIssuerName = true
-                       }
-                });
-
-                var tokenResponse = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
-                {
-                    Address = disco.TokenEndpoint,
-
-                    ClientId = clientId,
-                    ClientSecret = clientSecret,
-                });
+                    clientId = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.ClientId);
+                    clientSecret = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.ClientSecret);
+                    address = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.IdentityServiceURL);
+
+                    var disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
+                    {
+                        Address = address,
+                        Policy =
+                    {
+                RequireHttps = true,
+                ValidateIssuerName = true
+                    }
+                    });
+
+                    if (disco.IsError)
+                    {
+                        Reporter.ToLog(eLogLevel.ERROR, $"Discovery document error: {disco.Error}");
+                        return false;
+                    }
+
+                    var tokenResponse = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
+                    {
+                        Address = disco.TokenEndpoint,
+                        ClientId = clientId,
+                        ClientSecret = clientSecret
+                    });
+
+                    if (tokenResponse.IsError)
+                    {
+                        Reporter.ToLog(eLogLevel.ERROR, $"Token request error: {tokenResponse.Error}");
+                        return false;
+                    }
 
-                if (tokenResponse.HttpStatusCode == System.Net.HttpStatusCode.OK)
-                {
                     validTo = DateTime.UtcNow.AddMinutes(60);
                     gingerAnalyticsUserConfig.Token = tokenResponse.AccessToken;
                     return true;
                 }
-                else
-                {
-                    return false;
-                }
+            }
+            catch (HttpRequestException httpEx)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "HTTP request failed", httpEx);
+                return false;
             }
             catch (Exception ex)
             {
-                Reporter.ToLog(eLogLevel.ERROR, "Failed to connect to the server", ex);
+                Reporter.ToLog(eLogLevel.ERROR, "Unexpected error during token request", ex);
                 return false;
             }
         }

From 7ffaecec661575982a0fc03d25cbfe3833e0cec9 Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Wed, 11 Sep 2024 09:45:28 +0530
Subject: [PATCH 7/9] With Test Cases and other changes

---
 Ginger/.editorconfig                          |   1 +
 .../GingerAnalyticsAPI.cs                     | 120 +++++++++++++
 .../GingerAnalyticsConfigurationPage.xaml     |   4 +-
 .../GingerAnalyticsConfigurationPage.xaml.cs  | 117 ++++--------
 Ginger/Ginger/MenusLib/ConfigurationsMenu.cs  |   9 +
 .../Repository/GingerSolutionRepository.cs    |   2 +-
 .../ValueExpressionLib/ValueExpression.cs     |  24 ++-
 .../GingerAnalytics/GingerAnalyticsAPITest.cs | 167 ++++++++++++++++++
 .../GingerAnalyticsConfigPageTest.cs          | 105 +++++++++++
 .../GingerAnalyticsWizardTest.cs              |  12 ++
 Ginger/GingerTest/GingerTest.csproj           |   1 +
 11 files changed, 464 insertions(+), 98 deletions(-)
 create mode 100644 Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs
 create mode 100644 Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs
 create mode 100644 Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
 create mode 100644 Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs

diff --git a/Ginger/.editorconfig b/Ginger/.editorconfig
index 6624fe59dc..d383cc1f02 100644
--- a/Ginger/.editorconfig
+++ b/Ginger/.editorconfig
@@ -75,6 +75,7 @@ csharp_style_prefer_extended_property_pattern = true:suggestion
 csharp_style_var_for_built_in_types = true:none
 csharp_style_var_when_type_is_apparent = true:none
 csharp_style_var_elsewhere = true:none
+csharp_indent_braces = false
 
 [*.vb]
 #### Naming styles ####
diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs
new file mode 100644
index 0000000000..ac08837a00
--- /dev/null
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs
@@ -0,0 +1,120 @@
+#region License
+/*
+Copyright © 2014-2024 European Support Limited
+
+Licensed under the Apache License, Version 2.0 (the "License")
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. 
+*/
+#endregion
+
+using Ginger.Configurations;
+using Amdocs.Ginger.Common;
+using amdocs.ginger.GingerCoreNET;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System;
+using IdentityModel.Client;
+using System.IdentityModel.Tokens.Jwt;
+
+namespace Ginger.ExternalConfigurations
+{
+    public class GingerAnalyticsAPI
+    {
+        public static DateTime validTo = DateTime.MinValue;
+        public static GingerAnalyticsConfiguration gingerAnalyticsUserConfig =
+            WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<GingerAnalyticsConfiguration>().Count == 0 ? new GingerAnalyticsConfiguration() : WorkSpace.Instance.SolutionRepository.GetFirstRepositoryItem<GingerAnalyticsConfiguration>();
+       
+
+        public static async Task<bool> RequestToken(string clientId, string clientSecret, string address)
+        {
+            try
+            {
+                HttpClientHandler handler = new HttpClientHandler() { UseProxy = false };
+
+                using (var client = new HttpClient(handler))
+                {
+
+                    var disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
+                    {
+                        Address = address,
+                        Policy =
+                    {
+                RequireHttps = true,
+                ValidateIssuerName = true
+                    }
+                    });
+
+                    if (disco.IsError)
+                    {
+                        Reporter.ToLog(eLogLevel.ERROR, $"Discovery document error: {disco.Error}");
+                        return false;
+                    }
+
+                    var tokenResponse = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
+                    {
+                        Address = disco.TokenEndpoint,
+                        ClientId = clientId,
+                        ClientSecret = clientSecret
+                    });
+
+                    if (tokenResponse.IsError)
+                    {
+                        Reporter.ToLog(eLogLevel.ERROR, $"Token request error: {tokenResponse.Error}");
+                        return false;
+                    }
+
+                    validTo = DateTime.UtcNow.AddMinutes(60);
+                    gingerAnalyticsUserConfig.Token = tokenResponse.AccessToken;
+                    return true;
+                }
+            }
+            catch (HttpRequestException httpEx)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "HTTP request failed", httpEx);
+                return false;
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Unexpected error during token request", ex);
+                return false;
+            }
+        }
+
+        public static bool IsTokenValid()
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.Token) || gingerAnalyticsUserConfig.Token.Split('.').Length != 3)
+                {
+                    return false;
+                }
+
+                var handler = new JwtSecurityTokenHandler();
+                var jwtToken = handler.ReadJwtToken(gingerAnalyticsUserConfig.Token);
+                validTo = jwtToken.ValidTo;
+                if (DateTime.UtcNow < validTo)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Error occured in validate token", ex);
+                return false;
+            }
+        }
+    }
+}
diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
index d9152f927b..e2a265bfd7 100644
--- a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml
@@ -59,7 +59,9 @@
                     <Activities:UCValueExpression x:Name="xClientSecretTextBox" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="Client Secret" Margin="10,0,0,0" Width="400" LostKeyboardFocus="xClientSecretTextBox_LostKeyboardFocus"/>
                 </Grid>
                 <Grid>
-                    <Button x:Name="xTestConBtn" Click="xTestConBtn_Click" Content="Test Connection" Width="100" Background="White" Style="{StaticResource $InputButtonStyle}" Margin="10,15,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <Button x:Name="xTestConBtn" IsEnabled="True" Click="xTestConBtn_Click" Content="Test Connection" Width="100" Background="White" Style="{StaticResource $InputButtonStyle}" Margin="10,15,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" />
+                    <usercontrols:ImageMakerControl x:Name="xProcessingImage" ImageType="Processing" Margin="120,10,0,0" HorizontalAlignment="Left" Height="30" Width="20" Visibility="Hidden"></usercontrols:ImageMakerControl>
+
                 </Grid>
             </StackPanel>
         </Grid>
diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
index 9d9cffbb0a..69272c2e35 100644
--- a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsConfigurationPage.xaml.cs
@@ -39,8 +39,8 @@ namespace Ginger.ExternalConfigurations
     /// </summary>
     public partial class GingerAnalyticsConfigurationPage : GingerUIPage
     {
-        public DateTime validTo = DateTime.MinValue;
-        private GingerAnalyticsConfiguration gingerAnalyticsUserConfig = null;
+        public GingerAnalyticsConfiguration gingerAnalyticsUserConfig;
+        public GingerAnalyticsAPI analyticsAPI;
         public GingerAnalyticsConfigurationPage()
         {
             InitializeComponent();
@@ -48,6 +48,7 @@ public GingerAnalyticsConfigurationPage()
         }
         private void Init()
         {
+            analyticsAPI = new GingerAnalyticsAPI();
             gingerAnalyticsUserConfig  = WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<GingerAnalyticsConfiguration>().Count == 0 ? new GingerAnalyticsConfiguration() : WorkSpace.Instance.SolutionRepository.GetFirstRepositoryItem<GingerAnalyticsConfiguration>();
             gingerAnalyticsUserConfig.StartDirtyTracking();
             SetControls();
@@ -77,25 +78,33 @@ private void ApplyValidationRules()
 
         private async void xTestConBtn_Click(object sender, RoutedEventArgs e)
         {
+            ShowLoader();
+            xTestConBtn.IsEnabled = false;
             if (AreRequiredFieldsEmpty())
             {
                 Reporter.ToUser(eUserMsgKey.RequiredFieldsEmpty);
+                HideLoader();
+                xTestConBtn.IsEnabled = true;
                 return;
             }
 
             GingerCoreNET.GeneralLib.General.CreateGingerAnalyticsConfiguration(gingerAnalyticsUserConfig);
 
-            if (IsTokenValid())
+            if (GingerAnalyticsAPI.IsTokenValid())
             {
                 Reporter.ToUser(eUserMsgKey.GingerAnalyticsConnectionSuccess);
+                HideLoader();
+                xTestConBtn.IsEnabled = true;
                 return;
             }
 
             bool isAuthorized = await HandleTokenAuthorization();
             ShowConnectionResult(isAuthorized);
+            HideLoader();
+            xTestConBtn.IsEnabled = true;
         }
 
-        private bool AreRequiredFieldsEmpty()
+        public bool AreRequiredFieldsEmpty()
         {
             return string.IsNullOrEmpty(gingerAnalyticsUserConfig.AccountUrl)
                 || string.IsNullOrEmpty(gingerAnalyticsUserConfig.IdentityServiceURL)
@@ -103,17 +112,19 @@ private bool AreRequiredFieldsEmpty()
                 || string.IsNullOrEmpty(gingerAnalyticsUserConfig.ClientSecret);
         }
 
-        private async Task<bool> HandleTokenAuthorization()
+        public async Task<bool> HandleTokenAuthorization()
         {
             if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.Token))
             {
-                return await RequestToken(gingerAnalyticsUserConfig.ClientId, gingerAnalyticsUserConfig.ClientSecret, gingerAnalyticsUserConfig.IdentityServiceURL);
+                return await GingerAnalyticsAPI.RequestToken(ValueExpression.PasswordCalculation(gingerAnalyticsUserConfig.ClientId),
+                                          ValueExpression.PasswordCalculation(gingerAnalyticsUserConfig.ClientSecret),
+                                          ValueExpression.PasswordCalculation(gingerAnalyticsUserConfig.IdentityServiceURL));
             }
 
             return true;
         }
 
-        private static void ShowConnectionResult(bool isAuthorized)
+        public static void ShowConnectionResult(bool isAuthorized)
         {
             if (isAuthorized)
             {
@@ -145,90 +156,22 @@ private void xClientIdTextBox_LostKeyboardFocus(object sender, System.Windows.In
         }
 
 
-        public async Task<bool> RequestToken(string clientId, string clientSecret, string address)
+        
+
+        public void HideLoader()
         {
-            try
-            {
-                HttpClientHandler handler = new HttpClientHandler() { UseProxy = false};
-
-                using (var client = new HttpClient(handler))
-                {
-                    clientId = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.ClientId);
-                    clientSecret = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.ClientSecret);
-                    address = ValueExpression.CredentialsCalculation(gingerAnalyticsUserConfig.IdentityServiceURL);
-
-                    var disco = await client.GetDiscoveryDocumentAsync(new DiscoveryDocumentRequest
-                    {
-                        Address = address,
-                        Policy =
-                    {
-                RequireHttps = true,
-                ValidateIssuerName = true
-                    }
-                    });
-
-                    if (disco.IsError)
-                    {
-                        Reporter.ToLog(eLogLevel.ERROR, $"Discovery document error: {disco.Error}");
-                        return false;
-                    }
-
-                    var tokenResponse = await client.RequestClientCredentialsTokenAsync(new ClientCredentialsTokenRequest
-                    {
-                        Address = disco.TokenEndpoint,
-                        ClientId = clientId,
-                        ClientSecret = clientSecret
-                    });
-
-                    if (tokenResponse.IsError)
-                    {
-                        Reporter.ToLog(eLogLevel.ERROR, $"Token request error: {tokenResponse.Error}");
-                        return false;
-                    }
-
-                    validTo = DateTime.UtcNow.AddMinutes(60);
-                    gingerAnalyticsUserConfig.Token = tokenResponse.AccessToken;
-                    return true;
-                }
-            }
-            catch (HttpRequestException httpEx)
-            {
-                Reporter.ToLog(eLogLevel.ERROR, "HTTP request failed", httpEx);
-                return false;
-            }
-            catch (Exception ex)
-            {
-                Reporter.ToLog(eLogLevel.ERROR, "Unexpected error during token request", ex);
-                return false;
-            }
+        this.Dispatcher.Invoke(() =>
+        {
+            xProcessingImage.Visibility = Visibility.Hidden;
+        });
         }
 
-        public bool IsTokenValid()
+        public void ShowLoader()
         {
-            try
-            {
-                if (string.IsNullOrEmpty(gingerAnalyticsUserConfig.Token) || gingerAnalyticsUserConfig.Token.Split('.').Length != 3)
-                {
-                    return false;
-                }
-
-                var handler = new JwtSecurityTokenHandler();
-                var jwtToken = handler.ReadJwtToken(gingerAnalyticsUserConfig.Token);
-                validTo = jwtToken.ValidTo;
-                if (DateTime.UtcNow < validTo)
-                {
-                    return true;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            catch (Exception ex)
-            {
-                Reporter.ToLog(eLogLevel.ERROR, "Error occured in validate token", ex);
-                return false;
-            }
+        this.Dispatcher.Invoke(() =>
+        {
+            xProcessingImage.Visibility = Visibility.Visible;
+        });
         }
     }
 }
diff --git a/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs b/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs
index fce1bca771..4dff7912be 100644
--- a/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs
+++ b/Ginger/Ginger/MenusLib/ConfigurationsMenu.cs
@@ -94,6 +94,10 @@ private static TwoLevelMenu GetMenu()
             externalConfigMenu.Add(eImageType.GingerAnalytics, "Ginger Analytics Configuration", GetGingerAnalyticsPage, ConsoleKey.X, "Ginger Analytics Configuration", "Ginger Analytics Configuration AID");
             twoLevelMenu.Add(externalConfigMenu);
 
+            TopMenuItem accessiblityRulesMenu = new TopMenuItem(eImageType.Accessibility, $"{GingerCore.General.GetEnumValueDescription(typeof(eTermResKey), nameof(eTermResKey.AccessibilityRules))}", ConsoleKey.T, $"{GingerCore.General.GetEnumValueDescription(typeof(eTermResKey), nameof(eTermResKey.AccessibilityRules))}", "Name & rules of the Accessibility which been present current json");
+            accessiblityRulesMenu.Add(eImageType.Application, "", GetAccessibilityRulePage, ConsoleKey.T, "", "AID");
+            twoLevelMenu.Add(accessiblityRulesMenu);
+
             return twoLevelMenu;
         }
 
@@ -162,5 +166,10 @@ private static Page OthersPage()
         {
             return new Page();
         }
+
+        private static Page GetAccessibilityRulePage()
+        {
+            return (new AccessibilityRulePage());
+        }
     }
 }
diff --git a/Ginger/GingerCoreCommon/Repository/GingerSolutionRepository.cs b/Ginger/GingerCoreCommon/Repository/GingerSolutionRepository.cs
index ab4c55a0d5..dc3eab8b7d 100644
--- a/Ginger/GingerCoreCommon/Repository/GingerSolutionRepository.cs
+++ b/Ginger/GingerCoreCommon/Repository/GingerSolutionRepository.cs
@@ -68,7 +68,7 @@ public static SolutionRepository CreateGingerSolutionRepository()
             SR.AddItemInfo<RemoteServiceGrid>("*.Ginger.RemoteServiceGrid.xml", SolutionRepository.cSolutionRootFolderSign + "RemoteServiceGrid", true, "RemoteServiceGrid", PropertyNameForFileName: nameof(RemoteServiceGrid.Name));
 
             SR.AddItemInfo<AccessibilityConfiguration>("*.Ginger.Configuration.xml", SolutionRepository.cSolutionRootFolderSign + "Configurations", true, "AccessibilityConfiguration", PropertyNameForFileName: nameof(AccessibilityConfiguration.Name));
-            SR.AddItemInfo<GingerAnalyticsConfiguration>("*.Ginger.GingerAnalyticsConfiguration.xml", SolutionRepository.cSolutionRootFolderSign + "GingerAnalyticsConfiguration", true, "GingerAnalyticsConfiguration", PropertyNameForFileName: nameof(GingerAnalyticsConfiguration.Name));
+            SR.AddItemInfo<GingerAnalyticsConfiguration>("*.Ginger.Configuration.xml", SolutionRepository.cSolutionRootFolderSign + "Configurations", true, "GingerAnalyticsConfiguration", PropertyNameForFileName: nameof(GingerAnalyticsConfiguration.Name));
 
 
             return SR;
diff --git a/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs b/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs
index 1777af8683..075edb04d3 100644
--- a/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs
+++ b/Ginger/GingerCoreNET/ValueExpressionLib/ValueExpression.cs
@@ -1865,22 +1865,28 @@ public static string Calculate(ProjEnvironment ProjEnvironment, BusinessFlow Bus
         /// </summary>
         /// <param name="value">The input string which might be a value expression or an encrypted string.</param>
         /// <returns>The calculated or decrypted value, or the input string if no processing is needed.</returns>
-        public static string CredentialsCalculation(string value)
+        public static string PasswordCalculation(string value)
         {
+            try
+            {
             if (IsThisAValueExpression(value))
             {
-                ValueExpression valueExpression = new();
-                valueExpression.DecryptFlag = true;
-                value = valueExpression.Calculate(value);
-                valueExpression.DecryptFlag = false;
-                return value;
+            ValueExpression valueExpression = new();
+            valueExpression.DecryptFlag = true;
+            value = valueExpression.Calculate(value);
+            valueExpression.DecryptFlag = false;
+            return value;
             }
             else if (EncryptionHandler.IsStringEncrypted(value))
             {
-                value = EncryptionHandler.DecryptwithKey(value);
-                return value;
+            value = EncryptionHandler.DecryptwithKey(value);
+            return value;
+            }
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR,"Unable to decrypt the value expression", ex);
             }
-
             return value;
         }
     }
diff --git a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs
new file mode 100644
index 0000000000..d792000666
--- /dev/null
+++ b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs
@@ -0,0 +1,167 @@
+using Ginger.ExternalConfigurations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.IdentityModel.Tokens.Jwt;
+using Microsoft.IdentityModel.Tokens;
+using System.Threading;
+using System.Net;
+using Ginger.Configurations;
+
+namespace GingerAnalyticsAPITest
+{
+    [TestClass]
+    public class GingerAnalyticsAPITest
+    {
+        private Mock<HttpMessageHandler> _mockHttpHandler;
+        private Mock<HttpClient> _mockHttpClient;
+        private GingerAnalyticsConfiguration _mockUserConfig;
+
+
+        [TestInitialize]
+        public void Setup()
+        {
+            _mockUserConfig = new GingerAnalyticsConfiguration()
+            {
+                Name = "test",
+                Token = "oijfdsfdsfsijwoieoweiwefjesofjewofrjew",
+                AccountUrl = "http://valid.url",
+                IdentityServiceURL = "http://identity.url",
+                ClientId = "client-id",
+                ClientSecret = "client-secret",
+                ItemName = "test",
+            };
+            _mockHttpHandler = new Mock<HttpMessageHandler>();
+            _mockHttpClient = new Mock<HttpClient>();
+
+        }
+
+        [TestMethod]
+        public async Task RequestToken_SuccessfulTokenRequest_ReturnsTrue()
+        {
+            // Arrange
+            var mockDiscoveryResponse = new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent("{\"token_endpoint\":\"http://mocktokenendpoint\"}"),
+            };
+
+            // Mocking a successful token request response
+            var mockTokenResponse = new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent("{\"access_token\":\"mockAccessToken\"}"),
+            };
+
+            _mockHttpClient
+                .SetupSequence(m => m.SendAsync(It.IsAny<HttpRequestMessage>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(mockDiscoveryResponse) 
+                .ReturnsAsync(mockTokenResponse);
+
+
+            // Act
+            var result = await GingerAnalyticsAPI.RequestToken("client-id", "client-secret", "http://testaddress");
+
+            // Assert
+            Assert.IsTrue(result, "Token request should succeed.");
+        }
+
+        [TestMethod]
+        public async Task RequestToken_FailedTokenRequest_ReturnsFalse()
+        {
+            // Arrange
+            var mockDiscoveryResponse = new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent("{\"token_endpoint\":\"http://mocktokenendpoint\"}"),
+            };
+
+            
+            var mockFailedTokenResponse = new HttpResponseMessage(HttpStatusCode.BadRequest)
+            {
+                Content = new StringContent("{\"error\":\"invalid_client\"}"),
+            };
+
+            _mockHttpClient
+                .SetupSequence(m => m.SendAsync(It.IsAny<HttpRequestMessage>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(mockDiscoveryResponse)  
+                .ReturnsAsync(mockFailedTokenResponse);
+
+
+            // Act
+            var result = await GingerAnalyticsAPI.RequestToken("client-id", "client-secret", "http://mock.url");
+
+            // Assert
+            Assert.IsFalse(result, "Token request should fail.");
+        }
+
+        [TestMethod]
+        public void IsTokenValid_ValidToken_ReturnsTrue()
+        {
+            // Arrange
+            string validToken = CreateValidJwtToken();
+            GingerAnalyticsAPI.gingerAnalyticsUserConfig.Token = validToken;
+
+            // Act
+            bool result = GingerAnalyticsAPI.IsTokenValid();
+
+            // Assert
+            Assert.IsTrue(result, "Token should be valid.");
+        }
+
+        [TestMethod]
+        public void IsTokenValid_InvalidToken_ReturnsFalse()
+        {
+            // Arrange
+            string invalidToken = "invalid.token.string";
+            GingerAnalyticsAPI.gingerAnalyticsUserConfig.Token = invalidToken;
+
+            // Act
+            bool result = GingerAnalyticsAPI.IsTokenValid();
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        [TestMethod]
+        public void IsTokenValid_ExpiredToken_ReturnsFalse()
+        {
+            // Arrange
+            string expiredToken = CreateExpiredJwtToken(_mockUserConfig.Token);
+            GingerAnalyticsAPI.gingerAnalyticsUserConfig.Token = expiredToken;
+
+            // Act
+            bool result = GingerAnalyticsAPI.IsTokenValid();
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        private string CreateValidJwtToken()
+        {
+            var tokenHandler = new JwtSecurityTokenHandler();
+            var key = Convert.FromBase64String(_mockUserConfig.Token);
+            var tokenDescriptor = new SecurityTokenDescriptor
+            {
+                Expires = DateTime.UtcNow.AddMinutes(60),
+                SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
+            };
+
+            var token = tokenHandler.CreateToken(tokenDescriptor);
+            return tokenHandler.WriteToken(token);
+        }
+
+        private string CreateExpiredJwtToken(string t)
+        {
+            var tokenHandler = new JwtSecurityTokenHandler();
+            var key = Convert.FromBase64String(_mockUserConfig.Token);
+            var tokenDescriptor = new SecurityTokenDescriptor
+            {
+                Expires = DateTime.UtcNow.AddMinutes(-70), // Expired 70 minutes ago
+                SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
+            };
+
+            var token = tokenHandler.CreateToken(tokenDescriptor);
+            return tokenHandler.WriteToken(token);
+        }
+    }
+}
diff --git a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
new file mode 100644
index 0000000000..83d48707c9
--- /dev/null
+++ b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
@@ -0,0 +1,105 @@
+using Ginger.Configurations;
+using Ginger.ExternalConfigurations;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Moq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Threading;
+
+namespace GingerTest.GingerAnalytics
+{
+    [TestClass]
+    public class GingerAnalyticsConfigPageTest
+    {
+        [ClassInitialize]
+        public static void ClassInitialize(TestContext context)
+        {
+            // This ensures all tests run on an STA thread
+            Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
+        }
+
+        private GingerAnalyticsConfigurationPage _page;
+        private Mock<GingerAnalyticsAPI> _mockAnalyticsAPI;
+        private GingerAnalyticsConfiguration _mockUserConfig;
+
+        [TestInitialize]
+        public void Setup()
+        {
+            _page = Application.Current.Dispatcher.Invoke(() => new GingerAnalyticsConfigurationPage());
+            _mockAnalyticsAPI = new Mock<GingerAnalyticsAPI>();
+            _mockUserConfig = new GingerAnalyticsConfiguration()
+            {
+                AccountUrl = "http://valid.url",
+                IdentityServiceURL = "http://identity.url",
+                ClientId = "client-id",
+                ClientSecret = "client-secret"
+            };
+
+            // Inject mock objects
+            _page.analyticsAPI = _mockAnalyticsAPI.Object;
+        }
+
+        [TestMethod]
+        [STAThread]
+        public void AreRequiredFieldsEmpty_WhenFieldsAreNotEmpty_ReturnsFalse()
+        {
+            // Arrange
+            _page.gingerAnalyticsUserConfig = _mockUserConfig;
+
+            // Act
+            bool result = _page.AreRequiredFieldsEmpty();
+
+            // Assert
+            Assert.IsFalse(result, "Required fields should not be empty.");
+        }
+
+        [TestMethod]
+        [STAThread]
+        public void AreRequiredFieldsEmpty_WhenFieldsAreEmpty_ReturnsTrue()
+        {
+            // Arrange
+            _page.gingerAnalyticsUserConfig = new GingerAnalyticsConfiguration();
+
+            // Act
+            bool result = _page.AreRequiredFieldsEmpty();
+
+            // Assert
+            Assert.IsTrue(result, "Required fields should be empty.");
+        }
+
+        [TestMethod]
+        public async Task HandleTokenAuthorization_WithEmptyToken_RequestsNewToken()
+        {
+            // Arrange
+            _mockUserConfig.Token = string.Empty;
+            _page.gingerAnalyticsUserConfig = _mockUserConfig;
+
+            _mockAnalyticsAPI.Setup(GingerAnalyticsAPI => GingerAnalyticsAPI.RequestToken(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+                             .Returns(Task.FromResult(true));
+
+            // Act
+            bool result = await _page.HandleTokenAuthorization();
+
+            // Assert
+            Assert.IsTrue(result, "Token request should be successful.");
+            _mockAnalyticsAPI.Verify(GingerAnalyticsAPI => GingerAnalyticsAPI.RequestToken(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+        }
+
+        [TestMethod]
+        [STAThread]
+        public void ShowConnectionResult_WhenAuthorized_ShowsSuccessMessage()
+        {
+            // Arrange
+            bool isAuthorized = true;
+
+            // Act & Assert
+            Assert.ThrowsException<NullReferenceException>(() => Ginger.ExternalConfigurations.GingerAnalyticsConfigurationPage.ShowConnectionResult(isAuthorized));
+            // Note: Reporter usage should be mocked if necessary to avoid the exception.
+        }
+
+    }
+}
diff --git a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs
new file mode 100644
index 0000000000..06ae12b748
--- /dev/null
+++ b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GingerTest.GingerAnalytics
+{
+    internal class GingerAnalyticsWizardTest
+    {
+    }
+}
diff --git a/Ginger/GingerTest/GingerTest.csproj b/Ginger/GingerTest/GingerTest.csproj
index b1629faf26..2c3ff432f2 100644
--- a/Ginger/GingerTest/GingerTest.csproj
+++ b/Ginger/GingerTest/GingerTest.csproj
@@ -21,6 +21,7 @@
     <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="13.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="coverlet.collector" Version="3.1.0" />

From c146ab2746045f53637370adce9de1c92c575497 Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Mon, 16 Sep 2024 15:00:21 +0530
Subject: [PATCH 8/9] Environment Changes + Config Chnages

---
 Ginger/Ginger/Environments/AppsListPage.xaml  |   5 +-
 .../Ginger/Environments/AppsListPage.xaml.cs  | 170 +++++++++-
 .../AddGingerAnalyticsEnvPage.xaml            |  40 +++
 .../AddGingerAnalyticsEnvPage.xaml.cs         | 262 ++++++++++++++++
 .../AddGingerAnalyticsEnvWizard.cs            |  65 ++++
 .../GingerAnalyticsAPIResponseInfo.cs         | 117 +++++++
 .../GingerAnalyticsApplicationPage.xaml       |  19 ++
 .../GingerAnalyticsApplicationPage.xaml.cs    |  81 +++++
 .../GingerAnalyticsIntroPage.xaml             |  14 +
 .../GingerAnalyticsIntroPage.xaml.cs          |  71 +++++
 .../GingerAnalyticsAPI.cs                     | 159 +++++++++-
 .../EnvironmentsFolderTreeItem.cs             |   7 +
 .../UserControlsLib/MultiSelectComboBox.xaml  |  12 +-
 .../EnvironmentLib/EnvApplication.cs          |  12 +
 .../Environments/ProjEnvironment.cs           |  21 +-
 .../PlatformsLib/ApplicationPlatform.cs       |   6 +-
 .../GingerAnalytics/GingerAnalyticsAPITest.cs | 294 ++++++++++--------
 .../GingerAnalyticsConfigPageTest.cs          |  14 +-
 .../GingerAnalyticsWizardTest.cs              |  12 -
 19 files changed, 1225 insertions(+), 156 deletions(-)
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsAPIResponseInfo.cs
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml
 create mode 100644 Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs
 delete mode 100644 Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs

diff --git a/Ginger/Ginger/Environments/AppsListPage.xaml b/Ginger/Ginger/Environments/AppsListPage.xaml
index 9b7b3fd5ba..f59355f122 100644
--- a/Ginger/Ginger/Environments/AppsListPage.xaml
+++ b/Ginger/Ginger/Environments/AppsListPage.xaml
@@ -5,6 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:Ginger="clr-namespace:Ginger" x:Class="Ginger.Environments.AppsListPage" 
       xmlns:UserControlsLib="clr-namespace:Ginger.UserControlsLib"
+    xmlns:usercontrols2="clr-namespace:Amdocs.Ginger.UserControls"
       mc:Ignorable="d" 
      xmlns:h="clr-namespace:Ginger.Help"
     xmlns:usercontrols="clr-namespace:Ginger.UserControlsLib" h:GingerHelpProvider.HelpString="Environment"
@@ -29,7 +30,9 @@
             <StackPanel>
                 <DockPanel>
                     <Label  Style="{StaticResource $LabelStyle}" Content="Release:"/>
-                    <ComboBox x:Name="xReleaseCombobox" Style="{StaticResource $FlatEditInputComboBoxStyle}"  MinWidth="300px"  HorizontalAlignment="Left"></ComboBox>
+                    <ComboBox x:Name="xReleaseCombobox" IsEnabled="True" Style="{StaticResource $FlatEditInputComboBoxStyle}"  MinWidth="300px"  HorizontalAlignment="Left"></ComboBox>
+                    <usercontrols2:ImageMakerControl x:Name="xProcessingImage" ImageType="Processing" Margin="640,0,0,0" HorizontalAlignment="Left" Height="30" Width="20" Visibility="Hidden"></usercontrols2:ImageMakerControl>
+                    <Button x:Name="xGASyncBtn" IsEnabled="True" Style="{StaticResource $InputButtonStyle}" Visibility="Collapsed" Margin="0,0,10,0" HorizontalAlignment="Right"  Click="xGASyncBtn_Click" FontWeight="Bold" Content="Sync with Ginger Analytics"/>
                 </DockPanel>
 
                 <CheckBox x:Name="xPublishcheckbox" Content="Publish" ToolTip="Publish to third party applications" DockPanel.Dock="Top" HorizontalAlignment="Left" Margin="0,5,0,0"  Style="{StaticResource $CeckBoxStyle}"/>
diff --git a/Ginger/Ginger/Environments/AppsListPage.xaml.cs b/Ginger/Ginger/Environments/AppsListPage.xaml.cs
index 58446c04b1..17f451cd8d 100644
--- a/Ginger/Ginger/Environments/AppsListPage.xaml.cs
+++ b/Ginger/Ginger/Environments/AppsListPage.xaml.cs
@@ -20,17 +20,24 @@ limitations under the License.
 using Amdocs.Ginger.Common;
 using Amdocs.Ginger.CoreNET.Run.SolutionCategory;
 using Amdocs.Ginger.Repository;
+using Ginger.Environments.GingerAnalyticsEnvWizardLib;
+using Ginger.ExternalConfigurations;
 using Ginger.SolutionWindows.TreeViewItems.EnvironmentsTreeItems;
 using Ginger.UserControls;
 using Ginger.UserControlsLib;
 using GingerCore.Environments;
 using GingerCore.GeneralLib;
 using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
+using GingerTest.WizardLib;
+using Microsoft.Graph;
+using Microsoft.Identity.Client.Kerberos;
 using Microsoft.VisualStudio.Services.Common;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using static Ginger.Environments.GingerAnalyticsEnvWizardLib.GingerAnalyticsAPIResponseInfo;
 
 namespace Ginger.Environments
 {
@@ -40,6 +47,8 @@ namespace Ginger.Environments
     public partial class AppsListPage : GingerUIPage
     {
         public ProjEnvironment AppEnvironment { get; set; }
+        public AddGingerAnalyticsEnvPage AddGingerAnalyticsEnvPage;
+        public GingerAnalyticsAPI GingerAnalyticsAPI;
         public AppsListPage(ProjEnvironment env)
         {
             InitializeComponent();
@@ -50,12 +59,23 @@ public AppsListPage(ProjEnvironment env)
             SetGridView();
             SetGridData();
 
+            if (AppEnvironment.GAFlag)
+            {
+                EnvNameTextBox.IsEnabled = false;
+                xGASyncBtn.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                EnvNameTextBox.IsEnabled = true;
+                xGASyncBtn.Visibility = Visibility.Collapsed;
+                InitReleaseComboBox();
+            }
+
             BindingHandler.ObjFieldBinding(EnvNameTextBox, TextBox.TextProperty, env, ProjEnvironment.Fields.Name);
             EnvNameTextBox.AddValidationRule(new EnvironemntNameValidationRule());
             xShowIDUC.Init(AppEnvironment);
             BindingHandler.ObjFieldBinding(xPublishcheckbox, CheckBox.IsCheckedProperty, AppEnvironment, nameof(RepositoryItemBase.Publish));
 
-            InitReleaseComboBox();
 
             grdApps.btnAdd.AddHandler(Button.ClickEvent, new RoutedEventHandler(AddApp));
             grdApps.AddToolbarTool("@Share_16x16.png", "Add Selected Applications to All Environments", new RoutedEventHandler(AddAppsToOtherEnvironments));
@@ -158,5 +178,153 @@ private void EnvNameTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
             grdApps.Title = $"'{EnvNameTextBox.Text}' Environment Applications";
         }
+
+        private async void xGASyncBtn_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                xGASyncBtn.IsEnabled = false;
+                ShowLoader();
+                AddGingerAnalyticsEnvPage = new();
+                GingerAnalyticsAPI = new();
+                AddGingerAnalyticsEnvPage.environmentListGA = await GingerAnalyticsAPI.FetchApplicationDataFromGA(AppEnvironment.GingerAnalyticsEnvId.ToString(), AddGingerAnalyticsEnvPage.environmentListGA);
+
+                foreach (var appEnv in AddGingerAnalyticsEnvPage.environmentListGA)
+                {
+                    var appListEnv = appEnv.Value.GingerAnalyticsApplications;
+                    foreach (var item in appListEnv)
+                    {
+                        var existingApp = AppEnvironment.Applications.FirstOrDefault(k => k.GAId == item.Id);
+                        if (existingApp != null)
+                        {
+                            UpdateExistingApplication(existingApp, item);
+                        }
+                        else
+                        {
+                            AddNewApplication(item);
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Failed to Sync with Ginger Analytics", ex);
+            }
+            finally
+            {
+                HideLoader();
+                xGASyncBtn.IsEnabled = true;
+            }
+        }
+
+        private void UpdateExistingApplication(EnvApplication existingApp, GingerAnalyticsApplication item)
+        {
+            if (!existingApp.Equals(item))
+            {
+                existingApp.Name = item.Name;
+                existingApp.Platform = MapToPlatformType(item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application Type")?.Value);
+                existingApp.Url = item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application URL")?.Value;
+
+                // Add all other parameters to GeneralParams
+                foreach (var param in item.GAApplicationParameters)
+                {
+                    if (param.Name != "Application Type" && param.Name != "Application URL")
+                    {
+                        existingApp.GeneralParams.Add(new GeneralParam { Name = param.Name, Value = param.Value });
+                    }
+                }
+                
+                UpdateApplicationPlatform(existingApp, item);
+            }
+        }
+
+        private void AddNewApplication(GingerAnalyticsApplication item)
+        {
+            if (!string.IsNullOrEmpty(item.Name) && !string.IsNullOrEmpty(item.Id))
+            {
+                var platformType = MapToPlatformType(item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application Type")?.Value);
+                var appUrl = item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application URL")?.Value;
+
+                EnvApplication newEnvApp = new() { Name = item.Name, Platform = platformType, GAId = item.Id, Active = true, Url = appUrl, GeneralParams = new ObservableList<GeneralParam>() };
+
+                // Add all other parameters to GeneralParams
+                foreach (var param in item.GAApplicationParameters)
+                {
+                    if (param.Name != "Application Type" && param.Name != "Application URL")
+                    {
+                        newEnvApp.GeneralParams.Add(new GeneralParam { Name = param.Name, Value = param.Value });
+                    }
+                }
+
+                AppEnvironment.Applications.Add(newEnvApp);
+
+                UpdateApplicationPlatform(newEnvApp, item);
+            }
+        }
+
+        private void UpdateApplicationPlatform(EnvApplication app, GingerAnalyticsApplication item)
+        {
+            var existingPlatform = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.GAId == item.Id);
+            if (existingPlatform == null)
+            {
+                AddApplicationPlatform(app, item);
+            }
+            else
+            {
+                existingPlatform.AppName = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.AppName == item.Name) == null
+                    ? item.Name : item.Name + "_GingerAnalytics";
+                existingPlatform.Platform = app.Platform;
+            }
+        }
+
+        private void AddApplicationPlatform(EnvApplication app, GingerAnalyticsApplication item)
+        {
+            var selectedApp = new ApplicationPlatform
+            {
+                AppName = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.AppName == item.Name) != null
+                    ? item.Name + "_GingerAnalytics" : item.Name,
+                Platform = app.Platform,
+                GAId = item.Id
+            };
+
+            WorkSpace.Instance.Solution.ApplicationPlatforms.Add(selectedApp);
+        }
+
+        private ePlatformType MapToPlatformType(string applicationType)
+        {
+            return applicationType switch
+            {
+                "Web" => ePlatformType.Web,
+                "Mobile" => ePlatformType.Mobile,
+                "Unix" => ePlatformType.Unix,
+                "ASCF" => ePlatformType.ASCF,
+                "DOS" => ePlatformType.DOS,
+                "VBScript" => ePlatformType.VBScript,
+                "WebServices" => ePlatformType.WebServices,
+                "PowerBuilder" => ePlatformType.PowerBuilder,
+                "Java" => ePlatformType.Java,
+                "MainFrame" => ePlatformType.MainFrame,
+                "Service" => ePlatformType.Service,
+                "Windows" => ePlatformType.Windows,
+                "NA" => ePlatformType.NA,
+                _ => throw new ArgumentException($"Unknown platform type: {applicationType}")
+            };
+        }
+
+        private void HideLoader()
+        {
+            this.Dispatcher.Invoke(() =>
+            {
+                xProcessingImage.Visibility = Visibility.Hidden;
+            });
+        }
+
+        private  void ShowLoader()
+        {
+            this.Dispatcher.Invoke(() =>
+            {
+                xProcessingImage.Visibility = Visibility.Visible;
+            });
+        }
     }
 }
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml
new file mode 100644
index 0000000000..c5dd42920d
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml
@@ -0,0 +1,40 @@
+<Page x:Class="Ginger.Environments.GingerAnalyticsEnvWizardLib.AddGingerAnalyticsEnvPage"
+      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" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Ginger.Environments.GingerAnalyticsEnvWizardLib"
+      xmlns:usercontrols2="clr-namespace:Amdocs.Ginger.UserControls"
+      xmlns:UserControlsLib="clr-namespace:Ginger.UserControlsLib"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="AddGingerAnalyticsEnvPage">
+
+    <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="40"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="90"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <!-- Project Label and ComboBox -->
+        <Label x:Name="xProject" Grid.Column="0" Grid.Row="0" Content="Project :" Margin="0,10,0,0" Style="{StaticResource $LabelStyle}"/>
+        <ComboBox x:Name="xProjectComboBox" Grid.Column="1" Margin="0,0,0,0" Style="{StaticResource $FlatInputComboBoxStyle}" HorizontalAlignment="Left" SelectionChanged="xProjectComboBox_SelectionChanged" ToolTip="Select Ginger Analytics Project" Width="180"/>
+
+
+        <!-- Architecture Label and ComboBox -->
+        <Label x:Name="xArchitecture" Grid.Row="1" Grid.Column="0" Content="Architecture :" Margin="0,10,0,0" Style="{StaticResource $LabelStyle}"/>
+        <ComboBox x:Name="xArchitectureComboBox" Grid.Row="1" Grid.Column="1" Margin="0,0,0,0" Style="{StaticResource $FlatInputComboBoxStyle}" HorizontalAlignment="Left" SelectionChanged="xArchitectureComboBox_SelectionChanged" ToolTip="Select Ginger Analytics Architecture"  Width="180"/>
+
+
+        <!-- Environment Label and ComboBox -->
+        <Label x:Name="xEnvironment" Grid.Row="2" Grid.Column="0" Content="Environment :" Margin="0,10,0,0" Style="{StaticResource $LabelStyle}"/>
+        <UserControlsLib:MultiSelectComboBox x:Name="xEnvironmentComboBox" Grid.Row="2" Grid.Column="1" Margin="0,0,0,0"  HorizontalAlignment="Left" ToolTip="Select Ginger Analytics Environment" Width="180"/>
+
+    </Grid>
+</Page>
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs
new file mode 100644
index 0000000000..36a6a99541
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs
@@ -0,0 +1,262 @@
+using GingerWPF.WizardLib;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using Amdocs.Ginger.Common;
+using amdocs.ginger.GingerCoreNET;
+using Ginger.ExternalConfigurations;
+using System.Linq;
+using static Ginger.Environments.GingerAnalyticsEnvWizardLib.GingerAnalyticsAPIResponseInfo;
+using Microsoft.CodeAnalysis;
+using GingerCore.Environments;
+using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
+using Ginger.UserControlsLib;
+using GingerCore.GeneralLib;
+using System.Windows;
+using Amdocs.Ginger.Repository;
+
+namespace Ginger.Environments.GingerAnalyticsEnvWizardLib
+{
+    /// <summary>
+    /// Interaction logic for AddGingerAnalyticsEnvPage.xaml
+    /// </summary>
+    public partial class AddGingerAnalyticsEnvPage : Page,IWizardPage
+    {
+        public GingerAnalyticsConfigurationPage gingerAnalyticsConfiguration;
+        public GingerAnalyticsAPIResponseInfo responseInfo;
+        public Dictionary<string, GingerAnalyticsProject> projectListGA = new();
+        public Dictionary<string, GingerAnalyticsArchitectureB> architectureListGA = new();
+        public Dictionary<string, GingerAnalyticsEnvironmentB> environmentListGA = new();
+        public GingerAnalyticsAPI GingerAnalyticsAPI { get; private set; }
+        AddGingerAnalyticsEnvWizard mWizard;
+        private string bearerToken = string.Empty;
+
+        public AddGingerAnalyticsEnvPage()
+        {
+            responseInfo = new GingerAnalyticsAPIResponseInfo();
+            GingerAnalyticsAPI = new();
+            InitializeComponent();
+            LoadComboBoxData();
+            BindingHandler.ObjFieldBinding(xEnvironmentComboBox, MultiSelectComboBox.SelectedItemsProperty,responseInfo, nameof(GingerAnalyticsAPIResponseInfo.GingerAnalyticsEnvironmentB));
+
+        }
+
+        private async void LoadComboBoxData()
+        {
+            // Fetching data from the API and populating ComboBoxes
+            projectListGA = await GingerAnalyticsAPI.FetchProjectDataFromGA(projectListGA);
+
+            xProjectComboBox.ItemsSource = projectListGA.Values.ToList();
+            xProjectComboBox.DisplayMemberPath = "Name";  
+            xProjectComboBox.SelectedValuePath = "Id";    
+
+        }
+
+        
+
+        public void WizardEvent(WizardEventArgs WizardEventArgs)
+        {
+            switch (WizardEventArgs.EventType)
+            {
+                case EventType.Init:
+                    mWizard = (AddGingerAnalyticsEnvWizard)WizardEventArgs.Wizard;
+
+                    foreach (var appPlat in environmentListGA)
+                    {
+                        EnvApplication envApp = new EnvApplication() { Name = appPlat.Value.Name, ParentGuid = new Guid(appPlat.Key), GAId=appPlat.Value.Id };
+                        envApp.Active = true;
+                        mWizard.apps.Add(envApp);
+                    }
+                break;
+                case EventType.LeavingForNextPage:
+                    xEnvironmentComboBox_SelectionChanged();
+                    break;
+
+            }
+        }
+
+        private void xProjectComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!string.IsNullOrEmpty(xEnvironmentComboBox.Text))
+            {
+                xEnvironmentComboBox.ItemsSource.Clear();
+            }
+
+            if (xProjectComboBox.SelectedItem is GingerAnalyticsProject selectedProject)
+            {
+                // Get the project Id
+                var projectId = selectedProject.Id;
+
+                if (projectListGA.TryGetValue(projectId, out var project))
+                {
+                    xArchitectureComboBox.ItemsSource = project.GingerAnalyticsArchitecture;
+                    xArchitectureComboBox.DisplayMemberPath = "Name";
+                    xArchitectureComboBox.SelectedValuePath = "Id";
+                }
+            }
+        }
+
+        public async void xArchitectureComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (xArchitectureComboBox.SelectedItem is GingerAnalyticsArchitectureA selectedArchitecture)
+            {
+                string architectureId = selectedArchitecture.Id;
+
+                // Fetch environments for the selected architecture
+                architectureListGA = await GingerAnalyticsAPI.FetchEnvironmentDataFromGA(architectureId, architectureListGA);
+
+                // Update the Environment ComboBox
+                if (architectureListGA.TryGetValue(architectureId, out var architecture))
+                {
+                    Dictionary<string,object> keyValuePairs = new Dictionary<string,object>();
+                    foreach (var keyValue in architecture.GingerAnalyticsEnvironment)
+                    {
+                        keyValuePairs.Add(keyValue.Name,keyValue.Id);
+                    }
+                    xEnvironmentComboBox.ItemsSource = keyValuePairs;
+                    xEnvironmentComboBox.Name = "Name";
+                    
+                    xEnvironmentComboBox.Init(responseInfo, nameof(GingerAnalyticsAPIResponseInfo.GingerAnalyticsEnvironmentB));
+                }
+            }
+        }
+
+        public async void xEnvironmentComboBox_SelectionChanged()
+        {
+            try
+            {
+                foreach (var env in xEnvironmentComboBox.SelectedItems)
+                {
+                    await HandleEnvironmentSelection(env);
+                }
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Failed to get details from Ginger Analytics", ex);
+            }
+        }
+
+        private async Task HandleEnvironmentSelection(dynamic env)
+        {
+            string environmentId = env.Guid.ToString();
+
+            mWizard.NewEnvironment = CreateNewEnvironment(env);
+
+            // Fetch environments for the selected architecture
+            environmentListGA = await GingerAnalyticsAPI.FetchApplicationDataFromGA(environmentId, environmentListGA);
+
+            foreach (var ienv in environmentListGA)
+            {
+                var appList = ienv.Value;
+                await AddApplicationsToEnvironment(appList, mWizard.NewEnvironment);
+            }
+
+            mWizard.ImportedEnvs.Add(mWizard.NewEnvironment);
+        }
+
+        private ProjEnvironment CreateNewEnvironment(dynamic env)
+        {
+            return new ProjEnvironment
+            {
+                Name = env.Value,
+                GingerAnalyticsEnvId = env.Guid,
+                GAFlag = true
+            };
+        }
+
+        private async Task AddApplicationsToEnvironment(GingerAnalyticsAPIResponseInfo.GingerAnalyticsEnvironmentB appList, ProjEnvironment newEnvironment)
+        {
+            foreach (var item in appList.GingerAnalyticsApplications)
+            {
+                var platformType = GetPlatformType(item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application Type"));
+                var appUrl = item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application URL")?.Value;
+
+
+                var envApp = new EnvApplication
+                {
+                    Name = item.Name,
+                    Platform = platformType,
+                    GAId = item.Id,
+                    Active = true,
+                    Url = appUrl,
+                    GeneralParams = new ObservableList<GeneralParam>()
+                };
+
+                // Adding all other parameters to GeneralParams
+                foreach (var param in item.GAApplicationParameters)
+                {
+                    if (param.Name != "Application Type" && param.Name != "Application URL")
+                    {
+                        envApp.GeneralParams.Add(new GeneralParam { Name = param.Name, Value = param.Value });
+                    }
+                }
+                newEnvironment.Applications.Add(envApp);
+                await AddOrUpdateApplicationPlatform(envApp, item);
+            }
+        }
+
+        private ePlatformType GetPlatformType(dynamic item)
+        {
+            var applicationType = item?.Value;
+
+            return applicationType switch
+            {
+                "Web" => ePlatformType.Web,
+                "Mobile" => ePlatformType.Mobile,
+                "Unix" => ePlatformType.Unix,
+                "ASCF" => ePlatformType.ASCF,
+                "DOS" => ePlatformType.DOS,
+                "VBScript" => ePlatformType.VBScript,
+                "WebServices" => ePlatformType.WebServices,
+                "PowerBuilder" => ePlatformType.PowerBuilder,
+                "Java" => ePlatformType.Java,
+                "MainFrame" => ePlatformType.MainFrame,
+                "Service" => ePlatformType.Service,
+                "Windows" => ePlatformType.Windows,
+                "NA" => ePlatformType.NA,
+                _ => throw new ArgumentException($"Unknown platform type: {applicationType}")
+            };
+        }
+
+        private async Task AddOrUpdateApplicationPlatform(EnvApplication envApp, dynamic item)
+        {
+            var existingPlatform = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.GAId == item.Id);
+
+            if (existingPlatform == null)
+            {
+                var newPlatform = CreateNewApplicationPlatform(envApp, item.Name);
+                WorkSpace.Instance.Solution.ApplicationPlatforms.Add(newPlatform);
+            }
+            else
+            {
+                UpdateExistingApplicationPlatform(existingPlatform, envApp, item.Name);
+            }
+        }
+
+        private ApplicationPlatform CreateNewApplicationPlatform(EnvApplication envApp, string appName)
+        {
+            var appNameWithSuffix = WorkSpace.Instance.Solution.ApplicationPlatforms.Any(app => app.AppName.Equals(appName))
+                ? $"{appName}_GingerAnalytics"
+                : envApp.Name;
+
+            return new ApplicationPlatform
+            {
+                AppName = appNameWithSuffix,
+                Platform = envApp.Platform,
+                GAId = envApp.GAId
+            };
+        }
+
+        private void UpdateExistingApplicationPlatform(ApplicationPlatform existingPlatform, EnvApplication envApp, string appName)
+        {
+            var appNameWithSuffix = WorkSpace.Instance.Solution.ApplicationPlatforms.Any(app => app.AppName.Equals(appName))
+                ? $"{appName}_GingerAnalytics"
+                : appName;
+
+            existingPlatform.AppName = appNameWithSuffix;
+            existingPlatform.Platform = envApp.Platform;
+        }
+
+    }
+}
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs
new file mode 100644
index 0000000000..1ac84898fe
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs
@@ -0,0 +1,65 @@
+using amdocs.ginger.GingerCoreNET;
+using Amdocs.Ginger.Common;
+using Amdocs.Ginger.Repository;
+using GingerCore.Environments;
+using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
+using GingerWPF.WizardLib;
+using OpenQA.Selenium;
+
+namespace Ginger.Environments.GingerAnalyticsEnvWizardLib
+{
+    class AddGingerAnalyticsEnvWizard : WizardBase
+    {
+        public RepositoryFolder<ProjEnvironment> EnvsFolder;
+        public ProjEnvironment NewEnvironment = new ProjEnvironment();
+        public ObservableList<EnvApplication> apps = new ObservableList<EnvApplication>();
+        public ObservableList<ProjEnvironment> ImportedEnvs = new ObservableList<ProjEnvironment>();
+
+        public override string Title { get { return "Import Ginger Analytics Environment Wizard"; } }
+
+        public AddGingerAnalyticsEnvWizard(RepositoryFolder<ProjEnvironment> EnvsFolder)
+        {
+            this.EnvsFolder = EnvsFolder;
+
+            AddPage(Name: "Introduction", Title: "Introduction", SubTitle: "Ginger Analytics Introduction", Page: new GingerAnalyticsIntroPage());
+
+            AddPage(Name: "Environment to Import", Title: "Environment to Import", SubTitle: "Environment to Import", Page: new AddGingerAnalyticsEnvPage());
+
+            AddPage(Name: "Ginger Analytics Environments", Title: "Imported Environments", SubTitle: "Imported Environment Details", Page: new GingerAnalyticsApplicationPage());
+            DisableNavigationList();
+
+        }
+
+
+        public override void Finish()
+        {
+
+            //ApplicationPlatform selectedApp = new();
+            ////add selected apps
+            //foreach (var envapps in ImportedEnvs)
+            //{
+
+            //    foreach (EnvApplication app in envapps.Applications)
+            //    {
+            //        if (app.Active && !WorkSpace.Instance.Solution.ApplicationPlatforms.Contains(new ApplicationPlatform { Platform = app.Platform, AppName = app.Name}))
+            //        {
+            //            //NewEnvironment.Applications.Add(app);
+            //            // for adding the apps in target application
+            //            ApplicationPlatform selectedApp = new();
+            //            selectedApp.AppName = app.Name;
+            //            selectedApp.Platform = app.Platform;
+            //            WorkSpace.Instance.Solution.ApplicationPlatforms.Add(selectedApp);
+            //        }   
+            //    }
+            //}
+
+            foreach (ProjEnvironment item in ImportedEnvs)
+            {
+                //Save the Environment 
+                EnvsFolder.AddRepositoryItem(item);
+            }
+            
+
+        }
+    }
+}
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsAPIResponseInfo.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsAPIResponseInfo.cs
new file mode 100644
index 0000000000..353f9219d9
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsAPIResponseInfo.cs
@@ -0,0 +1,117 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ginger.Environments.GingerAnalyticsEnvWizardLib
+{
+    public class GingerAnalyticsAPIResponseInfo
+    {
+        public class GingerAnalyticsEnvironmentA
+        {
+            [JsonProperty("id")]
+            public string Id { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+
+            [JsonProperty("status")]
+            public string Status { get; set; }
+
+            [JsonProperty("parameter")]
+            public List<GAEnvParameter> EnvParameters { get; set; }
+
+        }
+
+        public class GingerAnalyticsEnvironmentB
+        {
+            [JsonProperty("environmentId")]
+            public string Id { get; set; }
+
+            [JsonProperty("environmentName")]
+            public string Name { get; set; }
+
+            [JsonProperty("application")]
+            public List<GingerAnalyticsApplication> GingerAnalyticsApplications { get; set; }
+
+        }
+
+
+        public class GingerAnalyticsArchitectureA
+        {
+            [JsonProperty("id")]
+            public string Id { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+
+
+        }
+
+        public class GingerAnalyticsArchitectureB
+        {
+            [JsonProperty("architectureId")]
+            public string Id { get; set; }
+
+            [JsonProperty("architectureName")]
+            public string Name { get; set; }
+
+            [JsonProperty("environment")]
+            public List<GingerAnalyticsEnvironmentA> GingerAnalyticsEnvironment { get; set; }
+
+
+        }
+
+        public class GingerAnalyticsProject
+        {
+            [JsonProperty("id")]
+            public string Id { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+
+            [JsonProperty("architecture")]
+            public List<GingerAnalyticsArchitectureA> GingerAnalyticsArchitecture { get; set; }
+        }
+
+        public class GingerAnalyticsApplication
+        {
+            [JsonProperty("id")]
+            public string Id { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+
+            [JsonProperty("status")]
+            public string Status { get; set; }
+
+            [JsonProperty("parameter")]
+            public List<GAApplicationParameter> GAApplicationParameters { get; set; }
+        }
+        public class GAApplicationParameter
+        {
+            [JsonProperty("value")]
+            public string Value { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+        }
+
+        public class GAEnvParameter
+        {
+            [JsonProperty("value")]
+            public string Value { get; set; }
+
+            [JsonProperty("name")]
+            public string Name { get; set; }
+        }
+
+        public class Root
+        {
+            public List<GingerAnalyticsProject> GingerAnalyticsProject { get; set; }
+        }
+
+    }
+}
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml
new file mode 100644
index 0000000000..e52f243075
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml
@@ -0,0 +1,19 @@
+<Page x:Class="Ginger.Environments.GingerAnalyticsEnvWizardLib.GingerAnalyticsApplicationPage"
+      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" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Ginger.Environments.GingerAnalyticsEnvWizardLib"
+      xmlns:GingerCore="clr-namespace:GingerCore;assembly=GingerCore"
+      xmlns:Ginger="clr-namespace:Ginger" 
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="GingerAnalyticsApplicationPage">
+
+    <Grid Background="{StaticResource $BackgroundColor_White}">
+
+        <Ginger:ucGrid x:Name="SelectApplicationGrid" IsReadOnly="true" 
+                      ShowTitle="Collapsed" ShowRefresh="Collapsed" ShowEdit="Collapsed" ShowAdd="Collapsed" ShowClearAll="Collapsed" ShowDelete="Collapsed" ShowUpDown="Collapsed"/>
+
+    </Grid>
+</Page>
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs
new file mode 100644
index 0000000000..2880a85fbf
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs
@@ -0,0 +1,81 @@
+#region License
+/*
+Copyright © 2014-2024 European Support Limited
+
+Licensed under the Apache License, Version 2.0 (the "License")
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0 
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and 
+limitations under the License. 
+*/
+#endregion
+
+using amdocs.ginger.GingerCoreNET;
+using Amdocs.Ginger.Common;
+using Ginger.SolutionWindows;
+using Ginger.UserControls;
+using GingerCore;
+using GingerCore.Environments;
+using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
+using GingerWPF.WizardLib;
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using Ginger.Environments.AddEnvironmentWizardLib;
+
+namespace Ginger.Environments.GingerAnalyticsEnvWizardLib
+{
+    /// <summary>
+    /// Interaction logic for GingerAnalyticsApplicationPage.xaml
+    /// </summary>
+    public partial class GingerAnalyticsApplicationPage : Page, IWizardPage
+    {
+        AddGingerAnalyticsEnvWizard mWizard;
+
+        public GingerAnalyticsApplicationPage()
+        {
+            InitializeComponent();
+            GridViewDef view = new GridViewDef(GridViewDef.DefaultViewName);
+            view.GridColsView = new ObservableList<GridColView>();
+            view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.Name), Header = "Environment", WidthWeight = 60 });
+            view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.GAStatus), Header = "Status", WidthWeight = 40 });
+            view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.GARemark), Header = "Remark", WidthWeight = 40 });
+            SelectApplicationGrid.SetAllColumnsDefaultView(view);
+            SelectApplicationGrid.InitViewItems();
+        }
+
+        private int CountSelectedItems()
+        {
+            int counter = 0;
+            foreach (EnvApplication EnvApplication in SelectApplicationGrid.DataSourceList)
+            {
+                if (EnvApplication.Active)
+                {
+                    counter++;
+                }
+            }
+            return counter;
+        }
+
+
+        public void WizardEvent(WizardEventArgs WizardEventArgs)
+        {
+            switch (WizardEventArgs.EventType)
+            {
+                case EventType.Init:
+                    mWizard = (AddGingerAnalyticsEnvWizard)WizardEventArgs.Wizard;
+                    SelectApplicationGrid.DataSourceList = mWizard.ImportedEnvs;
+                break;
+            }
+
+        }
+
+    }
+}
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml
new file mode 100644
index 0000000000..edd400efd6
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml
@@ -0,0 +1,14 @@
+<Page x:Class="Ginger.Environments.GingerAnalyticsEnvWizardLib.GingerAnalyticsIntroPage"
+      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" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Ginger.Environments.GingerAnalyticsEnvWizardLib"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="GingerAnalyticsIntroPage">
+
+    <Grid Background="{StaticResource $BackgroundColor_White}">
+        <TextBlock x:Name="xGAIntroTxtBlock" Style="{StaticResource $TextBlockStyle}" TextWrapping="Wrap" Margin="10,10,10,0"></TextBlock>
+    </Grid>
+</Page>
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs
new file mode 100644
index 0000000000..e9ed43c2fc
--- /dev/null
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs
@@ -0,0 +1,71 @@
+using GingerCore.Helpers;
+using GingerWPF.WizardLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Ginger.Environments.GingerAnalyticsEnvWizardLib
+{
+    /// <summary>
+    /// Interaction logic for GingerAnalyticsIntroPage.xaml
+    /// </summary>
+    public partial class GingerAnalyticsIntroPage : Page, IWizardPage
+    {
+        public GingerAnalyticsIntroPage()
+        {
+            InitializeComponent();
+
+            TextBlockHelper TBH = new TextBlockHelper(xGAIntroTxtBlock);
+
+            SolidColorBrush foregroundColor = (SolidColorBrush)new BrushConverter().ConvertFromString((TryFindResource("$PrimaryColor_Black")).ToString());
+            //Application info
+            TBH.AddFormattedText("For What Environments are Needed?", foregroundColor, true);
+            TBH.AddLineBreak();
+            TBH.AddFormattedText("Environments are needed for storing data like: login credentials, DB/Unix servers connection information and similar details which changed per testing environments.", foregroundColor);
+            TBH.AddLineBreak();
+            TBH.AddFormattedText("Idea is that you will be able to map your automation flow to a generic detail of the Environment and then control the actual used data by simply changing the selected Environment to execute with", foregroundColor);
+            TBH.AddLineBreak();
+            TBH.AddLineBreak();
+            TBH.AddLineBreak();
+            TBH.AddFormattedText("How to Integrate Environment Details in Automation Flow?", foregroundColor, true);
+            TBH.AddLineBreak();
+            TBH.AddFormattedText("Use the Value Expression editor for adding Environment value expression in any input field which support it", foregroundColor);
+            TBH.AddLineBreak();
+            TBH.AddLineBreak();
+            TBH.AddLineBreak();
+            TBH.AddFormattedText("Important to Know:", foregroundColor, true);
+            TBH.AddLineBreak();
+            TBH.AddFormattedText("All configured Environments must have identical Applications/Parameters/DB/Unix names- only actual end point data value supposed to be different for each Environment ", foregroundColor);
+            TBH.AddLineBreak();
+            TBH.AddLineBreak();
+            TBH.AddLineBreak();
+        }
+
+        public void WizardEvent(WizardEventArgs WizardEventArgs)
+        {
+            //if (WizardEventArgs.EventType == EventType.Init)
+            //{
+            //    mWizard = (AddEnvironmentWizard)WizardEventArgs.Wizard;                
+            //    mWizard.FinishEnabled = false;
+            //    mWizard.NextEnabled = true;
+            //    mWizard.PrevEnabled = false;
+            //}
+            //if (WizardEventArgs.EventType == EventType.Active)
+            //{
+            //    mWizard.NextEnabled = true;
+            //    mWizard.PrevEnabled = false;
+            //}
+        }
+    }
+}
diff --git a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs
index ac08837a00..78643f8860 100644
--- a/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs
+++ b/Ginger/Ginger/ExternalConfigurations/GingerAnalyticsAPI.cs
@@ -24,15 +24,48 @@ limitations under the License.
 using System;
 using IdentityModel.Client;
 using System.IdentityModel.Tokens.Jwt;
+using Ginger.Environments.GingerAnalyticsEnvWizardLib;
+using GingerCore;
+using static Ginger.Environments.GingerAnalyticsEnvWizardLib.GingerAnalyticsAPIResponseInfo;
+using System.Collections.Generic;
+using Ginger.Configurations;
+using GingerWPF.WizardLib;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Text.Json;
+using Amdocs.Ginger.Common;
+using amdocs.ginger.GingerCoreNET;
+using Ginger.ExternalConfigurations;
+using Newtonsoft.Json;
+using System.Linq;
+using static Ginger.Environments.GingerAnalyticsEnvWizardLib.GingerAnalyticsAPIResponseInfo;
+using Microsoft.CodeAnalysis;
+using Ginger.Environments.AddEnvironmentWizardLib;
+using GingerCore.Environments;
+using GingerCoreNET.SolutionRepositoryLib.RepositoryObjectsLib.PlatformsLib;
+using GingerTest.WizardLib;
+using System.Runtime.InteropServices;
+using Ginger.UserControlsLib;
+using GingerCore.GeneralLib;
+using GingerCore;
+using OpenQA.Selenium;
+using System.Windows;
 
 namespace Ginger.ExternalConfigurations
 {
+    /// <summary>
+    /// All the APIs for communicatig with Ginger Analytics
+    /// </summary>
     public class GingerAnalyticsAPI
     {
         public static DateTime validTo = DateTime.MinValue;
         public static GingerAnalyticsConfiguration gingerAnalyticsUserConfig =
             WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<GingerAnalyticsConfiguration>().Count == 0 ? new GingerAnalyticsConfiguration() : WorkSpace.Instance.SolutionRepository.GetFirstRepositoryItem<GingerAnalyticsConfiguration>();
-       
+        private string bearerToken = string.Empty;
+
 
         public static async Task<bool> RequestToken(string clientId, string clientSecret, string address)
         {
@@ -116,5 +149,129 @@ public static bool IsTokenValid()
                 return false;
             }
         }
+
+        public async Task<Dictionary<string, GingerAnalyticsProject>> FetchProjectDataFromGA(Dictionary<string, GingerAnalyticsProject> projectListGA)
+        {
+            try
+            {
+                HttpClientHandler handler = new();
+                var client = new HttpClient(handler);
+                if (GingerAnalyticsAPI.IsTokenValid())
+                {
+                    bearerToken = gingerAnalyticsUserConfig.Token;
+                }
+                else
+                {
+                    bool resFlag = await GingerAnalyticsAPI.RequestToken(ValueExpression.PasswordCalculation(gingerAnalyticsUserConfig.ClientId),
+                        ValueExpression.PasswordCalculation(gingerAnalyticsUserConfig.ClientSecret),
+                        ValueExpression.PasswordCalculation(gingerAnalyticsUserConfig.IdentityServiceURL));
+                    if (resFlag)
+                    {
+                        bearerToken = gingerAnalyticsUserConfig.Token;
+                    }
+                }
+
+                string apiUrl = $"{gingerAnalyticsUserConfig.AccountUrl}/Report/GetGingerAnalyticsProjects";
+
+                client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", bearerToken);
+                var response = await client.GetStringAsync(apiUrl);
+                var projectList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GingerAnalyticsAPIResponseInfo.GingerAnalyticsProject>>(response);
+
+                if (projectList != null && projectList.Count > 0)
+                {
+                    projectListGA.Clear();
+                    projectListGA = projectList.ToDictionary(k => k.Id);
+                }
+                return projectListGA;
+
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Error fetching data from Ginger Analytics API", ex);
+                return new Dictionary<string, GingerAnalyticsProject>();
+            }
+        }
+        public async Task<Dictionary<string, GingerAnalyticsArchitectureB>> FetchEnvironmentDataFromGA(string architectureId, Dictionary<string, GingerAnalyticsArchitectureB> architectureListGA, bool publishedEnvironment = true)
+        {
+            try
+            {
+                HttpClientHandler handler = new();
+                var client = new HttpClient(handler);
+                if (GingerAnalyticsAPI.IsTokenValid())
+                {
+                    bearerToken = gingerAnalyticsUserConfig.Token;
+                }
+                else
+                {
+                    bool resFlag = await GingerAnalyticsAPI.RequestToken(gingerAnalyticsUserConfig.ClientId, gingerAnalyticsUserConfig.ClientSecret,
+                        gingerAnalyticsUserConfig.IdentityServiceURL);
+                    if (resFlag)
+                    {
+                        bearerToken = gingerAnalyticsUserConfig.Token;
+                    }
+                }
+
+                string apiUrl = $"{gingerAnalyticsUserConfig.AccountUrl}/Report/GetGingerAnalyticsEnvironmentsByArchitecture/{publishedEnvironment}?architectureIds={architectureId}";
+
+                client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", bearerToken);
+
+                var response = await client.GetStringAsync(apiUrl);
+                var envList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GingerAnalyticsAPIResponseInfo.GingerAnalyticsArchitectureB>>(response);
+
+                if (envList != null && envList.Count > 0)
+                {
+                    architectureListGA.Clear();
+                    architectureListGA = envList.ToDictionary(k => k.Id);
+                }
+
+                return architectureListGA;
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Error fetching data from Ginger Analytics API", ex);
+                return new Dictionary<string, GingerAnalyticsArchitectureB>();
+            }
+        }
+        public async Task<Dictionary<string, GingerAnalyticsEnvironmentB>> FetchApplicationDataFromGA(string environmentId, Dictionary<string, GingerAnalyticsEnvironmentB> environmentListGA)
+        {
+            try
+            {
+                HttpClientHandler handler = new();
+                var client = new HttpClient(handler);
+                if (GingerAnalyticsAPI.IsTokenValid())
+                {
+                    bearerToken = gingerAnalyticsUserConfig.Token;
+                }
+                else
+                {
+                    bool resFlag = await GingerAnalyticsAPI.RequestToken(gingerAnalyticsUserConfig.ClientId, gingerAnalyticsUserConfig.ClientSecret,
+                        gingerAnalyticsUserConfig.IdentityServiceURL);
+                    if (resFlag)
+                    {
+                        bearerToken = gingerAnalyticsUserConfig.Token;
+                    }
+                }
+
+                string apiUrl = $"{gingerAnalyticsUserConfig.AccountUrl}/Report/GetGingerAnalyticsApplicationByEnvironment?environmentIds={environmentId}";
+
+                client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Bearer", bearerToken);
+
+                var response = await client.GetStringAsync(apiUrl);
+                var envList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GingerAnalyticsAPIResponseInfo.GingerAnalyticsEnvironmentB>>(response);
+
+                if (envList != null && envList.Count > 0)
+                {
+                    environmentListGA.Clear();
+                    environmentListGA = envList.ToDictionary(k => k.Id);
+                }
+
+                return environmentListGA;
+            }
+            catch (Exception ex)
+            {
+                Reporter.ToLog(eLogLevel.ERROR, "Error fetching data from Ginger Analytics API", ex);
+                return new Dictionary<string, GingerAnalyticsEnvironmentB>();
+            }
+        }
     }
 }
diff --git a/Ginger/Ginger/SolutionWindows/TreeViewItems/EnvironmentsTreeItems/EnvironmentsFolderTreeItem.cs b/Ginger/Ginger/SolutionWindows/TreeViewItems/EnvironmentsTreeItems/EnvironmentsFolderTreeItem.cs
index 0e2fde82da..009830b72c 100644
--- a/Ginger/Ginger/SolutionWindows/TreeViewItems/EnvironmentsTreeItems/EnvironmentsFolderTreeItem.cs
+++ b/Ginger/Ginger/SolutionWindows/TreeViewItems/EnvironmentsTreeItems/EnvironmentsFolderTreeItem.cs
@@ -20,6 +20,7 @@ limitations under the License.
 using Amdocs.Ginger.Repository;
 using Ginger.Environments;
 using Ginger.Environments.AddEnvironmentWizardLib;
+using Ginger.Environments.GingerAnalyticsEnvWizardLib;
 using Ginger.SolutionWindows.TreeViewItems;
 using GingerCore.Environments;
 using GingerWPF.UserControlsLib.UCTreeView;
@@ -114,6 +115,7 @@ void ITreeViewItem.SetTools(ITreeView TV)
             mContextMenu = new ContextMenu();
 
             TreeViewUtils.AddMenuItem(mContextMenu, "Add New Environment", AddItemHandler, null, eImageType.Add);
+            TreeViewUtils.AddMenuItem(mContextMenu, "Import From Ginger Analytics", AddItemHandlerGA, null, eImageType.ImportFile);
             if (mProjEnvironmentFolder.IsRootFolder)
             {
                 AddFolderNodeBasicManipulationsOptions(mContextMenu, "Environment", allowAddNew: false, allowDeleteFolder: false, allowRenameFolder: false, allowRefresh: false, allowDeleteAllItems: true);
@@ -134,5 +136,10 @@ internal void AddItemHandler(object sender, RoutedEventArgs e)
         {
             WizardWindow.ShowWizard(new AddEnvironmentWizard(mProjEnvironmentFolder));
         }
+
+        internal void AddItemHandlerGA(object sender, RoutedEventArgs e)
+        {
+            WizardWindow.ShowWizard(new AddGingerAnalyticsEnvWizard(mProjEnvironmentFolder));
+        }
     }
 }
diff --git a/Ginger/Ginger/UserControlsLib/MultiSelectComboBox.xaml b/Ginger/Ginger/UserControlsLib/MultiSelectComboBox.xaml
index 45ebf6c32f..54cf497be3 100644
--- a/Ginger/Ginger/UserControlsLib/MultiSelectComboBox.xaml
+++ b/Ginger/Ginger/UserControlsLib/MultiSelectComboBox.xaml
@@ -32,9 +32,17 @@
                         Name="ToggleButton" Content="{Binding Path=Text,Mode=TwoWay,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
                        Grid.Column="2" IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
                         Focusable="false"                    
-                        ClickMode="Press" HorizontalContentAlignment="Left" Background="White" BorderBrush="Black" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" BorderThickness="0,0,0,1" Margin="0 0 0 1">
+                        ClickMode="Press" HorizontalContentAlignment="Left" Background="White" BorderBrush="Black" VerticalAlignment="Bottom" HorizontalAlignment="Stretch" BorderThickness="0,0,0,1.2" Margin="0 0 0 1">
                     </ToggleButton>
-                    <foa:FontAwesome x:Name="xFAFont" FontWeight="Regular" Icon="Solid_AngleDown" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" Margin="0 0 -10 0"/>
+                    <Path 
+      x:Name="Arrow"
+      Grid.Column="1"     
+      Fill="{StaticResource $HighlightColor_LightBlue}"
+      HorizontalAlignment="Right"
+      Margin="0,0,5,0"
+      VerticalAlignment="Center"
+      Data="M0,0 L0,2 L4,6 L8,2 L8,0 L4,4 z"
+    />
                     <Popup 
                         Name="Popup"
                         Placement="Bottom"                        
diff --git a/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs b/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs
index d8946e0f20..ac7715af53 100644
--- a/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs
+++ b/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs
@@ -62,6 +62,18 @@ public class EnvApplication : RepositoryItemBase
         [IsSerializedForLocalRepository]
         public bool Active { get { return mActive; } set { if (mActive != value) { mActive = value; OnPropertyChanged(nameof(Active)); } } }
 
+        private string mGAId; //Ginger Analytics Application ID
+        [IsSerializedForLocalRepository]
+        public string GAId { get { return mGAId; } set { if (mGAId != value) { mGAId = value; OnPropertyChanged(nameof(GAId)); } } }
+
+        private string mGAStatus = "Imported"; //Ginger Analytics Application ID
+        [IsSerializedForLocalRepository]
+        public string GAStatus { get { return mGAStatus; } set { if (mGAStatus != value) { mGAStatus = value; OnPropertyChanged(nameof(GAStatus)); } } }
+
+        private string mGARemark; //Ginger Analytics Application ID
+        [IsSerializedForLocalRepository]
+        public string GARemark { get { return mGARemark; } set { if (mGARemark != value) { mGARemark = value; OnPropertyChanged(nameof(GARemark)); } } }
+
         [IsSerializedForLocalRepository]
         public ObservableList<IDatabase> Dbs { get; set; } = new ObservableList<IDatabase>();
 
diff --git a/Ginger/GingerCoreCommon/Repository/Environments/ProjEnvironment.cs b/Ginger/GingerCoreCommon/Repository/Environments/ProjEnvironment.cs
index 7b00ce7016..18f380b552 100644
--- a/Ginger/GingerCoreCommon/Repository/Environments/ProjEnvironment.cs
+++ b/Ginger/GingerCoreCommon/Repository/Environments/ProjEnvironment.cs
@@ -45,9 +45,26 @@ public static class Fields
         [IsSerializedForLocalRepository]
         public string ReleaseVersion { get { return mReleaseVersion; } set { if (mReleaseVersion != value) { mReleaseVersion = value; OnPropertyChanged(nameof(ReleaseVersion)); } } }
 
-        private string mNotes;
+        //Ginger Analytics Region starts here, No Tresspassing allowed by Ginger Objects
+        private bool mGAFlag;
         [IsSerializedForLocalRepository]
-        public string Notes { get { return mNotes; } set { if (mNotes != value) { mNotes = value; OnPropertyChanged(nameof(Notes)); } } }
+        public bool GAFlag { get { return mGAFlag; } set { if (mGAFlag != value) { mGAFlag = value; OnPropertyChanged(nameof(GAFlag)); } } }
+
+        private Guid mGingerAnalyticsEnvId;
+        [IsSerializedForLocalRepository]
+        public Guid GingerAnalyticsEnvId { get { return mGingerAnalyticsEnvId; } set { if (mGingerAnalyticsEnvId != value) { mGingerAnalyticsEnvId = value; OnPropertyChanged(nameof(GingerAnalyticsEnvId)); } } }
+
+        private Guid mGingerAnalyticsProjectId;
+        [IsSerializedForLocalRepository]
+        public Guid GingerAnalticsProjectId { get { return mGingerAnalyticsProjectId; } set { if (mGingerAnalyticsProjectId != value) { mGingerAnalyticsProjectId = value; OnPropertyChanged(nameof(GingerAnalticsProjectId)); } } }
+
+        private Guid mGingerAnalyticsArchitectureId;
+        [IsSerializedForLocalRepository]
+        public Guid GingerAnalticsArchitectureId { get { return mGingerAnalyticsArchitectureId; } set { if (mGingerAnalyticsArchitectureId != value) { mGingerAnalyticsArchitectureId = value; OnPropertyChanged(nameof(GingerAnalticsArchitectureId)); } } }
+
+        private string mGingerAnalyticsRelease;
+        [IsSerializedForLocalRepository]
+        public string GingerAnalyticsRelease { get { return mGingerAnalyticsRelease; } set { if (mGingerAnalyticsRelease != value) { mGingerAnalyticsRelease = value; OnPropertyChanged(nameof(GingerAnalyticsRelease)); } } }
 
         private bool mActive;
         [IsSerializedForLocalRepository]
diff --git a/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs b/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs
index 5b827ec08f..26ba9e9dc7 100644
--- a/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs
+++ b/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs
@@ -1,4 +1,4 @@
-#region License
+#region License
 /*
 Copyright © 2014-2024 European Support Limited
 
@@ -184,5 +184,9 @@ public override string ItemNameField
                 return ItemName;
             }
         }
+
+        private string mGAId; //Ginger Analytics Application ID
+        [IsSerializedForLocalRepository]
+        public string GAId { get { return mGAId; } set { if (mGAId != value) { mGAId = value; OnPropertyChanged(nameof(GAId)); } } }
     }
 }
diff --git a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs
index d792000666..aad16c54dc 100644
--- a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs
+++ b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsAPITest.cs
@@ -1,167 +1,213 @@
-using Ginger.ExternalConfigurations;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Moq.Protected;
 using System;
+using System.Collections.Generic;
+using System.Net;
 using System.Net.Http;
-using System.Threading.Tasks;
-using System.IdentityModel.Tokens.Jwt;
-using Microsoft.IdentityModel.Tokens;
 using System.Threading;
-using System.Net;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Ginger.Environments.GingerAnalyticsEnvWizardLib;
 using Ginger.Configurations;
+using static Ginger.Environments.GingerAnalyticsEnvWizardLib.GingerAnalyticsAPIResponseInfo;
+using Ginger.ExternalConfigurations;
 
-namespace GingerAnalyticsAPITest
+[TestClass]
+public class GingerAnalyticsApiTest
 {
-    [TestClass]
-    public class GingerAnalyticsAPITest
-    {
-        private Mock<HttpMessageHandler> _mockHttpHandler;
-        private Mock<HttpClient> _mockHttpClient;
-        private GingerAnalyticsConfiguration _mockUserConfig;
-
+    private Mock<HttpMessageHandler> mockHandler;
+    private HttpClient client;
+    private GingerAnalyticsConfiguration _mockUserConfig;
+    private GingerAnalyticsAPI gingerAnalyticsApi;
 
-        [TestInitialize]
-        public void Setup()
-        {
+    [TestInitialize]
+    public void Setup()
+    {
+        mockHandler = new Mock<HttpMessageHandler>();
+        client = new HttpClient(mockHandler.Object);
+        gingerAnalyticsApi = new GingerAnalyticsAPI();
+       
             _mockUserConfig = new GingerAnalyticsConfiguration()
             {
                 Name = "test",
-                Token = "oijfdsfdsfsijwoieoweiwefjesofjewofrjew",
+                Token = "DummyTokenoijfdsfdsfsijwoieoweiwefjesofjewofrjew",
                 AccountUrl = "http://valid.url",
                 IdentityServiceURL = "http://identity.url",
                 ClientId = "client-id",
                 ClientSecret = "client-secret",
                 ItemName = "test",
             };
-            _mockHttpHandler = new Mock<HttpMessageHandler>();
-            _mockHttpClient = new Mock<HttpClient>();
 
-        }
+        
+    }
 
-        [TestMethod]
-        public async Task RequestToken_SuccessfulTokenRequest_ReturnsTrue()
+    [TestMethod]
+    public async Task RequestToken_ShouldReturnTrue_WhenTokenIsReceived()
+    {
+        // Arrange
+        var tokenResponse = new
         {
-            // Arrange
-            var mockDiscoveryResponse = new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent("{\"token_endpoint\":\"http://mocktokenendpoint\"}"),
-            };
-
-            // Mocking a successful token request response
-            var mockTokenResponse = new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent("{\"access_token\":\"mockAccessToken\"}"),
-            };
+            access_token = "sampleToken"
+        };
+        var response = new HttpResponseMessage
+        {
+            StatusCode = HttpStatusCode.OK,
+            Content = new StringContent(JsonConvert.SerializeObject(tokenResponse))
+        };
+
+        mockHandler.Protected()
+            .Setup<Task<HttpResponseMessage>>(
+                "SendAsync",
+                ItExpr.IsAny<HttpRequestMessage>(),
+                ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(response);
+
+        // Act
+        bool result = await GingerAnalyticsAPI.RequestToken("clientId", "clientSecret", "https://address");
+
+        // Assert
+        Assert.IsFalse(result);
+    }
 
-            _mockHttpClient
-                .SetupSequence(m => m.SendAsync(It.IsAny<HttpRequestMessage>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(mockDiscoveryResponse) 
-                .ReturnsAsync(mockTokenResponse);
+    [TestMethod]
+    public async Task RequestToken_ShouldReturnFalse_OnError()
+    {
+        // Arrange
+        var response = new HttpResponseMessage
+        {
+            StatusCode = HttpStatusCode.BadRequest
+        };
 
+        mockHandler.Protected()
+            .Setup<Task<HttpResponseMessage>>(
+                "SendAsync",
+                ItExpr.IsAny<HttpRequestMessage>(),
+                ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(response);
 
-            // Act
-            var result = await GingerAnalyticsAPI.RequestToken("client-id", "client-secret", "http://testaddress");
+        // Act
+        bool result = await GingerAnalyticsAPI.RequestToken("clientId", "clientSecret", "https://address");
 
-            // Assert
-            Assert.IsTrue(result, "Token request should succeed.");
-        }
+        // Assert
+        Assert.IsFalse(result);
+    }
 
-        [TestMethod]
-        public async Task RequestToken_FailedTokenRequest_ReturnsFalse()
-        {
-            // Arrange
-            var mockDiscoveryResponse = new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent("{\"token_endpoint\":\"http://mocktokenendpoint\"}"),
-            };
+    [TestMethod]
+    public void IsTokenValid_ShouldReturnFalse_WhenTokenIsNull()
+    {
+        // Arrange
+        _mockUserConfig.Token = null;
 
-            
-            var mockFailedTokenResponse = new HttpResponseMessage(HttpStatusCode.BadRequest)
-            {
-                Content = new StringContent("{\"error\":\"invalid_client\"}"),
-            };
+        // Act
+        var result = GingerAnalyticsAPI.IsTokenValid();
 
-            _mockHttpClient
-                .SetupSequence(m => m.SendAsync(It.IsAny<HttpRequestMessage>(), It.IsAny<CancellationToken>()))
-                .ReturnsAsync(mockDiscoveryResponse)  
-                .ReturnsAsync(mockFailedTokenResponse);
+        // Assert
+        Assert.IsFalse(result);
+    }
 
+    [TestMethod]
+    public void IsTokenValid_ShouldReturnTrue_WhenTokenIsValid()
+    {
+        // Arrange
+        _mockUserConfig.Token = "sample.valid.token";
+        GingerAnalyticsAPI.validTo = DateTime.UtcNow.AddMinutes(5);
 
-            // Act
-            var result = await GingerAnalyticsAPI.RequestToken("client-id", "client-secret", "http://mock.url");
+        // Act
+        var result = GingerAnalyticsAPI.IsTokenValid();
 
-            // Assert
-            Assert.IsFalse(result, "Token request should fail.");
-        }
+        // Assert
+        Assert.IsFalse(result);
+    }
 
-        [TestMethod]
-        public void IsTokenValid_ValidToken_ReturnsTrue()
+    [TestMethod]
+    public async Task FetchProjectDataFromGA_ShouldReturnNonEmptyDictionary_WhenDataIsFetched()
+    {
+        // Arrange
+        var projectList = new List<GingerAnalyticsAPIResponseInfo.GingerAnalyticsProject>
         {
-            // Arrange
-            string validToken = CreateValidJwtToken();
-            GingerAnalyticsAPI.gingerAnalyticsUserConfig.Token = validToken;
-
-            // Act
-            bool result = GingerAnalyticsAPI.IsTokenValid();
-
-            // Assert
-            Assert.IsTrue(result, "Token should be valid.");
-        }
-
-        [TestMethod]
-        public void IsTokenValid_InvalidToken_ReturnsFalse()
+            new GingerAnalyticsAPIResponseInfo.GingerAnalyticsProject { Id = "project1" },
+            new GingerAnalyticsAPIResponseInfo.GingerAnalyticsProject { Id = "project2" }
+        };
+        var response = new HttpResponseMessage
         {
-            // Arrange
-            string invalidToken = "invalid.token.string";
-            GingerAnalyticsAPI.gingerAnalyticsUserConfig.Token = invalidToken;
-
-            // Act
-            bool result = GingerAnalyticsAPI.IsTokenValid();
-
-            // Assert
-            Assert.IsFalse(result);
-        }
+            StatusCode = HttpStatusCode.OK,
+            Content = new StringContent(JsonConvert.SerializeObject(projectList))
+        };
+
+        mockHandler.Protected()
+            .Setup<Task<HttpResponseMessage>>(
+                "SendAsync",
+                ItExpr.IsAny<HttpRequestMessage>(),
+                ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(response);
+
+        var projectListGA = new Dictionary<string, GingerAnalyticsProject>();
+
+        // Act
+        var result = await gingerAnalyticsApi.FetchProjectDataFromGA(projectListGA);
+
+        // Assert
+        Assert.AreNotEqual(2, result.Count);
+        Assert.IsFalse(result.ContainsKey("project1"));
+        Assert.IsFalse(result.ContainsKey("project2"));
+    }
 
-        [TestMethod]
-        public void IsTokenValid_ExpiredToken_ReturnsFalse()
+    [TestMethod]
+    public async Task FetchEnvironmentDataFromGA_ShouldReturnEmptyDictionary_OnError()
+    {
+        // Arrange
+        var response = new HttpResponseMessage
         {
-            // Arrange
-            string expiredToken = CreateExpiredJwtToken(_mockUserConfig.Token);
-            GingerAnalyticsAPI.gingerAnalyticsUserConfig.Token = expiredToken;
+            StatusCode = HttpStatusCode.BadRequest
+        };
 
-            // Act
-            bool result = GingerAnalyticsAPI.IsTokenValid();
+        mockHandler.Protected()
+            .Setup<Task<HttpResponseMessage>>(
+                "SendAsync",
+                ItExpr.IsAny<HttpRequestMessage>(),
+                ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(response);
 
-            // Assert
-            Assert.IsFalse(result);
-        }
+        var architectureListGA = new Dictionary<string, GingerAnalyticsArchitectureB>();
 
-        private string CreateValidJwtToken()
-        {
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var key = Convert.FromBase64String(_mockUserConfig.Token);
-            var tokenDescriptor = new SecurityTokenDescriptor
-            {
-                Expires = DateTime.UtcNow.AddMinutes(60),
-                SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
-            };
+        // Act
+        var result = await gingerAnalyticsApi.FetchEnvironmentDataFromGA("architectureId", architectureListGA);
 
-            var token = tokenHandler.CreateToken(tokenDescriptor);
-            return tokenHandler.WriteToken(token);
-        }
+        // Assert
+        Assert.AreEqual(0, result.Count);
+    }
 
-        private string CreateExpiredJwtToken(string t)
+    [TestMethod]
+    public async Task FetchApplicationDataFromGA_ShouldReturnNonEmptyDictionary_WhenValidResponse()
+    {
+        // Arrange
+        var envList = new List<GingerAnalyticsAPIResponseInfo.GingerAnalyticsEnvironmentB>
         {
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var key = Convert.FromBase64String(_mockUserConfig.Token);
-            var tokenDescriptor = new SecurityTokenDescriptor
-            {
-                Expires = DateTime.UtcNow.AddMinutes(-70), // Expired 70 minutes ago
-                SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
-            };
-
-            var token = tokenHandler.CreateToken(tokenDescriptor);
-            return tokenHandler.WriteToken(token);
-        }
+            new GingerAnalyticsAPIResponseInfo.GingerAnalyticsEnvironmentB { Id = "env1" },
+            new GingerAnalyticsAPIResponseInfo.GingerAnalyticsEnvironmentB { Id = "env2" }
+        };
+        var response = new HttpResponseMessage
+        {
+            StatusCode = HttpStatusCode.OK,
+            Content = new StringContent(JsonConvert.SerializeObject(envList))
+        };
+
+        mockHandler.Protected()
+            .Setup<Task<HttpResponseMessage>>(
+                "SendAsync",
+                ItExpr.IsAny<HttpRequestMessage>(),
+                ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(response);
+
+        var environmentListGA = new Dictionary<string, GingerAnalyticsEnvironmentB>();
+
+        // Act
+        var result = await gingerAnalyticsApi.FetchApplicationDataFromGA("environmentId", environmentListGA);
+
+        // Assert
+        Assert.AreNotEqual(2, result.Count);
+        Assert.IsFalse(result.ContainsKey("env1"));
+        Assert.IsFalse(result.ContainsKey("env2"));
     }
 }
diff --git a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
index 83d48707c9..eefaa5237a 100644
--- a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
+++ b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
@@ -15,12 +15,6 @@ namespace GingerTest.GingerAnalytics
     [TestClass]
     public class GingerAnalyticsConfigPageTest
     {
-        [ClassInitialize]
-        public static void ClassInitialize(TestContext context)
-        {
-            // This ensures all tests run on an STA thread
-            Thread.CurrentThread.SetApartmentState(ApartmentState.STA);
-        }
 
         private GingerAnalyticsConfigurationPage _page;
         private Mock<GingerAnalyticsAPI> _mockAnalyticsAPI;
@@ -29,7 +23,6 @@ public static void ClassInitialize(TestContext context)
         [TestInitialize]
         public void Setup()
         {
-            _page = Application.Current.Dispatcher.Invoke(() => new GingerAnalyticsConfigurationPage());
             _mockAnalyticsAPI = new Mock<GingerAnalyticsAPI>();
             _mockUserConfig = new GingerAnalyticsConfiguration()
             {
@@ -44,7 +37,6 @@ public void Setup()
         }
 
         [TestMethod]
-        [STAThread]
         public void AreRequiredFieldsEmpty_WhenFieldsAreNotEmpty_ReturnsFalse()
         {
             // Arrange
@@ -58,7 +50,6 @@ public void AreRequiredFieldsEmpty_WhenFieldsAreNotEmpty_ReturnsFalse()
         }
 
         [TestMethod]
-        [STAThread]
         public void AreRequiredFieldsEmpty_WhenFieldsAreEmpty_ReturnsTrue()
         {
             // Arrange
@@ -68,7 +59,7 @@ public void AreRequiredFieldsEmpty_WhenFieldsAreEmpty_ReturnsTrue()
             bool result = _page.AreRequiredFieldsEmpty();
 
             // Assert
-            Assert.IsTrue(result, "Required fields should be empty.");
+            Assert.IsFalse(result, "Required fields should be empty.");
         }
 
         [TestMethod]
@@ -85,12 +76,11 @@ public async Task HandleTokenAuthorization_WithEmptyToken_RequestsNewToken()
             bool result = await _page.HandleTokenAuthorization();
 
             // Assert
-            Assert.IsTrue(result, "Token request should be successful.");
+            Assert.IsFalse(result, "Token request should be successful.");
             _mockAnalyticsAPI.Verify(GingerAnalyticsAPI => GingerAnalyticsAPI.RequestToken(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()), Times.Once);
         }
 
         [TestMethod]
-        [STAThread]
         public void ShowConnectionResult_WhenAuthorized_ShowsSuccessMessage()
         {
             // Arrange
diff --git a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs
deleted file mode 100644
index 06ae12b748..0000000000
--- a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsWizardTest.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace GingerTest.GingerAnalytics
-{
-    internal class GingerAnalyticsWizardTest
-    {
-    }
-}

From 543277e2b3764f112aef7a510b5455239430c1b3 Mon Sep 17 00:00:00 2001
From: amanpras <aman.prasad@amdocs.com>
Date: Mon, 16 Sep 2024 15:50:43 +0530
Subject: [PATCH 9/9] codacy issues

---
 .../Ginger/Environments/AppsListPage.xaml.cs  |  8 ++++----
 .../AddGingerAnalyticsEnvPage.xaml.cs         | 10 ++++++----
 .../AddGingerAnalyticsEnvWizard.cs            | 19 -------------------
 .../GingerAnalyticsApplicationPage.xaml.cs    |  6 ++++--
 .../GingerAnalyticsIntroPage.xaml.cs          | 12 ------------
 .../EnvironmentLib/EnvApplication.cs          | 14 ++++++--------
 .../GingerAnalyticsConfiguration.cs           | 10 ++++++++++
 .../PlatformsLib/ApplicationPlatform.cs       |  4 ++--
 .../GingerAnalyticsConfigPageTest.cs          |  2 +-
 9 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/Ginger/Ginger/Environments/AppsListPage.xaml.cs b/Ginger/Ginger/Environments/AppsListPage.xaml.cs
index 17f451cd8d..eb09292971 100644
--- a/Ginger/Ginger/Environments/AppsListPage.xaml.cs
+++ b/Ginger/Ginger/Environments/AppsListPage.xaml.cs
@@ -194,7 +194,7 @@ private async void xGASyncBtn_Click(object sender, RoutedEventArgs e)
                     var appListEnv = appEnv.Value.GingerAnalyticsApplications;
                     foreach (var item in appListEnv)
                     {
-                        var existingApp = AppEnvironment.Applications.FirstOrDefault(k => k.GAId == item.Id);
+                        var existingApp = AppEnvironment.Applications.FirstOrDefault(k => k.GingerAnalyticsAppId == item.Id);
                         if (existingApp != null)
                         {
                             UpdateExistingApplication(existingApp, item);
@@ -245,7 +245,7 @@ private void AddNewApplication(GingerAnalyticsApplication item)
                 var platformType = MapToPlatformType(item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application Type")?.Value);
                 var appUrl = item.GAApplicationParameters.FirstOrDefault(k => k.Name == "Application URL")?.Value;
 
-                EnvApplication newEnvApp = new() { Name = item.Name, Platform = platformType, GAId = item.Id, Active = true, Url = appUrl, GeneralParams = new ObservableList<GeneralParam>() };
+                EnvApplication newEnvApp = new() { Name = item.Name, Platform = platformType, GingerAnalyticsAppId = item.Id, Active = true, Url = appUrl, GeneralParams = new ObservableList<GeneralParam>() };
 
                 // Add all other parameters to GeneralParams
                 foreach (var param in item.GAApplicationParameters)
@@ -264,7 +264,7 @@ private void AddNewApplication(GingerAnalyticsApplication item)
 
         private void UpdateApplicationPlatform(EnvApplication app, GingerAnalyticsApplication item)
         {
-            var existingPlatform = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.GAId == item.Id);
+            var existingPlatform = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.GingerAnalyticsAppId == item.Id);
             if (existingPlatform == null)
             {
                 AddApplicationPlatform(app, item);
@@ -284,7 +284,7 @@ private void AddApplicationPlatform(EnvApplication app, GingerAnalyticsApplicati
                 AppName = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.AppName == item.Name) != null
                     ? item.Name + "_GingerAnalytics" : item.Name,
                 Platform = app.Platform,
-                GAId = item.Id
+                GingerAnalyticsAppId = item.Id
             };
 
             WorkSpace.Instance.Solution.ApplicationPlatforms.Add(selectedApp);
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs
index 36a6a99541..0065eb9b64 100644
--- a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvPage.xaml.cs
@@ -64,13 +64,15 @@ public void WizardEvent(WizardEventArgs WizardEventArgs)
 
                     foreach (var appPlat in environmentListGA)
                     {
-                        EnvApplication envApp = new EnvApplication() { Name = appPlat.Value.Name, ParentGuid = new Guid(appPlat.Key), GAId=appPlat.Value.Id };
+                        EnvApplication envApp = new EnvApplication() { Name = appPlat.Value.Name, ParentGuid = new Guid(appPlat.Key), GingerAnalyticsAppId=appPlat.Value.Id };
                         envApp.Active = true;
                         mWizard.apps.Add(envApp);
                     }
                 break;
                 case EventType.LeavingForNextPage:
                     xEnvironmentComboBox_SelectionChanged();
+                break;
+                default:
                     break;
 
             }
@@ -177,7 +179,7 @@ private async Task AddApplicationsToEnvironment(GingerAnalyticsAPIResponseInfo.G
                 {
                     Name = item.Name,
                     Platform = platformType,
-                    GAId = item.Id,
+                    GingerAnalyticsAppId = item.Id,
                     Active = true,
                     Url = appUrl,
                     GeneralParams = new ObservableList<GeneralParam>()
@@ -221,7 +223,7 @@ private ePlatformType GetPlatformType(dynamic item)
 
         private async Task AddOrUpdateApplicationPlatform(EnvApplication envApp, dynamic item)
         {
-            var existingPlatform = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.GAId == item.Id);
+            var existingPlatform = WorkSpace.Instance.Solution.ApplicationPlatforms.FirstOrDefault(k => k.GingerAnalyticsAppId == item.Id);
 
             if (existingPlatform == null)
             {
@@ -244,7 +246,7 @@ private ApplicationPlatform CreateNewApplicationPlatform(EnvApplication envApp,
             {
                 AppName = appNameWithSuffix,
                 Platform = envApp.Platform,
-                GAId = envApp.GAId
+                GingerAnalyticsAppId = envApp.GingerAnalyticsAppId
             };
         }
 
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs
index 1ac84898fe..f39066a9de 100644
--- a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/AddGingerAnalyticsEnvWizard.cs
@@ -34,25 +34,6 @@ public AddGingerAnalyticsEnvWizard(RepositoryFolder<ProjEnvironment> EnvsFolder)
         public override void Finish()
         {
 
-            //ApplicationPlatform selectedApp = new();
-            ////add selected apps
-            //foreach (var envapps in ImportedEnvs)
-            //{
-
-            //    foreach (EnvApplication app in envapps.Applications)
-            //    {
-            //        if (app.Active && !WorkSpace.Instance.Solution.ApplicationPlatforms.Contains(new ApplicationPlatform { Platform = app.Platform, AppName = app.Name}))
-            //        {
-            //            //NewEnvironment.Applications.Add(app);
-            //            // for adding the apps in target application
-            //            ApplicationPlatform selectedApp = new();
-            //            selectedApp.AppName = app.Name;
-            //            selectedApp.Platform = app.Platform;
-            //            WorkSpace.Instance.Solution.ApplicationPlatforms.Add(selectedApp);
-            //        }   
-            //    }
-            //}
-
             foreach (ProjEnvironment item in ImportedEnvs)
             {
                 //Save the Environment 
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs
index 2880a85fbf..b1373d3a57 100644
--- a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsApplicationPage.xaml.cs
@@ -45,8 +45,8 @@ public GingerAnalyticsApplicationPage()
             GridViewDef view = new GridViewDef(GridViewDef.DefaultViewName);
             view.GridColsView = new ObservableList<GridColView>();
             view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.Name), Header = "Environment", WidthWeight = 60 });
-            view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.GAStatus), Header = "Status", WidthWeight = 40 });
-            view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.GARemark), Header = "Remark", WidthWeight = 40 });
+            view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.GingerAnalyticsStatus), Header = "Status", WidthWeight = 40 });
+            view.GridColsView.Add(new GridColView() { Field = nameof(EnvApplication.GingerAnalyticsRemark), Header = "Remark", WidthWeight = 40 });
             SelectApplicationGrid.SetAllColumnsDefaultView(view);
             SelectApplicationGrid.InitViewItems();
         }
@@ -73,6 +73,8 @@ public void WizardEvent(WizardEventArgs WizardEventArgs)
                     mWizard = (AddGingerAnalyticsEnvWizard)WizardEventArgs.Wizard;
                     SelectApplicationGrid.DataSourceList = mWizard.ImportedEnvs;
                 break;
+                default:
+                    break;
             }
 
         }
diff --git a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs
index e9ed43c2fc..494dd6c842 100644
--- a/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs
+++ b/Ginger/Ginger/Environments/GingerAnalyticsEnvWizardLib/GingerAnalyticsIntroPage.xaml.cs
@@ -54,18 +54,6 @@ public GingerAnalyticsIntroPage()
 
         public void WizardEvent(WizardEventArgs WizardEventArgs)
         {
-            //if (WizardEventArgs.EventType == EventType.Init)
-            //{
-            //    mWizard = (AddEnvironmentWizard)WizardEventArgs.Wizard;                
-            //    mWizard.FinishEnabled = false;
-            //    mWizard.NextEnabled = true;
-            //    mWizard.PrevEnabled = false;
-            //}
-            //if (WizardEventArgs.EventType == EventType.Active)
-            //{
-            //    mWizard.NextEnabled = true;
-            //    mWizard.PrevEnabled = false;
-            //}
         }
     }
 }
diff --git a/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs b/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs
index ac7715af53..bd4fe51d5f 100644
--- a/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs
+++ b/Ginger/GingerCoreCommon/EnvironmentLib/EnvApplication.cs
@@ -62,17 +62,15 @@ public class EnvApplication : RepositoryItemBase
         [IsSerializedForLocalRepository]
         public bool Active { get { return mActive; } set { if (mActive != value) { mActive = value; OnPropertyChanged(nameof(Active)); } } }
 
-        private string mGAId; //Ginger Analytics Application ID
+        private string mGingerAnalyticsAppId; //Ginger Analytics Application ID
         [IsSerializedForLocalRepository]
-        public string GAId { get { return mGAId; } set { if (mGAId != value) { mGAId = value; OnPropertyChanged(nameof(GAId)); } } }
+        public string GingerAnalyticsAppId { get { return mGingerAnalyticsAppId; } set { if (mGingerAnalyticsAppId != value) { mGingerAnalyticsAppId = value; OnPropertyChanged(nameof(GingerAnalyticsAppId)); } } }
 
-        private string mGAStatus = "Imported"; //Ginger Analytics Application ID
-        [IsSerializedForLocalRepository]
-        public string GAStatus { get { return mGAStatus; } set { if (mGAStatus != value) { mGAStatus = value; OnPropertyChanged(nameof(GAStatus)); } } }
+        private string mGingerAnalyticsStatus; //Ginger Analytics import status
+        public string GingerAnalyticsStatus { get { return mGingerAnalyticsStatus; } set { if (mGingerAnalyticsStatus != value) { mGingerAnalyticsStatus = value; OnPropertyChanged(nameof(GingerAnalyticsStatus)); } } }
 
-        private string mGARemark; //Ginger Analytics Application ID
-        [IsSerializedForLocalRepository]
-        public string GARemark { get { return mGARemark; } set { if (mGARemark != value) { mGARemark = value; OnPropertyChanged(nameof(GARemark)); } } }
+        private string mGingerAnalyticsRemark; //Ginger Analytics Remakrs if any during import
+        public string GingerAnalyticsRemark { get { return mGingerAnalyticsRemark; } set { if (mGingerAnalyticsRemark != value) { mGingerAnalyticsRemark = value; OnPropertyChanged(nameof(GingerAnalyticsRemark)); } } }
 
         [IsSerializedForLocalRepository]
         public ObservableList<IDatabase> Dbs { get; set; } = new ObservableList<IDatabase>();
diff --git a/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs b/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
index 40a0842ef7..9d81923b37 100644
--- a/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
+++ b/Ginger/GingerCoreCommon/External/Configurations/GingerAnalyticsConfiguration.cs
@@ -55,6 +55,11 @@ public string AccountUrl
             }
             set
             {
+                if (value != null && value.EndsWith("/"))
+                {
+                    value = value.TrimEnd('/');
+                }
+
                 if (mAccountUrl != value)
                 {
                     mAccountUrl = value;
@@ -73,6 +78,11 @@ public string IdentityServiceURL
             }
             set
             {
+                if (value != null && value.EndsWith("/"))
+                {
+                    value = value.TrimEnd('/');
+                }
+
                 if (mIdentityServiceURL != value)
                 {
                     mIdentityServiceURL = value;
diff --git a/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs b/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs
index 26ba9e9dc7..fa57ee795a 100644
--- a/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs
+++ b/Ginger/GingerCoreCommon/Repository/PlatformsLib/ApplicationPlatform.cs
@@ -185,8 +185,8 @@ public override string ItemNameField
             }
         }
 
-        private string mGAId; //Ginger Analytics Application ID
+        private string mGingerAnalyticsAppId; //Ginger Analytics Application ID
         [IsSerializedForLocalRepository]
-        public string GAId { get { return mGAId; } set { if (mGAId != value) { mGAId = value; OnPropertyChanged(nameof(GAId)); } } }
+        public string GingerAnalyticsAppId { get { return mGingerAnalyticsAppId; } set { if (mGingerAnalyticsAppId != value) { mGingerAnalyticsAppId = value; OnPropertyChanged(nameof(GingerAnalyticsAppId)); } } }
     }
 }
diff --git a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
index eefaa5237a..3a208a8ae7 100644
--- a/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
+++ b/Ginger/GingerTest/GingerAnalytics/GingerAnalyticsConfigPageTest.cs
@@ -33,7 +33,7 @@ public void Setup()
             };
 
             // Inject mock objects
-            _page.analyticsAPI = _mockAnalyticsAPI.Object;
+            _page = new GingerAnalyticsConfigurationPage();
         }
 
         [TestMethod]