From 4584716f779d981b6f46bfa8a4189713299f4719 Mon Sep 17 00:00:00 2001 From: Sipke Schoorstra Date: Mon, 20 Dec 2021 14:20:50 +0100 Subject: [PATCH] Prepend url with base path Fixes #2595 --- src/designer/elsa-workflows-studio/src/components.d.ts | 2 ++ .../elsa-workflow-definition-editor-screen.tsx | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/designer/elsa-workflows-studio/src/components.d.ts b/src/designer/elsa-workflows-studio/src/components.d.ts index 4b4285ec2..a59e4ba7f 100644 --- a/src/designer/elsa-workflows-studio/src/components.d.ts +++ b/src/designer/elsa-workflows-studio/src/components.d.ts @@ -282,6 +282,7 @@ export namespace Components { interface ElsaWorkflowDefinitionEditorNotifications { } interface ElsaWorkflowDefinitionEditorScreen { + "basePath": string; "culture": string; "exportWorkflow": () => Promise; "getServerUrl": () => Promise; @@ -1049,6 +1050,7 @@ declare namespace LocalJSX { interface ElsaWorkflowDefinitionEditorNotifications { } interface ElsaWorkflowDefinitionEditorScreen { + "basePath"?: string; "culture"?: string; "history"?: RouterHistory; "monacoLibPath"?: string; diff --git a/src/designer/elsa-workflows-studio/src/components/screens/workflow-definition-editor/elsa-workflow-definition-editor-screen/elsa-workflow-definition-editor-screen.tsx b/src/designer/elsa-workflows-studio/src/components/screens/workflow-definition-editor/elsa-workflow-definition-editor-screen/elsa-workflow-definition-editor-screen.tsx index c7c3a8e43..90464e639 100644 --- a/src/designer/elsa-workflows-studio/src/components/screens/workflow-definition-editor/elsa-workflow-definition-editor-screen/elsa-workflow-definition-editor-screen.tsx +++ b/src/designer/elsa-workflows-studio/src/components/screens/workflow-definition-editor/elsa-workflow-definition-editor-screen/elsa-workflow-definition-editor-screen.tsx @@ -45,6 +45,7 @@ export class ElsaWorkflowDefinitionEditorScreen { @Prop({attribute: 'server-url', reflect: true}) serverUrl: string; @Prop({attribute: 'monaco-lib-path', reflect: true}) monacoLibPath: string; @Prop() culture: string; + @Prop() basePath: string; @Prop() history: RouterHistory; @State() workflowDefinition: WorkflowDefinition; @State() workflowModel: WorkflowModel; @@ -370,7 +371,7 @@ export class ElsaWorkflowDefinitionEditorScreen { } updateUrl(id) { - this.history.push(`/workflow-definitions/${id}`, {}); + this.history.push(`${this.basePath}/workflow-definitions/${id}`, {}); } mapWorkflowModel(workflowDefinition: WorkflowDefinition): WorkflowModel { @@ -1066,4 +1067,4 @@ export class ElsaWorkflowDefinitionEditorScreen { } injectHistory(ElsaWorkflowDefinitionEditorScreen); -DashboardTunnel.injectProps(ElsaWorkflowDefinitionEditorScreen, ['serverUrl', 'culture', 'monacoLibPath']); +DashboardTunnel.injectProps(ElsaWorkflowDefinitionEditorScreen, ['serverUrl', 'culture', 'monacoLibPath', 'basePath']);