@backstage/plugin-catalog-backend 1.25.3-next.0 → 1.26.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @backstage/plugin-catalog-backend
 
+## 1.26.0-next.2
+
+### Minor Changes
+
+- 78475c3: Allow offset mode paging in entity list provider
+
+### Patch Changes
+
+- c2b63ab: Updated dependency `supertest` to `^7.0.0`.
+- Updated dependencies
+  - @backstage/backend-common@0.25.0-next.2
+  - @backstage/backend-plugin-api@1.0.0-next.2
+  - @backstage/catalog-client@1.7.0-next.1
+  - @backstage/integration@1.15.0-next.0
+  - @backstage/backend-openapi-utils@0.1.18-next.2
+  - @backstage/plugin-permission-node@0.8.3-next.2
+  - @backstage/catalog-model@1.6.0
+  - @backstage/config@1.2.0
+  - @backstage/errors@1.2.4
+  - @backstage/types@1.1.1
+  - @backstage/plugin-catalog-common@1.0.26
+  - @backstage/plugin-catalog-node@1.12.7-next.2
+  - @backstage/plugin-events-node@0.4.0-next.2
+  - @backstage/plugin-permission-common@0.8.1
+  - @backstage/plugin-search-backend-module-catalog@0.2.2-next.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.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.3-next.0
 
 ### Patch Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-catalog-backend__alpha",
-  "version": "1.25.3-next.0",
+  "version": "1.26.0-next.2",
   "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-DeLH-BIi.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-C7ANIkk3.cjs.js → CatalogBuilder-DeLH-BIi.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);
@@ -2571,6 +2579,9 @@ class DefaultEntitiesCatalog {
         }
       ]);
     }
+    if (isQueryEntitiesInitialRequest(request) && request.offset !== void 0) {
+      dbQuery.offset(request.offset);
+    }
     dbQuery.limit(isFetchingBackwards ? limit : limit + 1);
     countQuery.count("final_entities.entity_id", { as: "count" });
     const [rows, [{ count }]] = await Promise.all([
@@ -4978,6 +4989,9 @@ const spec = {
           {
             $ref: "#/components/parameters/limit"
           },
+          {
+            $ref: "#/components/parameters/offset"
+          },
           {
             $ref: "#/components/parameters/orderField"
           },
@@ -5508,6 +5522,7 @@ async function createRouter(options) {
     }).get("/entities/by-query", async (req, res) => {
       const { items, pageInfo, totalItems } = await entitiesCatalog.queryEntities({
         limit: req.query.limit,
+        offset: req.query.offset,
         ...parseQueryEntitiesParams(req.query),
         credentials: await httpAuth.credentials(req)
       });
@@ -7288,4 +7303,4 @@ exports.createCatalogPermissionRule = createCatalogPermissionRule;
 exports.createRandomProcessingInterval = createRandomProcessingInterval;
 exports.parseEntityYaml = parseEntityYaml;
 exports.permissionRules = permissionRules;
-//# sourceMappingURL=CatalogBuilder-C7ANIkk3.cjs.js.map
+//# sourceMappingURL=CatalogBuilder-DeLH-BIi.cjs.js.map