diff --git a/packages/core/http/core-http-server-internal/src/static_assets.test.ts b/packages/core/http/core-http-server-internal/src/static_assets.test.ts index 26e133dd99408c..d80ec6aaf6ed88 100644 --- a/packages/core/http/core-http-server-internal/src/static_assets.test.ts +++ b/packages/core/http/core-http-server-internal/src/static_assets.test.ts @@ -9,7 +9,6 @@ import { StaticAssets } from './static_assets'; import { BasePath } from './base_path_service'; import { CdnConfig } from './cdn'; -import { mockRouter } from '@kbn/core-http-router-server-mocks'; describe('StaticAssets', () => { let basePath: BasePath; @@ -24,12 +23,6 @@ describe('StaticAssets', () => { expect(staticAssets.getHrefBase()).toEqual('/test'); }); - it('can be scoped with Kibana request', () => { - const req = mockRouter.createKibanaRequest(); - basePath.set(req, '/my-space'); - expect(staticAssets.getHrefBase(req)).toEqual('/test/my-space'); - }); - it('provides the correct HREF given a CDN is configured', () => { cdnConfig = CdnConfig.from({ url: 'https://cdn.example.com/test' }); staticAssets = new StaticAssets(basePath, cdnConfig); diff --git a/packages/core/http/core-http-server-internal/src/static_assets.ts b/packages/core/http/core-http-server-internal/src/static_assets.ts index d5d6eeee725260..b4e7a529fe9489 100644 --- a/packages/core/http/core-http-server-internal/src/static_assets.ts +++ b/packages/core/http/core-http-server-internal/src/static_assets.ts @@ -6,12 +6,11 @@ * Side Public License, v 1. */ -import type { KibanaRequest } from '@kbn/core-http-server/src/router'; import type { BasePath } from './base_path_service'; import { CdnConfig } from './cdn'; export interface IStaticAssets { - getHrefBase(request?: KibanaRequest): string; + getHrefBase(): string; } export class StaticAssets implements IStaticAssets { @@ -20,14 +19,10 @@ export class StaticAssets implements IStaticAssets { * Returns a href (hypertext reference) intended to be used as the base for constructing * other hrefs to static assets. */ - getHrefBase(request?: KibanaRequest): string { + getHrefBase(): string { if (this.cdnConfig.baseHref) { return this.cdnConfig.baseHref; } - // TODO: not sure if this is necessary for static asset HREFs. - if (request) { - return this.basePath.get(request); - } return this.basePath.serverBasePath; } } diff --git a/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx b/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx index 4300cfb0d69f81..1791f55e563b65 100644 --- a/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx +++ b/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx @@ -114,7 +114,7 @@ export class RenderingService { packageInfo: this.coreContext.env.packageInfo, }; const buildNum = env.packageInfo.buildNum; - const staticAssetsHrefBase = http.staticAssets.getHrefBase(request); + const staticAssetsHrefBase = http.staticAssets.getHrefBase(); const basePath = http.basePath.get(request); const { serverBasePath, publicBaseUrl } = http.basePath;