Adjust to review

Signed-off-by: Philipp Hugenroth <philipph@spotify.com>

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({

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: [

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)
 ```

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(<m.GroupProfileCard />),
@@ -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(<m.MembersListCard />),
@@ -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(<m.OwnershipCard />),
@@ -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(<m.UserProfileCard />),