From 20383036a08fd0de29189bd975e05a7155fc3066 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Thu, 10 Oct 2024 15:19:25 -0700 Subject: [PATCH 1/5] feat: add heading and explanation at top of ccbc summary --- .../analyst/application/[applicationId].tsx | 4 ++- .../application/[applicationId]/summary.tsx | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/app/pages/analyst/application/[applicationId].tsx b/app/pages/analyst/application/[applicationId].tsx index b067ae629e..849291c53c 100644 --- a/app/pages/analyst/application/[applicationId].tsx +++ b/app/pages/analyst/application/[applicationId].tsx @@ -69,10 +69,12 @@ const getApplicationQuery = graphql` const Application = ({ preloadedQuery, }: RelayProps, ApplicationIdQuery>) => { + const router = useRouter(); + const expandAll = router.query.expandAll === 'true'; const query = usePreloadedQuery(getApplicationQuery, preloadedQuery); const [toggleOverride, setToggleExpandOrCollapseAll] = useState< boolean | undefined - >(undefined); + >(expandAll ? true : undefined); const { applicationByRowId, session } = query; const { status, diff --git a/app/pages/analyst/application/[applicationId]/summary.tsx b/app/pages/analyst/application/[applicationId]/summary.tsx index 910599808b..f29cd40a03 100644 --- a/app/pages/analyst/application/[applicationId]/summary.tsx +++ b/app/pages/analyst/application/[applicationId]/summary.tsx @@ -14,6 +14,8 @@ import { Tooltip } from '@mui/material'; import { Info } from '@mui/icons-material'; import { useState } from 'react'; import generateFormData from 'lib/helpers/ccbcSummaryGenerateFormData'; +import { useRouter } from 'next/router'; +import Link from 'next/link'; const getSummaryQuery = graphql` query summaryQuery($rowId: Int!) { @@ -168,9 +170,19 @@ const RightAlignText = styled('div')` padding-bottom: 4px; `; +const StyledLink = styled(Link)` + color: ${(props) => props.theme.color.links}; + text-decoration: none; + &:hover { + text-decoration: underline; + } +`; + const Summary = ({ preloadedQuery, }: RelayProps, summaryQuery>) => { + const router = useRouter(); + const applicationId = router.query.applicationId as string; const query = usePreloadedQuery(getSummaryQuery, preloadedQuery); const { applicationByRowId, @@ -194,6 +206,22 @@ const Summary = ({ return ( + <> +

Summary

+

+ This section provides up-to-date information on the project's + status by pulling from the{' '} + + Application + + , Conditional Approval accordion, + or SOW as it progresses through + each stage. +

{' '} +
+ <> Date: Wed, 16 Oct 2024 15:46:56 -0700 Subject: [PATCH 2/5] chore: handle conditional approval and sow links --- .../application/[applicationId]/project.tsx | 9 +++++++++ .../application/[applicationId]/summary.tsx | 16 +++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/pages/analyst/application/[applicationId]/project.tsx b/app/pages/analyst/application/[applicationId]/project.tsx index ff2cff8c37..2600625787 100644 --- a/app/pages/analyst/application/[applicationId]/project.tsx +++ b/app/pages/analyst/application/[applicationId]/project.tsx @@ -133,6 +133,15 @@ const Project = ({ setIsCommunityProgressExpanded(true); } } + // overwrite logic on expanded for when user + // is navigating with a query on the path + // from summary page + if (toggledSection === 'projectInformation') { + setIsProjectInformationExpanded(true); + } + if (toggledSection === 'conditionalApproval') { + setIsConditionalApprovalExpanded(true); + } }, [conditionalApproval, date, projectInformation]); return ( diff --git a/app/pages/analyst/application/[applicationId]/summary.tsx b/app/pages/analyst/application/[applicationId]/summary.tsx index f29cd40a03..facb0ee69f 100644 --- a/app/pages/analyst/application/[applicationId]/summary.tsx +++ b/app/pages/analyst/application/[applicationId]/summary.tsx @@ -216,9 +216,19 @@ const Summary = ({ > Application - , Conditional Approval accordion, - or SOW as it progresses through - each stage. + ,{' '} + + Conditional Approval + {' '} + accordion, or{' '} + + SOW + {' '} + as it progresses through each stage.

{' '}
From 14ed6ba53eeebfa5a736b789332e19151077fdd9 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Wed, 16 Oct 2024 15:47:44 -0700 Subject: [PATCH 3/5] chore: remove file --- app/next-env.d.ts | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 app/next-env.d.ts diff --git a/app/next-env.d.ts b/app/next-env.d.ts deleted file mode 100644 index a4a7b3f5cf..0000000000 --- a/app/next-env.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -/// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information. From be3e77b8b458a512dd57be6b432ffdf304151733 Mon Sep 17 00:00:00 2001 From: Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:00:37 -0700 Subject: [PATCH 4/5] test: section toggle conditional and project --- .../[applicationId]/project.test.tsx | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/app/tests/pages/analyst/application/[applicationId]/project.test.tsx b/app/tests/pages/analyst/application/[applicationId]/project.test.tsx index 384f46d45d..1aeebcaded 100644 --- a/app/tests/pages/analyst/application/[applicationId]/project.test.tsx +++ b/app/tests/pages/analyst/application/[applicationId]/project.test.tsx @@ -1,4 +1,5 @@ -import { act, fireEvent, screen } from '@testing-library/react'; +import { fireEvent, screen } from '@testing-library/react'; +import { act } from 'react'; import * as moduleApi from '@growthbook/growthbook-react'; import { FeatureResult, JSONValue } from '@growthbook/growthbook-react'; import Project from 'pages/analyst/application/[applicationId]/project'; @@ -446,6 +447,34 @@ describe('The Project page', () => { }); }); + it('should expand conditional approval sections if query is set', async () => { + pageTestingHelper.setMockRouterValues({ + query: { applicationId: '1', section: 'conditionalApproval' }, + }); + + await act(async () => { + pageTestingHelper.loadQuery(mockJsonDataQueryPayload); + pageTestingHelper.renderPage(); + }); + + expect(screen.getByText('Conditional approval')).toBeInTheDocument(); + }); + + it('should expand project information (sow) sections if query is set', async () => { + pageTestingHelper.setMockRouterValues({ + query: { applicationId: '1', section: 'projectInformation' }, + }); + + await act(async () => { + pageTestingHelper.loadQuery(mockJsonDataQueryPayload); + pageTestingHelper.renderPage(); + }); + + expect( + screen.getByText('Funding agreement, statement of work, & map') + ).toBeInTheDocument(); + }); + afterEach(() => { jest.clearAllMocks(); }); From e4d85f57e8b70fe7a85d415355fbda9b6855762d Mon Sep 17 00:00:00 2001 From: CCBC Service Account <116113628+ccbc-service-account@users.noreply.github.com> Date: Mon, 21 Oct 2024 21:32:03 +0000 Subject: [PATCH 5/5] chore: release v1.202.0 --- CHANGELOG.md | 6 ++++++ db/sqitch.plan | 1 + package.json | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93829ef295..15af5554cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# [1.202.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.201.1...v1.202.0) (2024-10-21) + +### Features + +- add heading and explanation at top of ccbc summary ([2038303](https://github.com/bcgov/CONN-CCBC-portal/commit/20383036a08fd0de29189bd975e05a7155fc3066)) + ## [1.201.1](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.201.0...v1.201.1) (2024-10-18) # [1.201.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.200.0...v1.201.0) (2024-10-18) diff --git a/db/sqitch.plan b/db/sqitch.plan index a148466f11..58492e6874 100644 --- a/db/sqitch.plan +++ b/db/sqitch.plan @@ -712,3 +712,4 @@ clean_pre_cut_over_cbc_history 2024-10-15T23:26:47Z ,,, # R tables/application_form_template_9_data 2024-09-25T22:50:17Z Rafael Solorzano <61289255+rafasdc@users.noreply.github.com> # create table for form template 9 data @1.201.0 2024-10-18T23:20:23Z CCBC Service Account # release v1.201.0 @1.201.1 2024-10-18T23:48:24Z CCBC Service Account # release v1.201.1 +@1.202.0 2024-10-21T21:32:01Z CCBC Service Account # release v1.202.0 diff --git a/package.json b/package.json index 9aa03acda2..81f6ad6cce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CONN-CCBC-portal", - "version": "1.201.1", + "version": "1.202.0", "main": "index.js", "repository": "https://github.com/bcgov/CONN-CCBC-portal.git", "author": "Romer, Meherzad CITZ:EX ",