Rename shared Blazor project to Application

Samples.sln

@@ -120,6 +120,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clients", "clients", "{E43F
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Client", "src\clients\Elsa.Client\Elsa.Client.csproj", "{2DA042D6-1E3C-4B15-B48E-BF45426C74E1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dashboards", "dashboards", "{5583B236-794A-422C-B306-52BB7DFE7EBE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "blazor", "blazor", "{5837821B-CA71-40B6-A9F1-C25D318B4691}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.WebAssembly", "src\dashboards\blazor\ElsaDashboard.Blazor\Client\ElsaDashboard.Blazor.WebAssembly.csproj", "{D7992973-A251-427A-8BF1-4D5F767A4A77}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Server", "src\dashboards\blazor\ElsaDashboard.Blazor\Server\ElsaDashboard.Blazor.Server.csproj", "{5B147B88-965C-4286-926B-333B0F0FFB12}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Application", "src\dashboards\blazor\ElsaDashboard.Blazor\Application\ElsaDashboard.Blazor.Application.csproj", "{B14D02C7-9832-4B50-9031-66683601C156}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -291,6 +301,18 @@ Global
 		{2DA042D6-1E3C-4B15-B48E-BF45426C74E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2DA042D6-1E3C-4B15-B48E-BF45426C74E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2DA042D6-1E3C-4B15-B48E-BF45426C74E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7992973-A251-427A-8BF1-4D5F767A4A77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7992973-A251-427A-8BF1-4D5F767A4A77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7992973-A251-427A-8BF1-4D5F767A4A77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7992973-A251-427A-8BF1-4D5F767A4A77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B147B88-965C-4286-926B-333B0F0FFB12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B147B88-965C-4286-926B-333B0F0FFB12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B147B88-965C-4286-926B-333B0F0FFB12}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B147B88-965C-4286-926B-333B0F0FFB12}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B14D02C7-9832-4B50-9031-66683601C156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B14D02C7-9832-4B50-9031-66683601C156}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B14D02C7-9832-4B50-9031-66683601C156}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B14D02C7-9832-4B50-9031-66683601C156}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -347,6 +369,11 @@ Global
 		{3529F81C-9256-4C24-A1E6-ADC27093AB49} = {5E5E1E84-DDBC-40D6-B891-0D563A15A44A}
 		{E43FB9E7-7851-4880-B7EE-12B8CEE628D0} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925}
 		{2DA042D6-1E3C-4B15-B48E-BF45426C74E1} = {E43FB9E7-7851-4880-B7EE-12B8CEE628D0}
+		{5583B236-794A-422C-B306-52BB7DFE7EBE} = {DA71CDAA-8DD3-4D5F-9FBD-8E4B37A2D925}
+		{5837821B-CA71-40B6-A9F1-C25D318B4691} = {5583B236-794A-422C-B306-52BB7DFE7EBE}
+		{D7992973-A251-427A-8BF1-4D5F767A4A77} = {5837821B-CA71-40B6-A9F1-C25D318B4691}
+		{5B147B88-965C-4286-926B-333B0F0FFB12} = {5837821B-CA71-40B6-A9F1-C25D318B4691}
+		{B14D02C7-9832-4B50-9031-66683601C156} = {5837821B-CA71-40B6-A9F1-C25D318B4691}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8B0975FD-7050-48B0-88C5-48C33378E158}

src/activities/Elsa.Activities.Http/Results/RedirectResult.cs

@@ -21,7 +21,10 @@ namespace Elsa.Activities.Http.Results
         
         protected override void Execute(ActivityExecutionContext activityExecutionContext)
         {
-            var response = _httpContextAccessor.HttpContext.Response;
+            var httpContext = _httpContextAccessor.HttpContext;
+            var response = httpContext.Response;
+            
+            httpContext.Items[WorkflowHttpResult.Instance] = WorkflowHttpResult.Instance;
             response.Redirect(Location.ToString(), Permanent);
         }
     }

src/dashboards/blazor/ElsaDashboard.Blazor.sln

