@backstage/plugin-catalog 2.0.0 → 2.0.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/plugin-catalog
 
+## 2.0.1
+
+### Patch Changes
+
+- 5b7e221: Disabled the default page layout header for the catalog entity page in the new frontend system. The entity page already renders its own header through the `EntityHeader` extension, so the page layout header was redundant.
+- Updated dependencies
+  - @backstage/ui@0.13.1
+  - @backstage/frontend-plugin-api@0.15.1
+
 ## 2.0.0
 
 ### Major Changes

package/dist/alpha/pages.esm.js

@@ -88,6 +88,7 @@ const catalogEntityPage = PageBlueprint.makeWithOverrides({
   factory(originalFactory, { config, inputs }) {
     return originalFactory({
       path: "/catalog/:namespace/:kind/:name",
+      noHeader: true,
       title: "Catalog Entity",
       // NOTE: The `convertLegacyRouteRef` call here ensures that this route ref
       // is mutated to support the new frontend system. Removing this conversion

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

@@ -1 +1 @@
-{"version":3,"file":"pages.esm.js","sources":["../../src/alpha/pages.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 { convertLegacyRouteRef } from '@backstage/core-compat-api';\nimport {\n  coreExtensionData,\n  createExtensionInput,\n  PageBlueprint,\n} from '@backstage/frontend-plugin-api';\nimport {\n  AsyncEntityProvider,\n  entityRouteRef,\n} from '@backstage/plugin-catalog-react';\nimport {\n  defaultEntityContentGroupDefinitions,\n  EntityContentBlueprint,\n  EntityContextMenuItemBlueprint,\n  EntityHeaderBlueprint,\n  EntityContentGroupDefinitions,\n} from '@backstage/plugin-catalog-react/alpha';\nimport CategoryIcon from '@material-ui/icons/Category';\nimport { rootRouteRef } from '../routes';\nimport { useEntityFromUrl } from '../components/CatalogEntityPage/useEntityFromUrl';\nimport { buildFilterFn } from './filter/FilterWrapper';\n\nexport const catalogPage = PageBlueprint.makeWithOverrides({\n  inputs: {\n    filters: createExtensionInput([coreExtensionData.reactElement]),\n  },\n  config: {\n    schema: {\n      pagination: z =>\n        z\n          .union([\n            z.boolean(),\n            z.object({\n              mode: z.enum(['cursor', 'offset']),\n              limit: z.number().optional(),\n              offset: z.number().optional(),\n            }),\n          ])\n          .default(true),\n    },\n  },\n  factory(originalFactory, { inputs, config }) {\n    return originalFactory({\n      path: '/catalog',\n      routeRef: rootRouteRef,\n      icon: <CategoryIcon fontSize=\"inherit\" />,\n      title: 'Catalog',\n      loader: async () => {\n        const { NfsDefaultCatalogPage } = await import(\n          '../components/CatalogPage/DefaultCatalogPage'\n        );\n        const filters = inputs.filters.map(filter =>\n          filter.get(coreExtensionData.reactElement),\n        );\n        return (\n          <NfsDefaultCatalogPage\n            filters={<>{filters}</>}\n            pagination={config.pagination}\n          />\n        );\n      },\n    });\n  },\n});\n\nexport const catalogEntityPage = PageBlueprint.makeWithOverrides({\n  name: 'entity',\n  inputs: {\n    headers: createExtensionInput([\n      EntityHeaderBlueprint.dataRefs.element.optional(),\n      EntityHeaderBlueprint.dataRefs.filterFunction.optional(),\n    ]),\n    contents: createExtensionInput([\n      coreExtensionData.reactElement,\n      coreExtensionData.routePath,\n      coreExtensionData.routeRef.optional(),\n      EntityContentBlueprint.dataRefs.title,\n      EntityContentBlueprint.dataRefs.filterFunction.optional(),\n      EntityContentBlueprint.dataRefs.filterExpression.optional(),\n      EntityContentBlueprint.dataRefs.group.optional(),\n      EntityContentBlueprint.dataRefs.icon.optional(),\n    ]),\n    contextMenuItems: createExtensionInput([\n      coreExtensionData.reactElement,\n      EntityContextMenuItemBlueprint.dataRefs.filterFunction.optional(),\n    ]),\n  },\n  config: {\n    schema: {\n      groups: z =>\n        z\n          .array(\n            z.record(\n              z.string(),\n              z.object({\n                title: z.string(),\n                icon: z.string().optional(),\n                aliases: z.array(z.string()).optional(),\n                contentOrder: z.enum(['title', 'natural']).optional(),\n              }),\n            ),\n          )\n          .optional(),\n      defaultContentOrder: z =>\n        z.enum(['title', 'natural']).optional().default('title'),\n      showNavItemIcons: z => z.boolean().optional().default(false),\n    },\n  },\n  factory(originalFactory, { config, inputs }) {\n    return originalFactory({\n      path: '/catalog/:namespace/:kind/:name',\n      title: 'Catalog Entity',\n      // NOTE: The `convertLegacyRouteRef` call here ensures that this route ref\n      // is mutated to support the new frontend system. Removing this conversion\n      // is a potentially breaking change since this is a singleton and the\n      // route refs from `core-plugin-api` used to not support the new format.\n      // This shouldn't be removed until we completely deprecate the\n      // `core-compat-api` package.\n      routeRef: convertLegacyRouteRef(entityRouteRef), // READ THE ABOVE\n      loader: async () => {\n        const { EntityLayout } = await import('./components/EntityLayout');\n\n        const menuItems = inputs.contextMenuItems.map(item => ({\n          element: item.get(coreExtensionData.reactElement),\n          filter:\n            item.get(EntityContextMenuItemBlueprint.dataRefs.filterFunction) ??\n            (() => true),\n        }));\n\n        // Get available headers, sorted by if they have a filter function or not.\n        // TODO(blam): we should really have priority or some specificity here which can be used to sort the headers.\n        // That can be done with embedding the priority in the dataRef alongside the filter function.\n        const headers = inputs.headers\n          .map(header => ({\n            element: header.get(EntityHeaderBlueprint.dataRefs.element),\n            filter: header.get(EntityHeaderBlueprint.dataRefs.filterFunction),\n          }))\n          .sort((a, b) => {\n            if (a.filter && !b.filter) return -1;\n            if (!a.filter && b.filter) return 1;\n            return 0;\n          });\n\n        const groupDefinitions =\n          config.groups?.reduce(\n            (rest, group) => ({ ...rest, ...group }),\n            {} as EntityContentGroupDefinitions,\n          ) ?? defaultEntityContentGroupDefinitions;\n\n        const Component = () => {\n          const entityFromUrl = useEntityFromUrl();\n          const { entity } = entityFromUrl;\n          const filteredMenuItems = entity\n            ? menuItems.filter(i => i.filter(entity)).map(i => i.element)\n            : [];\n\n          const header = headers.find(\n            h => !h.filter || h.filter(entity!),\n          )?.element;\n\n          return (\n            <AsyncEntityProvider {...entityFromUrl}>\n              <EntityLayout\n                header={header}\n                contextMenuItems={filteredMenuItems}\n                groupDefinitions={groupDefinitions}\n                defaultContentOrder={config.defaultContentOrder}\n                showNavItemIcons={config.showNavItemIcons}\n              >\n                {inputs.contents.map(output => (\n                  <EntityLayout.Route\n                    group={output.get(EntityContentBlueprint.dataRefs.group)}\n                    key={output.get(coreExtensionData.routePath)}\n                    path={output.get(coreExtensionData.routePath)}\n                    title={output.get(EntityContentBlueprint.dataRefs.title)}\n                    icon={output.get(EntityContentBlueprint.dataRefs.icon)}\n                    if={buildFilterFn(\n                      output.get(\n                        EntityContentBlueprint.dataRefs.filterFunction,\n                      ),\n                      output.get(\n                        EntityContentBlueprint.dataRefs.filterExpression,\n                      ),\n                    )}\n                  >\n                    {output.get(coreExtensionData.reactElement)}\n                  </EntityLayout.Route>\n                ))}\n              </EntityLayout>\n            </AsyncEntityProvider>\n          );\n        };\n\n        return <Component />;\n      },\n    });\n  },\n});\n\nexport default [catalogPage, catalogEntityPage];\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"pages.esm.js","sources":["../../src/alpha/pages.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 { convertLegacyRouteRef } from '@backstage/core-compat-api';\nimport {\n  coreExtensionData,\n  createExtensionInput,\n  PageBlueprint,\n} from '@backstage/frontend-plugin-api';\nimport {\n  AsyncEntityProvider,\n  entityRouteRef,\n} from '@backstage/plugin-catalog-react';\nimport {\n  defaultEntityContentGroupDefinitions,\n  EntityContentBlueprint,\n  EntityContextMenuItemBlueprint,\n  EntityHeaderBlueprint,\n  EntityContentGroupDefinitions,\n} from '@backstage/plugin-catalog-react/alpha';\nimport CategoryIcon from '@material-ui/icons/Category';\nimport { rootRouteRef } from '../routes';\nimport { useEntityFromUrl } from '../components/CatalogEntityPage/useEntityFromUrl';\nimport { buildFilterFn } from './filter/FilterWrapper';\n\nexport const catalogPage = PageBlueprint.makeWithOverrides({\n  inputs: {\n    filters: createExtensionInput([coreExtensionData.reactElement]),\n  },\n  config: {\n    schema: {\n      pagination: z =>\n        z\n          .union([\n            z.boolean(),\n            z.object({\n              mode: z.enum(['cursor', 'offset']),\n              limit: z.number().optional(),\n              offset: z.number().optional(),\n            }),\n          ])\n          .default(true),\n    },\n  },\n  factory(originalFactory, { inputs, config }) {\n    return originalFactory({\n      path: '/catalog',\n      routeRef: rootRouteRef,\n      icon: <CategoryIcon fontSize=\"inherit\" />,\n      title: 'Catalog',\n      loader: async () => {\n        const { NfsDefaultCatalogPage } = await import(\n          '../components/CatalogPage/DefaultCatalogPage'\n        );\n        const filters = inputs.filters.map(filter =>\n          filter.get(coreExtensionData.reactElement),\n        );\n        return (\n          <NfsDefaultCatalogPage\n            filters={<>{filters}</>}\n            pagination={config.pagination}\n          />\n        );\n      },\n    });\n  },\n});\n\nexport const catalogEntityPage = PageBlueprint.makeWithOverrides({\n  name: 'entity',\n  inputs: {\n    headers: createExtensionInput([\n      EntityHeaderBlueprint.dataRefs.element.optional(),\n      EntityHeaderBlueprint.dataRefs.filterFunction.optional(),\n    ]),\n    contents: createExtensionInput([\n      coreExtensionData.reactElement,\n      coreExtensionData.routePath,\n      coreExtensionData.routeRef.optional(),\n      EntityContentBlueprint.dataRefs.title,\n      EntityContentBlueprint.dataRefs.filterFunction.optional(),\n      EntityContentBlueprint.dataRefs.filterExpression.optional(),\n      EntityContentBlueprint.dataRefs.group.optional(),\n      EntityContentBlueprint.dataRefs.icon.optional(),\n    ]),\n    contextMenuItems: createExtensionInput([\n      coreExtensionData.reactElement,\n      EntityContextMenuItemBlueprint.dataRefs.filterFunction.optional(),\n    ]),\n  },\n  config: {\n    schema: {\n      groups: z =>\n        z\n          .array(\n            z.record(\n              z.string(),\n              z.object({\n                title: z.string(),\n                icon: z.string().optional(),\n                aliases: z.array(z.string()).optional(),\n                contentOrder: z.enum(['title', 'natural']).optional(),\n              }),\n            ),\n          )\n          .optional(),\n      defaultContentOrder: z =>\n        z.enum(['title', 'natural']).optional().default('title'),\n      showNavItemIcons: z => z.boolean().optional().default(false),\n    },\n  },\n  factory(originalFactory, { config, inputs }) {\n    return originalFactory({\n      path: '/catalog/:namespace/:kind/:name',\n      noHeader: true,\n      title: 'Catalog Entity',\n      // NOTE: The `convertLegacyRouteRef` call here ensures that this route ref\n      // is mutated to support the new frontend system. Removing this conversion\n      // is a potentially breaking change since this is a singleton and the\n      // route refs from `core-plugin-api` used to not support the new format.\n      // This shouldn't be removed until we completely deprecate the\n      // `core-compat-api` package.\n      routeRef: convertLegacyRouteRef(entityRouteRef), // READ THE ABOVE\n      loader: async () => {\n        const { EntityLayout } = await import('./components/EntityLayout');\n\n        const menuItems = inputs.contextMenuItems.map(item => ({\n          element: item.get(coreExtensionData.reactElement),\n          filter:\n            item.get(EntityContextMenuItemBlueprint.dataRefs.filterFunction) ??\n            (() => true),\n        }));\n\n        // Get available headers, sorted by if they have a filter function or not.\n        // TODO(blam): we should really have priority or some specificity here which can be used to sort the headers.\n        // That can be done with embedding the priority in the dataRef alongside the filter function.\n        const headers = inputs.headers\n          .map(header => ({\n            element: header.get(EntityHeaderBlueprint.dataRefs.element),\n            filter: header.get(EntityHeaderBlueprint.dataRefs.filterFunction),\n          }))\n          .sort((a, b) => {\n            if (a.filter && !b.filter) return -1;\n            if (!a.filter && b.filter) return 1;\n            return 0;\n          });\n\n        const groupDefinitions =\n          config.groups?.reduce(\n            (rest, group) => ({ ...rest, ...group }),\n            {} as EntityContentGroupDefinitions,\n          ) ?? defaultEntityContentGroupDefinitions;\n\n        const Component = () => {\n          const entityFromUrl = useEntityFromUrl();\n          const { entity } = entityFromUrl;\n          const filteredMenuItems = entity\n            ? menuItems.filter(i => i.filter(entity)).map(i => i.element)\n            : [];\n\n          const header = headers.find(\n            h => !h.filter || h.filter(entity!),\n          )?.element;\n\n          return (\n            <AsyncEntityProvider {...entityFromUrl}>\n              <EntityLayout\n                header={header}\n                contextMenuItems={filteredMenuItems}\n                groupDefinitions={groupDefinitions}\n                defaultContentOrder={config.defaultContentOrder}\n                showNavItemIcons={config.showNavItemIcons}\n              >\n                {inputs.contents.map(output => (\n                  <EntityLayout.Route\n                    group={output.get(EntityContentBlueprint.dataRefs.group)}\n                    key={output.get(coreExtensionData.routePath)}\n                    path={output.get(coreExtensionData.routePath)}\n                    title={output.get(EntityContentBlueprint.dataRefs.title)}\n                    icon={output.get(EntityContentBlueprint.dataRefs.icon)}\n                    if={buildFilterFn(\n                      output.get(\n                        EntityContentBlueprint.dataRefs.filterFunction,\n                      ),\n                      output.get(\n                        EntityContentBlueprint.dataRefs.filterExpression,\n                      ),\n                    )}\n                  >\n                    {output.get(coreExtensionData.reactElement)}\n                  </EntityLayout.Route>\n                ))}\n              </EntityLayout>\n            </AsyncEntityProvider>\n          );\n        };\n\n        return <Component />;\n      },\n    });\n  },\n});\n\nexport default [catalogPage, catalogEntityPage];\n"],"names":[],"mappings":";;;;;;;;;;AAsCO,MAAM,WAAA,GAAc,cAAc,iBAAA,CAAkB;AAAA,EACzD,MAAA,EAAQ;AAAA,IACN,OAAA,EAAS,oBAAA,CAAqB,CAAC,iBAAA,CAAkB,YAAY,CAAC;AAAA,GAChE;AAAA,EACA,MAAA,EAAQ;AAAA,IACN,MAAA,EAAQ;AAAA,MACN,UAAA,EAAY,CAAA,CAAA,KACV,CAAA,CACG,KAAA,CAAM;AAAA,QACL,EAAE,OAAA,EAAQ;AAAA,QACV,EAAE,MAAA,CAAO;AAAA,UACP,MAAM,CAAA,CAAE,IAAA,CAAK,CAAC,QAAA,EAAU,QAAQ,CAAC,CAAA;AAAA,UACjC,KAAA,EAAO,CAAA,CAAE,MAAA,EAAO,CAAE,QAAA,EAAS;AAAA,UAC3B,MAAA,EAAQ,CAAA,CAAE,MAAA,EAAO,CAAE,QAAA;AAAS,SAC7B;AAAA,OACF,CAAA,CACA,OAAA,CAAQ,IAAI;AAAA;AACnB,GACF;AAAA,EACA,OAAA,CAAQ,eAAA,EAAiB,EAAE,MAAA,EAAQ,QAAO,EAAG;AAC3C,IAAA,OAAO,eAAA,CAAgB;AAAA,MACrB,IAAA,EAAM,UAAA;AAAA,MACN,QAAA,EAAU,YAAA;AAAA,MACV,IAAA,kBAAM,GAAA,CAAC,YAAA,EAAA,EAAa,QAAA,EAAS,SAAA,EAAU,CAAA;AAAA,MACvC,KAAA,EAAO,SAAA;AAAA,MACP,QAAQ,YAAY;AAClB,QAAA,MAAM,EAAE,qBAAA,EAAsB,GAAI,MAAM,OACtC,qDACF,CAAA;AACA,QAAA,MAAM,OAAA,GAAU,OAAO,OAAA,CAAQ,GAAA;AAAA,UAAI,CAAA,MAAA,KACjC,MAAA,CAAO,GAAA,CAAI,iBAAA,CAAkB,YAAY;AAAA,SAC3C;AACA,QAAA,uBACE,GAAA;AAAA,UAAC,qBAAA;AAAA,UAAA;AAAA,YACC,OAAA,kCAAY,QAAA,EAAA,OAAA,EAAQ,CAAA;AAAA,YACpB,YAAY,MAAA,CAAO;AAAA;AAAA,SACrB;AAAA,MAEJ;AAAA,KACD,CAAA;AAAA,EACH;AACF,CAAC;AAEM,MAAM,iBAAA,GAAoB,cAAc,iBAAA,CAAkB;AAAA,EAC/D,IAAA,EAAM,QAAA;AAAA,EACN,MAAA,EAAQ;AAAA,IACN,SAAS,oBAAA,CAAqB;AAAA,MAC5B,qBAAA,CAAsB,QAAA,CAAS,OAAA,CAAQ,QAAA,EAAS;AAAA,MAChD,qBAAA,CAAsB,QAAA,CAAS,cAAA,CAAe,QAAA;AAAS,KACxD,CAAA;AAAA,IACD,UAAU,oBAAA,CAAqB;AAAA,MAC7B,iBAAA,CAAkB,YAAA;AAAA,MAClB,iBAAA,CAAkB,SAAA;AAAA,MAClB,iBAAA,CAAkB,SAAS,QAAA,EAAS;AAAA,MACpC,uBAAuB,QAAA,CAAS,KAAA;AAAA,MAChC,sBAAA,CAAuB,QAAA,CAAS,cAAA,CAAe,QAAA,EAAS;AAAA,MACxD,sBAAA,CAAuB,QAAA,CAAS,gBAAA,CAAiB,QAAA,EAAS;AAAA,MAC1D,sBAAA,CAAuB,QAAA,CAAS,KAAA,CAAM,QAAA,EAAS;AAAA,MAC/C,sBAAA,CAAuB,QAAA,CAAS,IAAA,CAAK,QAAA;AAAS,KAC/C,CAAA;AAAA,IACD,kBAAkB,oBAAA,CAAqB;AAAA,MACrC,iBAAA,CAAkB,YAAA;AAAA,MAClB,8BAAA,CAA+B,QAAA,CAAS,cAAA,CAAe,QAAA;AAAS,KACjE;AAAA,GACH;AAAA,EACA,MAAA,EAAQ;AAAA,IACN,MAAA,EAAQ;AAAA,MACN,MAAA,EAAQ,OACN,CAAA,CACG,KAAA;AAAA,QACC,CAAA,CAAE,MAAA;AAAA,UACA,EAAE,MAAA,EAAO;AAAA,UACT,EAAE,MAAA,CAAO;AAAA,YACP,KAAA,EAAO,EAAE,MAAA,EAAO;AAAA,YAChB,IAAA,EAAM,CAAA,CAAE,MAAA,EAAO,CAAE,QAAA,EAAS;AAAA,YAC1B,SAAS,CAAA,CAAE,KAAA,CAAM,EAAE,MAAA,EAAQ,EAAE,QAAA,EAAS;AAAA,YACtC,YAAA,EAAc,EAAE,IAAA,CAAK,CAAC,SAAS,SAAS,CAAC,EAAE,QAAA;AAAS,WACrD;AAAA;AACH,QAED,QAAA,EAAS;AAAA,MACd,mBAAA,EAAqB,CAAA,CAAA,KACnB,CAAA,CAAE,IAAA,CAAK,CAAC,OAAA,EAAS,SAAS,CAAC,CAAA,CAAE,QAAA,EAAS,CAAE,OAAA,CAAQ,OAAO,CAAA;AAAA,MACzD,gBAAA,EAAkB,OAAK,CAAA,CAAE,OAAA,GAAU,QAAA,EAAS,CAAE,QAAQ,KAAK;AAAA;AAC7D,GACF;AAAA,EACA,OAAA,CAAQ,eAAA,EAAiB,EAAE,MAAA,EAAQ,QAAO,EAAG;AAC3C,IAAA,OAAO,eAAA,CAAgB;AAAA,MACrB,IAAA,EAAM,iCAAA;AAAA,MACN,QAAA,EAAU,IAAA;AAAA,MACV,KAAA,EAAO,gBAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAOP,QAAA,EAAU,sBAAsB,cAAc,CAAA;AAAA;AAAA,MAC9C,QAAQ,YAAY;AAClB,QAAA,MAAM,EAAE,YAAA,EAAa,GAAI,MAAM,OAAO,wCAA2B,CAAA;AAEjE,QAAA,MAAM,SAAA,GAAY,MAAA,CAAO,gBAAA,CAAiB,GAAA,CAAI,CAAA,IAAA,MAAS;AAAA,UACrD,OAAA,EAAS,IAAA,CAAK,GAAA,CAAI,iBAAA,CAAkB,YAAY,CAAA;AAAA,UAChD,QACE,IAAA,CAAK,GAAA,CAAI,+BAA+B,QAAA,CAAS,cAAc,MAC9D,MAAM,IAAA;AAAA,SACX,CAAE,CAAA;AAKF,QAAA,MAAM,OAAA,GAAU,MAAA,CAAO,OAAA,CACpB,GAAA,CAAI,CAAA,MAAA,MAAW;AAAA,UACd,OAAA,EAAS,MAAA,CAAO,GAAA,CAAI,qBAAA,CAAsB,SAAS,OAAO,CAAA;AAAA,UAC1D,MAAA,EAAQ,MAAA,CAAO,GAAA,CAAI,qBAAA,CAAsB,SAAS,cAAc;AAAA,SAClE,CAAE,CAAA,CACD,IAAA,CAAK,CAAC,GAAG,CAAA,KAAM;AACd,UAAA,IAAI,CAAA,CAAE,MAAA,IAAU,CAAC,CAAA,CAAE,QAAQ,OAAO,EAAA;AAClC,UAAA,IAAI,CAAC,CAAA,CAAE,MAAA,IAAU,CAAA,CAAE,QAAQ,OAAO,CAAA;AAClC,UAAA,OAAO,CAAA;AAAA,QACT,CAAC,CAAA;AAEH,QAAA,MAAM,gBAAA,GACJ,OAAO,MAAA,EAAQ,MAAA;AAAA,UACb,CAAC,IAAA,EAAM,KAAA,MAAW,EAAE,GAAG,IAAA,EAAM,GAAG,KAAA,EAAM,CAAA;AAAA,UACtC;AAAC,SACH,IAAK,oCAAA;AAEP,QAAA,MAAM,YAAY,MAAM;AACtB,UAAA,MAAM,gBAAgB,gBAAA,EAAiB;AACvC,UAAA,MAAM,EAAE,QAAO,GAAI,aAAA;AACnB,UAAA,MAAM,iBAAA,GAAoB,MAAA,GACtB,SAAA,CAAU,MAAA,CAAO,OAAK,CAAA,CAAE,MAAA,CAAO,MAAM,CAAC,EAAE,GAAA,CAAI,CAAA,CAAA,KAAK,CAAA,CAAE,OAAO,IAC1D,EAAC;AAEL,UAAA,MAAM,SAAS,OAAA,CAAQ,IAAA;AAAA,YACrB,OAAK,CAAC,CAAA,CAAE,MAAA,IAAU,CAAA,CAAE,OAAO,MAAO;AAAA,WACpC,EAAG,OAAA;AAEH,UAAA,uBACE,GAAA,CAAC,mBAAA,EAAA,EAAqB,GAAG,aAAA,EACvB,QAAA,kBAAA,GAAA;AAAA,YAAC,YAAA;AAAA,YAAA;AAAA,cACC,MAAA;AAAA,cACA,gBAAA,EAAkB,iBAAA;AAAA,cAClB,gBAAA;AAAA,cACA,qBAAqB,MAAA,CAAO,mBAAA;AAAA,cAC5B,kBAAkB,MAAA,CAAO,gBAAA;AAAA,cAExB,QAAA,EAAA,MAAA,CAAO,QAAA,CAAS,GAAA,CAAI,CAAA,MAAA,qBACnB,GAAA;AAAA,gBAAC,YAAA,CAAa,KAAA;AAAA,gBAAb;AAAA,kBACC,KAAA,EAAO,MAAA,CAAO,GAAA,CAAI,sBAAA,CAAuB,SAAS,KAAK,CAAA;AAAA,kBAEvD,IAAA,EAAM,MAAA,CAAO,GAAA,CAAI,iBAAA,CAAkB,SAAS,CAAA;AAAA,kBAC5C,KAAA,EAAO,MAAA,CAAO,GAAA,CAAI,sBAAA,CAAuB,SAAS,KAAK,CAAA;AAAA,kBACvD,IAAA,EAAM,MAAA,CAAO,GAAA,CAAI,sBAAA,CAAuB,SAAS,IAAI,CAAA;AAAA,kBACrD,EAAA,EAAI,aAAA;AAAA,oBACF,MAAA,CAAO,GAAA;AAAA,sBACL,uBAAuB,QAAA,CAAS;AAAA,qBAClC;AAAA,oBACA,MAAA,CAAO,GAAA;AAAA,sBACL,uBAAuB,QAAA,CAAS;AAAA;AAClC,mBACF;AAAA,kBAEC,QAAA,EAAA,MAAA,CAAO,GAAA,CAAI,iBAAA,CAAkB,YAAY;AAAA,iBAAA;AAAA,gBAbrC,MAAA,CAAO,GAAA,CAAI,iBAAA,CAAkB,SAAS;AAAA,eAe9C;AAAA;AAAA,WACH,EACF,CAAA;AAAA,QAEJ,CAAA;AAEA,QAAA,2BAAQ,SAAA,EAAA,EAAU,CAAA;AAAA,MACpB;AAAA,KACD,CAAA;AAAA,EACH;AACF,CAAC;AAED,YAAe,CAAC,aAAa,iBAAiB,CAAA;;;;"}

package/dist/package.json.esm.js

@@ -1,5 +1,5 @@
 var name = "@backstage/plugin-catalog";
-var version = "2.0.0";
+var version = "2.0.1";
 var description = "The Backstage plugin for browsing the Backstage catalog";
 var backstage = {
 	role: "frontend-plugin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "The Backstage plugin for browsing the Backstage catalog",
   "backstage": {
     "role": "frontend-plugin",
@@ -76,7 +76,7 @@
     "@backstage/core-components": "^0.18.8",
     "@backstage/core-plugin-api": "^1.12.4",
     "@backstage/errors": "^1.2.7",
-    "@backstage/frontend-plugin-api": "^0.15.0",
+    "@backstage/frontend-plugin-api": "^0.15.1",
     "@backstage/integration-react": "^1.2.16",
     "@backstage/plugin-catalog-common": "^1.1.8",
     "@backstage/plugin-catalog-react": "^2.1.0",
@@ -87,7 +87,7 @@
     "@backstage/plugin-techdocs-common": "^0.1.1",
     "@backstage/plugin-techdocs-react": "^1.3.9",
     "@backstage/types": "^1.2.2",
-    "@backstage/ui": "^0.13.0",
+    "@backstage/ui": "^0.13.1",
     "@backstage/version-bridge": "^1.0.12",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",