From 61d350fd1c3b1ad6a6f590f1bd76322a6f445075 Mon Sep 17 00:00:00 2001 From: Alex McKay Date: Thu, 3 Apr 2025 14:02:44 -0400 Subject: [PATCH 1/3] move catalog filter blueprint to react package Signed-off-by: Alex McKay --- .changeset/happy-spoons-sing.md | 11 +++++++++++ plugins/catalog-react/report-alpha.api.md | 14 ++++++++++++++ .../blueprints/CatalogFilterBlueprint.test.tsx | 0 .../alpha/blueprints/CatalogFilterBlueprint.ts | 0 .../catalog-react/src/alpha/blueprints/index.ts | 1 + plugins/catalog/report-alpha.api.md | 15 --------------- plugins/catalog/src/alpha/blueprints/index.ts | 16 ---------------- plugins/catalog/src/alpha/filters.tsx | 2 +- plugins/catalog/src/alpha/index.ts | 1 - plugins/catalog/src/index.ts | 1 - 10 files changed, 27 insertions(+), 34 deletions(-) create mode 100644 .changeset/happy-spoons-sing.md rename plugins/{catalog => catalog-react}/src/alpha/blueprints/CatalogFilterBlueprint.test.tsx (100%) rename plugins/{catalog => catalog-react}/src/alpha/blueprints/CatalogFilterBlueprint.ts (100%) delete mode 100644 plugins/catalog/src/alpha/blueprints/index.ts diff --git a/.changeset/happy-spoons-sing.md b/.changeset/happy-spoons-sing.md new file mode 100644 index 0000000000..3ac0a48032 --- /dev/null +++ b/.changeset/happy-spoons-sing.md @@ -0,0 +1,11 @@ +--- +'@backstage/plugin-catalog-react': minor +'@backstage/plugin-catalog': minor +--- + +**BREAKING**: `CatalogFilterBlueprint`, used in the new frontend system, is now exported under plugin-catalog-react instead of plugin-catalog. + +```diff ++ import { CatalogFilterBlueprint } from '@backstage/plugin-catalog-react/alpha'; +- import { CatalogFilterBlueprint } from '@backstage/plugin-catalog/alpha'; +``` diff --git a/plugins/catalog-react/report-alpha.api.md b/plugins/catalog-react/report-alpha.api.md index 2df3371353..f3aaf6af9a 100644 --- a/plugins/catalog-react/report-alpha.api.md +++ b/plugins/catalog-react/report-alpha.api.md @@ -16,6 +16,20 @@ import { ResourcePermission } from '@backstage/plugin-permission-common'; import { RouteRef } from '@backstage/frontend-plugin-api'; import { TranslationRef } from '@backstage/core-plugin-api/alpha'; +// @alpha +export const CatalogFilterBlueprint: ExtensionBlueprint<{ + kind: 'catalog-filter'; + name: undefined; + params: { + loader: () => Promise; + }; + output: ConfigurableExtensionDataRef; + inputs: {}; + config: {}; + configInput: {}; + dataRefs: never; +}>; + // @alpha (undocumented) export const catalogReactTranslationRef: TranslationRef< 'catalog-react', diff --git a/plugins/catalog/src/alpha/blueprints/CatalogFilterBlueprint.test.tsx b/plugins/catalog-react/src/alpha/blueprints/CatalogFilterBlueprint.test.tsx similarity index 100% rename from plugins/catalog/src/alpha/blueprints/CatalogFilterBlueprint.test.tsx rename to plugins/catalog-react/src/alpha/blueprints/CatalogFilterBlueprint.test.tsx diff --git a/plugins/catalog/src/alpha/blueprints/CatalogFilterBlueprint.ts b/plugins/catalog-react/src/alpha/blueprints/CatalogFilterBlueprint.ts similarity index 100% rename from plugins/catalog/src/alpha/blueprints/CatalogFilterBlueprint.ts rename to plugins/catalog-react/src/alpha/blueprints/CatalogFilterBlueprint.ts diff --git a/plugins/catalog-react/src/alpha/blueprints/index.ts b/plugins/catalog-react/src/alpha/blueprints/index.ts index 10e339c44d..dc3fa7de1b 100644 --- a/plugins/catalog-react/src/alpha/blueprints/index.ts +++ b/plugins/catalog-react/src/alpha/blueprints/index.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +export { CatalogFilterBlueprint } from './CatalogFilterBlueprint'; export { EntityCardBlueprint } from './EntityCardBlueprint'; export { EntityContentBlueprint } from './EntityContentBlueprint'; export { diff --git a/plugins/catalog/report-alpha.api.md b/plugins/catalog/report-alpha.api.md index 77d8dbec50..c63f0f4fce 100644 --- a/plugins/catalog/report-alpha.api.md +++ b/plugins/catalog/report-alpha.api.md @@ -12,7 +12,6 @@ import { Entity } from '@backstage/catalog-model'; import { EntityCardType } from '@backstage/plugin-catalog-react/alpha'; import { EntityContentLayoutProps } from '@backstage/plugin-catalog-react/alpha'; import { EntityPredicate } from '@backstage/plugin-catalog-react/alpha'; -import { ExtensionBlueprint } from '@backstage/frontend-plugin-api'; import { ExtensionDefinition } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; import { ExternalRouteRef } from '@backstage/frontend-plugin-api'; @@ -25,20 +24,6 @@ import { SearchResultItemExtensionPredicate } from '@backstage/plugin-search-rea import { SearchResultListItemBlueprintParams } from '@backstage/plugin-search-react/alpha'; import { TranslationRef } from '@backstage/core-plugin-api/alpha'; -// @alpha -export const CatalogFilterBlueprint: ExtensionBlueprint<{ - kind: 'catalog-filter'; - name: undefined; - params: { - loader: () => Promise; - }; - output: ConfigurableExtensionDataRef; - inputs: {}; - config: {}; - configInput: {}; - dataRefs: never; -}>; - // @alpha (undocumented) export const catalogTranslationRef: TranslationRef< 'catalog', diff --git a/plugins/catalog/src/alpha/blueprints/index.ts b/plugins/catalog/src/alpha/blueprints/index.ts deleted file mode 100644 index a3a7bcb33f..0000000000 --- a/plugins/catalog/src/alpha/blueprints/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright 2024 The Backstage Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -export { CatalogFilterBlueprint } from './CatalogFilterBlueprint'; diff --git a/plugins/catalog/src/alpha/filters.tsx b/plugins/catalog/src/alpha/filters.tsx index 3507658731..1ff2981864 100644 --- a/plugins/catalog/src/alpha/filters.tsx +++ b/plugins/catalog/src/alpha/filters.tsx @@ -15,7 +15,7 @@ */ import React from 'react'; -import { CatalogFilterBlueprint } from './blueprints'; +import { CatalogFilterBlueprint } from '@backstage/plugin-catalog-react/alpha'; const catalogTagCatalogFilter = CatalogFilterBlueprint.make({ name: 'tag', diff --git a/plugins/catalog/src/alpha/index.ts b/plugins/catalog/src/alpha/index.ts index 3357024fd9..c9f4c8c4b7 100644 --- a/plugins/catalog/src/alpha/index.ts +++ b/plugins/catalog/src/alpha/index.ts @@ -16,5 +16,4 @@ export { default } from './plugin'; -export * from './blueprints'; export * from './translation'; diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts index f3cc7d3d0b..6555b4a2a0 100644 --- a/plugins/catalog/src/index.ts +++ b/plugins/catalog/src/index.ts @@ -21,7 +21,6 @@ */ export * from './apis'; - export type { AboutCardProps, AboutContentProps, From 3fe0b6a8a083c4d87036963a482723bbd996b345 Mon Sep 17 00:00:00 2001 From: Alex McKay Date: Thu, 3 Apr 2025 14:06:02 -0400 Subject: [PATCH 2/3] re-add accidentally deleted space Signed-off-by: Alex McKay --- plugins/catalog/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/catalog/src/index.ts b/plugins/catalog/src/index.ts index 6555b4a2a0..f3cc7d3d0b 100644 --- a/plugins/catalog/src/index.ts +++ b/plugins/catalog/src/index.ts @@ -21,6 +21,7 @@ */ export * from './apis'; + export type { AboutCardProps, AboutContentProps, From 4e4cccd5ad84507f82fd7288a981cdbae94c0786 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 7 Apr 2025 11:06:38 +0200 Subject: [PATCH 3/3] Update .changeset/happy-spoons-sing.md Signed-off-by: Patrik Oldsberg --- .changeset/happy-spoons-sing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/happy-spoons-sing.md b/.changeset/happy-spoons-sing.md index 3ac0a48032..f6e5b720d7 100644 --- a/.changeset/happy-spoons-sing.md +++ b/.changeset/happy-spoons-sing.md @@ -3,7 +3,7 @@ '@backstage/plugin-catalog': minor --- -**BREAKING**: `CatalogFilterBlueprint`, used in the new frontend system, is now exported under plugin-catalog-react instead of plugin-catalog. +**BREAKING ALPHA**: `CatalogFilterBlueprint`, used in the new frontend system, is now exported under plugin-catalog-react instead of plugin-catalog. ```diff + import { CatalogFilterBlueprint } from '@backstage/plugin-catalog-react/alpha';