Skip to content

Commit 51bc7ca

Browse files
committed
refactor(teams_selection): centralize team selection in TeamSelectionService
1 parent 624c8ab commit 51bc7ca

11 files changed

Lines changed: 219 additions & 129 deletions

File tree

‎src/app/component/add-evidence-modal/add-evidence-modal.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ <h2 mat-dialog-title align="center">Add Evidence</h2>
22

33
<mat-dialog-content class="config-content">
44
<app-team-selector
5-
[allTeams]="allTeams"
6-
[(selectedTeams)]="selectedTeams"
7-
[teamGroups]="teamGroups"
5+
[allTeams]="teamSelection.allTeams()"
6+
[selectedTeams]="selectedTeams"
7+
[teamGroups]="teamSelection.teamGroups()"
88
(selectedTeamsChange)="onSelectedTeamsChange($event)"
99
[type]="'add-evidence-config'">
1010
</app-team-selector>

‎src/app/component/add-evidence-modal/add-evidence-modal.component.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, inject, ChangeDetectionStrategy } from '@angular/core';
22
import { MAT_DIALOG_DATA, MatDialogRef, MatDialogModule } from '@angular/material/dialog';
33
import { EvidenceEntry, EvidenceStore } from '../../model/evidence-store';
4-
import { TeamGroups } from '../../model/types';
4+
import { TeamSelectionService } from '../../service/team-selection.service';
55
import { MatIconModule } from '@angular/material/icon';
66
import { MatTooltipModule } from '@angular/material/tooltip';
77
import { MatButtonModule } from '@angular/material/button';
@@ -16,8 +16,6 @@ import { TeamSelectorComponent } from '../team-selector/team-selector.component'
1616

1717
export interface AddEvidenceModalData {
1818
activityUuid: string;
19-
allTeams: string[];
20-
teamGroups: TeamGroups;
2119
}
2220

