Skip to content

[Core+MS] MDS-6613: make it mandatory to add in number of injuries for reportable incidents #3813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alva-fresh wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

[Core+MS] MDS-6613: make it mandatory to add in number of injuries for reportable incidents #3813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e642f08
changed frontend label to remove 'optional' word
alva-fresh Jan 27, 2026
7adf7ea
changed field type to required
alva-fresh Jan 27, 2026
d6a3df1
added validation for the number of injuries field
alva-fresh Jan 27, 2026
4b23584
added placeholder on the minespace web app
alva-fresh Jan 27, 2026
13402f6
updated snap tests
alva-fresh Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions services/core-web/src/components/Forms/incidents/IncidentFormInitialReport.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ const IncidentFormInitialReport: FC<IncidentFormInitialReportProps> = ({
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}
Expand Down
8 changes: 1 addition & 7 deletions ...es/core-web/src/tests/components/Forms/incidents/__snapshots__/IncidentForm.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,18 +1379,12 @@ exports[`IncidentForm renders properly 1`] = `
class="ant-col ant-form-item-label"
>
<label
class=""
class="ant-form-item-required"
for="ADD_EDIT_INCIDENT_number_of_injuries"
title=""
>
<div>
Number of injuries

<span
class="form-item-optional"
>
 (optional)
</span>
</div>
</label>
</div>
Expand Down
19 changes: 11 additions & 8 deletions services/minespace-web/src/components/Forms/incidents/IncidentForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,10 @@ 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, maxLength(10)]}
validate={[wholeNumber, required, maxLength(10)]}
disabled={formDisabled}
/>
</Col>
Expand All @@ -354,6 +356,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}
Expand Down Expand Up @@ -565,8 +568,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 =
Expand All @@ -576,14 +579,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 = [
Expand Down Expand Up @@ -911,7 +914,7 @@ export const IncidentForm = (props) => {
<FormWrapper
name={FORM.ADD_EDIT_INCIDENT}
initialValues={props.initialValues}
onSubmit={() => {}}
onSubmit={() => { }}
reduxFormConfig={{
enableReinitialize: true,
touchOnBlur: true,
Expand Down
32 changes: 4 additions & 28 deletions ...minespace-web/src/tests/components/incident/__snapshots__/IncidentStepForms.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,18 +783,12 @@ Object {
class="ant-col ant-form-item-label"
>
<label
class=""
class="ant-form-item-required"
for="ADD_EDIT_INCIDENT_number_of_injuries"
title=""
>
<div>
Number of injuries

<span
class="form-item-optional"
>
 (optional)
</span>
</div>
</label>
</div>
Expand Down Expand Up @@ -3006,18 +3000,12 @@ Object {
class="ant-col ant-form-item-label"
>
<label
class=""
class="ant-form-item-required"
for="ADD_EDIT_INCIDENT_number_of_injuries"
title=""
>
<div>
Number of injuries

<span
class="form-item-optional"
>
 (optional)
</span>
</div>
</label>
</div>
Expand Down Expand Up @@ -5404,18 +5392,12 @@ Object {
class="ant-col ant-form-item-label"
>
<label
class=""
class="ant-form-item-required"
for="ADD_EDIT_INCIDENT_number_of_injuries"
title=""
>
<div>
Number of injuries

<span
class="form-item-optional"
>
 (optional)
</span>
</div>
</label>
</div>
Expand Down Expand Up @@ -7627,18 +7609,12 @@ Object {
class="ant-col ant-form-item-label"
>
<label
class=""
class="ant-form-item-required"
for="ADD_EDIT_INCIDENT_number_of_injuries"
title=""
>
<div>
Number of injuries

<span
class="form-item-optional"
>
 (optional)
</span>
</div>
</label>
</div>
Expand Down
Loading