From 8ecd2efb11dc64a61ad22a5068d5c81071610ccb Mon Sep 17 00:00:00 2001
From: Gustaf Lundh <gustaf.lundh@axis.com>
Date: Tue, 29 Nov 2022 01:01:37 +0100
Subject: [PATCH] Fixed act-issues and review comments

Signed-off-by: Gustaf Lundh <gustaf.lundh@axis.com>
---
 plugins/catalog-react/api-report.md           | 20 -------------------
 .../src/hooks/useEntityListProvider.test.tsx  |  2 +-
 plugins/catalog-react/src/index.ts            |  2 --
 .../src/utils/kindFilterUtils.ts              |  3 ---
 .../CatalogKindHeader/CatalogKindHeader.tsx   |  3 +--
 5 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 91c57c3498..92bfc4de96 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -432,16 +432,6 @@ export type FavoriteEntityProps = ComponentProps<typeof IconButton> & {
   entity: Entity;
 };
 
-// Warning: (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// Warning: (ae-missing-release-tag) "filterAndCapitalize" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public
-export function filterAndCapitalize(
-  allKinds: string[],
-  allowedKinds?: string[],
-  forcedKinds?: string[],
-): Record<string, string>;
-
 // @public
 export function getEntityRelations(
   entity: Entity | undefined,
@@ -514,16 +504,6 @@ export type UnregisterEntityDialogProps = {
   entity: Entity;
 };
 
-// Warning: (tsdoc-undefined-tag) The TSDoc tag "@private" is not defined in this configuration
-// Warning: (ae-missing-release-tag) "useAllKinds" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public
-export function useAllKinds(): {
-  loading: boolean;
-  error?: Error;
-  allKinds: string[];
-};
-
 // @public
 export function useAsyncEntity<
   TEntity extends Entity = Entity,
diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
index d8c89e0858..b77c7f5619 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
@@ -166,7 +166,7 @@ describe('<EntityListProvider />', () => {
         location: `/catalog?${query}`,
       },
     });
-    await waitFor(() => !!result.current.queryParameters);
+    await act(() => waitFor(() => !!result.current.queryParameters));
     expect(result.current.queryParameters).toEqual({
       kind: 'component',
       type: 'service',
diff --git a/plugins/catalog-react/src/index.ts b/plugins/catalog-react/src/index.ts
index de8b32282a..2ca7d67d59 100644
--- a/plugins/catalog-react/src/index.ts
+++ b/plugins/catalog-react/src/index.ts
@@ -35,7 +35,5 @@ export {
   getEntityRelations,
   getEntitySourceLocation,
   isOwnerOf,
-  useAllKinds,
-  filterKinds,
 } from './utils';
 export type { EntitySourceLocation } from './utils';
diff --git a/plugins/catalog-react/src/utils/kindFilterUtils.ts b/plugins/catalog-react/src/utils/kindFilterUtils.ts
index a0441db33f..851dcfb702 100644
--- a/plugins/catalog-react/src/utils/kindFilterUtils.ts
+++ b/plugins/catalog-react/src/utils/kindFilterUtils.ts
@@ -20,7 +20,6 @@ import { catalogApiRef } from '../api';
 
 /**
  * Fetch and return all availible kinds.
- * @internal
  */
 export function useAllKinds(): {
   loading: boolean;
@@ -45,8 +44,6 @@ export function useAllKinds(): {
 
 /**
  * Filter and capitalize accessible kinds.
- *
- * @internal
  */
 export function filterKinds(
   allKinds: string[],
diff --git a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
index 5a69f89106..9ab2c4cb36 100644
--- a/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
+++ b/plugins/catalog/src/components/CatalogKindHeader/CatalogKindHeader.tsx
@@ -25,10 +25,9 @@ import {
 } from '@material-ui/core';
 import {
   EntityKindFilter,
-  filterKinds,
-  useAllKinds,
   useEntityList,
 } from '@backstage/plugin-catalog-react';
+import { filterKinds, useAllKinds } from '@backstage/plugin-catalog-react/src/utils';
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({