Merge pull request #4719 from cisagov/bug/reports-non-workflow

Refactor of CISA Assessor variable. Reports page tied to that now

Author: LaddieZeigler

CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.html

@@ -108,7 +108,7 @@ <h5>{{ assessment.typeTitle || 'Blank Assessment' }}</h5>
 
     <div class="mt-4">
       <h4>{{ t('assessment settings') }}</h4>
-      <div *ngIf="this.configSvc.cisaAssessorWorkflow; else content"
+      <div *ngIf="this.configSvc.userIsCisaAssessor; else content"
         class="d-flex align-items-center flex-00a ms-auto me-5" style="margin-top:-5px;">
         <div class="d-flex align-items-center me-3 pt-2">{{ t('protected features.cisa assessor workflow') }}</div>
         <div class="mb-2">

CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-config-iod/assessment-config-iod.component.ts

@@ -95,7 +95,7 @@ export class AssessmentConfigIodComponent implements OnInit {
         this.assessment.pciiNumber = null;
       }
 
-      this.configSvc.cisaAssessorWorkflow = true;
+      this.configSvc.userIsCisaAssessor = true;
       this.assessSvc.updateAssessmentDetails(this.assessment);
     }
   }

CSETWebNg/src/app/assessment/prepare/assessment-info/assessment-detail/assessment-detail.component.html

@@ -75,7 +75,7 @@ <h5>{{ assessment.typeTitle || 'Blank Assessment' }}</h5>
         </div>
 
     </div>
-    <div *ngIf="this.configSvc.cisaAssessorWorkflow" class="mt-4">
+    <div *ngIf="this.configSvc.userIsCisaAssessor" class="mt-4">
         <h4>{{ t('assessment settings') }}</h4>
         <div class="d-flex align-items-center flex-00a ms-auto me-5" style="margin-top:-5px;">
             <div class="d-flex align-items-center me-3 pt-2">{{ t('protected features.cisa assessor workflow') }}</div>

CSETWebNg/src/app/assessment/prepare/assessment-info/demographics-iod/demographics-iod.component.ts

