From d87d906c84b5f47029ed5137dc2bc1bc009050f4 Mon Sep 17 00:00:00 2001 From: Shijun Sun <30999793+AllForNothing@users.noreply.github.com> Date: Fri, 23 Dec 2022 16:09:22 +0800 Subject: [PATCH] Switch listUsers to searchUsers for adding project member (#18022) Fixes #18000 Signed-off-by: AllForNothing Signed-off-by: AllForNothing --- .../app/base/project/member/add-group/add-group.component.ts | 2 +- .../project/member/add-member/add-member.component.spec.ts | 2 +- .../base/project/member/add-member/add-member.component.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/portal/src/app/base/project/member/add-group/add-group.component.ts b/src/portal/src/app/base/project/member/add-group/add-group.component.ts index b5ea0dcd8..b6d5e5309 100644 --- a/src/portal/src/app/base/project/member/add-group/add-group.component.ts +++ b/src/portal/src/app/base/project/member/add-group/add-group.component.ts @@ -225,7 +225,7 @@ export class AddGroupComponent implements OnInit, OnDestroy { group_name: '', }; this.isGroupNameValid = true; - this.groupTooltip = 'MEMBER.USERNAME_IS_REQUIRED'; + this.groupTooltip = 'MEMBER.GROUP_NAME_REQUIRED'; this.searchedGroups = []; } isValid(): boolean { diff --git a/src/portal/src/app/base/project/member/add-member/add-member.component.spec.ts b/src/portal/src/app/base/project/member/add-member/add-member.component.spec.ts index 000f05c88..79d99a326 100644 --- a/src/portal/src/app/base/project/member/add-member/add-member.component.spec.ts +++ b/src/portal/src/app/base/project/member/add-member/add-member.component.spec.ts @@ -17,7 +17,7 @@ describe('AddMemberComponent', () => { }, }; const mockUserService = { - listUsers: () => { + searchUsers: () => { return of([[], []]); }, }; diff --git a/src/portal/src/app/base/project/member/add-member/add-member.component.ts b/src/portal/src/app/base/project/member/add-member/add-member.component.ts index e35c1dc0f..6e5348109 100644 --- a/src/portal/src/app/base/project/member/add-member/add-member.component.ts +++ b/src/portal/src/app/base/project/member/add-member/add-member.component.ts @@ -81,10 +81,10 @@ export class AddMemberComponent implements OnInit, OnDestroy { debounceTime(500), switchMap(name => { if (name) { - return this.userService.listUsers({ + return this.userService.searchUsers({ page: 1, pageSize: 10, - q: encodeURIComponent(`username=~${name}`), + username: name, }); } else { return of([]);