@backstage/plugin-catalog-backend 1.25.0 → 1.25.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @backstage/plugin-catalog-backend
 
+## 1.25.1
+
+### Patch Changes
+
+- 2fb4670: Fixed an issue with the by-query call, where ordering by a field that does not exist on all entities led to not all results being returned
+
 ## 1.25.0
 
 ### Minor Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend__alpha",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var alpha = require('@backstage/plugin-catalog-common/alpha');
 var pluginPermissionNode = require('@backstage/plugin-permission-node');
-var CatalogBuilder = require('./cjs/CatalogBuilder-BYL3AykR.cjs.js');
+var CatalogBuilder = require('./cjs/CatalogBuilder-C7ANIkk3.cjs.js');
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var pluginEventsNode = require('@backstage/plugin-events-node');
 var alpha$1 = require('@backstage/plugin-catalog-node/alpha');

package/dist/cjs/{CatalogBuilder-BYL3AykR.cjs.js → CatalogBuilder-C7ANIkk3.cjs.js}

@@ -2496,9 +2496,18 @@ class DefaultEntitiesCatalog {
       ...cursor.orderFields[0]
     };
     const [prevItemOrderFieldValue, prevItemUid] = cursor.orderFieldValues || [];
-    const dbQuery = db("search").join("final_entities", "search.entity_id", "final_entities.entity_id").where("search.key", sortField.field);
+    const dbQuery = db("final_entities").leftOuterJoin(
+      "search",
+      (qb) => qb.on("search.entity_id", "final_entities.entity_id").andOnVal("search.key", sortField.field)
+    );
     if (cursor.filter) {
-      parseFilter(cursor.filter, dbQuery, db, false, "search.entity_id");
+      parseFilter(
+        cursor.filter,
+        dbQuery,
+        db,
+        false,
+        "final_entities.entity_id"
+      );
     }
     const normalizedFullTextFilterTerm = cursor.fullTextFilter?.term?.trim();
     const textFilterFields = cursor.fullTextFilter?.fields ?? [sortField.field];
@@ -2515,7 +2524,7 @@ class DefaultEntitiesCatalog {
             `%${normalizedFullTextFilterTerm.toLocaleLowerCase("en-US")}%`
           );
         });
-        dbQuery.andWhere("search.entity_id", "in", matchQuery);
+        dbQuery.andWhere("final_entities.entity_id", "in", matchQuery);
       }
     }
     const countQuery = dbQuery.clone();
@@ -2527,23 +2536,43 @@ class DefaultEntitiesCatalog {
           isFetchingBackwards !== isOrderingDescending ? "<" : ">",
           prevItemOrderFieldValue
         ).orWhere("value", "=", prevItemOrderFieldValue).andWhere(
-          "search.entity_id",
+          "final_entities.entity_id",
           isFetchingBackwards !== isOrderingDescending ? "<" : ">",
           prevItemUid
         );
       });
     }
-    dbQuery.orderBy([
-      {
-        column: "value",
-        order: isFetchingBackwards ? invertOrder(sortField.order) : sortField.order
-      },
-      {
-        column: "search.entity_id",
-        order: isFetchingBackwards ? invertOrder(sortField.order) : sortField.order
-      }
-    ]).limit(isFetchingBackwards ? limit : limit + 1);
-    countQuery.count("search.entity_id", { as: "count" });
+    if (db.client.config.client === "pg") {
+      dbQuery.orderBy([
+        {
+          column: "search.value",
+          order: isFetchingBackwards ? invertOrder(sortField.order) : sortField.order,
+          nulls: "last"
+        },
+        {
+          column: "final_entities.entity_id",
+          order: isFetchingBackwards ? invertOrder(sortField.order) : sortField.order
+        }
+      ]);
+    } else {
+      dbQuery.orderBy([
+        {
+          column: "search.value",
+          order: void 0,
+          nulls: "last"
+        },
+        {
+          column: "search.value",
+          order: isFetchingBackwards ? invertOrder(sortField.order) : sortField.order
+        },
+        {
+          column: "final_entities.entity_id",
+          order: isFetchingBackwards ? invertOrder(sortField.order) : sortField.order
+        }
+      ]);
+    }
+    dbQuery.limit(isFetchingBackwards ? limit : limit + 1);
+    countQuery.count("final_entities.entity_id", { as: "count" });
     const [rows, [{ count }]] = await Promise.all([
       limit > 0 ? dbQuery : [],
       // for performance reasons we invoke the countQuery
@@ -7259,4 +7288,4 @@ exports.createCatalogPermissionRule = createCatalogPermissionRule;
 exports.createRandomProcessingInterval = createRandomProcessingInterval;
 exports.parseEntityYaml = parseEntityYaml;
 exports.permissionRules = permissionRules;
-//# sourceMappingURL=CatalogBuilder-BYL3AykR.cjs.js.map
+//# sourceMappingURL=CatalogBuilder-C7ANIkk3.cjs.js.map