fix: deposit form validation on license and access level

src/app/features/admin/components/presentationals/admin-user-form/admin-user-form.html

@@ -53,7 +53,7 @@
   <mat-form-field>
     <mat-label>{{'admin.user.form.person' | translate }}</mat-label>
     <mat-select [formControlName]="formDefinition.person">
-      <mat-option [value]="undefined"></mat-option>
+      <mat-option [value]="null"></mat-option>
       <mat-option *ngFor="let person of listPersons" [value]="person.resId">
         {{person.fullName}}
       </mat-option>

src/app/features/admin/components/presentationals/admin-user-form/admin-user-form.ts

@@ -17,7 +17,7 @@ import {isNullOrUndefined, PropertyName, SolidifyValidator} from "solidify-front
 export class AdminUserForm extends SharedAbstractFormPresentational<UsersExtended> {
   formDefinition: FormComponentFormDefinition = new FormComponentFormDefinition();
 
-  applicationRolesNames: any[] = [...Object.values(UserApplicationRoleEnum)];
+  applicationRolesNames: string[] = [...Object.values(UserApplicationRoleEnum)];
 
   @Input()
   listPersons: People[];

src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.html

@@ -13,10 +13,9 @@
   </mat-form-field>
 
   <mat-form-field>
-    <mat-label>{{'deposit.title' | translate }}</mat-label>
     <input [formControlName]="formDefinition.title"
            matInput
-           [placeholder]="'deposit.title.placeholder' | translate"
+           [placeholder]="'deposit.title' | translate"
            [required]="isRequired(formDefinition.title)"
     >
     <mat-error *ngIf="getFormControl(formDefinition.title).invalid">{{'required' | translate}}</mat-error>
@@ -47,9 +46,12 @@
     <input [formControlName]="formDefinition.publicationDate"
            matInput
            [matDatepicker]="publicationDateDatepicker"
-           [placeholder]="'deposit.publicationDate' | translate">
+           [placeholder]="'deposit.publicationDate' | translate"
+           [required]="isRequired(formDefinition.publicationDate)">
     <mat-datepicker-toggle matSuffix [for]="publicationDateDatepicker"></mat-datepicker-toggle>
     <mat-datepicker #publicationDateDatepicker></mat-datepicker>
+    <mat-error *ngIf="getFormControl(formDefinition.title).invalid">{{'required' | translate}}</mat-error>
+    <mat-error *ngFor="let error of getFormControl(formDefinition.title).errors?.errorsFromBackend">{{error}}</mat-error>
   </mat-form-field>
 
   <mat-form-field>
@@ -59,6 +61,8 @@
            [placeholder]="'deposit.collectionBegin' | translate">
     <mat-datepicker-toggle matSuffix [for]="collectionBeginDatepicker"></mat-datepicker-toggle>
     <mat-datepicker #collectionBeginDatepicker></mat-datepicker>
+    <mat-error *ngIf="getFormControl(formDefinition.collectionBegin).invalid">{{'required' | translate}}</mat-error>
+    <mat-error *ngFor="let error of getFormControl(formDefinition.collectionBegin).errors?.errorsFromBackend">{{error}}</mat-error>
   </mat-form-field>
 
   <mat-form-field>
@@ -68,6 +72,9 @@
            [placeholder]="'deposit.collectionEnd' | translate">
     <mat-datepicker-toggle matSuffix [for]="collectionEndDatepicker"></mat-datepicker-toggle>
     <mat-datepicker #collectionEndDatepicker></mat-datepicker>
+    <mat-error *ngIf="getFormControl(formDefinition.collectionEnd).invalid">{{'required' | translate}}</mat-error>
+    <mat-error *ngFor="let error of getFormControl(formDefinition.collectionEnd).errors?.errorsFromBackend">{{error}}</mat-error>
+    <!--    {{getFormControl(formDefinition.collectionEnd).errors | json}}-->
   </mat-form-field>
 
   <dlcm-shared-multi-select [list]="listPersons"
@@ -75,20 +82,15 @@
                             [labelKey]="'fullName'"
                             [valueKey]="'resId'"
                             [placeholder]="'deposit.authors' | translate"
+                            [required]="isRequired(formDefinition.authors)"
   >
   </dlcm-shared-multi-select>
 
   <mat-form-field>
     <mat-label>{{'deposit.accessLevel' | translate }}</mat-label>
-    <mat-select [formControlName]="formDefinition.accessLevel">
-      <mat-option [value]="accessModelEnum.PUBLIC">
-        {{accessModelEnum.PUBLIC}}
-      </mat-option>
-      <mat-option [value]="accessModelEnum.RESTRICTED">
-        {{accessModelEnum.RESTRICTED}}
-      </mat-option>
-      <mat-option [value]="accessModelEnum.CLOSED">
-        {{accessModelEnum.CLOSED}}
+    <mat-select [formControlName]="formDefinition.access">
+      <mat-option *ngFor="let accessLevel of accessEnumValues" [value]="accessLevel">
+        {{accessLevel}}
       </mat-option>
     </mat-select>
   </mat-form-field>
@@ -97,11 +99,15 @@
 
   <mat-form-field>
     <mat-label>{{'deposit.license' | translate }}</mat-label>
-    <mat-select [formControlName]="formDefinition.licenseId">
+    <mat-select [formControlName]="formDefinition.licenseId"
+                [required]="isRequired(formDefinition.licenseId)">
+      <mat-option [value]="null"></mat-option>
       <mat-option *ngFor="let license of licenses" [value]="license.resId">
         {{license.title}}
       </mat-option>
     </mat-select>
+    <mat-error *ngIf="getFormControl(formDefinition.licenseId).invalid">{{'required' | translate}}</mat-error>
+    <mat-error *ngFor="let error of getFormControl(formDefinition.licenseId).errors?.errorsFromBackend">{{error}}</mat-error>
   </mat-form-field>
 
   <mat-form-field>

src/app/features/deposit/components/presentationals/deposit-form/deposit-form.presentational.ts

-import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core";
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit} from "@angular/core";
 import {FormBuilder, Validators} from "@angular/forms";
 import {DepositsExtended} from "@app/features/deposit/models/deposits-extended.model";
