Merge branch 'develop' into feat/hamed-charging-site-status-override-3793

Author: AlexZorkin

backend/lcfs/tests/final_supply_equipment/test_final_supply_equipment_repo.py

@@ -411,6 +411,42 @@ async def test_check_overlap_within_current_report_only(repo, fake_db):
     assert result is True  # Should detect overlap within current report
 
 
+@pytest.mark.anyio
+async def test_check_overlap_different_charging_site_not_blocked(repo, fake_db):
+    """
+    Test that same serial number at a different Charging site (different postal_code/lat/lon)
+    does not trigger an overlap — the query must scope to the same location.
+    The mock returns False, simulating no match found when location differs.
+    """
+    from lcfs.web.api.final_supply_equipment.schema import (
+        FinalSupplyEquipmentCreateSchema,
+    )
+    from datetime import date
+
+    fse_record = FinalSupplyEquipmentCreateSchema(
+        compliance_report_id=400,
+        supply_from_date=date(2024, 1, 1),
+        supply_to_date=date(2024, 12, 31),
+        serial_nbr="RELOCATED_SERIAL",
+        postal_code="V8V 1V1",  # different site
+        latitude=48.425,
+        longitude=-123.365,
+        manufacturer="Test Manufacturer",
+        level_of_equipment="Level 2",
+        intended_use_types=["Public charging"],
+        intended_user_types=["Test"],
+        street_address="789 New Site Rd",
+        city="Victoria",
+        organization_name="Test Org",
+    )
+
+    # Simulate no overlap found because location conditions filter it out
+    fake_db.execute.return_value = FakeResult([False])
+
+    result = await repo.check_overlap_of_fse_row(fse_record)
+    assert result is False  # Different Charging site — should not be blocked
+
+
 @pytest.mark.anyio
 async def test_get_fse_reporting_list_paginated(repo, fake_db):
     """Test getting paginated FSE reporting list"""

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

@@ -494,6 +494,9 @@ async def check_overlap_of_fse_row(
                 FinalSupplyEquipment.supply_to_date >= row.supply_from_date,
             ),
             FinalSupplyEquipment.serial_nbr == row.serial_nbr,
+            FinalSupplyEquipment.postal_code == row.postal_code,
+            FinalSupplyEquipment.latitude == row.latitude,
+            FinalSupplyEquipment.longitude == row.longitude,
         ]
 
         if row.final_supply_equipment_id is not None:

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

@@ -48,7 +48,7 @@ async def check_equipment_uniqueness_and_overlap(
         is_overlapping = await self.fse_repo.check_overlap_of_fse_row(data)
         if is_overlapping:
             raise ValueError(
-                f"Date range overlap found for equipment with serial number {data.serial_nbr} at the same or different location."
+                f"Date range overlap found for equipment with serial number {data.serial_nbr} at the same Charging site."
             )
 
         return True  # If no duplicates or overlaps found

frontend/cypress/e2e/accessibility.cy.js

@@ -21,7 +21,7 @@ describe('Accessibility Tests for LCFS', () => {
         Cypress.env('ADMIN_IDIR_USERNAME'),
         Cypress.env('ADMIN_IDIR_PASSWORD')
       )
-      cy.wait(5000)
+      cy.get('.main-layout-navbar', { timeout: 30000 }).should('be.visible')
       cy.injectAxe() // Injects the axe-core library
       cy.checkA11y(null, null, terminalLog)
     })
