Client: use templateUrl/styleUrls instead of require

[github/Chocobozzz/PeerTube.git] / client / src / app / admin / users / user-add / user-add.component.ts

diff --git a/client/src/app/admin/users/user-add/user-add.component.ts b/client/src/app/admin/users/user-add/user-add.component.ts
index 30ca947a0c7d2ec563783721ddfd0273db603345..ab96fb01dac65e3883c37e5e5d1ff11d3942a60c 100644 (file)
--- a/client/src/app/admin/users/user-add/user-add.component.ts
+++ b/client/src/app/admin/users/user-add/user-add.component.ts
@@ -1,33 +1,57 @@
-import { Control, ControlGroup, Validators } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
 import { Router } from '@angular/router';
 
 import { UserService } from '../shared';
+import { FormReactive, USER_USERNAME, USER_PASSWORD } from '../../../shared';
 
 @Component({
   selector: 'my-user-add',
-  template: require('./user-add.component.html'),
+  templateUrl: './user-add.component.html'
 })
-export class UserAddComponent implements OnInit {
-  userAddForm: ControlGroup;
+export class UserAddComponent extends FormReactive implements OnInit {
   error: string = null;
 
-  constructor(private router: Router, private userService: UserService) {}
+  form: FormGroup;
+  formErrors = {
+    'username': '',
+    'password': ''
+  };
+  validationMessages = {
+    'username': USER_USERNAME.MESSAGES,
+    'password': USER_PASSWORD.MESSAGES,
+  };
 
-  ngOnInit() {
-    this.userAddForm = new ControlGroup({
-      username: new Control('', Validators.compose([ Validators.required, Validators.minLength(3), Validators.maxLength(20) ])),
-      password: new Control('', Validators.compose([ Validators.required, Validators.minLength(6) ])),
+  constructor(
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private userService: UserService
+  ) {
+    super();
+  }
+
+  buildForm() {
+    this.form = this.formBuilder.group({
+      username: [ '', USER_USERNAME.VALIDATORS ],
+      password: [ '', USER_PASSWORD.VALIDATORS ],
     });
+
+    this.form.valueChanges.subscribe(data => this.onValueChanged(data));
   }
 
-  addUser(username: string, password: string) {
+  ngOnInit() {
+    this.buildForm();
+  }
+
+  addUser() {
     this.error = null;
 
+    const { username, password } = this.form.value;
+
     this.userService.addUser(username, password).subscribe(
       ok => this.router.navigate([ '/admin/users/list' ]),
 
-      err => this.error = err
+      err => this.error = err.text
     );
   }
 }