Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
271b6f5
feat: ts migrate context files
kevin-hashimoto Dec 17, 2025
1b718bb
Fix: BUG - LCFS role switcher formatting
Dec 17, 2025
0fea420
.
Dec 17, 2025
d22ab03
Merge pull request #3627 from bcgov/release-v1.2.1
AlexZorkin Dec 17, 2025
30769bd
Merge pull request #3630 from bcgov/release-v1.2.1
AlexZorkin Dec 17, 2025
cb23ca5
Merge branch 'develop' into feat/kevin-2806
kevin-hashimoto Dec 18, 2025
a18399f
Merge pull request #3621 from bcgov/feat/kevin-2806
kevin-hashimoto Dec 18, 2025
3a96986
chore(deps-dev): bump storybook from 8.6.14 to 8.6.15 in /frontend
dependabot[bot] Dec 18, 2025
05ea5a4
Hotfix: LCFS - BUG - Line 6 values are not displaying
Dec 19, 2025
24a521a
.
Dec 19, 2025
2f8fbeb
Fix: LCFS - BUG - Line 6 values are not displaying
Dec 19, 2025
ab7363e
Fix: LCFS - Rename column header
Dec 19, 2025
2baab10
feat: added c-proxy fuel code prefix, update text on summary line, ch…
AlexZorkin Dec 19, 2025
32a4048
Merge pull request #3640 from bcgov/dependabot/npm_and_yarn/frontend/…
AlexZorkin Dec 19, 2025
5488298
Merge branch 'develop' into fix/prashanth-rename-column-hdr-3646
prv-proton Dec 19, 2025
83eee6b
Merge branch 'develop' into fix/prashanth-role-switcher-format-3569
prv-proton Dec 19, 2025
100ddb1
fix npm error
Dec 19, 2025
b7d0811
.
Dec 19, 2025
53d435f
Merge pull request #3623 from bcgov/fix/prashanth-role-switcher-forma…
prv-proton Dec 19, 2025
47bf584
Merge branch 'develop' into fix/alex-proxy-codes-3618
AlexZorkin Dec 19, 2025
cfcae39
Merge pull request #3648 from bcgov/hotfix/prashanth-report-line6-3638
prv-proton Dec 19, 2025
497c187
feat: added c-proxy fuel code prefix, update text on summary line, ch…
AlexZorkin Dec 19, 2025
ae37bcd
Merge branch 'release' into release-v1.2.1
AlexZorkin Dec 19, 2025
a890940
Merge branch 'main' into release-v1.2.1
AlexZorkin Dec 19, 2025
9f41976
Merge pull request #3653 from bcgov/hotfix/fse-save-fix
AlexZorkin Dec 19, 2025
741a0a3
Merge pull request #3651 from bcgov/fix/alex-proxy-codes-3618
AlexZorkin Dec 19, 2025
beff3b3
Merge branch 'develop' into fix/prashanth-report-lin6-bug-3638
prv-proton Dec 19, 2025
0e55305
Merge pull request #3649 from bcgov/fix/prashanth-report-lin6-bug-3638
prv-proton Dec 19, 2025
e975a7e
Merge branch 'develop' into fix/prashanth-rename-column-hdr-3646
prv-proton Dec 19, 2025
50c6787
Merge pull request #3650 from bcgov/fix/prashanth-rename-column-hdr-3646
prv-proton Dec 19, 2025
b54a351
Merge branch 'develop' into release-v1.2.1
AlexZorkin Dec 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
"""Add C-PROXY fuel code prefix

Revision ID: 7ca5289dff90
Revises: 64ab3b361bde
Create Date: 2025-12-19 14:00:00.000000

"""

import sqlalchemy as sa
from alembic import op

# revision identifiers, used by Alembic.
revision = "7ca5289dff90"
down_revision = "64ab3b361bde"
branch_labels = None
depends_on = None


def upgrade() -> None:
# Add C-PROXY prefix for Canadian proxy fuel codes
connection = op.get_bind()

insert_prefix_sql = sa.text("""
INSERT INTO fuel_code_prefix (fuel_code_prefix_id, prefix)
VALUES (:prefix_id, :prefix)
ON CONFLICT (fuel_code_prefix_id) DO NOTHING
""")

connection.execute(insert_prefix_sql, {
'prefix_id': 4,
'prefix': 'C-PROXY'
})


def downgrade() -> None:
# Remove C-PROXY prefix
connection = op.get_bind()

delete_prefix_sql = sa.text("""
DELETE FROM fuel_code_prefix
WHERE fuel_code_prefix_id = :prefix_id AND prefix = :prefix
""")

connection.execute(delete_prefix_sql, {
'prefix_id': 4,
'prefix': 'C-PROXY'
})
2 changes: 1 addition & 1 deletion backend/lcfs/web/api/compliance_report/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"field": "eligible_renewable_fuel_required",
},
5: {
"description": "Net volume of eligible renewable fuel notionally transferred (received)",
"description": "Net volume of eligible renewable fuel notionally transferred (transferred away)",
"field": "net_notionally_transferred",
},
6: {
Expand Down
73 changes: 31 additions & 42 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"react-i18next": "^15.4.1",
"react-input-mask": "^2.0.4",
"react-leaflet": "^4.2.1",
"react-leaflet-custom-control": "^1.3.2",
"react-leaflet-custom-control": "1.4.0",
"react-number-format": "^5.4.3",
"react-quill": "^2.0.0",
"react-router-dom": "^7.5.2",
Expand Down Expand Up @@ -148,7 +148,7 @@
"prettier": "3.5.3",
"prop-types": "^15.8.1",
"standard": "^17.1.2",
"storybook": "^8.6.10",
"storybook": "^8.6.15",
"typescript": "^5.8.3",
"vite-plugin-terminal": "^1.3.0",
"vitest": "^3.2.4"
Expand Down
1 change: 1 addition & 0 deletions frontend/src/assets/locales/en/finalSupplyEquipment.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"organizationName": "Organization",
"supplyFrom": "Supply date range",
"kwhUsage": "kWh usage",
"supplyDateRange": "Date range of supply",
"supplyFromDate": "Dates of supply from",
"supplyToDate": "Dates of supply to",
"registrationNbr": "Registration #",
Expand Down
23 changes: 0 additions & 23 deletions frontend/src/contexts/AuthorizationContext.jsx

This file was deleted.

44 changes: 44 additions & 0 deletions frontend/src/contexts/AuthorizationContext.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React, {
createContext,
useContext,
useState,
useMemo,
ReactNode
} from 'react'

interface AuthorizationContextValue {
forbidden: boolean
setForbidden: React.Dispatch<React.SetStateAction<boolean>>
}

const AuthorizationContext = createContext<AuthorizationContextValue | null>(null)

interface AuthorizationProviderProps {
children: ReactNode
}

export const AuthorizationProvider = ({ children }: AuthorizationProviderProps) => {
const [forbidden, setForbidden] = useState(false)

const value = useMemo(
() => ({
forbidden,
setForbidden
}),
[forbidden]
)

return (
<AuthorizationContext.Provider value={value}>
{children}
</AuthorizationContext.Provider>
)
}

export const useAuthorization = (): AuthorizationContextValue => {
const context = useContext(AuthorizationContext)
if (!context) {
throw new Error('useAuthorization must be used within an AuthorizationProvider')
}
return context
}
Loading