From 79de3a55b07632124d0bf883f60f83b995fa6066 Mon Sep 17 00:00:00 2001 From: Harsh Vador Date: Thu, 14 May 2026 13:06:21 +0530 Subject: [PATCH 1/2] fix(ui): use embedded breadcrumbs on ServicesPage when rendered in askCollate --- .../EmbeddedAddServicePage.component.tsx | 2 +- .../src/pages/ServicesPage/ServicesPage.tsx | 28 ++++++++++++------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/EmbeddedAddServicePage/EmbeddedAddServicePage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/EmbeddedAddServicePage/EmbeddedAddServicePage.component.tsx index 4fd6da638125..df4e7fee50f4 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/EmbeddedAddServicePage/EmbeddedAddServicePage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/EmbeddedAddServicePage/EmbeddedAddServicePage.component.tsx @@ -334,7 +334,7 @@ const EmbeddedAddServicePage = () => { minWidth: 700, flex: 0.7, className: 'content-resizable-panel-container', - cardClassName: 'max-width-md m-x-auto', + cardClassName: 'max-width-md m-x-auto tw:my-4', allowScroll: true, }} hideSecondPanel={hideSecondPanel} diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx index f258926a6dfa..0a4c99671a6d 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx @@ -87,16 +87,24 @@ const ServicesPage = () => { ); if (isEmbedded) { - return crumbs.map((crumb) => { - if (!crumb.activeTitle && crumb.url) { - return { - ...crumb, - url: '/askCollate/connections/settings/services', - }; - } - - return crumb; - }); + return [ + { + name: t('label.ask-collate'), + url: '/askCollate', + }, + { + name: t('label.connection-plural'), + url: '/askCollate/connections', + }, + { + name: + tab === GlobalSettingOptions.DATA_OBSERVABILITY + ? t('label.data-observability') + : capitalize(tab), + url: '', + activeTitle: true, + }, + ]; } return crumbs; From e7e37aeae80a5d436bee85743f3c8370559716e4 Mon Sep 17 00:00:00 2001 From: Harsh Vador Date: Thu, 14 May 2026 14:17:07 +0530 Subject: [PATCH 2/2] add support for embedded breadcrumb in global settings --- .../GlobalSettingCategoryPage.tsx | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx index 8093d290b1d6..5a7ddcd023af 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx @@ -56,13 +56,27 @@ const GlobalSettingCategoryPage = () => { const breadcrumbs: TitleBreadcrumbProps['titleLinks'] = useMemo(() => { const crumbs = getSettingPageEntityBreadCrumb(settingCategory); if (isEmbedded) { - return crumbs.map((crumb, i) => - i === 0 ? { ...crumb, url: '' } : crumb - ); + const categoryName = crumbs[crumbs.length - 1]?.name ?? ''; + + return [ + { + name: t('label.ask-collate'), + url: '/askCollate', + }, + { + name: t('label.connection-plural'), + url: '/askCollate/connections', + }, + { + name: categoryName, + url: '', + activeTitle: true, + }, + ]; } return crumbs; - }, [settingCategory, isEmbedded]); + }, [settingCategory, isEmbedded, t]); const settingCategoryData: SettingMenuItem | undefined = useMemo(() => { let categoryItem = globalSettingsClassBase