);
}
diff --git a/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-dashboard/readme.md b/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-dashboard/readme.md
index b7d0d7095..d1648fc25 100644
--- a/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-dashboard/readme.md
+++ b/src/designer/elsa-workflows-studio/src/components/dashboard/pages/elsa-studio-dashboard/readme.md
@@ -9,6 +9,7 @@
| Property | Attribute | Description | Type | Default |
| --------------- | ----------------- | ----------- | -------- | ----------- |
+| `basePath` | `base-path` | | `string` | `''` |
| `culture` | `culture` | | `string` | `undefined` |
| `monacoLibPath` | `monaco-lib-path` | | `string` | `undefined` |
| `serverUrl` | `server-url` | | `string` | `undefined` |
diff --git a/src/designer/elsa-workflows-studio/src/index.html b/src/designer/elsa-workflows-studio/src/index.html
index b4c87a83c..075a291eb 100644
--- a/src/designer/elsa-workflows-studio/src/index.html
+++ b/src/designer/elsa-workflows-studio/src/index.html
@@ -32,14 +32,16 @@
// Custom plugin that changes the icon of the ReadLine activity.
function CustomReadLinePlugin(elsaStudio) {
// Replace icon used for 'ReadLine' activity.
- elsaStudio.activityIconProvider.register('ReadLine', `
-
- `);
+ elsaStudio.activityIconProvider.register(
+ 'ReadLine',
+ `
+
+ `);
}
// Custom plugin that adds a menu item to the bulk actions list on the workflow instance list view.
@@ -47,12 +49,14 @@
const eventBus = elsaStudio.eventBus;
eventBus.on(EventTypes.WorkflowInstanceBulkActionsLoading, async e => {
- e.bulkActions.push({name: 'Reset', text: 'Reset', handler: async () => {
- if(!await confirmDialogService.show("Reset Workflows", "Are you sure you want to do this??"))
- return;
-
- alert('Resetting workflows!');
- }});
+ e.bulkActions.push({
+ name: 'Reset', text: 'Reset', handler: async () => {
+ if (!await confirmDialogService.show("Reset Workflows", "Are you sure you want to do this??"))
+ return;
+
+ alert('Resetting workflows!');
+ }
+ });
})
}
@@ -78,7 +82,7 @@
// Get a handle to the elsa-studio-root element.
const elsaStudioRoot = document.querySelector('elsa-studio-root');
-
+
// Configure Elsa.
(async () => {
// Wait until the component is available.
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj
index 6f88a8f87..b85a19703 100644
--- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj
@@ -2,22 +2,21 @@
net5.0
- true
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs
index 1dfd52ca0..bf08549cf 100644
--- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
using Elsa;
using Elsa.Persistence.EntityFramework.Core.Extensions;
using Elsa.Persistence.EntityFramework.Sqlite;
@@ -60,7 +59,6 @@ namespace ElsaDashboard.Samples.AspNetCore.Monolith
else
{
app.UseExceptionHandler("/Error");
- // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
app.UseHsts();
}
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/appsettings.json b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/appsettings.json
index 2dd150d5b..4c92708b5 100644
--- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/appsettings.json
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/appsettings.json
@@ -10,7 +10,7 @@
"Elsa": {
"Features": [],
"Server": {
- "BaseUrl": "https://localhost:15265",
+ "BaseUrl": "https://localhost:11000",
"BasePath": "/workflows"
}
}
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/ElsaDashboard.Samples.AspNetCore.SubPath.csproj b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/ElsaDashboard.Samples.AspNetCore.SubPath.csproj
new file mode 100644
index 000000000..28717ee27
--- /dev/null
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/ElsaDashboard.Samples.AspNetCore.SubPath.csproj
@@ -0,0 +1,22 @@
+
+
+
+ net5.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/ElsaDashboard.cshtml b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/ElsaDashboard.cshtml
new file mode 100644
index 000000000..df508c319
--- /dev/null
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/ElsaDashboard.cshtml
@@ -0,0 +1,26 @@
+@page "/Elsa/Dashboard"
+@using Microsoft.Extensions.Configuration
+@inject IConfiguration _configuration;
+@{
+ Layout = null;
+ var serverUrl = _configuration["Elsa:Server:BaseUrl"];
+}
+
+
+
+
+
+ Elsa Dashboard
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Error.cshtml b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Error.cshtml
new file mode 100644
index 000000000..b5105b6de
--- /dev/null
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Error.cshtml
@@ -0,0 +1,26 @@
+@page
+@model ErrorModel
+@{
+ ViewData["Title"] = "Error";
+}
+
+
Error.
+
An error occurred while processing your request.
+
+@if (Model.ShowRequestId)
+{
+
+ Request ID:@Model.RequestId
+
+}
+
+
Development Mode
+
+ Swapping to the Development environment displays detailed information about the error that occurred.
+
+
+ The Development environment shouldn't be enabled for deployed applications.
+ It can result in displaying sensitive information from exceptions to end users.
+ For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development
+ and restarting the app.
+
\ No newline at end of file
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Error.cshtml.cs b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Error.cshtml.cs
new file mode 100644
index 000000000..fb7d94681
--- /dev/null
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Error.cshtml.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.Extensions.Logging;
+
+namespace ElsaDashboard.Samples.AspNetCore.SubPath.Pages
+{
+ [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+ [IgnoreAntiforgeryToken]
+ public class ErrorModel : PageModel
+ {
+ public string RequestId { get; set; }
+
+ public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
+
+ private readonly ILogger _logger;
+
+ public ErrorModel(ILogger logger)
+ {
+ _logger = logger;
+ }
+
+ public void OnGet()
+ {
+ RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Index.cshtml b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Index.cshtml
new file mode 100644
index 000000000..fd28464cc
--- /dev/null
+++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.SubPath/Pages/Index.cshtml
@@ -0,0 +1,10 @@
+@page
+@model IndexModel
+@{
+ ViewData["Title"] = "Home page";
+}
+
+