Merge pull request #336 from 0x41head/activity-desc

Fixed bug where changes done in circular heatmap were not shown in activity description
devsecopsmaturitymodel · Nov 14, 2024 · 68951ef · 68951ef
2 parents ffccf07 + bbb5975
commit 68951ef
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 16 deletions.
diff --git a/src/app/component/activity-description/activity-description.component.ts b/src/app/component/activity-description/activity-description.component.ts
@@ -10,6 +10,7 @@ export interface implementation {
   url: string;
   description: string;
 }
+
 export interface activityDescription {
   dimension: string;
   subDimension: string;
@@ -127,19 +128,6 @@ export class ActivityDescriptionComponent implements OnInit {
             var currentActivityName = activityInCurrentSubDimension[a];
 
             try {
-              console.log(this.currentActivity.uuid, this.currentActivity.uuid);
-              console.log(
-                'uuid',
-                this.YamlObject[allDimensionNames[i]][
-                  subdimensionsInCurrentDimension[j]
-                ][currentActivityName].uuid
-              );
-              console.log(
-                'currentActivityName',
-                this.YamlObject[allDimensionNames[i]][
-                  subdimensionsInCurrentDimension[j]
-                ][currentActivityName]
-              );
               if (
                 this.YamlObject[allDimensionNames[i]][
                   subdimensionsInCurrentDimension[j]
@@ -149,7 +137,7 @@ export class ActivityDescriptionComponent implements OnInit {
                   this.YamlObject[allDimensionNames[i]][
                     subdimensionsInCurrentDimension[j]
                   ][currentActivityName];
-                this.currentActivity = data;
+                this.currentActivity = JSON.parse(JSON.stringify(data)); // Creates a deep copy of current activity to keep two seperate versions - with and without martkdown
                 this.currentActivity.dimension = allDimensionNames[i];
                 this.currentActivity.subDimension =
                   subdimensionsInCurrentDimension[j];
@@ -262,7 +250,35 @@ export class ActivityDescriptionComponent implements OnInit {
         data['isImplemented'],
         false
       );
-      this.currentActivity.teamsImplemented = data['teamsImplemented'];
+      const dataFromLocalStorage = localStorage.getItem('dataset');
+      if (dataFromLocalStorage !== null) {
+        var parsedDataFromLocalStorage = JSON.parse(dataFromLocalStorage);
+        var index = -1;
+        for (var i = 0; i < parsedDataFromLocalStorage.length; i++) {
+          for (
+            var j = 0;
+            j < parsedDataFromLocalStorage[i]['Activity'].length;
+            j++
+          ) {
+            if (
+              parsedDataFromLocalStorage[i]['Activity'][j]['uuid'] ===
+              data['uuid']
+            ) {
+              console.log('test', parsedDataFromLocalStorage[i]['Activity'][j]);
+
+              index = i;
+              this.currentActivity.teamsImplemented =
+                parsedDataFromLocalStorage[i]['Activity'][j][
+                  'teamsImplemented'
+                ];
+
+              break;
+            }
+          }
+        }
+        // this.currentActivity.teamsEvidence = this.defineEvidenceObject();
+      } else this.currentActivity.teamsImplemented = data['teamsImplemented'];
+
       this.currentActivity.teamsEvidence = this.defineEvidenceObject(
         data['teamsEvidence']
       );

diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.ts b/src/app/component/circular-heatmap/circular-heatmap.component.ts
@@ -12,6 +12,7 @@ import { Router } from '@angular/router';
 import { MatChip } from '@angular/material/chips';
 
 export interface activitySchema {
+  uuid: string;
   activityName: string;
   teamsImplemented: any;
 }
@@ -101,6 +102,11 @@ export class CircularHeatmapComponent implements OnInit {
 
             for (var a = 0; a < allActivityInThisSubDimension.length; a++) {
               try {
+                var uuid =
+                  this.YamlObject[allDimensionNames[d]][
+                    allSubDimensionInThisDimension[s]
+                  ][allActivityInThisSubDimension[a]]['uuid'];
+
                 var lvlOfCurrentActivity =
                   this.YamlObject[allDimensionNames[d]][
                     allSubDimensionInThisDimension[s]
@@ -148,6 +154,7 @@ export class CircularHeatmapComponent implements OnInit {
                   });
 
                   activity.push({
+                    uuid: uuid,
                     activityName: nameOfActivity,
                     teamsImplemented: teamStatus,
                   });
@@ -788,7 +795,7 @@ export class CircularHeatmapComponent implements OnInit {
 
   ResetIsImplemented() {
     localStorage.removeItem('dataset');
-    this.loadState()
+    this.loadState();
   }
 
   saveState() {