@backstage/plugin-catalog-backend 1.1.1 → 1.1.2-next.2

package/CHANGELOG.md

@@ -1,10 +1,42 @@
 # @backstage/plugin-catalog-backend
 
-## 1.1.1
+## 1.1.2-next.2
 
 ### Patch Changes
 
-- 777f2125ac: Fixed issue in `PermissionEvaluator` instance check that would cause unexpected "invalid union" errors.
+- 16a40ac4c0: Fix wrong return type of the `isGroupEntity` function.
+- 2909746147: Updated parseEntityTransformParams to handle keys with '.' in them. This will allow for querying of entities based off annotations such as 'backstage.io/orgin-location' or other entity field keys that have '.' in them.
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-scaffolder-common@1.1.0-next.0
+  - @backstage/config@1.0.1-next.0
+  - @backstage/plugin-search-common@0.3.4-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+  - @backstage/plugin-permission-common@0.6.1-next.0
+  - @backstage/plugin-permission-node@0.6.1-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+  - @backstage/plugin-catalog-common@1.0.2-next.0
+
+## 1.1.2-next.1
+
+### Patch Changes
+
+- 1ccbe081cc: Minor internal tweak to support TypeScript 4.6
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.1
+
+## 1.1.2-next.0
+
+### Patch Changes
+
+- 55e09b29dd: Fixing broken types for `knex` when checking returned rows
+- cfc0f19699: Updated dependency `fs-extra` to `10.1.0`.
+- 8cc75993a6: Fixed issue in `PermissionEvaluator` instance check that would cause unexpected "invalid union" errors.
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.0
+  - @backstage/integration@1.2.0-next.0
+  - @backstage/plugin-permission-node@0.6.1-next.0
 
 ## 1.1.0
 

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend",
-  "version": "1.1.1",
+  "version": "1.1.2-next.2",
   "main": "../dist/index.cjs.js",
   "types": "../dist/index.alpha.d.ts"
 }

package/dist/index.cjs.js

@@ -2079,11 +2079,11 @@ class DefaultEntitiesCatalog {
   }
   async entities(request) {
     const db = this.database;
-    let entitiesQuery = db("final_entities");
+    let entitiesQuery = db("final_entities").select("final_entities.*");
     if (request == null ? void 0 : request.filter) {
       entitiesQuery = parseFilter(request.filter, entitiesQuery, db);
     }
-    entitiesQuery = entitiesQuery.select("final_entities.*").whereNotNull("final_entities.final_entity").orderBy("entity_id", "asc");
+    entitiesQuery = entitiesQuery.whereNotNull("final_entities.final_entity").orderBy("entity_id", "asc");
     const { limit, offset } = parsePagination(request == null ? void 0 : request.pagination);
     if (limit !== void 0) {
       entitiesQuery = entitiesQuery.limit(limit + 1);
@@ -2703,11 +2703,11 @@ class Stitcher {
       entity.metadata.etag = hash;
     }
     const searchEntries = buildEntitySearch(entityId, entity);
-    const rowsChanged = await this.database("final_entities").update({
+    const amountOfRowsChanged = await this.database("final_entities").update({
       final_entity: JSON.stringify(entity),
       hash
     }).where("entity_id", entityId).where("stitch_ticket", ticket).onConflict("entity_id").merge(["final_entity", "hash"]);
-    if (rowsChanged.length === 0) {
+    if (amountOfRowsChanged === 0) {
       this.logger.debug(`Entity ${entityRef} is already processed, skipping write.`);
       return;
     }
@@ -2815,6 +2815,17 @@ function parseEntityPaginationParams(params) {
   };
 }
 
+function getPathArrayAndValue(input, field) {
+  return field.split(".").reduce(([pathArray, inputSubset], pathPart, index, fieldParts) => {
+    if (lodash__default["default"].hasIn(inputSubset, pathPart)) {
+      return [pathArray.concat(pathPart), inputSubset[pathPart]];
+    } else if (fieldParts[index + 1] !== void 0) {
+      fieldParts[index + 1] = `${pathPart}.${fieldParts[index + 1]}`;
+      return [pathArray, inputSubset];
+    }
+    return [pathArray, void 0];
+  }, [[], input]);
+}
 function parseEntityTransformParams(params) {
   const fieldsStrings = parseStringsParam(params.fields, "fields");
   if (!fieldsStrings) {
@@ -2830,9 +2841,9 @@ function parseEntityTransformParams(params) {
   return (input) => {
     const output = {};
     for (const field of fields) {
-      const value = lodash__default["default"].get(input, field);
+      const [pathArray, value] = getPathArrayAndValue(input, field);
       if (value !== void 0) {
-        lodash__default["default"].set(output, field, value);
+        lodash__default["default"].set(output, pathArray, value);
       }
     }
     return output;