diff --git a/plugins/catalog-react/report-alpha.api.md b/plugins/catalog-react/report-alpha.api.md index 1619bc6a3d..f495a043cc 100644 --- a/plugins/catalog-react/report-alpha.api.md +++ b/plugins/catalog-react/report-alpha.api.md @@ -363,12 +363,6 @@ export type EntityPredicateValue = $contains: EntityPredicateExpression; }; -// @alpha -export function evaluateEntityPredicate( - filter: EntityPredicate, - value: JsonValue, -): boolean; - // @alpha export function isOwnerOf(owner: Entity, entity: Entity): boolean; diff --git a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.test.ts b/plugins/catalog-react/src/alpha/predicates/entityPredicateToFilterFunction.test.ts similarity index 96% rename from plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.test.ts rename to plugins/catalog-react/src/alpha/predicates/entityPredicateToFilterFunction.test.ts index 261beae5ba..3e55bb33bd 100644 --- a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.test.ts +++ b/plugins/catalog-react/src/alpha/predicates/entityPredicateToFilterFunction.test.ts @@ -14,10 +14,10 @@ * limitations under the License. */ -import { evaluateEntityPredicate } from './evaluateEntityPredicate'; +import { entityPredicateToFilterFunction } from './entityPredicateToFilterFunction'; import { EntityPredicate } from './types'; -describe('evaluateEntityPredicate', () => { +describe('entityPredicateToFilterFunction', () => { const entities = [ { apiVersion: 'backstage.io/v1alpha1', @@ -228,7 +228,7 @@ describe('evaluateEntityPredicate', () => { ], ])('filter entry %#', (expected, filter) => { const filtered = entities.filter(entity => - evaluateEntityPredicate(filter, entity), + entityPredicateToFilterFunction(filter)(entity), ); expect(filtered.map(e => e.metadata.name).sort()).toEqual( expected.split(',').filter(Boolean).sort(), diff --git a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.ts b/plugins/catalog-react/src/alpha/predicates/entityPredicateToFilterFunction.ts similarity index 98% rename from plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.ts rename to plugins/catalog-react/src/alpha/predicates/entityPredicateToFilterFunction.ts index 514f01f0ad..56a6efe723 100644 --- a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.ts +++ b/plugins/catalog-react/src/alpha/predicates/entityPredicateToFilterFunction.ts @@ -35,9 +35,9 @@ export function entityPredicateToFilterFunction( /** * Evaluate a entity predicate against a value, typically an entity. * - * @alpha + * @internal */ -export function evaluateEntityPredicate( +function evaluateEntityPredicate( filter: EntityPredicate, value: JsonValue, ): boolean { diff --git a/plugins/catalog-react/src/alpha/predicates/index.ts b/plugins/catalog-react/src/alpha/predicates/index.ts index 5a9a747138..71be7403de 100644 --- a/plugins/catalog-react/src/alpha/predicates/index.ts +++ b/plugins/catalog-react/src/alpha/predicates/index.ts @@ -20,7 +20,4 @@ export type { EntityPredicatePrimitive, EntityPredicateValue, } from './types'; -export { - evaluateEntityPredicate, - entityPredicateToFilterFunction, -} from './evaluateEntityPredicate'; +export { entityPredicateToFilterFunction } from './entityPredicateToFilterFunction';