Merge pull request #4210 from cisagov/feature/CSET-2897

Add i18n for module name on maturity questions screen
cisagov · Nov 5, 2024 · b21358a · b21358a
2 parents 858ac9d + 5f457fb
commit b21358a
Show file tree

Hide file tree

Showing 29 changed files with 282 additions and 66 deletions.
diff --git a/...ment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts b/...ment/prepare/assessment-info/assessment-demographics/assessment-demographics.component.ts
@@ -232,7 +232,7 @@ export class AssessmentDemographicsComponent implements OnInit {
     }
 
     showCriticalService() {
-        const moduleBehavior = this.configSvc.config.moduleBehaviors.find(m => m.moduleName == this.assessSvc.assessment?.maturityModel?.modelName);
+        const moduleBehavior = this.configSvc.getModuleBehavior(this.assessSvc.assessment?.maturityModel?.modelName);
         return (this.configSvc.behaviors.showCriticalService ?? true)
             && (moduleBehavior?.showCriticalServiceDemog ?? true);
     }

diff --git a/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.html b/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.html
@@ -102,4 +102,4 @@ <h5 for="DomainRemarks">Remarks - {{grouping.title}}</h5>
 
 </ng-container>
 
-<div *ngIf="isDomain() && grouping.visible" class="mb-5"></div>
+<div *ngIf="isDomain() && isDomainVisible() && grouping.visible" class="mb-5"></div>
diff --git a/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.ts b/CSETWebNg/src/app/assessment/questions/grouping-block/grouping-block.component.ts
@@ -30,6 +30,7 @@ import { MaturityFilteringService } from '../../../services/filtering/maturity-f
 import { MaturityService } from '../../../services/maturity.service';
 import { NCUAService } from '../../../services/ncua.service';
 import { QuestionsService } from '../../../services/questions.service';
