Merge pull request #4478 from cisagov/feat/CSET-3026

Remove boolean for cmmc draft conversion

Author: randywoods

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

@@ -41,14 +41,13 @@ export class AssessmentConfigIodComponent implements OnInit {
 
     this.getAssessmentDetail();
 
-    if (this.configSvc.config.debug.showCmmcConversion ?? false) {
-      this.assessSvc.getAssessmentDetail().subscribe((data: AssessmentDetail) => {
-        if (data.maturityModel?.modelName == "CMMC2") {
-          this.showUpgrade = true;
-          this.targetModel = "CMMC2F"
-        }
-      })
-    };
+    this.assessSvc.getAssessmentDetail().subscribe((data: AssessmentDetail) => {
+      if (data.maturityModel?.modelName == "CMMC2") {
+        this.showUpgrade = true;
+        this.targetModel = "CMMC2F"
+      }
+    })
+
 
   }
 

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

@@ -30,11 +30,11 @@ import { ACETService } from '../../../services/acet.service';
 import { AssessmentDetail } from '../../../models/assessment-info.model';
 
 @Component({
-    selector: 'app-assessment-info',
-    templateUrl: './assessment-info.component.html',
-    // eslint-disable-next-line
-    host: { class: 'd-flex flex-column flex-11a' },
-    standalone: false
+  selector: 'app-assessment-info',
+  templateUrl: './assessment-info.component.html',
+  // eslint-disable-next-line
+  host: { class: 'd-flex flex-column flex-11a' },
+  standalone: false
 })
 export class AssessmentInfoComponent implements OnInit {
 
@@ -50,13 +50,13 @@ export class AssessmentInfoComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    if (this.configSvc.config.debug.showCmmcConversion ?? false) {
-      this.assessSvc.getAssessmentDetail().subscribe((data: AssessmentDetail) => {
-        if (data.maturityModel?.modelName == "CMMC2") {
-          this.showUpgrade = true;
-          this.targetModel = "CMMC2F"
-        }
-      });
-    }
+
+    this.assessSvc.getAssessmentDetail().subscribe((data: AssessmentDetail) => {
+      if (data.maturityModel?.modelName == "CMMC2") {
+        this.showUpgrade = true;
+        this.targetModel = "CMMC2F"
+      }
+    });
+
   }
 }

CSETWebNg/src/assets/settings/config.json

@@ -1,6 +1,8 @@
 {
   "NOTENODE": "Casing on config chain matters, the only item that should be changed here is the current ConfigChain value.  Once that is changed everything else should be set",
-  "currentConfigChain": ["CSET"],
+  "currentConfigChain": [
+    "CSET"
+  ],
   "defaultLang": "en",
   "isRunningAnonymous": false,
   "app": {
@@ -28,7 +30,6 @@
   "msgServerNotAvailable": "The server is unavailable. Contact your system administrator.",
   "supplementalAutoloadInitialValue": false,
   "debug": {
-    "showCmmcConversion": false,
     "showBuildTime": false,
     "showQuestionAndRequirementIDs": false,
     "canDeleteCustomModules": true,
@@ -518,4 +519,4 @@
       "name": "日本語"
     }
   ]
-}
+}