Merge pull request #4050 from bcgov/chore/merge-back-release-260316

Chore: Merge back release 260316

Author: AlexZorkin

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

@@ -1018,7 +1018,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
@@ -1029,16 +1029,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(
@@ -1048,6 +1043,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/components/ChargingSiteFSEGrid.jsx

@@ -70,7 +70,7 @@ 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) =>
@@ -198,6 +198,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({
@@ -214,7 +228,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'