From 7b370a5dadf45524510a2b809a937b64ede3daa6 Mon Sep 17 00:00:00 2001 From: Vincenzo Scamporlino Date: Fri, 3 Feb 2023 13:18:27 +0100 Subject: [PATCH] catalog-client: sortFields to orderFields Signed-off-by: Vincenzo Scamporlino --- packages/catalog-client/src/CatalogClient.test.ts | 4 ++-- packages/catalog-client/src/CatalogClient.ts | 6 +++--- packages/catalog-client/src/types/api.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/catalog-client/src/CatalogClient.test.ts b/packages/catalog-client/src/CatalogClient.test.ts index 4992b0d373..f11627d092 100644 --- a/packages/catalog-client/src/CatalogClient.test.ts +++ b/packages/catalog-client/src/CatalogClient.test.ts @@ -344,7 +344,7 @@ describe('CatalogClient', () => { fields: ['a', 'b'], limit: 100, query: 'query', - sortFields: [ + orderFields: [ { field: 'metadata.name', order: 'asc' }, { field: 'metadata.uid', order: 'desc' }, ], @@ -367,7 +367,7 @@ describe('CatalogClient', () => { fields: ['a', 'b'], limit: 100, query: 'query', - sortFields: [{ field: 'metadata.name', order: 'asc' }], + orderFields: [{ field: 'metadata.name', order: 'asc' }], cursor: 'cursor', }); expect(mockedEndpoint.mock.calls[0][0].url.search).toBe( diff --git a/packages/catalog-client/src/CatalogClient.ts b/packages/catalog-client/src/CatalogClient.ts index c8bf7e57c2..a380baf6e5 100644 --- a/packages/catalog-client/src/CatalogClient.ts +++ b/packages/catalog-client/src/CatalogClient.ts @@ -214,14 +214,14 @@ export class CatalogClient implements CatalogApi { const params: string[] = []; if (isQueryEntitiesInitialRequest(request)) { - const { fields = [], filter, limit, sortFields, query } = request; + const { fields = [], filter, limit, orderFields, query } = request; params.push(...this.getParams(filter)); if (limit !== undefined) { params.push(`limit=${limit}`); } - if (sortFields !== undefined) { - (Array.isArray(sortFields) ? sortFields : [sortFields]).forEach( + if (orderFields !== undefined) { + (Array.isArray(orderFields) ? orderFields : [orderFields]).forEach( ({ field, order }) => params.push(`sortField=${field},${order}`), ); } diff --git a/packages/catalog-client/src/types/api.ts b/packages/catalog-client/src/types/api.ts index 95998b3ed5..4a727b7bf0 100644 --- a/packages/catalog-client/src/types/api.ts +++ b/packages/catalog-client/src/types/api.ts @@ -400,7 +400,7 @@ export type QueryEntitiesInitialRequest = { fields?: string[]; limit?: number; filter?: EntityFilterQuery; - sortFields?: EntityOrderQuery; + orderFields?: EntityOrderQuery; query?: string; };