Skip to content
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.

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

bug fix for NOD update #21544

Merged
merged 3 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion app/controllers/correspondence_document_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class CorrespondenceDocumentController < ApplicationController
def update_document
document = CorrespondenceDocument.find(params[:id])
document.update!(update_params)
render json: {}
render json: { correspondence: document.correspondence }
end

def update_params
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { sprintf } from 'sprintf-js';
import SearchableDropdown from 'app/components/SearchableDropdown';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { updateDocumentTypeName } from '../correspondenceReducer/reviewPackageActions';
import { updateDocumentTypeName, setCorrespondence } from '../correspondenceReducer/reviewPackageActions';
import COPY from '../../../../COPY';
import Modal from '../../../components/Modal';
import Button from '../../../components/Button';
Expand Down Expand Up @@ -50,6 +50,8 @@ class EditDocumentTypeModal extends React.Component {
data: {
vbms_document_type_id: this.state.packageDocument.value
}
}).then((resp) => {
this.props.setCorrespondence(resp.body.correspondence);
});
this.props.updateDocumentTypeName(this.state.packageDocument, this.props.indexDoc);
this.props.setModalState(false);
Expand Down Expand Up @@ -102,12 +104,14 @@ EditDocumentTypeModal.propTypes = {
document: PropTypes.object,
onSaveValue: PropTypes.func,
updateDocumentTypeName: PropTypes.func,
setCorrespondence: PropTypes.func,
setModalState: PropTypes.func,
indexDoc: PropTypes.number
};

const mapDispatchToProps = (dispatch) => bindActionCreators({
updateDocumentTypeName
updateDocumentTypeName,
setCorrespondence
}, dispatch);

export default connect(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ export const CorrespondenceReviewPackage = (props) => {

setApiResponse(apiResWithVADOR);
const data = apiResWithVADOR;
const body = response.body;

hasEfolderUploadTask(data.correspondence_tasks);

Expand All @@ -120,8 +119,7 @@ export const CorrespondenceReviewPackage = (props) => {
setReviewDetails({
veteran_name: data.veteran_name || {},
dropdown_values: data.correspondence_types || [],
correspondence_type_id: data.correspondence_type_id,
nod: body.correspondence.nod
correspondence_type_id: data.correspondence_type_id
});

setReviewPackageDetails((prev) => {
Expand Down
7 changes: 5 additions & 2 deletions client/app/queue/correspondence/review_package/ReviewForm.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
import React, { useState } from 'react';
import { connect } from 'react-redux';
import { connect, useSelector } from 'react-redux';
import { bindActionCreators } from 'redux';
import TextField from '../../../components/TextField';
import SearchableDropdown from '../../../components/SearchableDropdown';
Expand All @@ -18,6 +18,9 @@ export const ReviewForm = (props) => {
// eslint-disable-next-line max-len
const [vaDORDate, setVADORDate] = useState(moment.utc((props.correspondence.va_date_of_receipt)).format('YYYY-MM-DD'));
const [dateError, setDateError] = useState(false);
const stateCorrespondence = useSelector(
(state) => state.reviewPackage.correspondence
);

const handleFileNumber = (value) => {
const isNumeric = value === '' || (/^\d{0,9}$/).test(value);
Expand Down Expand Up @@ -219,7 +222,7 @@ export const ReviewForm = (props) => {
<TextField
name="correspondence-package-document-type"
label="Package document type"
value = {props.reviewDetails?.nod ? 'NOD' : 'Non-NOD'}
value = {stateCorrespondence?.nod ? 'NOD' : 'Non-NOD'}
readOnly
/>
</div>
Expand Down
Loading