From a1d7d3098d78b3f79540079bd79fe9a12666b97d Mon Sep 17 00:00:00 2001
From: Viktor <VLe@infragistics.com>
Date: Mon, 25 Nov 2024 17:13:20 +0700
Subject: [PATCH 1/7] Create constructors for Postgres DataSource Item

---
 .../DataSourceItems/PostgreSqlDataSourceItem.cs   | 15 +++++++++++++++
 .../Data/DataSources/PostgreSQLDataSource.cs      |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs b/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs
index 47968036..161ee1a0 100644
--- a/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs
+++ b/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs
@@ -5,6 +5,16 @@ namespace Reveal.Sdk.Dom.Data
 {
     public class PostgreSqlDataSourceItem : FunctionDataSourceItem, IProcessDataOnServer
     {
+        public PostgreSqlDataSourceItem(string title, string table, PostgreSQLDataSource dataSource) :
+            this(title, dataSource)
+        {
+            Table = table;
+        }
+
+        public PostgreSqlDataSourceItem(string title, PostgreSQLDataSource dataSource) :
+            base(title, dataSource)
+        { }
+
         public PostgreSqlDataSourceItem(string title, DataSource dataSource) :
             base(title, dataSource)
         { }
@@ -15,5 +25,10 @@ public bool ProcessDataOnServer
             get => Properties.GetValue<bool>("ServerAggregation");
             set => Properties.SetItem("ServerAggregation", value);
         }
+
+        protected override DataSource CreateDataSourceInstance(DataSource dataSource)
+        {
+            return Create<PostgreSQLDataSource>(dataSource);
+        }
     }
 }
