From adcd98eb0b62b2404ed8bded0c8358dac059f41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 26 Feb 2026 16:02:46 +0100
Subject: [PATCH] feat(catalog): support query predicates in
 DefaultEntitiesCatalog.facets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
index dab605d176..a9d706582a 100644
--- a/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
+++ b/plugins/catalog-backend/src/service/DefaultEntitiesCatalog.ts
@@ -686,9 +686,10 @@ export class DefaultEntitiesCatalog implements EntitiesCatalog {
       })
       .groupBy(['search.key', 'search.original_value']);
 
-    if (request.filter) {
+    if (request.filter || request.query) {
       applyEntityFilterToQuery({
         filter: request.filter,
+        query: request.query,
         targetQuery: query,
         onEntityIdField: 'search.entity_id',
         knex: this.database,