Always show supportind documents and edit based on conditions

bcgov · Dec 16, 2024 · 912048e · 912048e
1 parent b20a84b
commit 912048e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/frontend/src/views/ComplianceReports/components/ReportDetails.jsx b/frontend/src/views/ComplianceReports/components/ReportDetails.jsx
@@ -40,7 +40,7 @@ const ReportDetails = ({ currentStatus = 'Draft', isAnalystRole }) => {
   const navigate = useNavigate()
 
   const [isFileDialogOpen, setFileDialogOpen] = useState(false)
-  const showSupportingDocs = useMemo(() => {
+  const editSupportingDocs = useMemo(() => {
     return isAnalystRole && (
       currentStatus === COMPLIANCE_REPORT_STATUSES.SUBMITTED ||
       currentStatus === COMPLIANCE_REPORT_STATUSES.ASSESSED
@@ -86,7 +86,7 @@ const ReportDetails = ({ currentStatus = 'Draft', isAnalystRole }) => {
             />
           </>
         ),
-        condition: showSupportingDocs
+        condition: true
       },
       {
         name: t('report:activityLists.supplyOfFuel'),
@@ -230,7 +230,7 @@ const ReportDetails = ({ currentStatus = 'Draft', isAnalystRole }) => {
       {activityList.map((activity, index) => {
         const { data, error, isLoading } = activity.useFetch(complianceReportId)
         return (
-          ((activity.name === t('report:supportingDocs') ? showSupportingDocs : (data && !isArrayEmpty(data)))) && (
+          (data && !isArrayEmpty(data) || activity.name === t('report:supportingDocs')) && (
             <Accordion
               key={index}
               expanded={activity.name === t('report:supportingDocs') ? expanded.includes(`panel${index}`) && !isArrayEmpty(data) : expanded.includes(`panel${index}`)}
@@ -251,7 +251,9 @@ const ReportDetails = ({ currentStatus = 'Draft', isAnalystRole }) => {
                   component="div"
                 >
                   {activity.name}&nbsp;&nbsp;
-                  <Role
+                  {editSupportingDocs && (
+                    <>
+                      <Role
                         roles={[
                           roles.supplier,
                           roles.compliance_reporting,
@@ -271,6 +273,8 @@ const ReportDetails = ({ currentStatus = 'Draft', isAnalystRole }) => {
                           />
                         </IconButton>
                       </Role>
+                    </>
+                  )}
                 </BCTypography>
               </AccordionSummary>
               <AccordionDetails>