diff --git a/src/Reveal.Sdk.Dom/Data/DataSources/PostgreSQLDataSource.cs b/src/Reveal.Sdk.Dom/Data/DataSources/PostgreSQLDataSource.cs
index 4a98e8c0..0a07dbdb 100644
--- a/src/Reveal.Sdk.Dom/Data/DataSources/PostgreSQLDataSource.cs
+++ b/src/Reveal.Sdk.Dom/Data/DataSources/PostgreSQLDataSource.cs
@@ -1,6 +1,6 @@
 namespace Reveal.Sdk.Dom.Data
 {
-    internal class PostgreSQLDataSource : SchemaDataSource
+    public class PostgreSQLDataSource : SchemaDataSource
     {
         public PostgreSQLDataSource()
         {

From da504ad21b299df3872d0c49de0fd6d0d616ab9d Mon Sep 17 00:00:00 2001
From: Viktor <VLe@infragistics.com>
Date: Tue, 26 Nov 2024 14:36:07 +0700
Subject: [PATCH 2/7] Update Postgresql DataSource Item and Unit tests

---
 .../PostgreSqlDataSourceItemFixture.cs        | 78 +++++++++++++++++--
 .../Data/DataSourceItemFactory.cs             |  1 +
 .../PostgreSqlDataSourceItem.cs               | 20 +++--
 .../Data/Enums/DataSourceType.cs              |  3 +-
 4 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs b/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs
index abff0791..8072ecb9 100644
--- a/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs
+++ b/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs
@@ -7,19 +7,83 @@ namespace Reveal.Sdk.Dom.Tests.Data.DataSourceItems
     public class PostgreSqlDataSourceItemFixture
     {
         [Theory]
-        [InlineData("Test Item")]
-        [InlineData(null)]
-        public void Constructor_SetsTitleAndDataSource_WhenCalled(string title)
+        [InlineData("DS Item Title", "DS Item Title", "DS Title", "DS Title")]
+        [InlineData("DS Item Title", "DS Item Title", null, "DS Item Title")]
+        public void Constructor_CreatePostgresDSItem_WithTitleAndPostgresDataSource(string dsItemTitle, string expectedDSItemTitle, string dsTitle, string expectedDSTitle)
         {
             // Arrange
-            var dataSource = new PostgreSQLDataSource();
+            var dataSource = new PostgreSQLDataSource() { Title = dsTitle};
 
             // Act
-            var item = new PostgreSqlDataSourceItem(title, dataSource);
+            var item = new PostgreSqlDataSourceItem(dsItemTitle, dataSource);
 
             // Assert
-            Assert.Equal(title, item.Title);
-            Assert.Equal(dataSource, item.DataSource);
+            Assert.Equal(expectedDSItemTitle, item.Title);
+            Assert.Equal(expectedDSTitle, item.DataSource.Title);
+            Assert.Equal(dataSource.Id, item.DataSource.Id);
+            Assert.Equal(dataSource.Id, item.DataSourceId);
+        }
+
+        [Theory]
+        [InlineData("DS Item Title", "DS Item Title", "DS Title", "DS Title")]
+        [InlineData("DS Item Title", "DS Item Title", null, "DS Item Title")]
+        public void Constructor_CreatePostgresDSItem_WithTitleAndDataSource(string dsItemTitle, string expectedDSItemTitle, string dsTitle, string expectedDSTitle)
+        {
+            // Arrange
+            var dataSource = new DataSource() { Title = dsTitle };
+
+            // Act
+            var item = new PostgreSqlDataSourceItem(dsItemTitle, dataSource);
+
+            // Assert
+            Assert.Equal(expectedDSItemTitle, item.Title);
+            Assert.Equal(expectedDSTitle, item.DataSource.Title);
+            Assert.Equal(dataSource.Id, item.DataSource.Id);
+            Assert.Equal(dataSource.Id, item.DataSourceId);
+            Assert.IsType<PostgreSQLDataSource>(item.DataSource);
+            Assert.NotSame(dataSource, item.DataSource);
+        }
+
+        [Theory]
+        [InlineData("DS Item Title", "DS Item Title", "DS Title", "DS Title")]
+        [InlineData("DS Item Title", "DS Item Title", null, "DS Item Title")]
+        public void Constructor_CreatePostgresDSItem_WithCustomTableAndPostgresDataSource(string dsItemTitle, string expectedDSItemTitle, string dsTitle, string expectedDSTitle)
+        {
+            // Arrange
+            var tableName = "Table";
+            var dataSource = new PostgreSQLDataSource() { Title = dsTitle};
+
+            // Act
+            var postgresDSItem = new PostgreSqlDataSourceItem(dsItemTitle, tableName, dataSource);
+
+            // Assert
+            Assert.Equal(expectedDSTitle, postgresDSItem.DataSource.Title);
+            Assert.Equal(expectedDSItemTitle, postgresDSItem.Title);
+            Assert.Equal(tableName, postgresDSItem.Table);
+            Assert.Equal(dataSource.Id, postgresDSItem.DataSource.Id);
+            Assert.Equal(dataSource.Id, postgresDSItem.DataSourceId);
+        }
+
+        [Theory]
+        [InlineData("DS Item Title", "DS Item Title", "DS Title", "DS Title")]
+        [InlineData("DS Item Title", "DS Item Title", null, "DS Item Title")]
+        public void Constructor_CreatePostgresDSItem_WithCustomTableAndDataSource(string dsItemTitle, string expectedDSItemTitle, string dsTitle, string expectedDSTitle)
+        {
+            // Arrange
+            var tableName = "Table";
+            var dataSource = new DataSource() { Title = dsTitle };
+
+            // Act
+            var postgresDSItem = new PostgreSqlDataSourceItem(dsItemTitle, tableName, dataSource);
+
+            // Assert
+            Assert.Equal(expectedDSTitle, postgresDSItem.DataSource.Title);
+            Assert.Equal(expectedDSItemTitle, postgresDSItem.Title);
+            Assert.Equal(tableName, postgresDSItem.Table);
+            Assert.Equal(dataSource.Id, postgresDSItem.DataSource.Id);
+            Assert.Equal(dataSource.Id, postgresDSItem.DataSourceId);
+            Assert.IsType<PostgreSQLDataSource>(postgresDSItem.DataSource);
+            Assert.NotSame(dataSource, postgresDSItem.DataSource);
         }
 
         [Fact]
diff --git a/src/Reveal.Sdk.Dom/Data/DataSourceItemFactory.cs b/src/Reveal.Sdk.Dom/Data/DataSourceItemFactory.cs
index f57fa80e..7cecba34 100644
--- a/src/Reveal.Sdk.Dom/Data/DataSourceItemFactory.cs
+++ b/src/Reveal.Sdk.Dom/Data/DataSourceItemFactory.cs
@@ -25,6 +25,7 @@ public DataSourceItem Create(DataSourceType type, string id, string title, strin
             {
                 DataSourceType.MicrosoftSqlServer => new MicrosoftSqlServerDataSourceItem(title, dataSource),
                 DataSourceType.REST => new RestDataSourceItem(title, dataSource),
+                DataSourceType.PostgreSQL => new PostgreSqlDataSourceItem(title, dataSource),
                 _ => throw new NotImplementedException($"No builder implemented for provider: {type}")
             };
 
diff --git a/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs b/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs
index 161ee1a0..5f9d8369 100644
--- a/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs
+++ b/src/Reveal.Sdk.Dom/Data/DataSourceItems/PostgreSqlDataSourceItem.cs
@@ -5,19 +5,25 @@ namespace Reveal.Sdk.Dom.Data
 {
     public class PostgreSqlDataSourceItem : FunctionDataSourceItem, IProcessDataOnServer
     {
-        public PostgreSqlDataSourceItem(string title, string table, PostgreSQLDataSource dataSource) :
-            this(title, dataSource)
-        {
-            Table = table;
-        }
-
         public PostgreSqlDataSourceItem(string title, PostgreSQLDataSource dataSource) :
             base(title, dataSource)
         { }
 
         public PostgreSqlDataSourceItem(string title, DataSource dataSource) :
             base(title, dataSource)
-        { }
+        { }
+
+        public PostgreSqlDataSourceItem(string title, string table, PostgreSQLDataSource dataSource) :
+           this(title, dataSource)
+        {
+            Table = table;
+        }
+
+        public PostgreSqlDataSourceItem(string title, string table, DataSource dataSource) :
+            this(title, dataSource)
+        {
+            Table = table;
+        }
 
         [JsonIgnore]
         public bool ProcessDataOnServer
diff --git a/src/Reveal.Sdk.Dom/Data/Enums/DataSourceType.cs b/src/Reveal.Sdk.Dom/Data/Enums/DataSourceType.cs
index 949210b7..292ef25a 100644
--- a/src/Reveal.Sdk.Dom/Data/Enums/DataSourceType.cs
+++ b/src/Reveal.Sdk.Dom/Data/Enums/DataSourceType.cs
@@ -3,6 +3,7 @@
     public enum DataSourceType
     {
         REST,
-        MicrosoftSqlServer
+        MicrosoftSqlServer,
+        PostgreSQL,
     }
 }

From e61b3627241af69a37093a6826ff9998fc9194f5 Mon Sep 17 00:00:00 2001
From: Viktor <VLe@infragistics.com>
Date: Wed, 27 Nov 2024 15:48:47 +0700
Subject: [PATCH 3/7] Update postgresql and fields

---
 .../PostgreSQLDataSourceFixture.cs            | 52 +++++++++++++++++++
 src/Reveal.Sdk.Dom/Data/DataSource.cs         |  9 +++-
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs b/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs
index 4f887052..5527dd21 100644
--- a/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs
+++ b/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs
@@ -1,5 +1,7 @@
+using Reveal.Sdk.Dom.Core.Serialization;
 using Reveal.Sdk.Dom.Data;
 using Xunit;
+using Newtonsoft.Json.Linq;
 
 namespace Reveal.Sdk.Dom.Tests.Data.DataSources
 {
@@ -14,5 +16,55 @@ public void Constructor_SetsProviderToPostgreSQL_WhenConstructed()
             // Assert
             Assert.Equal(DataSourceProvider.PostgreSQL, dataSource.Provider);
         }
+
+        [Fact]
+        public void ToJsonString_CreatesFormattedJson_NoConditions()
+        {
+            // Arrange
+            var expectedJson = @"{
+              ""_type"": ""DataSourceType"",
+              ""Id"": ""pgSqlId"",
+              ""Provider"": ""POSTGRES"",
+              ""Description"": ""Postgres DS"",
+              ""Subtitle"": ""Northwind Employees"",
+              ""Properties"": {
+                ""ServerAggregationDefault"": true,
+                ""ServerAggregationReadOnly"": true,
+                ""Host"": ""revealdb01.infragistics.local"",
+                ""Port"": 5432,
+                ""Database"": ""northwind"",
+                ""Schema"": ""public""
+              },
+              ""Settings"": {
+                ""DefaultRefreshRate"": 180
+              }
+            }";
+
+            var dataSource = new PostgreSQLDataSource()
+            {
+                Id = "pgSqlId",
+                Title = "Postgres DS",
+                Subtitle = "Northwind Employees",
+                ProcessDataOnServerDefaultValue = true,
+                ProcessDataOnServerReadOnly = true,
+                Host = "revealdb01.infragistics.local",
+                Port = 5432,
+                Database = "northwind",
+                Schema = "public",
+                DefaultRefreshRate = "180",
+                
+            };
+
+            // Act
+            var json = dataSource.ToJsonString();
+            var aJ = RdashSerializer.SerializeObject(dataSource);
+            var expectedJObject = JObject.Parse(expectedJson);
+            var actualJObject = JObject.Parse(json);
+
+            // Assert
+            //JsonConvert.SerializeObject(dataSource, Newtonsoft.Json.Formatting.Indented).JsonEquals(expectedJson);
+            Assert.Equal(expectedJObject, actualJObject);
+
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Reveal.Sdk.Dom/Data/DataSource.cs b/src/Reveal.Sdk.Dom/Data/DataSource.cs
index dbacee6b..bdca5df3 100644
--- a/src/Reveal.Sdk.Dom/Data/DataSource.cs
+++ b/src/Reveal.Sdk.Dom/Data/DataSource.cs
@@ -16,6 +16,7 @@ public DataSource()
         {
             SchemaTypeName = SchemaTypeNames.DataSourceType;
             Properties = new Dictionary<string, object>();
+            Settings = new Dictionary<string, object>();
         }
 
         public string Id
@@ -33,15 +34,19 @@ public string Id
 
         public string Subtitle { get; set; }
 
+        [JsonIgnore]
         public string DefaultRefreshRate
         {
-            get => Properties.GetValue<string>("DefaultRefreshRate");
-            set => Properties.SetItem("DefaultRefreshRate", value);
+            get => Settings.GetValue<string>("DefaultRefreshRate");
+            set => Settings.SetItem("DefaultRefreshRate", value);
         }
 
         [JsonProperty]
         internal Dictionary<string, object> Properties { get; set; }
 
+        [JsonProperty]
+        internal Dictionary<string, object> Settings { get; set; }
+
         public override bool Equals(object obj)
         {
             return Equals(obj as DataSource);

From 2d5471f4531628b4e091837d83f5c71dc87b60d0 Mon Sep 17 00:00:00 2001
From: Viktor <VLe@infragistics.com>
Date: Wed, 4 Dec 2024 17:48:14 +0700
Subject: [PATCH 4/7] Fix merge conflicts

---
 .../DashboardCreators/PostgresqlDashboard.cs  | 43 +++++++++++
 e2e/Sandbox/Helpers/DataSourceFactory.cs      | 37 +++++++++
 e2e/Sandbox/MainWindow.xaml                   | 36 ++++-----
 e2e/Sandbox/MainWindow.xaml.cs                | 26 +++++++
 e2e/Sandbox/Properties/Settings.Designer.cs   | 76 +++++++++----------
 e2e/Sandbox/Reveal/AuthenticationProvider.cs  |  5 ++
 6 files changed, 167 insertions(+), 56 deletions(-)
 create mode 100644 e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs

diff --git a/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs b/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
new file mode 100644
index 00000000..7c8047fd
--- /dev/null
+++ b/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
@@ -0,0 +1,43 @@
+using Reveal.Sdk.Dom;
+using Reveal.Sdk.Dom.Data;
+using Reveal.Sdk.Dom.Filters;
+using Reveal.Sdk.Dom.Visualizations;
+using Sandbox.Helpers;
+using System;
+
+namespace Sandbox.Factories
+{
+    internal class PostgresqlDashboard
+    {
+        internal static RdashDocument CreateDashboard()
+        {
+            var postgresDataSourceItem = PostgresDataSourceFactory.GetEmployeeDSItem();
+
+            var document = new RdashDocument()
+            {
+                Title = "PostgreSQL",
+                Description = "Example for Postgresql",
+                UseAutoLayout = false,
+            };
+
+            var dateFilter = new DashboardDateFilter("My Date Filter");
+            document.Filters.Add(dateFilter);
+
+            var countryFilter = new DashboardDataFilter("Country", postgresDataSourceItem);
+            document.Filters.Add(countryFilter);
+
+            document.Visualizations.Add(CreateEmployeeReportColumnVisualization(postgresDataSourceItem, countryFilter));
+
+            return document;
+        }
+
+        private static Visualization CreateEmployeeReportColumnVisualization(DataSourceItem postgresDSItem, params DashboardFilter[] filters)
+        {
+            return new ColumnChartVisualization("Employees report", postgresDSItem)
+                .SetLabel("ReportsTo")
+                .SetValue("EmployeeID")
+                .ConnectDashboardFilters(filters)
+                .SetPosition(20, 11);
+        }
+    }
+}
diff --git a/e2e/Sandbox/Helpers/DataSourceFactory.cs b/e2e/Sandbox/Helpers/DataSourceFactory.cs
index 67711bcf..f3025411 100644
--- a/e2e/Sandbox/Helpers/DataSourceFactory.cs
+++ b/e2e/Sandbox/Helpers/DataSourceFactory.cs
@@ -211,4 +211,41 @@ internal static List<IField> GetOHLCDataSourceFields()
             };
         }
     }
+
+    internal class PostgresDataSourceFactory
+    {
+        static DataSource _postgresDataSource = new PostgreSQLDataSource()
+        {
+            Id = "Postgres",
+            Title = "Postgres Data Source",
+            Subtitle = "The Data Source for Postgres",
+            Host = "revealdb01.infragistics.local",
+            Database = "northwind",
+            Port = 5432
+        };
+
+        internal static DataSourceItem GetEmployeeDSItem()
+        {
+            var employeesDSItem = new PostgreSqlDataSourceItem("Employees", _postgresDataSource)
+            {
+                Title = "Postgres Employee",
+                Subtitle = "Postgres DS Item for Employee",
+                Database = "northwind",
+                Table = "employees",
+                Fields = GetEmployeeColumnFields()
+            };
+
+            return employeesDSItem;
+        }
+
+        internal static List<IField> GetEmployeeColumnFields()
+        {
+            return new List<IField>
+            {
+                new NumberField("ReportsTo"),
+                new NumberField("EmployeeID"),
+                new TextField("Country"),
+            };
+        }
+    }
 }
diff --git a/e2e/Sandbox/MainWindow.xaml b/e2e/Sandbox/MainWindow.xaml
index a81abd25..c5e615d2 100644
--- a/e2e/Sandbox/MainWindow.xaml
+++ b/e2e/Sandbox/MainWindow.xaml
@@ -1,18 +1,18 @@
-<Window x:Class="Sandbox.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Sandbox"        
-        xmlns:rv="http://revealbi.io/"
-        mc:Ignorable="d"
+<Window x:Class="Sandbox.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Sandbox"        
+        xmlns:rv="http://revealbi.io/"
+        mc:Ignorable="d"
         Title="MainWindow" Height="1080" Width="1920">
-    <Grid>
-        <Grid.RowDefinitions>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Margin="5">
             <Button Click="Load_Dashboard" Margin="2">Load Dashboard</Button>
             <Button Click="Read_Dashboard" Margin="2">Read Dashboard</Button>
@@ -21,10 +21,10 @@
         <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="3">
             <ComboBox Name="_dashboardTypeSelector" DisplayMemberPath="Name" Margin="2" Width="250" />
             <Button Content="Create Dashboard with Type" Margin="2" Click="CreateDashboardWithTypeBtn_Click"/>
-        </StackPanel>
-
+        </StackPanel>
+
         <rv:RevealView Grid.Row="2" x:Name="_revealView" ShowEditDataSource="True" ShowDataBlending="True"
                        SaveDashboard="RevealView_SaveDashboard"/>
-    </Grid>
-
-</Window>
+    </Grid>
+
+</Window>
diff --git a/e2e/Sandbox/MainWindow.xaml.cs b/e2e/Sandbox/MainWindow.xaml.cs
index 1992d24c..cf8e3ed8 100644
--- a/e2e/Sandbox/MainWindow.xaml.cs
+++ b/e2e/Sandbox/MainWindow.xaml.cs
@@ -158,6 +158,27 @@ private void RevealView_DataSourcesRequested(object sender, DataSourcesRequested
             sqlDSI.Table = "Customers";
             dsi.Add(sqlDSI);
 
+            var postgresDS = new RVPostgresDataSource
+            {
+                Id = "postgresId",
+                Title = "Postgres DS",
+                Host = "revealdb01.infragistics.local",
+                Database = "northwind",
+                Port = 5432,
+            };
+            ds.Add(postgresDS);
+
+            var postgresDSItem = new RVPostgresDataSourceItem(postgresDS)
+            {
+                Id = "postgresDSItemId",
+                Title = "Postgres DSItem",
+                Description = "Northwind Employees",
+                Database = "northwind",
+                Schema = "public",
+                Table = "employees"
+            };
+            dsi.Add(postgresDSItem);
+
             //var webDS = new RVWebResourceDataSource();
             //webDS.UseAnonymousAuthentication = true;
             //webDS.Title = "Web Resource";
@@ -238,5 +259,10 @@ private void LoadDashboards()
                 _dashboardTypeSelector.SelectedItem = selectedDashboard;
             }
         }
+
+        private void _dashboardTypeSelector_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/e2e/Sandbox/Properties/Settings.Designer.cs b/e2e/Sandbox/Properties/Settings.Designer.cs
index 6ec3e987..67fdb056 100644
--- a/e2e/Sandbox/Properties/Settings.Designer.cs
+++ b/e2e/Sandbox/Properties/Settings.Designer.cs
@@ -1,38 +1,38 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Sandbox.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-        
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string LastSelectedDashboard {
-            get {
-                return ((string)(this["LastSelectedDashboard"]));
-            }
-            set {
-                this["LastSelectedDashboard"] = value;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Sandbox.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string LastSelectedDashboard {
+            get {
+                return ((string)(this["LastSelectedDashboard"]));
+            }
+            set {
+                this["LastSelectedDashboard"] = value;
+            }
+        }
+    }
+}
diff --git a/e2e/Sandbox/Reveal/AuthenticationProvider.cs b/e2e/Sandbox/Reveal/AuthenticationProvider.cs
index 07e9fce2..a3621387 100644
--- a/e2e/Sandbox/Reveal/AuthenticationProvider.cs
+++ b/e2e/Sandbox/Reveal/AuthenticationProvider.cs
@@ -1,6 +1,7 @@
 using Reveal.Sdk.Data;
 using Reveal.Sdk.Data.Microsoft.AnalysisServices;
 using Reveal.Sdk.Data.Microsoft.SqlServer;
+using Reveal.Sdk.Data.PostgreSQL;
 using System.Threading.Tasks;
 
 namespace Sandbox.RevealSDK
@@ -18,6 +19,10 @@ public Task<IRVDataSourceCredential> ResolveCredentialsAsync(RVDashboardDataSour
             {
                 userCredential = new RVUsernamePasswordDataSourceCredential("username", "password", "domain");
             }
+            else if (dataSource is RVPostgresDataSource)
+            {
+                userCredential = new RVUsernamePasswordDataSourceCredential("postgres", "postgres");
+            }
             return Task.FromResult(userCredential);
         }
     }

From 4334964be104345ad18a7b48e82d8ad3b1141084 Mon Sep 17 00:00:00 2001
From: Viktor <VLe@infragistics.com>
Date: Mon, 2 Dec 2024 16:59:37 +0700
Subject: [PATCH 5/7] update tests for DefaultRefreshRate properties

---
 src/Reveal.Sdk.Dom.Tests/Data/DataSourceFixture.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Reveal.Sdk.Dom.Tests/Data/DataSourceFixture.cs b/src/Reveal.Sdk.Dom.Tests/Data/DataSourceFixture.cs
index e7485998..f7d8582d 100644
--- a/src/Reveal.Sdk.Dom.Tests/Data/DataSourceFixture.cs
+++ b/src/Reveal.Sdk.Dom.Tests/Data/DataSourceFixture.cs
@@ -93,7 +93,7 @@ public void GetDefaultRefreshRate_ReturnSameValue_WithSetValue()
 
             // Assert
             Assert.Equal(expectedValue, actualValue);
-            Assert.Equal(expectedValue, dataSource.Properties.GetValue<string>("DefaultRefreshRate"));
+            Assert.Equal(expectedValue, dataSource.Settings.GetValue<string>("DefaultRefreshRate"));
         }
 
         [Fact]

