Merge pull request #1314 from utmstack/backlog/fix_compilance_modal_throwing

fix[frontend](compilance): setted compilance settings only by queryparams

Author: mjabascal10

frontend/src/app/compliance/compliance-report-viewer/compliance-report-viewer.component.ts

@@ -115,9 +115,6 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O
   }
 
   ngAfterViewInit(): void {
-    if (!this.standard) {
-      this.manageStandards();
-    }
   }
 
   manageStandards() {
@@ -127,10 +124,10 @@ export class ComplianceReportViewerComponent implements OnInit, AfterViewInit, O
       centered: true
     };
     const modalRef = this.modalService.open(UtmCpStandardComponent, options);
+    modalRef.componentInstance.standardId = this.standard.id;
 
     modalRef.result.then((standard) => {
       this.standard = standard;
-
       this.router.navigate([], {
         relativeTo: this.activatedRoute,
         queryParams: { standardId: this.standard.id },

frontend/src/app/compliance/shared/components/utm-cp-standard/utm-cp-standard.component.ts

@@ -3,7 +3,7 @@ import {ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output}
 import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
 import {LocalStorageService} from 'ngx-webstorage';
 import {EMPTY, Observable} from 'rxjs';
-import {catchError, concatMap, filter, map} from 'rxjs/operators';
+import {catchError, concatMap, filter, map,tap} from 'rxjs/operators';
 import {UtmToastService} from '../../../../shared/alert/utm-toast.service';
 import {CpStandardService} from '../../services/cp-standard.service';
 import {ComplianceStandardType} from '../../type/compliance-standard.type';
@@ -33,13 +33,15 @@ export class UtmCpStandardComponent implements OnInit {
       .pipe(filter(refresh => !!refresh),
         concatMap(() => this.standardService.fetchData({page: 0, size: 1000})),
         map((res) => res.body),
+        tap(standards=>{
+            this.selectedStandard =standards.find(s=>s.id==this.standardId);
+        }),
         catchError((err: HttpErrorResponse) => {
           this.toastService.showError('Error',
             'Unable to retrieve the list of compliance standards. Please try again or contact support.');
           return EMPTY;
         }));
 
-    this.selectedStandard = this.$localStorage.retrieve('selectedStandard');
     this.standardService.notifyRefresh(true);
   }
 
@@ -54,7 +56,6 @@ export class UtmCpStandardComponent implements OnInit {
   }
 
   confirmSelection() {
-    this.$localStorage.store('selectedStandard', this.selectedStandard);
     this.activeModal.close(this.selectedStandard);
   }
 }