From cb4e5e5eaa758207259ca33a3b86e3940b16fca3 Mon Sep 17 00:00:00 2001
From: Simen Fivelstad Smaaberg
 <66635118+simensma-fresh@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:16:51 +0000
Subject: [PATCH 1/3] MDS-6260 Added report type field to FE

---
 services/common/src/constants/strings.tsx     |  1 +
 .../mineReportPermitRequirements.interface.ts |  2 ++
 .../reports/ReportPermitRequirementForm.tsx   | 35 +++++++++++--------
 .../mine/Permit/PermitConditions.tsx          |  2 +-
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/services/common/src/constants/strings.tsx b/services/common/src/constants/strings.tsx
index a950affaa9..7417157392 100755
--- a/services/common/src/constants/strings.tsx
+++ b/services/common/src/constants/strings.tsx
@@ -491,5 +491,6 @@ export const REPORT_FREQUENCY_HASH = {
   "Semi-Annually": 6,
   "Annually": 12,
   "Bi-Annually": 24,
+  "Every 5 Years": 60,
   "Not Specified": 0,
 };
diff --git a/services/common/src/interfaces/permits/mineReportPermitRequirements.interface.ts b/services/common/src/interfaces/permits/mineReportPermitRequirements.interface.ts
index 8f0656ad18..e405a5509b 100644
--- a/services/common/src/interfaces/permits/mineReportPermitRequirements.interface.ts
+++ b/services/common/src/interfaces/permits/mineReportPermitRequirements.interface.ts
@@ -1,7 +1,9 @@
 export interface IMineReportPermitRequirement {
+  report_name: string;
   mine_report_permit_requirement_id: number;
   cim_or_cpo: string;
   ministry_recipient: string[];
   permit_condition_id: number;
   due_date_period_months: number;
+  initial_due_date: Date;
 }
diff --git a/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx b/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx
index 9c41112ac7..b2f778071e 100644
--- a/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx
+++ b/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx
@@ -24,6 +24,7 @@ import RenderGroupCheckbox, {
 } from "@mds/common/components/forms/RenderGroupCheckbox";
 import { getLatestAmendmentByPermitGuid } from "@mds/common/redux/selectors/permitSelectors";
 import RenderRadioButtons from "@mds/common/components/forms/RenderRadioButtons";
