Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +my-account / my-account-settings / my-account-settings.component.ts

diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
index a3a8ff1f19020555159b8671cdd493e32123f8a1..577f4a252a7d31e5ee8e03595962b5ba1544be6c 100644 (file)
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts
@@ -1,7 +1,8 @@
 import { ViewportScroller } from '@angular/common'
+import { HttpErrorResponse } from '@angular/common/http'
 import { AfterViewChecked, Component, OnInit } from '@angular/core'
 import { AuthService, Notifier, User, UserService } from '@app/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
+import { genericUploadErrorHandler } from '@app/helpers'
 
 @Component({
   selector: 'my-account-settings',
@@ -17,8 +18,7 @@ export class MyAccountSettingsComponent implements OnInit, AfterViewChecked {
     private viewportScroller: ViewportScroller,
     private userService: UserService,
     private authService: AuthService,
-    private notifier: Notifier,
-    private i18n: I18n
+    private notifier: Notifier
   ) {}
 
   get userInformationLoaded () {
@@ -39,14 +39,31 @@ export class MyAccountSettingsComponent implements OnInit, AfterViewChecked {
 
   onAvatarChange (formData: FormData) {
     this.userService.changeAvatar(formData)
-      .subscribe(
-        data => {
-          this.notifier.success(this.i18n('Avatar changed.'))
+      .subscribe({
+        next: data => {
+          this.notifier.success($localize`Avatar changed.`)
 
-          this.user.updateAccountAvatar(data.avatar)
+          this.user.updateAccountAvatar(data.avatars)
         },
 
-        err => this.notifier.error(err.message)
-      )
+        error: (err: HttpErrorResponse) => genericUploadErrorHandler({
+          err,
+          name: $localize`avatar`,
+          notifier: this.notifier
+        })
+      })
+  }
+
+  onAvatarDelete () {
+    this.userService.deleteAvatar()
+      .subscribe({
+        next: data => {
+          this.notifier.success($localize`Avatar deleted.`)
+
+          this.user.updateAccountAvatar()
+        },
+
+        error: (err: HttpErrorResponse) => this.notifier.error(err.message)
+      })
   }
 }