Merge pull request #17234 from backstage/fix-scaffolder-template-filter-logic

bug: Invert `templateFilter` predicate to align with `Array.filter`

.changeset/modern-snakes-check.md

@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-scaffolder-react': patch
+'@backstage/plugin-scaffolder': patch
+---
+
+bug: Invert `templateFilter` predicate to align with `Array.filter`

plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.test.tsx

@@ -214,7 +214,7 @@ describe('TemplateGroups', () => {
 
     expect(TemplateGroup).toHaveBeenCalledWith(
       expect.objectContaining({
-        templates: [expect.objectContaining({ template: mockEntities[1] })],
+        templates: [expect.objectContaining({ template: mockEntities[0] })],
       }),
       {},
     );

plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.tsx

@@ -91,7 +91,7 @@ export const TemplateGroups = (props: TemplateGroupsProps) => {
       {groups.map(({ title, filter }, index) => {
         const templates = entities
           .filter(isTemplateEntityV1beta3)
-          .filter(e => (templateFilter ? !templateFilter(e) : true))
+          .filter(e => (templateFilter ? templateFilter(e) : true))
           .filter(filter)
           .map(template => {
             const additionalLinks =

plugins/scaffolder/src/components/TemplateList/TemplateList.test.tsx

@@ -77,7 +77,7 @@ describe('TemplateList', () => {
       { mountedRoutes: { '/': rootRouteRef } },
     );
 
-    expect(() => screen.getByTestId('t1')).toThrow();
-    expect(screen.getByTestId('t2')).toBeDefined();
+    expect(() => screen.getByTestId('t2')).toThrow();
+    expect(screen.getByTestId('t1')).toBeDefined();
   });
 });

plugins/scaffolder/src/components/TemplateList/TemplateList.tsx

@@ -59,7 +59,7 @@ export const TemplateList = ({
   const templateEntities = entities.filter(isTemplateEntityV1beta3);
   const maybeFilteredEntities = (
     group ? templateEntities.filter(group.filter) : templateEntities
-  ).filter(e => (templateFilter ? !templateFilter(e) : true));
+  ).filter(e => (templateFilter ? templateFilter(e) : true));
 
   const titleComponent: React.ReactNode = (() => {
     if (group && group.title) {