@backstage/plugin-catalog-backend 1.8.0 → 1.8.1-next.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @backstage/plugin-catalog-backend
 
+## 1.8.1-next.0
+
+### Patch Changes
+
+- c9a0fdcd2c8: Fix deprecated types.
+- 899ebfd8e02: Add full text search support to the `by-query` endpoint.
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.2.7-next.0
+  - @backstage/backend-common@0.18.4-next.0
+  - @backstage/config@1.0.7
+  - @backstage/integration@1.4.3
+  - @backstage/backend-plugin-api@0.5.1-next.0
+  - @backstage/catalog-client@1.4.0
+  - @backstage/catalog-model@1.2.1
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.12
+  - @backstage/plugin-catalog-node@1.3.5-next.0
+  - @backstage/plugin-permission-common@0.7.4
+  - @backstage/plugin-permission-node@0.7.7-next.0
+  - @backstage/plugin-search-common@1.2.2
+
 ## 1.8.0
 
 ### Minor Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.8.0",
+  "version": "1.8.1-next.0",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -2245,7 +2245,7 @@ class DefaultEntitiesCatalog {
     return { items };
   }
   async queryEntities(request) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const db = this.database;
     const limit = (_a = request.limit) != null ? _a : DEFAULT_LIMIT;
     const cursor = {
@@ -2267,11 +2267,22 @@ class DefaultEntitiesCatalog {
       parseFilter(cursor.filter, dbQuery, db, false, "search.entity_id");
     }
     const normalizedFullTextFilterTerm = (_c = (_b = cursor.fullTextFilter) == null ? void 0 : _b.term) == null ? void 0 : _c.trim();
+    const textFilterFields = (_e = (_d = cursor.fullTextFilter) == null ? void 0 : _d.fields) != null ? _e : [sortField.field];
     if (normalizedFullTextFilterTerm) {
-      dbQuery.andWhereRaw(
-        "value like ?",
-        `%${normalizedFullTextFilterTerm.toLocaleLowerCase("en-US")}%`
-      );
+      if (textFilterFields.length === 1 && textFilterFields[0] === sortField.field) {
+        dbQuery.andWhereRaw(
+          "value like ?",
+          `%${normalizedFullTextFilterTerm.toLocaleLowerCase("en-US")}%`
+        );
+      } else {
+        const matchQuery = db("search").select("search.entity_id").whereIn("key", textFilterFields).andWhere(function keyFilter() {
+          this.andWhereRaw(
+            "value like ?",
+            `%${normalizedFullTextFilterTerm.toLocaleLowerCase("en-US")}%`
+          );
+        });
+        dbQuery.andWhere("search.entity_id", "in", matchQuery);
+      }
     }
     const countQuery = dbQuery.clone();
     const isOrderingDescending = sortField.order === "desc";