From 2bc98ca812ac71649a3610d5e4170bf3eff4bda0 Mon Sep 17 00:00:00 2001
From: Viktor <VLe@infragistics.com>
Date: Thu, 5 Dec 2024 15:02:30 +0700
Subject: [PATCH 6/7] Update sandbox

---
 .../DashboardCreators/PostgresqlDashboard.cs  | 33 +++++++++++++++--
 e2e/Sandbox/Helpers/DataSourceFactory.cs      | 37 -------------------
 e2e/Sandbox/MainWindow.xaml.cs                |  4 +-
 3 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs b/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
index 7c8047fd..3d51a6f0 100644
--- a/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
+++ b/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
@@ -2,16 +2,42 @@
 using Reveal.Sdk.Dom.Data;
 using Reveal.Sdk.Dom.Filters;
 using Reveal.Sdk.Dom.Visualizations;
+using Sandbox.DashboardFactories;
 using Sandbox.Helpers;
 using System;
+using System.Collections.Generic;
 
 namespace Sandbox.Factories
 {
-    internal class PostgresqlDashboard
+    internal class PostgresqlDashboard : IDashboardCreator
     {
-        internal static RdashDocument CreateDashboard()
+        public string Name => "PostgresQL Server Data Source";
+
+        public RdashDocument CreateDashboard()
         {
-            var postgresDataSourceItem = PostgresDataSourceFactory.GetEmployeeDSItem();
+            DataSource _postgresDataSource = new PostgreSQLDataSource()
+            {
+                Id = "Postgres",
+                Title = "Postgres Data Source",
+                Subtitle = "The Data Source for Postgres",
+                Host = "revealdb01.infragistics.local",
+                Database = "northwind",
+                Port = 5432
+            };
+
+            var postgresDataSourceItem = new PostgreSqlDataSourceItem("Employees", _postgresDataSource)
+            {
+                Title = "Postgres Employee",
+                Subtitle = "Postgres DS Item for Employee",
+                Database = "northwind",
+                Table = "employees",
+                Fields = new List<IField>
+                {
+                    new NumberField("ReportsTo"),
+                    new NumberField("EmployeeID"),
+                    new TextField("Country"),
+                }
+            };
 
             var document = new RdashDocument()
             {
@@ -39,5 +65,6 @@ private static Visualization CreateEmployeeReportColumnVisualization(DataSourceI
                 .ConnectDashboardFilters(filters)
                 .SetPosition(20, 11);
         }
+
     }
 }
diff --git a/e2e/Sandbox/Helpers/DataSourceFactory.cs b/e2e/Sandbox/Helpers/DataSourceFactory.cs
index f3025411..67711bcf 100644
--- a/e2e/Sandbox/Helpers/DataSourceFactory.cs
+++ b/e2e/Sandbox/Helpers/DataSourceFactory.cs
@@ -211,41 +211,4 @@ internal static List<IField> GetOHLCDataSourceFields()
             };
         }
     }
