@backstage/plugin-catalog-backend 1.25.2 → 1.25.3-next.1

package/CHANGELOG.md

@@ -1,23 +1,52 @@
 # @backstage/plugin-catalog-backend
 
-## 1.25.2
+## 1.25.3-next.1
 
 ### Patch Changes
 
+- 1882cfe: Moved `getEntities` ordering to utilize database instead of having it inside catalog client
+
+  Please note that the latest version of `@backstage/catalog-client` will not order the entities in the same way as before. This is because the ordering is now done in the database query instead of in the client. If you rely on the ordering of the entities, you may need to update your backend plugin or code to handle this change.
+
 - Updated dependencies
-  - @backstage/backend-common@0.24.1
-  - @backstage/plugin-events-node@0.3.10
-  - @backstage/plugin-permission-node@0.8.2
-  - @backstage/plugin-search-backend-module-catalog@0.2.1
-  - @backstage/backend-plugin-api@0.8.1
-  - @backstage/plugin-catalog-node@1.12.6
-  - @backstage/backend-openapi-utils@0.1.17
+  - @backstage/backend-common@0.25.0-next.1
+  - @backstage/catalog-client@1.6.7-next.0
+  - @backstage/backend-openapi-utils@0.1.18-next.1
+  - @backstage/backend-plugin-api@0.9.0-next.1
+  - @backstage/catalog-model@1.6.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.14.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.26
+  - @backstage/plugin-catalog-node@1.12.7-next.1
+  - @backstage/plugin-events-node@0.4.0-next.1
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-permission-node@0.8.3-next.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.2-next.1
 
-## 1.25.1
+## 1.25.3-next.0
 
 ### 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
+- d425fc4: Modules, plugins, and services are now `BackendFeature`, not a function that returns a feature.
+- 53cce86: 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
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.9.0-next.0
+  - @backstage/plugin-search-backend-module-catalog@0.2.2-next.0
+  - @backstage/plugin-permission-node@0.8.3-next.0
+  - @backstage/backend-common@0.25.0-next.0
+  - @backstage/plugin-events-node@0.4.0-next.0
+  - @backstage/backend-openapi-utils@0.1.18-next.0
+  - @backstage/plugin-catalog-node@1.12.7-next.0
+  - @backstage/catalog-client@1.6.6
+  - @backstage/catalog-model@1.6.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/integration@1.14.0
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.26
+  - @backstage/plugin-permission-common@0.8.1
 
 ## 1.25.0
 

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend__alpha",
-  "version": "1.25.2",
+  "version": "1.25.3-next.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-C7ANIkk3.cjs.js');
+var CatalogBuilder = require('./cjs/CatalogBuilder-BQ7aDMTH.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/alpha.d.ts

@@ -121,6 +121,6 @@ declare const permissionRules: {
  * Catalog plugin
  * @alpha
  */
-declare const catalogPlugin: _backstage_backend_plugin_api.BackendFeatureCompat;
+declare const catalogPlugin: _backstage_backend_plugin_api.BackendFeature;
 
 export { type CatalogPermissionRule, catalogConditions, createCatalogConditionalDecision, createCatalogPermissionRule, catalogPlugin as default, permissionRules };

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

@@ -2407,7 +2407,15 @@ class DefaultEntitiesCatalog {
         ]);
       }
     });
-    entitiesQuery = entitiesQuery.orderBy("final_entities.entity_id", "asc");
+    if (!request?.order) {
+      entitiesQuery = entitiesQuery.leftOuterJoin(
+        "refresh_state",
+        "refresh_state.entity_id",
+        "final_entities.entity_id"
+      ).orderBy("refresh_state.entity_ref", "asc");
+    } else {
+      entitiesQuery.orderBy("final_entities.entity_id", "asc");
+    }
     const { limit, offset } = parsePagination(request?.pagination);
     if (limit !== void 0) {
       entitiesQuery = entitiesQuery.limit(limit + 1);
@@ -7288,4 +7296,4 @@ exports.createCatalogPermissionRule = createCatalogPermissionRule;
 exports.createRandomProcessingInterval = createRandomProcessingInterval;
 exports.parseEntityYaml = parseEntityYaml;
 exports.permissionRules = permissionRules;
-//# sourceMappingURL=CatalogBuilder-C7ANIkk3.cjs.js.map
+//# sourceMappingURL=CatalogBuilder-BQ7aDMTH.cjs.js.map