From c1f74aa7b5b377d6ebad8b7d3a1663be5f50ce84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= Date: Mon, 10 May 2021 18:33:47 +0000 Subject: [PATCH] Fix the check for existing users when an email is entered in the ium principal search (#9239) --- .../principal/principal-search.component.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/modules/invite-user-modal/principal/principal-search.component.ts b/frontend/src/app/modules/invite-user-modal/principal/principal-search.component.ts index 667722b46f1..e5f695d3c92 100644 --- a/frontend/src/app/modules/invite-user-modal/principal/principal-search.component.ts +++ b/frontend/src/app/modules/invite-user-modal/principal/principal-search.component.ts @@ -14,6 +14,7 @@ import {ApiV3FilterBuilder} from "core-components/api/api-v3/api-v3-filter-build import {I18nService} from "core-app/modules/common/i18n/i18n.service"; import {UntilDestroyedMixin} from "core-app/helpers/angular/until-destroyed.mixin"; import {ProjectResource} from "core-app/modules/hal/resources/project-resource"; +import {UserResource} from "core-app/modules/hal/resources/user-resource"; import {PrincipalLike} from "core-app/modules/principal/principal-types"; import {CurrentUserService} from "core-app/modules/current-user/current-user.service"; import {PrincipalType} from '../invite-user.component'; @@ -49,12 +50,12 @@ export class PrincipalSearchComponent extends UntilDestroyedMixin implements OnI this.input$, this.currentUserService.hasCapabilities$('users/create'), ).pipe( - map(([elements, input, canCreateUsers]) => - canCreateUsers + map(([elements, input, canCreateUsers]) => { + return canCreateUsers && this.type === PrincipalType.User && input?.includes('@') - && !elements.find((el:any) => el.email === input) - ), + && !elements.find((el) => (el.principal as UserResource).email === input); + }), ); public canCreateNewPlaceholder$ = combineLatest(