From c104960da7d338f3038bd134e96a4ffa94ae4c4c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 8 Mar 2026 20:48:43 +0100
Subject: [PATCH] Tidy NFS catalog entity header content

Preserve custom entity header content below the page header and use the entity display title in breadcrumb text so the NFS entity page reads more consistently.

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
Made-with: Cursor
---
 .../src/alpha/components/EntityHeader/EntityHeader.tsx   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx b/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx
index 6278bf9590..543da69099 100644
--- a/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx
+++ b/plugins/catalog/src/alpha/components/EntityHeader/EntityHeader.tsx
@@ -108,6 +108,7 @@ function EntityHeaderSubtitle(props: { parentEntityRelations?: string[] }) {
   const classes = useStyles();
   const { entity } = useAsyncEntity();
   const { name } = useRouteRefParams(entityRouteRef);
+  const entityName = entity?.metadata.title ?? name;
   const parentEntity = findParentRelation(
     entity?.relations ?? [],
     parentEntityRelations ?? [],
@@ -131,7 +132,7 @@ function EntityHeaderSubtitle(props: { parentEntityRelations?: string[] }) {
         <EntityRefLink entityRef={ancestorEntity.targetRef} disableTooltip />
       )}
       <EntityRefLink entityRef={parentEntity.targetRef} disableTooltip />
-      {name}
+      {entityName}
     </Breadcrumbs>
   ) : null;
 }
@@ -232,6 +233,7 @@ export function EntityHeader(props: {
   );
 
   const inspectDialogOpen = typeof selectedInspectEntityDialogTab === 'string';
+  const customTitle = typeof title === 'string' ? undefined : title;
   const headerSubtitle = subtitle ?? (
     <EntityHeaderSubtitle parentEntityRelations={parentEntityRelations} />
   );
@@ -256,11 +258,12 @@ export function EntityHeader(props: {
           ) : undefined
         }
       />
-      {(headerSubtitle || entity) && (
+      {(customTitle || headerSubtitle || entity) && (
         <Box mt={2}>
+          {customTitle}
           {headerSubtitle}
           {entity && (
-            <Box mt={headerSubtitle ? 1 : 0}>
+            <Box mt={customTitle || headerSubtitle ? 1 : 0}>
               <EntityLabels entity={entity} />
             </Box>
           )}