-
-    internal class PostgresDataSourceFactory
-    {
-        static DataSource _postgresDataSource = new PostgreSQLDataSource()
-        {
-            Id = "Postgres",
-            Title = "Postgres Data Source",
-            Subtitle = "The Data Source for Postgres",
-            Host = "revealdb01.infragistics.local",
-            Database = "northwind",
-            Port = 5432
-        };
-
-        internal static DataSourceItem GetEmployeeDSItem()
-        {
-            var employeesDSItem = new PostgreSqlDataSourceItem("Employees", _postgresDataSource)
-            {
-                Title = "Postgres Employee",
-                Subtitle = "Postgres DS Item for Employee",
-                Database = "northwind",
-                Table = "employees",
-                Fields = GetEmployeeColumnFields()
-            };
-
-            return employeesDSItem;
-        }
-
-        internal static List<IField> GetEmployeeColumnFields()
-        {
-            return new List<IField>
-            {
-                new NumberField("ReportsTo"),
-                new NumberField("EmployeeID"),
-                new TextField("Country"),
-            };
-        }
-    }
 }
diff --git a/e2e/Sandbox/MainWindow.xaml.cs b/e2e/Sandbox/MainWindow.xaml.cs
index cf8e3ed8..febb6954 100644
--- a/e2e/Sandbox/MainWindow.xaml.cs
+++ b/e2e/Sandbox/MainWindow.xaml.cs
@@ -23,6 +23,7 @@
 using Reveal.Sdk.Data.Snowflake;
 using Reveal.Sdk.Dom;
 using Sandbox.DashboardFactories;