+import { ModuleBehavior } from '../../../models/module-config.model';
 
 
 @Component({
@@ -40,6 +41,7 @@ export class GroupingBlockComponent implements OnInit {
   @Input('grouping') grouping: QuestionGrouping;
 
   modelId: number;
+  moduleBehavior: ModuleBehavior;
 
   /**
    *
@@ -59,6 +61,7 @@ export class GroupingBlockComponent implements OnInit {
    */
   ngOnInit(): void {
     this.modelId = this.maturityFilteringService.assesmentSvc.assessment.maturityModel.modelId;
+    this.moduleBehavior = this.configSvc.getModuleBehavior(this.modelId);
   }
 
   /**
@@ -83,28 +86,21 @@ export class GroupingBlockComponent implements OnInit {
   }
 
   /**
-   * Indicates if the domain label should be shown
+   * Indicates if the domain label headers should be shown.
+   * Invisible domains stay invisible.  
+   * If the moduleBehavior.showDomainHeaders is not defined, it defaults to true.
    */
   isDomainVisible(): boolean {
     if (!this.isDomain()) {
       return false;
     }
 
-    // ACET domains are always visible
-    if (this.maturityFilteringService.assesmentSvc.assessment.maturityModel.modelName == 'ACET') {
-      return true;
-    }
-
-    if (this.maturityFilteringService.assesmentSvc.assessment.maturityModel.modelName == 'ISE') {
-      return false;
-    }
-
     // hide invisible domains
     if (!this.grouping.visible) {
       return false;
     }
 
-    return true;
+    return this.moduleBehavior.showDomainHeaders ?? true;
   }
 
   /**

diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.html b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.html
@@ -89,7 +89,6 @@ <h3>{{ groupingTitle }}</h3>
         <app-grouping-block [grouping]="g"></app-grouping-block>
       </div>
     </ng-template>
-
   </div>
 
   <app-nav-back-next *ngIf="isNcuaModel()" [page]="'maturity-questions-ncua'"></app-nav-back-next>

diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.ts b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.ts
@@ -42,6 +42,7 @@ import { TranslocoService } from '@jsverse/transloco';
 import { DemographicService } from '../../../services/demographic.service';
 import { DemographicIodService } from '../../../services/demographic-iod.service';
 import { SsgService } from '../../../services/ssg.service';
+import { ModuleBehavior } from '../../../models/module-config.model';
 
 @Component({
   selector: 'app-maturity-questions',
@@ -51,6 +52,7 @@ export class MaturityQuestionsComponent implements OnInit, AfterViewInit {
 
   groupings: QuestionGrouping[] = [];
   pageTitle: string = '';
+  moduleBehavior: ModuleBehavior;
   modelId: number;
   modelName: string = '';
   groupingTitle: string = '';
@@ -185,21 +187,21 @@ export class MaturityQuestionsComponent implements OnInit, AfterViewInit {
     obsGetQ.subscribe(
       (response: MaturityQuestionResponse) => {
         this.modelId = response.modelId;
+
+        this.moduleBehavior = this.configSvc.getModuleBehavior(this.modelId);
+
+
         this.modelName = response.modelName;
         this.questionsAlias = response.questionsAlias;
         this.groupings = response.groupings;
         this.assessSvc.assessment.maturityModel.maturityTargetLevel = response.maturityTargetLevel;
-        
+
         this.assessSvc.assessment.maturityModel.answerOptions = response.answerOptions;
         this.filterSvc.answerOptions = response.answerOptions;
         this.filterSvc.maturityModelId = response.modelId;
         this.filterSvc.maturityModelName = response.modelName;
 
-        if (this.groupingId?.toLowerCase() == 'bonus') {
-          this.pageTitle = this.tSvc.translate(`titles.ssg.${this.ssgSvc.ssgSimpleSectorLabel()}`);
-        } else {
-          this.pageTitle = this.tSvc.translate('titles.' + this.questionsAlias.toLowerCase().trim()) + ' - ' + this.modelName;
-        }
+        this.displayTitle();
 
 
         this.glossarySvc.glossaryEntries = response.glossary;
@@ -249,7 +251,7 @@ export class MaturityQuestionsComponent implements OnInit, AfterViewInit {
       this.filterSvc.maturityModelId = response.modelId;
 
       this.pageTitle = this.questionsAlias + ' - ' + this.modelName;
-      this.groupingTitle = response.title;
+
       this.glossarySvc.glossaryEntries = response.glossary;
 
       this.loaded = true;
@@ -268,6 +270,25 @@ export class MaturityQuestionsComponent implements OnInit, AfterViewInit {
       });
   }
 
+  /**
+   * 
+   */
+  displayTitle() {
+    // Bonus questions are for SSGs.
+    if (this.groupingId?.toLowerCase() == 'bonus') {
+      this.pageTitle = this.tSvc.translate(`titles.ssg.${this.ssgSvc.ssgSimpleSectorLabel()}`);
+      return;
+    }
+
+    let displayName = this.modelName;
+
+    if (this.moduleBehavior.displayNameKey != null) {
+      displayName = this.tSvc.translate(this.moduleBehavior.displayNameKey);
+    }
+
+    this.pageTitle = this.tSvc.translate('titles.' + this.questionsAlias.toLowerCase().trim()) + ' - ' + displayName;
+  }
+
   /**
      * Controls the mass expansion/collapse of all subcategories on the screen.
      * @param mode

diff --git a/...src/app/assessment/questions/question-block-maturity/question-block-maturity.component.ts b/...src/app/assessment/questions/question-block-maturity/question-block-maturity.component.ts
@@ -139,7 +139,7 @@ export class QuestionBlockMaturityComponent implements OnInit {
    * hidden.  Use config moduleBehavior to define this.
    */
   showLevelIndicator(q): boolean {
-    const behavior = this.configSvc.config.moduleBehaviors.find(m => m.moduleName == this.assessSvc.assessment.maturityModel.modelName)
+    const behavior = this.configSvc.getModuleBehavior(this.assessSvc.assessment.maturityModel.modelName);
     if (!!behavior) {
       return behavior.showMaturityLevelBadge ?? true;
     }

diff --git a/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.html b/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.html
@@ -278,7 +278,7 @@
                 </div>
 
 
-                <div *ngIf="!seperateGuidanceFromApproach()">
+                <div *ngIf="!separateGuidanceFromApproach()">
                     <hr
                         *ngIf="!!tab?.requirementsData?.supplementalInfo && !!tab?.requirementsData?.examinationApproach">
                     <div

diff --git a/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.ts b/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.ts
@@ -689,7 +689,7 @@ export class QuestionExtrasComponent implements OnInit {
       return result;
     }
 
-    const behavior = this.configSvc.config.moduleBehaviors.find(m => m.moduleName == this.assessSvc.assessment.maturityModel?.modelName)
+    const behavior = this.configSvc.getModuleBehavior(this.assessSvc.assessment.maturityModel?.modelName);
 
     if (mode == 'DETAIL') {
       return behavior?.questionIcons?.showDetails ?? true;
@@ -748,7 +748,7 @@ export class QuestionExtrasComponent implements OnInit {
    * @returns
    */
   whichSupplementalIcon() {
-    const behavior = this.configSvc.config.moduleBehaviors.find(m => m.moduleName == this.assessSvc.assessment.maturityModel?.modelName);
+    const behavior = this.configSvc.getModuleBehavior(this.assessSvc.assessment.maturityModel?.modelName);
     if (!!behavior && behavior.questionIcons?.guidanceIcon?.toLowerCase() == 'g') {
       return "G";
     } else {
@@ -812,8 +812,8 @@ export class QuestionExtrasComponent implements OnInit {
    * independent from Examination Approach or not
    * @returns
    */
-  seperateGuidanceFromApproach() {
-    const behavior = this.configSvc.config.moduleBehaviors.find(m => m.moduleName == this.assessSvc.assessment.maturityModel?.modelName);
+  separateGuidanceFromApproach() {
+    const behavior = this.configSvc.getModuleBehavior(this.assessSvc.assessment.maturityModel?.modelName);
     return behavior?.independentSuppGuidance;
   }
 

diff --git a/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.ts b/CSETWebNg/src/app/assessment/results/cpg/cpg-summary/cpg-summary.component.ts
@@ -52,7 +52,7 @@ export class CpgSummaryComponent implements OnInit {
    */
   ngOnInit(): void {
     this.cpgSvc.getAnswerDistrib().subscribe((resp: any) => {
-      const cpgAnswerOptions = this.configSvc.config.moduleBehaviors.find(b => b.moduleName == 'CPG').answerOptions;
+      const cpgAnswerOptions = this.configSvc.getModuleBehavior('CPG').answerOptions;
 
       resp.forEach(r => {
         r.series.forEach(element => {

diff --git a/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss b/CSETWebNg/src/app/layout/acet-layout-main/acet-layout-main.component.scss
@@ -2311,7 +2311,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss b/CSETWebNg/src/app/layout/cf-layout-main/cf-layout-main.component.scss
@@ -2337,7 +2337,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss b/CSETWebNg/src/app/layout/cie-layout-main/cie-layout-main.component.scss
@@ -2344,7 +2344,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss b/CSETWebNg/src/app/layout/iod-layout/iod-layout.component.scss
@@ -2340,7 +2340,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss b/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
@@ -2345,7 +2345,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss b/CSETWebNg/src/app/layout/renew-layout-main/renew-layout-main.component.scss
@@ -2340,7 +2340,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss b/CSETWebNg/src/app/layout/rra-layout-main/rra-layout-main.component.scss
@@ -2095,7 +2095,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/styles-base.scss b/CSETWebNg/src/app/layout/styles-base.scss
@@ -2097,7 +2097,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {

diff --git a/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss b/CSETWebNg/src/app/layout/tsa-layout-main/tsa-layout-main.component.scss
@@ -2292,7 +2292,7 @@ ul.related-questions li {
 
 .domain-group-heading {
   margin-bottom: 1rem;
-  font-size: 2rem;
+  font-size: 1.8rem;
 }
 
 .capability-group-heading {