Merge pull request #27159 from drodil/fix_scaffolder_total_query

fix(1.32.0): scaffolder total query
This commit is contained in:
Ben Lambert
2024-10-16 08:43:01 +02:00
committed by GitHub
2 changed files with 8 additions and 3 deletions
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-scaffolder-backend': patch
---
Fix tasks listing with postgres
@@ -213,6 +213,9 @@ export class DatabaseTaskStore implements TaskStore {
queryBuilder.whereIn('status', [...new Set(arr)]);
}
const countQuery = queryBuilder.clone();
countQuery.count('tasks.id', { as: 'count' });
if (order) {
order.forEach(f => {
queryBuilder.orderBy(f.field, f.order);
@@ -221,9 +224,6 @@ export class DatabaseTaskStore implements TaskStore {
queryBuilder.orderBy('created_at', 'desc');
}
const countQuery = queryBuilder.clone();
countQuery.count('tasks.id', { as: 'count' });
if (pagination?.limit !== undefined) {
queryBuilder.limit(pagination.limit);
}