Skip to content

Commit a36448a

Browse files
authored
fix(ui): use embedded breadcrumbs on ServicesPage when in embedded (#28107)
* fix(ui): use embedded breadcrumbs on ServicesPage when rendered in askCollate * add support for embedded breadcrumb in global settings
1 parent bba0bf8 commit a36448a

3 files changed

Lines changed: 37 additions & 15 deletions

File tree

openmetadata-ui/src/main/resources/ui/src/pages/EmbeddedAddServicePage/EmbeddedAddServicePage.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ const EmbeddedAddServicePage = () => {
334334
minWidth: 700,
335335
flex: 0.7,
336336
className: 'content-resizable-panel-container',
337-
cardClassName: 'max-width-md m-x-auto',
337+
cardClassName: 'max-width-md m-x-auto tw:my-4',
338338
allowScroll: true,
339339
}}
340340
hideSecondPanel={hideSecondPanel}

openmetadata-ui/src/main/resources/ui/src/pages/GlobalSettingPage/GlobalSettingCategory/GlobalSettingCategoryPage.tsx

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,27 @@ const GlobalSettingCategoryPage = () => {
5656
const breadcrumbs: TitleBreadcrumbProps['titleLinks'] = useMemo(() => {
5757
const crumbs = getSettingPageEntityBreadCrumb(settingCategory);
5858
if (isEmbedded) {
59-
return crumbs.map((crumb, i) =>
60-
i === 0 ? { ...crumb, url: '' } : crumb
61-
);
59+
const categoryName = crumbs[crumbs.length - 1]?.name ?? '';
60+
61+
return [
62+
{
63+
name: t('label.ask-collate'),
64+
url: '/askCollate',
65+
},
66+
{
67+
name: t('label.connection-plural'),
68+
url: '/askCollate/connections',
69+
},
70+
{
71+
name: categoryName,
72+
url: '',
73+
activeTitle: true,
74+
},
75+
];
6276
}
6377

6478
return crumbs;
65-
}, [settingCategory, isEmbedded]);
79+
}, [settingCategory, isEmbedded, t]);
6680

6781
const settingCategoryData: SettingMenuItem | undefined = useMemo(() => {
6882
let categoryItem = globalSettingsClassBase

openmetadata-ui/src/main/resources/ui/src/pages/ServicesPage/ServicesPage.tsx

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,24 @@ const ServicesPage = () => {
8787
);
8888

8989
if (isEmbedded) {
90-
return crumbs.map((crumb) => {
91-
if (!crumb.activeTitle && crumb.url) {
92-
return {
93-
...crumb,
94-
url: '/askCollate/connections/settings/services',
95-
};
96-
}
97-
98-
return crumb;
99-
});
90+
return [
91+
{
92+
name: t('label.ask-collate'),
93+
url: '/askCollate',
94+
},
95+
{
96+
name: t('label.connection-plural'),
97+
url: '/askCollate/connections',
98+
},
99+
{
100+
name:
101+
tab === GlobalSettingOptions.DATA_OBSERVABILITY
102+
? t('label.data-observability')
103+
: capitalize(tab),
104+
url: '',
105+
activeTitle: true,
106+
},
107+
];
100108
}
101109

102110
return crumbs;

0 commit comments

Comments
 (0)