Update WebService Datasource

e2e/Sandbox/DashboardCreators/WebServiceDataSourceDashboard.cs

@@ -0,0 +1,57 @@
+using Reveal.Sdk.Data.MySql;
+using Reveal.Sdk.Data.Rest;
+using Reveal.Sdk.Dom;
+using Reveal.Sdk.Dom.Data;
+using Reveal.Sdk.Dom.Filters;
+using Reveal.Sdk.Dom.Visualizations;
+using Sandbox.DashboardFactories;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sandbox.DashboardCreators
+{
+    public class WebServiceDataSourceDashboard : IDashboardCreator
+    {
+        public string Name => "Web Service Data Source";
+
+        public RdashDocument CreateDashboard()
+        {
+            var document = new RdashDocument()
+            {
+                Title = "Webservice DS",
+                Description = "Example for Webservice",
+                UseAutoLayout = false,
+            };
+
+            var dataSourceItems = new WebServiceDataSourceItem("DB Test", new DataSource { Title = "JSON DS", Subtitle = "JSON DS Subtitle" })
+            {
+                Id = "webServiceItemId",
+                Title = "Sales by Category",
+                Subtitle = "Excel2Json",
+                Fields = new List<IField>
+                {
+                    new NumberField("CategoryID"),
+                    new TextField("CategoryName"),
+                    new TextField("ProductName"),
+                    new NumberField("ProductSales"),
+                }
+            };
+
+            var dateFilter = new DashboardDateFilter("My Date Filter");
+            document.Filters.Add(dateFilter);
+
+            var countryFilter = new DashboardDataFilter("Country", dataSourceItems);
+            document.Filters.Add(countryFilter);
+
+            document.Visualizations.Add(
+                            new ColumnChartVisualization("Test List", dataSourceItems)
+                                .SetLabel("CategoryName")
+                                .SetValue("ProductName")
+                                );
+            return document;
+        }
+    }
+}

e2e/Sandbox/MainWindow.xaml.cs

@@ -22,6 +22,7 @@
 using Reveal.Sdk.Data.Rest;
 using Reveal.Sdk.Data.Snowflake;
 using Reveal.Sdk.Dom;
+using Sandbox.DashboardCreators;
 using Sandbox.DashboardFactories;
 using Sandbox.RevealSDK;
 using System;
@@ -51,6 +52,7 @@ public partial class MainWindow : Window
             new RestDataSourceDashboard(),
             new SalesDashboard(),
             new SqlServerDataSourceDashboards(),
+            new WebServiceDataSourceDashboard()
         };
 
         public MainWindow()
@@ -60,7 +62,7 @@ public MainWindow()
             RevealSdkSettings.DataSourceProvider = new Sandbox.RevealSDK.DataSourceProvider();
             RevealSdkSettings.AuthenticationProvider = new AuthenticationProvider();
             RevealSdkSettings.DataSources.RegisterMicrosoftSqlServer().RegisterMicrosoftAnalysisServices();
-
+            
             LoadDashboards();
 
             _revealView.LinkedDashboardProvider = (string dashboardId, string linkTitle) =>

src/Reveal.Sdk.Dom.Tests/Data/DataSourceItems/WebServiceDataSourceItemFixture.cs

@@ -1,6 +1,13 @@
+using Newtonsoft.Json.Linq;
 using Reveal.Sdk.Dom.Core.Extensions;
 using Reveal.Sdk.Dom.Data;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System;
 using Xunit;
+using Reveal.Sdk.Dom.Visualizations;
+using Reveal.Sdk.Dom.Core.Serialization;
 
 namespace Reveal.Sdk.Dom.Tests.Data.DataSourceItems
 {
@@ -16,7 +23,6 @@ public void Constructor_SetsTitleAndDataSource_WhenConstructed()
 
             // Assert
             Assert.Equal(title, item.Title);
-            Assert.Equal(dataSource, item.DataSource);
         }
 
         [Theory]
@@ -34,5 +40,116 @@ public void Url_SetsAndGetsValue_WithDifferentInputs(string url)
             Assert.Equal(url, item.Url);
             Assert.Equal(url, item.Properties.GetValue<string>("Url"));
         }
