From 8c60c2b1e9666826a0e4a4b5e3ed8ff8e018ea5c Mon Sep 17 00:00:00 2001 From: Art Date: Tue, 21 Sep 2021 16:02:15 +0300 Subject: [PATCH] Modified user.component and user.service to be able to use default profile image (#22) --- .../src/app/component/user/user.component.ts | 3 +-- .../src/app/service/user.service.ts | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/support-portal-frontend/src/app/component/user/user.component.ts b/support-portal-frontend/src/app/component/user/user.component.ts index a8974f4..d2b75f4 100644 --- a/support-portal-frontend/src/app/component/user/user.component.ts +++ b/support-portal-frontend/src/app/component/user/user.component.ts @@ -77,8 +77,7 @@ export class UserComponent implements OnInit, OnDestroy { } public onAddNewUser(userForm: NgForm): void { - // TODO: test if profileImage is null (we are not passing it) - let formData = this.userService.createUserFormData('', userForm.value, this.profileImage!); + let formData = this.userService.createUserFormData(null, userForm.value, this.profileImage); let subscription = this.userService.addUser(formData) .subscribe( (user: User) => { diff --git a/support-portal-frontend/src/app/service/user.service.ts b/support-portal-frontend/src/app/service/user.service.ts index 4822017..503f605 100644 --- a/support-portal-frontend/src/app/service/user.service.ts +++ b/support-portal-frontend/src/app/service/user.service.ts @@ -63,19 +63,21 @@ export class UserService { return []; } - public createUserFormData(loggedInUsername: string, user: User, profileImage: File): FormData { + public createUserFormData(loggedInUsername: string | null, user: User, profileImage: File | null): FormData { const formData = new FormData(); - formData.append('currentUsername', loggedInUsername); + if (loggedInUsername) + formData.append('currentUsername', loggedInUsername); formData.append('firstName', user.firstName); formData.append('lastName', user.lastName); formData.append("username", user.username); formData.append("email", user.email); formData.append("role", user.role); - formData.append("active", String(user.active)); - formData.append("notLocked", String(user.notLocked)); - formData.append("profileImage", profileImage); + formData.append("active", user.active ? 'true' : 'false'); + formData.append("notLocked", user.notLocked ? 'true' : 'false'); + if (profileImage) + formData.append("profileImage", profileImage); return formData; }