@backstage/plugin-catalog 1.22.0 → 1.22.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @backstage/plugin-catalog
 
+## 1.22.1-next.0
+
+### Patch Changes
+
+- fec8b57: Updated exports to use the new type parameters for extensions and extension blueprints.
+- 5446061: The `/alpha` export no longer export extension creators for the new frontend system, existing usage should be switched to use the equivalent extension blueprint instead. For more information see the [new frontend system 1.30 migration documentation](https://backstage.io/docs/frontend-system/architecture/migrations#130).
+- 180a45f: Entity presentation api now only fetches fields that are required to display entity title
+- Updated dependencies
+  - @backstage/frontend-plugin-api@0.8.0-next.0
+  - @backstage/core-compat-api@0.2.9-next.0
+  - @backstage/plugin-catalog-react@1.12.4-next.0
+  - @backstage/plugin-search-react@1.8.0-next.0
+  - @backstage/catalog-client@1.6.6
+  - @backstage/catalog-model@1.6.0
+  - @backstage/core-components@0.14.10
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.26
+  - @backstage/plugin-permission-react@0.4.25
+  - @backstage/plugin-scaffolder-common@1.5.5
+  - @backstage/plugin-search-common@1.2.14
+
 ## 1.22.0
 
 ### Minor Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog__alpha",
-  "version": "1.22.0",
+  "version": "1.22.1-next.0",
   "main": "../dist/alpha.esm.js",
   "module": "../dist/alpha.esm.js",
   "types": "../dist/alpha.d.ts"

package/dist/alpha.d.ts

@@ -4,7 +4,6 @@ import * as _backstage_catalog_model from '@backstage/catalog-model';
 import * as React from 'react';
 import * as _backstage_core_plugin_api from '@backstage/core-plugin-api';
 import * as _backstage_frontend_plugin_api from '@backstage/frontend-plugin-api';
-import { AnyExtensionInputMap, PortableSchema } from '@backstage/frontend-plugin-api';
 import * as _backstage_core_plugin_api_alpha from '@backstage/core-plugin-api/alpha';
 
 /** @alpha */
@@ -28,332 +27,411 @@ declare const _default: _backstage_frontend_plugin_api.BackstagePlugin<{
     }>;
     unregisterRedirect: _backstage_frontend_plugin_api.ExternalRouteRef<undefined>;
 }, {
-    "nav-item:catalog": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<{
-        title: string;
-        icon: _backstage_core_plugin_api.IconComponent;
-        routeRef: _backstage_frontend_plugin_api.RouteRef<undefined>;
-    }, "core.nav-item.target", {}>, {}, {
+    "api:catalog": _backstage_frontend_plugin_api.ExtensionDefinition<{
+        kind: "api";
+        namespace: undefined;
+        name: undefined;
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.AnyApiFactory, "core.api.factory", {}>;
+        inputs: {};
+    }>;
+    "nav-item:catalog": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "nav-item";
         namespace: undefined;
         name: undefined;
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<{
+            title: string;
+            icon: _backstage_core_plugin_api.IconComponent;
+            routeRef: _backstage_frontend_plugin_api.RouteRef<undefined>;
+        }, "core.nav-item.target", {}>;
+        inputs: {};
     }>;
-    "api:catalog/starred-entities": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.AnyApiFactory, "core.api.factory", {}>, {}, {
+    "api:catalog/starred-entities": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "api";
         namespace: undefined;
         name: "starred-entities";
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.AnyApiFactory, "core.api.factory", {}>;
+        inputs: {};
     }>;
-    "api:catalog/entity-presentation": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.AnyApiFactory, "core.api.factory", {}>, {}, {
+    "api:catalog/entity-presentation": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "api";
         namespace: undefined;
         name: "entity-presentation";
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.AnyApiFactory, "core.api.factory", {}>;
+        inputs: {};
     }>;
     "entity-card:catalog/about": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "about";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/links": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "links";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/labels": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "labels";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/depends-on-components": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "depends-on-components";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/depends-on-resources": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "depends-on-resources";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/has-components": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "has-components";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/has-resources": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "has-resources";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/has-subcomponents": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "has-subcomponents";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/has-subdomains": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "has-subdomains";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-card:catalog/has-systems": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        filter: string | undefined;
-    }, {
-        filter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {}, {
         kind: "entity-card";
         namespace: undefined;
         name: "has-systems";
+        config: {
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+            optional: true;
+        }>;
+        inputs: {};
     }>;
     "entity-content:catalog/overview": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        [x: string]: any;
-    } & {
-        path: string | undefined;
-        title: string | undefined;
-        filter: string | undefined;
-    }, {
-        [x: string]: any;
-    } & {
-        filter?: string | undefined;
-        title?: string | undefined;
-        path?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-content-title", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-        optional: true;
-    }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
-        optional: true;
-    }>, {
-        cards: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+        config: {
+            path: string | undefined;
+            title: string | undefined;
+            filter: string | undefined;
+        };
+        configInput: {
+            filter?: string | undefined;
+            title?: string | undefined;
+            path?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
+            optional: true;
+        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-content-title", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
             optional: true;
         }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
             optional: true;
-        }>, {
-            singleton: false;
-            optional: false;
         }>;
-    }, {
+        inputs: {
+            cards: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+                optional: true;
+            }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+                optional: true;
+            }>, {
+                singleton: false;
+                optional: false;
+            }>;
+        };
         kind: "entity-content";
         namespace: undefined;
         name: "overview";
     }>;
-    "catalog-filter:catalog/tag": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {}, {
+    "catalog-filter:catalog/tag": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "catalog-filter";
         namespace: undefined;
         name: "tag";
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {};
     }>;
     "catalog-filter:catalog/kind": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        initialFilter: string;
