From e642f08c8f41c72e240c806eb84e4d856e4c0afc Mon Sep 17 00:00:00 2001 From: Alva Kostrova Date: Mon, 26 Jan 2026 18:29:34 -0800 Subject: [PATCH 1/5] changed frontend label to remove 'optional' word --- .../__snapshots__/IncidentForm.spec.tsx.snap | 6 ----- .../IncidentStepForms.spec.tsx.snap | 24 ------------------- 2 files changed, 30 deletions(-) diff --git a/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap b/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap index 91537023f6..b4797db25b 100644 --- a/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap +++ b/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap @@ -1385,12 +1385,6 @@ exports[`IncidentForm renders properly 1`] = ` >
Number of injuries - - -  (optional) -
diff --git a/services/minespace-web/src/tests/components/incident/__snapshots__/IncidentStepForms.spec.tsx.snap b/services/minespace-web/src/tests/components/incident/__snapshots__/IncidentStepForms.spec.tsx.snap index 88eddbb3a0..e49f9e4a06 100644 --- a/services/minespace-web/src/tests/components/incident/__snapshots__/IncidentStepForms.spec.tsx.snap +++ b/services/minespace-web/src/tests/components/incident/__snapshots__/IncidentStepForms.spec.tsx.snap @@ -789,12 +789,6 @@ Object { >
Number of injuries - - -  (optional) -
@@ -3012,12 +3006,6 @@ Object { >
Number of injuries - - -  (optional) -
@@ -5410,12 +5398,6 @@ Object { >
Number of injuries - - -  (optional) -
@@ -7633,12 +7615,6 @@ Object { >
Number of injuries - - -  (optional) -
From 7adf7ea08f40326f132fdb9af26a6b5081161cc3 Mon Sep 17 00:00:00 2001 From: Alva Kostrova Date: Mon, 26 Jan 2026 18:30:19 -0800 Subject: [PATCH 2/5] changed field type to required --- .../components/Forms/incidents/IncidentForm.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/services/minespace-web/src/components/Forms/incidents/IncidentForm.js b/services/minespace-web/src/components/Forms/incidents/IncidentForm.js index b8c327d465..2b816758f5 100644 --- a/services/minespace-web/src/components/Forms/incidents/IncidentForm.js +++ b/services/minespace-web/src/components/Forms/incidents/IncidentForm.js @@ -345,7 +345,7 @@ const renderIncidentDetails = (childProps) => { id="number_of_injuries" name="number_of_injuries" component={renderConfig.FIELD} - validate={[wholeNumber, maxLength(10)]} + validate={[wholeNumber, required, maxLength(10)]} disabled={formDisabled} /> @@ -354,6 +354,7 @@ const renderIncidentDetails = (childProps) => { label="Number of fatalities" id="number_of_fatalities" name="number_of_fatalities" + required component={renderConfig.FIELD} validate={[wholeNumber, maxLength(10)]} disabled={formDisabled} @@ -565,8 +566,8 @@ const renderUploadInitialNotificationDocuments = ( const formValuesDocumentsInitial = formValues?.documents ? formValues?.documents?.filter( - (doc) => doc.mine_incident_document_type_code === Strings.INCIDENT_DOCUMENT_TYPES.initial - ) + (doc) => doc.mine_incident_document_type_code === Strings.INCIDENT_DOCUMENT_TYPES.initial + ) : []; const formValuesDocumentsFinalReport = @@ -576,14 +577,14 @@ const renderUploadInitialNotificationDocuments = ( const formValuesInitialNotificationDocs = formValues?.initial_notification_documents ? formValues?.initial_notification_documents?.filter( - (doc) => doc.mine_incident_document_type_code === Strings.INCIDENT_DOCUMENT_TYPES.initial - ) + (doc) => doc.mine_incident_document_type_code === Strings.INCIDENT_DOCUMENT_TYPES.initial + ) : []; const formValuesFinaltReportDocs = formValues?.final_report_documents ? formValues?.final_report_documents?.filter( - (doc) => doc.mine_incident_document_type_code === Strings.INCIDENT_DOCUMENT_TYPES.final - ) + (doc) => doc.mine_incident_document_type_code === Strings.INCIDENT_DOCUMENT_TYPES.final + ) : []; const initialDocumentsForm = [ @@ -911,7 +912,7 @@ export const IncidentForm = (props) => { {}} + onSubmit={() => { }} reduxFormConfig={{ enableReinitialize: true, touchOnBlur: true, From d6a3df1e09cbc656b24a416761019dd63adc4796 Mon Sep 17 00:00:00 2001 From: Alva Kostrova Date: Mon, 26 Jan 2026 18:34:28 -0800 Subject: [PATCH 3/5] added validation for the number of injuries field --- .../components/Forms/incidents/IncidentFormInitialReport.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core-web/src/components/Forms/incidents/IncidentFormInitialReport.tsx b/services/core-web/src/components/Forms/incidents/IncidentFormInitialReport.tsx index 02b1d87dfa..40ee25ca49 100644 --- a/services/core-web/src/components/Forms/incidents/IncidentFormInitialReport.tsx +++ b/services/core-web/src/components/Forms/incidents/IncidentFormInitialReport.tsx @@ -322,6 +322,8 @@ const IncidentFormInitialReport: FC = ({ label="Number of injuries" id="number_of_injuries" name="number_of_injuries" + required + placeholder="Enter the number of injuries. If none, enter '0'." component={renderConfig.FIELD} validate={[wholeNumber, maxLength(10)]} disabled={!isEditMode} From 4b2358424580afcfe11e6e24d426f455d0a2c0e4 Mon Sep 17 00:00:00 2001 From: Alva Kostrova Date: Mon, 26 Jan 2026 18:45:31 -0800 Subject: [PATCH 4/5] added placeholder on the minespace web app --- .../src/components/Forms/incidents/IncidentForm.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/minespace-web/src/components/Forms/incidents/IncidentForm.js b/services/minespace-web/src/components/Forms/incidents/IncidentForm.js index 2b816758f5..6379b20cef 100644 --- a/services/minespace-web/src/components/Forms/incidents/IncidentForm.js +++ b/services/minespace-web/src/components/Forms/incidents/IncidentForm.js @@ -344,6 +344,8 @@ const renderIncidentDetails = (childProps) => { label="Number of injuries" id="number_of_injuries" name="number_of_injuries" + required + placeholder="Enter the number of injuries. If none, enter '0'." component={renderConfig.FIELD} validate={[wholeNumber, required, maxLength(10)]} disabled={formDisabled} From 13402f6a83238561848ea8a218baa5d07997d76f Mon Sep 17 00:00:00 2001 From: Alva Kostrova Date: Mon, 26 Jan 2026 18:55:33 -0800 Subject: [PATCH 5/5] updated snap tests --- .../incidents/__snapshots__/IncidentForm.spec.tsx.snap | 2 +- .../__snapshots__/IncidentStepForms.spec.tsx.snap | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap b/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap index b4797db25b..70b58ebc22 100644 --- a/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap +++ b/services/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap @@ -1379,7 +1379,7 @@ exports[`IncidentForm renders properly 1`] = ` class="ant-col ant-form-item-label" >