Merge branch 'develop' into dependabot/npm_and_yarn/CSETWebNg/angular…

…/elements-18.2.11
cisagov · Nov 8, 2024 · 5ba7c66 · 5ba7c66
2 parents ef8cc34 + 2b00f66
commit 5ba7c66
Show file tree

Hide file tree

Showing 95 changed files with 377 additions and 47 deletions.
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs
@@ -624,10 +624,10 @@ public int GetMaturityLevel(int assessmentId)
         }
 
 
-
-
-
-
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
         public AVAILABLE_MATURITY_MODELS ProcessModelDefaults(int assessmentId, int maturityModelId = 3)
         {
             //if the available maturity model is not selected and the application is CSET
@@ -671,6 +671,7 @@ public object GetEdmPercentScores(int assessmentId)
             };
         }
 
+
         /// <summary>
         /// 
         /// </summary>

diff --git a/CSETWebNg/package-lock.json b/CSETWebNg/package-lock.json
diff --git a/CSETWebNg/package.json b/CSETWebNg/package.json
@@ -16,7 +16,7 @@
         "setup:electron-build-files": "shx rm -rf temp-electron && shx mkdir -p temp-electron/node_modules && shx cp -r {package.json,main-electron.js,License.txt,NOTICE.txt,dist} temp-electron && shx cp -r node_modules/{electron-log,electron-find-on-page,lodash} temp-electron/node_modules"
     },
     "dependencies": {
-        "@angular-devkit/build-webpack": "^0.1802.9",
+        "@angular-devkit/build-webpack": "^0.1802.11",
         "@angular-devkit/schematics": "^18.2.10",
         "@angular-eslint/schematics": "^18.4.0",
         "@angular-slider/ngx-slider": "^18.0.0",
@@ -27,7 +27,7 @@
         "@angular/compiler": "^18.2.9",
         "@angular/core": "^18.2.9",
         "@angular/elements": "^18.2.11",
-        "@angular/forms": "^18.2.9",
+        "@angular/forms": "^18.2.11",
         "@angular/material": "^18.2.10",
         "@angular/platform-browser": "^18.2.9",
         "@angular/platform-browser-dynamic": "^18.2.9",
@@ -68,7 +68,7 @@
         "pdfmake": "^0.2.14",
         "rxjs": "^7.8.1",
         "sanitize-html": "^2.13.0",
-        "sass": "^1.80.1",
+        "sass": "^1.80.6",
         "screenfull": "^5.2.0",
         "style-loader": "^4.0.0",
         "swiper": "^8.4.7",

diff --git a/CSETWebNg/src/app/app-routing.module.ts b/CSETWebNg/src/app/app-routing.module.ts
@@ -238,6 +238,7 @@ import { TutorialMvraComponent } from './assessment/prepare/maturity/tutorial-mv
 import { AllAnsweredquestionsComponent } from './reports/all-answeredquestions/all-answeredquestions.component';
 import { AllCommentsmarkedComponent } from './reports/all-commentsmarked/all-commentsmarked.component';
 import { AllReviewedComponent } from './reports/all-reviewed/all-reviewed.component';
+import { Cmmc2LevelsComponent } from './assessment/prepare/maturity/cmmc2-levels/cmmc2-levels.component';
 
 const appRoutes: Routes = [
 
@@ -409,6 +410,7 @@ const appRoutes: Routes = [
               },
               { path: 'config-cis', component: ConfigCisComponent },
               { path: 'cmmc-levels', component: CmmcLevelsComponent },
+              { path: 'cmmc2-levels', component: Cmmc2LevelsComponent },
               { path: 'csi', component: CsiComponent },
               { path: 'sal', component: SalsComponent },
               { path: 'standards', component: StandardsComponent },

diff --git a/CSETWebNg/src/app/app.module.ts b/CSETWebNg/src/app/app.module.ts
@@ -283,6 +283,7 @@ import { CompareReportMComponent } from './reports/compare-report-m/compare-repo
 import { AwwaStandardComponent } from './assessment/prepare/standards/awwa-standard/awwa-standard.component';
 import { ModelSelectComponent } from './assessment/prepare/maturity/model-select/model-select.component';
 import { CmmcLevelsComponent } from './assessment/prepare/maturity/cmmc-levels/cmmc-levels.component';
+import { Cmmc2LevelsComponent } from './assessment/prepare/maturity/cmmc2-levels/cmmc2-levels.component';
 import { CmmcAComponent } from './assessment/prepare/maturity/cmmc-a/cmmc-a.component';
 import { CategoryBlockComponent } from './assessment/questions/category-block/category-block.component';
 import { MaturityQuestionsComponent } from './assessment/questions/maturity-questions/maturity-questions.component';
@@ -829,6 +830,7 @@ import { RolesChangedComponent } from './dialogs/roles-changed/roles-changed.com
         AssessmentConfigComponent,
         CmmcAComponent,
         CmmcLevelsComponent,
+        Cmmc2LevelsComponent,
         CmmcLevelResultsComponent,
         CmmcLevelDrilldownComponent,
         CmmcComplianceComponent,

diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/cmmc-levels/cmmc-levels.component.html b/CSETWebNg/src/app/assessment/prepare/maturity/cmmc-levels/cmmc-levels.component.html
@@ -20,8 +20,8 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
   SOFTWARE. 
 -------------------------->
-<div class="white-panel d-flex justify-content-start flex-column flex-11a">
-  <h3 class="wrap-text">CMMC Target Level Selection</h3>
+<div class="white-panel d-flex justify-content-start flex-column flex-11a" *transloco="let t">
+  <h3 class="wrap-text">{{t('titles.cmmc target level selection')}}</h3>
 
   <p>
     Select the desired maturity level. Selecting a level will include

diff --git a/CSETWebNg/src/app/assessment/prepare/maturity/cmmc2-levels/cmmc2-levels.component.html b/CSETWebNg/src/app/assessment/prepare/maturity/cmmc2-levels/cmmc2-levels.component.html
@@ -0,0 +1,94 @@
+<!---------------------- 
+
+   Copyright 2024 Battelle Energy Alliance, LLC  
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy 
+  of this software and associated documentation files (the "Software"), to deal 
+  in the Software without restriction, including without limitation the rights 
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+  copies of the Software, and to permit persons to whom the Software is 
+  furnished to do so, subject to the following conditions: 
+ 
+  The above copyright notice and this permission notice shall be included in all 
+  copies or substantial portions of the Software. 
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+  SOFTWARE. 
+-------------------------->
+<div class="white-panel d-flex justify-content-start flex-column flex-11a" *transloco="let t">
+     <h3 class="wrap-text mb-3">{{t('titles.cmmc target level selection')}}</h3>
+
+     <p>
+          Select the level appropriate to your organization's assessment.
+     </p>
+
+     <div class="d-flex flex-row my-3">
+          <div class="w-25 text-center align-content-center">
+               <label class="btn btn-l1 form-check-label" [class.answer-selected]="selectedLevel == 1"
+                    (click)="saveLevel(1)">
+                    <input name="q_L1" class="btn-check" type="radio" autocomplete="off"
+                         [checked]="selectedLevel == 1">Level 1
+               </label>
+          </div>
+          <div class="w-75">
+               Foundational. Level 1 is comprised of the 15 basic safeguarding requirements specified in Federal
+               Acquisition Regulation
+               (FAR) Clause 52.204-21. Level 1 is achievable by self-assessment.
+          </div>
+     </div>
+
+     <hr>
+
+     <div class="d-flex flex-row my-3">
+          <div class="w-25 text-center align-content-center">
+               <label class="btn btn-l2 form-check-label" [class.answer-selected]="selectedLevel == 2"
+                    (click)="saveLevel(2)">
+                    <input name="q_L2" class="btn-check" type="radio" autocomplete="off"
+                         [checked]="selectedLevel == 2">Level 2
+               </label>
+          </div>
+          <div class="w-75">
+               <p>
+                    Advanced. Consists of 110 practices aligned with NIST SP 800-171. Requires annual self-assessment
+                    for select contractors or triennial third-party assessments for critical national security projects.
+
+                    The advanced level will calculate a scorecard with the Supplier Performance Risk System (SPRS)
+                    score.
+               </p>
+               <p>
+                    Level 2 can be used for a self-assessment or a certification assessment. It incorporates
+                    the security requirements specified in NIST SP 800-171 Revision 2.
+               </p>
+          </div>
+     </div>
+
+     <hr>
+
+     <div class="d-flex flex-row my-3">
+          <div class="w-25 text-center align-content-center">
+               <label class="btn btn-l3 form-check-label" [class.answer-selected]="selectedLevel == 3"
+                    (click)="saveLevel(3)">
+                    <input name="q_L3" class="btn-check" type="radio" autocomplete="off"
+                         [checked]="selectedLevel == 3">Level 3
+               </label>
+          </div>
+          <div class="w-75">
+               <p>
+                    Level 3 consists of selected security requirements derived from National Institute of Standards and
+                    Technology (NIST) Special Publication (SP) 800-172,
+               </p>
+               <p>
+                    Level 3 only applies to systems that have already achieved a Final Level 2 (C3PAO) CMMC Status.
+               </p>
+          </div>
+     </div>
+
+
+     <app-nav-back-next [page]="'cmmc2-levels'"></app-nav-back-next>
+
+</div>