From adc7f5f565892f0d7ee88e44b083b21992508dfb Mon Sep 17 00:00:00 2001 From: Roman Date: Mon, 16 Nov 2020 14:05:16 +0200 Subject: [PATCH] clean up test, deprecate page.routePath Signed-off-by: Roman --- src/extensions/registries/__tests__/page-registry.test.ts | 8 -------- src/extensions/registries/page-registry.ts | 7 ++++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/extensions/registries/__tests__/page-registry.test.ts b/src/extensions/registries/__tests__/page-registry.test.ts index 8bb5d11133..47a5f82d9d 100644 --- a/src/extensions/registries/__tests__/page-registry.test.ts +++ b/src/extensions/registries/__tests__/page-registry.test.ts @@ -82,14 +82,6 @@ describe("globalPageRegistry", () => { expect(page.id).toEqual("test-page") }) - it("returns matching page", () => { - const page = globalPageRegistry.getByPageMenuTarget({ - pageId: "test-page", - extensionId: ext.name - }) - expect(page.id).toEqual("test-page") - }) - it("returns null if target not found", () => { const page = globalPageRegistry.getByPageMenuTarget({ pageId: "wrong-page", diff --git a/src/extensions/registries/page-registry.ts b/src/extensions/registries/page-registry.ts index 3f303f6ff5..bd265bc77c 100644 --- a/src/extensions/registries/page-registry.ts +++ b/src/extensions/registries/page-registry.ts @@ -15,6 +15,11 @@ export interface PageRegistration { * When not provided, first registered page without "id" would be used for page-menus without target.pageId for same extension */ id?: string; + /** + * Alias to page ID which assume to be used as path with possible :param placeholders + * @deprecated + */ + routePath?: string; /** * Strict route matching to provided page-id, read also: https://reactrouter.com/web/api/NavLink/exact-bool * In case when more than one page registered at same extension "pageId" is required to identify different pages, @@ -62,7 +67,7 @@ export class PageRegistry extends BaseRegistry registeredPages = items.map(page => ({ ...page, extensionId: ext.name, - routePath: getExtensionPageUrl({ extensionId: ext.name, pageId: page.id }), + routePath: getExtensionPageUrl({ extensionId: ext.name, pageId: page.id ?? page.routePath }), })) } catch (err) { logger.error(`[EXTENSION]: page-registration failed`, {