+using Sandbox.Factories;
 using Sandbox.RevealSDK;
 using System;
 using System.Collections.Generic;
@@ -51,6 +52,7 @@ public partial class MainWindow : Window
             new RestDataSourceDashboard(),
             new SalesDashboard(),
             new SqlServerDataSourceDashboards(),
+            new PostgresqlDashboard()
         };
 
         public MainWindow()
@@ -59,7 +61,7 @@ public MainWindow()
 
             RevealSdkSettings.DataSourceProvider = new Sandbox.RevealSDK.DataSourceProvider();
             RevealSdkSettings.AuthenticationProvider = new AuthenticationProvider();
-            RevealSdkSettings.DataSources.RegisterMicrosoftSqlServer().RegisterMicrosoftAnalysisServices();
+            RevealSdkSettings.DataSources.RegisterMicrosoftSqlServer().RegisterMicrosoftAnalysisServices().RegisterPostgreSQL();
 
             LoadDashboards();
 

From 9a5d442eebaca2d0fad19c4c4cc63245849ff7e4 Mon Sep 17 00:00:00 2001
From: Viktor <VLe@infragistics.com>
Date: Tue, 10 Dec 2024 12:04:39 +0700
Subject: [PATCH 7/7] Remove unused code

---
 .../DashboardCreators/PostgresqlDashboard.cs  | 23 +++-----
 e2e/Sandbox/MainWindow.xaml                   | 36 ++++++------
 e2e/Sandbox/MainWindow.xaml.cs                | 30 +---------
 .../PostgreSqlDataSourceItemFixture.cs        | 55 ++++++++++++++++++-
 .../PostgreSQLDataSourceFixture.cs            |  2 -
 5 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs b/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
