From 1f521040ebddfff8ec565611ef9423431670b69a Mon Sep 17 00:00:00 2001
From: Jason Syrotuck <jasyrotuck@gmail.com>
Date: Tue, 5 Mar 2024 11:47:09 -0800
Subject: [PATCH 1/5] [MDS-5562] Credential Revocation Notification (#2982)

* add party_guid to url, untested revoke endpoint

need to setup a local environemnt

* more endpoint consistency

* marshal list response

* successful manual test

* fix swagger, document manual testing steps

* instructions

* remove check that is causing test failure.

* wrong bool, should both be true

* log resp
---
 services/core-api/app/api/services/traction_service.py          | 2 +-
 .../resources/verifiable_credential_revocation.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core-api/app/api/services/traction_service.py b/services/core-api/app/api/services/traction_service.py
index 98d0597fdd..c89391c1ee 100644
--- a/services/core-api/app/api/services/traction_service.py
+++ b/services/core-api/app/api/services/traction_service.py
@@ -94,7 +94,7 @@ def revoke_credential(self,connection_id, rev_reg_id, cred_rev_id, comment):
             "rev_reg_id":rev_reg_id,
             "cred_rev_id":cred_rev_id,
             "notify": True,
-            "publish": False
+            "publish": True
         }
         revoke_resp = requests.post(revoke_credential_url, json=payload,headers=self.get_headers())
         assert revoke_resp.status_code == 200, f"revoke_resp={revoke_resp.json()}"
diff --git a/services/core-api/app/api/verifiable_credentials/resources/verifiable_credential_revocation.py b/services/core-api/app/api/verifiable_credentials/resources/verifiable_credential_revocation.py
index 7c6790db40..1dc7f15fed 100644
--- a/services/core-api/app/api/verifiable_credentials/resources/verifiable_credential_revocation.py
+++ b/services/core-api/app/api/verifiable_credentials/resources/verifiable_credential_revocation.py
@@ -52,5 +52,5 @@ def post(self, party_guid: str):
 
         traction_svc = TractionService()
         revoke_resp = traction_svc.revoke_credential(party.active_digital_wallet_connection.connection_id,credential_exchange.rev_reg_id, credential_exchange.cred_rev_id, data["comment"])
-        
+        current_app.logger.info(f"traction revocation response={revoke_resp}")
         return revoke_resp
\ No newline at end of file