@@ -5,24 +5,20 @@ VisualStudioVersion = 16.0.30615.102
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{963AE286-A579-4299-8A06-926346EABCCD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Shared", "ElsaDashboard.Blazor\Shared\ElsaDashboard.Blazor.Shared.csproj", "{B39719A2-6C4C-48A0-89EC-EA573C22D246}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.WebAssembly", "ElsaDashboard.Blazor\Client\ElsaDashboard.Blazor.WebAssembly.csproj", "{72105B63-D94C-4216-A648-CB1F4AAD7426}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Server", "ElsaDashboard.Blazor\Server\ElsaDashboard.Blazor.Server.csproj", "{522BA06A-56E3-41D7-9548-9653FF2BC9F2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{7F1D88F0-7AA2-47F3-AACB-387BCDCFE63B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ElsaDashboard.Blazor.Application", "ElsaDashboard.Blazor\Application\ElsaDashboard.Blazor.Application.csproj", "{FD666570-D8F4-41B6-8FCD-C5988B6E16CD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B39719A2-6C4C-48A0-89EC-EA573C22D246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B39719A2-6C4C-48A0-89EC-EA573C22D246}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B39719A2-6C4C-48A0-89EC-EA573C22D246}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B39719A2-6C4C-48A0-89EC-EA573C22D246}.Release|Any CPU.Build.0 = Release|Any CPU
 		{72105B63-D94C-4216-A648-CB1F4AAD7426}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{72105B63-D94C-4216-A648-CB1F4AAD7426}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{72105B63-D94C-4216-A648-CB1F4AAD7426}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -31,6 +27,10 @@ Global
 		{522BA06A-56E3-41D7-9548-9653FF2BC9F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{522BA06A-56E3-41D7-9548-9653FF2BC9F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{522BA06A-56E3-41D7-9548-9653FF2BC9F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD666570-D8F4-41B6-8FCD-C5988B6E16CD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -40,8 +40,8 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7F1D88F0-7AA2-47F3-AACB-387BCDCFE63B} = {963AE286-A579-4299-8A06-926346EABCCD}
-		{B39719A2-6C4C-48A0-89EC-EA573C22D246} = {963AE286-A579-4299-8A06-926346EABCCD}
 		{522BA06A-56E3-41D7-9548-9653FF2BC9F2} = {963AE286-A579-4299-8A06-926346EABCCD}
 		{72105B63-D94C-4216-A648-CB1F4AAD7426} = {963AE286-A579-4299-8A06-926346EABCCD}
+		{FD666570-D8F4-41B6-8FCD-C5988B6E16CD} = {963AE286-A579-4299-8A06-926346EABCCD}
 	EndGlobalSection
 EndGlobal

src/dashboards/blazor/ElsaDashboard.Blazor/Application/App.razor

@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(Class1).Assembly">
+<Router AppAssembly="@typeof(MenuItem).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>

src/dashboards/blazor/ElsaDashboard.Blazor/Application/ElsaDashboard.Blazor.Application.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <LangVersion>latest</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Grpc.Net.Client" Version="2.33.1"/>
+        <PackageReference Include="Grpc.Net.ClientFactory" Version="2.33.1"/>
+        <PackageReference Include="protobuf-net" Version="3.0.52"/>
+        <PackageReference Include="protobuf-net.Grpc" Version="1.0.123"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <SupportedPlatform Remove="iOS"/>
+        <SupportedPlatform Remove="Linux"/>
+        <SupportedPlatform Remove="macOS"/>
+        <SupportedPlatform Remove="Android"/>
+        <SupportedPlatform Remove="Windows"/>
+    </ItemGroup>
+
+</Project>

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using ElsaDashboard.Blazor.Shared.Services;
+using ElsaDashboard.Blazor.Application.Services;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Models/MenuItem.cs

@@ -1,4 +1,4 @@
-namespace ElsaDashboard.Blazor.Shared.Models
+namespace ElsaDashboard.Blazor.Application.Models
 {
     public class MenuItem
     {

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Activity.razor.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
-namespace ElsaDashboard.Blazor.Shared.Pages.Designer
+namespace ElsaDashboard.Blazor.Application.Pages.Designer
 {
     partial class Activity
     {

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Pages/Designer/Designer.razor.cs

@@ -1,11 +1,10 @@
-using System;
-using System.Threading.Tasks;
-using ElsaDashboard.Blazor.Shared.Services;
+using System.Threading.Tasks;
+using ElsaDashboard.Blazor.Application.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
 
-namespace ElsaDashboard.Blazor.Shared.Pages.Designer
+namespace ElsaDashboard.Blazor.Application.Pages.Designer
 {
     partial class Designer
     {

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Rpc/IWorkflowDefinitionService.cs

@@ -1,8 +1,6 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using ProtoBuf;
 
-namespace ElsaDashboard.Blazor.Shared.Rpc
+namespace ElsaDashboard.Blazor.Application.Rpc
 {
     [ProtoContract]
     public interface IWorkflowDefinitionService

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/FlyoutPanelService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.JSInterop;
 
-namespace ElsaDashboard.Blazor.Shared.Services
+namespace ElsaDashboard.Blazor.Application.Services
 {
     public class FlyoutPanelService : IFlyoutPanelService, IAsyncDisposable
     {
@@ -34,7 +34,7 @@ namespace ElsaDashboard.Blazor.Shared.Services
         
         private async Task InitModuleAsync()
         {
-            _module = await _jsRuntime.InvokeAsync<IJSObjectReference>("import", "./_content/ElsaDashboard.Blazor.Shared/flyoutPanel.js");
+            _module = await _jsRuntime.InvokeAsync<IJSObjectReference>("import", "./_content/ElsaDashboard.Blazor.Application/flyoutPanel.js");
         }
     }
 }

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Services/IFlyoutPanelService.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace ElsaDashboard.Blazor.Shared.Services
+namespace ElsaDashboard.Blazor.Application.Services
 {
     public interface IFlyoutPanelService
     {

src/dashboards/blazor/ElsaDashboard.Blazor/Application/Shared/NavMenu.razor.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using ElsaDashboard.Blazor.Shared.Models;
+using ElsaDashboard.Blazor.Application.Models;
 
-namespace ElsaDashboard.Blazor.Shared.Shared
+namespace ElsaDashboard.Blazor.Application.Shared
 {
     partial class NavMenu
     {

src/dashboards/blazor/ElsaDashboard.Blazor/Application/_Imports.razor

@@ -5,4 +5,5 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using ElsaDashboard.Blazor.Shared.Shared
+@using ElsaDashboard.Blazor.Application.Models
+@using ElsaDashboard.Blazor.Application.Shared

src/dashboards/blazor/ElsaDashboard.Blazor/Client/ElsaDashboard.Blazor.WebAssembly.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Shared\ElsaDashboard.Blazor.Shared.csproj" />
+    <ProjectReference Include="..\Application\ElsaDashboard.Blazor.Application.csproj" />
   </ItemGroup>
 
 </Project>

src/dashboards/blazor/ElsaDashboard.Blazor/Client/Program.cs

@@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
-using ElsaDashboard.Blazor.Shared;
 
 namespace ElsaDashboard.Blazor.WebAssembly
 {
@@ -12,13 +11,12 @@ namespace ElsaDashboard.Blazor.WebAssembly
         public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
-            builder.RootComponents.Add<App>("#app");
-            
-            var services =builder.Services;
-            services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+            var services = builder.Services;
+
+            services.AddScoped(sp => new HttpClient {BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)});
             services.AddElsaDashboard();
 
             await builder.Build().RunAsync();
         }
     }
-}
+}

src/dashboards/blazor/ElsaDashboard.Blazor/Server/ElsaDashboard.Blazor.Server.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Client\ElsaDashboard.Blazor.WebAssembly.csproj" />
-    <ProjectReference Include="..\Shared\ElsaDashboard.Blazor.Shared.csproj" />
+    <ProjectReference Include="..\Application\ElsaDashboard.Blazor.Application.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/dashboards/blazor/ElsaDashboard.Blazor/Server/Pages/_Host.cshtml

@@ -1,5 +1,5 @@
 @page "/"
-@using ElsaDashboard.Blazor.Shared
+@using ElsaDashboard.Blazor.Application
 @namespace ElsaDashboard.Blazor.Server.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @{
@@ -22,16 +22,8 @@
     <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.x.x/dist/alpine.js"></script>
 </head>
 <body class="antialiased font-sans bg-gray-200">
-@if (Program.UseBlazorServer)
-{
-    <component type="typeof(App)" render-mode="@Program.RenderMode"/>
-}
-else
-{
-    <div id="app">
-        Loading...
-    </div>
-}
+
+<component type="typeof(App)" render-mode="@Program.RenderMode"/>
 
 <div id="blazor-error-ui">
     <environment include="Staging,Production">
@@ -52,6 +44,6 @@ else
 {
     <script src="_framework/blazor.webassembly.js"></script>
 }
-<script src="_content/ElsaDashboard.Blazor.Shared/store.js"></script>
+<script src="_content/ElsaDashboard.Blazor.Application/store.js"></script>
 </body>
 </html>

src/dashboards/blazor/ElsaDashboard.Blazor/Server/Program.cs

@@ -7,8 +7,8 @@ namespace ElsaDashboard.Blazor.Server
 {
     public class Program
     {
-        public static bool UseBlazorServer = false;
-        public static RenderMode RenderMode => UseBlazorServer ? RenderMode.Server: RenderMode.WebAssembly;
+        public static bool UseBlazorServer = true;
+        public static RenderMode RenderMode => UseBlazorServer ? RenderMode.ServerPrerendered: RenderMode.WebAssemblyPrerendered;
         private static Type StartupType => UseBlazorServer ? typeof(BlazorServerStartup) : typeof(BlazorWebAssemblyStartup);
 
         public static void Main(string[] args)

src/dashboards/blazor/ElsaDashboard.Blazor/Server/_Imports.razor

@@ -5,4 +5,4 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using ElsaDashboard.Blazor.Shared.Shared
+@using ElsaDashboard.Blazor.Application

src/dashboards/blazor/ElsaDashboard.Blazor/Shared/Class1.cs

@@ -1,7 +0,0 @@
-namespace ElsaDashboard.Blazor.Shared
-{
-    public class Class1
-    {
-        
-    }
-}

src/dashboards/blazor/ElsaDashboard.Blazor/Shared/ElsaDashboard.Blazor.Shared.csproj

@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Grpc.Net.Client" Version="2.33.1" />
-        <PackageReference Include="Grpc.Net.ClientFactory" Version="2.33.1" />
-        <PackageReference Include="protobuf-net" Version="3.0.52" />
-        <PackageReference Include="protobuf-net.Grpc" Version="1.0.123" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="5.0.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <SupportedPlatform Remove="iOS" />
-      <SupportedPlatform Remove="Linux" />
-      <SupportedPlatform Remove="macOS" />
-      <SupportedPlatform Remove="Android" />
-      <SupportedPlatform Remove="Windows" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Include="wwwroot\flyoutPanel.js" />
-      <None Include="wwwroot\workflowDesigner.js" />
-    </ItemGroup>
-</Project>