From 6c047a5a3773ea7b3326cace5c2391d7f5fbe777 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 24 Feb 2025 00:40:10 +0100
Subject: [PATCH] catalog-react: remove $eq and $ne value predicate

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../alpha/predicates/createEntityPredicateSchema.test.ts    | 4 ++--
 .../src/alpha/predicates/createEntityPredicateSchema.ts     | 2 --
 .../src/alpha/predicates/evaluateEntityPredicate.test.ts    | 4 ++--
 .../src/alpha/predicates/evaluateEntityPredicate.ts         | 6 ------
 plugins/catalog-react/src/alpha/predicates/types.ts         | 2 --
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts
index 3df0b1a95f..3334343e8b 100644
--- a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts
+++ b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.test.ts
@@ -65,8 +65,8 @@ describe('createEntityPredicateSchema', () => {
     { kind: 'component', 'spec.type': { $in: ['service'] } },
     { 'spec.owner': { $exists: true } },
     { 'spec.owner': { $exists: false } },
-    { 'spec.type': { $eq: 'service' } },
-    { 'spec.type': { $ne: 'service' } },
+    { 'spec.type': 'service' },
+    { $not: { 'spec.type': 'service' } },
     {
       kind: 'component',
       'metadata.annotations.github.com/repo': { $exists: true },
diff --git a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
index c9c5c4815c..147769c937 100644
--- a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
+++ b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
@@ -42,8 +42,6 @@ export function createEntityPredicateSchema(z: typeof zImpl) {
   valuePredicateSchema = z.union([
     comparableValueSchema,
     z.object({ $exists: z.boolean() }),
-    z.object({ $eq: z.union([primitiveSchema, z.array(primitiveSchema)]) }),
-    z.object({ $ne: z.union([primitiveSchema, z.array(primitiveSchema)]) }),
     z.object({ $in: z.array(primitiveSchema) }),
     z.object({ $contains: predicateSchema }),
   ]) as ZodType<EntityPredicateValue>;
diff --git a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.test.ts b/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.test.ts
index e6a46d4a2d..841056d01e 100644
--- a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.test.ts
+++ b/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.test.ts
@@ -211,8 +211,8 @@ describe('evaluateEntityPredicate', () => {
     ],
     ['s,w,a', { 'spec.owner': { $exists: true } }],
     ['g', { 'spec.owner': { $exists: false } }],
-    ['s', { 'spec.type': { $eq: 'service' } }],
-    ['w,g,a', { 'spec.type': { $ne: 'service' } }],
+    ['s', { 'spec.type': 'service' }],
+    ['w,g,a', { $not: { 'spec.type': 'service' } }],
     ['', { 'spec.type': null }],
     [
       's,w',
diff --git a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.ts b/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.ts
index b687773604..7bd301a889 100644
--- a/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.ts
+++ b/plugins/catalog-react/src/alpha/predicates/evaluateEntityPredicate.ts
@@ -99,12 +99,6 @@ function evaluatePredicateValue(
     }
     return value === undefined;
   }
-  if ('$eq' in filter) {
-    return valuesAreEqual(value, filter.$eq);
-  }
-  if ('$ne' in filter) {
-    return !valuesAreEqual(value, filter.$ne);
-  }
 
   return false;
 }
diff --git a/plugins/catalog-react/src/alpha/predicates/types.ts b/plugins/catalog-react/src/alpha/predicates/types.ts
index e6932c4006..b20d90c4e5 100644
--- a/plugins/catalog-react/src/alpha/predicates/types.ts
+++ b/plugins/catalog-react/src/alpha/predicates/types.ts
@@ -33,8 +33,6 @@ export type EntityPredicateExpression = {
 export type EntityPredicateValue =
   | EntityPredicatePrimitive
   | { $exists: boolean }
-  | { $eq: EntityPredicatePrimitive }
-  | { $ne: EntityPredicatePrimitive }
   | { $in: EntityPredicatePrimitive[] }
   | { $contains: EntityPredicateExpression };