From 2b91568fa3c4ddeee8e982621c06a57ee1cd5544 Mon Sep 17 00:00:00 2001 From: Camila Belo Date: Sat, 21 Oct 2023 13:07:53 +0200 Subject: [PATCH] refactor(catalog): rename filters extensions file Signed-off-by: Camila Belo --- ...uiltInFilterExtensions.tsx => filters.tsx} | 2 +- plugins/catalog/src/alpha/plugin.tsx | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) rename plugins/catalog/src/alpha/{builtInFilterExtensions.tsx => filters.tsx} (98%) diff --git a/plugins/catalog/src/alpha/builtInFilterExtensions.tsx b/plugins/catalog/src/alpha/filters.tsx similarity index 98% rename from plugins/catalog/src/alpha/builtInFilterExtensions.tsx rename to plugins/catalog/src/alpha/filters.tsx index 5a7575c4f5..7b73c2d14b 100644 --- a/plugins/catalog/src/alpha/builtInFilterExtensions.tsx +++ b/plugins/catalog/src/alpha/filters.tsx @@ -109,7 +109,7 @@ const CatalogUserListFilter = createCatalogFilterExtension({ }, }); -export const builtInFilterExtensions = [ +export default [ CatalogEntityTagFilter, CatalogEntityKindFilter, CatalogEntityTypeFilter, diff --git a/plugins/catalog/src/alpha/plugin.tsx b/plugins/catalog/src/alpha/plugin.tsx index d9d2878213..9f6094d288 100644 --- a/plugins/catalog/src/alpha/plugin.tsx +++ b/plugins/catalog/src/alpha/plugin.tsx @@ -15,7 +15,9 @@ */ import React from 'react'; +import Grid from '@material-ui/core/Grid'; import HomeIcon from '@material-ui/icons/Home'; + import { createApiFactory, discoveryApiRef, @@ -23,7 +25,6 @@ import { storageApiRef, } from '@backstage/core-plugin-api'; import { convertLegacyRouteRef } from '@backstage/core-plugin-api/alpha'; -import { CatalogClient } from '@backstage/catalog-client'; import { createApiExtension, createPageExtension, @@ -32,6 +33,8 @@ import { coreExtensionData, createExtensionInput, } from '@backstage/frontend-plugin-api'; + +import { CatalogClient } from '@backstage/catalog-client'; import { AsyncEntityProvider, catalogApiRef, @@ -44,6 +47,7 @@ import { entityContentTitleExtensionDataRef, } from '@backstage/plugin-catalog-react/alpha'; import { createSearchResultListItemExtension } from '@backstage/plugin-search-react/alpha'; + import { DefaultStarredEntitiesApi } from '../apis'; import { createComponentRouteRef, @@ -51,9 +55,9 @@ import { rootRouteRef, viewTechDocRouteRef, } from '../routes'; -import { builtInFilterExtensions } from './builtInFilterExtensions'; import { useEntityFromUrl } from '../components/CatalogEntityPage/useEntityFromUrl'; -import Grid from '@material-ui/core/Grid'; + +import filters from './filters'; /** @alpha */ export const CatalogApi = createApiExtension({ @@ -99,8 +103,11 @@ const CatalogIndexPage = createPageExtension({ }, loader: async ({ inputs }) => { const { BaseCatalogPage } = await import('../components/CatalogPage'); - const filters = inputs.filters.map(filter => filter.element); - return {filters}} />; + return ( + {inputs.filters.map(filter => filter.element)}} + /> + ); }, }); @@ -188,6 +195,7 @@ export default createPlugin({ createFromTemplate: convertLegacyRouteRef(createFromTemplateRouteRef), }, extensions: [ + ...filters, CatalogApi, StarredEntitiesApi, CatalogSearchResultListItemExtension, @@ -196,6 +204,5 @@ export default createPlugin({ CatalogNavItem, OverviewEntityContent, EntityAboutCard, - ...builtInFilterExtensions, ], });