-    }, {
-        initialFilter?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {
-        [x: string]: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.AnyExtensionDataRef, {
-            optional: boolean;
-            singleton: boolean;
-        }>;
-    }, {
+        config: {
+            initialFilter: string;
+        };
+        configInput: {
+            initialFilter?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {
+            [x: string]: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.AnyExtensionDataRef, {
+                optional: boolean;
+                singleton: boolean;
+            }>;
+        };
         kind: "catalog-filter";
         namespace: undefined;
         name: "kind";
     }>;
-    "catalog-filter:catalog/type": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {}, {
+    "catalog-filter:catalog/type": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "catalog-filter";
         namespace: undefined;
         name: "type";
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {};
     }>;
     "catalog-filter:catalog/mode": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        mode: "all" | "owners-only" | undefined;
-    }, {
-        mode?: "all" | "owners-only" | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {
-        [x: string]: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.AnyExtensionDataRef, {
-            optional: boolean;
-            singleton: boolean;
-        }>;
-    }, {
+        config: {
+            mode: "all" | "owners-only" | undefined;
+        };
+        configInput: {
+            mode?: "all" | "owners-only" | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {
+            [x: string]: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.AnyExtensionDataRef, {
+                optional: boolean;
+                singleton: boolean;
+            }>;
+        };
         kind: "catalog-filter";
         namespace: undefined;
         name: "mode";
     }>;
-    "catalog-filter:catalog/namespace": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {}, {
+    "catalog-filter:catalog/namespace": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "catalog-filter";
         namespace: undefined;
         name: "namespace";
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {};
     }>;
-    "catalog-filter:catalog/lifecycle": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {}, {
+    "catalog-filter:catalog/lifecycle": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "catalog-filter";
         namespace: undefined;
         name: "lifecycle";
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {};
     }>;
-    "catalog-filter:catalog/processing-status": _backstage_frontend_plugin_api.ExtensionDefinition<{}, {}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {}, {
+    "catalog-filter:catalog/processing-status": _backstage_frontend_plugin_api.ExtensionDefinition<{
         kind: "catalog-filter";
         namespace: undefined;
         name: "processing-status";
+        config: {};
+        configInput: {};
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {};
     }>;
     "catalog-filter:catalog/list": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        initialFilter: "all" | "owned" | "starred";
-    }, {
-        initialFilter?: "all" | "owned" | "starred" | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {
-        [x: string]: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.AnyExtensionDataRef, {
-            optional: boolean;
-            singleton: boolean;
-        }>;
-    }, {
+        config: {
+            initialFilter: "all" | "owned" | "starred";
+        };
+        configInput: {
+            initialFilter?: "all" | "owned" | "starred" | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+        inputs: {
+            [x: string]: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.AnyExtensionDataRef, {
+                optional: boolean;
+                singleton: boolean;
+            }>;
+        };
         kind: "catalog-filter";
         namespace: undefined;
         name: "list";
     }>;
     "page:catalog": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        [x: string]: any;
-    } & {
-        path: string | undefined;
-    }, {
-        [x: string]: any;
-    } & {
-        path?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
-        optional: true;
-    }>, {
-        filters: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {
-            singleton: false;
-            optional: false;
+        config: {
+            path: string | undefined;
+        };
+        configInput: {
+            path?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
+            optional: true;
         }>;
-    }, {
+        inputs: {
+            filters: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {
+                singleton: false;
+                optional: false;
+            }>;
+        };
         kind: "page";
         namespace: undefined;
         name: undefined;
     }>;
     "page:catalog/entity": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        [x: string]: any;
-    } & {
-        path: string | undefined;
-    }, {
-        [x: string]: any;
-    } & {
-        path?: string | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
-        optional: true;
-    }>, {
-        contents: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
-            optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-content-title", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
-            optional: true;
-        }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+        config: {
+            path: string | undefined;
+        };
+        configInput: {
+            path?: string | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
             optional: true;
-        }>, {
-            singleton: false;
-            optional: false;
         }>;
-    }, {
+        inputs: {
+            contents: _backstage_frontend_plugin_api.ExtensionInput<_backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "core.routing.path", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<_backstage_frontend_plugin_api.RouteRef<_backstage_frontend_plugin_api.AnyRouteRefParams>, "core.routing.ref", {
+                optional: true;
+            }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-content-title", {}> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<(entity: _backstage_catalog_model.Entity) => boolean, "catalog.entity-filter-function", {
+                optional: true;
+            }> | _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<string, "catalog.entity-filter-expression", {
+                optional: true;
+            }>, {
+                singleton: false;
+                optional: false;
+            }>;
+        };
         kind: "page";
         namespace: undefined;
         name: "entity";
     }>;
     "search-result-list-item:catalog": _backstage_frontend_plugin_api.ExtensionDefinition<{
-        noTrack: boolean;
-    }, {
-        noTrack?: boolean | undefined;
-    }, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<{
-        predicate?: _backstage_plugin_search_react_alpha.SearchResultItemExtensionPredicate | undefined;
-        component: _backstage_plugin_search_react_alpha.SearchResultItemExtensionComponent;
-    }, "search.search-result-list-item.item", {}>, {}, {
         kind: "search-result-list-item";
         namespace: undefined;
         name: undefined;
+        config: {
+            noTrack: boolean;
+        };
+        configInput: {
+            noTrack?: boolean | undefined;
+        };
+        output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<{
+            predicate?: _backstage_plugin_search_react_alpha.SearchResultItemExtensionPredicate | undefined;
+            component: _backstage_plugin_search_react_alpha.SearchResultItemExtensionComponent;
+        }, "search.search-result-list-item.item", {}>;
+        inputs: {};
     }>;
 }>;
 
-/**
- * @alpha
- * @deprecated Use {@link CatalogFilterBlueprint} instead
- */
-declare function createCatalogFilterExtension<TInputs extends AnyExtensionInputMap, TConfig>(options: {
-    namespace?: string;
-    name?: string;
-    inputs?: TInputs;
-    configSchema?: PortableSchema<TConfig>;
-    loader: (options: {
-        config: TConfig;
-    }) => Promise<JSX.Element>;
-}): _backstage_frontend_plugin_api.ExtensionDefinition<TConfig, TConfig, never, never, {
-    kind?: string | undefined;
-    namespace?: string | undefined;
-    name?: string | undefined;
-}>;
-
 /**
  * Creates Catalog Filter Extensions
  * @alpha
@@ -362,9 +440,15 @@ declare const CatalogFilterBlueprint: _backstage_frontend_plugin_api.ExtensionBl
     kind: "catalog-filter";
     namespace: undefined;
     name: undefined;
-}, {
-    loader: () => Promise<JSX.Element>;
-}, _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>, {}, {}, {}, never>;
+    params: {
+        loader: () => Promise<JSX.Element>;
+    };
+    output: _backstage_frontend_plugin_api.ConfigurableExtensionDataRef<React.JSX.Element, "core.reactElement", {}>;
+    inputs: {};
+    config: {};
+    configInput: {};
+    dataRefs: never;
+}>;
 
 /** @alpha */
 declare const catalogTranslationRef: _backstage_core_plugin_api_alpha.TranslationRef<"catalog", {
@@ -448,4 +532,4 @@ declare const catalogTranslationRef: _backstage_core_plugin_api_alpha.Translatio
     readonly "systemDiagramCard.edgeLabels.provides": "provides";
 }>;
 
-export { CatalogFilterBlueprint, catalogTranslationRef, createCatalogFilterExtension, _default as default };
+export { CatalogFilterBlueprint, catalogTranslationRef, _default as default };

package/dist/alpha.esm.js

@@ -1,5 +1,4 @@
 export { default } from './alpha/plugin.esm.js';
-export { createCatalogFilterExtension } from './alpha/createCatalogFilterExtension.esm.js';
 export { CatalogFilterBlueprint } from './alpha/blueprints/CatalogFilterBlueprint.esm.js';
 export { catalogTranslationRef } from './alpha/translation.esm.js';
 //# sourceMappingURL=alpha.esm.js.map

package/dist/alpha.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"alpha.esm.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;"}
+{"version":3,"file":"alpha.esm.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;"}

