Merge pull request #397 from OrleansContrib/pr396

Pr396
OrleansContrib · May 15, 2023 · 4b9dd9e · 4b9dd9e
2 parents f8263f1 + 1381e1b
commit 4b9dd9e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,6 +11,6 @@
     <PackageProjectUrl>https://github.com/OrleansContrib/OrleansDashboard</PackageProjectUrl>
     <PackageTags>orleans dashboard metrics monitor</PackageTags>
     <RepositoryUrl>https://github.com/OrleansContrib/OrleansDashboard</RepositoryUrl>
-    <Version>7.2.0</Version>
+    <Version>7.2.1</Version>
   </PropertyGroup>
 </Project>
diff --git a/OrleansDashboard/Dashboard.cs b/OrleansDashboard/Dashboard.cs
@@ -4,13 +4,15 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using OpenTelemetry;
 using OpenTelemetry.Metrics;
 using Orleans;
 using Orleans.Runtime;
 using OrleansDashboard.Implementation;
+using OrleansDashboard.Implementation.Assets;
 
 namespace OrleansDashboard
 {
@@ -23,6 +25,7 @@ public sealed class Dashboard : IStartupTask, IDisposable
         private readonly IGrainFactory grainFactory;
         private readonly DashboardTelemetryExporter dashboardTelemetryExporter;
         private readonly ISiloGrainClient siloGrainClient;
+        private readonly IAssetProvider assetProvider;
         private readonly DashboardOptions dashboardOptions;
 
         public Dashboard(
@@ -31,13 +34,14 @@ public sealed class Dashboard : IStartupTask, IDisposable
             IGrainFactory grainFactory,
             DashboardTelemetryExporter dashboardTelemetryExporter,
             IOptions<DashboardOptions> dashboardOptions,
-            ISiloGrainClient siloGrainClient)
+            ISiloGrainClient siloGrainClient, IAssetProvider assetProvider)
         {
             this.logger = logger;
             this.grainFactory = grainFactory;
             this.localSiloDetails = localSiloDetails;
             this.dashboardTelemetryExporter = dashboardTelemetryExporter;
             this.siloGrainClient = siloGrainClient;
+            this.assetProvider = assetProvider;
             this.dashboardOptions = dashboardOptions.Value;
         }
 
@@ -51,6 +55,8 @@ public async Task Execute(CancellationToken cancellationToken)
                         new WebHostBuilder()
                             .ConfigureServices(services =>
                             {
+                                //Add IAssetProvider [EmbeddedAssetProvider]
+                                services.AddSingleton(assetProvider);                                
                                 services.AddServicesForHostedDashboard(grainFactory, dashboardOptions);
                             })
                             .Configure(app =>

diff --git a/Tests/TestHosts/TestHost/Program.cs b/Tests/TestHosts/TestHost/Program.cs
@@ -36,6 +36,7 @@ public static void Main(string[] args)
                     {
                         options.HostSelf = true;
                     });
+                    
                 })
                 .ConfigureServices(services =>
                 {

diff --git a/Tests/TestHosts/TestHostCohosted2/Properties/launchSettings.json b/Tests/TestHosts/TestHostCohosted2/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "TestHostCohosted2": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:55355;http://localhost:55356"
+    }
+  }
+}