@@ -23,6 +23,7 @@ import { MatButtonToggleModule } from '@angular/material/button-toggle';
2323
2424export interface ReportConfigModalData {
2525 config : ReportConfig ;
26+ selectedTeams : string [ ] ;
2627 allActivities : Activity [ ] ;
2728 allTeams : string [ ] ;
2829 allDimensions : string [ ] ;
@@ -31,6 +32,11 @@ export interface ReportConfigModalData {
3132 teamGroups : TeamGroups ;
3233}
3334
35+ export interface ReportConfigModalResult {
36+ config : ReportConfig ;
37+ selectedTeams : string [ ] ;
38+ }
39+
3440@Component ( {
3541 selector : 'app-report-config-modal' ,
3642 templateUrl : './report-config-modal.component.html' ,
@@ -57,11 +63,12 @@ export class ReportConfigModalComponent {
5763
5864 config = signal < ReportConfig > ( JSON . parse ( JSON . stringify ( { } ) ) ) ;
5965 allActivities : Activity [ ] ;
60- allTeams : string [ ] ;
66+ allTeams : string [ ] = [ ] ;
6167 allDimensions : string [ ] ;
6268 allSubdimensions : string [ ] ;
6369 allProgressTitles : ProgressTitle [ ] ;
64- teamGroups : TeamGroups ;
70+ teamGroups : TeamGroups = { } ;
71+ selectedTeams : string [ ] = [ ] ;
6572 activitySearchQuery = signal ( '' ) ;
6673 maxWordCap : number = MAX_DESCRIPTION_WORD_CAP ;
6774
@@ -86,11 +93,12 @@ export class ReportConfigModalComponent {
8693 // Deep copy config to avoid mutating the original until save
8794 this . config . set ( JSON . parse ( JSON . stringify ( data . config ) ) ) ;
8895 this . allActivities = data . allActivities ;
89- this . allTeams = data . allTeams ;
96+ this . allTeams = [ ... data . allTeams ] ;
9097 this . allDimensions = data . allDimensions ;
9198 this . allSubdimensions = data . allSubdimensions ;
9299 this . allProgressTitles = data . allProgressTitles || [ ] ;
93- this . teamGroups = data . teamGroups || { } ;
100+ this . teamGroups = { ...data . teamGroups } ;
101+ this . selectedTeams = [ ...data . selectedTeams ] ;
94102 }
95103
96104 setColumnGrouping ( grouping : ColumnGrouping ) : void {
@@ -172,13 +180,13 @@ export class ReportConfigModalComponent {
172180 } ) ;
173181 }
174182
175- onTeamsChanged ( teams : string [ ] ) : void {
176- this . config . update ( c => ( { ... c , selectedTeams : teams } ) ) ;
183+ onSelectedTeamsChange ( teams : string [ ] ) : void {
184+ this . selectedTeams = teams ;
177185 }
178186
179187 // --- Actions ---
180188 onSave ( ) : void {
181- this . dialogRef . close ( this . config ( ) ) ;
189+ this . dialogRef . close ( { config : this . config ( ) , selectedTeams : this . selectedTeams } ) ;
182190 }
183191
184192 onCancel ( ) : void {
0 commit comments