From f63c286458827818f02c00484831718af8b4b480 Mon Sep 17 00:00:00 2001 From: jramos Date: Mon, 13 Apr 2026 16:14:27 -0600 Subject: [PATCH] fix: show all Ivanti reviewer notes (rework, approval, current/previous state) in history tab --- .../src/components/pages/ReportingPage.js | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/pages/ReportingPage.js b/frontend/src/components/pages/ReportingPage.js index df92711..970a867 100644 --- a/frontend/src/components/pages/ReportingPage.js +++ b/frontend/src/components/pages/ReportingPage.js @@ -2707,21 +2707,29 @@ function FpEditModal({ open, onClose, submission, queueItems, onSuccess }) { {/* History tab */} {activeTab === 'history' && (
- {/* Ivanti reviewer notes (rework/approval feedback) */} - {(submission.ivanti_rework_note || submission.ivanti_current_state_notes) && ( -
-
- Ivanti Reviewer Notes + {/* Ivanti reviewer notes (rework/approval/previous state feedback) */} + {(() => { + const notes = [ + submission.ivanti_rework_note && { label: 'Rework Note', text: submission.ivanti_rework_note }, + submission.ivanti_approval_note && { label: 'Approval Note', text: submission.ivanti_approval_note }, + submission.ivanti_current_state_notes && { label: 'Current State Notes', text: submission.ivanti_current_state_notes }, + submission.ivanti_previous_state_notes && { label: 'Previous State Notes', text: submission.ivanti_previous_state_notes }, + ].filter(Boolean); + return notes.length > 0 ? notes.map((note, idx) => ( +
+
+ {note.label} +
+
+ {note.text} +
-
- {submission.ivanti_rework_note || submission.ivanti_current_state_notes} -
-
- )} + )) : null; + })()} {history.length === 0 ? (
No history entries.