Merge pull request #4033 from cisagov/bug/autoLoadSupp-nulling-out

fixed bug where autoLoadSupp nulls out

CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.ts

@@ -639,7 +639,7 @@ export class QuestionExtrasComponent implements OnInit {
   // }
 
   autoLoadSupplemental() {
-    return this.questionsSvc.autoLoadSupplemental(this.assessSvc.assessment.maturityModel?.modelId);
+    return this.questionsSvc.autoLoadSupplemental(this.assessSvc.assessment.maturityModel);
   }
 
   /**

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

@@ -134,23 +134,32 @@ export class QuestionsService {
   /**
    * Analyzes the current 'auto load supplemental' preference and the maturity model
    */
-  autoLoadSupplemental(modelId?: number) {
+  autoLoadSupplemental(model?: any) {
     // first see if it should be forced on by configuration
     if (this.configSvc.config.supplementalAutoloadInitialValue) {
       return true;
     }
 
     // standards (modelid is null) - check the checkbox state
-    if (!modelId) {
+    if (!model) {
       return this.autoLoadSuppCheckboxState;
     }
 
     // check the model's configuration
-    const modelConfiguration = this.configSvc.config.moduleBehaviors.find(x => x.modelId == modelId);
-    if (modelConfiguration.autoLoadSupplemental ?? false) {
+    const modelConfiguration = this.configSvc.config.moduleBehaviors.find(x => x.modelId == model.modelId);
+    if (modelConfiguration != null && (modelConfiguration.autoLoadSupplemental ?? false)) {
       return true;
     }
 
+    else {
+      let modelConfigurationByModelName = this.configSvc.config.moduleBehaviors.find(x => x.moduleName == model.moduleName);
+      if (modelConfigurationByModelName != null && (modelConfiguration.autoLoadSupplemental ?? false)) {
+        return true;
+      }
+    }
+
+
+
     return false;
   }