+
+        [Fact]
+        public void RDashDocument_HasCorrectDataSource_WhenLoadFromFile()
+        {
+            // Arrange
+            var filePath = Path.Combine(Environment.CurrentDirectory, "Dashboards", "TestWebResource.rdash");
+
+            // Act
+            var document = RdashDocument.Load(filePath);
+            var jsonDataSource = document.DataSources.FirstOrDefault();
+            var webServiceDataSource = document.DataSources.LastOrDefault();
+            var webServiceDataSourceItem = document.Visualizations.FirstOrDefault().DataDefinition.DataSourceItem;
+
+            // Assert
+            Assert.Equal(DataSourceProvider.JSON, jsonDataSource.Provider);
+            Assert.Equal(DataSourceProvider.WebService, webServiceDataSource.Provider);
+            Assert.NotNull(webServiceDataSource.Properties.GetValue<string>("Url"));
+            Assert.NotNull(webServiceDataSource.Properties.GetValue<string>("_rpUseAnonymousAuthentication"));
+        }
+
+        [Fact]
+        public void ToJsonString_CreatesFormattedJson_ForWebServiceDataSource()
+        {
+            // Arrange
+            var expectedJson = @"
+            {
+              ""_type"": ""DataSourceItemType"",
+              ""Id"": ""webServiceItemId"",
+              ""Title"": ""Sales by Category"",
+              ""Subtitle"": ""Excel2Json"",
+              ""DataSourceId"": ""__JSON"",
+              ""HasTabularData"": true,
+              ""HasAsset"": false,
+              ""Properties"": {},
+              ""Parameters"": {
+                ""config"": {
+                  ""iterationDepth"": 0,
+                  ""columnsConfig"": [
+                    {
+                      ""key"": ""CategoryID"",
+                      ""type"": 1
+                    },
+                    {
+                      ""key"": ""CategoryName"",
+                      ""type"": 0
+                    },
+                    {
+                      ""key"": ""ProductName"",
+                      ""type"": 0
+                    },
+                    {
+                      ""key"": ""ProductSales"",
+                      ""type"": 1
+                    }
+                  ]
+                }
+              },
+              ""ResourceItem"": {
+                ""_type"": ""DataSourceItemType"",
+                ""Id"": ""webServiceItemId"",
+                ""Title"": ""DB Test"",
+                ""Subtitle"": ""Excel2Json"",
+                ""DataSourceId"": ""webServiceId"",
+                ""HasTabularData"": true,
+                ""HasAsset"": false,
+                ""Properties"": {},
+                ""Parameters"": {}
+              }
+            }";
+
+            var dataSource = new WebServiceDataSource()
+            {
+                Id = "webServiceId",
+                Title = "Web Data Source",
+                Subtitle = "Web Data Source Subtitle",
+                Url = "https://excel2json.io/api/share/6e0f06b3-72d3-4fec-7984-08da43f56bb9",
+                UseAnonymousAuthentication = true,
+            };
+
+            var dataSourceItems = new WebServiceDataSourceItem("DB Test", dataSource)
+            {
+                Id = "webServiceItemId",
+                Title = "Sales by Category",
+                Subtitle = "Excel2Json",
+                Fields = new List<IField>
+                {
+                    new NumberField("CategoryID"),
+                    new TextField("CategoryName"),
+                    new TextField("ProductName"),
+                    new NumberField("ProductSales"),
+                }
+            };
+
+            var document = new RdashDocument("My Dashboard");
+            document.Visualizations.Add(
+                new ColumnChartVisualization("Test List", dataSourceItems)
+                    .SetLabel("CategoryName")
+                    .SetValue("ProductName")
+                    );
+
+            var expectedJObject = JObject.Parse(expectedJson);
+
+            // Act
+            RdashSerializer.SerializeObject(document);
+            var json = document.ToJsonString();
+            var jObject = JObject.Parse(json);
+            var actualJObject = jObject["Widgets"].FirstOrDefault()["DataSpec"]["DataSourceItem"];
+
+            // Assert
+            Assert.Equal(expectedJObject, actualJObject);
+        }
     }
 }