From 5bc450b7f194f2ba6b112c549b41c12c71351f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Mon, 30 Mar 2026 20:57:39 +0200 Subject: [PATCH] Rename entityPresentation parameter to entityPresentationApi for consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.6 (1M context) Signed-off-by: Fredrik Adelöw --- plugins/catalog-react/report-alpha.api.md | 4 ++-- plugins/catalog-react/report.api.md | 8 ++++---- .../EntityDataTable/columnFactories.tsx | 16 +++++++-------- .../src/components/EntityTable/columns.tsx | 20 +++++++++---------- plugins/catalog/report.api.md | 2 +- .../src/components/CatalogTable/columns.tsx | 6 +++--- .../src/home/components/Tables/helpers.ts | 6 +++--- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/plugins/catalog-react/report-alpha.api.md b/plugins/catalog-react/report-alpha.api.md index 17bd8de8af..c2818b78ee 100644 --- a/plugins/catalog-react/report-alpha.api.md +++ b/plugins/catalog-react/report-alpha.api.md @@ -500,7 +500,7 @@ export const entityDataTableColumns: Readonly<{ createEntityRefColumn(options: { defaultKind?: string; isRowHeader?: boolean; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): EntityColumnConfig; createEntityRelationColumn(options: { id: string; @@ -510,7 +510,7 @@ export const entityDataTableColumns: Readonly<{ filter?: { kind: string; }; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): EntityColumnConfig; createOwnerColumn(): EntityColumnConfig; createSystemColumn(): EntityColumnConfig; diff --git a/plugins/catalog-react/report.api.md b/plugins/catalog-react/report.api.md index 806d329fe0..251a0e853a 100644 --- a/plugins/catalog-react/report.api.md +++ b/plugins/catalog-react/report.api.md @@ -266,7 +266,7 @@ export type CatalogReactUserListPickerClassKey = export const columnFactories: Readonly<{ createEntityRefColumn(options: { defaultKind?: string; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn; createEntityRelationColumn(options: { title: string | JSX.Element; @@ -275,7 +275,7 @@ export const columnFactories: Readonly<{ filter?: { kind: string; }; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn; createOwnerColumn(): TableColumn; createDomainColumn(): TableColumn; @@ -689,7 +689,7 @@ export const EntityTable: { columns: Readonly<{ createEntityRefColumn(options: { defaultKind?: string; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn; createEntityRelationColumn(options: { title: string | JSX.Element; @@ -698,7 +698,7 @@ export const EntityTable: { filter?: { kind: string; }; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn; createOwnerColumn(): TableColumn; createDomainColumn(): TableColumn; diff --git a/plugins/catalog-react/src/components/EntityDataTable/columnFactories.tsx b/plugins/catalog-react/src/components/EntityDataTable/columnFactories.tsx index aed29dbd56..5c425907d3 100644 --- a/plugins/catalog-react/src/components/EntityDataTable/columnFactories.tsx +++ b/plugins/catalog-react/src/components/EntityDataTable/columnFactories.tsx @@ -36,11 +36,11 @@ export interface EntityColumnConfig extends ColumnConfig { function getEntityTitle( entityOrRef: Entity | { kind: string; namespace?: string; name: string }, context: { defaultKind?: string }, - entityPresentation?: EntityPresentationApi, + entityPresentationApi?: EntityPresentationApi, ): string { - if (entityPresentation) { - return entityPresentation.forEntity(entityOrRef as Entity, context).snapshot - .primaryTitle; + if (entityPresentationApi) { + return entityPresentationApi.forEntity(entityOrRef as Entity, context) + .snapshot.primaryTitle; } return defaultEntityPresentation(entityOrRef as Entity, context).primaryTitle; } @@ -50,7 +50,7 @@ export const columnFactories = Object.freeze({ createEntityRefColumn(options: { defaultKind?: string; isRowHeader?: boolean; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): EntityColumnConfig { const isRowHeader = options.isRowHeader ?? true; return { @@ -76,7 +76,7 @@ export const columnFactories = Object.freeze({ getEntityTitle( entity, { defaultKind: options.defaultKind }, - options.entityPresentation, + options.entityPresentationApi, ), }; }, @@ -87,7 +87,7 @@ export const columnFactories = Object.freeze({ relation: string; defaultKind?: string; filter?: { kind: string }; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): EntityColumnConfig { return { id: options.id, @@ -116,7 +116,7 @@ export const columnFactories = Object.freeze({ getEntityTitle( r, { defaultKind: options.defaultKind }, - options.entityPresentation, + options.entityPresentationApi, ), ) .join(', '), diff --git a/plugins/catalog-react/src/components/EntityTable/columns.tsx b/plugins/catalog-react/src/components/EntityTable/columns.tsx index 3768cf595e..01d1c7e1f3 100644 --- a/plugins/catalog-react/src/components/EntityTable/columns.tsx +++ b/plugins/catalog-react/src/components/EntityTable/columns.tsx @@ -29,11 +29,11 @@ import { EntityTableColumnTitle } from './TitleColumn'; function getEntityTitle( entityOrRef: Entity | CompoundEntityRef, context: { defaultKind?: string }, - entityPresentation?: EntityPresentationApi, + entityPresentationApi?: EntityPresentationApi, ): string { - if (entityPresentation) { - return entityPresentation.forEntity(entityOrRef as Entity, context).snapshot - .primaryTitle; + if (entityPresentationApi) { + return entityPresentationApi.forEntity(entityOrRef as Entity, context) + .snapshot.primaryTitle; } return defaultEntityPresentation(entityOrRef, context).primaryTitle; } @@ -42,11 +42,11 @@ function getEntityTitle( export const columnFactories = Object.freeze({ createEntityRefColumn(options: { defaultKind?: string; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn { - const { defaultKind, entityPresentation } = options; + const { defaultKind, entityPresentationApi } = options; function formatContent(entity: T): string { - return getEntityTitle(entity, { defaultKind }, entityPresentation); + return getEntityTitle(entity, { defaultKind }, entityPresentationApi); } return { @@ -80,14 +80,14 @@ export const columnFactories = Object.freeze({ relation: string; defaultKind?: string; filter?: { kind: string }; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn { const { title, relation, defaultKind, filter: entityFilter, - entityPresentation, + entityPresentationApi, } = options; function getRelations(entity: T): CompoundEntityRef[] { @@ -96,7 +96,7 @@ export const columnFactories = Object.freeze({ function formatContent(entity: T): string { return getRelations(entity) - .map(r => getEntityTitle(r, { defaultKind }, entityPresentation)) + .map(r => getEntityTitle(r, { defaultKind }, entityPresentationApi)) .join(', '); } diff --git a/plugins/catalog/report.api.md b/plugins/catalog/report.api.md index 816d469d13..d8c5c85402 100644 --- a/plugins/catalog/report.api.md +++ b/plugins/catalog/report.api.md @@ -153,7 +153,7 @@ export const CatalogTable: { columns: Readonly<{ createNameColumn(options?: { defaultKind?: string; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn; createSystemColumn(): TableColumn; createOwnerColumn(): TableColumn; diff --git a/plugins/catalog/src/components/CatalogTable/columns.tsx b/plugins/catalog/src/components/CatalogTable/columns.tsx index 05a8b1979b..55b2d5c6a8 100644 --- a/plugins/catalog/src/components/CatalogTable/columns.tsx +++ b/plugins/catalog/src/components/CatalogTable/columns.tsx @@ -32,11 +32,11 @@ import { EntityTableColumnTitle } from '@backstage/plugin-catalog-react/alpha'; export const columnFactories = Object.freeze({ createNameColumn(options?: { defaultKind?: string; - entityPresentation?: EntityPresentationApi; + entityPresentationApi?: EntityPresentationApi; }): TableColumn { function formatContent(entity: Entity): string { - if (options?.entityPresentation) { - return options.entityPresentation.forEntity(entity, { + if (options?.entityPresentationApi) { + return options.entityPresentationApi.forEntity(entity, { defaultKind: options?.defaultKind, }).snapshot.primaryTitle; } diff --git a/plugins/techdocs/src/home/components/Tables/helpers.ts b/plugins/techdocs/src/home/components/Tables/helpers.ts index 4ec3123fe8..4f2424340e 100644 --- a/plugins/techdocs/src/home/components/Tables/helpers.ts +++ b/plugins/techdocs/src/home/components/Tables/helpers.ts @@ -37,7 +37,7 @@ export function entitiesToDocsMapper( entities: Entity[], getRouteToReaderPageFor: getRouteFunc, config: ConfigApi, - entityPresentation?: EntityPresentationApi, + entityPresentationApi?: EntityPresentationApi, ) { return entities.map(entity => { const ownedByRelations = getEntityRelations(entity, RELATION_OWNED_BY); @@ -55,8 +55,8 @@ export function entitiesToDocsMapper( ownedByRelations, ownedByRelationsTitle: ownedByRelations .map(r => { - if (entityPresentation) { - return entityPresentation.forEntity(stringifyEntityRef(r), { + if (entityPresentationApi) { + return entityPresentationApi.forEntity(stringifyEntityRef(r), { defaultKind: 'group', }).snapshot.primaryTitle; }