From 76743539daad1d03d614ea8d22a22ba472b474fb Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Wed, 24 Apr 2024 16:33:58 +0300
Subject: [PATCH] description copy fix

---
 .../ui/description/editor/description-editor.component.html  | 2 +-
 .../ui/description/editor/description-editor.component.ts    | 5 ++++-
 .../app/ui/description/editor/description-editor.resolver.ts | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
index 841707064..7c59fea12 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.html
@@ -112,7 +112,7 @@
 							<span class="material-icons">chevron_right</span>
 						</div>
 						<button [disabled]="saving" (click)="saveAndClose()" *ngIf="(step === maxStep) && !isLocked && formGroup.get('descriptionTemplateId').value && !viewOnly" mat-raised-button type="button" class="col-auto stepper-btn add-description-btn ml-auto">
-							{{ 'DESCRIPTION-EDITOR.ACTIONS.SAVE' | translate }}
+							{{ 'DESCRIPTION-EDITOR.ACTIONS.SAVE-AND-CLOSE' | translate }}
 						</button>
 					</div>
 					<div class="col-auto pr-0">
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
index cb0ed4eaa..e19f8740e 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.ts
@@ -61,6 +61,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 
 	isNew = true;
 	isDeleted = false;
+	isCopy = false;
 	item: Description;
 	fieldsetIdWithFocus: string;
 	fileTransformerEntityTypeEnum = FileTransformerEntityType;
@@ -126,10 +127,12 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 
 				const itemId = params['id'];
 				const dmpId = params['dmpId'];
+				const copyDmpId = params['copyDmpId'];
 				const dmpSectionId = params['dmpSectionId'];
 
 				const isPublicDescription = params['public'];
 				const newDmpId = params['newDmpId'];
+				if(copyDmpId && !dmpId && dmpSectionId) this.isCopy = true;
 
 
 
@@ -631,7 +634,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 	refreshOnNavigateToData(id?: Guid): void {
 		this.formGroup.markAsPristine();
 
-		if (this.isNew) {
+		if (this.isNew || this.isCopy) {
 			let route = [];
 			route.push('/descriptions/edit/' + id);
 			this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.resolver.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.resolver.ts
index d7072f847..007cc79c6 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-editor.resolver.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-editor.resolver.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { DescriptionStatus } from '@app/core/common/enum/description-status';
 import { AppPermission } from '@app/core/common/enum/permission.enum';
 import { DescriptionTemplate, DescriptionTemplateBaseFieldData, DescriptionTemplateDefinition, DescriptionTemplateExternalDatasetData, DescriptionTemplateField, DescriptionTemplateFieldSet, DescriptionTemplateMultiplicity, DescriptionTemplatePage, DescriptionTemplateReferenceTypeData, DescriptionTemplateRule, DescriptionTemplateSection, DescriptionTemplateSelectData, DescriptionTemplateSelectOption, DescriptionTemplateUploadData, DescriptionTemplateUploadOption } from '@app/core/model/description-template/description-template';
 import { Description, DescriptionExternalIdentifier, DescriptionField, DescriptionPropertyDefinition, DescriptionPropertyDefinitionFieldSet, DescriptionPropertyDefinitionFieldSetItem, DescriptionReference, DescriptionReferenceData, DescriptionTag } from '@app/core/model/description/description';
@@ -203,8 +204,12 @@ export class DescriptionEditorResolver extends BaseEditorResolver {
 			return this.dmpService.getSingle(Guid.parse(copyDmpId), DescriptionEditorResolver.dmpLookupFields()).pipe(tap(x => this.breadcrumbService.addIdResolvedValue(x.id?.toString(), x.label)), takeUntil(this._destroyed), concatMap(dmp => {
 				return this.descriptionService.getSingle(Guid.parse(id), DescriptionEditorResolver.cloneLookupFields()).pipe(tap(x => this.breadcrumbService.addIdResolvedValue(x.id?.toString(), x.label)), takeUntil(this._destroyed), map(description => {
 
+					description.id = null;
+					description.hash = null;
+					description.status = DescriptionStatus.Draft;
 					description.dmp = dmp;
 					description.dmpDescriptionTemplate = {
+						id: dmp.dmpDescriptionTemplates.filter(x => x.sectionId == Guid.parse(dmpSectionId) && x.descriptionTemplateGroupId == description.descriptionTemplate.groupId)[0].id,
 						sectionId: Guid.parse(dmpSectionId)
 					}
 					return description;