+import { maxLength } from "@common/utils/Validate";
 
 interface ReportPermitRequirementProps {
   onSubmit: (values: Partial<IMineReport>) => void | Promise<void>;
@@ -54,19 +55,19 @@ export const ReportPermitRequirementForm: FC<ReportPermitRequirementProps> = ({
         initialValues={
           mineReportPermitRequirement
             ? {
-                ...mineReportPermitRequirement,
-                stepPath: condition.stepPath,
-                permit_amendment_id: latestPermitAmendment.permit_amendment_id,
-              }
+              ...mineReportPermitRequirement,
+              stepPath: condition.stepPath,
+              permit_amendment_id: latestPermitAmendment.permit_amendment_id,
+            }
             : {
-                mine_report_status_code: MINE_REPORT_SUBMISSION_CODES.NON,
-                stepPath: condition.stepPath,
-                permit_condition_category_code: condition.condition_category_code,
-                permit_condition_type_code: REPORT_TYPE_CODES.PRR,
-                permit_condition_id: condition.permit_condition_id,
-                permit_guid: permitGuid,
-                permit_amendment_id: latestPermitAmendment.permit_amendment_id,
-              }
+              mine_report_status_code: MINE_REPORT_SUBMISSION_CODES.NON,
+              stepPath: condition.stepPath,
+              permit_condition_category_code: condition.condition_category_code,
+              permit_condition_type_code: REPORT_TYPE_CODES.PRR,
+              permit_condition_id: condition.permit_condition_id,
+              permit_guid: permitGuid,
+              permit_amendment_id: latestPermitAmendment.permit_amendment_id,
+            }
         }
       >
         <Row gutter={[16, 16]}>
@@ -80,6 +81,14 @@ export const ReportPermitRequirementForm: FC<ReportPermitRequirementProps> = ({
               disabled
             />
           </Col>
+          <Col span={24}>
+            <Field
+              name="report_name"
+              label="Report Type"
+              validate={[maxLength(255)]}
+              component={RenderField}
+            />
+          </Col>
           <Col span={12}>
             <Field
               name="due_date_period_months"
@@ -100,8 +109,6 @@ export const ReportPermitRequirementForm: FC<ReportPermitRequirementProps> = ({
               name="initial_due_date"
               label="Initial Due Date"
               placeholder="Select date"
-              required
-              validate={[required]}
               formatViewDate
               component={RenderDate}
             />
diff --git a/services/core-web/src/components/mine/Permit/PermitConditions.tsx b/services/core-web/src/components/mine/Permit/PermitConditions.tsx
index 1bf3a30b5e..20d9de122e 100644
--- a/services/core-web/src/components/mine/Permit/PermitConditions.tsx
+++ b/services/core-web/src/components/mine/Permit/PermitConditions.tsx
@@ -339,7 +339,7 @@ const PermitConditions: FC<PermitConditionProps> = ({
                               <Collapse.Panel
                                 key={cond.permit_condition_id}
                                 header={
-                                  <Typography.Text strong>Report #{index + 1}</Typography.Text>
+                                  <Typography.Text strong>Report #{index + 1}{cond.mineReportPermitRequirement?.report_name ? ` - ${cond.mineReportPermitRequirement.report_name}` : ''}</Typography.Text>
                                 }
                                 className="report-collapse"
                               >

From acfe21dcae31fdceabaf299a8456bfaa524c0f1a Mon Sep 17 00:00:00 2001
From: Simen Fivelstad Smaaberg
 <66635118+simensma-fresh@users.noreply.github.com>
Date: Thu, 12 Dec 2024 18:24:35 +0000
Subject: [PATCH 2/3] updated report permit requirement form spec

---
 .../ReportPermitRequirementForm.spec.tsx.snap | 77 +++++++++++++++++--
 1 file changed, 72 insertions(+), 5 deletions(-)

diff --git a/services/core-web/src/tests/components/Forms/reports/__snapshots__/ReportPermitRequirementForm.spec.tsx.snap b/services/core-web/src/tests/components/Forms/reports/__snapshots__/ReportPermitRequirementForm.spec.tsx.snap
index 08861c4da0..7cb3885376 100644
--- a/services/core-web/src/tests/components/Forms/reports/__snapshots__/ReportPermitRequirementForm.spec.tsx.snap
+++ b/services/core-web/src/tests/components/Forms/reports/__snapshots__/ReportPermitRequirementForm.spec.tsx.snap
@@ -73,6 +73,70 @@ exports[`RequestReportForm renders form properly 1`] = `
           </div>
         </div>
       </div>
+      <div
+        class="ant-col ant-col-24"
+        style="padding: 8px 8px 8px 8px;"
+      >
+        <div
+          class="ant-form-item ant-form-item-with-help"
+        >
+          <div
+            class="ant-row ant-form-item-row"
+          >
+            <div
+              class="ant-col ant-form-item-label"
+            >
+              <label
+                class=""
+                for="ADD_REPORT_TO_PERMIT_CONDITION-1639_report_name"
+                title=""
+              >
+                <div>
+                  Report Type
+                   
+                  <span
+                    class="form-item-optional"
+                  >
+                     (optional)
+                  </span>
+                </div>
+              </label>
+            </div>
+            <div
+              class="ant-col ant-form-item-control"
+            >
+              <div
+                class="ant-form-item-control-input"
+              >
+                <div
+                  class="ant-form-item-control-input-content"
+                >
+                  <input
+                    aria-label="report_name"
+                    class="ant-input"
+                    name="report_name"
+                    type="text"
+                    value=""
+                  />
+                </div>
+              </div>
+              <div
+                style="display: flex; flex-wrap: nowrap;"
+              >
+                <div
+                  class="ant-form-item-explain ant-form-item-explain-connected"
+                  id="ADD_REPORT_TO_PERMIT_CONDITION-1639_report_name_help"
+                  role="alert"
+                >
+                  <div
+                    class=""
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
       <div
         class="ant-col ant-col-12"
         style="padding: 8px 8px 8px 8px;"
@@ -199,14 +263,18 @@ exports[`RequestReportForm renders form properly 1`] = `
               class="ant-col ant-form-item-label"
             >
               <label
-                class="ant-form-item-required"
+                class=""
                 for="ADD_REPORT_TO_PERMIT_CONDITION-1639_initial_due_date"
                 title=""
               >
-                <div
-                  style="width: 100%;"
-                >
+                <div>
                   Initial Due Date
+                   
+                  <span
+                    class="form-item-optional"
+                  >
+                     (optional)
+                  </span>
                 </div>
               </label>
             </div>
@@ -226,7 +294,6 @@ exports[`RequestReportForm renders form properly 1`] = `
                       class="ant-picker-input"
                     >
                       <input
-                        aria-required="true"
                         autocomplete="off"
                         id="ADD_REPORT_TO_PERMIT_CONDITION-1639_initial_due_date"
                         name="initial_due_date"

From eea33d85ae493e200e177c7fad7cd8a4744bf577 Mon Sep 17 00:00:00 2001
From: Simen Fivelstad Smaaberg
 <66635118+simensma-fresh@users.noreply.github.com>
Date: Thu, 12 Dec 2024 21:55:34 +0000
Subject: [PATCH 3/3] MDS-6260 Updated import validation

---
 .../components/Forms/reports/ReportPermitRequirementForm.tsx   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx b/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx
index b2f778071e..d5699c1ade 100644
--- a/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx
+++ b/services/core-web/src/components/Forms/reports/ReportPermitRequirementForm.tsx
@@ -13,7 +13,7 @@ import {
   REPORT_REGULATORY_AUTHORITY_CODES_HASH,
   REPORT_TYPE_CODES,
 } from "@mds/common";
-import { required, requiredRadioButton } from "@mds/common/redux/utils/Validate";
+import { required, requiredRadioButton, maxLength } from "@mds/common/redux/utils/Validate";
 import FormWrapper from "@mds/common/components/forms/FormWrapper";
 import RenderSelect from "@mds/common/components/forms/RenderSelect";
 import RenderDate from "@mds/common/components/forms/RenderDate";
@@ -24,7 +24,6 @@ import RenderGroupCheckbox, {
 } from "@mds/common/components/forms/RenderGroupCheckbox";
 import { getLatestAmendmentByPermitGuid } from "@mds/common/redux/selectors/permitSelectors";
 import RenderRadioButtons from "@mds/common/components/forms/RenderRadioButtons";
-import { maxLength } from "@common/utils/Validate";
 
 interface ReportPermitRequirementProps {
   onSubmit: (values: Partial<IMineReport>) => void | Promise<void>;