From 77c05f3a32ef7a1de0bb99ea73de95c865682e65 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Mon, 10 May 2021 21:32:02 +0200 Subject: [PATCH] Make monaco editor component more configurable to support monaco scripts hosted on a different path --- .../Elsa.Designer.Components.Web/WorkflowEditor.razor | 2 +- .../components/controls/elsa-monaco/elsa-monaco-utils.ts | 9 +++------ src/designer/elsa-workflows-studio/src/index.html | 6 +++--- .../Pages/_Host.cshtml | 2 +- .../ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs | 3 ++- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/WorkflowEditor.razor b/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/WorkflowEditor.razor index 5ed74f7f6..e88956e59 100644 --- a/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/WorkflowEditor.razor +++ b/src/designer/bindings/aspnet/Elsa.Designer.Components.Web/WorkflowEditor.razor @@ -1,7 +1,7 @@ @using Microsoft.JSInterop @inject IJSRuntime JS; - + @code{ diff --git a/src/designer/elsa-workflows-studio/src/components/controls/elsa-monaco/elsa-monaco-utils.ts b/src/designer/elsa-workflows-studio/src/components/controls/elsa-monaco/elsa-monaco-utils.ts index 440af3953..7df58846e 100644 --- a/src/designer/elsa-workflows-studio/src/components/controls/elsa-monaco/elsa-monaco-utils.ts +++ b/src/designer/elsa-workflows-studio/src/components/controls/elsa-monaco/elsa-monaco-utils.ts @@ -3,23 +3,20 @@ const require = win.require; let initialized = false; -export function initializeMonacoWorker(libPath?: string) { +export function initializeMonacoWorker(libPath: string) { if (initialized) return; - if (!libPath) - libPath = 'assets/js'; - const origin = document.location.origin; - const baseUrl = `${origin}/${libPath}/monaco-editor/min`; + const baseUrl = `${origin}/${libPath}`; require.config({paths: {'vs': `${baseUrl}/vs`}}); win.MonacoEnvironment = {getWorkerUrl: () => proxy}; let proxy = URL.createObjectURL(new Blob([` self.MonacoEnvironment = { - baseUrl: '${baseUrl}/' + baseUrl: '${baseUrl}' }; importScripts('${baseUrl}/vs/base/worker/workerMain.js'); `], {type: 'text/javascript'})); diff --git a/src/designer/elsa-workflows-studio/src/index.html b/src/designer/elsa-workflows-studio/src/index.html index 600e4680f..f0c0ec6c5 100644 --- a/src/designer/elsa-workflows-studio/src/index.html +++ b/src/designer/elsa-workflows-studio/src/index.html @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_Host.cshtml b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_Host.cshtml index 11d68a8b1..69fae4098 100644 --- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_Host.cshtml +++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Pages/_Host.cshtml @@ -18,6 +18,6 @@ - + \ No newline at end of file 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 25d3ac1a0..c12cea8f4 100644 --- a/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs +++ b/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/Startup.cs @@ -35,7 +35,8 @@ namespace ElsaDashboard.Samples.AspNetCore.Monolith .AddEmailActivities(elsaSection.GetSection("Smtp").Bind) .AddQuartzTemporalActivities() .AddJavaScriptActivities() - .AddWorkflow() + .AddActivitiesFrom() + .AddWorkflowsFrom() ); services