Merge branch 'DTOSS-7817-SonarCloud-Coverage-Refinements' of github.com:NHSDigital/dtos-cohort-manager into DTOSS-7817-SonarCloud-Coverage-Refinements

Author: SamAinsworth-NHS

.azuredevops/pipelines/cd-infrastructure-dev-core.yaml

@@ -13,7 +13,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: c00889236a258a52a2f3131272427ce81d4da951
+      ref: 63363f075e3cd89a35d79325a25c7f7b3d2ccff6
       endpoint: NHSDigital
 
 variables:

application/CohortManager/src/Functions/ScreeningValidationService/LookupValidation/Breast_Screening_lookupRules.json

@@ -5,6 +5,10 @@
       {
         "Name": "ValidCurrentPosting",
         "Expression": "string.IsNullOrEmpty(newParticipant.CurrentPosting) OR dbLookup.CheckIfCurrentPostingExists(newParticipant.CurrentPosting)"
+      },
+      {
+        "Name": "ValidPrimaryCareProvider",
+        "Expression": "string.IsNullOrEmpty(newParticipant.PrimaryCareProvider) || dbLookup.CheckIfPrimaryCareProviderExists(newParticipant.PrimaryCareProvider)"
       }
     ],
     "Rules": [
@@ -21,8 +25,8 @@
         }
       },
       {
-        "RuleName": "36.ValidatePrimaryCareProvider.BSSelect.NonFatal",
-        "Expression": "string.IsNullOrEmpty(newParticipant.PrimaryCareProvider) || dbLookup.CheckIfPrimaryCareProviderExists(newParticipant.primaryCareProvider)",
+        "RuleName": "3601.ValidatePrimaryCareProvider.BSSelect.NonFatal",
+        "Expression": "ValidPrimaryCareProvider",
         "Actions": {
           "OnFailure": {
             "Name": "OutputExpression",
@@ -33,18 +37,22 @@
         }
       },
       {
-        "RuleName": "3645.CurrentPostingAndPrimaryProvider.BSSelect.NonFatal",
+        "RuleName": "3602.CurrentPostingAndPrimaryProvider.BSSelect.NonFatal",
         "LocalParams": [
           {
-            "Name": "ValidPostingCategory",
-            "Expression": "dbLookup.ValidatePostingCategories(newParticipant.CurrentPosting)"
-          },
-          {
-            "Name": "InvalidPrimaryCareProvider",
-            "Expression": "!string.IsNullOrEmpty(newParticipant.PrimaryCareProvider) AND !dbLookup.CheckIfPrimaryCareProviderExists(newParticipant.PrimaryCareProvider)"
+            "Name": "EnglishPostingCategory",
+            "Expression": "dbLookup.RetrievePostingCategory(newParticipant.CurrentPosting) == \"ENGLAND\""
           }
         ],
-        "Expression": "!(ValidPostingCategory AND InvalidPrimaryCareProvider)"
+        "Expression": "!((EnglishPostingCategory || new[] {\"ENG\", \"DMS\", \"IM\"}.Contains(newParticipant.CurrentPosting)) && !string.IsNullOrEmpty(newParticipant.PrimaryCareProvider) && !dbLookup.CheckIfPrimaryCareProviderExists(newParticipant.PrimaryCareProvider))",
+        "Actions": {
+          "OnFailure": {
+            "Name": "OutputExpression",
+            "Context": {
+              "Expression": "\"Invalid primary care provider GP practice code\""
+            }
+          }
+        }
       },
       {
         "RuleName": "58.CurrentPosting.NBO.NonFatal",

application/CohortManager/src/Web/app/accessibility-statement/page.tsx

@@ -56,41 +56,45 @@ export default async function Page() {
           </p>
           <h2>Reporting accessibility problems with this website</h2>
           <p>
-            We're always looking to improve the accessibility of this website.
-            If you find any problems not listed on this page or think we're not
-            meeting accessibility requirements, please contact{" "}
+            We&apos;re always looking to improve the accessibility of this
+            website. If you find any problems not listed on this page or think
+            we&apos;re not meeting accessibility requirements, please contact{" "}
             <a href="mailto:[email protected]">
               [email protected]
-            </a>. This helps us improve.
+            </a>
+            . This helps us improve.
           </p>
           <h2>Enforcement procedure</h2>
           <p>
             If you contact us with a complaint and you are not happy with our
             response,{" "}
             <a href="https://www.equalityadvisoryservice.com/">
               contact the Equality Advisory and Support Service (EASS)
-            </a>.
+            </a>
+            .
           </p>
           <p>
             The Equality and Human Rights Commission (EHRC) is responsible for
             enforcing the{" "}
             <a href="https://www.legislation.gov.uk/uksi/2018/952/contents/made">
               Public Sector Bodies (Websites and Mobile Applications) (No. 2)
               Accessibility Regulations 2018 on legislation.gov.uk
-            </a> (the "accessibility regulations").
+            </a>{" "}
+            (the &quot;accessibility regulations&quot;).
           </p>
           <h2>Technical information about this website&apos;s accessibility</h2>
           <p>
             This service is compliant with the{" "}
             <a href="http://www.w3.org/TR/WCAG21/">
               Web Content Accessibility Guidelines (WCAG) version 2.1 AA
               standard
-            </a>.
+            </a>
+            .
           </p>
           <h2>Preparation of this accessibility statement</h2>
           <p>This statement was prepared on 2 December 2024.</p>
           <p>
-            This website's accessibility will be reviewed on a regular and
+            This website&apos;s accessibility will be reviewed on a regular and
             continuous basis.
           </p>
         </div>

application/CohortManager/src/Web/app/components/exceptionsTable.tsx

@@ -1,5 +1,5 @@
-import { ExceptionDetails } from "@/app/types";
 import Link from "next/link";
+import { ExceptionDetails } from "@/app/types";
 import { formatNhsNumber, formatDate } from "@/app/lib/utils";
 
 interface ExceptionsTableProps {
@@ -16,7 +16,7 @@ export default function ExceptionsTable({
       <caption className="nhsuk-table__caption">
         {caption ? `${caption}` : "Total breast screening exceptions"}
       </caption>
-      <thead role="rowgroup" className="nhsuk-table__head">
+      <thead className="nhsuk-table__head">
         <tr role="row">
           <th role="columnheader" scope="col">
             Exception ID
@@ -39,7 +39,7 @@ export default function ExceptionsTable({
             className="nhsuk-table__row"
             key={exception.exceptionId}
           >
-            <td role="cell" className="nhsuk-table__cell">
+            <td className="nhsuk-table__cell">
               <span
                 className="nhsuk-table-responsive__heading"
                 aria-hidden="true"
@@ -50,7 +50,7 @@ export default function ExceptionsTable({
                 {exception.exceptionId}
               </Link>
             </td>
-            <td role="cell" className="nhsuk-table__cell app-u-no-wrap">
+            <td className="nhsuk-table__cell app-u-no-wrap">
               <span
                 className="nhsuk-table-responsive__heading"
                 aria-hidden="true"
@@ -59,7 +59,7 @@ export default function ExceptionsTable({
               </span>
               {formatNhsNumber(exception.nhsNumber ?? "")}
             </td>
-            <td role="cell" className="nhsuk-table__cell app-u-no-wrap">
+            <td className="nhsuk-table__cell app-u-no-wrap">
               <span
                 className="nhsuk-table-responsive__heading"
                 aria-hidden="true"
@@ -68,7 +68,7 @@ export default function ExceptionsTable({
               </span>
               {formatDate(exception.dateCreated)}
             </td>
-            <td role="cell" className="nhsuk-table__cell">
+            <td className="nhsuk-table__cell">
               <span
                 className="nhsuk-table-responsive__heading"
                 aria-hidden="true"

application/CohortManager/src/Web/app/components/signIn.tsx

@@ -1,6 +1,8 @@
 import styles from "@/app/styles/components/signIn.module.scss";
 import { signIn } from "@/app/lib/auth";
 
+import type { JSX } from "react";
+
 interface SignInProps {
   serviceName?: string;
   headingLevel?: 1 | 2 | 3 | 4;

application/CohortManager/src/Web/next.config.mjs

@@ -1,6 +1,10 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   output: "standalone",
+  sassOptions: {
+    quietDeps: true,
+    includePaths: ["./node_modules/nhsuk-frontend"],
+  },
 };
 
 export default nextConfig;