From 481f784d6e607129a4fa72bfcba86c66828cbd67 Mon Sep 17 00:00:00 2001 From: Quadman Date: Sun, 7 Apr 2024 18:02:59 +0200 Subject: [PATCH] made the teams limit option available in front end but with no defined default value since it is set to a default 100 in backend Signed-off-by: Quadman --- plugins/azure-devops-backend/src/service/router.ts | 4 ++++ plugins/azure-devops/src/api/AzureDevOpsClient.ts | 3 +++ plugins/azure-devops/src/hooks/usePullRequests.ts | 3 +++ 3 files changed, 10 insertions(+) diff --git a/plugins/azure-devops-backend/src/service/router.ts b/plugins/azure-devops-backend/src/service/router.ts index 98d719898a..8a3daf9f9a 100644 --- a/plugins/azure-devops-backend/src/service/router.ts +++ b/plugins/azure-devops-backend/src/service/router.ts @@ -178,6 +178,9 @@ export async function createRouter( const { projectName, repoName } = req.params; const top = req.query.top ? Number(req.query.top) : DEFAULT_TOP; + const teamsLimit = req.query.teamsLimit + ? Number(req.query.teamsLimit) + : DEFAULT_TEAMS_LIMIT; const host = req.query.host?.toString(); const org = req.query.org?.toString(); const status = req.query.status @@ -187,6 +190,7 @@ export async function createRouter( const pullRequestOptions: PullRequestOptions = { top: top, status: status, + teamsLimit: teamsLimit, }; const entityRef = req.query.entityRef; diff --git a/plugins/azure-devops/src/api/AzureDevOpsClient.ts b/plugins/azure-devops/src/api/AzureDevOpsClient.ts index ce823def06..fb9d96c7e9 100644 --- a/plugins/azure-devops/src/api/AzureDevOpsClient.ts +++ b/plugins/azure-devops/src/api/AzureDevOpsClient.ts @@ -107,6 +107,9 @@ export class AzureDevOpsClient implements AzureDevOpsApi { if (options?.status) { queryString.append('status', options.status.toString()); } + if (options?.teamsLimit) { + queryString.append('teamsLimit', options.teamsLimit.toString()); + } if (host) { queryString.append('host', host); } diff --git a/plugins/azure-devops/src/hooks/usePullRequests.ts b/plugins/azure-devops/src/hooks/usePullRequests.ts index 636e7d9562..f4145b59d7 100644 --- a/plugins/azure-devops/src/hooks/usePullRequests.ts +++ b/plugins/azure-devops/src/hooks/usePullRequests.ts @@ -31,16 +31,19 @@ export function usePullRequests( entity: Entity, defaultLimit?: number, requestedStatus?: PullRequestStatus, + defaultTeamsLimit?: number, ): { items?: PullRequest[]; loading: boolean; error?: Error; } { const top = defaultLimit ?? AZURE_DEVOPS_DEFAULT_TOP; + const teamsLimit = defaultTeamsLimit ?? undefined; const status = requestedStatus ?? PullRequestStatus.Active; const options: PullRequestOptions = { top, status, + teamsLimit, }; const api = useApi(azureDevOpsApiRef);