index 3d51a6f0..4d2c01c1 100644
--- a/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
+++ b/e2e/Sandbox/DashboardCreators/PostgresqlDashboard.cs
@@ -2,16 +2,13 @@
 using Reveal.Sdk.Dom.Data;
 using Reveal.Sdk.Dom.Filters;
 using Reveal.Sdk.Dom.Visualizations;
-using Sandbox.DashboardFactories;
-using Sandbox.Helpers;
-using System;
 using System.Collections.Generic;
 
-namespace Sandbox.Factories
+namespace Sandbox.DashboardFactories
 {
     internal class PostgresqlDashboard : IDashboardCreator
     {
-        public string Name => "PostgresQL Server Data Source";
+        public string Name => "PostgresQL Data Source";
 
         public RdashDocument CreateDashboard()
         {
@@ -52,19 +49,13 @@ public RdashDocument CreateDashboard()
             var countryFilter = new DashboardDataFilter("Country", postgresDataSourceItem);
             document.Filters.Add(countryFilter);
 
-            document.Visualizations.Add(CreateEmployeeReportColumnVisualization(postgresDataSourceItem, countryFilter));
-
-            return document;
-        }
-
-        private static Visualization CreateEmployeeReportColumnVisualization(DataSourceItem postgresDSItem, params DashboardFilter[] filters)
-        {
-            return new ColumnChartVisualization("Employees report", postgresDSItem)
+            document.Visualizations.Add(new ColumnChartVisualization("Employees report", postgresDataSourceItem)
                 .SetLabel("ReportsTo")
                 .SetValue("EmployeeID")
-                .ConnectDashboardFilters(filters)
-                .SetPosition(20, 11);
-        }
+                .ConnectDashboardFilters(countryFilter)
+                .SetPosition(20, 11));
 
+            return document;
+        }
     }
 }
