From 3dcc415d5e1f1459ea322f09ed1ea2d550182a31 Mon Sep 17 00:00:00 2001
From: "CITE\\spapacharalampous" <Sofia Papacharalampous>
Date: Thu, 29 Aug 2024 11:40:21 +0300
Subject: [PATCH] added group id on public description template model

---
 .../org/opencdmp/model/PublicDescriptionTemplate.java    | 7 +++++++
 .../model/builder/PublicDescriptionTemplateBuilder.java  | 9 +--------
 .../description-copy-dialog.component.ts                 | 4 +---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/backend/core/src/main/java/org/opencdmp/model/PublicDescriptionTemplate.java b/backend/core/src/main/java/org/opencdmp/model/PublicDescriptionTemplate.java
index 382f621ed..649e84b88 100644
--- a/backend/core/src/main/java/org/opencdmp/model/PublicDescriptionTemplate.java
+++ b/backend/core/src/main/java/org/opencdmp/model/PublicDescriptionTemplate.java
@@ -7,6 +7,9 @@ public class PublicDescriptionTemplate {
     public final static String _id = "id";
     private UUID id;
 
+    public final static String _groupId = "groupId";
+    private UUID groupId;
+
     public final static String _label = "label";
     private String label;
 
@@ -21,6 +24,10 @@ public class PublicDescriptionTemplate {
         this.id = id;
     }
 
+    public UUID getGroupId() { return this.groupId; }
+
+    public void setGroupId(UUID groupId) { this.groupId = groupId; }
+
     public String getLabel() {
         return label;
     }
diff --git a/backend/core/src/main/java/org/opencdmp/model/builder/PublicDescriptionTemplateBuilder.java b/backend/core/src/main/java/org/opencdmp/model/builder/PublicDescriptionTemplateBuilder.java
index 3aeefc151..92f3b974b 100644
--- a/backend/core/src/main/java/org/opencdmp/model/builder/PublicDescriptionTemplateBuilder.java
+++ b/backend/core/src/main/java/org/opencdmp/model/builder/PublicDescriptionTemplateBuilder.java
@@ -1,17 +1,10 @@
 package org.opencdmp.model.builder;
 
 import org.opencdmp.authorization.AuthorizationFlags;
-import org.opencdmp.commons.XmlHandlingService;
-import org.opencdmp.commons.types.descriptiontemplate.DefinitionEntity;
 import org.opencdmp.convention.ConventionService;
 import org.opencdmp.data.DescriptionTemplateEntity;
 import org.opencdmp.model.PublicDescriptionTemplate;
-import org.opencdmp.query.DescriptionTemplateTypeQuery;
-import org.opencdmp.query.UserDescriptionTemplateQuery;
-import gr.cite.tools.data.builder.BuilderFactory;
-import gr.cite.tools.data.query.QueryFactory;
 import gr.cite.tools.exception.MyApplicationException;
-import gr.cite.tools.fieldset.BaseFieldSet;
 import gr.cite.tools.fieldset.FieldSet;
 import gr.cite.tools.logging.DataLogEntry;
 import gr.cite.tools.logging.LoggerService;
@@ -22,7 +15,6 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Component
 @Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE)
@@ -50,6 +42,7 @@ public class PublicDescriptionTemplateBuilder extends BaseBuilder<PublicDescript
         for (DescriptionTemplateEntity d : data) {
             PublicDescriptionTemplate m = new PublicDescriptionTemplate();
             if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._id)))  m.setId(d.getId());
+            if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._groupId)))  m.setGroupId(d.getGroupId());
             if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._label)))  m.setLabel(d.getLabel());
             if (fields.hasField(this.asIndexer(PublicDescriptionTemplate._description)))  m.setDescription(d.getDescription());
             models.add(m);
diff --git a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.ts b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.ts
index e51ecefac..a44c244a3 100644
--- a/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.ts
+++ b/frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.ts
@@ -1,8 +1,7 @@
 
-import { map, filter } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { Component } from "@angular/core";
 import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
-import { Observable } from "rxjs";
 import { Inject } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 import { SingleAutoCompleteConfiguration } from '@app/library/auto-complete/single/single-auto-complete-configuration';
@@ -16,7 +15,6 @@ import { Guid } from '@common/types/guid';
 import { PlanStatusEnum } from '@app/core/common/enum/plan-status';
 import { nameof } from 'ts-simple-nameof';
 import { FilterService } from '@common/modules/text-filter/filter-service';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
 import { DescriptionTemplatesInSection, PlanBlueprint, PlanBlueprintDefinition, PlanBlueprintDefinitionSection } from '@app/core/model/plan-blueprint/plan-blueprint';
 import { TenantLookup } from '@app/core/query/tenant.lookup';
 import { Tenant } from '@app/core/model/tenant/tenant';