fix: show assessment statements in history for gov and non-gov users based on report status

Author: hamed-valiollahi

frontend/src/views/ComplianceReports/components/HistoryCard.jsx

@@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next'
 const Accordion = styled((props) => (
   <MuiAccordion disableGutters elevation={0} square {...props} />
 ))(() => ({
-  border: `none`,
+  border: 'none',
   '&::before': {
     display: 'none'
   }
@@ -49,15 +49,53 @@ export const HistoryCard = ({ report, defaultExpanded = false }) => {
   const { data: currentUser } = useCurrentUser()
   const isGovernmentUser = currentUser?.isGovernmentUser
   const { t } = useTranslation(['report'])
-  const filteredHistory = useMemo(() => {
-    if (!report.history || report.history.length === 0) {
-      return []
-    }
-    // Sort the history array by date in descending order
+
+  const isCurrentAssessed =
+    report.currentStatus?.status === COMPLIANCE_REPORT_STATUSES.ASSESSED
+
+  /**
+   * Helper: build the two assessment list items.
+   * We use it twice – once top‑level for gov users (pre‑assessment)
+   * and once nested under the Assessed history entry for all users.
+   */
+  const AssessmentLines = () => (
+    <>
+      <StyledListItem disablePadding>
+        <ListItemText primaryTypographyProps={{ variant: 'body4' }}>
+          <strong>
+            {t('report:complianceReportHistory.renewableTarget')}:&nbsp;
+          </strong>
+          {t('report:assessmentLn1', {
+            name: report.organization.name,
+            hasMet:
+              report.summary.line11FossilDerivedBaseFuelTotal <= 0
+                ? 'has met'
+                : 'has not met'
+          })}
+        </ListItemText>
+      </StyledListItem>
+      <StyledListItem disablePadding>
+        <ListItemText primaryTypographyProps={{ variant: 'body4' }}>
+          <strong>
+            {t('report:complianceReportHistory.lowCarbonTarget')}:&nbsp;
+          </strong>
+          {t('report:assessmentLn2', {
+            name: report.organization.name,
+            hasMet:
+              report.summary.line21NonCompliancePenaltyPayable <= 0
+                ? 'has met'
+                : 'has not met'
+          })}
+        </ListItemText>
+      </StyledListItem>
+    </>
+  )
+
+  const sortedHistory = useMemo(() => {
+    if (!Array.isArray(report.history) || report.history.length === 0) return []
+
     return [...report.history]
-      .sort((a, b) => {
-        return new Date(b.createDate) - new Date(a.createDate)
-      })
+      .sort((a, b) => new Date(b.createDate) - new Date(a.createDate))
       .map((item) => {
         if (
           item.status.status === COMPLIANCE_REPORT_STATUSES.ASSESSED &&
@@ -82,12 +120,12 @@ export const HistoryCard = ({ report, defaultExpanded = false }) => {
           : {report.currentStatus.status}
         </BCTypography>
       </AccordionSummary>
-      {filteredHistory.length > 0 && (
+
+      {sortedHistory.length > 0 && (
         <AccordionDetails>
           <List>
             {report.assessmentStatement &&
-              ((!isGovernmentUser &&
-                report.currentStatus.status === 'Assessed') ||
+              ((!isGovernmentUser && isCurrentAssessed) ||
                 isGovernmentUser) && (
                 <StyledListItem disablePadding>
                   <ListItemText
@@ -101,71 +139,49 @@ export const HistoryCard = ({ report, defaultExpanded = false }) => {
                   </ListItemText>
                 </StyledListItem>
               )}
-            {filteredHistory.map((item, index) => (
-              <StyledListItem key={index} disablePadding>
-                <ListItemText
-                  data-test="list-item"
-                  primaryTypographyProps={{ variant: 'body4' }}
-                >
-                  <span
-                    dangerouslySetInnerHTML={{
-                      __html: t(
-                        `report:complianceReportHistory.${item.status.status}`,
-                        {
-                          createDate: timezoneFormatter({
-                            value: item?.createDate
-                          }),
-                          displayName:
-                            item.displayName ||
-                            `${item.userProfile.firstName} ${item.userProfile.lastName}`
-                        }
-                      )
-                    }}
-                  />
-                </ListItemText>
-                {[COMPLIANCE_REPORT_STATUSES.ASSESSED, 'AssessedBy'].includes(
-                  item.status.status
-                ) && (
-                  <List sx={{ p: 0, m: 0 }}>
-                    <StyledListItem disablePadding>
-                      <ListItemText
-                        primaryTypographyProps={{ variant: 'body4' }}
-                      >
-                        <strong>
-                          {t('report:complianceReportHistory.renewableTarget')}
-                          :&nbsp;
-                        </strong>
-                        {t('report:assessmentLn1', {
-                          name: report.organization.name,
-                          hasMet:
-                            report.summary.line11FossilDerivedBaseFuelTotal <= 0
-                              ? 'has met'
-                              : 'has not met'
-                        })}
-                      </ListItemText>
-                    </StyledListItem>
-                    <StyledListItem disablePadding>
-                      <ListItemText
-                        primaryTypographyProps={{ variant: 'body4' }}
-                      >
-                        <strong>
-                          {t('report:complianceReportHistory.lowCarbonTarget')}
-                          :&nbsp;
-                        </strong>
-                        {t('report:assessmentLn2', {
-                          name: report.organization.name,
-                          hasMet:
-                            report.summary.line21NonCompliancePenaltyPayable <=
-                            0
-                              ? 'has met'
-                              : 'has not met'
-                        })}
-                      </ListItemText>
-                    </StyledListItem>
-                  </List>
-                )}
-              </StyledListItem>
-            ))}
+
+            {/* GOV users – show assessment lines immediately (top‑level) until Assessed */}
+            {isGovernmentUser && !isCurrentAssessed && <AssessmentLines />}
+
+            {/* History timeline */}
+            {sortedHistory.map((item, index) => {
+              const showNestedAssessment = [
+                COMPLIANCE_REPORT_STATUSES.ASSESSED,
+                'AssessedBy'
+              ].includes(item.status.status)
+
+              return (
+                <StyledListItem key={index} disablePadding>
+                  <ListItemText
+                    data-test="list-item"
+                    primaryTypographyProps={{ variant: 'body4' }}
+                  >
+                    <span
+                      dangerouslySetInnerHTML={{
+                        __html: t(
+                          `report:complianceReportHistory.${item.status.status}`,
+                          {
+                            createDate: timezoneFormatter({
+                              value: item.createDate
+                            }),
+                            displayName:
+                              item.displayName ||
+                              `${item.userProfile.firstName} ${item.userProfile.lastName}`
+                          }
+                        )
+                      }}
+                    />
+                  </ListItemText>
+
+                  {/* Nested assessment – appears once the status is Assessed */}
+                  {showNestedAssessment && (
+                    <List sx={{ p: 0, m: 0 }}>
+                      <AssessmentLines />
+                    </List>
+                  )}
+                </StyledListItem>
+              )
+            })}
           </List>
         </AccordionDetails>
       )}