From 604a504328e95a8330e0dec0ada377cd139cbfe4 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 5 Aug 2024 16:38:22 +0200
Subject: [PATCH 1/2] catalog: add more filters for alpha entity cards

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/bright-donkeys-buy.md          | 5 +++++
 plugins/catalog/src/alpha/entityCards.tsx | 7 +++++++
 2 files changed, 12 insertions(+)
 create mode 100644 .changeset/bright-donkeys-buy.md

diff --git a/.changeset/bright-donkeys-buy.md b/.changeset/bright-donkeys-buy.md
new file mode 100644
index 0000000000..ded16ccc2c
--- /dev/null
+++ b/.changeset/bright-donkeys-buy.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog': patch
+---
+
+The entity relation cards available for the new frontend system via `/alpha` now have more accurate and granular default filters.
diff --git a/plugins/catalog/src/alpha/entityCards.tsx b/plugins/catalog/src/alpha/entityCards.tsx
index 332bd49c55..8a18efabde 100644
--- a/plugins/catalog/src/alpha/entityCards.tsx
+++ b/plugins/catalog/src/alpha/entityCards.tsx
@@ -46,6 +46,7 @@ export const catalogLabelsEntityCard = createEntityCardExtension({
 
 export const catalogDependsOnComponentsEntityCard = createEntityCardExtension({
   name: 'depends-on-components',
+  filter: 'kind:component',
   loader: async () =>
     import('../components/DependsOnComponentsCard').then(m =>
       compatWrapper(<m.DependsOnComponentsCard variant="gridItem" />),
@@ -54,6 +55,7 @@ export const catalogDependsOnComponentsEntityCard = createEntityCardExtension({
 
 export const catalogDependsOnResourcesEntityCard = createEntityCardExtension({
   name: 'depends-on-resources',
+  filter: 'kind:component',
   loader: async () =>
     import('../components/DependsOnResourcesCard').then(m =>
       compatWrapper(<m.DependsOnResourcesCard variant="gridItem" />),
@@ -62,6 +64,7 @@ export const catalogDependsOnResourcesEntityCard = createEntityCardExtension({
 
 export const catalogHasComponentsEntityCard = createEntityCardExtension({
   name: 'has-components',
+  filter: 'kind:system',
   loader: async () =>
     import('../components/HasComponentsCard').then(m =>
       compatWrapper(<m.HasComponentsCard variant="gridItem" />),
@@ -70,6 +73,7 @@ export const catalogHasComponentsEntityCard = createEntityCardExtension({
 
 export const catalogHasResourcesEntityCard = createEntityCardExtension({
   name: 'has-resources',
+  filter: 'kind:system',
   loader: async () =>
     import('../components/HasResourcesCard').then(m =>
       compatWrapper(<m.HasResourcesCard variant="gridItem" />),
@@ -78,6 +82,7 @@ export const catalogHasResourcesEntityCard = createEntityCardExtension({
 
 export const catalogHasSubcomponentsEntityCard = createEntityCardExtension({
   name: 'has-subcomponents',
+  filter: 'kind:component',
   loader: async () =>
     import('../components/HasSubcomponentsCard').then(m =>
       compatWrapper(<m.HasSubcomponentsCard variant="gridItem" />),
@@ -86,6 +91,7 @@ export const catalogHasSubcomponentsEntityCard = createEntityCardExtension({
 
 export const catalogHasSubdomainsEntityCard = createEntityCardExtension({
   name: 'has-subdomains',
+  filter: 'kind:domain',
   loader: async () =>
     import('../components/HasSubdomainsCard').then(m =>
       compatWrapper(<m.HasSubdomainsCard variant="gridItem" />),
@@ -94,6 +100,7 @@ export const catalogHasSubdomainsEntityCard = createEntityCardExtension({
 
 export const catalogHasSystemsEntityCard = createEntityCardExtension({
   name: 'has-systems',
+  filter: 'kind:domain',
   loader: async () =>
     import('../components/HasSystemsCard').then(m =>
       compatWrapper(<m.HasSystemsCard variant="gridItem" />),

From 012e3ebf715aa78ed183fd4069152db933607c7d Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 5 Aug 2024 16:38:55 +0200
Subject: [PATCH 2/2] catalog-react: enable entity cards and content by default
 in new system

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/witty-geese-battle.md    | 5 +++++
 plugins/catalog-react/src/alpha.tsx | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/witty-geese-battle.md

diff --git a/.changeset/witty-geese-battle.md b/.changeset/witty-geese-battle.md
new file mode 100644
index 0000000000..082784cc8b
--- /dev/null
+++ b/.changeset/witty-geese-battle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Entity page extensions created for the new frontend system via the `/alpha` exports will now be enabled by default.
diff --git a/plugins/catalog-react/src/alpha.tsx b/plugins/catalog-react/src/alpha.tsx
index e81b8e5ebf..42d69726b6 100644
--- a/plugins/catalog-react/src/alpha.tsx
+++ b/plugins/catalog-react/src/alpha.tsx
@@ -83,7 +83,7 @@ export function createEntityCardExtension<
       id: 'entity-content:catalog/overview',
       input: 'cards',
     },
-    disabled: options.disabled ?? true,
+    disabled: options.disabled,
     output: {
       element: coreExtensionData.reactElement,
       filterFunction: catalogExtensionData.entityFilterFunction.optional(),
@@ -137,7 +137,7 @@ export function createEntityContentExtension<
       id: 'page:catalog/entity',
       input: 'contents',
     },
-    disabled: options.disabled ?? true,
+    disabled: options.disabled,
     output: {
       element: coreExtensionData.reactElement,
       path: coreExtensionData.routePath,