-import {
-  Deposits,
-  Languages,
-  Licenses,
-  OrganizationalUnits,
-  People,
-  PreservationPolicies,
-  SubmissionPolicies
-} from "@app/generated-api";
+import {Deposits, Languages, Licenses, OrganizationalUnits, People, PreservationPolicies, SubmissionPolicies} from "@app/generated-api";
 import {SharedAbstractFormPresentational} from "@app/shared/components/presentationals/shared-abstract-form/shared-abstract-form.presentational";
 import {LocalModelAttributeEnum} from "@app/shared/enums/model-attribute.enum";
 import {BaseFormDefinition} from "@app/shared/models/base-form-definition.model";
 import _ from "lodash";
+import {distinctUntilChanged, tap} from "rxjs/operators";
 import {DateUtil, PropertyName, SolidifyValidator} from "solidify-frontend";
 import AccessEnum = Deposits.AccessEnum;
 
@@ -23,12 +16,10 @@ import AccessEnum = Deposits.AccessEnum;
   styleUrls: ["../../../../../shared/components/presentationals/shared-abstract-form/shared-abstract-form.presentational.scss"],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class DepositFormPresentational extends SharedAbstractFormPresentational<DepositsExtended> {
+export class DepositFormPresentational extends SharedAbstractFormPresentational<DepositsExtended> implements OnInit {
   formDefinition: FormComponentFormDefinition = new FormComponentFormDefinition();
 
-  get accessModelEnum(): typeof AccessEnum {
-    return AccessEnum;
-  }
+  accessEnumValues: string[] = [...Object.values(AccessEnum)];
 
   @Input()
   languages: Languages[];
@@ -56,21 +47,42 @@ export class DepositFormPresentational extends SharedAbstractFormPresentational<
     super(_changeDetectorRef);
   }
 
+  ngOnInit(): void {
+    super.ngOnInit();
+
+    this.validationLicenseRequiredWhenAccessPublic();
+  }
+
+  private validationLicenseRequiredWhenAccessPublic(): void {
+    const licenseFormControl = this.form.get(this.formDefinition.licenseId);
+    this.subscribe(this.form.get(this.formDefinition.access).valueChanges.pipe(
+      distinctUntilChanged(),
+      tap(accessLevel => {
+        if (accessLevel === AccessEnum.PUBLIC) {
+          licenseFormControl.setValidators([Validators.required]);
+        } else {
+          licenseFormControl.setValidators(null);
+        }
+        licenseFormControl.updateValueAndValidity();
+      }),
+    ));
+  }
+
   protected initNewForm(): void {
     this.form = this._fb.group({
       [this.formDefinition.organizationalUnitId]: ["", [Validators.required, SolidifyValidator]],
       [this.formDefinition.title]: ["", [Validators.required, SolidifyValidator]],
       [this.formDefinition.description]: ["", [Validators.required, SolidifyValidator]],
       [this.formDefinition.languageId]: [""],
-      [this.formDefinition.publicationDate]: [""],
+      [this.formDefinition.publicationDate]: ["", [Validators.required, SolidifyValidator]],
       [this.formDefinition.collectionBegin]: [""],
       [this.formDefinition.collectionEnd]: [""],
-      [this.formDefinition.accessLevel]: [AccessEnum.PUBLIC],
+      [this.formDefinition.access]: [AccessEnum.PUBLIC],
       [this.formDefinition.hasEmbargo]: [false],
-      [this.formDefinition.licenseId]: [""],
+      [this.formDefinition.licenseId]: ["", [Validators.required, SolidifyValidator]],
       [this.formDefinition.submissionPolicyId]: [""],
       [this.formDefinition.preservationPolicyId]: [""],
-      [this.formDefinition.authors]: [],
+      [this.formDefinition.authors]: ["", [Validators.required, SolidifyValidator]],
     });
   }
 
@@ -80,15 +92,15 @@ export class DepositFormPresentational extends SharedAbstractFormPresentational<
       [this.formDefinition.title]: [deposit.title, [Validators.required, SolidifyValidator]],
       [this.formDefinition.description]: [deposit.description, [Validators.required, SolidifyValidator]],
       [this.formDefinition.languageId]: [deposit.languageId],
-      [this.formDefinition.publicationDate]: [deposit.publicationDate],
-      [this.formDefinition.collectionBegin]: [DateUtil.convertOffsetDateTimeIso8601ToDate(deposit.collectionBegin)],
-      [this.formDefinition.collectionEnd]: [DateUtil.convertOffsetDateTimeIso8601ToDate(deposit.collectionEnd)],
-      [this.formDefinition.accessLevel]: [deposit.access],
+      [this.formDefinition.publicationDate]: [deposit.publicationDate, [Validators.required, SolidifyValidator]],
+      [this.formDefinition.collectionBegin]: [DateUtil.convertOffsetDateTimeIso8601ToDate(deposit.collectionBegin), [SolidifyValidator]],
+      [this.formDefinition.collectionEnd]: [DateUtil.convertOffsetDateTimeIso8601ToDate(deposit.collectionEnd), [SolidifyValidator]],
+      [this.formDefinition.access]: [deposit.access],
       [this.formDefinition.hasEmbargo]: [deposit.hasEmbargo],
       [this.formDefinition.licenseId]: [deposit.licenseId],
       [this.formDefinition.submissionPolicyId]: [deposit.submissionPolicyId],
       [this.formDefinition.preservationPolicyId]: [deposit.preservationPolicyId],
-      [this.formDefinition.authors]: [_.map(this.selectedPersons, LocalModelAttributeEnum.resId)],
+      [this.formDefinition.authors]: [_.map(this.selectedPersons, LocalModelAttributeEnum.resId), [Validators.required, SolidifyValidator]],
     });
   }
 
@@ -109,7 +121,7 @@ class FormComponentFormDefinition extends BaseFormDefinition {
   @PropertyName() collectionBegin: string;
   @PropertyName() collectionEnd: string;
   @PropertyName() authors: string;
-  @PropertyName() accessLevel: string;
+  @PropertyName() access: string;
   @PropertyName() hasEmbargo: string;
   @PropertyName() licenseId: string;
   @PropertyName() submissionPolicyId: string;