@@ -36,9 +36,8 @@ describe('Accessibility Tests for LCFS', () => {
         Cypress.env('ADMIN_IDIR_USERNAME'),
         Cypress.env('ADMIN_IDIR_PASSWORD')
       )
-      cy.wait(5000)
+      cy.getByDataTest('bc-navbar', { timeout: 30000 }).should('be.visible')
       cy.injectAxe() // Injects the axe-core library
-      cy.getByDataTest('bc-navbar').should('exist')
       cy.getByDataTest('bc-navbar').within(() => {
         cy.checkA11y(null, null, terminalLog)
       })

frontend/cypress/e2e/admin.cy.js

@@ -31,9 +31,12 @@ describe('Admin view happy paths', () => {
     ]
 
     cy.visit('/admin/users', { timeout: 30000 })
+    cy.getByDataTest('bc-grid-container', { timeout: 30000 }).should('exist')
 
     tabs.forEach(({ label, path, panelIndex }) => {
-      cy.contains('[role="tab"]', label, { timeout: 10000 }).click()
+      cy.contains('[role="tab"]', label, { timeout: 10000 })
+        .should('be.visible')
+        .click()
       cy.location('pathname', { timeout: 30000 }).should('eq', path)
       cy.get(
         `#full-width-AdminTabPanel-${panelIndex} [data-test="bc-grid-container"]`,

frontend/cypress/e2e/charging_equipment_and_fse_reporting.cy.js

@@ -214,10 +214,12 @@ describe('ChargingEquipment create/edit/list filters/download', () => {
     cy.wait(['@orgNames', '@equipmentList'])
 
     cy.contains('.filter-toolbar', 'Show FSE for:', { timeout: 30000 })
+      .should('be.visible')
       .find('input')
       .first()
+      .should('be.visible')
       .type('LCFS Org 2')
-    cy.contains('li', 'LCFS Org 2', { timeout: 30000 }).click()
+    cy.contains('li', 'LCFS Org 2', { timeout: 30000 }).should('be.visible').click()
     cy.wait('@equipmentListFiltered').its('request.body.organization_id').should('eq', 1002)
 
     cy.getByDataTest('download-fse-excel', { timeout: 30000 }).click()
@@ -357,10 +359,12 @@ describe('FSE Reporting grid interactions + save flow', () => {
       'be.visible'
     )
 
-    cy.get('#site-selector input', { timeout: 30000 }).type(
-      'Cypress Charging Site'
-    )
-    cy.contains('li', 'Cypress Charging Site', { timeout: 30000 }).click()
+    cy.get('#site-selector input', { timeout: 30000 })
+      .should('be.visible')
+      .type('Cypress Charging Site')
+    cy.contains('li', 'Cypress Charging Site', { timeout: 30000 })
+      .should('be.visible')
+      .click()
     cy.wait('@fseReportingListFiltered')
 
     cy.contains('.ag-row', 'REG-8001', { timeout: 30000 })

frontend/cypress/e2e/charging_sites_fse_workflows.cy.js

@@ -396,19 +396,30 @@ describe('Charging Site and FSE supplier workflows', () => {
     cy.visit('/compliance-reporting/fse', { timeout: 30000 })
     cy.wait('@chargingEquipmentList')
 
-    cy.contains('button', 'Select all Draft/Updated', { timeout: 30000 }).click()
-    cy.contains('button', 'Submit selected').click()
+    cy.contains('button', 'Select all Draft/Updated', { timeout: 30000 })
+      .should('be.visible')
+      .click()
+    cy.contains('button', 'Submit selected', { timeout: 30000 })
+      .should('be.visible')
+      .click()
+    // Click the confirmation button in the modal
     cy.contains('button', 'Submit selected', { timeout: 30000 }).last().click()
     cy.wait('@bulkSubmit')
-    cy.getByDataTest('alert-box').should('contain', 'submitted')
+    cy.getByDataTest('alert-box', { timeout: 30000 }).should('contain', 'submitted')
 
-    cy.contains('button', 'Select all Validated', { timeout: 30000 }).click()
-    cy.contains('button', 'Set to Decommissioned').first().click()
+    cy.contains('button', 'Select all Validated', { timeout: 30000 })
+      .should('be.visible')
+      .click()
+    cy.contains('button', 'Set to Decommissioned', { timeout: 30000 })
+      .should('be.visible')
+      .first()
+      .click()
+    // Click the confirmation button in the modal
     cy.contains('button', 'Set to Decommissioned', { timeout: 30000 })
       .last()
       .click()
     cy.wait('@bulkDecommission')
-    cy.getByDataTest('alert-box').should('contain', 'decommissioned')
+    cy.getByDataTest('alert-box', { timeout: 30000 }).should('contain', 'decommissioned')
   })
 })
 
@@ -499,13 +510,18 @@ describe('FSE processing and map workflows (IDIR)', () => {
     cy.contains('h5, h6', 'Charging site/FSE processing', {
       timeout: 30000
     }).should('be.visible')
-    cy.contains('button', 'Select all submitted').click()
-    cy.contains('button', 'Set selected as validated').click()
+    cy.contains('button', 'Select all submitted', { timeout: 30000 })
+      .should('be.visible')
+      .click()
+    cy.contains('button', 'Set selected as validated', { timeout: 30000 })
+      .should('be.visible')
+      .click()
+    // Click the confirmation button in the modal
     cy.contains('button', 'Validate Equipment', { timeout: 30000 })
       .last()
       .click()
     cy.wait('@bulkValidate')
-    cy.getByDataTest('alert-box').should('contain', 'Validated')
+    cy.getByDataTest('alert-box', { timeout: 30000 }).should('contain', 'Validated')
   })
 
   it('renders the FSE map view and supports interactions', () => {

frontend/cypress/e2e/dashboard.cy.js

@@ -17,7 +17,9 @@ describe('Dashboard view coverage', () => {
     cy.getByDataTest('dashboard-admin-links-card', {
       timeout: 30000
     }).should('be.visible')
-    cy.getByDataTest('admin-link-admin-users').click()
+    cy.getByDataTest('admin-link-admin-users', { timeout: 30000 })
+      .should('be.visible')
+      .click()
     cy.location('pathname', { timeout: 30000 }).should('eq', '/admin/users')
   })
 

frontend/cypress/e2e/notifications.cy.js

@@ -65,6 +65,7 @@ describe('Notifications view flows', () => {
     cy.getByDataTest('select-all').click()
     cy.getByDataTest('select-all').click()
 
+    // Note: data-test="mark-as-unread" is actually the delete button
     cy.getByDataTest('mark-as-unread').should('not.be.disabled').click()
     cy.wait('@deleteNotifications')
       .its('request.body')