Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MDS-6135] Major projects general UI updates #3246

Merged
merged 7 commits into from
Sep 17, 2024
Merged

[MDS-6135] Major projects general UI updates #3246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d907fde
more major projects ui updates
asinn134 Sep 13, 2024
5389534
removing commented out code
asinn134 Sep 13, 2024
880fa3a
removing extra slash
asinn134 Sep 13, 2024
c5e18ea
fix merge conflict
asinn134 Sep 13, 2024
7df340d
testing out cypress error
asinn134 Sep 13, 2024
5c54ae0
playing around with cypress error
asinn134 Sep 13, 2024
93bd875
fix for cypress error
asinn134 Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 49 additions & 48 deletions services/common/src/components/projectSummary/Declaration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,57 @@ import RenderCheckbox from "../forms/RenderCheckbox";
import PageFoldScrollWrapper from "../common/PageFoldScrollWrapper";

const terms = (
<ol>
<ol type="1" className="declaration-page-content">
<li>
In this section: “Applicant” means the applicant as identified in section 2 of this
application form;
</li>
<li>
“Authorization” means the permit, approval, operational certificate, or amended permit,
approval, operational certificate, sought pursuant to this application;
</li>
<li>
“Director” means any statutory decision maker under EMA; “EMA” means the Environmental
Management Act, S.B.C. 2003, c. 53, as amended or replaced from time to time;
</li>
<li>
“FOIPPA” means the Freedom of Information and Protection of Privacy Act, R.S.B.C. 1996, c.
165, as amended or replaced from time to time;
</li>
<li>
“Province” means His Majesty King in Right of British Columbia; “Regulatory Document” means:
</li>
<li>a) this application form,</li>
<li>
b) any document that the Applicant submits or causes to be provided submitted to the Province
or the Director in
</li>
<li>support of this application, and</li>
<li>
c) any document that the Applicant submitted or causes to be submitted to the Director or the
Province pursuant to
<ol type="a">
<li>the Authorization;</li>
<li>
any regulation made under EMA that regulates the facility described above or the discharge
of waste from
</li>
<li>that facility; or</li>
<li>
any order issued under EMA directed against the Applicant that is related to the facility
described above or
</li>
<li>the discharge of waste from that facility.</li>
</ol>
In this section:
<div style={{ paddingLeft: "15px" }}>
<div>
“Applicant” means the applicant as identified on the Applicant Information tab of this
application form;
</div>
<div>
“Authorization” means the permit, approval, operational certificate, or amended permit,
approval, operational certificate, sought pursuant to this application;
</div>
<div>“Director” means any statutory decision maker under EMA;</div>
<div>
“EMA” means the Environmental Management Act, S.B.C. 2003, c. 53, as amended or replaced
from time to time;
</div>
<div>
“FOIPPA” means the Freedom of Information and Protection of Privacy Act, R.S.B.C. 1996, c.
165, as amended or replaced from time to time;
</div>
<div>“Province” means His Majesty the King in Right of British Columbia;</div>
<div>“Regulatory Document” means:</div>
<ol type="a">
<li>this application form,</li>
<li>
any document that the Applicant submits or causes to be provided submitted to the
Director or the Province in support of this application, and
</li>
<li>
any document that the Applicant submitted or causes to be submitted to the Director or
the Province pursuant to:
</li>
<ol type="i">
<li>the Authorization;</li>
<li>
any regulation made under EMA that regulates the facility described above or the
discharge of waste from that facility; or
</li>
<li>
any order issued under EMA directed against the Applicant that is related to the
facility described above or the discharge of waste from that facility.
</li>
</ol>
</ol>
</div>
</li>
<li>
In consideration of the Province receiving this application, subject to paragraph 3, the
Applicant hereby irrevocably authorizes
</li>
<li>
the Province to publish on the B.C. government website the entirety of any Regulatory
Document.
Applicant hereby irrevocably authorizes the Province to publish on the B.C. government website
the entirety of any Regulatory Document.
</li>
<li>
Despite paragraph 2, if the Applicant clearly identifies on the face of a Regulatory Document
Expand All @@ -77,9 +78,9 @@ const terms = (
that arise from the publication of a Regulatory Document.
</li>
<li>
The Applicant certifies that the information provided in this registration form is true,
The Applicant certifies that the information provided in this application form is true,
complete and accurate, and acknowledges that the submission of insufficient information may
result in this registration being returned causing delays in the registration review process.
result in this application being returned causing delays in the application review process.
</li>
</ol>
);
Expand Down
8 changes: 4 additions & 4 deletions services/common/src/components/projectSummary/DocumentUpload.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ export const DocumentUpload: FC = () => {

<Typography.Title level={5}>Supporting Documents</Typography.Title>
<Typography.Paragraph>
Upload any supporting document and draft of{" "}
Please upload any supporting documents such as a draft of the{" "}
<LinkButton
disabled={isDocumentFieldDisabled(systemFlag, status_code)}
onClick={() =>
Expand All @@ -248,9 +248,9 @@ export const DocumentUpload: FC = () => {
}
>
Information Requirements Table (IRT)
</LinkButton>{" "}
following the official template here. It is required to upload your final IRT in the form
provided to proceed to the final application.
</LinkButton>
. To proceed to the final application, you must upload your final Joint Application IRT
using the form provided in the next phase.
</Typography.Paragraph>
{!isDocumentFieldDisabled(systemFlag, status_code) && (
<Field
Expand Down
50 changes: 29 additions & 21 deletions services/common/src/components/projectSummary/ProjectContacts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import React, { FC, useEffect } from "react";
import { useSelector, useDispatch } from "react-redux";
import { isNil } from "lodash";
import { Typography, Button, Row, Col, Popconfirm } from "antd";
import DeleteOutlined from "@ant-design/icons/DeleteOutlined";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faTrashAlt } from "@fortawesome/pro-light-svg-icons";
import PlusOutlined from "@ant-design/icons/PlusOutlined";
import { Field, FieldArray, arrayPush, getFormValues, change } from "redux-form";
import {
Expand Down Expand Up @@ -58,26 +59,33 @@ const RenderContacts = ({ fields, isDisabled }) => {
</>
) : (
<>
<Row gutter={16}>
<Col span={10}>
<Typography.Title level={5}>
Additional project contact #{index}
</Typography.Title>
</Col>
<Col span={12}>
<Popconfirm
placement="topLeft"
title="Are you sure you want to remove this contact?"
onConfirm={() => fields.remove(index)}
okText="Remove"
cancelText="Cancel"
>
<Button disabled={isDisabled} type="primary" size="small" ghost>
<DeleteOutlined className="padding-sm--left icon-sm" />
</Button>
</Popconfirm>
</Col>
</Row>
<Col span={24}>
<Row gutter={16}>
<Col>
<Typography.Title level={5}>
Additional project contact #{index}
</Typography.Title>
</Col>
<Col>
<Popconfirm
placement="topLeft"
title="Are you sure you want to remove this contact?"
onConfirm={() => fields.remove(index)}
okText="Remove"
cancelText="Cancel"
>
<Button
style={{ marginTop: 0 }}
className="fa-icon-container btn-sm-padding"
icon={<FontAwesomeIcon icon={faTrashAlt} />}
type="default"
>
Delete
</Button>
</Popconfirm>
</Col>
</Row>
</Col>
</>
)}
<Row gutter={16}>
Expand Down
20 changes: 4 additions & 16 deletions services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const ProjectSubmissionStatusPage = () => {

const renderContent = () => {
let content = (
<div style={{ textAlign: "center" }}>
<div className="status-page-content">
<>
<Row>
<Col span={24}>
Expand All @@ -35,21 +35,9 @@ export const ProjectSubmissionStatusPage = () => {
<Typography.Title level={4}>
Thank you, your application has been submitted successfully!
</Typography.Title>
You can track the submission status in Project Description Overview.
</Typography.Paragraph>
<Typography.Paragraph>
If your application requires{" "}
<a
href="https://www2.gov.bc.ca/gov/content/industry/mineral-exploration-mining/permitting/coordinated-authorizations"
target="_blank"
rel="noopener noreferrer"
>
Information Requirements Table (IRT)
</a>
,
</Typography.Paragraph>
<Typography.Paragraph>
download{" "}
Your submission tracking number and status are available in the Project Description
Overview. If your application requires an Information Requirements Table(IRT), please
download the{" "}
<LinkButton
onClick={() =>
downloadIRTTemplate(
Expand Down
106 changes: 57 additions & 49 deletions services/common/src/components/projectSummary/__snapshots__/Declaration.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,58 +123,66 @@ exports[`Declaration renders properly 1`] = `
id="terms-and-conditions"
style="max-height: 728px; overflow-y: scroll; min-height: 100px;"
>
<ol>
<li>
In this section: “Applicant” means the applicant as identified in section 2 of this application form;
</li>
<li>
“Authorization” means the permit, approval, operational certificate, or amended permit, approval, operational certificate, sought pursuant to this application;
</li>
<li>
“Director” means any statutory decision maker under EMA; “EMA” means the Environmental Management Act, S.B.C. 2003, c. 53, as amended or replaced from time to time;
</li>
<li>
“FOIPPA” means the Freedom of Information and Protection of Privacy Act, R.S.B.C. 1996, c. 165, as amended or replaced from time to time;
</li>
<li>
“Province” means His Majesty King in Right of British Columbia; “Regulatory Document” means:
</li>
<li>
a) this application form,
</li>
<li>
b) any document that the Applicant submits or causes to be provided submitted to the Province or the Director in
</li>
<li>
support of this application, and
</li>
<ol
class="declaration-page-content"
type="1"
>
<li>
c) any document that the Applicant submitted or causes to be submitted to the Director or the Province pursuant to
<ol
type="a"
In this section:
<div
style="padding-left: 15px;"
>
<li>
the Authorization;
</li>
<li>
any regulation made under EMA that regulates the facility described above or the discharge of waste from
</li>
<li>
that facility; or
</li>
<li>
any order issued under EMA directed against the Applicant that is related to the facility described above or
</li>
<li>
the discharge of waste from that facility.
</li>
</ol>
</li>
<li>
In consideration of the Province receiving this application, subject to paragraph 3, the Applicant hereby irrevocably authorizes
<div>
“Applicant” means the applicant as identified on the Applicant Information tab of this application form;
</div>
<div>
“Authorization” means the permit, approval, operational certificate, or amended permit, approval, operational certificate, sought pursuant to this application;
</div>
<div>
“Director” means any statutory decision maker under EMA;
</div>
<div>
“EMA” means the Environmental Management Act, S.B.C. 2003, c. 53, as amended or replaced from time to time;
</div>
<div>
“FOIPPA” means the Freedom of Information and Protection of Privacy Act, R.S.B.C. 1996, c. 165, as amended or replaced from time to time;
</div>
<div>
“Province” means His Majesty the King in Right of British Columbia;
</div>
<div>
“Regulatory Document” means:
</div>
<ol
type="a"
>
<li>
this application form,
</li>
<li>
any document that the Applicant submits or causes to be provided submitted to the Director or the Province in support of this application, and
</li>
<li>
any document that the Applicant submitted or causes to be submitted to the Director or the Province pursuant to:
</li>
<ol
type="i"
>
<li>
the Authorization;
</li>
<li>
any regulation made under EMA that regulates the facility described above or the discharge of waste from that facility; or
</li>
<li>
any order issued under EMA directed against the Applicant that is related to the facility described above or the discharge of waste from that facility.
</li>
</ol>
</ol>
</div>
</li>
<li>
the Province to publish on the B.C. government website the entirety of any Regulatory Document.
In consideration of the Province receiving this application, subject to paragraph 3, the Applicant hereby irrevocably authorizes the Province to publish on the B.C. government website the entirety of any Regulatory Document.
</li>
<li>
Despite paragraph 2, if the Applicant clearly identifies on the face of a Regulatory Document that the Regulatory Document, or clearly identified portions of it, are confidential and provides in writing with the document a rationale for why the document or portion thereof could not be disclosed under FOIPPA, the Applicant does not consent to the Province publishing the document or any portion of it if, in the opinion of the Director, the document or portion could not be disclosed under FOIPPA, if it were subject to a request under section 5 of FOIPPA.
Expand All @@ -183,7 +191,7 @@ exports[`Declaration renders properly 1`] = `
In consideration of the Province receiving this application, the Applicant agrees that it will indemnify and save harmless the Province and the Province’s employees and agents from any claim for infringement of copyright or other intellectual property rights that the Province or any of the Province’s employees or agents may sustain, incur, suffer or be put to at any time that arise from the publication of a Regulatory Document.
</li>
<li>
The Applicant certifies that the information provided in this registration form is true, complete and accurate, and acknowledges that the submission of insufficient information may result in this registration being returned causing delays in the registration review process.
The Applicant certifies that the information provided in this application form is true, complete and accurate, and acknowledges that the submission of insufficient information may result in this application being returned causing delays in the application review process.
</li>
</ol>
</div>
Expand Down
5 changes: 2 additions & 3 deletions services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,16 +283,15 @@ exports[`DocumentUpload renders properly 1`] = `
<div
class="ant-typography"
>
Upload any supporting document and draft of
Please upload any supporting documents such as a draft of the

<a
role="link"
tabindex="0"
>
Information Requirements Table (IRT)
</a>

following the official template here. It is required to upload your final IRT in the form provided to proceed to the final application.
. To proceed to the final application, you must upload your final Joint Application IRT using the form provided in the next phase.
</div>
<div
class="whirlpool-container"
Expand Down
Loading
Loading