@backstage/plugin-catalog-backend 1.9.1-next.1 → 1.9.1

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # @backstage/plugin-catalog-backend
 
+## 1.9.1
+
+### Patch Changes
+
+- ce8d203235b: Ensure that entity cache state is only written to the database when actually changed
+- 485a6c5f7b5: Internal refactoring for performance in the service handlers
+- 3587a968dcd: Fixed a bug in the `queryEntities` endpoint that was causing filtered entities to be included in cursor requests.
+- ce335df9d1c: Improve the query for orphan pruning
+- 27956d78671: Adjusted the OpenAPI schema file name according to the new structure
+- 51064e6e5ee: Change orphan cleanup task to only log a message if it deleted entities.
+- 12a345317ab: Remove unnecessary join in the entity facets endpoint, exclude nulls
+- Updated dependencies
+  - @backstage/backend-common@0.18.5
+  - @backstage/integration@1.4.5
+  - @backstage/plugin-scaffolder-common@1.3.0
+  - @backstage/plugin-permission-node@0.7.8
+  - @backstage/backend-tasks@0.5.2
+  - @backstage/plugin-catalog-node@1.3.6
+  - @backstage/plugin-search-backend-module-catalog@0.1.1
+  - @backstage/backend-plugin-api@0.5.2
+  - @backstage/catalog-client@1.4.1
+  - @backstage/catalog-model@1.3.0
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/types@1.0.2
+  - @backstage/plugin-catalog-common@1.0.13
+  - @backstage/plugin-permission-common@0.7.5
+  - @backstage/plugin-search-common@1.2.3
+
+## 1.9.1-next.2
+
+### Patch Changes
+
+- ce8d203235b: Ensure that entity cache state is only written to the database when actually changed
+- 485a6c5f7b5: Internal refactoring for performance in the service handlers
+- 3587a968dcd: Fixed a bug in the `queryEntities` endpoint that was causing filtered entities to be included in cursor requests.
+- 12a345317ab: Remove unnecessary join in the entity facets endpoint, exclude nulls
+- Updated dependencies
+  - @backstage/plugin-scaffolder-common@1.3.0-next.0
+  - @backstage/config@1.0.7
+
 ## 1.9.1-next.1
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.9.1-next.1",
+  "version": "1.9.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-ecfd2db6.cjs.js');
+var CatalogBuilder = require('./cjs/CatalogBuilder-6a9091b7.cjs.js');
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var alpha$1 = require('@backstage/plugin-catalog-node/alpha');
 var backendCommon = require('@backstage/backend-common');

package/dist/cjs/{CatalogBuilder-ecfd2db6.cjs.js → CatalogBuilder-6a9091b7.cjs.js}

