Feature/subject in contact form (#1926)

* #1915 Add a subject to contact form and add it to email sent

* #1915 Add subject to contact form tests

* #1915 Contact form test corrected && tslint correction

4 files changed, 28 insertions, 2 deletions

diff --git a/client/src/app/+about/about-instance/contact-admin-modal.component.html b/client/src/app/+about/about-instance/contact-admin-modal.component.html
index b2cbd0873..c3c71bdee 100644
--- a/client/src/app/+about/about-instance/contact-admin-modal.component.html
+++ b/client/src/app/+about/about-instance/contact-admin-modal.component.html
@@ -26,6 +26,15 @@
       </div>
 
       <div class="form-group">
+        <label i18n for="subject">Subject</label>
+        <input
+          type="text" id="subject"
+          formControlName="subject" [ngClass]="{ 'input-error': formErrors['subject'] }"
+        >
+        <div *ngIf="formErrors.subject" class="form-error">{{ formErrors.subject }}</div>
+      </div>
+
+      <div class="form-group">
         <label i18n for="body">Your message</label>
         <textarea id="body" formControlName="body" [ngClass]="{ 'input-error': formErrors['body'] }">
         </textarea>
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 7d79c2215..c609c98c3 100644
--- a/client/src/app/+about/about-instance/contact-admin-modal.component.ts
+++ b/client/src/app/+about/about-instance/contact-admin-modal.component.ts
@@ -39,6 +39,7 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit {
     this.buildForm({
       fromName: this.instanceValidatorsService.FROM_NAME,
       fromEmail: this.instanceValidatorsService.FROM_EMAIL,
+      subject: this.instanceValidatorsService.SUBJECT,
       body: this.instanceValidatorsService.BODY
     })
   }
@@ -58,9 +59,10 @@ export class ContactAdminModalComponent extends FormReactive implements OnInit {
   sendForm () {
     const fromName = this.form.value['fromName']
     const fromEmail = this.form.value[ 'fromEmail' ]
+    const subject = this.form.value[ 'subject' ]
     const body = this.form.value[ 'body' ]
 
-    this.instanceService.contactAdministrator(fromEmail, fromName, body)
+    this.instanceService.contactAdministrator(fromEmail, fromName, subject, body)
         .subscribe(
           () => {
             this.notifier.success(this.i18n('Your message has been sent.'))
diff --git a/client/src/app/shared/forms/form-validators/instance-validators.service.ts b/client/src/app/shared/forms/form-validators/instance-validators.service.ts
index 5bb852858..cc5f3c5a1 100644
--- a/client/src/app/shared/forms/form-validators/instance-validators.service.ts
+++ b/client/src/app/shared/forms/form-validators/instance-validators.service.ts
@@ -7,6 +7,7 @@ import { Injectable } from '@angular/core'
 export class InstanceValidatorsService {
   readonly FROM_EMAIL: BuildFormValidator
   readonly FROM_NAME: BuildFormValidator
+  readonly SUBJECT: BuildFormValidator
   readonly BODY: BuildFormValidator
 
   constructor (private i18n: I18n) {
@@ -32,6 +33,19 @@ export class InstanceValidatorsService {
       }
     }
 
+    this.SUBJECT = {
+      VALIDATORS: [
+        Validators.required,
+        Validators.minLength(1),
+        Validators.maxLength(120)
+      ],
+      MESSAGES: {
+        'required': this.i18n('A subject is required.'),
+        'minlength': this.i18n('The subject must be at least 1 character long.'),
+        'maxlength': this.i18n('The subject cannot be more than 120 characters long.')
+      }
+    }
+
     this.BODY = {
       VALIDATORS: [
         Validators.required,
diff --git a/client/src/app/shared/instance/instance.service.ts b/client/src/app/shared/instance/instance.service.ts
index 61321ecce..d0c96941d 100644
--- a/client/src/app/shared/instance/instance.service.ts
+++ b/client/src/app/shared/instance/instance.service.ts
@@ -22,10 +22,11 @@ export class InstanceService {
                .pipe(catchError(res => this.restExtractor.handleError(res)))
   }
 
-  contactAdministrator (fromEmail: string, fromName: string, message: string) {
+  contactAdministrator (fromEmail: string, fromName: string, subject: string, message: string) {
     const body = {
       fromEmail,
       fromName,
+      subject,
       body: message
     }