From 6b69593dbf6a6dabec5675e15573d34f21511f1e Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 17 Mar 2023 17:03:40 +0100
Subject: [PATCH] chore: fixing api-reports and merge conflicts

Signed-off-by: blam <ben@blam.sh>
---
 plugins/scaffolder/alpha-api-report.md                        | 4 ++++
 .../src/next/TemplateListPage/TemplateGroups.test.tsx         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/scaffolder/alpha-api-report.md b/plugins/scaffolder/alpha-api-report.md
index 1fc77322bd..58d70e3c71 100644
--- a/plugins/scaffolder/alpha-api-report.md
+++ b/plugins/scaffolder/alpha-api-report.md
@@ -31,6 +31,7 @@ export type NextRouterProps = {
     }>;
   };
   groups?: TemplateGroupFilter[];
+  templateFilter?: TemplateFilter;
   FormProps?: FormProps_2;
   contextMenu?: {
     editor?: boolean;
@@ -44,6 +45,9 @@ export const NextScaffolderPage: (
   props: PropsWithChildren<NextRouterProps>,
 ) => JSX.Element;
 
+// @alpha (undocumented)
+export type TemplateFilter = (entity: Entity) => boolean;
+
 // @alpha (undocumented)
 export type TemplateGroupFilter = {
   title?: React_2.ReactNode;
diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx
index 291804abbd..c0fb503d9b 100644
--- a/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx
+++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateGroups.test.tsx
@@ -243,7 +243,7 @@ describe('TemplateGroups', () => {
       </TestApiProvider>,
       {
         mountedRoutes: {
-          '/next': nextRouteRef,
+          '/create': rootRouteRef,
         },
       },
     );