diff --git a/services/common/src/components/project/ProjectDescriptionTab.tsx b/services/common/src/components/project/ProjectDescriptionTab.tsx index 36bfdfcbdc..f517b7cf24 100644 --- a/services/common/src/components/project/ProjectDescriptionTab.tsx +++ b/services/common/src/components/project/ProjectDescriptionTab.tsx @@ -7,6 +7,7 @@ import { ENVIRONMENTAL_MANAGMENT_ACT, AMS_STATUS_CODES_SUCCESS, AMS_STATUS_CODE_ERROR, + WASTE_DISCHARGE_AUTHORIZATION_PROCESS, } from "@mds/common/constants/strings"; import { AMS_ENVIRONMENTAL_MANAGEMENT_ACT_TYPES, @@ -22,7 +23,7 @@ import { useSelector, useDispatch } from "react-redux"; import { getPermits } from "@mds/common/redux/selectors/permitSelectors"; import { renderTextColumn } from "@mds/common/components/common/CoreTableCommonColumns"; import { IAuthorizationSummary } from "@mds/common/interfaces"; -import { useHistory } from "react-router-dom"; +import { useHistory, Link } from "react-router-dom"; import { getDropdownProjectSummaryPermitTypes, @@ -378,7 +379,7 @@ const ProjectDescriptionTab = () => { - Project Description Overview + Project Description Overview - ) : null - } - style={{ marginBottom: "12px" }} - /> + + Submission Progress + + {minesActData.length > 0 && ( + <> + + Major Mines Office + + Mines Act + +
+ + )} + {waterSustainabilityActData.length > 0 && ( + <> + Water Sustainability Act + +
+ + )} + {forestryActData.length > 0 && ( + <> + Forestry Act + +
+ + )} + {environmentalManagementActData.length > 0 && ( + <> + + Ministry of Environment + + + Environmental Management Act + + + An Environmental Protection Officer will contact you once your application is + reviewed and accepted. In the meantime, to learn about the ministry’s structured + application process and timelines to get a waste discharge authorization, please + visit{" "} + + The waste discharge authorization process + + . + + {hasFailedAMSSubmission && ( + + Retry Failed Submission + + ) : null + } + style={{ marginBottom: "12px" }} + /> + )} + + )} - ) : ( diff --git a/services/common/src/components/project/__snapshots__/ProjectDescriptionTab.spec.tsx.snap b/services/common/src/components/project/__snapshots__/ProjectDescriptionTab.spec.tsx.snap index 1390255e93..b3201bd186 100644 --- a/services/common/src/components/project/__snapshots__/ProjectDescriptionTab.spec.tsx.snap +++ b/services/common/src/components/project/__snapshots__/ProjectDescriptionTab.spec.tsx.snap @@ -16,11 +16,11 @@ exports[`ProjectDescriptionTab renders properly 1`] = `
-

Project Description Overview -

+

Submission Progress

-

Major Mines Office -

-
+ Mines Act -
+
@@ -70,7 +70,7 @@ exports[`ProjectDescriptionTab renders properly 1`] = ` class="ant-spin-container" >
- No Data Yet +
+
+
- - - -
-
-
-
-
- -
-
- Water Sustainability Act -
-
-
-
-
-
-
- - - - - - - - - - - +
+ May 24 2024, 12:17 (PDT) +
+ @@ -205,11 +171,11 @@ exports[`ProjectDescriptionTab renders properly 1`] = `
-
Forestry Act -
+
@@ -220,7 +186,7 @@ exports[`ProjectDescriptionTab renders properly 1`] = ` class="ant-spin-container" >
- - -
- Type - - Permit - - Date - + N/A + + + - Status - -
- No Data Yet + + + + Submitted + +
- No Data Yet +
+
+
-
-
-
-
-
-
-
-

- Ministry of Environment -

-
- Environmental Management Act -
-
-
-
-
-
-
- - - - - - - - - - - - +
+ May 24 2024, 12:17 (PDT) +
+ @@ -364,6 +286,7 @@ exports[`ProjectDescriptionTab renders properly 1`] = ` +
diff --git a/services/common/src/constants/strings.tsx b/services/common/src/constants/strings.tsx index 1bc972eebd..5e80383431 100755 --- a/services/common/src/constants/strings.tsx +++ b/services/common/src/constants/strings.tsx @@ -466,3 +466,5 @@ export const WASTE_DISCHARGE_NEW_AUTHORIZATIONS_URL = "https://www2.gov.bc.ca/gov/content/environment/waste-management/waste-discharge-authorization/apply"; export const WASTE_DISCHARGE_AMENDMENT_AUTHORIZATIONS_URL = "https://www2.gov.bc.ca/gov/content/environment/waste-management/waste-discharge-authorization/change"; +export const WASTE_DISCHARGE_AUTHORIZATION_PROCESS = + "https://www2.gov.bc.ca/gov/content/environment/waste-management/waste-discharge-authorization/process"; diff --git a/services/common/src/tests/mocks/dataMocks.tsx b/services/common/src/tests/mocks/dataMocks.tsx index feac3fec3e..a356a67d59 100644 --- a/services/common/src/tests/mocks/dataMocks.tsx +++ b/services/common/src/tests/mocks/dataMocks.tsx @@ -7614,6 +7614,44 @@ export const PROJECT_SUMMARY: IProjectSummary = { ams_status_code: null, ams_submission_timestamp: "2024-05-24T19:17:09.212499+00:00", }, + { + project_summary_authorization_guid: "4d04995c-f90d-42fd-a951-60d9891f242c", + project_summary_guid: "8b4b9781-2e59-43ef-8164-4cc3b964417a", + project_summary_permit_type: ["AMENDMENT"], + project_summary_authorization_type: "MINES_ACT_PERMIT", + existing_permits_authorizations: null, + amendment_changes: null, + amendment_severity: null, + is_contaminated: null, + new_type: null, + authorization_description: null, + exemption_reason: null, + amendment_documents: [], + exemption_requested: null, + ams_tracking_number: null, + ams_outcome: null, + ams_status_code: null, + ams_submission_timestamp: "2024-05-24T19:17:09.212499+00:00", + }, + { + project_summary_authorization_guid: "80fa60e3-0c8b-48e1-aede-ed2830e8ca42", + project_summary_guid: "8b4b9781-2e59-43ef-8164-4cc3b964417a", + project_summary_permit_type: ["CLOSURE"], + project_summary_authorization_type: "OCCUPANT_CUT_LICENCE", + existing_permits_authorizations: null, + amendment_changes: null, + amendment_severity: null, + is_contaminated: null, + new_type: null, + authorization_description: null, + exemption_reason: null, + amendment_documents: [], + exemption_requested: null, + ams_tracking_number: null, + ams_outcome: null, + ams_status_code: null, + ams_submission_timestamp: "2024-05-24T19:17:09.212499+00:00", + }, ], }; diff --git a/services/core-web/src/components/mine/Projects/Project.tsx b/services/core-web/src/components/mine/Projects/Project.tsx index 2cfdda3ec5..092606011f 100644 --- a/services/core-web/src/components/mine/Projects/Project.tsx +++ b/services/core-web/src/components/mine/Projects/Project.tsx @@ -29,7 +29,7 @@ const Project: FC = () => { const [isValid, setIsValid] = useState(true); const [activeTab, setActiveTab] = useState("overview"); - const { information_requirements_table, major_mine_application } = project; + const { information_requirements_table, major_mine_application, project_summary } = project; const hasInformationRequirementsTable = Boolean(information_requirements_table?.irt_guid); const hasFinalAplication = Boolean(major_mine_application?.major_mine_application_guid); @@ -119,15 +119,16 @@ const Project: FC = () => { ), }, - isFeatureEnabled(Feature.AMS_AGENT) && { - key: "project-description", - label: "Project Description", - children: ( -
- -
- ), - }, + isFeatureEnabled(Feature.AMS_AGENT) && + project_summary?.status_code === "SUB" && { + key: "project-description", + label: "Project Description", + children: ( +
+ +
+ ), + }, { key: "information-requirements-table", label: "IRT", diff --git a/services/core-web/src/styles/components/NoticeOfDeparture.scss b/services/core-web/src/styles/components/NoticeOfDeparture.scss index 54f3eb82bc..aa0c28483e 100644 --- a/services/core-web/src/styles/components/NoticeOfDeparture.scss +++ b/services/core-web/src/styles/components/NoticeOfDeparture.scss @@ -30,7 +30,8 @@ .nod-callout>h4 { color: $medium-grey; - font-weight: 700; + font-weight: $bold; + font-size: $default-p; } .nod-callout>p { diff --git a/services/core-web/src/styles/generic/layout.scss b/services/core-web/src/styles/generic/layout.scss index f47ec51b99..631e9bb0b3 100644 --- a/services/core-web/src/styles/generic/layout.scss +++ b/services/core-web/src/styles/generic/layout.scss @@ -722,4 +722,12 @@ img.lessOpacity { li { list-style-position: outside; } +} + +.desktop-bold { + font-size: $default-p; + font-style: normal; + font-weight: $bold; + line-height: 24px; + color: #606060; } \ No newline at end of file diff --git a/services/core-web/src/styles/settings/variables.scss b/services/core-web/src/styles/settings/variables.scss index cfd54d5f16..5270a24db0 100755 --- a/services/core-web/src/styles/settings/variables.scss +++ b/services/core-web/src/styles/settings/variables.scss @@ -93,8 +93,8 @@ $default-h3: 1.5rem; //24px $mobile-h3: 1.25rem; //20px $default-h4: 1.25rem; //20px $mobile-h4: 1.125rem; //18px -$default-h5: 1.25rem; //20px -$mobile-h5: 1.125rem; //18px +$default-h5: 1.125rem; //18px +$mobile-h5: 1rem; //16px $default-h6: 0.875rem; //14px $mobile-h6: 0.75rem; //12px $default-p: 1rem; //16px diff --git a/services/minespace-web/src/components/dashboard/mine/projects/ProjectStagesTable.js b/services/minespace-web/src/components/dashboard/mine/projects/ProjectStagesTable.js index 9fb8b9be4e..1b2aa7dd4f 100644 --- a/services/minespace-web/src/components/dashboard/mine/projects/ProjectStagesTable.js +++ b/services/minespace-web/src/components/dashboard/mine/projects/ProjectStagesTable.js @@ -63,6 +63,12 @@ export class ProjectStagesTable extends Component { render: (text, record) => { let link; if (record.project_stage === "Project description") { + let buttonLabel; + if (record.stage_status === "SUB") { + buttonLabel = "View"; + } else { + buttonLabel = "Resume"; + } link = ( ); diff --git a/services/minespace-web/src/components/pages/Project/ProjectPage.tsx b/services/minespace-web/src/components/pages/Project/ProjectPage.tsx index 3a58e16104..0c9765f98b 100644 --- a/services/minespace-web/src/components/pages/Project/ProjectPage.tsx +++ b/services/minespace-web/src/components/pages/Project/ProjectPage.tsx @@ -21,6 +21,8 @@ import MajorMineApplicationEntryTab from "./MajorMineApplicationEntryTab"; import { MAJOR_MINE_APPLICATION_SUBMISSION_STATUSES } from "./MajorMineApplicationPage"; import ProjectDocumentsTab from "@mds/common/components/projects/ProjectDocumentsTab"; import ProjectDescriptionTab from "@mds/common/components/project/ProjectDescriptionTab"; +import { useFeatureFlag } from "@mds/common/providers/featureFlags/useFeatureFlag"; +import { Feature } from "@mds/common"; const tabs = [ "overview", @@ -39,6 +41,7 @@ const ProjectPage: FC = () => { projectGuid: string; }>(); const history = useHistory(); + const { isFeatureEnabled } = useFeatureFlag(); const [isLoaded, setIsLoaded] = useState(false); const [activeTab, setActiveTab] = useState(tab ?? tabs[0]); @@ -50,6 +53,7 @@ const ProjectPage: FC = () => { information_requirements_table, major_mine_application, mrc_review_required, + project_summary, } = project; const mine = useSelector((state) => getMineById(state, mine_guid)) ?? {}; const { mine_name } = mine; @@ -196,15 +200,16 @@ const ProjectPage: FC = () => { ), }, - { - label: "Project Description", - key: "project-description", - children: ( -
- -
- ), - }, + isFeatureEnabled(Feature.AMS_AGENT) && + project_summary?.status_code === "SUB" && { + label: "Project Description", + key: "project-description", + children: ( +
+ +
+ ), + }, { label: "IRT", key: "irt-entry", diff --git a/services/minespace-web/src/styles/components/NoticeOfDeparture.scss b/services/minespace-web/src/styles/components/NoticeOfDeparture.scss index 3620cf3bd4..691ac9156b 100644 --- a/services/minespace-web/src/styles/components/NoticeOfDeparture.scss +++ b/services/minespace-web/src/styles/components/NoticeOfDeparture.scss @@ -15,6 +15,7 @@ background: #FFFFFF; border-radius: 4px; color: #5E46A1; + &:hover { color: #FFFFFF; } @@ -34,12 +35,13 @@ justify-content: center; } -.nod-callout > h4 { +.nod-callout>h4 { color: $font-colour; - font-weight: 700; + font-weight: $bold; + font-size: $default-p; } -.nod-callout > p { +.nod-callout>p { font-size: 1rem; margin-bottom: 0; } \ No newline at end of file diff --git a/services/minespace-web/src/styles/components/ScrollSideMenuWrapper.scss b/services/minespace-web/src/styles/components/ScrollSideMenuWrapper.scss index bd7fcb32e1..fd3c74b365 100644 --- a/services/minespace-web/src/styles/components/ScrollSideMenuWrapper.scss +++ b/services/minespace-web/src/styles/components/ScrollSideMenuWrapper.scss @@ -96,7 +96,7 @@ .fixed-tabs-tabs { &>.ant-tabs-nav { position: fixed; - top: $layout-header-height + 123px; //ProjectDocumentsTab->headerHeight + top: $layout-header-height + 103px; //ProjectDocumentsTab->headerHeight width: calc(100vw - ($fixed-page-margin * 2)); background-color: $white; z-index: 1000; diff --git a/services/minespace-web/src/styles/elements/elements.scss b/services/minespace-web/src/styles/elements/elements.scss index a08bc72264..68633bd857 100644 --- a/services/minespace-web/src/styles/elements/elements.scss +++ b/services/minespace-web/src/styles/elements/elements.scss @@ -2,6 +2,10 @@ color: $gov-blue !important; } +.font-colour { + color: $font-colour !important; +} + a { &[disabled] { pointer-events: all; diff --git a/services/minespace-web/src/styles/generic/layout.scss b/services/minespace-web/src/styles/generic/layout.scss index 68f45f309f..26b46e3187 100644 --- a/services/minespace-web/src/styles/generic/layout.scss +++ b/services/minespace-web/src/styles/generic/layout.scss @@ -509,4 +509,12 @@ li { list-style-position: outside; } +} + +.desktop-bold { + font-size: $default-p; + font-style: normal; + font-weight: $bold; + line-height: 24px; + color: $font-colour; } \ No newline at end of file diff --git a/services/minespace-web/src/styles/overrides/antd-overrides.scss b/services/minespace-web/src/styles/overrides/antd-overrides.scss index 7ed7ab830e..f88ca17641 100644 --- a/services/minespace-web/src/styles/overrides/antd-overrides.scss +++ b/services/minespace-web/src/styles/overrides/antd-overrides.scss @@ -122,21 +122,34 @@ h1.ant-typography, .ant-typography h1 { color: $primary-color; margin-top: 0.5em; + font-size: $default-h1; + font-weight: $bold; +} + +h2.ant-typography, +.ant-typography h2 { + font-size: $default-h2; + font-weight: $bold; } h4.ant-typography, .ant-typography h4 { color: $primary-color; + font-size: $default-h4; + font-weight: $bold; } h3.ant-typography, .ant-typography h3 { color: $primary-color; + font-size: $default-h3; + font-weight: $bold; } h5.ant-typography, .ant-typography h5 { color: $font-colour; + font-size: $default-h5; } .ant-typography a { diff --git a/services/minespace-web/src/styles/settings/variables.scss b/services/minespace-web/src/styles/settings/variables.scss index 36dc509473..6f20fb7716 100755 --- a/services/minespace-web/src/styles/settings/variables.scss +++ b/services/minespace-web/src/styles/settings/variables.scss @@ -86,8 +86,8 @@ $default-h3: 1.5rem; //24px $mobile-h3: 1.25rem; //20px $default-h4: 1.25rem; //20px $mobile-h4: 1.125rem; //18px -$default-h5: 1.25rem; //20px -$mobile-h5: 1.125rem; //18px +$default-h5: 1.125rem; //18px +$mobile-h5: 1rem; //16px $default-h6: 0.875rem; //14px $mobile-h6: 0.75rem; //12px $default-p: 1rem; //16px diff --git a/services/minespace-web/src/tests/mocks/dataMocks.js b/services/minespace-web/src/tests/mocks/dataMocks.js index b6a6e2bff4..37c88298cd 100644 --- a/services/minespace-web/src/tests/mocks/dataMocks.js +++ b/services/minespace-web/src/tests/mocks/dataMocks.js @@ -1145,7 +1145,10 @@ export const PROJECT = { project_guid: "8132462392222", mine_guid: "60300a07-376c-46f1-a984-88a813f91438", proponent_project_id: "Test-ID", - project_summary: {}, + project_summary: { + project_summary_guid: "6bab1df6-e181-435a-abc0-e99466411880", + status_code: "SUB", + }, information_requirements_table: { irt_guid: "c16afb82-144c-4138-9a36-ba5c24c43d8a", requirements: [
- Type - - Authorization - - Tracking # - - Date - + N/A + + + - Status - -
- No Data Yet + + + + Submitted + +