diff --git a/app/controllers/correspondence_document_controller.rb b/app/controllers/correspondence_document_controller.rb index fb080304fe3..625a894c90c 100644 --- a/app/controllers/correspondence_document_controller.rb +++ b/app/controllers/correspondence_document_controller.rb @@ -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 diff --git a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx index 723bf69167a..3f9c43bd440 100644 --- a/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx +++ b/client/app/queue/correspondence/component/EditDocumentTypeModal.jsx @@ -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'; @@ -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); @@ -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( diff --git a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx index 7c72041ff1d..7048492dd09 100644 --- a/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx +++ b/client/app/queue/correspondence/review_package/CorrespondenceReviewPackage.jsx @@ -105,7 +105,6 @@ export const CorrespondenceReviewPackage = (props) => { setApiResponse(apiResWithVADOR); const data = apiResWithVADOR; - const body = response.body; hasEfolderUploadTask(data.correspondence_tasks); @@ -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) => { diff --git a/client/app/queue/correspondence/review_package/ReviewForm.jsx b/client/app/queue/correspondence/review_package/ReviewForm.jsx index 8a893c9c7d0..a0735a7b517 100644 --- a/client/app/queue/correspondence/review_package/ReviewForm.jsx +++ b/client/app/queue/correspondence/review_package/ReviewForm.jsx @@ -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'; @@ -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); @@ -219,7 +222,7 @@ export const ReviewForm = (props) => {