diff --git a/plugins/devtools-react/src/devToolsContentBlueprint.tsx b/plugins/devtools-react/src/devToolsContentBlueprint.tsx index e1c4c4ebfb..835599dff3 100644 --- a/plugins/devtools-react/src/devToolsContentBlueprint.tsx +++ b/plugins/devtools-react/src/devToolsContentBlueprint.tsx @@ -68,7 +68,6 @@ export const DevToolsContentBlueprint = createExtensionBlueprint({ }, }, *factory(params: DevToolsRouteBlueprintParams, { node, config }) { - console.log('DevToolsContentBlueprint', params, config); const path = config.path ?? params.path; const title = config.title ?? params.title; diff --git a/plugins/devtools-react/src/extensionData.ts b/plugins/devtools-react/src/extensionData.ts index 62821c3e12..33754f6556 100644 --- a/plugins/devtools-react/src/extensionData.ts +++ b/plugins/devtools-react/src/extensionData.ts @@ -15,7 +15,7 @@ */ import { createExtensionDataRef } from '@backstage/frontend-plugin-api'; -/** @internal */ +/** @public */ export const contentTitleDataRef = createExtensionDataRef().with({ id: 'devtools.content-title', }); diff --git a/plugins/devtools-react/src/index.ts b/plugins/devtools-react/src/index.ts index 18b17387c1..1a31aa4f09 100644 --- a/plugins/devtools-react/src/index.ts +++ b/plugins/devtools-react/src/index.ts @@ -23,3 +23,4 @@ export { type DevToolsRouteBlueprintParams, DevToolsContentBlueprint, } from './devToolsContentBlueprint.tsx'; +export { contentTitleDataRef } from './extensionData'; diff --git a/plugins/devtools/src/alpha/plugin.tsx b/plugins/devtools/src/alpha/plugin.tsx index 7c020639bf..5628492b90 100644 --- a/plugins/devtools/src/alpha/plugin.tsx +++ b/plugins/devtools/src/alpha/plugin.tsx @@ -32,6 +32,7 @@ import { } from '@backstage/core-compat-api'; import BuildIcon from '@material-ui/icons/Build'; import { rootRouteRef } from '../routes'; +import { contentTitleDataRef } from '@backstage/plugin-devtools-react'; /** @alpha */ export const devToolsApi = ApiBlueprint.make({ @@ -55,6 +56,7 @@ export const devToolsPage = PageBlueprint.makeWithOverrides({ coreExtensionData.reactElement, coreExtensionData.routePath, coreExtensionData.routeRef.optional(), + contentTitleDataRef, ], { optional: true, @@ -65,10 +67,16 @@ export const devToolsPage = PageBlueprint.makeWithOverrides({ return originalFactory({ path: '/devtools', routeRef: convertLegacyRouteRef(rootRouteRef), - loader: () => - import('../components/DevToolsPage').then(m => - compatWrapper(), - ), + loader: () => { + const extensions = inputs.contents.map(content => ({ + path: content.get(coreExtensionData.routePath), + title: content.get(contentTitleDataRef), + children: content.get(coreExtensionData.reactElement), + })); + return import('../components/DevToolsPage').then(m => + compatWrapper(), + ); + }, }); }, });