Merge branch 'release/3.1.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +about / about-instance / contact-admin-modal.component.ts

diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.ts b/client/src/app/+about/about-instance/contact-admin-modal.component.ts
index 215e281bb5fcf5ee352bb3d6715782236f7fa43b..ac2a6c98029f4c958e29a5484071483e9647bcec 100644 (file)
--- a/client/src/app/+about/about-instance/contact-admin-modal.component.ts
+++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts
@@ -1,9 +1,16 @@
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { Notifier, ServerService } from '@app/core'
-import { FormReactive, FormValidatorService, InstanceValidatorsService } from '@app/shared/shared-forms'
+import {
+  BODY_VALIDATOR,
+  FROM_EMAIL_VALIDATOR,
+  FROM_NAME_VALIDATOR,
+  SUBJECT_VALIDATOR
+} from '@app/shared/form-validators/instance-validators'
+import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
 import { InstanceService } from '@app/shared/shared-instance'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
+import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
 import { ServerConfig } from '@shared/models'
 
 @Component({
@@ -22,7 +29,6 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit {
   constructor (
     protected formValidatorService: FormValidatorService,
     private modalService: NgbModal,
-    private instanceValidatorsService: InstanceValidatorsService,
     private instanceService: InstanceService,
     private serverService: ServerService,
     private notifier: Notifier
@@ -40,10 +46,10 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit {
         .subscribe(config => this.serverConfig = config)
 
     this.buildForm({
-      fromName: this.instanceValidatorsService.FROM_NAME,
-      fromEmail: this.instanceValidatorsService.FROM_EMAIL,
-      subject: this.instanceValidatorsService.SUBJECT,
-      body: this.instanceValidatorsService.BODY
+      fromName: FROM_NAME_VALIDATOR,
+      fromEmail: FROM_EMAIL_VALIDATOR,
+      subject: SUBJECT_VALIDATOR,
+      body: BODY_VALIDATOR
     })
   }
 
@@ -73,7 +79,7 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit {
           },
 
           err => {
-            this.error = err.status === 403
+            this.error = err.status === HttpStatusCode.FORBIDDEN_403
               ? $localize`You already sent this form recently`
               : err.message
           }