From bd182548180db7de83e32fa92c3c9e747e39f837 Mon Sep 17 00:00:00 2001 From: Mark Dunphy Date: Wed, 14 May 2025 13:39:01 -0400 Subject: [PATCH] revert buildFilterFn relocation af0ab1cb788287cf645a5874796e2b375ace6b9d Signed-off-by: Mark Dunphy --- plugins/catalog-react/src/alpha/index.ts | 1 - plugins/catalog/src/alpha/entityContents.tsx | 2 +- .../src/alpha/filter/FilterWrapper.tsx | 10 +++------- .../src/alpha/filter/matchers/createHasMatcher.test.ts | 0 .../src/alpha/filter/matchers/createHasMatcher.ts | 0 .../src/alpha/filter/matchers/createIsMatcher.test.ts | 0 .../src/alpha/filter/matchers/createIsMatcher.ts | 0 .../alpha/filter/matchers/createKindMatcher.test.ts | 0 .../src/alpha/filter/matchers/createKindMatcher.ts | 0 .../alpha/filter/matchers/createTypeMatcher.test.ts | 0 .../src/alpha/filter/matchers/createTypeMatcher.ts | 0 .../src/alpha/filter/matchers/types.ts | 0 .../src/alpha/filter/parseFilterExpression.test.ts | 0 .../src/alpha/filter/parseFilterExpression.ts | 0 plugins/catalog/src/alpha/pages.tsx | 2 +- 15 files changed, 5 insertions(+), 10 deletions(-) rename plugins/{catalog-react => catalog}/src/alpha/filter/FilterWrapper.tsx (94%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createHasMatcher.test.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createHasMatcher.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createIsMatcher.test.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createIsMatcher.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createKindMatcher.test.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createKindMatcher.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createTypeMatcher.test.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/createTypeMatcher.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/matchers/types.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/parseFilterExpression.test.ts (100%) rename plugins/{catalog-react => catalog}/src/alpha/filter/parseFilterExpression.ts (100%) diff --git a/plugins/catalog-react/src/alpha/index.ts b/plugins/catalog-react/src/alpha/index.ts index f1b8b05c62..4ff4dbf0dd 100644 --- a/plugins/catalog-react/src/alpha/index.ts +++ b/plugins/catalog-react/src/alpha/index.ts @@ -20,4 +20,3 @@ export * from './predicates'; export { catalogReactTranslationRef } from '../translation'; export { isOwnerOf } from '../utils/isOwnerOf'; export { useEntityPermission } from '../hooks/useEntityPermission'; -export { buildFilterFn } from './filter/FilterWrapper'; diff --git a/plugins/catalog/src/alpha/entityContents.tsx b/plugins/catalog/src/alpha/entityContents.tsx index 224557519e..165ed33e04 100644 --- a/plugins/catalog/src/alpha/entityContents.tsx +++ b/plugins/catalog/src/alpha/entityContents.tsx @@ -26,7 +26,7 @@ import { EntityContentLayoutBlueprint, EntityContentLayoutProps, } from '@backstage/plugin-catalog-react/alpha'; -import { buildFilterFn } from '@backstage/plugin-catalog-react/alpha'; +import { buildFilterFn } from './filter/FilterWrapper'; import { useEntity } from '@backstage/plugin-catalog-react'; export const catalogOverviewEntityContent = diff --git a/plugins/catalog-react/src/alpha/filter/FilterWrapper.tsx b/plugins/catalog/src/alpha/filter/FilterWrapper.tsx similarity index 94% rename from plugins/catalog-react/src/alpha/filter/FilterWrapper.tsx rename to plugins/catalog/src/alpha/filter/FilterWrapper.tsx index 76ee69b087..33af9c2c3f 100644 --- a/plugins/catalog-react/src/alpha/filter/FilterWrapper.tsx +++ b/plugins/catalog/src/alpha/filter/FilterWrapper.tsx @@ -24,13 +24,9 @@ import { parseFilterExpression } from './parseFilterExpression'; const seenParseErrorExpressionStrings = new Set(); const seenDuplicateExpressionStrings = new Set(); -/** - * Given an optional filter function and an optional filter expression, make - * sure that at most one of them was given, and return a filter function that - * does the right thing. - * - * @alpha - */ +// Given an optional filter function and an optional filter expression, make +// sure that at most one of them was given, and return a filter function that +// does the right thing. export function buildFilterFn( filterFunction?: (entity: Entity) => boolean, filterExpression?: string, diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createHasMatcher.test.ts b/plugins/catalog/src/alpha/filter/matchers/createHasMatcher.test.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createHasMatcher.test.ts rename to plugins/catalog/src/alpha/filter/matchers/createHasMatcher.test.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createHasMatcher.ts b/plugins/catalog/src/alpha/filter/matchers/createHasMatcher.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createHasMatcher.ts rename to plugins/catalog/src/alpha/filter/matchers/createHasMatcher.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createIsMatcher.test.ts b/plugins/catalog/src/alpha/filter/matchers/createIsMatcher.test.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createIsMatcher.test.ts rename to plugins/catalog/src/alpha/filter/matchers/createIsMatcher.test.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createIsMatcher.ts b/plugins/catalog/src/alpha/filter/matchers/createIsMatcher.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createIsMatcher.ts rename to plugins/catalog/src/alpha/filter/matchers/createIsMatcher.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createKindMatcher.test.ts b/plugins/catalog/src/alpha/filter/matchers/createKindMatcher.test.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createKindMatcher.test.ts rename to plugins/catalog/src/alpha/filter/matchers/createKindMatcher.test.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createKindMatcher.ts b/plugins/catalog/src/alpha/filter/matchers/createKindMatcher.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createKindMatcher.ts rename to plugins/catalog/src/alpha/filter/matchers/createKindMatcher.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createTypeMatcher.test.ts b/plugins/catalog/src/alpha/filter/matchers/createTypeMatcher.test.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createTypeMatcher.test.ts rename to plugins/catalog/src/alpha/filter/matchers/createTypeMatcher.test.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/createTypeMatcher.ts b/plugins/catalog/src/alpha/filter/matchers/createTypeMatcher.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/createTypeMatcher.ts rename to plugins/catalog/src/alpha/filter/matchers/createTypeMatcher.ts diff --git a/plugins/catalog-react/src/alpha/filter/matchers/types.ts b/plugins/catalog/src/alpha/filter/matchers/types.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/matchers/types.ts rename to plugins/catalog/src/alpha/filter/matchers/types.ts diff --git a/plugins/catalog-react/src/alpha/filter/parseFilterExpression.test.ts b/plugins/catalog/src/alpha/filter/parseFilterExpression.test.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/parseFilterExpression.test.ts rename to plugins/catalog/src/alpha/filter/parseFilterExpression.test.ts diff --git a/plugins/catalog-react/src/alpha/filter/parseFilterExpression.ts b/plugins/catalog/src/alpha/filter/parseFilterExpression.ts similarity index 100% rename from plugins/catalog-react/src/alpha/filter/parseFilterExpression.ts rename to plugins/catalog/src/alpha/filter/parseFilterExpression.ts diff --git a/plugins/catalog/src/alpha/pages.tsx b/plugins/catalog/src/alpha/pages.tsx index 8eef497845..c1f5b55341 100644 --- a/plugins/catalog/src/alpha/pages.tsx +++ b/plugins/catalog/src/alpha/pages.tsx @@ -31,11 +31,11 @@ import { EntityHeaderBlueprint, EntityContentBlueprint, defaultEntityContentGroups, - buildFilterFn, EntityContextMenuItemBlueprint, } from '@backstage/plugin-catalog-react/alpha'; import { rootRouteRef } from '../routes'; import { useEntityFromUrl } from '../components/CatalogEntityPage/useEntityFromUrl'; +import { buildFilterFn } from './filter/FilterWrapper'; export const catalogPage = PageBlueprint.makeWithOverrides({ inputs: {