Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

dmp-frontend/src/app/ui/description/editor/description-editor.component.ts

@@ -49,6 +49,7 @@ import { DmpDescriptionTemplate } from '@app/core/model/dmp/dmp';
 import { FileTransformerEntityType } from '@app/core/common/enum/file-transformer-entity-type';
 import { nameof } from 'ts-simple-nameof';
 import { AbstractControl, UntypedFormArray, UntypedFormGroup } from '@angular/forms';
+import { TableOfContentsValidationService } from './table-of-contents/services/table-of-contents-validation-service';
 
 @Component({
 	selector: 'app-description-editor-component',
@@ -99,6 +100,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 		private dmpService: DmpService,
 		public visibilityRulesService: VisibilityRulesService,
 		public fileTransformerService: FileTransformerService,
+		public tocValidationService: TableOfContentsValidationService 
 
 	) {
 		super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, datePipe, route, queryParamsService, lockService, authService, configurationService);
@@ -623,6 +625,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 
 	refreshData(): void {
 		this.getItem(this.editorModel.id, (data: Description) => this.prepareForm(data));
+		this.tocValidationService.validateForm();
 	}
 
 	refreshOnNavigateToData(id?: Guid): void {
@@ -1015,6 +1018,10 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 					// this.formChanged();
 				}
 			});
+
+		this.formGroup.get('properties').valueChanges
+			.pipe(takeUntil(this._destroyed))
+			.subscribe(next => this.tocValidationService.validateForm());
 			
 		// // const labelSubscription =
 		// this.formGroup.get('label').valueChanges

dmp-frontend/src/app/ui/description/editor/table-of-contents/services/table-of-contents-validation-service.ts

@@ -0,0 +1,13 @@
+import { EventEmitter, Injectable } from "@angular/core";
+
+@Injectable()
+export class TableOfContentsValidationService  {
+  private _validateFormEvent: EventEmitter<any> = new EventEmitter<any>();
+  get validateFormEvent(): EventEmitter<any> {
+    return this._validateFormEvent;
+  }
+
+  validateForm(): void {
+    this._validateFormEvent.emit();
+  }
+}

dmp-frontend/src/app/ui/description/editor/table-of-contents/table-of-contents-internal/table-of-contents-internal.ts

@@ -6,6 +6,7 @@ import { ToCEntry } from '../models/toc-entry';
 import { ToCEntryType } from '../models/toc-entry-type.enum';
 import { DescriptionFieldIndicator } from '../../description-editor.model';
 import { Observable, Subscription, map } from 'rxjs';
+import { TableOfContentsValidationService } from '../services/table-of-contents-validation-service';
 
 @Component({
 	selector: 'table-of-contents-internal',
@@ -34,8 +35,7 @@ export class TableOfContentsInternal implements OnInit, OnDestroy {
 	tocEntriesStateSubscriptions: Subscription[] = [];
 	tocEntriesStateMap: Map<string, boolean> = new Map<string, boolean>();
 
-	constructor() {
+	constructor(private tocValidationService: TableOfContentsValidationService) { }
-	}
 	
 	ngOnInit(): void {
 		// console.log('component created' + JSON.stringify(this.tocentries));
@@ -93,7 +93,7 @@ export class TableOfContentsInternal implements OnInit, OnDestroy {
 			this.tocEntriesStateMap.set(entry.id, false);
 
 			this.tocEntriesStateSubscriptions.push(
-				this.propertiesFormGroup.statusChanges
+				this.tocValidationService.validateFormEvent
 				.pipe(map(() => this.hasErrors(entry.id)))
 				.subscribe(next => {
 					this.tocEntriesStateMap.set(entry.id, next);

dmp-frontend/src/app/ui/description/editor/table-of-contents/table-of-contents.module.ts

@@ -1,15 +1,16 @@
 import {CommonModule} from '@angular/common';
-import {NgModule} from '@angular/core';
+import { NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
 import { TableOfContentsInternal } from './table-of-contents-internal/table-of-contents-internal';
 import { MatIconModule } from '@angular/material/icon';
 import { VisibilityRulesService } from '@app/ui/description/editor/description-form/visibility-rules/visibility-rules.service';
 import { TableOfContentsComponent } from './table-of-contents.component';
+import { TableOfContentsValidationService } from './services/table-of-contents-validation-service';
 
 @NgModule({
     imports: [CommonModule, RouterModule, MatIconModule],
     declarations: [TableOfContentsComponent, TableOfContentsInternal],
     exports: [TableOfContentsComponent],
-    providers: [VisibilityRulesService]
+    providers: [VisibilityRulesService, TableOfContentsValidationService]
 })
 export class TableOfContentsModule { }

dmp-frontend/src/common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component.html

@@ -1,10 +1,12 @@
-<div class="form-content-editor-content">
+<div class="container-fluid">
-	<div mat-dialog-title class="d-flex justify-content-between m-0">
+	<div class="row mt-3">
-		<span class="title">{{'GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.WARNING' | translate}}</span>
+		<div mat-dialog-title class="col-12 pr-1 d-flex justify-content-between">
-		<mat-icon class="close-icon" (click)="onClose()">close</mat-icon>
+			<span class="mr-3 title">{{'GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.WARNING' | translate}}</span>
+			<mat-icon class="close-icon" (click)="onClose()">close</mat-icon>
+		</div>
 	</div>
-	<div class="content">
+	<div class="row mt-3 mr-3 mb-3">
-		<div class="col p-0">
+		<div class="col-12">
 			<ng-container *ngIf="errorMessages">
 				<ul class="error-list" *ngIf="errorMessages.length > 1 else singleError">
 					<li *ngFor="let error of errorMessages">{{error}}</li>
@@ -15,8 +17,8 @@
 			</ng-template>
 		</div>
 	</div>
-	<div>
+	<div class="row mt-3 mb-3">
-		<div class="col actions">
+		<div class="col-12 actions">
 			<button mat-button type="button" class="ml-auto cancel-btn" (click)="onClose()">{{'GENERAL.FORM-VALIDATION-DISPLAY-DIALOG.ACTIONS.CANCEL' | translate}}</button>
 		</div>
 	</div>