Merge pull request #29477 from alex-mckay/addCatalogFilterExtensionPoint

Move catalog filter blueprint to -react package

.changeset/happy-spoons-sing.md

@@ -0,0 +1,11 @@
+---
+'@backstage/plugin-catalog-react': minor
+'@backstage/plugin-catalog': minor
+---
+
+**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';
+- import { CatalogFilterBlueprint } from '@backstage/plugin-catalog/alpha';
+```

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<JSX.Element>;
+  };
+  output: ConfigurableExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>;
+  inputs: {};
+  config: {};
+  configInput: {};
+  dataRefs: never;
+}>;
+
 // @alpha (undocumented)
 export const catalogReactTranslationRef: TranslationRef<
   'catalog-react',

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 {

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<JSX.Element>;
-  };
-  output: ConfigurableExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>;
-  inputs: {};
-  config: {};
-  configInput: {};
-  dataRefs: never;
-}>;
-
 // @alpha (undocumented)
 export const catalogTranslationRef: TranslationRef<
   'catalog',

plugins/catalog/src/alpha/blueprints/index.ts

@@ -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';

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',

plugins/catalog/src/alpha/index.ts

@@ -16,5 +16,4 @@
 
 export { default } from './plugin';
 
-export * from './blueprints';
 export * from './translation';