From 1587a413cf6b492c0a2433f991398be01dd5dc0e Mon Sep 17 00:00:00 2001
From: mchouliara <mchouliara@cite.gr>
Date: Wed, 28 Aug 2024 15:37:35 +0300
Subject: [PATCH] description template listing > fix clone action condition

---
 .../editor/description-template-editor.resolver.ts              | 2 +-
 .../listing/description-template-listing.component.html         | 2 +-
 .../listing/description-template-listing.component.ts           | 2 +-
 .../editor/resolvers/description-editor-entity.resolver.ts      | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/ui/admin/description-template/editor/description-template-editor.resolver.ts b/frontend/src/app/ui/admin/description-template/editor/description-template-editor.resolver.ts
index 3fbb7967f..8a7ebe542 100644
--- a/frontend/src/app/ui/admin/description-template/editor/description-template-editor.resolver.ts
+++ b/frontend/src/app/ui/admin/description-template/editor/description-template-editor.resolver.ts
@@ -124,7 +124,7 @@ export class DescriptionTemplateEditorResolver extends BaseEditorResolver {
 						descriptionTemplate.hash = null;
 						descriptionTemplate.code = null;
 						descriptionTemplate.isActive = IsActive.Active;
-
+                        descriptionTemplate.belongsToCurrentTenant = true;
 						return descriptionTemplate;
 				}));
 		} else if (newversion != null) {
diff --git a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
index 79d1f96ea..56c1712b7 100644
--- a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
+++ b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
@@ -13,7 +13,7 @@
 					</button>
 				</div>
 
-				<div class="col-auto">
+				<div class="col-auto" *ngIf="canCreateNew()">
 					<button mat-raised-button class="create-btn" *ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionTemplate)" [routerLink]="[routerUtils.generateUrl('/description-templates/new')]">
 						<mat-icon>add</mat-icon>
 						{{'DESCRIPTION-TEMPLATE-LISTING.CREATE-DESCRIPTION-TEMPLATE' | translate}}
diff --git a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
index 516e8c045..5439a7c5a 100644
--- a/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
+++ b/frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.ts
@@ -224,7 +224,7 @@ export class DescriptionTemplateListingComponent extends BaseListingComponent<De
 	}
 
 	public canClone(descriptionTemplate: DescriptionTemplate): boolean {
-		return descriptionTemplate.belongsToCurrentTenant != false && this.hasPermission(AppPermission.CloneDescriptionTemplate, descriptionTemplate);
+		return this.hasPermission(AppPermission.CloneDescriptionTemplate, descriptionTemplate);
 	}
 
 	public canViewVersions(descriptionTemplate: DescriptionTemplate): boolean {
diff --git a/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts b/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts
index 3f245d48d..bed8915f2 100644
--- a/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts
+++ b/frontend/src/app/ui/description/editor/resolvers/description-editor-entity.resolver.ts
@@ -202,6 +202,7 @@ export class DescriptionEditorEntityResolver extends BaseEditorResolver {
 					description.id = null;
 					description.hash = null;
 					description.isActive = IsActive.Active;
+                    description.belongsToCurrentTenant = true;
 					description.status = DescriptionStatusEnum.Draft;
 					description.plan = plan;
 					description.planDescriptionTemplate = {