From 949af337146a8f1e6a29cf4b89ed75577525e012 Mon Sep 17 00:00:00 2001
From: R Ranathunga <rumesha.ranathunga@gov.bc.ca>
Date: Thu, 3 Oct 2024 10:22:13 -0700
Subject: [PATCH 1/2] chore: add alert in summary when sow not uploaded

---
 app/components/Review/Accordion.tsx           |  14 +-
 app/components/Review/ReviewSectionField.tsx  |   2 +
 .../helpers/ccbcSummaryGenerateFormData.tsx   | 179 ++++++++------
 .../application/[applicationId]/summary.tsx   |   1 -
 .../[applicationId]/summary.test.tsx          | 228 +++++++++++++++++-
 5 files changed, 343 insertions(+), 81 deletions(-)

diff --git a/app/components/Review/Accordion.tsx b/app/components/Review/Accordion.tsx
index c33a5ab02..0c7013b1b 100644
--- a/app/components/Review/Accordion.tsx
+++ b/app/components/Review/Accordion.tsx
@@ -6,6 +6,7 @@ import Link from 'next/link';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faMinus, faPen, faPlus } from '@fortawesome/free-solid-svg-icons';
 import CbcRecordLock from 'components/Analyst/CBC/CbcRecordLock';
+import { Tooltip } from '@mui/material';
 import AlertIcon from './AlertIcon';
 
 export function getToggledState(
@@ -64,6 +65,10 @@ const StyledLink = styled(Link)`
   text-decoration: none;
 `;
 
+const StyledTooltip = styled(Tooltip)`
+  cursor: pointer;
+`;
+
 const Accordion = ({
   allowAnalystEdit,
   children,
@@ -71,6 +76,7 @@ const Accordion = ({
   isCBC,
   cbcId,
   error,
+  sectionErrors,
   name,
   onToggle,
   toggled,
@@ -131,9 +137,11 @@ const Accordion = ({
             ))}
 
           {error && (
-            <StyledAlert>
-              <AlertIcon />
-            </StyledAlert>
+            <StyledTooltip title={sectionErrors?.join('\n')} placement="top">
+              <StyledAlert data-testid="styled-alert">
+                <AlertIcon />
+              </StyledAlert>
+            </StyledTooltip>
           )}
           <button type="button" onClick={handleToggle}>
             {isToggled ? (
diff --git a/app/components/Review/ReviewSectionField.tsx b/app/components/Review/ReviewSectionField.tsx
index 6ffbd8ba7..228811b5b 100644
--- a/app/components/Review/ReviewSectionField.tsx
+++ b/app/components/Review/ReviewSectionField.tsx
@@ -16,6 +16,7 @@ const ReviewSectionField: React.FC<FieldProps> = (props) => {
   const pageName = idSchema.$id?.split('_')?.[1];
   const formErrorSchema = formContext?.formErrorSchema ?? formContext.errors;
   const hasFormContextError = formErrorSchema?.[pageName];
+  const sectionErrors = hasFormContextError?.__errors;
   const hasErrors = useMemo(
     () => Object.keys(errorSchema || {}).length > 0 || !!hasFormContextError,
     [errorSchema, hasFormContextError]
@@ -33,6 +34,7 @@ const ReviewSectionField: React.FC<FieldProps> = (props) => {
       cbcId={formContext.cbcId}
       isCBC={formContext.isCBC}
       error={hasErrors}
+      sectionErrors={sectionErrors}
       title={schema.title}
       allowAnalystEdit={allowAnalystEdit}
       recordLocked={formContext.recordLocked}
diff --git a/app/lib/helpers/ccbcSummaryGenerateFormData.tsx b/app/lib/helpers/ccbcSummaryGenerateFormData.tsx
index 0802286f6..db159fc62 100644
--- a/app/lib/helpers/ccbcSummaryGenerateFormData.tsx
+++ b/app/lib/helpers/ccbcSummaryGenerateFormData.tsx
@@ -1,3 +1,5 @@
+import review from 'formSchema/analyst/summary/review';
+
 const getEconomicRegions = (economicRegions) => {
   if (!economicRegions) {
     return null;
@@ -150,93 +152,118 @@ const getCommunities = (communities) => {
   };
 };
 
+const getSowErrors = (sowData, schema, formDataSource) => {
+  if (sowData?.length) return null;
+  const errors = {};
+  Object.entries(schema?.properties || {}).forEach(([parentKey, value]) => {
+    const sectionSchema = value['properties'];
+    Object.keys(sectionSchema || {}).forEach((key) => {
+      if (formDataSource[key] === 'SOW') {
+        errors[parentKey] = errors[parentKey] || {
+          __errors: [
+            'Highlighted cells are null because SOW Excel table has not been uploaded in the portal',
+          ],
+        };
+        errors[parentKey][key] = {
+          __errors: ['SOW excel table has not been uploaded in the portal'],
+        };
+      }
+    });
+  });
+
+  return errors;
+};
+
 const getSowData = (sowData, baseSowData) => {
   const communitiesData = getCommunities(
     sowData?.nodes[0]?.sowTab8SBySowId?.nodes[0]?.jsonData?.geoNames
   );
-  const errors = {}; // errors may get added later
   const communities =
     sowData?.nodes[0]?.sowTab8SBySowId?.nodes[0]?.jsonData?.communitiesNumber;
   const indigenousCommunities =
     sowData?.nodes[0]?.sowTab8SBySowId?.nodes[0]?.jsonData
       ?.indigenousCommunitiesNumber;
-  return {
-    formData: {
-      counts: {
-        communities,
-        indigenousCommunities,
-        nonIndigenousCommunities:
-          communities && indigenousCommunities
-            ? communities - indigenousCommunities
-            : communities,
-        totalHouseholdsImpacted:
-          sowData?.nodes[0]?.sowTab1SBySowId?.nodes[0]?.jsonData
-            ?.numberOfHouseholds,
-        numberOfIndigenousHouseholds:
-          sowData?.nodes[0]?.sowTab1SBySowId?.nodes[0]?.jsonData
-            ?.householdsImpactedIndigenous,
-      },
-      locations: {
-        benefitingCommunities: communitiesData?.benefitingCommunities,
-        benefitingIndigenousCommunities:
-          communitiesData?.benefitingIndigenousCommunities,
-      },
-      funding: {
-        bcFundingRequested:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.amountRequestedFromProvince,
-        federalFunding:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.amountRequestedFromFederalGovernment,
-        fundingRequestedCcbc:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.totalFundingRequestedCCBC,
-        applicantAmount:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.totalApplicantContribution,
-        cibFunding:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.totalInfrastructureBankFunding,
-        fhnaFunding:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.totalFNHAFunding,
-        otherFunding:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.fundingFromAllOtherSources,
-        totalProjectBudget:
-          sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
-            ?.totalProjectCost,
-      },
-      eventsAndDates: {
-        effectiveStartDate: sowData?.nodes[0]?.jsonData?.effectiveStartDate,
-        proposedStartDate: sowData?.nodes[0]?.jsonData?.projectStartDate,
-        proposedCompletionDate:
-          sowData?.nodes[0]?.jsonData?.projectCompletionDate,
-        dateAgreementSigned:
-          baseSowData?.nodes[0]?.jsonData?.dateFundingAgreementSigned,
-      },
+  const formData = {
+    counts: {
+      communities,
+      indigenousCommunities,
+      nonIndigenousCommunities:
+        communities && indigenousCommunities
+          ? communities - indigenousCommunities
+          : communities,
+      totalHouseholdsImpacted:
+        sowData?.nodes[0]?.sowTab1SBySowId?.nodes[0]?.jsonData
+          ?.numberOfHouseholds,
+      numberOfIndigenousHouseholds:
+        sowData?.nodes[0]?.sowTab1SBySowId?.nodes[0]?.jsonData
+          ?.householdsImpactedIndigenous,
     },
-    formDataSource: {
-      communities: 'SOW',
-      benefitingCommunities: 'SOW',
-      indigenousCommunities: 'SOW',
-      nonIndigenousCommunities: 'SOW',
-      benefitingIndigenousCommunities: 'SOW',
-      totalHouseholdsImpacted: 'SOW',
-      numberOfIndigenousHouseholds: 'SOW',
-      bcFundingRequested: 'SOW',
-      federalFunding: 'SOW',
-      fundingRequestedCcbc: 'SOW',
-      applicantAmount: 'SOW',
-      cibFunding: 'SOW',
-      fhnaFunding: 'SOW',
-      otherFunding: 'SOW',
-      totalProjectBudget: 'SOW',
-      effectiveStartDate: 'SOW',
-      proposedStartDate: 'SOW',
-      proposedCompletionDate: 'SOW',
-      dateAgreementSigned: 'SOW',
+    locations: {
+      benefitingCommunities: communitiesData?.benefitingCommunities,
+      benefitingIndigenousCommunities:
+        communitiesData?.benefitingIndigenousCommunities,
+    },
+    funding: {
+      bcFundingRequested:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.amountRequestedFromProvince,
+      federalFunding:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.amountRequestedFromFederalGovernment,
+      fundingRequestedCcbc:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.totalFundingRequestedCCBC,
+      applicantAmount:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.totalApplicantContribution,
+      cibFunding:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.totalInfrastructureBankFunding,
+      fhnaFunding:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.totalFNHAFunding,
+      otherFunding:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.fundingFromAllOtherSources,
+      totalProjectBudget:
+        sowData?.nodes[0]?.sowTab7SBySowId?.nodes[0]?.jsonData?.summaryTable
+          ?.totalProjectCost,
+    },
+    eventsAndDates: {
+      effectiveStartDate: sowData?.nodes[0]?.jsonData?.effectiveStartDate,
+      proposedStartDate: sowData?.nodes[0]?.jsonData?.projectStartDate,
+      proposedCompletionDate:
+        sowData?.nodes[0]?.jsonData?.projectCompletionDate,
+      dateAgreementSigned:
+        baseSowData?.nodes[0]?.jsonData?.dateFundingAgreementSigned,
     },
+  };
+  const formDataSource = {
+    communities: 'SOW',
+    benefitingCommunities: 'SOW',
+    indigenousCommunities: 'SOW',
+    nonIndigenousCommunities: 'SOW',
+    benefitingIndigenousCommunities: 'SOW',
+    totalHouseholdsImpacted: 'SOW',
+    numberOfIndigenousHouseholds: 'SOW',
+    bcFundingRequested: 'SOW',
+    federalFunding: 'SOW',
+    fundingRequestedCcbc: 'SOW',
+    applicantAmount: 'SOW',
+    cibFunding: 'SOW',
+    fhnaFunding: 'SOW',
+    otherFunding: 'SOW',
+    totalProjectBudget: 'SOW',
+    effectiveStartDate: 'SOW',
+    proposedStartDate: 'SOW',
+    proposedCompletionDate: 'SOW',
+    dateAgreementSigned: 'SOW',
+  };
+  const errors = getSowErrors(sowData?.nodes, review, formDataSource);
+
+  return {
+    formData,
+    formDataSource,
     errors,
   };
 };
diff --git a/app/pages/analyst/application/[applicationId]/summary.tsx b/app/pages/analyst/application/[applicationId]/summary.tsx
index 419f7df6a..8b4c93530 100644
--- a/app/pages/analyst/application/[applicationId]/summary.tsx
+++ b/app/pages/analyst/application/[applicationId]/summary.tsx
@@ -229,7 +229,6 @@ const Summary = ({
             isEditable: false,
             errors,
             formDataSource,
-            showErrorHint: true,
           }}
           formData={formData}
           handleChange={() => {}}
diff --git a/app/tests/pages/analyst/application/[applicationId]/summary.test.tsx b/app/tests/pages/analyst/application/[applicationId]/summary.test.tsx
index eae24138f..0fe41da23 100644
--- a/app/tests/pages/analyst/application/[applicationId]/summary.test.tsx
+++ b/app/tests/pages/analyst/application/[applicationId]/summary.test.tsx
@@ -1,4 +1,4 @@
-import { act, screen } from '@testing-library/react';
+import { act, fireEvent, screen } from '@testing-library/react';
 import Summary from 'pages/analyst/application/[applicationId]/summary';
 import PageTestingHelper from 'tests/utils/pageTestingHelper';
 import compiledSummaryQuery, {
@@ -715,6 +715,214 @@ const mockQueryPayloadAgreementSigned = {
   },
 };
 
+const mockQueryPayloadAgreementSignedMissingSow = {
+  Query() {
+    return {
+      applicationByRowId: {
+        announcements: {
+          totalCount: 3,
+        },
+        formData: {
+          jsonData: {
+            review: {
+              acknowledgeIncomplete: true,
+            },
+            benefits: {
+              projectBenefits:
+                "Test project benefits. This is a test project's benefits.",
+              numberOfHouseholds: 31,
+              householdsImpactedIndigenous: 0,
+            },
+
+            projectPlan: {
+              operationalPlan:
+                'Test operational plan. This is a test operational plan.',
+              projectStartDate: '2023-01-01',
+              projectCompletionDate: '2024-01-01',
+            },
+            budgetDetails: {
+              totalProjectCost: 111,
+              totalEligibleCosts: 222,
+            },
+            projectFunding: {
+              fundingRequestedCCBC2324: 111,
+              fundingRequestedCCBC2425: 222,
+              totalFundingRequestedCCBC: 333,
+              totalApplicantContribution: 444,
+              applicationContribution2324: 555,
+              applicationContribution2425: 666,
+            },
+            alternateContact: {},
+            authorizedContact: {},
+            contactInformation: {},
+            projectInformation: {
+              projectTitle: 'Test project title',
+              projectDescription:
+                'Test project description. This is a test project description.',
+              geographicAreaDescription:
+                'Test geographic area description. This is a test geographic area description.',
+            },
+            organizationProfile: {},
+            otherFundingSources: {
+              otherFundingSources: true,
+              otherFundingSourcesArray: [
+                {
+                  funderType: 'Provincial/territorial',
+                  statusOfFunding: 'Submitted',
+                  fundingPartnersName:
+                    'Test funding partner name. This is a test funding partner name.',
+                  nameOfFundingProgram: 'Test',
+                  fundingSourceContactInfo: 'Test',
+                  requestedFundingPartner2324: 777,
+                  requestedFundingPartner2425: 888,
+                  totalRequestedFundingPartner: 999,
+                },
+              ],
+              totalInfrastructureBankFunding: null,
+            },
+            supportingDocuments: {},
+            organizationLocation: {},
+            existingNetworkCoverage: {},
+            estimatedProjectEmployment: {
+              currentEmployment: 1,
+              estimatedFTECreation: 1.1,
+              numberOfEmployeesToWork: 1,
+              personMonthsToBeCreated: 1,
+              hoursOfEmploymentPerWeek: 10,
+              numberOfContractorsToWork: 1,
+              estimatedFTEContractorCreation: 1.4,
+              contractorPersonMonthsToBeCreated: 1,
+              hoursOfContractorEmploymentPerWeek: 11,
+            },
+          },
+        },
+        projectInformation: {
+          jsonData: {
+            dateFundingAgreementSigned: '2023-12-02',
+            hasFundingAgreementBeenSigned: true,
+          },
+        },
+        applicationMilestoneExcelDataByApplicationId: {
+          nodes: [
+            {
+              jsonData: {
+                projectNumber: 'CCBC-010001',
+                milestone1Progress: 0.6666666666666666,
+                milestone2Progress: 0,
+                milestone3Progress: 0,
+                milestone1ProjectSites: [
+                  {
+                    isPOP: '',
+                    siteId: '',
+                    projectSite: '',
+                    milestoneOneDueDate: '',
+                  },
+                ],
+                milestone2ProjectSites: [
+                  {
+                    isPOP: '',
+                    siteId: '',
+                    projectSite: '',
+                    detailedProgress: {
+                      landAccessPermitEvidence: {
+                        progress: 0,
+                      },
+                      radioAndSpectrumLicenses: {
+                        progress: 0,
+                      },
+                      photographsOfProjectSites: {
+                        progress: 0,
+                      },
+                      pointOfPresenceConfirmation: {
+                        progress: 0,
+                      },
+                    },
+                    milestoneTwoDueDate: '',
+                  },
+                ],
+                overallMilestoneProgress: 0.24,
+                milestone1DateOfReception: '2024-04-10T00:00:00.000Z',
+                milestone2DateOfReception: '',
+              },
+            },
+          ],
+        },
+        conditionalApproval: {
+          jsonData: {
+            decision: {
+              ministerDate: '2023-04-18',
+              ministerDecision: 'Approved',
+              provincialRequested: 555,
+            },
+            response: {
+              applicantResponse: 'Accepted',
+              statusApplicantSees: 'Conditionally Approved',
+            },
+            isedDecisionObj: {
+              isedDate: '2023-05-02',
+              isedDecision: 'Approved',
+              federalRequested: 555,
+              isedAnnouncement: 'Hold announcement',
+            },
+            letterOfApproval: {
+              letterOfApprovalDateSent: '2023-05-27',
+            },
+          },
+        },
+        changeRequestDataByApplicationId: {},
+        status: 'applicant_approved',
+        allAssessments: {
+          nodes: [
+            {
+              assessmentDataType: 'screening',
+              jsonData: {
+                decision: 'Eligible',
+                nextStep: 'Assessment complete',
+                assignedTo: 'Someone',
+                targetDate: '2023-01-09',
+                contestingMap: ['Applicant is contesting the area map'],
+                crtcProjectDependent: true,
+                connectedCoastNetworkDependent: true,
+              },
+            },
+          ],
+        },
+        intakeNumber: 1,
+      },
+      allApplicationSowData: {
+        nodes: [],
+      },
+      allIntakes: {
+        nodes: [
+          {
+            closeTimestamp: '2022-12-15T22:30:00+00:00',
+            ccbcIntakeNumber: 1,
+          },
+          {
+            closeTimestamp: '2023-02-16T22:30:00+00:00',
+            ccbcIntakeNumber: 2,
+          },
+          {
+            closeTimestamp: '2027-04-01T06:59:59+00:00',
+            ccbcIntakeNumber: 99,
+          },
+          {
+            closeTimestamp: '2024-03-14T21:30:00+00:00',
+            ccbcIntakeNumber: 3,
+          },
+          {
+            closeTimestamp: '2024-06-20T21:30:00+00:00',
+            ccbcIntakeNumber: 4,
+          },
+        ],
+      },
+      session: {
+        sub: '4e0ac88c-bf05-49ac-948f-7fd53c7a9fd6',
+      },
+    };
+  },
+};
+
 const pageTestingHelper = new PageTestingHelper<summaryQuery>({
   pageComponent: Summary,
   compiledQuery: compiledSummaryQuery,
@@ -837,4 +1045,22 @@ describe('The Summary page', () => {
     // application source
     expect(screen.getAllByText('(SOW)')).toHaveLength(17);
   });
+
+  it('should show the alert when SOW has not been uploaded and application is agreement signed', async () => {
+    await act(async () => {
+      pageTestingHelper.loadQuery(mockQueryPayloadAgreementSignedMissingSow);
+      pageTestingHelper.renderPage();
+    });
+
+    expect(screen.queryAllByText('(SOW)')).toHaveLength(0);
+    const alerts = screen.getAllByTestId('styled-alert');
+    expect(alerts).toHaveLength(4);
+
+    fireEvent.mouseOver(alerts[0]);
+    expect(
+      await screen.findByText(
+        'Highlighted cells are null because SOW Excel table has not been uploaded in the portal'
+      )
+    ).toBeInTheDocument();
+  });
 });

From b0babfc20bfcd5c8a598f37230b3ecc8156a8e35 Mon Sep 17 00:00:00 2001
From: CCBC Service Account
 <116113628+ccbc-service-account@users.noreply.github.com>
Date: Thu, 10 Oct 2024 22:07:57 +0000
Subject: [PATCH 2/2] chore: release v1.197.2

---
 CHANGELOG.md   | 2 ++
 db/sqitch.plan | 1 +
 package.json   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28c271af7..ca34e87b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## [1.197.2](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.197.1...v1.197.2) (2024-10-10)
+
 ## [1.197.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.197.0...v1.197.1) (2024-10-10)
 
 # [1.197.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.195.4...v1.197.0) (2024-10-04)
diff --git a/db/sqitch.plan b/db/sqitch.plan
index 30edaa617..109d63684 100644
--- a/db/sqitch.plan
+++ b/db/sqitch.plan
@@ -701,3 +701,4 @@ tables/application_rd 2024-09-11T18:21:13Z Rafael Solorzano <61289255+rafasdc@us
 @1.196.0 2024-10-04T16:31:01Z CCBC Service Account <ccbc@button.is> # release v1.196.0
 @1.197.0 2024-10-04T21:12:28Z CCBC Service Account <ccbc@button.is> # release v1.197.0
 @1.197.1 2024-10-10T17:11:00Z CCBC Service Account <ccbc@button.is> # release v1.197.1
+@1.197.2 2024-10-10T22:07:55Z CCBC Service Account <ccbc@button.is> # release v1.197.2
diff --git a/package.json b/package.json
index eea7fab45..74b876d33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.197.1",
+  "version": "1.197.2",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <Meherzad.Romer@gov.bc.ca>",