Merge branch 'develop' into release/12.2.1.0

Author: Marcus-Goectau

CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Reports/ReportsDataBusiness.cs

@@ -1781,6 +1781,12 @@ private void GetQuestionTitleAndText(dynamic f,
                     identifier = f.mq.Question_Title;
                     questionText = f.mq.Question_Text;
 
+                    // CPG is a special case
+                    if (!String.IsNullOrEmpty(f.mq.Security_Practice))
+                    {
+                        questionText = f.mq.Security_Practice;
+                    }
+
                     // overlay
                     MaturityQuestionOverlay o = _overlay.GetMaturityQuestion(f.mq.Mat_Question_Id, lang);
                     if (o != null)

CSETWebNg/src/app/reports/cpg/cpg-deficiency/cpg-deficiency.component.html

@@ -45,10 +45,9 @@ <h1 class="page-title">{{t('reports.core.cpg.deficiency.deficiencies')}}</h1>
                 <tr>
                     <td class="deficiencies-list-item" style="font-weight: bold; width: 50px;">{{s.mat.question_Title}}
                     </td>
-                    <td class="deficiencies-list-comment">{{parseQuestionText(s.mat.question_Text)}}</td>
+                    <td class="deficiencies-list-comment">{{s.mat.security_Practice}}</td>
                     <td style="padding-top: 1rem; padding-left: 1rem; vertical-align: top; color: #555555">
                         <div style="width: 9rem; font-weight: bold;">
-                            <!-- {{s.answer.answer_Text}} -->
                             {{questionsSvc.answerDisplayLabel(11, s.answer.answer_Text)}}
                         </div>
                     </td>

CSETWebNg/src/app/reports/cpg/cpg-deficiency/cpg-deficiency.component.ts

@@ -87,12 +87,4 @@ export class CpgDeficiencyComponent implements OnInit {
       this.loading = true;
     })
   }
-
-  parseQuestionText(textWithHtml: string) {
-    let startOfRealText = textWithHtml.indexOf(this.cpgPracticeTag) + this.cpgPracticeTag.length;
-    let endOfRealText = textWithHtml.indexOf('<', startOfRealText);
-
-    return textWithHtml.substring(startOfRealText, endOfRealText);
-  }
-
 }