Use real appBasePath in legacy AppService shim (elastic#51353)

timductive · Dec 16, 2019 · 1e120fe · 1e120fe
1 parent 039ebcc
commit 1e120fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/legacy/ui/public/new_platform/new_platform.test.ts b/src/legacy/ui/public/new_platform/new_platform.test.ts
@@ -18,13 +18,15 @@
  */
 
 import { setRootControllerMock } from './new_platform.test.mocks';
-import { legacyAppRegister, __reset__ } from './new_platform';
+import { legacyAppRegister, __reset__, __setup__ } from './new_platform';
+import { coreMock } from '../../../../core/public/mocks';
 
 describe('ui/new_platform', () => {
   describe('legacyAppRegister', () => {
     beforeEach(() => {
       setRootControllerMock.mockReset();
       __reset__();
+      __setup__(coreMock.createSetup({ basePath: '/test/base/path' }) as any, {} as any);
     });
 
     const registerApp = () => {
@@ -59,7 +61,7 @@ describe('ui/new_platform', () => {
       controller(scopeMock, elementMock);
       expect(mountMock).toHaveBeenCalledWith(expect.any(Object), {
         element: elementMock[0],
-        appBasePath: '',
+        appBasePath: '/test/base/path/app/test',
       });
     });
 

diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -111,7 +111,10 @@ export const legacyAppRegister = (app: App) => {
 
     // Root controller cannot return a Promise so use an internal async function and call it immediately
     (async () => {
-      const unmount = await app.mount({ core: npStart.core }, { element, appBasePath: '' });
+      const unmount = await app.mount(
+        { core: npStart.core },
+        { element, appBasePath: npSetup.core.http.basePath.prepend(`/app/${app.id}`) }
+      );
       $scope.$on('$destroy', () => {
         unmount();
       });