fix REPL base url to allow hosting it on proxy environemnts (#3169)

finos · May 21, 2024 · 61d0311 · 61d0311
1 parent 3f958a1
commit 61d0311
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.changeset/many-terms-kiss.md b/.changeset/many-terms-kiss.md
@@ -0,0 +1,6 @@
+---
+'@finos/legend-application-repl-deployment': patch
+'@finos/legend-application-repl': patch
+---
+
+BugFix REPL base url
diff --git a/packages/legend-application-repl-deployment/src/index.tsx b/packages/legend-application-repl-deployment/src/index.tsx
@@ -15,7 +15,8 @@
  */
 
 import { LegendREPLGridClientWebApplication } from '@finos/legend-application-repl';
-import config from '../repl.config.js';
 import './index.scss';
 
-LegendREPLGridClientWebApplication.run(config.baseUrl);
+// Resolve baseUrl relatively for application to work in vscode code-server
+const relativeBaseUrl = new URL('./', window.location.href).pathname;
+LegendREPLGridClientWebApplication.run(relativeBaseUrl);
diff --git a/packages/legend-application-repl/src/application/LegendREPLGridClient.tsx b/packages/legend-application-repl/src/application/LegendREPLGridClient.tsx
@@ -61,13 +61,11 @@ export class LegendREPLGridClient extends LegendApplication {
     baseUrl: string,
   ): Promise<[LegendApplicationConfig, ExtensionsConfigurationData]> {
     const client = new NetworkClient();
-    // Resolve baseUrl relatively for application to work in vscode code-server
-    const relativeBaseUrl = new URL('./', window.location.href).pathname;
     // app config
     let configData: LegendREPLGridClientApplicationConfigData | undefined;
     try {
       configData = await client.get<LegendREPLGridClientApplicationConfigData>(
-        `${window.location.origin}${relativeBaseUrl}config.json`,
+        `${window.location.origin}${baseUrl}config.json`,
       );
     } catch (error) {
       assertErrorThrown(error);
@@ -85,7 +83,7 @@ export class LegendREPLGridClient extends LegendApplication {
     let versionData;
     try {
       versionData = await client.get<LegendApplicationVersionData>(
-        `${window.location.origin}${relativeBaseUrl}version.json`,
+        `${window.location.origin}${baseUrl}version.json`,
       );
     } catch (error) {
       assertErrorThrown(error);