Merge pull request #350 from 0x41head/circular-desc-fix

feat: fixes markdown render issue in circular heatmap
devsecopsmaturitymodel · Jan 13, 2025 · bf14c86 · bf14c86
2 parents fd118d7 + 4b888e5
commit bf14c86
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.html b/src/app/component/circular-heatmap/circular-heatmap.component.html
@@ -45,19 +45,7 @@ <h2>Nothing to show</h2>
                   </mat-panel-title>
                 </mat-expansion-panel-header>
                 <ng-template matExpansionPanelContent>
-                  <div
-                    *ngIf="
-                      markdown.render(activityDetails.description);
-                      else ifFileIsNotAMarkdown
-                    ">
-                    <p
-                      [innerHTML]="
-                        markdown.render(activityDetails.description)
-                      "></p>
-                  </div>
-                  <ng-template #ifFileIsNotAMarkdown>
-                    <p [innerHTML]="activityDetails.description"></p>
-                  </ng-template>
+                  <p [innerHTML]="activityDetails.description"></p>
                 </ng-template>
               </mat-expansion-panel>
               <mat-expansion-panel

diff --git a/src/app/component/circular-heatmap/circular-heatmap.component.ts b/src/app/component/circular-heatmap/circular-heatmap.component.ts
@@ -717,6 +717,17 @@ export class CircularHeatmapComponent implements OnInit {
     }
   }
 
+  defineStringValues(
+    dataToCheck: string,
+    valueOfDataIfUndefined: string
+  ): string {
+    try {
+      return this.markdown.render(dataToCheck);
+    } catch {
+      return valueOfDataIfUndefined;
+    }
+  }
+
   openActivityDetails(dim: string, subdim: string, activityName: string) {
     let navigationExtras = {
       dimension: dim,
@@ -727,7 +738,18 @@ export class CircularHeatmapComponent implements OnInit {
       {},
       this.YamlObject[dim][subdim][activityName]
     );
-
+    this.activityDetails.description = this.defineStringValues(
+      this.activityDetails.description,
+      this.activityDetails.description
+    );
+    this.activityDetails.risk = this.defineStringValues(
+      this.activityDetails.risk,
+      this.activityDetails.risk
+    );
+    this.activityDetails.measure = this.defineStringValues(
+      this.activityDetails.measure,
+      this.activityDetails.measure
+    );
     if (this.activityDetails) {
       this.activityDetails.navigationExtras = navigationExtras;
     }