[Explore | master & Library | angular-14]: composer.ts: [Bug fix] Add parenthesis around ternary operator in method composeEmailForExplore() - empty or wrong body | contact-us.component.html: Added #captchaElem in <re-captcha> | contact-us.component.ts: Added ViewChild for captchaElem and added method "resetRecaptcha()" | contact.component.html: Added #contactUs in <contact-us> | contact.component.ts: Added ViewChild for contactUs and call contactUsComponent.resetRecaptcha() on reset method.

contact-us/contact-us.component.html

@@ -26,7 +26,7 @@
   <div *ngIf="contactForm.get('description')" class="uk-width-1-1" input type="textarea" rows="4" placeholder="Description"
        [inputClass]="'inner' + (smallForm?' x-small':'')" [formInput]="contactForm.get('description')"></div>
   <div *ngIf="contactForm.get('recaptcha')" class="uk-flex uk-flex-center" [class.uk-width-1-1]="smallForm" [class.uk-flex-last@s]="!smallForm">
-    <re-captcha (resolved)="handleRecaptcha($event)" [siteKey]="properties.reCaptchaSiteKey"></re-captcha>
+    <re-captcha #captchaElem (resolved)="handleRecaptcha($event)" [siteKey]="properties.reCaptchaSiteKey"></re-captcha>
   </div>
   <div class="uk-flex uk-flex-center" [class.uk-width-1-1]="smallForm" [class.uk-flex-column]="!smallForm">
     <div class="uk-flex uk-flex-center" [class.uk-flex-left@s]="!smallForm">

contact-us/contact-us.component.ts

@@ -1,7 +1,8 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core';
 import {FormGroup} from '@angular/forms';
 import {EnvProperties} from "../utils/properties/env-properties";
 import {properties} from "../../../environments/environment";
+import {RecaptchaComponent} from "ng-recaptcha";
 
 @Component({
   selector: 'contact-us',
@@ -18,6 +19,8 @@ export class ContactUsComponent {
   @Input() public scrollspy: boolean = false;
   @Input() public sending: boolean = false;
   @Output() sendEmitter: EventEmitter<any> = new EventEmitter<any>();
+  @ViewChild('captchaElem') captchaElem: RecaptchaComponent;
+
   public properties: EnvProperties = properties;
   
   public send() {
@@ -29,4 +32,8 @@ export class ContactUsComponent {
   public handleRecaptcha(captchaResponse: string) {
     this.contactForm.get('recaptcha').setValue(captchaResponse);
   }
+
+  public resetRecaptcha() {
+    this.captchaElem.reset();
+  }
 }

utils/email/composer.ts

@@ -86,7 +86,7 @@ export class Composer {
 			+ "<span><b>Name</b>: " + contactForm.name + "</span><br>"
 			+ "<span><b>Surname</b>: " + contactForm.surname + "</span><br>"
 			+ "<span><b>Email</b>: " + contactForm.email + "</span><br>"
-			+ "<span><b>Affiliation</b>: " + contactForm.affiliation ? contactForm.affiliation : '-' + "</span><br>"
+			+ "<span><b>Affiliation</b>: " + (contactForm.affiliation ? contactForm.affiliation : '-') + "</span><br>"
 			+ "<p>" + contactForm.message + "</p>"
 			+ "</div>";
     email.recipients = admins;