diff --git a/packages/backend/src/plugins/search.ts b/packages/backend/src/plugins/search.ts index 68380935d9..4cf9c10021 100644 --- a/packages/backend/src/plugins/search.ts +++ b/packages/backend/src/plugins/search.ts @@ -76,10 +76,6 @@ export default async function createPlugin({ collator: DefaultTechDocsCollator.fromConfig(config, { discovery, logger, - legacyPathCasing: - config.getOptionalBoolean( - 'techdocs.legacyUseCaseSensitiveTripletPaths', - ) || false, }), }); diff --git a/plugins/techdocs-backend/api-report.md b/plugins/techdocs-backend/api-report.md index 7d7cad261f..f955cea906 100644 --- a/plugins/techdocs-backend/api-report.md +++ b/plugins/techdocs-backend/api-report.md @@ -47,7 +47,7 @@ export class DefaultTechDocsCollator implements DocumentCollator { execute(): Promise; // (undocumented) static fromConfig( - _config: Config, + config: Config, options: TechDocsCollatorOptions, ): DefaultTechDocsCollator; // (undocumented) diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts index 49b2c46622..0df22bee53 100644 --- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts +++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.test.ts @@ -23,6 +23,7 @@ import { DefaultTechDocsCollator } from './DefaultTechDocsCollator'; import { msw } from '@backstage/test-utils'; import { setupServer } from 'msw/node'; import { rest } from 'msw'; +import { ConfigReader } from '@backstage/config'; const logger = getVoidLogger(); @@ -94,7 +95,12 @@ describe('DefaultTechDocsCollator with legacyPathCasing configuration', () => { getBaseUrl: jest.fn().mockResolvedValue('http://test-backend'), getExternalBaseUrl: jest.fn(), }; - collator = new DefaultTechDocsCollator({ + const mockConfig = new ConfigReader({ + techdocs: { + legacyUseCaseSensitiveTripletPaths: true, + }, + }); + collator = DefaultTechDocsCollator.fromConfig(mockConfig, { discovery: mockDiscoveryApi, logger, legacyPathCasing: true, @@ -146,7 +152,7 @@ describe('DefaultTechDocsCollator', () => { getBaseUrl: jest.fn().mockResolvedValue('http://test-backend'), getExternalBaseUrl: jest.fn(), }; - collator = new DefaultTechDocsCollator({ + collator = DefaultTechDocsCollator.fromConfig(new ConfigReader({}), { discovery: mockDiscoveryApi, logger, }); diff --git a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts index 283fdb0e1b..5f0bc5f79e 100644 --- a/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts +++ b/plugins/techdocs-backend/src/search/DefaultTechDocsCollator.ts @@ -76,8 +76,12 @@ export class DefaultTechDocsCollator implements DocumentCollator { this.legacyPathCasing = legacyPathCasing; } - static fromConfig(_config: Config, options: TechDocsCollatorOptions) { - return new DefaultTechDocsCollator(options); + static fromConfig(config: Config, options: TechDocsCollatorOptions) { + const legacyPathCasing = + config.getOptionalBoolean( + 'techdocs.legacyUseCaseSensitiveTripletPaths', + ) || false; + return new DefaultTechDocsCollator({ ...options, legacyPathCasing }); } async execute() {