package/dist/apis/EntityPresentationApi/DefaultEntityPresentationApi.esm.js

@@ -155,7 +155,16 @@ class DefaultEntityPresentationApi {
     return new DataLoader(
       async (entityRefs) => {
         const { items } = await options.catalogApi.getEntitiesByRefs({
-          entityRefs
+          entityRefs,
+          fields: [
+            "kind",
+            "metadata.name",
+            "metadata.namespace",
+            "metadata.title",
+            "metadata.description",
+            "spec.profile.displayName",
+            "spec.type"
+          ]
         });
         const now = Date.now();
         entityRefs.forEach((entityRef, index) => {

package/dist/apis/EntityPresentationApi/DefaultEntityPresentationApi.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"DefaultEntityPresentationApi.esm.js","sources":["../../../src/apis/EntityPresentationApi/DefaultEntityPresentationApi.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  Entity,\n  parseEntityRef,\n  stringifyEntityRef,\n} from '@backstage/catalog-model';\nimport { IconComponent } from '@backstage/core-plugin-api';\nimport {\n  CatalogApi,\n  EntityPresentationApi,\n  EntityRefPresentation,\n  EntityRefPresentationSnapshot,\n} from '@backstage/plugin-catalog-react';\nimport { HumanDuration, durationToMilliseconds } from '@backstage/types';\nimport DataLoader from 'dataloader';\nimport ExpiryMap from 'expiry-map';\nimport ObservableImpl from 'zen-observable';\nimport {\n  DEFAULT_BATCH_DELAY,\n  DEFAULT_CACHE_TTL,\n  DEFAULT_ICONS,\n  createDefaultRenderer,\n} from './defaults';\n\n/**\n * A custom renderer for the {@link DefaultEntityPresentationApi}.\n *\n * @public\n */\nexport interface DefaultEntityPresentationApiRenderer {\n  /**\n   * Whether to request the entity from the catalog API asynchronously.\n   *\n   * @remarks\n   *\n   * If this is set to true, entity data will be streamed in from the catalog\n   * whenever needed, and the render function may be called more than once:\n   * first when no entity data existed (or with old cached data), and then again\n   * at a later point when data is loaded from the catalog that proved to be\n   * different from the old one.\n   *\n   * @defaultValue true\n   */\n  async?: boolean;\n\n  /**\n   * The actual render function.\n   *\n   * @remarks\n   *\n   * This function may be called multiple times.\n   *\n   * The loading flag signals that the framework MAY be trying to load more\n   * entity data from the catalog and call the render function again, if it\n   * succeeds. In some cases you may want to render a loading state in that\n   * case.\n   *\n   * The entity may or may not be given. If the caller of the presentation API\n   * did present an entity upfront, then that's what will be passed in here.\n   * Otherwise, it may be a server-side entity that either comes from a local\n   * cache or directly from the server.\n   *\n   * In either case, the renderer should return a presentation that is the most\n   * useful possible for the end user, given the data that is available.\n   */\n  render: (options: {\n    entityRef: string;\n    loading: boolean;\n    entity: Entity | undefined;\n    context: {\n      defaultKind?: string;\n      defaultNamespace?: string;\n    };\n  }) => {\n    snapshot: Omit<EntityRefPresentationSnapshot, 'entityRef'>;\n  };\n}\n\n/**\n * Options for the {@link DefaultEntityPresentationApi}.\n *\n * @public\n */\nexport interface DefaultEntityPresentationApiOptions {\n  /**\n   * The catalog API to use. If you want to use any asynchronous features, you\n   * must supply one.\n   */\n  catalogApi?: CatalogApi;\n\n  /**\n   * When to expire entities that have been loaded from the catalog API and\n   * cached for a while.\n   *\n   * @defaultValue 10 seconds\n   * @remarks\n   *\n   * The higher this value, the lower the load on the catalog API, but also the\n   * higher the risk of users seeing stale data.\n   */\n  cacheTtl?: HumanDuration;\n\n  /**\n   * For how long to wait before sending a batch of entity references to the\n   * catalog API.\n   *\n   * @defaultValue 50 milliseconds\n   * @remarks\n   *\n   * The higher this value, the greater the chance of batching up requests from\n   * across a page, but also the longer the lag time before displaying accurate\n   * information.\n   */\n  batchDelay?: HumanDuration;\n\n  /**\n   * A mapping from kinds to icons.\n   *\n   * @remarks\n   *\n   * The keys are kinds (case insensitive) that map to icon values to represent\n   * kinds by. These are merged with the default set of icons.\n   */\n  kindIcons?: Record<string, IconComponent>;\n\n  /**\n   * A custom renderer, if any.\n   */\n  renderer?: DefaultEntityPresentationApiRenderer;\n}\n\ninterface CacheEntry {\n  updatedAt: number;\n  entity: Entity | undefined;\n}\n\n/**\n * Default implementation of the {@link @backstage/plugin-catalog-react#EntityPresentationApi}.\n *\n * @public\n */\nexport class DefaultEntityPresentationApi implements EntityPresentationApi {\n  /**\n   * Creates a new presentation API that does not reach out to the catalog.\n   */\n  static createLocal(): EntityPresentationApi {\n    return new DefaultEntityPresentationApi({\n      renderer: createDefaultRenderer({ async: false }),\n    });\n  }\n\n  /**\n   * Creates a new presentation API that calls out to the catalog as needed to\n   * get additional information about entities.\n   */\n  static create(\n    options: DefaultEntityPresentationApiOptions,\n  ): EntityPresentationApi {\n    return new DefaultEntityPresentationApi(options);\n  }\n\n  // This cache holds on to all entity data ever loaded, no matter how old. Each\n  // entry is tagged with a timestamp of when it was inserted. We use this map\n  // to be able to always render SOME data even though the information is old.\n  // Entities change very rarely, so it's likely that the rendered information\n  // was perfectly fine in the first place.\n  readonly #cache: Map<string, CacheEntry>;\n  readonly #cacheTtlMs: number;\n  readonly #loader: DataLoader<string, Entity | undefined> | undefined;\n  readonly #kindIcons: Record<string, IconComponent>; // lowercased kinds\n  readonly #renderer: DefaultEntityPresentationApiRenderer;\n\n  private constructor(options: DefaultEntityPresentationApiOptions) {\n    const cacheTtl = options.cacheTtl ?? DEFAULT_CACHE_TTL;\n    const batchDelay = options.batchDelay ?? DEFAULT_BATCH_DELAY;\n    const renderer = options.renderer ?? createDefaultRenderer({ async: true });\n\n    const kindIcons: Record<string, IconComponent> = {};\n    Object.entries(DEFAULT_ICONS).forEach(([kind, icon]) => {\n      kindIcons[kind.toLocaleLowerCase('en-US')] = icon;\n    });\n    Object.entries(options.kindIcons ?? {}).forEach(([kind, icon]) => {\n      kindIcons[kind.toLocaleLowerCase('en-US')] = icon;\n    });\n\n    if (renderer.async) {\n      if (!options.catalogApi) {\n        throw new TypeError(`Asynchronous rendering requires a catalog API`);\n      }\n      this.#loader = this.#createLoader({\n        cacheTtl,\n        batchDelay,\n        renderer,\n        catalogApi: options.catalogApi,\n      });\n    }\n\n    this.#cacheTtlMs = durationToMilliseconds(cacheTtl);\n    this.#cache = new Map();\n    this.#kindIcons = kindIcons;\n    this.#renderer = renderer;\n  }\n\n  /** {@inheritdoc @backstage/plugin-catalog-react#EntityPresentationApi.forEntity} */\n  forEntity(\n    entityOrRef: Entity | string,\n    context?: {\n      defaultKind?: string;\n      defaultNamespace?: string;\n    },\n  ): EntityRefPresentation {\n    const { entityRef, kind, entity, needsLoad } =\n      this.#getEntityForInitialRender(entityOrRef);\n\n    // Make a wrapping helper for rendering\n    const render = (options: {\n      loading: boolean;\n      entity?: Entity;\n    }): EntityRefPresentationSnapshot => {\n      const { snapshot } = this.#renderer.render({\n        entityRef: entityRef,\n        loading: options.loading,\n        entity: options.entity,\n        context: context || {},\n      });\n      return {\n        ...snapshot,\n        entityRef: entityRef,\n        Icon: this.#maybeFallbackIcon(snapshot.Icon, kind),\n      };\n    };\n\n    // First the initial render\n    let initialSnapshot: EntityRefPresentationSnapshot;\n    try {\n      initialSnapshot = render({\n        loading: needsLoad,\n        entity: entity,\n      });\n    } catch {\n      // This is what gets presented if the renderer throws an error\n      initialSnapshot = {\n        primaryTitle: entityRef,\n        entityRef: entityRef,\n      };\n    }\n\n    if (!needsLoad) {\n      return {\n        snapshot: initialSnapshot,\n        promise: Promise.resolve(initialSnapshot),\n      };\n    }\n\n    // Load the entity and render it\n    const maybeUpdatedSnapshot = Promise.resolve()\n      .then(() => {\n        return this.#loader?.load(entityRef);\n      })\n      .then(newEntity => {\n        // We re-render no matter if we get back a new entity or the old\n        // one or nothing, because of the now false loading state - in\n        // case the renderer outputs different data depending on that\n        return render({\n          loading: false,\n          entity: newEntity ?? entity,\n        });\n      })\n      .catch(() => {\n        // Intentionally ignored - we do not propagate errors to the\n        // caller here. The presentation API should be error free and\n        // always return SOMETHING that makes sense to render, and we have\n        // already ensured above that the initial snapshot was that.\n        return undefined;\n      });\n\n    const observable = new ObservableImpl<EntityRefPresentationSnapshot>(\n      subscriber => {\n        let aborted = false;\n\n        maybeUpdatedSnapshot\n          .then(updatedSnapshot => {\n            if (updatedSnapshot) {\n              subscriber.next(updatedSnapshot);\n            }\n          })\n          .finally(() => {\n            if (!aborted) {\n              subscriber.complete();\n            }\n          });\n\n        return () => {\n          aborted = true;\n        };\n      },\n    );\n\n    const promise = maybeUpdatedSnapshot.then(updatedSnapshot => {\n      return updatedSnapshot ?? initialSnapshot;\n    });\n\n    return {\n      snapshot: initialSnapshot,\n      update$: observable,\n      promise: promise,\n    };\n  }\n\n  #getEntityForInitialRender(entityOrRef: Entity | string): {\n    entity: Entity | undefined;\n    kind: string;\n    entityRef: string;\n    needsLoad: boolean;\n  } {\n    // If we were given an entity in the first place, we use it for a single\n    // pass of rendering and assume that it's up to date and not partial (i.e.\n    // we expect that it wasn't fetched in such a way that the required fields\n    // of the renderer were excluded)\n    if (typeof entityOrRef !== 'string') {\n      return {\n        entity: entityOrRef,\n        kind: entityOrRef.kind,\n        entityRef: stringifyEntityRef(entityOrRef),\n        needsLoad: false,\n      };\n    }\n\n    const cached = this.#cache.get(entityOrRef);\n    const cachedEntity: Entity | undefined = cached?.entity;\n    const cacheNeedsUpdate =\n      !cached || Date.now() - cached.updatedAt > this.#cacheTtlMs;\n    const needsLoad =\n      cacheNeedsUpdate &&\n      this.#renderer.async !== false &&\n      this.#loader !== undefined;\n\n    return {\n      entity: cachedEntity,\n      kind: parseEntityRef(entityOrRef).kind,\n      entityRef: entityOrRef,\n      needsLoad,\n    };\n  }\n\n  #createLoader(options: {\n    catalogApi: CatalogApi;\n    cacheTtl: HumanDuration;\n    batchDelay: HumanDuration;\n    renderer: DefaultEntityPresentationApiRenderer;\n  }): DataLoader<string, Entity | undefined> {\n    const cacheTtlMs = durationToMilliseconds(options.cacheTtl);\n    const batchDelayMs = durationToMilliseconds(options.batchDelay);\n\n    return new DataLoader(\n      async (entityRefs: readonly string[]) => {\n        const { items } = await options.catalogApi!.getEntitiesByRefs({\n          entityRefs: entityRefs as string[],\n        });\n\n        const now = Date.now();\n        entityRefs.forEach((entityRef, index) => {\n          this.#cache.set(entityRef, {\n            updatedAt: now,\n            entity: items[index],\n          });\n        });\n\n        return items;\n      },\n      {\n        name: 'DefaultEntityPresentationApi',\n        // This cache is the one that the data loader uses internally for\n        // memoizing requests; essentially what it achieves is that multiple\n        // requests for the same entity ref will be batched up into a single\n        // request and then the resulting promises are held on to. We put an\n        // expiring map here, which makes it so that it re-fetches data with the\n        // expiry cadence of that map. Otherwise it would only fetch a given ref\n        // once and then never try again. This cache does therefore not fulfill\n        // the same purpose as the one that is in the root of the class.\n        cacheMap: new ExpiryMap(cacheTtlMs),\n        maxBatchSize: 100,\n        batchScheduleFn: batchDelayMs\n          ? cb => setTimeout(cb, batchDelayMs)\n          : undefined,\n      },\n    );\n  }\n\n  #maybeFallbackIcon(\n    renderedIcon: IconComponent | false | undefined,\n    kind: string,\n  ): IconComponent | false | undefined {\n    if (renderedIcon) {\n      return renderedIcon;\n    } else if (renderedIcon === false) {\n      return false;\n    }\n\n    return this.#kindIcons[kind.toLocaleLowerCase('en-US')];\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"DefaultEntityPresentationApi.esm.js","sources":["../../../src/apis/EntityPresentationApi/DefaultEntityPresentationApi.ts"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  Entity,\n  parseEntityRef,\n  stringifyEntityRef,\n} from '@backstage/catalog-model';\nimport { IconComponent } from '@backstage/core-plugin-api';\nimport {\n  CatalogApi,\n  EntityPresentationApi,\n  EntityRefPresentation,\n  EntityRefPresentationSnapshot,\n} from '@backstage/plugin-catalog-react';\nimport { durationToMilliseconds, HumanDuration } from '@backstage/types';\nimport DataLoader from 'dataloader';\nimport ExpiryMap from 'expiry-map';\nimport ObservableImpl from 'zen-observable';\nimport {\n  createDefaultRenderer,\n  DEFAULT_BATCH_DELAY,\n  DEFAULT_CACHE_TTL,\n  DEFAULT_ICONS,\n} from './defaults';\n\n/**\n * A custom renderer for the {@link DefaultEntityPresentationApi}.\n *\n * @public\n */\nexport interface DefaultEntityPresentationApiRenderer {\n  /**\n   * Whether to request the entity from the catalog API asynchronously.\n   *\n   * @remarks\n   *\n   * If this is set to true, entity data will be streamed in from the catalog\n   * whenever needed, and the render function may be called more than once:\n   * first when no entity data existed (or with old cached data), and then again\n   * at a later point when data is loaded from the catalog that proved to be\n   * different from the old one.\n   *\n   * @defaultValue true\n   */\n  async?: boolean;\n\n  /**\n   * The actual render function.\n   *\n   * @remarks\n   *\n   * This function may be called multiple times.\n   *\n   * The loading flag signals that the framework MAY be trying to load more\n   * entity data from the catalog and call the render function again, if it\n   * succeeds. In some cases you may want to render a loading state in that\n   * case.\n   *\n   * The entity may or may not be given. If the caller of the presentation API\n   * did present an entity upfront, then that's what will be passed in here.\n   * Otherwise, it may be a server-side entity that either comes from a local\n   * cache or directly from the server.\n   *\n   * In either case, the renderer should return a presentation that is the most\n   * useful possible for the end user, given the data that is available.\n   */\n  render: (options: {\n    entityRef: string;\n    loading: boolean;\n    entity: Entity | undefined;\n    context: {\n      defaultKind?: string;\n      defaultNamespace?: string;\n    };\n  }) => {\n    snapshot: Omit<EntityRefPresentationSnapshot, 'entityRef'>;\n  };\n}\n\n/**\n * Options for the {@link DefaultEntityPresentationApi}.\n *\n * @public\n */\nexport interface DefaultEntityPresentationApiOptions {\n  /**\n   * The catalog API to use. If you want to use any asynchronous features, you\n   * must supply one.\n   */\n  catalogApi?: CatalogApi;\n\n  /**\n   * When to expire entities that have been loaded from the catalog API and\n   * cached for a while.\n   *\n   * @defaultValue 10 seconds\n   * @remarks\n   *\n   * The higher this value, the lower the load on the catalog API, but also the\n   * higher the risk of users seeing stale data.\n   */\n  cacheTtl?: HumanDuration;\n\n  /**\n   * For how long to wait before sending a batch of entity references to the\n   * catalog API.\n   *\n   * @defaultValue 50 milliseconds\n   * @remarks\n   *\n   * The higher this value, the greater the chance of batching up requests from\n   * across a page, but also the longer the lag time before displaying accurate\n   * information.\n   */\n  batchDelay?: HumanDuration;\n\n  /**\n   * A mapping from kinds to icons.\n   *\n   * @remarks\n   *\n   * The keys are kinds (case insensitive) that map to icon values to represent\n   * kinds by. These are merged with the default set of icons.\n   */\n  kindIcons?: Record<string, IconComponent>;\n\n  /**\n   * A custom renderer, if any.\n   */\n  renderer?: DefaultEntityPresentationApiRenderer;\n}\n\ninterface CacheEntry {\n  updatedAt: number;\n  entity: Entity | undefined;\n}\n\n/**\n * Default implementation of the {@link @backstage/plugin-catalog-react#EntityPresentationApi}.\n *\n * @public\n */\nexport class DefaultEntityPresentationApi implements EntityPresentationApi {\n  /**\n   * Creates a new presentation API that does not reach out to the catalog.\n   */\n  static createLocal(): EntityPresentationApi {\n    return new DefaultEntityPresentationApi({\n      renderer: createDefaultRenderer({ async: false }),\n    });\n  }\n\n  /**\n   * Creates a new presentation API that calls out to the catalog as needed to\n   * get additional information about entities.\n   */\n  static create(\n    options: DefaultEntityPresentationApiOptions,\n  ): EntityPresentationApi {\n    return new DefaultEntityPresentationApi(options);\n  }\n\n  // This cache holds on to all entity data ever loaded, no matter how old. Each\n  // entry is tagged with a timestamp of when it was inserted. We use this map\n  // to be able to always render SOME data even though the information is old.\n  // Entities change very rarely, so it's likely that the rendered information\n  // was perfectly fine in the first place.\n  readonly #cache: Map<string, CacheEntry>;\n  readonly #cacheTtlMs: number;\n  readonly #loader: DataLoader<string, Entity | undefined> | undefined;\n  readonly #kindIcons: Record<string, IconComponent>; // lowercased kinds\n  readonly #renderer: DefaultEntityPresentationApiRenderer;\n\n  private constructor(options: DefaultEntityPresentationApiOptions) {\n    const cacheTtl = options.cacheTtl ?? DEFAULT_CACHE_TTL;\n    const batchDelay = options.batchDelay ?? DEFAULT_BATCH_DELAY;\n    const renderer = options.renderer ?? createDefaultRenderer({ async: true });\n\n    const kindIcons: Record<string, IconComponent> = {};\n    Object.entries(DEFAULT_ICONS).forEach(([kind, icon]) => {\n      kindIcons[kind.toLocaleLowerCase('en-US')] = icon;\n    });\n    Object.entries(options.kindIcons ?? {}).forEach(([kind, icon]) => {\n      kindIcons[kind.toLocaleLowerCase('en-US')] = icon;\n    });\n\n    if (renderer.async) {\n      if (!options.catalogApi) {\n        throw new TypeError(`Asynchronous rendering requires a catalog API`);\n      }\n      this.#loader = this.#createLoader({\n        cacheTtl,\n        batchDelay,\n        renderer,\n        catalogApi: options.catalogApi,\n      });\n    }\n\n    this.#cacheTtlMs = durationToMilliseconds(cacheTtl);\n    this.#cache = new Map();\n    this.#kindIcons = kindIcons;\n    this.#renderer = renderer;\n  }\n\n  /** {@inheritdoc @backstage/plugin-catalog-react#EntityPresentationApi.forEntity} */\n  forEntity(\n    entityOrRef: Entity | string,\n    context?: {\n      defaultKind?: string;\n      defaultNamespace?: string;\n    },\n  ): EntityRefPresentation {\n    const { entityRef, kind, entity, needsLoad } =\n      this.#getEntityForInitialRender(entityOrRef);\n\n    // Make a wrapping helper for rendering\n    const render = (options: {\n      loading: boolean;\n      entity?: Entity;\n    }): EntityRefPresentationSnapshot => {\n      const { snapshot } = this.#renderer.render({\n        entityRef: entityRef,\n        loading: options.loading,\n        entity: options.entity,\n        context: context || {},\n      });\n      return {\n        ...snapshot,\n        entityRef: entityRef,\n        Icon: this.#maybeFallbackIcon(snapshot.Icon, kind),\n      };\n    };\n\n    // First the initial render\n    let initialSnapshot: EntityRefPresentationSnapshot;\n    try {\n      initialSnapshot = render({\n        loading: needsLoad,\n        entity: entity,\n      });\n    } catch {\n      // This is what gets presented if the renderer throws an error\n      initialSnapshot = {\n        primaryTitle: entityRef,\n        entityRef: entityRef,\n      };\n    }\n\n    if (!needsLoad) {\n      return {\n        snapshot: initialSnapshot,\n        promise: Promise.resolve(initialSnapshot),\n      };\n    }\n\n    // Load the entity and render it\n    const maybeUpdatedSnapshot = Promise.resolve()\n      .then(() => {\n        return this.#loader?.load(entityRef);\n      })\n      .then(newEntity => {\n        // We re-render no matter if we get back a new entity or the old\n        // one or nothing, because of the now false loading state - in\n        // case the renderer outputs different data depending on that\n        return render({\n          loading: false,\n          entity: newEntity ?? entity,\n        });\n      })\n      .catch(() => {\n        // Intentionally ignored - we do not propagate errors to the\n        // caller here. The presentation API should be error free and\n        // always return SOMETHING that makes sense to render, and we have\n        // already ensured above that the initial snapshot was that.\n        return undefined;\n      });\n\n    const observable = new ObservableImpl<EntityRefPresentationSnapshot>(\n      subscriber => {\n        let aborted = false;\n\n        maybeUpdatedSnapshot\n          .then(updatedSnapshot => {\n            if (updatedSnapshot) {\n              subscriber.next(updatedSnapshot);\n            }\n          })\n          .finally(() => {\n            if (!aborted) {\n              subscriber.complete();\n            }\n          });\n\n        return () => {\n          aborted = true;\n        };\n      },\n    );\n\n    const promise = maybeUpdatedSnapshot.then(updatedSnapshot => {\n      return updatedSnapshot ?? initialSnapshot;\n    });\n\n    return {\n      snapshot: initialSnapshot,\n      update$: observable,\n      promise: promise,\n    };\n  }\n\n  #getEntityForInitialRender(entityOrRef: Entity | string): {\n    entity: Entity | undefined;\n    kind: string;\n    entityRef: string;\n    needsLoad: boolean;\n  } {\n    // If we were given an entity in the first place, we use it for a single\n    // pass of rendering and assume that it's up to date and not partial (i.e.\n    // we expect that it wasn't fetched in such a way that the required fields\n    // of the renderer were excluded)\n    if (typeof entityOrRef !== 'string') {\n      return {\n        entity: entityOrRef,\n        kind: entityOrRef.kind,\n        entityRef: stringifyEntityRef(entityOrRef),\n        needsLoad: false,\n      };\n    }\n\n    const cached = this.#cache.get(entityOrRef);\n    const cachedEntity: Entity | undefined = cached?.entity;\n    const cacheNeedsUpdate =\n      !cached || Date.now() - cached.updatedAt > this.#cacheTtlMs;\n    const needsLoad =\n      cacheNeedsUpdate &&\n      this.#renderer.async !== false &&\n      this.#loader !== undefined;\n\n    return {\n      entity: cachedEntity,\n      kind: parseEntityRef(entityOrRef).kind,\n      entityRef: entityOrRef,\n      needsLoad,\n    };\n  }\n\n  #createLoader(options: {\n    catalogApi: CatalogApi;\n    cacheTtl: HumanDuration;\n    batchDelay: HumanDuration;\n    renderer: DefaultEntityPresentationApiRenderer;\n  }): DataLoader<string, Entity | undefined> {\n    const cacheTtlMs = durationToMilliseconds(options.cacheTtl);\n    const batchDelayMs = durationToMilliseconds(options.batchDelay);\n\n    return new DataLoader(\n      async (entityRefs: readonly string[]) => {\n        const { items } = await options.catalogApi!.getEntitiesByRefs({\n          entityRefs: entityRefs as string[],\n          fields: [\n            'kind',\n            'metadata.name',\n            'metadata.namespace',\n            'metadata.title',\n            'metadata.description',\n            'spec.profile.displayName',\n            'spec.type',\n          ],\n        });\n\n        const now = Date.now();\n        entityRefs.forEach((entityRef, index) => {\n          this.#cache.set(entityRef, {\n            updatedAt: now,\n            entity: items[index],\n          });\n        });\n\n        return items;\n      },\n      {\n        name: 'DefaultEntityPresentationApi',\n        // This cache is the one that the data loader uses internally for\n        // memoizing requests; essentially what it achieves is that multiple\n        // requests for the same entity ref will be batched up into a single\n        // request and then the resulting promises are held on to. We put an\n        // expiring map here, which makes it so that it re-fetches data with the\n        // expiry cadence of that map. Otherwise it would only fetch a given ref\n        // once and then never try again. This cache does therefore not fulfill\n        // the same purpose as the one that is in the root of the class.\n        cacheMap: new ExpiryMap(cacheTtlMs),\n        maxBatchSize: 100,\n        batchScheduleFn: batchDelayMs\n          ? cb => setTimeout(cb, batchDelayMs)\n          : undefined,\n      },\n    );\n  }\n\n  #maybeFallbackIcon(\n    renderedIcon: IconComponent | false | undefined,\n    kind: string,\n  ): IconComponent | false | undefined {\n    if (renderedIcon) {\n      return renderedIcon;\n    } else if (renderedIcon === false) {\n      return false;\n    }\n\n    return this.#kindIcons[kind.toLocaleLowerCase('en-US')];\n  }\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "1.22.0",
+  "version": "1.22.1-next.0",
   "description": "The Backstage plugin for browsing the Backstage catalog",
   "backstage": {
     "role": "frontend-plugin",
@@ -59,18 +59,18 @@
   "dependencies": {
     "@backstage/catalog-client": "^1.6.6",
     "@backstage/catalog-model": "^1.6.0",
-    "@backstage/core-compat-api": "^0.2.8",
+    "@backstage/core-compat-api": "^0.2.9-next.0",
     "@backstage/core-components": "^0.14.10",
     "@backstage/core-plugin-api": "^1.9.3",
     "@backstage/errors": "^1.2.4",
-    "@backstage/frontend-plugin-api": "^0.7.0",
+    "@backstage/frontend-plugin-api": "^0.8.0-next.0",
     "@backstage/integration-react": "^1.1.30",
     "@backstage/plugin-catalog-common": "^1.0.26",
-    "@backstage/plugin-catalog-react": "^1.12.3",
+    "@backstage/plugin-catalog-react": "^1.12.4-next.0",
     "@backstage/plugin-permission-react": "^0.4.25",
     "@backstage/plugin-scaffolder-common": "^1.5.5",
     "@backstage/plugin-search-common": "^1.2.14",
-    "@backstage/plugin-search-react": "^1.7.14",
+    "@backstage/plugin-search-react": "^1.8.0-next.0",
     "@backstage/types": "^1.1.1",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -86,12 +86,12 @@
     "zen-observable": "^0.10.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0",
+    "@backstage/cli": "^0.27.1-next.0",
     "@backstage/core-app-api": "^1.14.2",
-    "@backstage/dev-utils": "^1.0.37",
-    "@backstage/frontend-test-utils": "^0.1.12",
+    "@backstage/dev-utils": "^1.0.38-next.0",
+    "@backstage/frontend-test-utils": "^0.2.0-next.0",
     "@backstage/plugin-permission-common": "^0.8.1",
-    "@backstage/test-utils": "^1.5.10",
+    "@backstage/test-utils": "^1.6.0-next.0",
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^15.0.0",

package/dist/alpha/createCatalogFilterExtension.esm.js

@@ -1,27 +0,0 @@
-import React, { lazy } from 'react';
-import { createExtension, coreExtensionData, ExtensionBoundary } from '@backstage/frontend-plugin-api';
-
-function createCatalogFilterExtension(options) {
-  return createExtension({
-    kind: "catalog-filter",
-    namespace: options.namespace,
-    name: options.name,
-    attachTo: { id: "page:catalog", input: "filters" },
-    inputs: options.inputs ?? {},
-    configSchema: options.configSchema,
-    output: {
-      element: coreExtensionData.reactElement
-    },
-    factory({ config, node }) {
-      const ExtensionComponent = lazy(
-        () => options.loader({ config }).then((element) => ({ default: () => element }))
-      );
-      return {
-        element: /* @__PURE__ */ React.createElement(ExtensionBoundary, { node }, /* @__PURE__ */ React.createElement(ExtensionComponent, null))
-      };
-    }
-  });
-}
-
-export { createCatalogFilterExtension };
-//# sourceMappingURL=createCatalogFilterExtension.esm.js.map

package/dist/alpha/createCatalogFilterExtension.esm.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createCatalogFilterExtension.esm.js","sources":["../../src/alpha/createCatalogFilterExtension.tsx"],"sourcesContent":["/*\n * Copyright 2023 The Backstage Authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport React, { lazy } from 'react';\nimport {\n  AnyExtensionInputMap,\n  ExtensionBoundary,\n  PortableSchema,\n  coreExtensionData,\n  createExtension,\n} from '@backstage/frontend-plugin-api';\n\n/**\n * @alpha\n * @deprecated Use {@link CatalogFilterBlueprint} instead\n */\nexport function createCatalogFilterExtension<\n  TInputs extends AnyExtensionInputMap,\n  TConfig,\n>(options: {\n  namespace?: string;\n  name?: string;\n  inputs?: TInputs;\n  configSchema?: PortableSchema<TConfig>;\n  loader: (options: { config: TConfig }) => Promise<JSX.Element>;\n}) {\n  return createExtension({\n    kind: 'catalog-filter',\n    namespace: options.namespace,\n    name: options.name,\n    attachTo: { id: 'page:catalog', input: 'filters' },\n    inputs: options.inputs ?? {},\n    configSchema: options.configSchema,\n    output: {\n      element: coreExtensionData.reactElement,\n    },\n    factory({ config, node }) {\n      const ExtensionComponent = lazy(() =>\n        options\n          .loader({ config })\n          .then(element => ({ default: () => element })),\n      );\n\n      return {\n        element: (\n          <ExtensionBoundary node={node}>\n            <ExtensionComponent />\n          </ExtensionBoundary>\n        ),\n      };\n    },\n  });\n}\n"],"names":[],"mappings":";;;AA6BO,SAAS,6BAGd,OAMC,EAAA;AACD,EAAA,OAAO,eAAgB,CAAA;AAAA,IACrB,IAAM,EAAA,gBAAA;AAAA,IACN,WAAW,OAAQ,CAAA,SAAA;AAAA,IACnB,MAAM,OAAQ,CAAA,IAAA;AAAA,IACd,QAAU,EAAA,EAAE,EAAI,EAAA,cAAA,EAAgB,OAAO,SAAU,EAAA;AAAA,IACjD,MAAA,EAAQ,OAAQ,CAAA,MAAA,IAAU,EAAC;AAAA,IAC3B,cAAc,OAAQ,CAAA,YAAA;AAAA,IACtB,MAAQ,EAAA;AAAA,MACN,SAAS,iBAAkB,CAAA,YAAA;AAAA,KAC7B;AAAA,IACA,OAAQ,CAAA,EAAE,MAAQ,EAAA,IAAA,EAAQ,EAAA;AACxB,MAAA,MAAM,kBAAqB,GAAA,IAAA;AAAA,QAAK,MAC9B,OAAA,CACG,MAAO,CAAA,EAAE,MAAO,EAAC,CACjB,CAAA,IAAA,CAAK,CAAY,OAAA,MAAA,EAAE,OAAS,EAAA,MAAM,SAAU,CAAA,CAAA;AAAA,OACjD,CAAA;AAEA,MAAO,OAAA;AAAA,QACL,yBACG,KAAA,CAAA,aAAA,CAAA,iBAAA,EAAA,EAAkB,IACjB,EAAA,kBAAA,KAAA,CAAA,aAAA,CAAC,wBAAmB,CACtB,CAAA;AAAA,OAEJ,CAAA;AAAA,KACF;AAAA,GACD,CAAA,CAAA;AACH;;;;"}