Hide children section for milestones

https://community.openproject.org/work_packages/54983
opf · Jun 24, 2024 · 8845f0b · 8845f0b
1 parent dceff13
commit 8845f0b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/...ckages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.directive.ts b/...ckages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.directive.ts
@@ -39,6 +39,7 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import {
   WorkPackageIsolatedQuerySpaceDirective,
 } from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive';
+import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
 
 @Component({
   selector: 'wp-relations-hierarchy',
@@ -54,18 +55,21 @@ export class WorkPackageRelationsHierarchyComponent extends UntilDestroyedMixin
 
   public workPackagePath:string;
 
-  public canHaveChildren:boolean;
+  public canHaveChildren = false;
 
   public canModifyHierarchy:boolean;
 
   public canAddRelation:boolean;
 
   public childrenQueryProps:any;
 
-  constructor(protected wpRelationsHierarchyService:WorkPackageRelationsHierarchyService,
-    protected apiV3Service:ApiV3Service,
-    protected PathHelper:PathHelperService,
-    readonly I18n:I18nService) {
+  constructor(
+    readonly wpRelationsHierarchyService:WorkPackageRelationsHierarchyService,
+    readonly apiV3Service:ApiV3Service,
+    readonly PathHelper:PathHelperService,
+    readonly I18n:I18nService,
+    readonly schemaCache:SchemaCacheService,
+  ) {
     super();
   }
 
@@ -93,8 +97,10 @@ export class WorkPackageRelationsHierarchyComponent extends UntilDestroyedMixin
       .pipe(
         this.untilDestroyed(),
       )
-      .subscribe((wp:WorkPackageResource) => {
+      .subscribe((wp) => {
+        const milestone = this.schemaCache.of(wp).isMilestone as boolean;
         this.workPackage = wp;
+        this.canHaveChildren = !milestone;
 
         const parentId = this.workPackage.parent?.id?.toString();
 

diff --git a/...kages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.template.html b/...kages/components/wp-relations/wp-relations-hierarchy/wp-relations-hierarchy.template.html
@@ -1,4 +1,6 @@
-<div class="wp-relations-hierarchy-section wp-relations--children">
+<div
+  *ngIf="canHaveChildren"
+  class="wp-relations-hierarchy-section wp-relations--children">
   <div class="attributes-group--header">
     <div class="attributes-group--header-container">
       <h3 class="attributes-group--header-text"

diff --git a/spec/features/work_packages/details/relations/hierarchy_milestone_spec.rb b/spec/features/work_packages/details/relations/hierarchy_milestone_spec.rb
@@ -54,5 +54,7 @@
       expect(page).to have_no_text("Create new child")
       expect(page).to have_no_css("wp-inline-create--add-link")
     end
+
+    expect(page).to have_no_text("Children")
   end
 end