diff --git a/e2e/Sandbox/MainWindow.xaml b/e2e/Sandbox/MainWindow.xaml
index c5e615d2..52631991 100644
--- a/e2e/Sandbox/MainWindow.xaml
+++ b/e2e/Sandbox/MainWindow.xaml
@@ -1,18 +1,18 @@
-<Window x:Class="Sandbox.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Sandbox"        
-        xmlns:rv="http://revealbi.io/"
-        mc:Ignorable="d"
+<Window x:Class="Sandbox.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Sandbox"        
+        xmlns:rv="http://revealbi.io/"
+        mc:Ignorable="d"
         Title="MainWindow" Height="1080" Width="1920">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
+    <Grid>
+        <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Margin="5">
             <Button Click="Load_Dashboard" Margin="2">Load Dashboard</Button>
             <Button Click="Read_Dashboard" Margin="2">Read Dashboard</Button>
@@ -21,10 +21,10 @@
         <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="3">
             <ComboBox Name="_dashboardTypeSelector" DisplayMemberPath="Name" Margin="2" Width="250" />
             <Button Content="Create Dashboard with Type" Margin="2" Click="CreateDashboardWithTypeBtn_Click"/>
-        </StackPanel>
-
+        </StackPanel>
+
         <rv:RevealView Grid.Row="2" x:Name="_revealView" ShowEditDataSource="True" ShowDataBlending="True"
                        SaveDashboard="RevealView_SaveDashboard"/>
-    </Grid>
-
-</Window>
+    </Grid>
+
+</Window>
\ No newline at end of file
diff --git a/e2e/Sandbox/MainWindow.xaml.cs b/e2e/Sandbox/MainWindow.xaml.cs
index febb6954..d907f340 100644
--- a/e2e/Sandbox/MainWindow.xaml.cs
+++ b/e2e/Sandbox/MainWindow.xaml.cs
@@ -23,7 +23,6 @@
 using Reveal.Sdk.Data.Snowflake;
 using Reveal.Sdk.Dom;
 using Sandbox.DashboardFactories;
-using Sandbox.Factories;
 using Sandbox.RevealSDK;
 using System;
 using System.Collections.Generic;
@@ -49,17 +48,17 @@ public partial class MainWindow : Window
             new HealthcareDashboard(),
             new ManufacturingDashboard(),
             new MarketingDashboard(),
+            new PostgresqlDashboard(),
             new RestDataSourceDashboard(),
             new SalesDashboard(),
             new SqlServerDataSourceDashboards(),
-            new PostgresqlDashboard()
         };
 
         public MainWindow()
         {
             InitializeComponent();
 
-            RevealSdkSettings.DataSourceProvider = new Sandbox.RevealSDK.DataSourceProvider();
+            RevealSdkSettings.DataSourceProvider = new DataSourceProvider();
             RevealSdkSettings.AuthenticationProvider = new AuthenticationProvider();
             RevealSdkSettings.DataSources.RegisterMicrosoftSqlServer().RegisterMicrosoftAnalysisServices().RegisterPostgreSQL();
 
@@ -160,26 +159,6 @@ private void RevealView_DataSourcesRequested(object sender, DataSourcesRequested
             sqlDSI.Table = "Customers";
             dsi.Add(sqlDSI);
 
-            var postgresDS = new RVPostgresDataSource
-            {
-                Id = "postgresId",
-                Title = "Postgres DS",
-                Host = "revealdb01.infragistics.local",
-                Database = "northwind",
-                Port = 5432,
-            };
-            ds.Add(postgresDS);
-
-            var postgresDSItem = new RVPostgresDataSourceItem(postgresDS)
-            {
-                Id = "postgresDSItemId",
-                Title = "Postgres DSItem",
-                Description = "Northwind Employees",
-                Database = "northwind",
-                Schema = "public",
-                Table = "employees"
-            };
-            dsi.Add(postgresDSItem);
 
             //var webDS = new RVWebResourceDataSource();
             //webDS.UseAnonymousAuthentication = true;
@@ -261,10 +240,5 @@ private void LoadDashboards()
                 _dashboardTypeSelector.SelectedItem = selectedDashboard;
             }
         }
