From e923ff1485c9c96bb9f7caa379281d6bdb7e6fe6 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Sat, 28 Mar 2026 14:50:59 +0100 Subject: [PATCH] Remove unnecessary NFS page component exports Page components without props don't need to be exported from the package API surface. Import directly from the component file in the alpha entry points instead. Signed-off-by: Patrik Oldsberg Made-with: Cursor --- .changeset/catalog-graph-nfs-page.md | 2 +- plugins/catalog-graph/report-alpha.api.md | 2 +- plugins/catalog-graph/src/alpha.tsx | 2 +- .../src/components/CatalogGraphPage/index.ts | 2 +- plugins/catalog-import/report-alpha.api.md | 12 ++++-------- plugins/catalog-import/src/alpha.tsx | 2 -- .../DefaultImportPage/DefaultImportPage.tsx | 3 --- 7 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.changeset/catalog-graph-nfs-page.md b/.changeset/catalog-graph-nfs-page.md index ff43ffaf25..3b7a999b54 100644 --- a/.changeset/catalog-graph-nfs-page.md +++ b/.changeset/catalog-graph-nfs-page.md @@ -2,4 +2,4 @@ '@backstage/plugin-catalog-graph': patch --- -The new frontend plugin entry now exposes a display title and icon for navigation, and the catalog graph page uses the Backstage UI header when rendered in the new frontend system. A new `NfsCatalogGraphPage` export is available for the same layout without the legacy `Page` shell. +The new frontend plugin entry now exposes a display title and icon for navigation, and the catalog graph page uses the Backstage UI header when rendered in the new frontend system. diff --git a/plugins/catalog-graph/report-alpha.api.md b/plugins/catalog-graph/report-alpha.api.md index 8bfbe17e9b..e40a82698a 100644 --- a/plugins/catalog-graph/report-alpha.api.md +++ b/plugins/catalog-graph/report-alpha.api.md @@ -167,8 +167,8 @@ const _default: OverridableFrontendPlugin< direction?: 'TB' | 'BT' | 'LR' | 'RL' | undefined; zoom?: 'disabled' | 'enabled' | 'enable-on-click' | undefined; relations?: string[] | undefined; - maxDepth?: number | undefined; rootEntityRefs?: string[] | undefined; + maxDepth?: number | undefined; kinds?: string[] | undefined; mergeRelations?: boolean | undefined; relationPairs?: [string, string][] | undefined; diff --git a/plugins/catalog-graph/src/alpha.tsx b/plugins/catalog-graph/src/alpha.tsx index e1e60f77a0..a71189c7ab 100644 --- a/plugins/catalog-graph/src/alpha.tsx +++ b/plugins/catalog-graph/src/alpha.tsx @@ -80,7 +80,7 @@ const CatalogGraphPage = PageBlueprint.makeWithOverrides({ path: '/catalog-graph', routeRef: catalogGraphRouteRef, loader: () => - import('./components/CatalogGraphPage').then(m => ( + import('./components/CatalogGraphPage/CatalogGraphPage').then(m => ( )), }); diff --git a/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts b/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts index cdf8bc9430..496e79aab4 100644 --- a/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts +++ b/plugins/catalog-graph/src/components/CatalogGraphPage/index.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -export { CatalogGraphPage, NfsCatalogGraphPage } from './CatalogGraphPage'; +export { CatalogGraphPage } from './CatalogGraphPage'; export type { CatalogGraphPageClassKey } from './CatalogGraphPage'; export type { MaxDepthFilterClassKey } from './MaxDepthFilter'; export type { SelectedKindsFilterClassKey } from './SelectedKindsFilter'; diff --git a/plugins/catalog-import/report-alpha.api.md b/plugins/catalog-import/report-alpha.api.md index b4847f06f1..d00d4634a2 100644 --- a/plugins/catalog-import/report-alpha.api.md +++ b/plugins/catalog-import/report-alpha.api.md @@ -11,8 +11,7 @@ import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api'; import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; import { IconElement } from '@backstage/frontend-plugin-api'; -import { JSX as JSX_2 } from 'react/jsx-runtime'; -import { JSX as JSX_3 } from 'react'; +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/core-plugin-api'; @@ -134,7 +133,7 @@ const _default: OverridableFrontendPlugin< optional: true; } > - | ExtensionDataRef + | ExtensionDataRef | ExtensionDataRef< string, 'core.title', @@ -151,7 +150,7 @@ const _default: OverridableFrontendPlugin< >; inputs: { pages: ExtensionInput< - | ConfigurableExtensionDataRef + | ConfigurableExtensionDataRef | ConfigurableExtensionDataRef | ConfigurableExtensionDataRef< RouteRef_2, @@ -185,7 +184,7 @@ const _default: OverridableFrontendPlugin< path: string; title?: string; icon?: IconElement; - loader?: () => Promise; + loader?: () => Promise; routeRef?: RouteRef_2; noHeader?: boolean; }; @@ -194,8 +193,5 @@ const _default: OverridableFrontendPlugin< >; export default _default; -// @alpha (undocumented) -export const DefaultImportPage: () => JSX_2.Element; - // (No @packageDocumentation comment for this package) ``` diff --git a/plugins/catalog-import/src/alpha.tsx b/plugins/catalog-import/src/alpha.tsx index 52b7f9cfe1..315bbc36e6 100644 --- a/plugins/catalog-import/src/alpha.tsx +++ b/plugins/catalog-import/src/alpha.tsx @@ -44,8 +44,6 @@ import { catalogImportTranslationRef as _catalogImportTranslationRef } from './t */ export const catalogImportTranslationRef = _catalogImportTranslationRef; -export { NfsDefaultImportPage as DefaultImportPage } from './components/DefaultImportPage/DefaultImportPage'; - // TODO: It's currently possible to override the import page with a custom one. We need to decide // whether this type of override is typically done with an input or by overriding the entire extension. const catalogImportPage = PageBlueprint.make({ diff --git a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx index 5861a141e3..9989bbd9b6 100644 --- a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx +++ b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx @@ -81,9 +81,6 @@ export const DefaultImportPage = () => { ); }; -/** - * @alpha - */ export const NfsDefaultImportPage = () => { const { t } = useTranslationRef(catalogImportTranslationRef); const configApi = useApi(configApiRef);