From a12f6189477c52209b0abf0da8a2576f9136dc90 Mon Sep 17 00:00:00 2001
From: bnechyporenko <bnechyporenko@bol.com>
Date: Wed, 6 Jul 2022 17:26:11 +0200
Subject: [PATCH] Incorporated the feedback.

Signed-off-by: bnechyporenko <bnechyporenko@bol.com>
---
 packages/app/src/App.tsx                |  6 +--
 plugins/catalog-customized/src/index.ts | 63 +------------------------
 2 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 289af8d40f..2a6e542c75 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -39,7 +39,7 @@ import { AzurePullRequestsPage } from '@backstage/plugin-azure-devops';
 import {
   CatalogEntityPage,
   CatalogIndexPage,
-  catalogPlugin,
+  customizedCatalog,
 } from '@internal/plugin-catalog-customized';
 
 import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
@@ -121,7 +121,7 @@ const app = createApp({
     },
   },
   bindRoutes({ bind }) {
-    bind(catalogPlugin.externalRoutes, {
+    bind(customizedCatalog.externalRoutes, {
       createComponent: scaffolderPlugin.routes.root,
       viewTechDoc: techdocsPlugin.routes.docRoot,
     });
@@ -132,7 +132,7 @@ const app = createApp({
       registerComponent: catalogImportPlugin.routes.importPage,
     });
     bind(orgPlugin.externalRoutes, {
-      catalogIndex: catalogPlugin.routes.catalogIndex,
+      catalogIndex: customizedCatalog.routes.catalogIndex,
     });
   },
 });
diff --git a/plugins/catalog-customized/src/index.ts b/plugins/catalog-customized/src/index.ts
index 05678fc562..9c828cacfc 100644
--- a/plugins/catalog-customized/src/index.ts
+++ b/plugins/catalog-customized/src/index.ts
@@ -16,65 +16,4 @@
 
 export { customizedCatalog } from './plugin';
 
-export type {
-  AboutCardProps,
-  AboutContentProps,
-  AboutFieldProps,
-  BackstageOverrides,
-  CatalogTable,
-  CatalogTableProps,
-  CatalogTableRow,
-  CatalogKindHeaderProps,
-  CatalogSearchResultListItemProps,
-  DefaultCatalogPageProps,
-  DefaultStarredEntitiesApi,
-  DependencyOfComponentsCardProps,
-  DependsOnComponentsCardProps,
-  DependsOnResourcesCardProps,
-  EntityContextMenuClassKey,
-  EntityLayoutProps,
-  EntityLayoutRouteProps,
-  EntityLinksEmptyStateClassKey,
-  EntityListContainer,
-  EntityLinksCardProps,
-  EntityOrphanWarning,
-  EntityProcessingErrorsPanel,
-  EntitySwitch,
-  EntitySwitchCaseProps,
-  EntitySwitchProps,
-  hasCatalogProcessingErrors,
-  HasComponentsCardProps,
-  HasResourcesCardProps,
-  isKind,
-  isNamespace,
-  isComponentType,
-  isOrphan,
-  FilterContainer,
-  FilteredEntityLayout,
-  HasSubcomponentsCardProps,
-  HasSystemsCardProps,
-  PluginCatalogComponentsNameToClassKey,
-  RelatedEntitiesCardProps,
-  SystemDiagramCardClassKey,
-} from '@backstage/plugin-catalog';
-
-export {
-  AboutContent,
-  AboutField,
-  catalogPlugin,
-  CatalogEntityPage,
-  CatalogIndexPage,
-  CatalogKindHeader,
-  CatalogSearchResultListItem,
-  EntityAboutCard,
-  EntityDependencyOfComponentsCard,
-  EntityDependsOnComponentsCard,
-  EntityDependsOnResourcesCard,
-  EntityHasComponentsCard,
-  EntityHasResourcesCard,
-  EntityHasSubcomponentsCard,
-  EntityHasSystemsCard,
-  EntityLayout,
-  EntityLinksCard,
-  RelatedEntitiesCard,
-} from '@backstage/plugin-catalog';
+export { CatalogEntityPage, CatalogIndexPage } from '@backstage/plugin-catalog';