From b0f08f6a95b65f854a1b7229d50f4819148d0465 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Tue, 21 Nov 2023 15:28:26 +0200
Subject: [PATCH] [master | DONE | CHANGED]: harvester.component.ts &
 harvester.component.html: Made email field required (not optional) and
 updated respective messages.

---
 src/app/harvester/harvester.component.html | 9 +++++----
 src/app/harvester/harvester.component.ts   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/harvester/harvester.component.html b/src/app/harvester/harvester.component.html
index 10d3da4..612c2bf 100644
--- a/src/app/harvester/harvester.component.html
+++ b/src/app/harvester/harvester.component.html
@@ -125,13 +125,14 @@
 <!--    <hr class="uk-margin-xlarge-top uk-margin-xlarge-bottom">-->
 
     <div *ngIf="!modalShowNext" class="uk-flex uk-flex-column uk-flex-middle">
-      <div>Want feedback on the harvest status?</div>
-      <div>Please provide us with your email address and click the <i class="uk-text-bold">harvest</i> button.</div>
-      <div class="uk-margin-small-top">Otherwise, simply click the <i class="uk-text-bold">harvest</i> button to continue.</div>
+<!--      <div>Want feedback on the harvest status?</div>-->
+      <div>Please provide us with your email address and click on the <i class="uk-text-bold">harvest</i> button.
+      You will soon receive an email with the harvest status.</div>
+<!--      <div class="uk-margin-small-top">Otherwise, simply click the <i class="uk-text-bold">harvest</i> button to continue.</div>-->
 
       <div input class="uk-width-2-3 uk-margin-medium-top"
            [formInput]="form.get('email')" placeholder="E-mail">
-        <span note>(Optional)</span>
+<!--        <span note>(Optional)</span>-->
       </div>
       <div>
   <!--      <re-captcha (resolved)="handleRecaptcha($event)" [siteKey]="properties.reCaptchaSiteKey"-->
diff --git a/src/app/harvester/harvester.component.ts b/src/app/harvester/harvester.component.ts
index 4300ab4..95778d4 100644
--- a/src/app/harvester/harvester.component.ts
+++ b/src/app/harvester/harvester.component.ts
@@ -39,7 +39,7 @@ export class HarvesterComponent {
 
   ngOnInit() {
     this.form = this.fb.group({
-      email: this.fb.control('', Validators.email),
+      email: this.fb.control('', [Validators.email, Validators.required]),
       // recaptcha: this.fb.control('', Validators.required),
       recordsNum: this.fb.control(1000, Validators.required),
       format: this.fb.control(null, Validators.required)