Skip to content

Commit 05fa9b4

Browse files
authored
[MDS-6290]updated project description text (#3727)
* updated project description text * fix for cypress test
1 parent 082be91 commit 05fa9b4

File tree

18 files changed

+73
-45
lines changed

18 files changed

+73
-45
lines changed

services/common/src/components/common/ActionMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import DownOutlined from "@ant-design/icons/DownOutlined";
55
import EllipsisOutlined from "@ant-design/icons/EllipsisOutlined";
66
import { ITableAction } from "@mds/common/components/common/CoreTableCommonColumns";
77

8-
export const deleteConfirmWrapper = (recordDescription: string, onOk: () => void, plural = false) => {
8+
export const deleteConfirmWrapper = (recordDescription: string, onOk: () => void, plural = false, okText = "Delete") => {
99
const title = `Confirm Deletion`;
1010
const article = plural ? "these" : "this"
1111
const content = `Are you sure you want to delete ${article} ${recordDescription}?`;
1212
const modalContent = {
1313
title,
1414
content,
1515
onOk,
16-
okText: "Delete",
16+
okText: okText,
1717
};
1818
return Modal.confirm(modalContent);
1919
};

services/common/src/components/projectSummary/Applicant.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ const Applicant: FC<ProjectSummaryFormComponentProps> = ({ fieldsDisabled }) =>
283283
customOptions={[
284284
{ label: "Company", value: "ORG" },
285285
{
286-
label: "Individual",
286+
label: "Person",
287287
value: "PER",
288288
},
289289
]}
@@ -384,7 +384,7 @@ const Applicant: FC<ProjectSummaryFormComponentProps> = ({ fieldsDisabled }) =>
384384
<Col md={8} sm={19}>
385385
<Field
386386
name="applicant.phone_no"
387-
label="Contact Number"
387+
label="Phone Number"
388388
required
389389
component={RenderField}
390390
validate={[phoneNumber, maxLength(12), required]}

services/common/src/components/projectSummary/AuthorizationsInvolved.tsx

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import { FormContext } from "../forms/FormWrapper";
5454
import { ProjectSummaryFormComponentProps } from "./ProjectSummaryForm";
5555
import { areAuthEnvFieldsDisabled, areDocumentFieldsDisabled, isDocumentDeletionEnabled } from "../projects/projectUtils";
5656
import { removeDocumentFromProjectSummary } from "@mds/common/redux/actionCreators/projectActionCreator";
57-
import { PROJECT_SUMMARY_DOCUMENT_TYPE_CODE_STATE, ENVIRONMENTAL_MANAGMENT_ACT, WASTE_DISCHARGE_NEW_AUTHORIZATIONS_URL, WASTE_DISCHARGE_AMENDMENT_AUTHORIZATIONS_URL } from "@mds/common/constants/strings";
57+
import { PROJECT_SUMMARY_DOCUMENT_TYPE_CODE_STATE, WATER_SUSTAINABILITY_ACT, ENVIRONMENTAL_MANAGMENT_ACT, WASTE_DISCHARGE_NEW_AUTHORIZATIONS_URL, WASTE_DISCHARGE_AMENDMENT_AUTHORIZATIONS_URL } from "@mds/common/constants/strings";
5858
import { useAppDispatch } from "@mds/common/redux/rootState";
5959

6060
const RenderEMAPermitCommonSections = ({ code, isAmendment, index, isDisabled }) => {
@@ -176,7 +176,7 @@ const RenderEMAPermitCommonSections = ({ code, isAmendment, index, isDisabled })
176176
maximumCharacters={4000}
177177
minRows={2}
178178
component={RenderAutoSizeField}
179-
placeholder="e.g. To Discharge air emissions from x number of stacks at a sawmill."
179+
placeholder="To discharge air emissions from x number of stacks at a mining facility."
180180
/>
181181
<Field
182182
disabled={isDisabled}
@@ -629,11 +629,21 @@ export const AuthorizationsInvolved: FC<ProjectSummaryFormComponentProps> = ({ f
629629
{transformedProjectSummaryAuthorizationTypes.map((authorization) => {
630630
return (
631631
<div key={authorization.code} className="margin-large--bottom">
632-
<Typography.Title level={5}>{authorization.description}</Typography.Title>
632+
{(authorization.code === WATER_SUSTAINABILITY_ACT) && (<>
633+
<Typography.Title level={4}>Indicate any other required regulatory approvals.</Typography.Title>
634+
<Typography.Paragraph>
635+
Note: These related approvals are listed for <b>informational purposes only</b> and are <b>not submitted</b> through this application.
636+
However, by providing details about these applications, you help support a coordinated review process across ministries,
637+
which may positively impact review timelines and reduce delays.
638+
</Typography.Paragraph>
639+
</>)}
640+
<Typography.Title level={5}>{`${authorization.description} ${authorization.code === ENVIRONMENTAL_MANAGMENT_ACT ? "(EMA)" : ""}`}</Typography.Title>
633641
{authorization.code === ENVIRONMENTAL_MANAGMENT_ACT && (
634642
<Typography.Paragraph>
635-
For registration under the Municipal Wastewater Regulation and Hazardous Waste
636-
Regulation, please refer to the{" "}
643+
For Registration and Changes to an Existing Registration under the EMA’s Municipal Wastewater Regulation,
644+
Hazardous Waste Regulation or Petroleum Storage and
645+
Distribution Facilities Storm Water Regulation: submit an application to the Ministry of Environment and Parks
646+
according to the {" "}
637647
<Link
638648
to={{ pathname: WASTE_DISCHARGE_NEW_AUTHORIZATIONS_URL }}
639649
target="_blank"
@@ -645,7 +655,7 @@ export const AuthorizationsInvolved: FC<ProjectSummaryFormComponentProps> = ({ f
645655
to={{ pathname: WASTE_DISCHARGE_AMENDMENT_AUTHORIZATIONS_URL }}
646656
target="_blank"
647657
>
648-
authorization amendment
658+
change a waste discharge authorization
649659
</Link>{" "}
650660
guideline.
651661
</Typography.Paragraph>

services/common/src/components/projectSummary/Declaration.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ const terms = (
1919
application form;
2020
</div>
2121
<div>
22-
“Authorization” means the permit, approval, operational certificate, or amended permit,
23-
approval, operational certificate, sought pursuant to this application;
22+
“Authorization” means the permit, or approval, or amended permit, or approval, sought pursuant to this application;
2423
</div>
2524
<div>“Director” means any statutory decision maker under EMA;</div>
2625
<div>
@@ -137,7 +136,7 @@ const Declaration: FC = () => {
137136
<Typography.Text strong>Confirmation of Submission</Typography.Text>
138137
<Field
139138
name="confirmation_of_submission"
140-
label="I understand that this submission, along with any supporting files, is being submitted on behalf of the owner, agent, or mine manager. The reporter may be contacted by the Ministry for further follow-up."
139+
label="I understand that this submission, along with any supporting files, is being submitted on behalf of the owner, agent, or mine manager. The submitter, or any of the provided contacts in this submission, may be contacted by the Ministry for further follow-up."
141140
required
142141
validate={[required]}
143142
component={RenderCheckbox}

services/common/src/components/projectSummary/FacilityOperator.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const FacilityOperator: FC<ProjectSummaryFormComponentProps> = ({ fieldsD
4141
required
4242
validate={[required, maxLength(4000)]}
4343
label="Facility Type"
44-
labelSubtitle="List the proposed facility type and/or mining activity."
44+
labelSubtitle="Briefly describe the proposed facility type and/or mining activity."
4545
component={RenderField}
4646
disabled={fieldsDisabled}
4747
/>
@@ -50,7 +50,7 @@ export const FacilityOperator: FC<ProjectSummaryFormComponentProps> = ({ fieldsD
5050
required
5151
validate={[required, maxLength(4000)]}
5252
label="Facility Description"
53-
labelSubtitle="Briefly describe: Overview of the project. The primary activity of the facility. If there is not enough space, you may attach additional information, including conceptual site plans."
53+
labelSubtitle="Briefly describe the primary activity of the facility. If there is not enough space, you may attach additional information, including conceptual site plans."
5454
maximumCharacters={4000}
5555
rows={3}
5656
component={RenderAutoSizeField}
@@ -172,7 +172,7 @@ export const FacilityOperator: FC<ProjectSummaryFormComponentProps> = ({ fieldsD
172172
<Field
173173
disabled={fieldsDisabled}
174174
name="facility_operator.phone_no"
175-
label="Facility Operator Contact Number"
175+
label="Facility Operator Phone Number"
176176
required
177177
validate={[phoneNumber, maxLength(12), required]}
178178
component={RenderField}

services/common/src/components/projectSummary/PaymentContact.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export const PaymentContact = ({ isDisabled }) => {
5353
<div style={{ paddingTop: 12 }}>
5454
<Title level={4}>Contact for Payment</Title>
5555
<Paragraph>
56-
Provide contact information for the responsible person for application payments.
56+
Provide contact information for the person responsible for application payments.
5757
</Paragraph>
5858
<Row gutter={16}>
5959
<Col md={12} sm={24}>

services/common/src/components/projectSummary/ProjectContacts.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ const RenderContacts = ({ fields, isDisabled }) => {
140140
disabled={isDisabled}
141141
name={`${field}.phone_number`}
142142
id={`${field}.phone_number`}
143-
label="Contact Number"
143+
label="Phone Number"
144144
required
145145
component={RenderField}
146146
validate={[phoneNumber, maxLength(12), required]}
@@ -162,7 +162,7 @@ const RenderContacts = ({ fields, isDisabled }) => {
162162
disabled={isDisabled}
163163
name={`${field}.email`}
164164
id={`${field}.email`}
165-
label="Email"
165+
label="Email Address"
166166
required
167167
component={RenderField}
168168
validate={[required, email, maxLength(60)]}

services/common/src/components/projectSummary/ProjectLinksTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const ProjectLinksTable: React.FC<IProjectLinksTableProps> = ({
5353
label: "Remove Linked-project",
5454
icon: <FileOutlined />,
5555
clickFunction: (_event, record: ILinkedProject) => {
56-
deleteConfirmWrapper("Project Link", () => removeProjectLink(record.project_link_guid));
56+
deleteConfirmWrapper("Project Link", () => removeProjectLink(record.project_link_guid), false, "Remove Project Link");
5757
},
5858
};
5959
if (hasModifyPermission) {

services/common/src/components/projectSummary/ProjectSummaryForm.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const getProjectFormTabs = (
4343
) => {
4444
const projectFormTabs = [
4545
"basic-information",
46-
"related-projects",
46+
"link-related-projects",
4747
"purpose-and-authorization",
4848
"project-contacts",
4949
"applicant-information",
@@ -67,7 +67,7 @@ export const getProjectFormTabs = (
6767
? projectFormTabs
6868
: [
6969
"basic-information",
70-
"related-projects",
70+
"link-related-projects",
7171
"project-contacts",
7272
"project-dates",
7373
"document-upload",
@@ -117,7 +117,7 @@ export const ProjectSummaryForm: FC<ProjectSummaryFormProps> = ({
117117
"ministry-contact": <ProjectManagement />,
118118
"location-access-and-land-use": <LegalLandOwnerInformation fieldsDisabled={fieldsDisabled} />,
119119
"basic-information": <BasicInformation fieldsDisabled={fieldsDisabled} />,
120-
"related-projects": (
120+
"link-related-projects": (
121121
<ProjectLinks
122122
fieldsDisabled={fieldsDisabled}
123123
viewProject={(p) => GLOBAL_ROUTES?.EDIT_PROJECT.dynamicRoute(p.project_guid)}
@@ -146,7 +146,7 @@ export const ProjectSummaryForm: FC<ProjectSummaryFormProps> = ({
146146
forceRedux
147147
>
148148
{projectFormTabs
149-
.filter((tab) => majorProjectsFeatureEnabled || tab !== "related-projects")
149+
.filter((tab) => majorProjectsFeatureEnabled || tab !== "link-related-projects")
150150
.map((tab) => (
151151
<Step key={tab}>{renderTabComponent(tab)}</Step>
152152
))}

services/common/src/components/projectSummary/__snapshots__/Applicant.spec.tsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ exports[`Applicant Component should render the component with expected fields 1`
8989
/>
9090
</span>
9191
<span>
92-
Individual
92+
Person
9393
</span>
9494
</label>
9595
</div>
@@ -381,7 +381,7 @@ exports[`Applicant Component should render the component with expected fields 1`
381381
<div
382382
style="width: 100%;"
383383
>
384-
Contact Number
384+
Phone Number
385385
</div>
386386
</label>
387387
</div>
@@ -2212,7 +2212,7 @@ exports[`Applicant Component should render the component with expected fields 1`
22122212
<div
22132213
class="ant-typography"
22142214
>
2215-
Provide contact information for the responsible person for application payments.
2215+
Provide contact information for the person responsible for application payments.
22162216
</div>
22172217
<div
22182218
class="ant-row"

0 commit comments

Comments
 (0)