diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx index b8430294a5..e3c36c9329 100644 --- a/packages/app/src/components/Root/Root.tsx +++ b/packages/app/src/components/Root/Root.tsx @@ -95,11 +95,9 @@ export const Root = ({ children }: PropsWithChildren<{}>) => ( {/* Global nav, not org-specific */} diff --git a/plugins/org/README.md b/plugins/org/README.md index ddb4468582..9023c16ace 100644 --- a/plugins/org/README.md +++ b/plugins/org/README.md @@ -35,10 +35,10 @@ To use the MyGroupsSidebarItem you'll need to add it to your `Root.tsx` - found {/* Global nav, not org-specific */} //... -+ //... @@ -53,6 +53,6 @@ Once added MyGroupsSidebarItem will work in three ways: ![MyGroupsSidebarItem single example](./docs/mygroupssidebaritem-single.png) -3. The user is logged in and a member of more than one group: the MyGroupsSidebarItem will display a single items with a submenu with all the related groups like this: +3. The user is logged in and a member of more than one group: the MyGroupsSidebarItem will display a single items with a sub-menu with all the related groups like this: ![MyGroupsSidebarItem multiple example](./docs/mygroupssidebaritem-multiple.png) diff --git a/plugins/org/api-report.md b/plugins/org/api-report.md index dd8852edc4..1050b2aaff 100644 --- a/plugins/org/api-report.md +++ b/plugins/org/api-report.md @@ -66,14 +66,14 @@ export const MembersListCard: (_props: { // @public export const MyGroupsSidebarItem: ({ - props, + singularTitle, + pluralTitle, + icon, }: { - props: { - singularTitle: string; - pluralTitle: string; - icon: IconComponent; - }; -}) => JSX.Element; + singularTitle: string; + pluralTitle: string; + icon: IconComponent; +}) => JSX.Element | null; // Warning: (ae-missing-release-tag) "orgPlugin" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) // diff --git a/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx b/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx index 23ae09a99b..794dd23747 100644 --- a/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx +++ b/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.test.tsx @@ -47,11 +47,9 @@ describe('MyGroupsSidebarItem Test', () => { ]} > , { @@ -103,11 +101,9 @@ describe('MyGroupsSidebarItem Test', () => { ]} > , { @@ -187,11 +183,9 @@ describe('MyGroupsSidebarItem Test', () => { ]} > , { diff --git a/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.tsx b/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.tsx index eb81cc0c27..6f13cb08db 100644 --- a/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.tsx +++ b/plugins/org/src/components/MyGroupsSidebarItem/MyGroupsSidebarItem.tsx @@ -40,11 +40,15 @@ import { getCompoundEntityRef } from '@backstage/catalog-model'; * @public */ export const MyGroupsSidebarItem = ({ - props, + singularTitle, + pluralTitle, + icon, }: { - props: { singularTitle: string; pluralTitle: string; icon: IconComponent }; + singularTitle: string; + pluralTitle: string; + icon: IconComponent; }) => { - const { singularTitle, pluralTitle, icon } = props; + // const { singularTitle, pluralTitle, icon } = props; const identityApi = useApi(identityApiRef); const catalogApi: CatalogApi = useApi(catalogApiRef); const catalogEntityRoute = useRouteRef(entityRouteRef);