Fix PageRegistry.getByPageMenuTarget issue when package name has special chars (#1380)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen authored and GitHub committed 2020-11-14 10:16:40 +02:00
1 parent 4d3204766b
commit 55b6edfc2a
2 files changed
+55 -3

No files matched your search

+7 -2
View File
@@ -20,11 +20,15 @@ export interface PageComponents {
const routePrefix = "/extension/:name"
export function sanitizeExtensioName(name: string) {
return name.replace("@", "").replace("/", "-")
}
export function getPageUrl(ext: LensExtension, baseUrl = "") {
if (baseUrl !== "" && !baseUrl.startsWith("/")) {
baseUrl = "/" + baseUrl
}
const validUrlName = ext.name.replace("@", "").replace("/", "-");
const validUrlName = sanitizeExtensioName(ext.name);
return compile(routePrefix)({ name: validUrlName }) + baseUrl;
}
@@ -46,7 +50,8 @@ export class PageRegistry<T extends PageRegistration> extends BaseRegistry<T> {
if (!target) {
return null
}
return this.getItems().find((page) => page.routePath.startsWith(`/extension/${target.extensionId}/`) && page.id === target.pageId)
const routePath = `/extension/${sanitizeExtensioName(target.extensionId)}/`
return this.getItems().find((page) => page.routePath.startsWith(routePath) && page.id === target.pageId) || null
}
}