From 863bdd04631c7173a2664c0046374b588263813d Mon Sep 17 00:00:00 2001
From: Vegard Bakke <vegard.bakke@gmail.com>
Date: Sat, 28 Dec 2024 15:36:44 +0100
Subject: [PATCH 1/5] Fixes hover color

---
 .../component/circular-heatmap/circular-heatmap.component.css | 4 ++--
 .../circular-heatmap/circular-heatmap.component.html          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.css b/src/app/component/circular-heatmap/circular-heatmap.component.css
index bcad1c36e..3f73baa0e 100644
--- a/src/app/component/circular-heatmap/circular-heatmap.component.css
+++ b/src/app/component/circular-heatmap/circular-heatmap.component.css
@@ -8,8 +8,8 @@
   shape-rendering: crispEdges;
 }
 
-.normal-button {
-  background-color: white;
+.title-button {
+  background-color: transparent;
   border: none;
   text-align: left;
   cursor: pointer;
diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.html b/src/app/component/circular-heatmap/circular-heatmap.component.html
index cb32c31b0..fa89ba20c 100644
--- a/src/app/component/circular-heatmap/circular-heatmap.component.html
+++ b/src/app/component/circular-heatmap/circular-heatmap.component.html
@@ -247,7 +247,7 @@ <h2>Nothing to show</h2>
                 <mat-expansion-panel-header>
                   <mat-panel-title>
                     <button
-                      class="normal-button"
+                      class="title-button"
                       (click)="
                         $event.preventDefault();
                         navigate(

From 4d76bd942e1d19e272f60e53f7fef8546b7f89c1 Mon Sep 17 00:00:00 2001
From: Vegard Bakke <vegard.bakke@gmail.com>
Date: Sat, 28 Dec 2024 15:38:05 +0100
Subject: [PATCH 2/5] Initialize all team filters as `selected`

---
 .../circular-heatmap/circular-heatmap.component.html          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.html b/src/app/component/circular-heatmap/circular-heatmap.component.html
index fa89ba20c..3e80e7d65 100644
--- a/src/app/component/circular-heatmap/circular-heatmap.component.html
+++ b/src/app/component/circular-heatmap/circular-heatmap.component.html
@@ -230,7 +230,9 @@ <h2>Nothing to show</h2>
                 <mat-chip
                   #c="matChip"
                   *ngFor="let team of teamList"
-                  (click)="toggleTeamSelection(c)">
+                  (click)="toggleTeamSelection(c)"
+                  selected
+                  >
                   {{ team }}
                 </mat-chip>
               </mat-chip-list>

From 6818c3514722991558b614115e962c8e97279291 Mon Sep 17 00:00:00 2001
From: Vegard Bakke <vegard.bakke@gmail.com>
Date: Sat, 28 Dec 2024 15:39:18 +0100
Subject: [PATCH 3/5] Init filter chips after completing all loads

---
 .../circular-heatmap.component.ts             | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.ts b/src/app/component/circular-heatmap/circular-heatmap.component.ts
index 01670e78c..7902d0da6 100644
--- a/src/app/component/circular-heatmap/circular-heatmap.component.ts
+++ b/src/app/component/circular-heatmap/circular-heatmap.component.ts
@@ -68,13 +68,19 @@ export class CircularHeatmapComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    console.log(`${this.perfNow()}s: ngOnInit`);
     // Ensure that Levels and Teams load before MaturityData
     // using promises, since ngOnInit does not support async/await
     this.LoadMaturityLevels()
       .then(() => this.LoadTeamsFromMetaYaml())
-      .then(() => this.LoadMaturityDataFromGeneratedYaml());
+      .then(() => this.LoadMaturityDataFromGeneratedYaml())
+      .then(() => {
+          console.log(`${this.perfNow()}s: set filters: ${this.chips?.length}`);
+          this.matChipsArray = this.chips.toArray();
+      });
   }
 
+
   @ViewChildren(MatChip) chips!: QueryList<MatChip>;
   matChipsArray: MatChip[] = [];
 
@@ -255,7 +261,6 @@ export class CircularHeatmapComponent implements OnInit {
         this.teamList = this.YamlObject['teams'];
         this.teamGroups = this.YamlObject['teamGroups'];
         this.teamVisible = [...this.teamList];
-        console.log(`${this.perfNow()}s: LoadTeamsFromMetaYaml End`);
         resolve();
       });
     });
@@ -276,7 +281,6 @@ export class CircularHeatmapComponent implements OnInit {
           this.radial_labels.push('Level ' + y);
           this.maxLevelOfActivities = y;
         }
-        console.log(`${this.perfNow()}s: LoadMaturityLevels End`);
         resolve();
       });
     });
