Merge pull request #4046 from bcgov/fix/alex-build-polish-250316

fix: fse redirect when all draft fse set by idir

Author: AlexZorkin

backend/lcfs/web/api/final_supply_equipment/repo.py

@@ -1005,7 +1005,7 @@ async def get_total_kwh_usage_for_report_group(
         Return total kWh usage for effective FSE records in a report group.
 
         Effective records are derived by keeping the latest record per
-        (charging_equipment_id, charging_equipment_version).
+        equipment group_uuid (which spans all versions of the same equipment).
         """
         conditions = [
             ComplianceReportChargingEquipment.compliance_report_group_uuid
@@ -1016,16 +1016,11 @@ async def get_total_kwh_usage_for_report_group(
 
         dedup_subquery = (
             select(
-                ComplianceReportChargingEquipment.charging_equipment_id.label(
-                    "charging_equipment_id"
-                ),
-                ComplianceReportChargingEquipment.charging_equipment_version.label(
-                    "charging_equipment_version"
-                ),
+                ChargingEquipment.group_uuid.label("equipment_group_uuid"),
                 ComplianceReportChargingEquipment.kwh_usage.label("kwh_usage"),
                 func.row_number()
                 .over(
-                    partition_by=ComplianceReportChargingEquipment.charging_equipment_id,
+                    partition_by=ChargingEquipment.group_uuid,
                     order_by=(
                         desc(ComplianceReportChargingEquipment.charging_equipment_version),
                         desc(
@@ -1035,6 +1030,11 @@ async def get_total_kwh_usage_for_report_group(
                 )
                 .label("row_number"),
             )
+            .join(
+                ChargingEquipment,
+                ChargingEquipment.charging_equipment_id
+                == ComplianceReportChargingEquipment.charging_equipment_id,
+            )
             .where(and_(*conditions))
             .subquery()
         )

frontend/src/hooks/useChargingSite.js

@@ -332,7 +332,10 @@ export const useBulkUpdateEquipmentStatus = (options = {}) => {
         queryClient.invalidateQueries({
           queryKey: ['charging-site-equipment-paginated']
         })
-        // 3. Invalidate all charging sites by organization queries
+        // 3. Invalidate all charging sites list queries (both IDIR and org)
+        queryClient.invalidateQueries({
+          queryKey: ['chargingSitesAll']
+        })
         queryClient.invalidateQueries({
           queryKey: ['chargingSitesByOrg']
         })

frontend/src/hooks/useFSEProcessing.js

@@ -48,6 +48,10 @@ export const useFSEProcessing = (siteId) => {
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ['fse-processing'] })
       queryClient.invalidateQueries({ queryKey: ['charging-equipment'] })
+      // Invalidate charging site list queries so the site disappears if all FSE are now draft
+      queryClient.invalidateQueries({ queryKey: ['chargingSitesAll'] })
+      queryClient.invalidateQueries({ queryKey: ['chargingSitesByOrg'] })
+      queryClient.invalidateQueries({ queryKey: ['chargingSite'] })
     }
   })
 

frontend/src/views/ChargingSite/__tests__/components/ChargingSiteFSEGrid.test.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
+import { render, screen, fireEvent, waitFor } from '@testing-library/react'
 import { ChargingSiteFSEGrid } from '../../components/ChargingSiteFSEGrid'
 import { wrapper } from '@/tests/utils/wrapper.jsx'
 
@@ -30,6 +30,32 @@ vi.mock('@/components/BCDataGrid/BCGridViewer.jsx', () => ({
       >
         Row Click
       </button>
+      <button
+        onClick={() =>
+          props.gridOptions?.onSelectionChanged?.({
+            api: {
+              getSelectedNodes: () => [
+                { data: { chargingEquipmentId: 2, status: { status: 'Validated' } } }
+              ]
+            }
+          })
+        }
+      >
+        Select Validated
+      </button>
+      <button
+        onClick={() =>
+          props.gridOptions?.onSelectionChanged?.({
+            api: {
+              getSelectedNodes: () => [
+                { data: { chargingEquipmentId: 3, status: { status: 'Submitted' } } }
+              ]
+            }
+          })
+        }
+      >
+        Select Submitted
+      </button>
     </div>
   ))
 }))
@@ -52,6 +78,16 @@ describe('ChargingSiteFSEGrid', () => {
         chargingEquipmentId: 1,
         status: { status: 'Draft' },
         registrationNumber: 'REG001'
+      },
+      {
+        chargingEquipmentId: 2,
+        status: { status: 'Validated' },
+        registrationNumber: 'REG002'
+      },
+      {
+        chargingEquipmentId: 3,
+        status: { status: 'Submitted' },
+        registrationNumber: 'REG003'
       }
     ],
     status: { status: 'Draft' },
@@ -250,4 +286,40 @@ describe('ChargingSiteFSEGrid', () => {
       )
     })
   })
+
+  describe('Return to draft button rules', () => {
+    it('disables Return to draft for IDIR when a Validated row is selected', async () => {
+      const idirProps = {
+        ...mockProps,
+        isIDIR: true,
+        hasAnyRole: vi.fn(() => true),
+        hasRoles: vi.fn((role) => role === 'analyst')
+      }
+      render(<ChargingSiteFSEGrid {...idirProps} />, { wrapper })
+
+      fireEvent.click(screen.getByText('Select Validated'))
+
+      await waitFor(() => {
+        expect(
+          screen.getByRole('button', {
+            name: 'chargingSite:buttons.returnSelectedToDraft'
+          })
+        ).toBeDisabled()
+      })
+    })
+
+    it('keeps Return to draft enabled for non-IDIR when a Validated row is selected', async () => {
+      render(<ChargingSiteFSEGrid {...mockProps} />, { wrapper })
+
+      fireEvent.click(screen.getByText('Select Validated'))
+
+      await waitFor(() => {
+        expect(
+          screen.getByRole('button', {
+            name: 'chargingSite:buttons.returnSelectedToDraft'
+          })
+        ).toBeEnabled()
+      })
+    })
+  })
 })

frontend/src/views/ChargingSite/components/ChargingSiteFSEGrid.jsx

@@ -70,16 +70,18 @@ export const ChargingSiteFSEGrid = ({
     return selectedEquipment.every((eq) => eq.status.status === 'Draft' || eq.status.status === 'Updated')
   }, [selectedRows, equipmentList])
 
-  // Check if selected equipment can be returned to draft (only from Submitted or Validated status)
+  // Check if selected equipment can be returned to draft (only from Submitted status)
   const canReturnToDraft = useMemo(() => {
     if (selectedRows.length === 0) return false
     const selectedEquipment = equipmentList.filter((eq) =>
       selectedRows.includes(eq.chargingEquipmentId)
     )
-    return selectedEquipment.every((eq) => 
-      eq.status.status === 'Submitted' || eq.status.status === 'Validated'
+    return selectedEquipment.every((eq) =>
+      isIDIR
+        ? eq.status.status === 'Submitted'
+        : eq.status.status === 'Submitted' || eq.status.status === 'Validated'
     )
-  }, [selectedRows, equipmentList])
+  }, [selectedRows, equipmentList, isIDIR])
 
   // Check if selected equipment can be validated (only from Submitted status)
   const canValidate = useMemo(() => {
@@ -195,6 +197,20 @@ export const ChargingSiteFSEGrid = ({
           equipmentIds: selectedRows,
           newStatus
         })
+
+        // If moving to Draft, check if all equipment on this site will now be Draft
+        if (newStatus === 'Draft') {
+          const allWillBeDraft = equipmentList.every(
+            (eq) =>
+              selectedRows.includes(eq.chargingEquipmentId) ||
+              eq.status.status === 'Draft'
+          )
+          if (allWillBeDraft) {
+            navigate(ROUTES.REPORTS.CHARGING_SITE.INDEX)
+            return
+          }
+        }
+
         refetch()
         handleClearFilters()
         alertRef.current?.triggerAlert({
@@ -211,7 +227,7 @@ export const ChargingSiteFSEGrid = ({
         setModalData(null)
       }
     },
-    [selectedRows, siteId, bulkUpdateStatus, handleClearFilters]
+    [selectedRows, siteId, bulkUpdateStatus, handleClearFilters, equipmentList, navigate]
   )
 
   const gridOptions = useMemo(

frontend/src/views/FSEProcessing/FSEProcessing.jsx

@@ -234,6 +234,21 @@ export const FSEProcessing = () => {
     const equipmentIds = selectedRows.map((row) => row.charging_equipment_id)
     try {
       const result = await returnToDraft(equipmentIds)
+
+      // Check if all equipment on this site will now be Draft
+      let allWillBeDraft = true
+      gridRef.current?.api?.forEachNode((node) => {
+        const isDraftTarget = equipmentIds.includes(node.data.charging_equipment_id)
+        if (!isDraftTarget && node.data.status !== 'Draft') {
+          allWillBeDraft = false
+        }
+      })
+
+      if (allWillBeDraft) {
+        navigate(ROUTES.REPORTS.CHARGING_SITE.INDEX)
+        return
+      }
+
       alertRef.current?.triggerAlert({
         message: result.message,
         severity: 'success'