From bde3d6fd27e37d0098849c3b78ecd562c8f0c354 Mon Sep 17 00:00:00 2001 From: Ke Ma Date: Fri, 31 Mar 2023 18:17:36 +0200 Subject: [PATCH 1/5] fix: sortField is changed to orderField Signed-off-by: Ke Ma --- packages/catalog-client/src/CatalogClient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts index be4ae6289d..c388519e05 100644 --- a/packages/catalog-client/src/CatalogClient.ts +++ b/packages/catalog-client/src/CatalogClient.ts @@ -230,7 +230,7 @@ export class CatalogClient implements CatalogApi { } if (orderFields !== undefined) { (Array.isArray(orderFields) ? orderFields : [orderFields]).forEach( - ({ field, order }) => params.push(`sortField=${field},${order}`), + ({ field, order }) => params.push(`orderField=${field},${order}`), ); } if (fields.length) { From c1c4e080b797b487404cd4bd02b3aef243c82148 Mon Sep 17 00:00:00 2001 From: Ke Ma Date: Fri, 31 Mar 2023 18:23:46 +0200 Subject: [PATCH 2/5] add changelog Signed-off-by: Ke Ma --- .changeset/eight-trainers-smoke.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/eight-trainers-smoke.md diff --git a/.changeset/eight-trainers-smoke.md b/.changeset/eight-trainers-smoke.md new file mode 100644 index 0000000000..338df0d44e --- /dev/null +++ b/.changeset/eight-trainers-smoke.md @@ -0,0 +1,5 @@ +--- +'@backstage/catalog-client': minor +--- + +Fixed bug in queryEntities of CatalogClient where the sortField is supposed to be changed to orderField. From c546627cceb0214a17cf1cc27b8c9142822a87f9 Mon Sep 17 00:00:00 2001 From: Ke Ma Date: Sat, 1 Apr 2023 10:58:43 +0200 Subject: [PATCH 3/5] fix changeset Signed-off-by: Ke Ma --- .changeset/eight-trainers-smoke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/eight-trainers-smoke.md b/.changeset/eight-trainers-smoke.md index 338df0d44e..9e4aaf3c9e 100644 --- a/.changeset/eight-trainers-smoke.md +++ b/.changeset/eight-trainers-smoke.md @@ -2,4 +2,4 @@ '@backstage/catalog-client': minor --- -Fixed bug in queryEntities of CatalogClient where the sortField is supposed to be changed to orderField. +Fixed bug in `queryEntities` of `CatalogClient` where the `sortField` is supposed to be changed to `orderField`. From 199905a9144a75844428517db069439a24932c9b Mon Sep 17 00:00:00 2001 From: Ke Ma Date: Sat, 1 Apr 2023 12:59:22 +0200 Subject: [PATCH 4/5] fix test Signed-off-by: Ke Ma --- packages/catalog-client/src/CatalogClient.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/catalog-client/src/CatalogClient.test.ts b/packages/catalog-client/src/CatalogClient.test.ts index 53bb55b95f..f5c221569d 100644 --- a/packages/catalog-client/src/CatalogClient.test.ts +++ b/packages/catalog-client/src/CatalogClient.test.ts @@ -352,7 +352,7 @@ describe('CatalogClient', () => { ], }); expect(mockedEndpoint.mock.calls[0][0].url.search).toBe( - '?limit=100&sortField=metadata.name,asc&sortField=metadata.uid,desc&fields=a,b&fullTextFilterTerm=query', + '?limit=100&orderField=metadata.name,asc&orderField=metadata.uid,desc&fields=a,b&fullTextFilterTerm=query', ); }); From 6dfe695b09e29b1a4c356dd239a25d5e51167e41 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 4 Apr 2023 10:04:26 +0200 Subject: [PATCH 5/5] Update .changeset/eight-trainers-smoke.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Fredrik Adelöw Signed-off-by: Mark --- .changeset/eight-trainers-smoke.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/eight-trainers-smoke.md b/.changeset/eight-trainers-smoke.md index 9e4aaf3c9e..4c3cd33fbb 100644 --- a/.changeset/eight-trainers-smoke.md +++ b/.changeset/eight-trainers-smoke.md @@ -1,5 +1,5 @@ --- -'@backstage/catalog-client': minor +'@backstage/catalog-client': patch --- Fixed bug in `queryEntities` of `CatalogClient` where the `sortField` is supposed to be changed to `orderField`.