feat: Move Assessment Statement into history

* Combine HistoryCard.tests into a single file
* Add new tests for assessment statement
* default expand first history item

Author: dhaselhan

frontend/src/assets/locales/en/reports.json

@@ -179,7 +179,8 @@
     "AssessedBy": "Assessed {{createDate}} by the director under the <i>Low Carbon Fuels Act.</i>",
     "Reassessed": "Re-assessed",
     "renewableTarget": "Renewable fuel target",
-    "lowCarbonTarget": "Low carbon fuel target"
+    "lowCarbonTarget": "Low carbon fuel target",
+    "directorStatement": "Assessment statement from the director"
   },
   "internalComments": "Internal comments",
   "fuelLabels": {
@@ -202,8 +203,6 @@
   "reportAssessed": "Compliance report, Assessed",
   "changelog": "Change log",
   "documentLabel": "Add file attachments (maximum file size: 50 MB):",
-  "assessmentStatement": "Assessment statement from the director",
-  "assessmentStatementEdit": "(can be edited below)",
   "assessmentRecommendation": "Assessment recommendation",
   "directorStatement": "Director assessment statement to the organization (optional)",
   "assessmentStatementInstructions": "The analyst and/or compliance manager can draft an assessment statement to the organization. The director can edit or delete this statement. This is suggested when making analyst adjustments or reassessments.",

frontend/src/hooks/useCurrentUser.js

@@ -21,7 +21,9 @@ export const useCurrentUser = () => {
     onSuccess: setUser,
     onError: (error) => {
       console.error('Error fetching current user:', error)
-    }
+    },
+    staleTime: 5 * (60 * 1000), // 5 mins
+    cacheTime: 10 * (60 * 1000) // 10 mins
   })
 
   /**

frontend/src/views/ComplianceReports/__tests__/HistoryCard.test.jsx

@@ -134,39 +134,6 @@ export const AssessmentCard = ({
                 setIsEditing={setIsEditing}
               />
             )}
-            {((!isGovernmentUser &&
-              ['Assessed', 'Reassessed', 'Rejected'].includes(
-                reportData.report.currentStatus?.status
-              )) ||
-              isGovernmentUser) && (
-              <>
-                <BCTypography
-                  sx={{ paddingTop: '16px' }}
-                  component="div"
-                  variant="h6"
-                  color="primary"
-                >
-                  {t('report:assessmentStatement')}
-                  {((hasRoles('Analyst') && currentStatus === 'Submitted') ||
-                    (hasRoles('Compliance Manager') &&
-                      currentStatus === 'Recommended by analyst') ||
-                    (hasRoles('Director') &&
-                      currentStatus === 'Recommended by manager')) && (
-                    <span style={{ color: 'red' }}>
-                      {' '}
-                      {t('report:assessmentStatementEdit')}
-                    </span>
-                  )}
-                </BCTypography>
-                <List sx={{ padding: 0 }}>
-                  <StyledListItem>
-                    <ListItemText primaryTypographyProps={{ variant: 'body4' }}>
-                      {reportData.report.assessmentStatement || 'N/A'}
-                    </ListItemText>
-                  </StyledListItem>
-                </List>
-              </>
-            )}
             {filteredChain.length > 0 &&
               currentStatus !== COMPLIANCE_REPORT_STATUSES.DRAFT && (
                 <>
@@ -178,8 +145,12 @@ export const AssessmentCard = ({
                   >
                     {t('report:reportHistory')}
                   </BCTypography>
-                  {filteredChain.map((report) => (
-                    <HistoryCard key={report.version} report={report} />
+                  {filteredChain.map((report, index) => (
+                    <HistoryCard
+                      defaultExpanded={index === 0}
+                      key={report.version}
+                      report={report}
+                    />
                   ))}
                 </>
               )}

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

@@ -45,7 +45,7 @@ const AccordionDetails = styled(MuiAccordionDetails)(() => ({
   paddingBottom: 0
 }))
 
-export const HistoryCard = ({ report }) => {
+export const HistoryCard = ({ report, defaultExpanded = false }) => {
   const { data: currentUser } = useCurrentUser()
   const isGovernmentUser = currentUser?.isGovernmentUser
   const { t } = useTranslation(['report'])
@@ -70,7 +70,7 @@ export const HistoryCard = ({ report }) => {
   }, [isGovernmentUser, report.history])
 
   return (
-    <Accordion>
+    <Accordion defaultExpanded={defaultExpanded}>
       <AccordionSummary
         expandIcon={<ExpandMore sx={{ width: '2rem', height: '2rem' }} />}
         aria-controls="panel1-content"
@@ -107,9 +107,11 @@ export const HistoryCard = ({ report }) => {
                     }}
                   />
                 </ListItemText>
-                {item.status.status === COMPLIANCE_REPORT_STATUSES.ASSESSED && (
+                {[COMPLIANCE_REPORT_STATUSES.ASSESSED, 'AssessedBy'].includes(
+                  item.status.status
+                ) && (
                   <List sx={{ p: 0, m: 0 }}>
-                    <StyledListItem key={index} disablePadding>
+                    <StyledListItem disablePadding>
                       <ListItemText
                         primaryTypographyProps={{ variant: 'body4' }}
                       >
@@ -126,7 +128,7 @@ export const HistoryCard = ({ report }) => {
                         })}
                       </ListItemText>
                     </StyledListItem>
-                    <StyledListItem key={index} disablePadding>
+                    <StyledListItem disablePadding>
                       <ListItemText
                         primaryTypographyProps={{ variant: 'body4' }}
                       >
@@ -144,6 +146,21 @@ export const HistoryCard = ({ report }) => {
                         })}
                       </ListItemText>
                     </StyledListItem>
+                    {report.assessmentStatement && (
+                      <StyledListItem disablePadding>
+                        <ListItemText
+                          primaryTypographyProps={{ variant: 'body4' }}
+                        >
+                          <strong>
+                            {t(
+                              'report:complianceReportHistory.directorStatement'
+                            )}
+                            :&nbsp;
+                          </strong>
+                          {report.assessmentStatement}
+                        </ListItemText>
+                      </StyledListItem>
+                    )}
                   </List>
                 )}
               </StyledListItem>