@@ -334,16 +338,6 @@ export class CircularHeatmapComponent implements OnInit {
     this.updateChips(prevSelectedChip);
   }
 
-  ngAfterViewInit() {
-    // Putting all the chips inside an array
-
-    setTimeout(() => {
-      this.matChipsArray = this.chips.toArray();
-      this.updateChips(true);
-      this.reColorHeatmap();
-    }, 100);
-  }
-
   updateChips(fromTeamGroup: any) {
     console.log('updating chips', fromTeamGroup);
     // Re select chips

From c4466f8a544450bd421f1ea1b1992a26b60f111f Mon Sep 17 00:00:00 2001
From: Vegard Bakke <vegard.bakke@gmail.com>
Date: Sat, 28 Dec 2024 15:40:46 +0100
Subject: [PATCH 4/5] Allow spaces in team and group names

---
 .../circular-heatmap/circular-heatmap.component.ts          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.ts b/src/app/component/circular-heatmap/circular-heatmap.component.ts
index 7902d0da6..6e03a20c2 100644
--- a/src/app/component/circular-heatmap/circular-heatmap.component.ts
+++ b/src/app/component/circular-heatmap/circular-heatmap.component.ts
@@ -288,7 +288,7 @@ export class CircularHeatmapComponent implements OnInit {
 
   toggleTeamGroupSelection(chip: MatChip) {
     chip.toggleSelected();
-    let currChipValue = chip.value.replace(/\s/g, '');
+    let currChipValue = chip.value.trim();
 
     if (chip.selected) {
       this.selectedTeamChips = [currChipValue];
@@ -321,7 +321,7 @@ export class CircularHeatmapComponent implements OnInit {
 
   toggleTeamSelection(chip: MatChip) {
     chip.toggleSelected();
-    let currChipValue = chip.value.replace(/\s/g, '');
+    let currChipValue = chip.value.trim();
     let prevSelectedChip = this.selectedTeamChips;
     if (chip.selected) {
       this.teamVisible.push(currChipValue);
@@ -342,7 +342,7 @@ export class CircularHeatmapComponent implements OnInit {
     console.log('updating chips', fromTeamGroup);
     // Re select chips
     this.matChipsArray.forEach(chip => {
-      let currChipValue = chip.value.replace(/\s/g, '');
+      let currChipValue = chip.value.trim();
 
       if (this.teamVisible.includes(currChipValue)) {
         console.log(currChipValue);

From df9417337c5d3c1a20eb02ebad37f63174327695 Mon Sep 17 00:00:00 2001
From: Vegard Bakke <vegard.bakke@gmail.com>
Date: Sat, 28 Dec 2024 17:27:15 +0100
Subject: [PATCH 5/5] Linted

---
 .prettierrc.json                                             | 3 ++-
 .../circular-heatmap/circular-heatmap.component.html         | 3 +--
 .../component/circular-heatmap/circular-heatmap.component.ts | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.prettierrc.json b/.prettierrc.json
index ef2ac3421..ff4791ca6 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -7,5 +7,6 @@
     "arrowParens": "avoid",
     "trailingComma": "es5",
     "bracketSameLine": true,
-    "printWidth": 80
+    "printWidth": 80,
+    "endOfLine": "auto"
   }
\ No newline at end of file
diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.html b/src/app/component/circular-heatmap/circular-heatmap.component.html
index 3e80e7d65..027d2d5a8 100644
--- a/src/app/component/circular-heatmap/circular-heatmap.component.html
+++ b/src/app/component/circular-heatmap/circular-heatmap.component.html
@@ -231,8 +231,7 @@ <h2>Nothing to show</h2>
                   #c="matChip"
                   *ngFor="let team of teamList"
                   (click)="toggleTeamSelection(c)"
-                  selected
-                  >
+                  selected>
                   {{ team }}
                 </mat-chip>
               </mat-chip-list>
diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.ts b/src/app/component/circular-heatmap/circular-heatmap.component.ts
index 6e03a20c2..d23d1cfff 100644
--- a/src/app/component/circular-heatmap/circular-heatmap.component.ts
+++ b/src/app/component/circular-heatmap/circular-heatmap.component.ts
@@ -75,12 +75,11 @@ export class CircularHeatmapComponent implements OnInit {
       .then(() => this.LoadTeamsFromMetaYaml())
       .then(() => this.LoadMaturityDataFromGeneratedYaml())
       .then(() => {
-          console.log(`${this.perfNow()}s: set filters: ${this.chips?.length}`);
-          this.matChipsArray = this.chips.toArray();
+        console.log(`${this.perfNow()}s: set filters: ${this.chips?.length}`);
+        this.matChipsArray = this.chips.toArray();
       });
   }
 
-
   @ViewChildren(MatChip) chips!: QueryList<MatChip>;
   matChipsArray: MatChip[] = [];