2321
@Component({
@@ -42,10 +40,9 @@ export interface AddEvidenceModalData {
4240
export class AddEvidenceModalComponent {
4341
dialogRef = inject<MatDialogRef<AddEvidenceModalComponent>>(MatDialogRef);
4442
data = inject<AddEvidenceModalData>(MAT_DIALOG_DATA);
43+
readonly teamSelection = inject(TeamSelectionService);
4544

4645
activityUuid: string;
47-
allTeams: string[];
48-
teamGroups: TeamGroups;
4946

5047
// Form fields
5148
selectedTeams: string[] = [];
@@ -66,8 +63,7 @@ export class AddEvidenceModalComponent {
6663
const data = this.data;
6764

6865
this.activityUuid = data.activityUuid;
69-
this.allTeams = data.allTeams;
70-
this.teamGroups = data.teamGroups || {};
66+
this.selectedTeams = [...this.teamSelection.effectiveTeams()];
7167
}
7268

7369
onSelectedTeamsChange(teams: string[]): void {

‎src/app/component/evidence-panel/evidence-panel.component.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
} from '@angular/core';
99
import { EvidenceEntry } from '../../model/evidence-store';
1010
import { LoaderService } from '../../service/loader/data-loader.service';
11+
import { TeamSelectionService } from '../../service/team-selection.service';
1112
import { MatIconModule } from '@angular/material/icon';
1213
import { MatExpansionModule } from '@angular/material/expansion';
1314
import { DatePipe } from '@angular/common';
@@ -21,6 +22,7 @@ import { DatePipe } from '@angular/common';
2122
})
2223
export class EvidencePanelComponent implements OnChanges {
2324
private loader = inject(LoaderService);
25+
private teamSelection = inject(TeamSelectionService);
2426

2527
@Input() activityUuid: string = '';
2628
@Input() expanded: boolean = false;
@@ -53,9 +55,12 @@ export class EvidencePanelComponent implements OnChanges {
5355

5456
this.evidenceEntries = evidenceStore.getEvidence(this.activityUuid);
5557

58+
const effectiveTeams = new Set(this.teamSelection.effectiveTeams());
59+
5660
// Group evidence entries by team name
5761
for (const entry of this.evidenceEntries) {
5862
for (const teamName of entry.teams) {
63+
if (!effectiveTeams.has(teamName)) continue;
5964
if (!this.evidenceByTeam.has(teamName)) {
6065
this.evidenceByTeam.set(teamName, []);
6166
}

‎src/app/component/report-config-modal/report-config-modal.component.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,10 @@ <h3>Individual Activities</h3>
256256
<!-- Teams -->
257257
<app-team-selector
258258
[allTeams]="allTeams"
259-
[selectedTeams]="config().selectedTeams"
260-
(selectedTeamsChange)="onTeamsChanged($event)"
261-
[teamGroups]="teamGroups"></app-team-selector>
259+
[selectedTeams]="selectedTeams"
260+
(selectedTeamsChange)="onSelectedTeamsChange($event)"
261+
[teamGroups]="teamGroups">
262+
</app-team-selector>
262263

263264
<mat-divider></mat-divider>
264265
</mat-dialog-content>

‎src/app/component/report-config-modal/report-config-modal.component.ts‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { MatButtonToggleModule } from '@angular/material/button-toggle';
2323

2424
export 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 {

‎src/app/component/team-selector/team-selector.component.ts‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,45 @@ export class TeamSelectorComponent {
2121

2222
@Output() selectedTeamsChange = new EventEmitter<string[]>();
2323

24-
selectedGroupName: string = '';
25-
2624
isTeamSelected(team: string): boolean {
2725
return this.selectedTeams.includes(team);
2826
}
2927

3028
toggleTeam(team: string): void {
31-
const idx = this.selectedTeams.indexOf(team);
32-
if (idx >= 0) {
33-
this.selectedTeams.splice(idx, 1);
29+
const teams = [...this.selectedTeams];
30+
const index = teams.indexOf(team);
31+
if (index >= 0) {
32+
teams.splice(index, 1);
3433
} else {
35-
this.selectedTeams.push(team);
34+
teams.push(team);
3635
}
37-
this.selectedGroupName = '';
38-
this.selectedTeamsChange.emit([...this.selectedTeams]);
36+
this.selectedTeamsChange.emit(teams);
3937
}
4038

4139
selectAllTeams(): void {
42-
this.selectedTeams = [...this.allTeams];
43-
this.selectedGroupName = '';
44-
this.selectedTeamsChange.emit([...this.selectedTeams]);
40+
this.selectedTeamsChange.emit([...this.allTeams]);
4541
}
4642

4743
deselectAllTeams(): void {
48-
this.selectedTeams = [];
49-
this.selectedGroupName = '';
50-
this.selectedTeamsChange.emit([...this.selectedTeams]);
44+
this.selectedTeamsChange.emit([]);
5145
}
5246

5347
get groupNames(): string[] {
54-
return Object.keys(this.teamGroups);
48+
return Object.keys(this.teamGroups).filter(group => this.teamGroups[group].length > 0);
5549
}
5650

5751
selectGroup(group: string): void {
58-
this.selectedTeams = [...(this.teamGroups[group] || [])];
59-
this.selectedGroupName = group;
60-
this.selectedTeamsChange.emit([...this.selectedTeams]);
52+
this.selectedTeamsChange.emit([...(this.teamGroups[group] || [])]);
53+
}
54+
55+
get selectedGroupName(): string {
56+
const selected = new Set(this.selectedTeams);
57+
for (const group of this.groupNames) {
58+
const teams = this.teamGroups[group];
59+
if (teams.length === selected.size && teams.every(team => selected.has(team))) {
60+
return group;
61+
}
62+
}
63+
return '';
6164
}
6265
}

‎src/app/model/report-config.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export interface ActivityAttributes {
2626
export interface ReportConfig {
2727
columnGrouping: ColumnGrouping;
2828
descriptionWordCap: number;
29-
selectedTeams: string[];
3029
excludedDimensions: string[];
3130
excludedSubdimensions: string[];
3231
excludedActivities: string[];
@@ -66,7 +65,6 @@ export function getDefaultReportConfig(): ReportConfig {
6665
return {
6766
columnGrouping: 'byProgress',
6867
descriptionWordCap: DEFAULT_DESCRIPTION_WORD_CAP,
69-
selectedTeams: [],
7068
excludedDimensions: [],
7169
excludedSubdimensions: [],
7270
excludedActivities: [],
@@ -118,15 +116,21 @@ export function getReportConfig(): ReportConfig {
118116
showTags: parsedAttrs.showTags ?? defaultAttrs.showTags,
119117
};
120118

121-
return {
119+
const config: ReportConfig = {
122120
columnGrouping: parsed.columnGrouping ?? defaults.columnGrouping,
123121
descriptionWordCap: parsed.descriptionWordCap ?? defaults.descriptionWordCap,
124-
selectedTeams: parsed.selectedTeams ?? defaults.selectedTeams,
125122
excludedDimensions: parsed.excludedDimensions ?? defaults.excludedDimensions,
126123
excludedSubdimensions: parsed.excludedSubdimensions ?? defaults.excludedSubdimensions,
127124
excludedActivities: parsed.excludedActivities ?? defaults.excludedActivities,
128125
activityAttributes,
129126
};
127+
128+
// Remove the legacy team selection from saved report settings.
129+
if ('selectedTeams' in parsed) {
130+
saveReportConfig(config);
131+
}
132+
133+
return config;
130134
}
131135
} catch (e) {
132136
console.error('Error reading ReportConfig from localStorage:', e);

0 commit comments

Comments
 (0)