Skip to content

[MDS-6385] NoD decision document upload conditions #3459

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

Merged
merged 8 commits into from
Mar 13, 2025
Merged

[MDS-6385] NoD decision document upload conditions #3459

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3d2198
fix for fee exemption error in updating and creating permits
asinn134 Mar 5, 2025
31351e3
Merge branch 'develop' into mds-6366-fee-exemption-error
asinn134 Mar 5, 2025
411681b
adjusting snap file
asinn134 Mar 5, 2025
85a4065
adding test for EditPermitForm component
asinn134 Mar 5, 2025
f2ca765
adjusting NoD decision doc upload conditions
asinn134 Mar 12, 2025
697d6ba
merge with develop
asinn134 Mar 12, 2025
47081f0
ran yarn install locally
asinn134 Mar 12, 2025
3ff7a0a
addressing pr comment
asinn134 Mar 12, 2025
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
29 changes: 25 additions & 4 deletions services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import { Button, Col, Popconfirm, Row, Form } from "antd";
import { connect } from "react-redux";
import { connect, useSelector } from "react-redux";
import { bindActionCreators, compose } from "redux";
import {
EMPTY_FIELD,
Expand All @@ -18,12 +18,13 @@ import {
updateNoticeOfDeparture,
} from "@mds/common/redux/actionCreators/noticeOfDepartureActionCreator";
import { getNoticeOfDeparture } from "@mds/common/redux/selectors/noticeOfDepartureSelectors";
import { Field, FieldArray, change } from "@mds/common/components/forms/form";
import { Field, FieldArray, change, getFormValues } from "@mds/common/components/forms/form";
import {
email,
maxLength,
phoneNumber,
required,
requiredList,
} from "@mds/common/redux/utils/Validate";
import { getUserAccessData } from "@mds/common/redux/selectors/authenticationSelectors";
import CoreTable from "@mds/common/components/common/CoreTable";
Expand Down Expand Up @@ -51,7 +52,6 @@ interface RenderContactsProps {

export const renderContacts: React.FC<RenderContactsProps> = (props, disabled = false) => {
const { fields } = props;

return (
<div className="margin-large--bottom">
{fields.length > 0 && (
Expand Down Expand Up @@ -131,7 +131,9 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
const [documentArray, setDocumentArray] = useState([]);
const [uploadedFiles, setUploadedFiles] = useState([]);
const [uploading, setUploading] = useState(false);
const [currentStatus, setCurrentStatus] = useState("");
const formName = FORM.NOTICE_OF_DEPARTURE_FORM;
const formValues = useSelector(getFormValues(formName));

const { noticeOfDeparture, mine, change } = props;
const { nod_guid } = noticeOfDeparture;
Expand All @@ -149,6 +151,15 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
(doc) => doc.document_type === NOTICE_OF_DEPARTURE_DOCUMENT_TYPE.DECISION
);

const isDecisionDocRequired = (status) => {
const requiredDocStatuses = [
NOTICE_OF_DEPARTURE_STATUS_VALUES.determined_non_substantial,
NOTICE_OF_DEPARTURE_STATUS_VALUES.determined_substantial,
];

return requiredDocStatuses.includes(status) && decision.length === 0 && documentArray.length == 0;
}

const handleAddDocuments = (noticeOfDepartureGuid) => {
documentArray.forEach((document) =>
props.addDocumentToNoticeOfDeparture(
Expand Down Expand Up @@ -209,8 +220,16 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
};
})
);

setCurrentStatus(props?.initialValues?.nod_status);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if you can simplify things here with something like currentStatus = formValues?.nod_status since it always seems to be equal to that. Setting the initialValues on the form should also set the formValues.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right it does work with that change, its much cleaner.

}, []);

useEffect(() => {
if (formValues?.nod_status !== currentStatus) {
setCurrentStatus(formValues?.nod_status);
}
}, [formValues?.nod_status]);

const handleDeleteANoticeOfDepartureDocument = async (document) => {
await removeFileFromDocumentManager(document);

Expand Down Expand Up @@ -335,6 +354,8 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
addFileStart={() => setUploading(true)}
onAbort={() => setUploading(false)}
onProcessFiles={() => setUploading(false)}
validate={isDecisionDocRequired(currentStatus) ? [requiredList] : []}
required={isDecisionDocRequired(currentStatus)}
uploadUrl={NOTICE_OF_DEPARTURE_DOCUMENTS(mine.mine_guid)}
acceptedFileTypesMap={{ ...DOCUMENT, ...EXCEL }}
onFileLoad={(documentName, document_manager_guid) => {
Expand Down Expand Up @@ -383,7 +404,7 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
) : (
<>
<RenderCancelButton />
<RenderSubmitButton disabled={documentArray.length == 0 || uploading} buttonText="Update" disableOnClean={false} />
<RenderSubmitButton disabled={isDecisionDocRequired(currentStatus) || uploading} buttonText="Update" disableOnClean={false} />
</>
)}
</div>
Expand Down
11 changes: 0 additions & 11 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4676,17 +4676,6 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:1.7.2":
version: 1.7.2
resolution: "axios@npm:1.7.2"
dependencies:
follow-redirects: ^1.15.6
form-data: ^4.0.0
proxy-from-env: ^1.1.0
checksum: e457e2b0ab748504621f6fa6609074ac08c824bf0881592209dfa15098ece7e88495300e02cd22ba50b3468fd712fe687e629dcb03d6a3f6a51989727405aedf
languageName: node
linkType: hard

"axios@npm:1.8.2":
version: 1.8.2
resolution: "axios@npm:1.8.2"
Expand Down
Loading