Handle input error in custom input text

[github/Chocobozzz/PeerTube.git] / client / src / app / +signup / +register / register.component.ts

diff --git a/client/src/app/+signup/+register/register.component.ts b/client/src/app/+signup/+register/register.component.ts
index 241ca04c6a512549adb0923c203a510f427870a7..396b27e5aee2d499fe883074f846e8249dd9905e 100644 (file)
--- a/client/src/app/+signup/+register/register.component.ts
+++ b/client/src/app/+signup/+register/register.component.ts
@@ -1,12 +1,14 @@
-import { Component, OnInit } from '@angular/core'
+import { CdkStep } from '@angular/cdk/stepper'
+import { Component, OnInit, ViewChild } from '@angular/core'
 import { FormGroup } from '@angular/forms'
 import { ActivatedRoute } from '@angular/router'
-import { AuthService, UserService } from '@app/core'
+import { AuthService } from '@app/core'
 import { HooksService } from '@app/core/plugins/hooks.service'
+import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance'
+import { UserSignupService } from '@app/shared/shared-users'
 import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap'
 import { UserRegister } from '@shared/models'
 import { ServerConfig } from '@shared/models/server'
-import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance'
 
 @Component({
   selector: 'my-register',
@@ -14,13 +16,15 @@ import { InstanceAboutAccordionComponent } from '@app/shared/shared-instance'
   styleUrls: [ './register.component.scss' ]
 })
 export class RegisterComponent implements OnInit {
+  @ViewChild('lastStep') lastStep: CdkStep
+
   accordion: NgbAccordion
-  info: string = null
-  error: string = null
-  success: string = null
-  signupDone = false
+
+  signupError: string
+  signupSuccess = false
 
   videoUploadDisabled: boolean
+  videoQuota: number
 
   formStepTerms: FormGroup
   formStepUser: FormGroup
@@ -38,19 +42,20 @@ export class RegisterComponent implements OnInit {
     moderation: false
   }
 
-  defaultPreviousStepButtonLabel = $localize`:Button on the registration form to go to the previous step:Back`
-  defaultNextStepButtonLabel = $localize`:Button on the registration form to go to the previous step:Next`
+  defaultPreviousStepButtonLabel = $localize`:Button on the registration form to go to the previous step:Go to the previous step`
+  defaultNextStepButtonLabel = $localize`:Button on the registration form to go to the previous step:Go to the next step`
   stepUserButtonLabel = this.defaultNextStepButtonLabel
 
+  signupDisabled = false
+
   private serverConfig: ServerConfig
 
   constructor (
     private route: ActivatedRoute,
     private authService: AuthService,
-    private userService: UserService,
+    private userSignupService: UserSignupService,
     private hooks: HooksService
-    ) {
-  }
+  ) { }
 
   get requiresEmailVerification () {
     return this.serverConfig.signup.requiresEmailVerification
@@ -60,10 +65,21 @@ export class RegisterComponent implements OnInit {
     return this.serverConfig.signup.minimumAge
   }
 
-  ngOnInit (): void {
+  get instanceName () {
+    return this.serverConfig.instance.name
+  }
+
+  ngOnInit () {
     this.serverConfig = this.route.snapshot.data.serverConfig
 
-    this.videoUploadDisabled = this.serverConfig.user.videoQuota === 0
+    if (this.serverConfig.signup.allowed === false || this.serverConfig.signup.allowedForCurrentIP === false) {
+      this.signupDisabled = true
+      return
+    }
+
+    this.videoQuota = this.serverConfig.user.videoQuota
+    this.videoUploadDisabled = this.videoQuota === 0
+
     this.stepUserButtonLabel = this.videoUploadDisabled
       ? $localize`:Button on the registration form to finalize the account and channel creation:Signup`
       : this.defaultNextStepButtonLabel
@@ -113,36 +129,50 @@ export class RegisterComponent implements OnInit {
     this.aboutHtml = instanceAboutAccordion.aboutHtml
   }
 
+  skipChannelCreation () {
+    this.formStepChannel.reset()
+    this.lastStep.select()
+    this.signup()
+  }
+
   async signup () {
-    this.error = null
+    this.signupError = undefined
 
     const body: UserRegister = await this.hooks.wrapObject(
-      Object.assign(this.formStepUser.value, { channel: this.videoUploadDisabled ? undefined : this.formStepChannel.value }),
+      {
+        ...this.formStepUser.value,
+
+        channel: this.formStepChannel?.value?.name
+          ? this.formStepChannel.value
+          : undefined
+      },
       'signup',
       'filter:api.signup.registration.create.params'
     )
 
-    this.userService.signup(body).subscribe(
-      () => {
-        this.signupDone = true
-
+    this.userSignupService.signup(body).subscribe({
+      next: () => {
         if (this.requiresEmailVerification) {
-          this.info = $localize`Now please check your emails to verify your account and complete signup.`
+          this.signupSuccess = true
           return
         }
 
         // Auto login
         this.authService.login(body.username, body.password)
-            .subscribe(
-              () => {
-                this.success = $localize`You are now logged in as ${body.username}!`
-              },
-
-              err => this.error = err.message
-            )
+          .subscribe({
+            next: () => {
+              this.signupSuccess = true
+            },
+
+            error: err => {
+              this.signupError = err.message
+            }
+          })
       },
 
-      err => this.error = err.message
-    )
+      error: err => {
+        this.signupError = err.message
+      }
+    })
   }
 }