plugins: remove unnecessary use of convertLegacyRouteRef(s)

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
This commit is contained in:
Patrik Oldsberg
2025-11-23 14:17:58 +01:00
parent c8fc1429b4
commit 1c7ea4a3e8
33 changed files with 170 additions and 182 deletions
+10 -9
View File
@@ -18,7 +18,8 @@ import { IconLinkVerticalProps } from '@backstage/core-components';
import { JSX as JSX_2 } from 'react';
import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
import { RouteRef } from '@backstage/frontend-plugin-api';
import { RouteRef } from '@backstage/core-plugin-api';
import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api';
import { SearchResultItemExtensionComponent } from '@backstage/plugin-search-react/alpha';
import { SearchResultItemExtensionPredicate } from '@backstage/plugin-search-react/alpha';
import { SearchResultListItemBlueprintParams } from '@backstage/plugin-search-react/alpha';
@@ -107,7 +108,7 @@ const _default: OverridableFrontendPlugin<
| ExtensionDataRef<string, 'core.routing.path', {}>
| ExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
| ExtensionDataRef<
RouteRef<AnyRouteRefParams>,
RouteRef_2<AnyRouteRefParams>,
'core.routing.ref',
{
optional: true;
@@ -171,7 +172,7 @@ const _default: OverridableFrontendPlugin<
defaultGroup?: [Error: `Use the 'group' param instead`];
group?: keyof defaultEntityContentGroups | (string & {});
loader: () => Promise<JSX.Element>;
routeRef?: RouteRef;
routeRef?: RouteRef_2;
filter?: string | EntityPredicate | ((entity: Entity) => boolean);
};
}>;
@@ -223,7 +224,7 @@ const _default: OverridableFrontendPlugin<
{
title: string;
icon: IconComponent;
routeRef: RouteRef<undefined>;
routeRef: RouteRef_2<undefined>;
},
'core.nav-item.target',
{}
@@ -232,7 +233,7 @@ const _default: OverridableFrontendPlugin<
params: {
title: string;
icon: IconComponent;
routeRef: RouteRef<undefined>;
routeRef: RouteRef_2<undefined>;
};
}>;
'page:techdocs': OverridableExtensionDefinition<{
@@ -248,7 +249,7 @@ const _default: OverridableFrontendPlugin<
| ExtensionDataRef<string, 'core.routing.path', {}>
| ExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
| ExtensionDataRef<
RouteRef<AnyRouteRefParams>,
RouteRef_2<AnyRouteRefParams>,
'core.routing.ref',
{
optional: true;
@@ -259,7 +260,7 @@ const _default: OverridableFrontendPlugin<
defaultPath?: [Error: `Use the 'path' param instead`];
path: string;
loader: () => Promise<JSX.Element>;
routeRef?: RouteRef;
routeRef?: RouteRef_2;
};
}>;
'page:techdocs/reader': OverridableExtensionDefinition<{
@@ -273,7 +274,7 @@ const _default: OverridableFrontendPlugin<
| ExtensionDataRef<string, 'core.routing.path', {}>
| ExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
| ExtensionDataRef<
RouteRef<AnyRouteRefParams>,
RouteRef_2<AnyRouteRefParams>,
'core.routing.ref',
{
optional: true;
@@ -298,7 +299,7 @@ const _default: OverridableFrontendPlugin<
defaultPath?: [Error: `Use the 'path' param instead`];
path: string;
loader: () => Promise<JSX.Element>;
routeRef?: RouteRef;
routeRef?: RouteRef_2;
};
}>;
'search-result-list-item:techdocs': OverridableExtensionDefinition<{
+6 -10
View File
@@ -29,10 +29,6 @@ import {
discoveryApiRef,
fetchApiRef,
} from '@backstage/core-plugin-api';
import {
convertLegacyRouteRef,
convertLegacyRouteRefs,
} from '@backstage/core-compat-api';
import {
EntityContentBlueprint,
EntityIconLinkBlueprint,
@@ -138,7 +134,7 @@ export const techDocsSearchResultListItemExtension =
const techDocsPage = PageBlueprint.make({
params: {
path: '/docs',
routeRef: convertLegacyRouteRef(rootRouteRef),
routeRef: rootRouteRef,
loader: () =>
import('../home/components/TechDocsIndexPage').then(m => (
<m.TechDocsIndexPage />
@@ -166,7 +162,7 @@ const techDocsReaderPage = PageBlueprint.makeWithOverrides({
return originalFactory({
path: '/docs/:namespace/:kind/:name',
routeRef: convertLegacyRouteRef(rootDocsRouteRef),
routeRef: rootDocsRouteRef,
loader: async () =>
await import('../Router').then(({ TechDocsReaderRouter }) => (
<TechDocsReaderRouter>
@@ -199,7 +195,7 @@ const techDocsEntityContent = EntityContentBlueprint.makeWithOverrides({
{
path: 'docs',
title: 'TechDocs',
routeRef: convertLegacyRouteRef(rootCatalogDocsRouteRef),
routeRef: rootCatalogDocsRouteRef,
loader: () =>
import('../Router').then(({ EmbeddedDocsRouter }) => {
const addons = context.inputs.addons.map(output => {
@@ -237,7 +233,7 @@ const techDocsNavItem = NavItemBlueprint.make({
params: {
icon: LibraryBooks,
title: 'Docs',
routeRef: convertLegacyRouteRef(rootRouteRef),
routeRef: rootRouteRef,
},
});
@@ -256,9 +252,9 @@ export default createFrontendPlugin({
techDocsEntityContentEmptyState,
techDocsSearchResultListItemExtension,
],
routes: convertLegacyRouteRefs({
routes: {
root: rootRouteRef,
docRoot: rootDocsRouteRef,
entityContent: rootCatalogDocsRouteRef,
}),
},
});