#10453 Resolved conflicts

Signed-off-by: Shailendra Ahir <shailendraahir@hotmail.com>

plugins/catalog/api-report.md

@@ -163,6 +163,8 @@ export interface DefaultCatalogPageProps {
   // (undocumented)
   columns?: TableColumn<CatalogTableRow>[];
   // (undocumented)
+  initialKind?: string;
+  // (undocumented)
   initiallySelectedFilter?: UserListFilterKind;
   // (undocumented)
   options?: TableProps<CatalogTableRow>['options'];

plugins/catalog/src/components/CatalogPage/DefaultCatalogPage.tsx

@@ -48,6 +48,7 @@ export interface DefaultCatalogPageProps {
   initiallySelectedFilter?: UserListFilterKind;
   columns?: TableColumn<CatalogTableRow>[];
   actions?: TableProps<CatalogTableRow>['actions'];
+  initialKind?: string;
   options?: TableProps<CatalogTableRow>['options'];
 }
 
@@ -56,6 +57,7 @@ export function DefaultCatalogPage(props: DefaultCatalogPageProps) {
     columns,
     actions,
     initiallySelectedFilter = 'owned',
+    initialKind = 'component',
     options = {},
   } = props;
   const orgName =
@@ -66,7 +68,9 @@ export function DefaultCatalogPage(props: DefaultCatalogPageProps) {
     <PageWithHeader title={`${orgName} Catalog`} themeId="home">
       <EntityListProvider>
         <Content>
-          <ContentHeader titleComponent={<CatalogKindHeader />}>
+          <ContentHeader
+            titleComponent={<CatalogKindHeader initialFilter={initialKind} />}
+          >
             <CreateButton
               title="Create Component"
               to={createComponentLink && createComponentLink()}