@@ -1177,10 +1177,12 @@ async function deleteOrphanedEntities(options) {
   for (let i = 0; i < 100; ++i) {
     const candidates = await tx.with(
       "orphans",
-      (orphans) => orphans.from("refresh_state").select("entity_id", "entity_ref").whereNotIn(
-        "entity_ref",
-        (keep) => keep.distinct("target_entity_ref").from("refresh_state_references")
-      )
+      ["entity_id", "entity_ref"],
+      (orphans) => orphans.from("refresh_state").select("refresh_state.entity_id", "refresh_state.entity_ref").leftOuterJoin(
+        "refresh_state_references",
+        "refresh_state_references.target_entity_ref",
+        "refresh_state.entity_ref"
+      ).whereNull("refresh_state_references.target_entity_ref")
     ).select({
       entityId: "orphans.entity_id",
       relationSourceId: "refresh_state.entity_id"
@@ -1563,7 +1565,8 @@ class DefaultCatalogProcessingEngine {
           });
           track.markProcessorsCompleted(result);
           if (result.ok) {
-            if (stableStringify__default["default"](state) !== stableStringify__default["default"](result.state)) {
+            const { ttl: _, ...stateWithoutTtl } = state != null ? state : {};
+            if (stableStringify__default["default"](stateWithoutTtl) !== stableStringify__default["default"](result.state)) {
               await this.processingDatabase.transaction(async (tx) => {
                 await this.processingDatabase.updateEntityCache(tx, {
                   id,
@@ -1696,7 +1699,9 @@ class DefaultCatalogProcessingEngine {
       try {
         await this.processingDatabase.transaction(async (tx) => {
           const n = await this.processingDatabase.deleteOrphanedEntities(tx);
-          this.logger.info(`Deleted ${n} orphaned entities`);
+          if (n > 0) {
+            this.logger.info(`Deleted ${n} orphaned entities`);
+          }
         });
       } catch (error) {
         this.logger.warn(`Failed to delete orphaned entities`, error);
@@ -2018,46 +2023,45 @@ function parsePagination(input) {
     return {};
   }
   let { limit, offset } = input;
-  if (input.after !== void 0) {
-    let cursor;
-    try {
-      const json = Buffer.from(input.after, "base64").toString("utf8");
-      cursor = JSON.parse(json);
-    } catch {
-      throw new errors.InputError("Malformed after cursor, could not be parsed");
-    }
-    if (cursor.limit !== void 0) {
-      if (!Number.isInteger(cursor.limit)) {
-        throw new errors.InputError("Malformed after cursor, limit was not an number");
-      }
-      limit = cursor.limit;
+  if (input.after === void 0) {
+    return { limit, offset };
+  }
+  let cursor;
+  try {
+    const json = Buffer.from(input.after, "base64").toString("utf8");
+    cursor = JSON.parse(json);
+  } catch {
+    throw new errors.InputError("Malformed after cursor, could not be parsed");
+  }
+  if (cursor.limit !== void 0) {
+    if (!Number.isInteger(cursor.limit)) {
+      throw new errors.InputError("Malformed after cursor, limit was not an number");
     }
-    if (cursor.offset !== void 0) {
-      if (!Number.isInteger(cursor.offset)) {
-        throw new errors.InputError("Malformed after cursor, offset was not a number");
-      }
-      offset = cursor.offset;
+    limit = cursor.limit;
+  }
+  if (cursor.offset !== void 0) {
+    if (!Number.isInteger(cursor.offset)) {
+      throw new errors.InputError("Malformed after cursor, offset was not a number");
     }
+    offset = cursor.offset;
   }
   return { limit, offset };
 }
 function stringifyPagination(input) {
-  const json = JSON.stringify({ limit: input.limit, offset: input.offset });
+  const { limit, offset } = input;
+  const json = JSON.stringify({ limit, offset });
   const base64 = Buffer.from(json, "utf8").toString("base64");
   return base64;
 }
 function addCondition(queryBuilder, db, filter, negate = false, entityIdField = "entity_id") {
-  const matchQuery = db("search").select("search.entity_id").where({ key: filter.key.toLowerCase() }).andWhere(function keyFilter() {
-    if (filter.values) {
-      if (filter.values.length === 1) {
-        this.where({ value: filter.values[0].toLowerCase() });
-      } else {
-        this.andWhere(
-          "value",
-          "in",
-          filter.values.map((v) => v.toLowerCase())
-        );
-      }
+  var _a;
+  const key = filter.key.toLowerCase();
+  const values = (_a = filter.values) == null ? void 0 : _a.map((v) => v.toLowerCase());
+  const matchQuery = db("search").select("search.entity_id").where({ key }).andWhere(function keyFilter() {
+    if ((values == null ? void 0 : values.length) === 1) {
+      this.where({ value: values.at(0) });
+    } else if (values) {
+      this.andWhere("value", "in", values);
     }
   });
   queryBuilder.andWhere(entityIdField, negate ? "not in" : "in", matchQuery);
@@ -2072,14 +2076,14 @@ function isNegationEntityFilter(filter) {
   return filter.hasOwnProperty("not");
 }
 function parseFilter(filter, query, db, negate = false, entityIdField = "entity_id") {
+  if (isNegationEntityFilter(filter)) {
+    return parseFilter(filter.not, query, db, !negate, entityIdField);
+  }
   if (isEntitiesSearchFilter(filter)) {
     return query.andWhere(function filterFunction() {
       addCondition(this, db, filter, negate, entityIdField);
     });
   }
-  if (isNegationEntityFilter(filter)) {
-    return parseFilter(filter.not, query, db, !negate, entityIdField);
-  }
   return query[negate ? "andWhereNot" : "andWhere"](function filterFunction() {
     var _a, _b;
     if (isOrEntityFilter(filter)) {
@@ -2256,13 +2260,12 @@ class DefaultEntitiesCatalog {
     const countQuery = dbQuery.clone();
     const isOrderingDescending = sortField.order === "desc";
     if (prevItemOrderFieldValue) {
-      dbQuery.andWhere(
-        "value",
-        isFetchingBackwards !== isOrderingDescending ? "<" : ">",
-        prevItemOrderFieldValue
-      );
-      dbQuery.orWhere(function nested() {
-        this.where("value", "=", prevItemOrderFieldValue).andWhere(
+      dbQuery.andWhere(function nested() {
+        this.where(
+          "value",
+          isFetchingBackwards !== isOrderingDescending ? "<" : ">",
+          prevItemOrderFieldValue
+        ).orWhere("value", "=", prevItemOrderFieldValue).andWhere(
           "search.entity_id",
           isFetchingBackwards !== isOrderingDescending ? "<" : ">",
           prevItemUid
@@ -2416,7 +2419,7 @@ class DefaultEntitiesCatalog {
     const facets = {};
     const db = this.database;
     for (const facet of request.facets) {
-      const dbQuery = db("search").join("final_entities", "search.entity_id", "final_entities.entity_id").where("search.key", facet.toLocaleLowerCase("en-US")).count("search.entity_id as count").select({ value: "search.original_value" }).groupBy("search.original_value");
+      const dbQuery = db("search").where("search.key", facet.toLocaleLowerCase("en-US")).whereNotNull("search.original_value").select({ value: "search.original_value", count: db.raw("count(*)") }).groupBy("search.original_value");
       if (request == null ? void 0 : request.filter) {
         parseFilter(request.filter, dbQuery, db, false, "search.entity_id");
       }
@@ -5056,4 +5059,4 @@ exports.createCatalogPermissionRule = createCatalogPermissionRule;
 exports.createRandomProcessingInterval = createRandomProcessingInterval;
 exports.parseEntityYaml = parseEntityYaml;
 exports.permissionRules = permissionRules;
-//# sourceMappingURL=CatalogBuilder-ecfd2db6.cjs.js.map
+//# sourceMappingURL=CatalogBuilder-6a9091b7.cjs.js.map