diff --git a/tdrs-frontend/src/assets/Reports.scss b/tdrs-frontend/src/assets/Reports.scss index 58b89ce6c..0c6de7dfb 100644 --- a/tdrs-frontend/src/assets/Reports.scss +++ b/tdrs-frontend/src/assets/Reports.scss @@ -42,6 +42,19 @@ cursor: pointer; } +.reprocessed { + background-color: transparent; + border: none; + color: #264A64; + text-align: left; + margin: 0; + padding: 0; +} + +.reprocessed:hover { + cursor: pointer; +} + .usa-table caption { width: 100%; } \ No newline at end of file diff --git a/tdrs-frontend/src/components/SubmissionHistory/CaseAggregatesTable.jsx b/tdrs-frontend/src/components/SubmissionHistory/CaseAggregatesTable.jsx index 56b1b5ecc..f5be03616 100644 --- a/tdrs-frontend/src/components/SubmissionHistory/CaseAggregatesTable.jsx +++ b/tdrs-frontend/src/components/SubmissionHistory/CaseAggregatesTable.jsx @@ -8,6 +8,7 @@ import { downloadFile, getErrorReportStatus, } from './helpers' +import ReprocessedModal from './ReprocessedModal' const MonthSubRow = ({ data }) => data ? ( @@ -24,15 +25,28 @@ const MonthSubRow = ({ data }) => ) +const Message = ({ date }) => { + return ( + <> + We've reprocessed your submission with updated validation criteria, based + on system improvements, to improve accuracy of error reports. No changes + have been made to your original data submission. +
+
+ Data was reprocessed on: {date} + + ) +} + const CaseAggregatesRow = ({ file }) => { const dispatch = useDispatch() - + const reprocessedOn = formatDate(getReprocessedDate(file)) return ( <> - + {formatDate(file.createdAt) + ' by ' + file.submittedBy} - {hasReparsed(file) && <>} + {hasReparsed(file) && } diff --git a/tdrs-frontend/src/components/SubmissionHistory/ReprocessedModal.jsx b/tdrs-frontend/src/components/SubmissionHistory/ReprocessedModal.jsx new file mode 100644 index 000000000..cfb38101d --- /dev/null +++ b/tdrs-frontend/src/components/SubmissionHistory/ReprocessedModal.jsx @@ -0,0 +1,46 @@ +import React, { useState } from 'react' +import Modal from '../Modal' + +const Message = ({ date }) => { + return ( + <> + We've reprocessed your submission with updated validation criteria, based + on system improvements, to improve accuracy of error reports. No changes + have been made to your original data submission. +
+
+ Data was reprocessed on: {date} + + ) +} + +const ReprocessedModal = ({ date }) => { + const [modalVisible, setModalVisible] = useState(false) + const message = + return ( +
+
+ +
+
+ { + setModalVisible(false) + }, + }, + ]} + /> +
+ ) +} + +export default ReprocessedModal diff --git a/tdrs-frontend/src/components/SubmissionHistory/TotalAggregatesTable.jsx b/tdrs-frontend/src/components/SubmissionHistory/TotalAggregatesTable.jsx index 2d05fba6c..7e19bbaee 100644 --- a/tdrs-frontend/src/components/SubmissionHistory/TotalAggregatesTable.jsx +++ b/tdrs-frontend/src/components/SubmissionHistory/TotalAggregatesTable.jsx @@ -8,6 +8,7 @@ import { downloadFile, getErrorReportStatus, } from './helpers' +import ReprocessedModal from './ReprocessedModal' const MonthSubRow = ({ data }) => data ? ( @@ -24,13 +25,13 @@ const MonthSubRow = ({ data }) => const TotalAggregatesRow = ({ file }) => { const dispatch = useDispatch() - + const reprocessedOn = formatDate(getReprocessedDate(file)) return ( <> {formatDate(file.createdAt) + ' by ' + file.submittedBy} - {hasReparsed(file) && <>} + {hasReparsed(file) && } diff --git a/tdrs-frontend/src/components/SubmissionHistory/helpers.jsx b/tdrs-frontend/src/components/SubmissionHistory/helpers.jsx index 5bb71d0e4..2301485fe 100644 --- a/tdrs-frontend/src/components/SubmissionHistory/helpers.jsx +++ b/tdrs-frontend/src/components/SubmissionHistory/helpers.jsx @@ -31,7 +31,8 @@ export const hasReparsed = (f) => f.latest_reparse_file_meta.finished_at && f.latest_reparse_file_meta.finished_at !== null -export const getReprocessedDate = (f) => f.latest_reparse_file_meta.finished_at +export const getReprocessedDate = (f) => + f?.latest_reparse_file_meta?.finished_at export const getErrorReportStatus = (file) => { if (