From fbf5f6531880356a2e8d8b28cc1df9131cd12e89 Mon Sep 17 00:00:00 2001
From: Thomas Georgios Giannos <thgiannos@cite.gr>
Date: Thu, 8 Feb 2024 16:48:50 +0200
Subject: [PATCH] Adding all versions listing and new version form for
 description templates

---
 .../description-template-editor.component.ts  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
index e6064e396..f58a9cffb 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
@@ -14,7 +14,7 @@ import { IsActive } from '@app/core/common/enum/is-active.enum';
 import { AppPermission } from '@app/core/common/enum/permission.enum';
 import { UserDescriptionTemplateRole } from '@app/core/common/enum/user-description-template-role';
 import { DescriptionTemplate } from '@app/core/model/description-template/description-template';
-import { DescriptionTemplatePersist } from '@app/core/model/description-template/description-template-persist';
+import { DescriptionTemplatePersist, NewVersionDescriptionTemplatePersist } from '@app/core/model/description-template/description-template-persist';
 import { LanguageInfo } from '@app/core/model/language-info';
 import { User } from '@app/core/model/user/user';
 import { AuthService } from '@app/core/services/auth/auth.service';
@@ -201,13 +201,23 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 	}
 
 	persistEntity(onSuccess?: (response) => void): void {
-		const formData = this.formService.getValue(this.formGroup.value) as DescriptionTemplatePersist;
+		if (this.isNew && !this.isClone && !this.isNewVersion){
+			const formData = this.formService.getValue(this.formGroup.value) as DescriptionTemplatePersist;
 
-		this.descriptionTemplateService.persist(formData)
-			.pipe(takeUntil(this._destroyed)).subscribe(
-				complete => onSuccess ? onSuccess(complete) : this.onCallbackSuccess(complete),
-				error => this.onCallbackError(error)
-			);
+			this.descriptionTemplateService.persist(formData)
+				.pipe(takeUntil(this._destroyed)).subscribe(
+					complete => onSuccess ? onSuccess(complete) : this.onCallbackSuccess(complete),
+					error => this.onCallbackError(error)
+				);
+			} else if (this.isNewVersion && !this.isNew && !this.isClone) {
+				const formData = this.formService.getValue(this.formGroup.value) as NewVersionDescriptionTemplatePersist;
+	
+				this.descriptionTemplateService.newVersion(formData)
+					.pipe(takeUntil(this._destroyed)).subscribe(
+						complete => onSuccess ? onSuccess(complete) : this.onCallbackSuccess(complete),
+						error => this.onCallbackError(error)
+					);
+			}
 	}
 
 	formSubmit(): void {