bug/616-enable-disable-buttons

frontend/src/app/objective/objective.component.html

@@ -19,6 +19,7 @@
       />
       <header class="title col-10 ps-2">{{ objective.title }}</header>
       <button
+        #menuButton
         *ngIf="isWritable"
         class="icon-button three-dot-menu"
         [matMenuTriggerFor]="objectiveMenu"

frontend/src/app/objective/objective.component.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
 import { MenuEntry } from '../shared/types/menu-entry';
 import { ObjectiveMin } from '../shared/types/model/ObjectiveMin';
 import { Router } from '@angular/router';
@@ -29,6 +29,7 @@ export class ObjectiveComponent implements OnInit {
   menuEntries: MenuEntry[] = [];
   isComplete: boolean = false;
   protected readonly trackByFn = trackByFn;
+  @ViewChild('menuButton') private menuButton!: ElementRef;
 
   constructor(
     private matDialog: MatDialog,
@@ -160,6 +161,7 @@ export class ObjectiveComponent implements OnInit {
         maxWidth: dialogConfig.maxWidth,
       });
       matDialogRef.afterClosed().subscribe((result) => {
+        this.menuButton.nativeElement.focus();
         if (result) {
           this.handleDialogResult(menuEntry, result);
         }

frontend/src/app/team/team.component.html

@@ -25,7 +25,7 @@
     >
       <app-objective-column
         id="objective-column"
-        *ngFor="let objective of OVEntity.objectives; trackBy: trackByFn"
+        *ngFor="let objective of OVEntity.objectives; trackBy: trackByObjectiveId"
         [objective]="objective"
         [isWritable]="OVEntity.team.writable"
         class="col-xs-12 col-md-4 p-0 column-width"

frontend/src/app/team/team.component.ts

@@ -1,16 +1,17 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Input, TrackByFunction } from '@angular/core';
 import { OverviewEntity } from '../shared/types/model/OverviewEntity';
 import { MatDialog } from '@angular/material/dialog';
 import { ObjectiveFormComponent } from '../shared/dialog/objective-dialog/objective-form.component';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
 import { RefreshDataService } from '../shared/services/refresh-data.service';
 import { Objective } from '../shared/types/model/Objective';
-import { isMobileDevice, optionalReplaceWithNulls, trackByFn } from '../shared/common';
+import { isMobileDevice, optionalReplaceWithNulls } from '../shared/common';
 import { TeamManagementComponent } from '../shared/dialog/team-management/team-management.component';
 import { TeamMin } from '../shared/types/model/TeamMin';
 import { KeyresultDialogComponent } from '../shared/dialog/keyresult-dialog/keyresult-dialog.component';
 import { ActivatedRoute, Router } from '@angular/router';
 import { CloseState } from '../shared/types/enums/CloseState';
+import { ObjectiveMin } from '../shared/types/model/ObjectiveMin';
 
 @Component({
   selector: 'app-team',
@@ -20,7 +21,7 @@ import { CloseState } from '../shared/types/enums/CloseState';
 })
 export class TeamComponent {
   private overviewEntity$ = new BehaviorSubject<OverviewEntity>({} as OverviewEntity);
-  protected readonly trackByFn = trackByFn;
+  trackByObjectiveId: TrackByFunction<ObjectiveMin> = (index, objective) => objective.id;
 
   @Input()
   hasAdminAccess!: ReplaySubject<boolean>;
@@ -129,10 +130,12 @@ export class TeamComponent {
       },
     });
     dialog.afterClosed().subscribe((result) => {
-      if (result.state == CloseState.DELETED) {
-        this.removeTeam(result.id).then(() => this.refreshDataService.markDataRefresh());
-      } else {
-        this.refreshDataService.markDataRefresh();
+      if (result) {
+        if (result.state == CloseState.DELETED) {
+          this.removeTeam(result.id).then(() => this.refreshDataService.markDataRefresh());
+        } else {
+          this.refreshDataService.markDataRefresh();
+        }
       }
     });
   }