From 7d723dd39a438185461f6a7ce916cf2745d4c3dc Mon Sep 17 00:00:00 2001
From: Leonardo Mendoza Fernadez <l.mendoza@Leonardos-MacBook-Pro.local>
Date: Thu, 18 Jan 2024 17:46:34 -0600
Subject: [PATCH] batch-fixes-jan-18-2024

---
 .../components/form-personal/form-personal.component.html | 6 ++++++
 .../components/form-personal/form-personal.component.ts   | 8 +++++++-
 .../form-current-employment.component.html                | 3 ++-
 .../form-current-employment.component.ts                  | 2 +-
 .../components/form-personal/form-personal.component.html | 6 ++++++
 .../components/form-personal/form-personal.component.ts   | 3 ++-
 src/app/shared/validators/date/date.validator.ts          | 4 +++-
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/app/register/components/form-personal/form-personal.component.html b/src/app/register/components/form-personal/form-personal.component.html
index 4b447f9fdd..834e6277b4 100644
--- a/src/app/register/components/form-personal/form-personal.component.html
+++ b/src/app/register/components/form-personal/form-personal.component.html
@@ -8,6 +8,12 @@
         matInput
         #firstInput
       />
+      <mat-error
+        *ngIf="form.hasError('maxlength', 'givenNames')"
+        i18n="@@topBar.keywordMaxLength"
+      >
+        Must be less than 100 characters
+      </mat-error>
       <mat-error
         *ngIf="form.hasError('required', 'givenNames')"
         i18n="@@register.firstNamePassword"
diff --git a/src/app/register/components/form-personal/form-personal.component.ts b/src/app/register/components/form-personal/form-personal.component.ts
index 0ec38870eb..3b3e0b2429 100644
--- a/src/app/register/components/form-personal/form-personal.component.ts
+++ b/src/app/register/components/form-personal/form-personal.component.ts
@@ -45,6 +45,8 @@ export class FormPersonalComponent
   extends BaseForm
   implements OnInit, AfterViewInit
 {
+  nameMaxLength = 99
+
   @Input() reactivation: ReactivationLocal
   @ViewChild('firstInput') firstInput: ElementRef
   labelInfoAboutName = $localize`:@@register.ariaLabelInfo:info about names`
@@ -97,7 +99,11 @@ export class FormPersonalComponent
 
     this.form = new UntypedFormGroup({
       givenNames: new UntypedFormControl('', {
-        validators: [Validators.required, OrcidValidators.illegalName],
+        validators: [
+          Validators.required,
+          OrcidValidators.illegalName,
+          Validators.maxLength(this.nameMaxLength),
+        ],
         asyncValidators: this._register.backendValueValidate('givenNames'),
       }),
       familyNames: new UntypedFormControl('', {
diff --git a/src/app/register2/components/form-current-employment/form-current-employment.component.html b/src/app/register2/components/form-current-employment/form-current-employment.component.html
index 87b38031f4..9b5195732e 100644
--- a/src/app/register2/components/form-current-employment/form-current-employment.component.html
+++ b/src/app/register2/components/form-current-employment/form-current-employment.component.html
@@ -113,7 +113,8 @@ <h3 class="orc-font-body" i18n="@@register.thisLooksLikeAPersonalEmail">
         *ngIf="selectedOrganizationFromDatabase && displayOrganizationHint"
       >
         {{ selectedOrganizationFromDatabase.value }},
-        {{ selectedOrganizationFromDatabase.city }}<ng-container *ngIf="selectedOrganizationFromDatabase.city"
+        {{ selectedOrganizationFromDatabase.city
+        }}<ng-container *ngIf="selectedOrganizationFromDatabase.city"
           >,</ng-container
         >
         {{ selectedOrganizationFromDatabase.country }}
diff --git a/src/app/register2/components/form-current-employment/form-current-employment.component.ts b/src/app/register2/components/form-current-employment/form-current-employment.component.ts
index 6360488ae1..90e6c5b6f4 100644
--- a/src/app/register2/components/form-current-employment/form-current-employment.component.ts
+++ b/src/app/register2/components/form-current-employment/form-current-employment.component.ts
@@ -141,7 +141,7 @@ export class FormCurrentEmploymentComponent extends BaseForm implements OnInit {
           startDateMonth: [''],
           startDateYear: [''],
         },
-        dateMonthYearValidator('startDate')
+        { validator: dateMonthYearValidator('startDate') }
       ),
     })
 
diff --git a/src/app/register2/components/form-personal/form-personal.component.html b/src/app/register2/components/form-personal/form-personal.component.html
index 8244de7b5f..bc6ecc6600 100644
--- a/src/app/register2/components/form-personal/form-personal.component.html
+++ b/src/app/register2/components/form-personal/form-personal.component.html
@@ -23,6 +23,12 @@ <h3 i18n="@@register.yourNames" class="orc-font-body margin-top-12">
       />
     </mat-form-field>
 
+    <mat-error
+      *ngIf="form.hasError('maxlength', 'givenNames')"
+      i18n="@@topBar.keywordMaxLength"
+    >
+      Must be less than 100 characters
+    </mat-error>
     <mat-error
       *ngIf="givenNameFormTouched && form.hasError('required', 'givenNames')"
       i18n="@@register.firstNameError"
diff --git a/src/app/register2/components/form-personal/form-personal.component.ts b/src/app/register2/components/form-personal/form-personal.component.ts
index de12f2be3b..d512684716 100644
--- a/src/app/register2/components/form-personal/form-personal.component.ts
+++ b/src/app/register2/components/form-personal/form-personal.component.ts
@@ -77,6 +77,7 @@ export class MyErrorStateMatcher implements ErrorStateMatcher {
 })
 export class FormPersonalComponent extends BaseForm implements OnInit {
   matcher = new MyErrorStateMatcher()
+  maxNameLenght = 100
   @Input() nextButtonWasClicked: boolean
   @Input() reactivation: ReactivationLocal
   @ViewChild(FormGroupDirective) formGroupDir: FormGroupDirective
@@ -158,7 +159,7 @@ export class FormPersonalComponent extends BaseForm implements OnInit {
 
     this.form = new UntypedFormGroup({
       givenNames: new UntypedFormControl('', {
-        validators: [Validators.required, OrcidValidators.illegalName],
+        validators: [Validators.required, OrcidValidators.illegalName, Validators.maxLength(this.maxNameLenght)],
         asyncValidators: this._register.backendValueValidate('givenNames'),
       }),
       familyNames: new UntypedFormControl('', {
diff --git a/src/app/shared/validators/date/date.validator.ts b/src/app/shared/validators/date/date.validator.ts
index a10c835621..a5642dccdc 100644
--- a/src/app/shared/validators/date/date.validator.ts
+++ b/src/app/shared/validators/date/date.validator.ts
@@ -42,11 +42,13 @@ export function dateValidator(dateType: string) {
   }
 }
 
-export function dateMonthYearValidator(dateType: string) {
+export function dateMonthYearValidator(dateType: string, formHasDay = true) {
   return (c: AbstractControl): { [key: string]: any } | null => {
     const year = c.get(dateType + 'Year').value
     const month = c.get(dateType + 'Month').value
 
+    console.log(year, month)
+
     if (!year && !month) {
       return null
     }