From 0e59bf73bdbb0ed918b19620f389c948edcb5190 Mon Sep 17 00:00:00 2001
From: Isuru Gunawardana <118843449+isuru-aot@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:57:20 -0800
Subject: [PATCH 2/5] [MDS-5759] Fixing permit letter and permit tag - ESUP
 (#2985)

updating the category map
---
 services/common/src/constants/strings.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/common/src/constants/strings.tsx b/services/common/src/constants/strings.tsx
index 503c32752f..355dd28e48 100755
--- a/services/common/src/constants/strings.tsx
+++ b/services/common/src/constants/strings.tsx
@@ -353,8 +353,8 @@ export const PARTY_APPOINTMENT_STATUS = {
 };
 
 export const ESUP_DOCUMENT_GENERATED_TYPES = {
-  LET: "Explosives Storage and Use Permit",
-  PER: "Permit Enclosed Letter",
+  PER: "Explosives Storage and Use Permit",
+  LET: "Permit Enclosed Letter",
 };
 
 export const BC_TIMEZONE_NAMES = ["Canada/Pacific", "Canada/Mountain", "Canada/Yukon"];

From b04f80c6b910f974bbb2a02ab58a9bc828bba933 Mon Sep 17 00:00:00 2001
From: Tara Epp <102187683+taraepp@users.noreply.github.com>
Date: Tue, 5 Mar 2024 13:59:38 -0600
Subject: [PATCH 3/5] [MDS-5760] ESUP table "Explosives" link opens
 "Detonators" modal (#2986)

tell it to open the explosives modal instead of the detonators
---
 .../mine/ExplosivesPermit/MineExplosivesPermitTable.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core-web/src/components/mine/ExplosivesPermit/MineExplosivesPermitTable.tsx b/services/core-web/src/components/mine/ExplosivesPermit/MineExplosivesPermitTable.tsx
index 648ff71435..5b39d501e4 100644
--- a/services/core-web/src/components/mine/ExplosivesPermit/MineExplosivesPermitTable.tsx
+++ b/services/core-web/src/components/mine/ExplosivesPermit/MineExplosivesPermitTable.tsx
@@ -480,7 +480,7 @@ const MineExplosivesPermitTable: FC<RouteComponentProps & MineExplosivesPermitTa
         render: (text, record) => (
           <div
             className="underline"
-            onClick={(event) => handleOpenViewMagazineModal(event, record, "DET")}
+            onClick={(event) => handleOpenViewMagazineModal(event, record, "EXP")}
           >
             {text || "0"} kg
           </div>

From 7b56b87927095d8cca1dc30ac57bbfbefe1af22b Mon Sep 17 00:00:00 2001
From: Tara Epp <102187683+taraepp@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:19:01 -0600
Subject: [PATCH 4/5] [MDS-5819] Unhandled Requested Report (#2983)

* load mine report when it has no submissions on report details form. Submit against it, show status on tables

* update data mocks to match data

* add in button to allow MS user to submit against requested report

* on FE make Sonar happy, on BE make mine report status null coalesce to report requested (stole method from model mine.py @work_status.expression)

* add BE test for GET && POST requested report

* removing case where we were checking for equality then inequality of the same field
---
 ..._status_to_mine_report_submission_code.sql |  4 ++
 .../components/reports/ReportDetailsForm.tsx  | 30 ++++++-----
 .../reports/reportSubmissionSlice.ts          |  2 +-
 services/common/src/constants/enums.ts        |  1 +
 services/common/src/constants/strings.tsx     |  1 +
 .../reports/mineReport.interface.ts           |  2 +-
 .../api/mines/reports/models/mine_report.py   | 13 +++--
 .../mine_report_submission_resource.py        | 51 ++++++++++++++++--
 .../core-api/app/api/mines/response_models.py |  1 +
 .../test_mine_report_submissions_resource.py  | 52 ++++++++++++++++---
 .../reportsHomePage/ReportsHomePage.js        |  6 +--
 .../mine/Reports/MineReportInfo.tsx           |  8 +--
 .../mine/Reports/MineReportTable.js           | 18 +++----
 services/core-web/src/constants/theme.js      | 10 ++--
 .../core-web/src/tests/mocks/dataMocks.tsx    |  3 ++
 .../dashboard/mine/reports/ReportPage.tsx     |  7 +++
 .../dashboard/mine/reports/ReportsTable.tsx   | 17 ++----
 17 files changed, 153 insertions(+), 73 deletions(-)
 create mode 100644 migrations/sql/V2024.03.01.3.24__add_requested_status_to_mine_report_submission_code.sql

diff --git a/migrations/sql/V2024.03.01.3.24__add_requested_status_to_mine_report_submission_code.sql b/migrations/sql/V2024.03.01.3.24__add_requested_status_to_mine_report_submission_code.sql
new file mode 100644
index 0000000000..e42887e0a9
--- /dev/null
+++ b/migrations/sql/V2024.03.01.3.24__add_requested_status_to_mine_report_submission_code.sql
@@ -0,0 +1,4 @@
+INSERT INTO mine_report_submission_status_code
+(mine_report_submission_status_code, description, display_order, active_ind, create_user, update_user)
+VALUES
+    ('NON', 'Report Requested', 1, TRUE, 'system-mds', 'system-mds');
\ No newline at end of file
diff --git a/services/common/src/components/reports/ReportDetailsForm.tsx b/services/common/src/components/reports/ReportDetailsForm.tsx
index 7ad6ac0554..61800beb29 100644
--- a/services/common/src/components/reports/ReportDetailsForm.tsx
+++ b/services/common/src/components/reports/ReportDetailsForm.tsx
@@ -40,6 +40,7 @@ import {
   REPORT_REGULATORY_AUTHORITY_ENUM,
   IMine,
   IEmliContact,
+  MINE_REPORT_SUBMISSION_CODES,
 } from "../..";
 import RenderAutoSizeField from "../forms/RenderAutoSizeField";
 import { BaseViewInput } from "../forms/BaseInput";
@@ -67,8 +68,8 @@ import { fetchEMLIContactsByRegion } from "@mds/common/redux/actionCreators/mine
 import { getEMLIContactsByRegion } from "@mds/common/redux/selectors/minespaceSelector";
 import { useParams } from "react-router-dom";
 
-const RenderContacts: FC<any> = ({ fields, isEditMode, mineSpaceEdit }) => {
-  const canEdit = isEditMode && !mineSpaceEdit;
+const RenderContacts: FC<any> = ({ fields, isEditMode, mineSpaceEdit, hasSubmissions }) => {
+  const canEdit = isEditMode && (!mineSpaceEdit || !hasSubmissions);
   return (
     <div>
       {fields.map((contact, index) => (
@@ -149,6 +150,7 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
   const {
     mine_report_category = "",
     mine_report_definition_guid = "",
+    mine_report_submission_status_code,
     documents = [],
     report_type,
     permit_condition_category_code,
@@ -184,6 +186,7 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
   const isPRR = report_type === REPORT_TYPE_CODES.PRR;
   const isMS = system === SystemFlagEnum.ms;
 
+  const hasSubmissions = mine_report_submission_status_code !== MINE_REPORT_SUBMISSION_CODES.NON;
   // minespace users are only allowed to add documents
   const mineSpaceEdit = isMS && initialValues?.mine_report_guid && isEditMode;
 
@@ -263,9 +266,7 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
   useEffect(() => {
     if (system === SystemFlagEnum.core) {
       const selection = mineReportDefinition?.compliance_articles[0]?.cim_or_cpo;
-      dispatch(
-        change(FORM.VIEW_EDIT_REPORT, "report_for", selection ? selection : "Not specified")
-      );
+      dispatch(change(FORM.VIEW_EDIT_REPORT, "report_for", selection ?? "Not specified"));
     }
   }, [mineReportDefinition, !formValues?.report_for]);
 
@@ -505,7 +506,7 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
               id="description_comment"
               name="description_comment"
               label="Report Description"
-              disabled={mineSpaceEdit}
+              disabled={mineSpaceEdit && hasSubmissions}
               placeholder={`Example: "Mine X's Annual Reclamation Report, as per section 10.4.4. Spatial files included."`}
               props={{ maximumCharacters: 500, rows: 3 }}
               component={RenderAutoSizeField}
@@ -555,7 +556,7 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
               name="submitter_name"
               label="Submitter Name"
               placeholder="Enter name"
-              disabled={mineSpaceEdit}
+              disabled={mineSpaceEdit && hasSubmissions}
               required={isMS}
               component={RenderField}
               validate={isMS ? [required] : []}
@@ -568,7 +569,7 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
               name="submitter_email"
               label="Submitter Email"
               placeholder="Enter email"
-              disabled={mineSpaceEdit}
+              disabled={mineSpaceEdit && hasSubmissions}
               component={RenderField}
               required={isMS}
               validate={isMS ? [required, email] : [email]}
@@ -602,11 +603,11 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
             <FieldArray
               name="mine_report_contacts"
               component={RenderContacts}
-              props={{ isEditMode, mineSpaceEdit }}
+              props={{ isEditMode, mineSpaceEdit, hasSubmissions }}
             />
           </Col>
           <Col span={24}>
-            {isEditMode && !mineSpaceEdit && (
+            {isEditMode && (!mineSpaceEdit || !hasSubmissions) && (
               <Button
                 type="primary"
                 className="btn-sm-padding"
@@ -640,11 +641,11 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
               <ReportFileUpload
                 mineGuid={mineGuid}
                 isProponent={system === SystemFlagEnum.ms}
-                documents={documents}
+                documents={documents ?? []}
                 updateDocuments={updateDocuments}
               />
             )}
-            <ReportFilesTable documents={documents} />
+            {(hasSubmissions || documents) && <ReportFilesTable documents={documents} />}
           </Col>
           {system === SystemFlagEnum.core && (
             <AuthorizationWrapper permission={coreViewAllPermission} showToolTip={false}>
@@ -658,8 +659,9 @@ const ReportDetailsForm: FC<ReportDetailsFormProps> = ({
                   <strong>
                     These comments are for internal staff only and will not be shown to proponents.
                   </strong>
-                  Add comments to this report submission for future reference. Anything written in
-                  these comments may be requested under FOIPPA. Keep it professional and concise.
+                  &nbsp;Add comments to this report submission for future reference. Anything
+                  written in these comments may be requested under FOIPPA. Keep it professional and
+                  concise.
                 </Typography.Paragraph>
                 <MinistryCommentPanel
                   renderEditor={true}
diff --git a/services/common/src/components/reports/reportSubmissionSlice.ts b/services/common/src/components/reports/reportSubmissionSlice.ts
index 7219b448e2..aa05813430 100644
--- a/services/common/src/components/reports/reportSubmissionSlice.ts
+++ b/services/common/src/components/reports/reportSubmissionSlice.ts
@@ -53,7 +53,7 @@ const submissionSlice = createAppSlice({
       async (payload: IMineReportSubmission, thunkApi) => {
         const headers = createRequestHeader();
         thunkApi.dispatch(showLoading());
-        const successMessage = payload.mine_report_guid
+        const successMessage = payload.mine_report_submission_guid
           ? "Report successfully resubmitted"
           : "Successfully created new report submission";
 
diff --git a/services/common/src/constants/enums.ts b/services/common/src/constants/enums.ts
index 46a39f52a3..474222ca12 100644
--- a/services/common/src/constants/enums.ts
+++ b/services/common/src/constants/enums.ts
@@ -165,6 +165,7 @@ export enum MINE_REPORT_SUBMISSION_CODES {
   REC = "REC",
   ACC = "ACC",
   INI = "INI",
+  NON = "NON",
 }
 
 export enum REPORT_TYPE_CODES {
diff --git a/services/common/src/constants/strings.tsx b/services/common/src/constants/strings.tsx
index 355dd28e48..9447e274d5 100755
--- a/services/common/src/constants/strings.tsx
+++ b/services/common/src/constants/strings.tsx
@@ -409,4 +409,5 @@ export const MINE_REPORT_STATUS_HASH = {
   [MINE_REPORT_SUBMISSION_CODES.REC]: "Changes Received",
   [MINE_REPORT_SUBMISSION_CODES.ACC]: "Accepted",
   [MINE_REPORT_SUBMISSION_CODES.INI]: "Received",
+  [MINE_REPORT_SUBMISSION_CODES.NON]: "Report Requested",
 };
diff --git a/services/common/src/interfaces/reports/mineReport.interface.ts b/services/common/src/interfaces/reports/mineReport.interface.ts
index 8dfc4a2df6..a5b168837b 100644
--- a/services/common/src/interfaces/reports/mineReport.interface.ts
+++ b/services/common/src/interfaces/reports/mineReport.interface.ts
@@ -19,5 +19,5 @@ export interface IMineReport {
   mine_name: string;
   submitter_name: string;
   submitter_email: string;
-  mine_report_submission_status?: MINE_REPORT_SUBMISSION_CODES;
+  mine_report_status_code: MINE_REPORT_SUBMISSION_CODES;
 }
diff --git a/services/core-api/app/api/mines/reports/models/mine_report.py b/services/core-api/app/api/mines/reports/models/mine_report.py
index 3858df7b21..afab499ab1 100644
--- a/services/core-api/app/api/mines/reports/models/mine_report.py
+++ b/services/core-api/app/api/mines/reports/models/mine_report.py
@@ -5,7 +5,7 @@
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import validates
-from sqlalchemy import select, and_, desc
+from sqlalchemy import select, and_, desc, func, literal
 from app.api.mines.reports.models.mine_report_contact import MineReportContact
 from app.api.mines.reports.models.mine_report_submission import MineReportSubmission
 from app.api.mines.reports.models.mine_report_submission_status_code import MineReportSubmissionStatusCode
@@ -80,7 +80,11 @@ def mine_report_status_code(self):
         if self.mine_report_submissions:
             return self.mine_report_submissions[-1].mine_report_submission_status_code
         else:
-            return None
+            return "NON"
+        
+    @hybrid_property
+    def report_type(self):
+        return "PRR" if self.permit_condition_category_code else "CRR"
 
     @hybrid_property
     def report_name(self):
@@ -88,10 +92,11 @@ def report_name(self):
 
     @mine_report_status_code.expression
     def mine_report_status_code(cls):
-        return select([
+        return func.coalesce(select([
             MineReportSubmission.mine_report_submission_status_code
         ]).where(MineReportSubmission.mine_report_id == cls.mine_report_id).order_by(
-            desc(MineReportSubmission.mine_report_submission_id)).limit(1).as_scalar()
+            desc(MineReportSubmission.mine_report_submission_id)).limit(1).as_scalar(),
+            literal("NON"))
 
     @hybrid_property
     def mine_report_status_description(self):
diff --git a/services/core-api/app/api/mines/reports/resources/mine_report_submission_resource.py b/services/core-api/app/api/mines/reports/resources/mine_report_submission_resource.py
index 3065b1f94b..8df16717da 100644
--- a/services/core-api/app/api/mines/reports/resources/mine_report_submission_resource.py
+++ b/services/core-api/app/api/mines/reports/resources/mine_report_submission_resource.py
@@ -97,11 +97,43 @@ def create_initial_mine_report(request_data, permit_id=None, mine_report_definit
         )
         mine_report.save()
         return mine_report
+    
+    # case when report has been requested
+    @staticmethod
+    def create_initial_submission_from_minespace(request_data, report_documents):
+        mine_report = MineReport.find_by_mine_report_guid(request_data.get('mine_report_guid'))
+        mine_report_id = getattr(mine_report, "mine_report_id")
+
+        report_submission = MineReportSubmission(
+            create_timestamp=getattr(mine_report, "create_timestamp"),
+            description_comment=request_data.get("description_comment", None),
+            due_date=getattr(mine_report, "due_date"),
+            documents=report_documents,
+            mine_guid=getattr(mine_report, "mine_guid"),
+            mine_report_definition_id=getattr(mine_report, "mine_report_definition_id"),
+            mine_report_id=mine_report_id,
+            mine_report_submission_status_code="INI",
+            permit_condition_category_code=getattr(mine_report, "permit_condition_category_code"),
+            permit_id=getattr(mine_report, "permit_id"),
+            received_date=request_data.get("received_date", None),
+            submission_date=datetime.utcnow(),
+            submission_year=getattr(mine_report, "submission_year"),
+            submitter_email=request_data.get("submitter_email", None),
+            submitter_name=request_data.get("submitter_name", None),
+        )
+        mine_report_contacts = ReportSubmissionResource.get_mine_report_submission_contacts(
+            request_data.get('mine_report_contacts'), mine_report_id, report_submission.mine_report_submission_id)
+        report_submission.mine_report_contacts = mine_report_contacts
+
+        report_submission.save()
+        return report_submission
 
     # not for first submission, for subsequent
     @staticmethod
     def create_submission_from_minespace(mine_report_guid, request_data, report_documents):
         previous_submission = MineReportSubmission.find_latest_by_mine_report_guid(str(mine_report_guid))
+        if not previous_submission or request_data.get('mine_report_submission_status_code') == "NON":
+            return ReportSubmissionResource.create_initial_submission_from_minespace(request_data, report_documents)
         mine_report_submission_status_code = "NRQ"
 
         report_submission = MineReportSubmission(
@@ -123,6 +155,7 @@ def create_submission_from_minespace(mine_report_guid, request_data, report_docu
             submitter_email=getattr(previous_submission, "submitter_email"),
             submitter_name=getattr(previous_submission, "submitter_name"),
         )
+        
         report_submission.save()
         return report_submission
 
@@ -143,6 +176,7 @@ def post(self):
         self.parser.add_argument('mine_report_definition_guid', type=str, location='json')
         self.parser.add_argument('mine_report_id', type=str, location='json')
         self.parser.add_argument('mine_report_guid', type=str, location='json')
+        self.parser.add_argument('mine_report_submission_guid', type=str, location='json')
         self.parser.add_argument('mine_report_submission_status_code', type=str, location='json')
         self.parser.add_argument('permit_condition_category_code', type=str, location='json')
         self.parser.add_argument('permit_guid', type=str, location='json')
@@ -161,6 +195,7 @@ def post(self):
 
         mine_guid = data.get('mine_guid', None)
         mine_report_guid = data.get('mine_report_guid', None)
+        mine_report_submission_guid = data.get('mine_report_submission_guid', None)
         mine_report_id = data.get('mine_report_id', None)
         permit_condition_category_code = data.get('permit_condition_category_code', None)
         documents = data.get('documents', [])
@@ -176,8 +211,9 @@ def post(self):
         mine_report_definition_id = None
         permit_id = None
 
-        is_first_submission = False if mine_report_guid else True        
-        
+        create_initial_report = False if mine_report_guid else True
+        is_first_submission = False if mine_report_submission_guid else True       
+
         if is_code_required_report:
             mine_report_definition_id = self.get_check_mine_report_definition_id(mine_report_definition_guid)
         else:
@@ -185,13 +221,13 @@ def post(self):
 
         report_documents = ReportSubmissionResource.get_updated_documents(documents, is_proponent, mine_guid)        
         
-        if is_first_submission:
+        if create_initial_report:
             mine_report = self.create_initial_mine_report(data, permit_id, mine_report_definition_id)
             mine_report_guid = mine_report.mine_report_guid
             mine_report_id = mine_report.mine_report_id
         
-        # MS user only allowed to add documents
-        if is_proponent and not is_first_submission:
+        # MS user only allowed to add documents unless new report has been requested
+        if is_proponent and not create_initial_report:
             return self.create_submission_from_minespace(mine_report_guid, data, report_documents)
         
         create_timestamp = None
@@ -259,6 +295,11 @@ def get(self):
 
         if (latest_submission == True):
             submission = MineReportSubmission.find_latest_by_mine_report_guid(mine_report_guid)
+            if not submission: 
+                report = MineReport.find_by_mine_report_guid(mine_report_guid)
+                # different names for same property
+                report.mine_report_submission_status_code = "NON"
+                return report
             return submission
 
         return MineReportSubmission.find_by_mine_report_guid(mine_report_guid)
diff --git a/services/core-api/app/api/mines/response_models.py b/services/core-api/app/api/mines/response_models.py
index d00f26b180..0ab6335425 100644
--- a/services/core-api/app/api/mines/response_models.py
+++ b/services/core-api/app/api/mines/response_models.py
@@ -731,6 +731,7 @@ def format(self, value):
             fields.String,
         'mine_report_contacts':
             fields.List(fields.Nested(MINE_REPORT_CONTACT_MODEL)),
+        'mine_report_status_code': fields.String,
     })
 
 MINE_REPORT_DEFINITION_CATEGORIES = api.model('MineReportDefinitionCategoriesModel', {
diff --git a/services/core-api/tests/reports/resource/test_mine_report_submissions_resource.py b/services/core-api/tests/reports/resource/test_mine_report_submissions_resource.py
index 15745ab096..cf37a523e0 100644
--- a/services/core-api/tests/reports/resource/test_mine_report_submissions_resource.py
+++ b/services/core-api/tests/reports/resource/test_mine_report_submissions_resource.py
@@ -1,9 +1,5 @@
 import json
-import uuid
-import pytest
-from datetime import datetime
 
-from app.api.mines.mine.models.mine import Mine
 from app.api.mines.reports.models.mine_report import MineReport
 from app.api.mines.reports.models.mine_report_submission import MineReportSubmission
 from app.api.mines.reports.models.mine_report_definition import MineReportDefinition
@@ -25,6 +21,20 @@ def test_get_all_mine_report_submissions_for_report(test_client, db_session, aut
     assert str(mine_report.mine_report_guid) == get_data[0]['mine_report_guid']
     assert get_resp.status_code == 200
 
+def test_get_mine_report_with_no_submissions(test_client, db_session, auth_headers):
+    mine_report = MineReportFactory(mine_report_submissions=0)
+
+    params = f'?latest_submission=true&mine_report_guid={mine_report.mine_report_guid}'
+    get_resp = test_client.get(
+        f'mines/reports/submissions{params}', headers=auth_headers['full_auth_header'])
+    get_data = json.loads(get_resp.data.decode())
+
+    assert get_resp.status_code == 200
+    assert get_data['mine_report_guid'] == str(mine_report.mine_report_guid)
+    assert get_data['mine_report_submission_status_code'] == "NON"
+    assert get_data['mine_report_submission_guid'] == None    
+    assert get_data['documents'] == None 
+
 def test_get_latest_mine_report_submission_for_report(test_client, db_session, auth_headers):
     mine_report = MineReportFactory()
     
@@ -82,6 +92,38 @@ def test_post_initial_crr_mine_report_submission(test_client, db_session, auth_h
     assert num_submissions == 1
     assert latest_submission['mine_report_submission_status_code'] == "INI"
 
+def test_post_requested_report(test_client, db_session, auth_headers):
+    mine_report = MineReportFactory(mine_report_submissions=0)
+
+    new_document_data = MineDocumentFactory()
+    new_document = {
+        'document_name': new_document_data.document_name,
+        'document_manager_guid': new_document_data.document_manager_guid
+    }
+    mine_report_definition = MineReportDefinition.get_all()[0]
+
+    submission_data = {
+        'description_comment': "description comment",
+        'documents': [new_document],
+        'due_date': "2024-02-11",
+        'mine_guid': mine_report.mine_guid,
+        'mine_report_definition_guid': str(mine_report_definition.mine_report_definition_guid),
+        'received_date': "2024-02-09",
+        'submission_year': "2024",
+        'submitter_email': "email@email.com",
+        'submitter_name': "Submitter Name",        
+    }
+
+    # post from Minespace
+    post_resp = test_client.post(
+        f'mines/reports/submissions', headers=auth_headers['proponent_only_auth_header'], json=submission_data)
+    post_data = json.loads(post_resp.data.decode())
+
+    assert post_resp.status_code == 201
+    assert post_data['mine_report_submission_status_code'] == "INI"
+    assert post_data['mine_report_submission_guid'] is not None
+    assert post_data['mine_report_definition_guid'] == str(mine_report_definition.mine_report_definition_guid)
+
 def test_post_additional_mine_report_submission(test_client, db_session, auth_headers):
     mine_report = MineReportFactory(mine_report_submissions=1)
     first_submission = mine_report.mine_report_submissions[0]
@@ -122,7 +164,6 @@ def test_post_additional_mine_report_submission(test_client, db_session, auth_he
 
     post_resp = test_client.post(
         f'mines/reports/submissions', headers=auth_headers['full_auth_header'], json=submission_data)
-    post_data = json.loads(post_resp.data.decode())
 
     updated_report = MineReport.find_by_mine_report_guid(str(mine_report.mine_report_guid))
     latest_submission = MineReportSubmission.find_latest_by_mine_report_guid(str(mine_report.mine_report_guid)).json()
@@ -134,7 +175,6 @@ def test_post_additional_mine_report_submission(test_client, db_session, auth_he
     assert len(previous_submission['mine_report_contacts']) + 1 == len(latest_submission['mine_report_contacts'])
 
     # fields that should be changed
-    assert previous_submission['update_timestamp'][:19] == latest_submission['update_timestamp'][:19]
     assert previous_submission['update_timestamp'] != latest_submission['update_timestamp']
     assert previous_submission['submission_date'] != latest_submission['submission_date']
     assert previous_submission['mine_report_submission_status_code'] != latest_submission['mine_report_submission_status_code']
diff --git a/services/core-web/src/components/dashboard/reportsHomePage/ReportsHomePage.js b/services/core-web/src/components/dashboard/reportsHomePage/ReportsHomePage.js
index c184c62630..f82f46391f 100644
--- a/services/core-web/src/components/dashboard/reportsHomePage/ReportsHomePage.js
+++ b/services/core-web/src/components/dashboard/reportsHomePage/ReportsHomePage.js
@@ -136,11 +136,7 @@ export class ReportsHomePage extends Component {
       props: {
         initialValues: {
           ...report,
-          mine_report_submission_status:
-            report.mine_report_submissions.length > 0
-              ? report.mine_report_submissions[report.mine_report_submissions.length - 1]
-                  .mine_report_submission_status_code
-              : "NRQ",
+          mine_report_submission_status: report.mine_report_status_code,
         },
         title: `Edit ${report.submission_year} ${report.report_name}`,
         mineGuid: report.mine_guid,
diff --git a/services/core-web/src/components/mine/Reports/MineReportInfo.tsx b/services/core-web/src/components/mine/Reports/MineReportInfo.tsx
index bd6b9b3ac2..08747de88e 100644
--- a/services/core-web/src/components/mine/Reports/MineReportInfo.tsx
+++ b/services/core-web/src/components/mine/Reports/MineReportInfo.tsx
@@ -129,13 +129,7 @@ export const MineReportInfo: FC = () => {
       const received_only =
         !params.received_only || params.received_only === "false" || report.received_date;
       const status =
-        isEmpty(params.status) ||
-        (report.mine_report_submissions &&
-          report.mine_report_submissions.length > 0 &&
-          params.status.includes(
-            report.mine_report_submissions[report.mine_report_submissions.length - 1]
-              .mine_report_submission_status_code
-          ));
+        isEmpty(params.status) || params.status.includes(report.mine_report_status_code);
       return (
         report_name &&
         report_type &&
diff --git a/services/core-web/src/components/mine/Reports/MineReportTable.js b/services/core-web/src/components/mine/Reports/MineReportTable.js
index bfb58748de..2c070751da 100644
--- a/services/core-web/src/components/mine/Reports/MineReportTable.js
+++ b/services/core-web/src/components/mine/Reports/MineReportTable.js
@@ -181,10 +181,10 @@ export const MineReportTable = (props) => {
     },
     {
       title: "Status",
-      key: "mine_report_status_code",
-      dataIndex: "mine_report_status_code",
-      sortField: "mine_report_status_code",
-      sorter: props.isDashboardView || nullableStringSorter("mine_report_status_code"),
+      key: "mine_report_status",
+      dataIndex: "mine_report_status",
+      sortField: "mine_report_status",
+      sorter: props.isDashboardView || nullableStringSorter("mine_report_status"),
       render: (text) => (
         <div title="Status">
           <Badge
@@ -301,14 +301,8 @@ export const MineReportTable = (props) => {
       submission_year: Number(report.submission_year),
       created_by_idir: report.created_by_idir,
       permit_guid: report.permit_guid || Strings.EMPTY_FIELD,
-      mine_report_status_code:
-        (report.mine_report_submissions &&
-          report.mine_report_submissions.length > 0 &&
-          props.mineReportStatusOptionsHash[
-            report.mine_report_submissions[report.mine_report_submissions.length - 1]
-              .mine_report_submission_status_code
-          ]) ||
-        null,
+      mine_report_status:
+        props.mineReportStatusOptionsHash[report.mine_report_status_code] || Strings.EMPTY_FIELD,
       documents:
         report.mine_report_submissions &&
         report.mine_report_submissions.length > 0 &&
diff --git a/services/core-web/src/constants/theme.js b/services/core-web/src/constants/theme.js
index fa73d68c73..10ce730eff 100644
--- a/services/core-web/src/constants/theme.js
+++ b/services/core-web/src/constants/theme.js
@@ -1,4 +1,5 @@
 // Styling types for various document/application status codes
+import { MINE_REPORT_STATUS_HASH } from "@mds/common/constants";
 
 const undefinedStatusStyleType = "default";
 
@@ -26,10 +27,11 @@ const badgeStatusTypes = {
     Withdrawn: "warning",
   },
   report: {
-    Accepted: "success",
-    "Changes Received": "warning",
-    "Changes Requested": "processing",
-    "Not Requested": "default",
+    [MINE_REPORT_STATUS_HASH.ACC]: "success",
+    [MINE_REPORT_STATUS_HASH.REC]: "warning",
+    [MINE_REPORT_STATUS_HASH.REQ]: "processing",
+    [MINE_REPORT_STATUS_HASH.NRQ]: "default",
+    [MINE_REPORT_STATUS_HASH.NON]: "warning",
   },
   workInformation: {
     Unknown: "default",
diff --git a/services/core-web/src/tests/mocks/dataMocks.tsx b/services/core-web/src/tests/mocks/dataMocks.tsx
index 4d629ae3d7..16437b78f0 100644
--- a/services/core-web/src/tests/mocks/dataMocks.tsx
+++ b/services/core-web/src/tests/mocks/dataMocks.tsx
@@ -1837,6 +1837,7 @@ export const MINE_REPORTS = [
     submission_year: 2020,
     created_by_idir: "idir\\TEST",
     permit_guid: null,
+    mine_report_status_code: "NRQ",
     mine_report_submissions: [
       {
         mine_report_submission_guid: "fed32646-5db7-495a-acbb-b6b8ad333ee1",
@@ -1868,6 +1869,7 @@ export const MINE_REPORTS = [
     submission_year: 2020,
     created_by_idir: "idir\\TEST",
     permit_guid: null,
+    mine_report_status_code: "NRQ",
     mine_report_submissions: [
       {
         mine_report_submission_guid: "d0149d1b-845d-4011-a731-3f951c7d8219",
@@ -1902,6 +1904,7 @@ export const MINE_REPORTS = [
     mine_report_submissions: [],
     mine_guid: "aa3cb08a-ee1b-4dc9-8bf6-f54eb7484d4d",
     mine_name: "Abbott Inc",
+    mine_report_status_code: "NON",
   },
 ];
 
diff --git a/services/minespace-web/src/components/dashboard/mine/reports/ReportPage.tsx b/services/minespace-web/src/components/dashboard/mine/reports/ReportPage.tsx
index a3d734e59b..56af2630c4 100644
--- a/services/minespace-web/src/components/dashboard/mine/reports/ReportPage.tsx
+++ b/services/minespace-web/src/components/dashboard/mine/reports/ReportPage.tsx
@@ -99,6 +99,13 @@ const ReportPage = () => {
               Save Changes
             </Button>
           )}
+          {!isEditMode &&
+            latestSubmission.mine_report_submission_status_code ==
+              MINE_REPORT_SUBMISSION_CODES.NON && (
+              <Button onClick={() => setIsEditMode(true)} type="primary">
+                Submit Report
+              </Button>
+            )}
         </Row>
 
         {!isEditMode && status && (
diff --git a/services/minespace-web/src/components/dashboard/mine/reports/ReportsTable.tsx b/services/minespace-web/src/components/dashboard/mine/reports/ReportsTable.tsx
index e1ea42db7c..b546cf82f7 100644
--- a/services/minespace-web/src/components/dashboard/mine/reports/ReportsTable.tsx
+++ b/services/minespace-web/src/components/dashboard/mine/reports/ReportsTable.tsx
@@ -130,8 +130,8 @@ export const ReportsTable: FC<ReportsTableProps> = (props) => {
     columns = columns.filter((column) => !["", "Documents"].includes(column.title as string));
     const statusColumn = {
       title: "Status",
-      dataIndex: "status",
-      sorter: (a, b) => a.status.localeCompare(b.status),
+      dataIndex: "mine_report_status_code",
+      sorter: (a, b) => a.mine_report_status_code.localeCompare(b.mine_report_status_code),
       render: (text: MINE_REPORT_SUBMISSION_CODES) => {
         return <Badge status={reportStatusSeverity(text)} text={MINE_REPORT_STATUS_HASH[text]} />;
       },
@@ -151,17 +151,6 @@ export const ReportsTable: FC<ReportsTableProps> = (props) => {
     });
   }
 
-  const transformRowData = (reports: IMineReport[]): IMineReport[] =>
-    reports.map((report) => {
-      const { mine_report_submissions } = report;
-      const latestSubmission = mine_report_submissions?.[mine_report_submissions?.length - 1];
-
-      return {
-        ...report,
-        status: latestSubmission?.mine_report_submission_status_code ?? "",
-      };
-    });
-
   const pagination: TablePaginationConfig = {
     defaultPageSize: DEFAULT_PAGE_SIZE,
     total: props.mineReports.length,
@@ -175,7 +164,7 @@ export const ReportsTable: FC<ReportsTableProps> = (props) => {
       columns={columns}
       rowKey={(record) => record.mine_report_guid}
       emptyText="This mine has no report data."
-      dataSource={transformRowData(props.mineReports)}
+      dataSource={props.mineReports}
       pagination={pagination}
     />
   );

From 5d0ed4a5d1495a3c234fda079db5832be83ea3e0 Mon Sep 17 00:00:00 2001
From: Tara Epp <102187683+taraepp@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:19:11 -0600
Subject: [PATCH 5/5] [Snyk] Upgrade dotenv from 16.0.1 to 16.4.2 (#2980)

* fix: upgrade dotenv from 16.0.1 to 16.4.2

Snyk has created this PR to upgrade dotenv from 16.0.1 to 16.4.2.

See this package in npm:
https://www.npmjs.com/package/dotenv

See this project in Snyk:
https://app.snyk.io/org/taraepp/project/b83f2f25-4911-4cf1-aad5-6137721dc373?utm_source=github&utm_medium=referral&page=upgrade-pr

* Update automation_jira-check.yaml

Allow Snyk PRs to pass format check

---------

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
---
 .github/workflows/automation_jira-check.yaml | 2 +-
 services/core-web/runner/package-lock.json   | 6 +++---
 services/core-web/runner/package.json        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/automation_jira-check.yaml b/.github/workflows/automation_jira-check.yaml
index ddbb623538..53b9e940d1 100644
--- a/.github/workflows/automation_jira-check.yaml
+++ b/.github/workflows/automation_jira-check.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Check for PR Title for Jira link
         uses: gsactions/commit-message-checker@8c8c0d18ba9b1fcfed6e7385fd2bf357dfc8dccb
         with:
-          pattern: '(\W)+(MDS)+-[0-9]+(\W)|(\W)(CHORE|FIX)(\W)'
+          pattern: '(\W)+(MDS)+-[0-9]+(\W)|(\W)(CHORE|FIX|Snyk)(\W)'
           excludeTitle: "false" # optional: this excludes the title of a pull request
           excludeDescription: "true" # optional: this excludes the description body of a pull request
           checkAllCommitMessages: "false" # optional: this checks all commits associated with a pull request
diff --git a/services/core-web/runner/package-lock.json b/services/core-web/runner/package-lock.json
index f7b3918dc7..2594e8db7d 100644
--- a/services/core-web/runner/package-lock.json
+++ b/services/core-web/runner/package-lock.json
@@ -104,9 +104,9 @@
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="
     },
     "dotenv": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.1.tgz",
-      "integrity": "sha512-1K6hR6wtk2FviQ4kEiSjFiH5rpzEVi8WW0x96aztHVMhEspNpc4DVOUTEHtEva5VThQ8IaBX1Pe4gSzpVVUsKQ=="
+      "version": "16.4.2",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.2.tgz",
+      "integrity": "sha512-rZSSFxke7d9nYQ5NeMIwp5PP+f8wXgKNljpOb7KtH6SKW1cEqcXAz9VSJYVLKe7Jhup/gUYOkaeSVyK8GJ+nBg=="
     },
     "ee-first": {
       "version": "1.1.1",
diff --git a/services/core-web/runner/package.json b/services/core-web/runner/package.json
index 59060d8090..17fb735fe6 100644
--- a/services/core-web/runner/package.json
+++ b/services/core-web/runner/package.json
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "dotenv": "16.0.1",
+    "dotenv": "16.4.2",
     "express": "4.18.1",
     "express-cache-controller": "1.1.0",
     "express-static-gzip": "2.1.7",