From d907fdec57841747ee2df6e95b86fd060be4806b Mon Sep 17 00:00:00 2001 From: Sinn Date: Fri, 13 Sep 2024 10:27:48 -0700 Subject: [PATCH 1/6] more major projects ui updates --- .../components/projectSummary/Declaration.tsx | 97 ++++++++-------- .../projectSummary/DocumentUpload.tsx | 8 +- .../projectSummary/ProjectContacts.tsx | 50 +++++---- .../ProjectSubmissionStatusPage.tsx | 25 +++-- .../__snapshots__/Declaration.spec.tsx.snap | 106 ++++++++++-------- .../DocumentUpload.spec.tsx.snap | 5 +- .../ProjectSubmissionStatusPage.spec.tsx.snap | 23 +--- .../components/MajorMineApplication.scss | 9 ++ .../ProjectSubmissionStatusPage.scss | 6 + services/core-web/src/styles/index.scss | 1 + .../components/MajorMineApplication.scss | 14 +++ 11 files changed, 192 insertions(+), 152 deletions(-) create mode 100644 services/core-web/src/styles/components/MajorMineApplication.scss diff --git a/services/common/src/components/projectSummary/Declaration.tsx b/services/common/src/components/projectSummary/Declaration.tsx index 6ec9a9e124..91b000a09f 100644 --- a/services/common/src/components/projectSummary/Declaration.tsx +++ b/services/common/src/components/projectSummary/Declaration.tsx @@ -9,56 +9,57 @@ import RenderCheckbox from "../forms/RenderCheckbox"; import PageFoldScrollWrapper from "../common/PageFoldScrollWrapper"; const terms = ( -
    +
    1. - In this section: “Applicant” means the applicant as identified in section 2 of this - application form; -
      2. -
    2. - “Authorization” means the permit, approval, operational certificate, or amended permit, - approval, operational certificate, sought pursuant to this application; -
      3. -
    3. - “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; -
      4. -
    4. - “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; -
      5. -
    5. - “Province” means His Majesty King in Right of British Columbia; “Regulatory Document” means: -
      6. -
    6. a) this application form,
      7. -
    7. - b) any document that the Applicant submits or causes to be provided submitted to the Province - or the Director in -
      8. -
    8. support of this application, and
      9. -
    9. - c) any document that the Applicant submitted or causes to be submitted to the Director or the - Province pursuant to -
        -
      1. the Authorization;
        2. -
      2. - any regulation made under EMA that regulates the facility described above or the discharge - of waste from -
        3. -
      3. that facility; or
        4. -
      4. - any order issued under EMA directed against the Applicant that is related to the facility - described above or -
        5. -
      5. the discharge of waste from that facility.
        6. -
      + In this section: +
      +
      + “Applicant” means the applicant as identified on the Applicant Information tab of this + application form; +
      +
      + “Authorization” means the permit, approval, operational certificate, or amended permit, + approval, operational certificate, sought pursuant to this application; +
      +
      “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; +
      +
      + “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; +
      +
      “Province” means His Majesty the King in Right of British Columbia;
      +
      “Regulatory Document” means:
      +
        +
      1. this application form,
        2. +
      2. + any document that the Applicant submits or causes to be provided submitted to the + Director or the Province in support of this application, and +
        3. +
      3. + any document that the Applicant submitted or causes to be submitted to the Director or + the Province pursuant to: +
        4. +
          +
        1. the Authorization;
          2. +
        2. + any regulation made under EMA that regulates the facility described above or the + discharge of waste from that facility; or +
          3. +
        3. + 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. +
          4. +
        +
      +
    10. In consideration of the Province receiving this application, subject to paragraph 3, the - Applicant hereby irrevocably authorizes -
      11. -
    11. - 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.
    12. Despite paragraph 2, if the Applicant clearly identifies on the face of a Regulatory Document @@ -77,9 +78,9 @@ const terms = ( that arise from the publication of a Regulatory Document.
    13. - 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.
    ); diff --git a/services/common/src/components/projectSummary/DocumentUpload.tsx b/services/common/src/components/projectSummary/DocumentUpload.tsx index 4842e5a3bd..bb0add1dc4 100644 --- a/services/common/src/components/projectSummary/DocumentUpload.tsx +++ b/services/common/src/components/projectSummary/DocumentUpload.tsx @@ -225,7 +225,7 @@ export const DocumentUpload: FC = () => { Supporting Documents - Upload any supporting document and draft of{" "} + Please upload any supporting documents such as a draft of the{" "} downloadIRTTemplate( @@ -234,9 +234,9 @@ export const DocumentUpload: FC = () => { } > Information Requirements Table (IRT) - {" "} - 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. { ) : ( <> - - - - Additional project contact #{index} - - - - fields.remove(index)} - okText="Remove" - cancelText="Cancel" - > - - - - + + + + + Additional project contact #{index} + + + + fields.remove(index)} + okText="Remove" + cancelText="Cancel" + > + + + + + )} diff --git a/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx b/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx index 3c8b28906e..2de7d7913c 100644 --- a/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx +++ b/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx @@ -23,7 +23,7 @@ export const ProjectSubmissionStatusPage = () => { const renderContent = () => { let content = ( -
    +
    <> @@ -35,9 +35,21 @@ export const ProjectSubmissionStatusPage = () => { Thank you, your application has been submitted successfully! - You can track the submission status in Project Description Overview. + 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{" "} + + downloadIRTTemplate( + ENVIRONMENT.apiUrl + API.INFORMATION_REQUIREMENTS_TABLE_TEMPLATE_DOWNLOAD + ) + } + > + IRT template + {" "} + for the next phase. - + {/* If your application requires{" "} { Information Requirements Table (IRT) , - - - download{" "} + */} + {/* downloadIRTTemplate( @@ -60,7 +71,7 @@ export const ProjectSubmissionStatusPage = () => { IRT template {" "} for the next phase. - + */}

    diff --git a/services/common/src/components/projectSummary/__snapshots__/Declaration.spec.tsx.snap b/services/common/src/components/projectSummary/__snapshots__/Declaration.spec.tsx.snap index 2a78faca8c..4772545d68 100644 --- a/services/common/src/components/projectSummary/__snapshots__/Declaration.spec.tsx.snap +++ b/services/common/src/components/projectSummary/__snapshots__/Declaration.spec.tsx.snap @@ -123,58 +123,66 @@ exports[`Declaration renders properly 1`] = ` id="terms-and-conditions" style="max-height: 728px; overflow-y: scroll; min-height: 100px;" > -

      -
    1. - In this section: “Applicant” means the applicant as identified in section 2 of this application form; -
      2. -
    2. - “Authorization” means the permit, approval, operational certificate, or amended permit, approval, operational certificate, sought pursuant to this application; -
      3. -
    3. - “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; -
      4. -
    4. - “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; -
      5. -
    5. - “Province” means His Majesty King in Right of British Columbia; “Regulatory Document” means: -
      6. -
    6. - a) this application form, -
      7. -
    7. - b) any document that the Applicant submits or causes to be provided submitted to the Province or the Director in -
      8. -
    8. - support of this application, and -
      9. +
      1. - c) any document that the Applicant submitted or causes to be submitted to the Director or the Province pursuant to -
          -
        1. - the Authorization; -
          2. -
        2. - any regulation made under EMA that regulates the facility described above or the discharge of waste from -
          3. -
        3. - that facility; or -
          4. -
        4. - any order issued under EMA directed against the Applicant that is related to the facility described above or -
          5. -
        5. - the discharge of waste from that facility. -
          6. -
        -
        2. -
      2. - In consideration of the Province receiving this application, subject to paragraph 3, the Applicant hereby irrevocably authorizes +
        + “Applicant” means the applicant as identified on the Applicant Information tab of this application form; +
        +
        + “Authorization” means the permit, approval, operational certificate, or amended permit, approval, operational certificate, sought pursuant to this application; +
        +
        + “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; +
        +
        + “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; +
        +
        + “Province” means His Majesty the King in Right of British Columbia; +
        +
        + “Regulatory Document” means: +
        +
          +
        1. + this application form, +
          2. +
        2. + any document that the Applicant submits or causes to be provided submitted to the Director or the Province in support of this application, and +
          3. +
        3. + any document that the Applicant submitted or causes to be submitted to the Director or the Province pursuant to: +
          4. +
            +
          1. + the Authorization; +
            2. +
          2. + any regulation made under EMA that regulates the facility described above or the discharge of waste from that facility; or +
            3. +
          3. + 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. +
            4. +
          +
        +
  1. - 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.
  2. 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. @@ -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.
  3. - 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.
diff --git a/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap b/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap index fee0d25ca2..5549bb81fe 100644 --- a/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap +++ b/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap @@ -283,7 +283,7 @@ exports[`DocumentUpload renders properly 1`] = `
- Upload any supporting document and draft of + Please upload any supporting documents such as a draft of the Information Requirements Table (IRT) + . - 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.
Thank you, your application has been submitted successfully! - You can track the submission status in Project Description Overview. -
-
- If your application requires - - - Information Requirements Table (IRT) - - , -
-
- 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 Date: Fri, 13 Sep 2024 10:36:25 -0700 Subject: [PATCH 2/6] removing commented out code --- .../ProjectSubmissionStatusPage.tsx | 23 ------------------- .../DocumentUpload.spec.tsx.snap | 4 +--- .../ProjectSubmissionStatusPage.spec.tsx.snap | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx b/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx index 2de7d7913c..46fa9ce17d 100644 --- a/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx +++ b/services/common/src/components/projectSummary/ProjectSubmissionStatusPage.tsx @@ -49,29 +49,6 @@ export const ProjectSubmissionStatusPage = () => { {" "} for the next phase. - {/* - If your application requires{" "} - - Information Requirements Table (IRT) - - , - */} - {/* - - downloadIRTTemplate( - ENVIRONMENT.apiUrl + API.INFORMATION_REQUIREMENTS_TABLE_TEMPLATE_DOWNLOAD - ) - } - > - IRT template - {" "} - for the next phase. - */}

diff --git a/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap b/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap index 5549bb81fe..aa6f275bc1 100644 --- a/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap +++ b/services/common/src/components/projectSummary/__snapshots__/DocumentUpload.spec.tsx.snap @@ -291,9 +291,7 @@ exports[`DocumentUpload renders properly 1`] = ` > Information Requirements Table (IRT) - . - - To proceed to the final application, you must upload your final Joint Application IRT using the form provided in the next phase. + . To proceed to the final application, you must upload your final Joint Application IRT using the form provided in the next phase.

Thank you, your application has been submitted successfully! - 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 + 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 Date: Fri, 13 Sep 2024 11:27:13 -0700 Subject: [PATCH 3/6] removing extra slash --- services/core-web/src/styles/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core-web/src/styles/index.scss b/services/core-web/src/styles/index.scss index 5aebe76634..2529a97544 100755 --- a/services/core-web/src/styles/index.scss +++ b/services/core-web/src/styles/index.scss @@ -63,7 +63,7 @@ @import "./components/Callout.scss"; @import "./components/CorePageHeader.scss"; @import "./components/PermitConditions.scss"; -@import "./components//MajorMineApplication.scss"; +@import "./components/MajorMineApplication.scss"; // UTILITIES - utilities and helper classes. This layer has the highest specificity. \ No newline at end of file From 7df340d0830606bfbc9a34084769cad46fd92b48 Mon Sep 17 00:00:00 2001 From: Sinn Date: Fri, 13 Sep 2024 15:53:56 -0700 Subject: [PATCH 4/6] testing out cypress error --- .../src/styles/components/MajorMineApplication.scss | 9 --------- services/core-web/src/styles/components/Permit.scss | 10 ++++++++++ services/core-web/src/styles/index.scss | 1 - 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 services/core-web/src/styles/components/MajorMineApplication.scss diff --git a/services/core-web/src/styles/components/MajorMineApplication.scss b/services/core-web/src/styles/components/MajorMineApplication.scss deleted file mode 100644 index 435cda95ba..0000000000 --- a/services/core-web/src/styles/components/MajorMineApplication.scss +++ /dev/null @@ -1,9 +0,0 @@ -.declaration-page-content { - list-style-position: outside; - padding-left: 25px; - - ol { - padding-left: 40px; - } - -} \ No newline at end of file diff --git a/services/core-web/src/styles/components/Permit.scss b/services/core-web/src/styles/components/Permit.scss index 9838a97535..fccf9dc477 100644 --- a/services/core-web/src/styles/components/Permit.scss +++ b/services/core-web/src/styles/components/Permit.scss @@ -1,4 +1,14 @@ .vertical-radio-group { display: flex; flex-direction: column; +} + +.declaration-page-content { + list-style-position: outside; + padding-left: 25px; + + ol { + padding-left: 40px; + } + } \ No newline at end of file diff --git a/services/core-web/src/styles/index.scss b/services/core-web/src/styles/index.scss index 2529a97544..b578742916 100755 --- a/services/core-web/src/styles/index.scss +++ b/services/core-web/src/styles/index.scss @@ -63,7 +63,6 @@ @import "./components/Callout.scss"; @import "./components/CorePageHeader.scss"; @import "./components/PermitConditions.scss"; -@import "./components/MajorMineApplication.scss"; // UTILITIES - utilities and helper classes. This layer has the highest specificity. \ No newline at end of file From 5c54ae02bf218f0676fad970b804210d8b8214c8 Mon Sep 17 00:00:00 2001 From: Sinn Date: Fri, 13 Sep 2024 16:13:50 -0700 Subject: [PATCH 5/6] playing around with cypress error --- .../src/styles/components/MajorMineApplication.scss | 9 +++++++++ services/core-web/src/styles/components/Permit.scss | 10 ---------- services/core-web/src/styles/index.scss | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 services/core-web/src/styles/components/MajorMineApplication.scss diff --git a/services/core-web/src/styles/components/MajorMineApplication.scss b/services/core-web/src/styles/components/MajorMineApplication.scss new file mode 100644 index 0000000000..435cda95ba --- /dev/null +++ b/services/core-web/src/styles/components/MajorMineApplication.scss @@ -0,0 +1,9 @@ +.declaration-page-content { + list-style-position: outside; + padding-left: 25px; + + ol { + padding-left: 40px; + } + +} \ No newline at end of file diff --git a/services/core-web/src/styles/components/Permit.scss b/services/core-web/src/styles/components/Permit.scss index fccf9dc477..9838a97535 100644 --- a/services/core-web/src/styles/components/Permit.scss +++ b/services/core-web/src/styles/components/Permit.scss @@ -1,14 +1,4 @@ .vertical-radio-group { display: flex; flex-direction: column; -} - -.declaration-page-content { - list-style-position: outside; - padding-left: 25px; - - ol { - padding-left: 40px; - } - } \ No newline at end of file diff --git a/services/core-web/src/styles/index.scss b/services/core-web/src/styles/index.scss index b578742916..b7703b0965 100755 --- a/services/core-web/src/styles/index.scss +++ b/services/core-web/src/styles/index.scss @@ -63,6 +63,6 @@ @import "./components/Callout.scss"; @import "./components/CorePageHeader.scss"; @import "./components/PermitConditions.scss"; - +@import "./components/MajorMineApplication.scss"; // UTILITIES - utilities and helper classes. This layer has the highest specificity. \ No newline at end of file From 93bd875923e1d29ca1eb187cd08f90a032718b7f Mon Sep 17 00:00:00 2001 From: Sinn Date: Fri, 13 Sep 2024 16:28:16 -0700 Subject: [PATCH 6/6] fix for cypress error --- .../src/styles/components/MajorMineApplication.scss | 9 --------- services/core-web/src/styles/generic/layout.scss | 9 +++++++++ services/core-web/src/styles/index.scss | 1 - 3 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 services/core-web/src/styles/components/MajorMineApplication.scss diff --git a/services/core-web/src/styles/components/MajorMineApplication.scss b/services/core-web/src/styles/components/MajorMineApplication.scss deleted file mode 100644 index 435cda95ba..0000000000 --- a/services/core-web/src/styles/components/MajorMineApplication.scss +++ /dev/null @@ -1,9 +0,0 @@ -.declaration-page-content { - list-style-position: outside; - padding-left: 25px; - - ol { - padding-left: 40px; - } - -} \ No newline at end of file diff --git a/services/core-web/src/styles/generic/layout.scss b/services/core-web/src/styles/generic/layout.scss index 631e9bb0b3..d127a6106a 100644 --- a/services/core-web/src/styles/generic/layout.scss +++ b/services/core-web/src/styles/generic/layout.scss @@ -730,4 +730,13 @@ img.lessOpacity { font-weight: $bold; line-height: 24px; color: #606060; +} + +.declaration-page-content { + list-style-position: outside; + padding-left: 25px; + + ol { + padding-left: 40px; + } } \ No newline at end of file diff --git a/services/core-web/src/styles/index.scss b/services/core-web/src/styles/index.scss index b7703b0965..5bfb6d7fc2 100755 --- a/services/core-web/src/styles/index.scss +++ b/services/core-web/src/styles/index.scss @@ -63,6 +63,5 @@ @import "./components/Callout.scss"; @import "./components/CorePageHeader.scss"; @import "./components/PermitConditions.scss"; -@import "./components/MajorMineApplication.scss"; // UTILITIES - utilities and helper classes. This layer has the highest specificity. \ No newline at end of file