-
-        private void _dashboardTypeSelector_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)
-        {
-
-        }
     }
 }
diff --git a/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs b/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs
index 8072ecb9..228d9939 100644
--- a/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs
+++ b/src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/PostgreSqlDataSourceItemFixture.cs
@@ -1,3 +1,4 @@
+using Newtonsoft.Json.Linq;
 using Reveal.Sdk.Dom.Core.Extensions;
 using Reveal.Sdk.Dom.Data;
 using Xunit;
@@ -22,6 +23,7 @@ public void Constructor_CreatePostgresDSItem_WithTitleAndPostgresDataSource(stri
             Assert.Equal(expectedDSTitle, item.DataSource.Title);
             Assert.Equal(dataSource.Id, item.DataSource.Id);
             Assert.Equal(dataSource.Id, item.DataSourceId);
+            Assert.Same(dataSource, item.DataSource);
         }
 
         [Theory]
@@ -60,8 +62,10 @@ public void Constructor_CreatePostgresDSItem_WithCustomTableAndPostgresDataSourc
             Assert.Equal(expectedDSTitle, postgresDSItem.DataSource.Title);
             Assert.Equal(expectedDSItemTitle, postgresDSItem.Title);
             Assert.Equal(tableName, postgresDSItem.Table);
+            Assert.Equal(tableName, postgresDSItem.Properties.GetValue<string>("Table"));
             Assert.Equal(dataSource.Id, postgresDSItem.DataSource.Id);
             Assert.Equal(dataSource.Id, postgresDSItem.DataSourceId);
+            Assert.Same(dataSource, postgresDSItem.DataSource);
         }
 
         [Theory]
@@ -80,6 +84,7 @@ public void Constructor_CreatePostgresDSItem_WithCustomTableAndDataSource(string
             Assert.Equal(expectedDSTitle, postgresDSItem.DataSource.Title);
             Assert.Equal(expectedDSItemTitle, postgresDSItem.Title);
             Assert.Equal(tableName, postgresDSItem.Table);
+            Assert.Equal(tableName, postgresDSItem.Properties.GetValue<string>("Table"));
             Assert.Equal(dataSource.Id, postgresDSItem.DataSource.Id);
             Assert.Equal(dataSource.Id, postgresDSItem.DataSourceId);
             Assert.IsType<PostgreSQLDataSource>(postgresDSItem.DataSource);
@@ -87,7 +92,7 @@ public void Constructor_CreatePostgresDSItem_WithCustomTableAndDataSource(string
         }
 
         [Fact]
-        public void ProcessDataOnServer_SetsAndGetsValue_WithInputs()
+        public void GetProcessDataOnServer_ReturnSameValue_WhenSetValue()
         {
             // Arrange
             var item = new PostgreSqlDataSourceItem("Test Item", new PostgreSQLDataSource());
@@ -99,5 +104,53 @@ public void ProcessDataOnServer_SetsAndGetsValue_WithInputs()
             Assert.True(item.ProcessDataOnServer);
             Assert.True(item.Properties.GetValue<bool>("ServerAggregation"));
         }
+
+        [Fact]
+        public void ToJsonString_CreatesFormattedJson_NoConditions()
+        {
+            // Arrange
+            var expectedJson = @"{
+              ""_type"": ""DataSourceItemType"",
+              ""Id"": ""pgSqlDSItemId"",
+              ""Title"": ""Postgres DSItem"",
+              ""Subtitle"": ""Northwind Employees For DS Item"",
+              ""DataSourceId"": ""pgSqlId"",
+              ""HasTabularData"": true,
+              ""HasAsset"": false,
+              ""Properties"": {
+                ""ServerAggregation"": true,
+                ""Database"": ""northwind"",
+                ""Table"": ""categories"",
+                ""Schema"": """"
+              },
+              ""Parameters"": {}
+            }";
+
+            var dataSource = new PostgreSQLDataSource()
+            {
+                Id = "pgSqlId",
+            };
+
+            var dataSourceItem = new PostgreSqlDataSourceItem("Postgres DSItem", dataSource)
+            {
+                Id = "pgSqlDSItemId",
+                Subtitle = "Northwind Employees For DS Item",
+                HasTabularData = true,
+                HasAsset = false,
+                ProcessDataOnServer = true,
+                Database = "northwind",
+                Table = "categories",
+                Schema = "",
+            };
+
+            // Act
+            var json = dataSourceItem.ToJsonString();
+            var expectedJObject = JObject.Parse(expectedJson);
+            var actualJObject = JObject.Parse(json);
+
+            // Assert
+            Assert.Equal(expectedJObject, actualJObject);
+
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs b/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs
index 5527dd21..1af1350b 100644
--- a/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs
+++ b/src/Reveal.Sdk.Dom.Tests/Data/DataSources/PostgreSQLDataSourceFixture.cs
@@ -57,12 +57,10 @@ public void ToJsonString_CreatesFormattedJson_NoConditions()
 
             // Act
             var json = dataSource.ToJsonString();
-            var aJ = RdashSerializer.SerializeObject(dataSource);
             var expectedJObject = JObject.Parse(expectedJson);
             var actualJObject = JObject.Parse(json);
 
             // Assert
-            //JsonConvert.SerializeObject(dataSource, Newtonsoft.Json.Formatting.Indented).JsonEquals(expectedJson);
             Assert.Equal(expectedJObject, actualJObject);
 
         }