diff --git a/packages/app-next/app-config.yaml b/packages/app-next/app-config.yaml index 0b842a0b91..4e54d96d7c 100644 --- a/packages/app-next/app-config.yaml +++ b/packages/app-next/app-config.yaml @@ -5,7 +5,7 @@ app: bindings: catalog.viewTechDoc: techdocs.docRoot catalog.createComponent: catalog-import.importPage - # org.catalogIndex: catalog.catalogIndex + org.catalogIndex: catalog.catalogIndex extensions: # - apis.plugin.graphiql.browse.gitlab: true @@ -21,12 +21,10 @@ app: - entity-content:techdocs # Org Plugin - - entity-card:org/group-profile: - config: - filter: kind:group - # - entity-card:org/members-list - # - entity-card:org/ownership - # - entity-card:org/user-profile + - entity-card:org/group-profile + - entity-card:org/members-list + - entity-card:org/ownership + - entity-card:org/user-profile # scmAuthExtension: >- # createScmAuthExtension({ diff --git a/packages/app-next/src/App.tsx b/packages/app-next/src/App.tsx index bb39d8d40e..03a6649c27 100644 --- a/packages/app-next/src/App.tsx +++ b/packages/app-next/src/App.tsx @@ -24,7 +24,6 @@ import userSettingsPlugin from '@backstage/plugin-user-settings/alpha'; import homePlugin, { titleExtensionDataRef, } from '@backstage/plugin-home/alpha'; -import orgPlugin from '@backstage/plugin-org/alpha'; import { coreExtensionData, @@ -126,7 +125,6 @@ const app = createApp({ userSettingsPlugin, homePlugin, appVisualizerPlugin, - orgPlugin, ...collectedLegacyPlugins, createExtensionOverrides({ extensions: [ diff --git a/plugins/org/api-report-alpha.md b/plugins/org/api-report-alpha.md index b9605a45f5..3cee584db0 100644 --- a/plugins/org/api-report-alpha.md +++ b/plugins/org/api-report-alpha.md @@ -4,7 +4,6 @@ ```ts import { BackstagePlugin } from '@backstage/frontend-plugin-api'; -import { ExtensionDefinition } from '@backstage/frontend-plugin-api'; import { ExternalRouteRef } from '@backstage/frontend-plugin-api'; // @alpha (undocumented) @@ -16,10 +15,5 @@ const _default: BackstagePlugin< >; export default _default; -// @alpha (undocumented) -export const EntityGroupProfileCard: ExtensionDefinition<{ - filter?: string | undefined; -}>; - // (No @packageDocumentation comment for this package) ``` diff --git a/plugins/org/src/alpha.tsx b/plugins/org/src/alpha.tsx index 3d02aec88b..3fbf5bcc41 100644 --- a/plugins/org/src/alpha.tsx +++ b/plugins/org/src/alpha.tsx @@ -24,8 +24,9 @@ import { catalogIndexRouteRef } from './routes'; import { createEntityCardExtension } from '@backstage/plugin-catalog-react/alpha'; /** @alpha */ -export const EntityGroupProfileCard = createEntityCardExtension({ +const EntityGroupProfileCard = createEntityCardExtension({ name: 'group-profile', + filter: 'kind:group', loader: async () => import('./components/Cards/Group/GroupProfile/GroupProfileCard').then(m => compatWrapper(), @@ -33,8 +34,9 @@ export const EntityGroupProfileCard = createEntityCardExtension({ }); /** @alpha */ -export const EntityMembersListCard = createEntityCardExtension({ +const EntityMembersListCard = createEntityCardExtension({ name: 'members-list', + filter: 'kind:group', loader: async () => import('./components/Cards/Group/MembersList/MembersListCard').then(m => compatWrapper(), @@ -42,8 +44,9 @@ export const EntityMembersListCard = createEntityCardExtension({ }); /** @alpha */ -export const EntityOwnershipCard = createEntityCardExtension({ +const EntityOwnershipCard = createEntityCardExtension({ name: 'ownership', + filter: 'kind:group,user', loader: async () => import('./components/Cards/OwnershipCard/OwnershipCard').then(m => compatWrapper(), @@ -51,8 +54,9 @@ export const EntityOwnershipCard = createEntityCardExtension({ }); /** @alpha */ -export const EntityUserProfileCard = createEntityCardExtension({ +const EntityUserProfileCard = createEntityCardExtension({ name: 'user-profile', + filter: 'kind:user', loader: async () => import('./components/Cards/User/UserProfileCard/UserProfileCard').then(m => compatWrapper(),