@@ -140,7 +140,7 @@ export class DemographicsIodComponent implements OnInit {
    * 
    */
   updateDemographics() {
-    this.configSvc.cisaAssessorWorkflow = true;
+    this.configSvc.userIsCisaAssessor = true;
     this.demographicData.sectorDirective = 'NIPP';
 
     // keep a few things in sync

CSETWebNg/src/app/assessment/results/reports/reports.component.ts

@@ -133,20 +133,20 @@ export class ReportsComponent implements OnInit, AfterViewInit {
       this.router.navigate([value], { relativeTo: this.route.parent });
     });
 
-    if (this.configSvc.installationMode === 'IOD') {
+    if (this.configSvc.installationMode === 'IOD' && this.assessSvc.assessment.assessorMode) {
       this.reportSvc.validateCisaAssessorFields().subscribe((result: CisaWorkflowFieldValidationResponse) => {
         this.cisaAssessorWorkflowFieldValidation = result;
         if (!this.cisaAssessorWorkflowFieldValidation?.isValid) {
           this.disableEntirePage = true;
         }
       });
     }
- 
+    
     this.assessSvc.getLastModified().subscribe((data: any) => {
       this.lastModifiedTimestamp = data.lastModifiedDate;
     });
-
-    this.configSvc.getCisaAssessorWorkflow().subscribe((resp: boolean) => this.configSvc.cisaAssessorWorkflow = resp);
+    
+    this.configSvc.getCisaAssessorWorkflow().subscribe((resp: boolean) => this.configSvc.userIsCisaAssessor = resp);
 
     this.updateSectionId();
   }

CSETWebNg/src/app/assessment/upgrade/upgrade.component.ts

@@ -164,7 +164,7 @@ export class UpgradeComponent implements OnInit {
     this.iodDemoSvc.getDemographics().subscribe((data: any) => {
       this.iodDemographics = data;
     });
-    if (this.configSvc.cisaAssessorWorkflow == true) {
+    if (this.configSvc.userIsCisaAssessor == true) {
       this.csiSvc.getCsiServiceDemographic().subscribe((result: CsiServiceDemographic) => {
         this.csiServiceDemographic = result;
       });
@@ -187,7 +187,7 @@ export class UpgradeComponent implements OnInit {
     this.assessment.galleryItemGuid = this.assessSvc.galleryItemGuid.toLowerCase()
     this.demoSvc.updateDemographic(this.demographicData);
     this.iodDemoSvc.updateDemographic(this.iodDemographics);
-    if (this.configSvc.cisaAssessorWorkflow == true) {
+    if (this.configSvc.userIsCisaAssessor == true) {
       this.csiSvc.updateCsiServiceDemographic(this.csiServiceDemographic);
       this.csiSvc.updateCsiServiceComposition(this.serviceComposition);
     }

CSETWebNg/src/app/dialogs/user-settings/user-settings.component.ts

@@ -47,7 +47,7 @@ export class UserSettingsComponent implements OnInit {
       this.encryption = result
     });
     this.configSvc.getCisaAssessorWorkflow().subscribe((cisaWorkflowEnabled: boolean) => {
-      this.configSvc.cisaAssessorWorkflow = cisaWorkflowEnabled;
+      this.configSvc.userIsCisaAssessor = cisaWorkflowEnabled;
       this.cisaWorkflowEnabled = cisaWorkflowEnabled;
       this.cisaWorkflowStatusLoaded = true;
     });

CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts

@@ -139,7 +139,7 @@ export class MyAssessmentsComponent implements OnInit {
     }
 
 
-    this.configSvc.getCisaAssessorWorkflow().subscribe((resp: boolean) => this.configSvc.cisaAssessorWorkflow = resp);
+    this.configSvc.getCisaAssessorWorkflow().subscribe((resp: boolean) => this.configSvc.userIsCisaAssessor = resp);
   }
 
   /**
@@ -162,7 +162,7 @@ export class MyAssessmentsComponent implements OnInit {
     }
 
     if (column == 'export json') {
-      return this.configSvc.cisaAssessorWorkflow;
+      return this.configSvc.userIsCisaAssessor;
     }
 
     return true;

CSETWebNg/src/app/services/assessment.service.ts

@@ -233,7 +233,7 @@ export class AssessmentService {
         headers
       )
       .subscribe(() => {
-        if (this.configSvc.cisaAssessorWorkflow) {
+        if (this.configSvc.userIsCisaAssessor) {
           this.updateAssessmentName();
         }
       });

CSETWebNg/src/app/services/config.service.ts

@@ -99,7 +99,7 @@ export class ConfigService {
    * will contain an empty string or "none".
    */
   mobileEnvironment = '';
-  cisaAssessorWorkflow: boolean = false;
+  userIsCisaAssessor: boolean = false;
 
   /**
    * Constructor.
@@ -346,7 +346,7 @@ export class ConfigService {
   }
 
   setCisaAssessorWorkflow(cisaAssessorWorkflowEnabled: boolean) {
-    this.cisaAssessorWorkflow = cisaAssessorWorkflowEnabled;
+    this.userIsCisaAssessor = cisaAssessorWorkflowEnabled;
     return this.http.post(this.apiUrl + 'EnableProtectedFeature/setCisaAssessorWorkflow', cisaAssessorWorkflowEnabled);
   }
 

CSETWebNg/src/app/services/demographic-iod.service.ts

@@ -77,7 +77,7 @@ export class DemographicIodService {
   updateDemographic(demographic: DemographicsIod) {
     this.http.post(this.apiUrl, demographic, headers)
       .subscribe(() => {
-        if (this.configSvc.cisaAssessorWorkflow) {
+        if (this.configSvc.userIsCisaAssessor) {
           this.assessSvc.updateAssessmentName();
         }
       });

CSETWebNg/src/app/services/demographic.service.ts

@@ -92,7 +92,7 @@ export class DemographicService {
 
     this.http.post(this.apiUrl, JSON.stringify(demographic), headers)
       .subscribe(() => {
-        if (this.configSvc.cisaAssessorWorkflow) {  
+        if (this.configSvc.userIsCisaAssessor) {  
 
         }
       });

CSETWebNg/src/app/services/navigation/page-visibility.service.ts

@@ -153,18 +153,18 @@ export class PageVisibilityService {
       }
 
       if (c == ('ASSESSOR')) {
-        if (this.configSvc.cisaAssessorWorkflow) {
-          show = show && (this.configSvc.cisaAssessorWorkflow && this.assessSvc.assessment?.assessorMode);
+        if (this.configSvc.userIsCisaAssessor) {
+          show = show && (this.configSvc.userIsCisaAssessor && this.assessSvc.assessment?.assessorMode);
         } else {
-          show = show && (this.configSvc.cisaAssessorWorkflow !== this.assessSvc.assessment?.assessorMode);
+          show = show && (this.configSvc.userIsCisaAssessor !== this.assessSvc.assessment?.assessorMode);
         }
       }
 
       if (c == ('ASSESSOR-NONE')) {
-        if (this.configSvc.cisaAssessorWorkflow) {
-          show = show && !(this.configSvc.cisaAssessorWorkflow && this.assessSvc.assessment?.assessorMode);
+        if (this.configSvc.userIsCisaAssessor) {
+          show = show && !(this.configSvc.userIsCisaAssessor && this.assessSvc.assessment?.assessorMode);
         } else {
-          show = show && !(this.configSvc.cisaAssessorWorkflow !== this.assessSvc.assessment?.assessorMode);
+          show = show && !(this.configSvc.userIsCisaAssessor !== this.assessSvc.assessment?.assessorMode);
         }
       }
 
@@ -344,7 +344,7 @@ export class PageVisibilityService {
    * Indicates whether the current user is a CISA CSA / assessor
    */
   isUserCisaAssessor(): boolean {
-    return this.configSvc.cisaAssessorWorkflow;
+    return this.configSvc.userIsCisaAssessor;
   }
 
   /**