Merge pull request #3665 from cisagov/feature/CSET-2506

Add Config Behavior to Show / Hide CISA Assessor Workflow Switch
cisagov · Dec 7, 2023 · f0179bd · f0179bd
2 parents ff08d96 + bdee6f7
commit f0179bd
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 13 deletions.
diff --git a/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html b/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.html
@@ -53,7 +53,7 @@
       <div class="mx-3 mt-2" *ngIf="message && message.message.length > 0">{{ message.message }}</div>
     </div>
 
-    <div class="form-group d-flex align-items-center justify-content-between mt-4 mx-2">
+    <div *ngIf="showCisaAssessorWorkflowSwitch()" class="form-group d-flex align-items-center justify-content-between mt-4 mx-2">
       <label for="csaToggle" class="font-weight-bold">CISA Assessor Workflow </label>
       <div id="csaToggle" class="btn-group btn-group-toggle w-50 ml-2" data-toggle="buttons">
         <label

diff --git a/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.ts b/CSETWebNg/src/app/dialogs/enable-protected/enable-protected.component.ts
@@ -74,6 +74,10 @@ export class EnableProtectedComponent implements OnInit {
     return (this.modulesList && this.modulesList.length > 0 && this.modulesList.every(m => m.unlocked));
   }
 
+  showCisaAssessorWorkflowSwitch() {
+    return this.configSvc.behaviors.showCisaAssessorWorkflowSwitch;
+  }
+
   /**
    *
    */

diff --git a/CSETWebNg/src/assets/settings/config.ACET.json b/CSETWebNg/src/assets/settings/config.ACET.json
@@ -22,7 +22,8 @@
         "showExportOnReports": false,
         "showFeedback": false,
         "showDisclaimer": false,
-        "independentSuppGuidance": true
+        "independentSuppGuidance": true,
+        "showCisaAssessorWorkflowSwitch": false
     },
     "languageOptions": [
         { "value": "en", "name": "English" },

diff --git a/CSETWebNg/src/assets/settings/config.CF.json b/CSETWebNg/src/assets/settings/config.CF.json
@@ -23,9 +23,10 @@
         "showOrganizationName": true,
         "showBusinessAgencyName": true,
         "showCriticalService": true,
-        "allowDiagram":false,
-        "showPrivacyWarning":true,
-        "showTheUpgradeButton":true
+        "allowDiagram": false,
+        "showPrivacyWarning": true,
+        "showTheUpgradeButton": true,
+        "showCisaAssessorWorkflowSwitch": false
     }
 }
 
diff --git a/CSETWebNg/src/assets/settings/config.CSET.json b/CSETWebNg/src/assets/settings/config.CSET.json
@@ -16,7 +16,8 @@
         "showContacts": true,
         "showOrganizationName": true,
         "showBusinessAgencyName": true,
-        "showCriticalService": true
+        "showCriticalService": true,
+        "showCisaAssessorWorkflowSwitch": true
     }
 }
 

diff --git a/CSETWebNg/src/assets/settings/config.IOD.json b/CSETWebNg/src/assets/settings/config.IOD.json
@@ -16,6 +16,7 @@
         "showContacts": true,
         "showOrganizationName": true,
         "showBusinessAgencyName": true,
-        "showCriticalService": true
+        "showCriticalService": true,
+        "showCisaAssessorWorkflowSwitch": true
     }
-}
+}
diff --git a/CSETWebNg/src/assets/settings/config.ISE.json b/CSETWebNg/src/assets/settings/config.ISE.json
@@ -22,9 +22,10 @@
         "showExportOnReports": false,
         "showFeedback": false,
         "showDisclaimer": false,
-        "independentSuppGuidance": true
+        "independentSuppGuidance": true,
+        "showCisaAssessorWorkflowSwitch": false
     },
     "languageOptions": [
         { "value": "en", "name": "English" }
     ]
-}
+}
diff --git a/CSETWebNg/src/assets/settings/config.RENEW.json b/CSETWebNg/src/assets/settings/config.RENEW.json
@@ -20,7 +20,8 @@
         "showOrganizationName": true,
         "showBusinessAgencyName": true,
         "showCriticalService": true,
-        "additionalUserGuides": []
+        "additionalUserGuides": [],
+        "showCisaAssessorWorkflowSwitch": false
     }
 
 }
diff --git a/CSETWebNg/src/assets/settings/config.TSA.json b/CSETWebNg/src/assets/settings/config.TSA.json
@@ -18,7 +18,8 @@
         "showOrganizationName": true,
         "showBusinessAgencyName": true,
         "showCriticalService": true,
-        "additionalUserGuides": ["TSA"]
+        "additionalUserGuides": ["TSA"],
+        "showCisaAssessorWorkflowSwitch": false
     }
 
 }
diff --git a/CSETWebNg/src/assets/settings/config.TSAonline.json b/CSETWebNg/src/assets/settings/config.TSAonline.json
@@ -31,6 +31,7 @@
         "showCompare": false,
         "showEnableProtectedFeatures": false,
         "showComments": false,
-        "showFeedback": false
+        "showFeedback": false,
+        "showCisaAssessorWorkflowSwitch": false
     }
 }
diff --git a/CSETWebNg/src/assets/settings/config.json b/CSETWebNg/src/assets/settings/config.json
@@ -67,6 +67,7 @@
         "showComments": true,
         "showFeedback": true,
         "showEnableProtectedFeatures": true,
+        "showCisaAssessorWorkflowSwitch": true,
         "showUpdateDiagramCsafVulnerabilitiesButton": false,
         "showVulnerabilitiesDiagramInventoryTab": false,
         "additionalUserGuides": []
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,10 @@ export class EnableProtectedComponent implements OnInit { @@
         return (this.modulesList && this.modulesList.length > 0 && this.modulesList.every(m => m.unlocked));
       }
+      showCisaAssessorWorkflowSwitch() {
+        return this.configSvc.behaviors.showCisaAssessorWorkflowSwitch;
+      }
       /**
        *
        */
@@ Expand Down @@