Fix incorrect reporting-profile sidebar expansion content

This commit fixes #4333 The scan results expansion items were not being correctly mapped to the nodes they belong to. Signed-off-by: Scott Christopherson <scott@chef.io>
chef · Sep 21, 2020 · 2b58c5a · 2b58c5a
1 parent fe4bd0b
commit 2b58c5a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.../src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.html b/.../src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.html
@@ -137,7 +137,7 @@ <h4><strong>Scan results for control:</strong></h4>
                 </chef-toggle>
                 <ng-container [ngSwitch]="openControlPane(node)">
                   <div *ngSwitchCase="'results'">
-                    <div class="result-item" *ngFor="let result of scanResults.control.results">
+                    <div class="result-item" *ngFor="let result of scanResults.controls[node.id]?.results">
                       <div class="result-item-header">
                         <chef-icon [ngClass]="result.status">{{ statusIcon(result.status) }}</chef-icon>
                         <p>{{ result.code_desc }}</p>

diff --git a/...ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.ts b/...ui/src/app/pages/+compliance/+reporting/+reporting-profile/reporting-profile.component.ts
@@ -103,6 +103,7 @@ export class ReportingProfileComponent implements OnInit, OnDestroy {
         takeUntil(this.isDestroyed))
         .subscribe((control) => {
           this.scanResults.control = control;
+          this.scanResults.controls[nodeId] = control;
           this.scanResults.controlDetail.item = control;
           this.scanResults.showControlDetail = true;
         });

diff --git a/components/automate-ui/src/app/pages/+compliance/shared/reporting/scan-results.service.ts b/components/automate-ui/src/app/pages/+compliance/shared/reporting/scan-results.service.ts
@@ -1,6 +1,10 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 
+interface ControlsByNode {
+  [nodeId: string]: any;
+}
+
 @Injectable()
 export class ScanResultsService {
 
@@ -12,6 +16,7 @@ export class ScanResultsService {
   node: any = {};
   profile: any = {};
   control: any = {};
+  controls: ControlsByNode = {};
 
   showNodesList = false;
   nodesList: any = {