Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tracking pull request to merge release-0.2.0 to main #282

Open
wants to merge 3,096 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3096 commits
Select commit Hold shift + click to select a range
af78b94
feat: Fix Bad Transaction Times
dhaselhan Jan 12, 2025
29e2194
Merge branch 'release-0.2.0' into fix/prashanth-cr-text-bugs-1593-1625
prv-proton Jan 13, 2025
883175a
Merge pull request #1662 from bcgov/fix/prashanth-cr-text-bugs-1593-1625
prv-proton Jan 13, 2025
3a49351
feat: Re-enable Cypress Daily
dhaselhan Jan 12, 2025
53d54d9
fix: Set max width and re-use plain style
dhaselhan Jan 13, 2025
76355a3
Merge branch 'release-0.2.0' into fix/daniel-xlsx-large-rows-1664
hamed-valiollahi Jan 13, 2025
f5502a3
Merge branch 'release-0.2.0' into feat/kevin-1583
kevin-hashimoto Jan 13, 2025
9f95b0b
Merge branch 'release-0.2.0' into feat/daniel-cypress-daily-1645
prv-proton Jan 13, 2025
aa796f7
Merge branch 'release-0.2.0' into fix/daniel-lock-summary-on-submit-1643
prv-proton Jan 13, 2025
5d00b88
Merge pull request #1676 from bcgov/fix/daniel-xlsx-large-rows-1664
dhaselhan Jan 13, 2025
631b64f
fix: migration revision fix
kevin-hashimoto Jan 13, 2025
b82ffc2
Merge branch 'release-0.2.0' into feat/kevin-1583
kevin-hashimoto Jan 13, 2025
f40b33e
feat: Add CR Transactions to Transactions view
dhaselhan Jan 13, 2025
4660292
Merge branch 'release-0.2.0' into feat/daniel-cypress-daily-1645
dhaselhan Jan 13, 2025
336f089
Merge pull request #1673 from bcgov/feat/daniel-cypress-daily-1645
dhaselhan Jan 13, 2025
55a1b83
Merge branch 'release-0.2.0' into feat/kevin-1583
kevin-hashimoto Jan 13, 2025
ef519fd
feat: More Cypress Fixes
dhaselhan Jan 13, 2025
bfaa08e
Merge branch 'release-0.2.0' into fix/daniel-lock-summary-on-submit-1643
prv-proton Jan 14, 2025
336ed05
feat: setup unauthorized page and redirect for users without LCFS access
hamed-valiollahi Jan 14, 2025
d65536f
fix: LCFS - BUG - Comments on transfers from government users not sho…
Jan 14, 2025
ec8733c
fix: resolve failing front-end tests
hamed-valiollahi Jan 14, 2025
8e93299
Merge pull request #1653 from bcgov/fix/daniel-lock-summary-on-submit…
dhaselhan Jan 14, 2025
0702c5d
Merge branch 'release-0.2.0' into feat/hamed-unauthorized-page-1616
hamed-valiollahi Jan 14, 2025
9e1ef3c
Merge branch 'release-0.2.0' into fix/alex-marine-1498
prv-proton Jan 14, 2025
b1e76d1
Merge pull request #1681 from bcgov/feat/hamed-unauthorized-page-1616
hamed-valiollahi Jan 14, 2025
e3528b7
Merge branch 'release-0.2.0' into feat/daniel-etl-transaction-dates-2949
dhaselhan Jan 14, 2025
5a8055d
Merge branch 'release-0.2.0' into feat/kevin-1583
hamed-valiollahi Jan 14, 2025
6bf9be7
Merge pull request #1674 from bcgov/feat/daniel-etl-transaction-dates…
dhaselhan Jan 14, 2025
fe3910b
Merge branch 'release-0.2.0' into feat/kevin-1583
kevin-hashimoto Jan 14, 2025
0132dce
Merge pull request #1660 from bcgov/feat/kevin-1583
kevin-hashimoto Jan 14, 2025
54d34ac
feat: dashboard layout
kevin-hashimoto Jan 14, 2025
3268065
Merge remote-tracking branch 'origin/release-0.2.0' into feat/kevin-1588
kevin-hashimoto Jan 14, 2025
162794b
Fix: Separate where clauses for compliance report
dhaselhan Jan 14, 2025
5ff452e
Merge branch 'release-0.2.0' into fix/prashanth-comments-fix-1636
prv-proton Jan 14, 2025
8fc9f25
fix: Rename Labels and Fix User Name Search
dhaselhan Jan 14, 2025
051000f
fix: disable Category D checkbox for Analysts after transfer recommen…
hamed-valiollahi Jan 14, 2025
ad43ee1
Merge branch 'release-0.2.0' into dependabot/pip/backend/jinja2-3.1.5
AlexZorkin Jan 14, 2025
2eab8de
Merge branch 'release-0.2.0' into update-node-version-0.2.0
AlexZorkin Jan 14, 2025
06e08dc
fix: etl buy transfer
Jan 14, 2025
0799ffd
chore: merge release
Jan 14, 2025
cb32125
fix: fixed migration order
Jan 14, 2025
c29ff14
Merge pull request #1689 from bcgov/fix/hamed-disable-category-d-chec…
hamed-valiollahi Jan 14, 2025
43a5e10
Merge branch 'release-0.2.0' into fix/prashanth-comments-fix-1636
prv-proton Jan 14, 2025
1720352
chore: merge release
Jan 14, 2025
e019324
chore: merge release
Jan 14, 2025
39e2560
Merge branch 'release-0.2.0' into fix/alex-etl-polish-250109
AlexZorkin Jan 14, 2025
db9edee
updates
Jan 14, 2025
2c43551
fix: Add all empty sets for page options
dhaselhan Jan 14, 2025
b36508b
Code Review Feedback
dhaselhan Jan 14, 2025
1619227
Merge branch 'release-0.2.0' into fix/daniel-fixing-cypress
dhaselhan Jan 14, 2025
ee48a13
Merge pull request #1680 from bcgov/fix/daniel-fixing-cypress
dhaselhan Jan 14, 2025
293fb02
Merge branch 'release-0.2.0' into fix/daniel-fix-compliance-filtering…
dhaselhan Jan 14, 2025
4a4b44e
Merge pull request #1685 from bcgov/fix/daniel-fix-compliance-filteri…
dhaselhan Jan 14, 2025
f1fa504
Merge branch 'release-0.2.0' into feat/daniel-add-cr-transactions-1668
dhaselhan Jan 14, 2025
d9431cd
Merge branch 'release-0.2.0' into dependabot/pip/backend/jinja2-3.1.5
AlexZorkin Jan 14, 2025
cf8642e
clear filters button for all components except User Activity.
areyeslo Jan 9, 2025
db7698a
User Activity with clear filters button
areyeslo Jan 9, 2025
d1f9875
Filters using BCGridViewer
areyeslo Jan 10, 2025
000af60
Updated components using BCDataGridServer to use useCallback
areyeslo Jan 10, 2025
e01d9d8
styling to ClearFiltersButton component
areyeslo Jan 11, 2025
34bf765
styling for view organizations
areyeslo Jan 11, 2025
22309e0
Merge pull request #1678 from bcgov/feat/daniel-add-cr-transactions-1668
dhaselhan Jan 14, 2025
7c0fb96
Merge branch 'release-0.2.0' into LCFS-1539-AddClearFiltersButton
areyeslo Jan 14, 2025
fe834d0
Merge branch 'release-0.2.0' into fix/alex-etl-polish-250109
prv-proton Jan 15, 2025
c3f4bd3
feat: mv fuel codes count
kevin-hashimoto Jan 15, 2025
7ec5634
Merge remote-tracking branch 'origin/release-0.2.0' into feat/kevin-1588
kevin-hashimoto Jan 15, 2025
17e513a
fix: migration fix
kevin-hashimoto Jan 15, 2025
7710481
Merge pull request #1670 from bcgov/LCFS-1539-AddClearFiltersButton
areyeslo Jan 15, 2025
b76dd96
Merge branch 'release-0.2.0' into fix/daniel-full-name-search-1661
dhaselhan Jan 15, 2025
a75832d
Merge branch 'release-0.2.0' into fix/alex-etl-polish-250109
AlexZorkin Jan 15, 2025
d164431
Merge pull request #1688 from bcgov/fix/daniel-full-name-search-1661
dhaselhan Jan 15, 2025
9e3a9d9
feat: clean up script extended
Jan 15, 2025
d4f9454
Merge branch 'release-0.2.0' into feat/alex-etl-updates-250114
AlexZorkin Jan 15, 2025
1709234
Merge branch 'release-0.2.0' into fix/alex-etl-polish-250109
AlexZorkin Jan 15, 2025
0c01e6f
fix: migration order
Jan 15, 2025
e26330d
Merge branch 'release-0.2.0' into dependabot/pip/backend/jinja2-3.1.5
AlexZorkin Jan 15, 2025
8b557b8
fix for keycloak username
Jan 15, 2025
dac285e
Merge branch 'release-0.2.0' into fix/prashanth-comments-fix-1636
prv-proton Jan 15, 2025
2b50799
Organiation status fix for archived orgs
Jan 15, 2025
797c2e9
fix: setup unauthorized page and redirect for LCFS
hamed-valiollahi Jan 15, 2025
1be85d8
Merge pull request #1682 from bcgov/fix/prashanth-comments-fix-1636
prv-proton Jan 15, 2025
d80a6aa
fix: merge transfer etl
Jan 15, 2025
18d6f48
Merge branch 'release-0.2.0' into fix/daniel-always-return-options-1677
dhaselhan Jan 15, 2025
a8154e9
Merge pull request #1692 from bcgov/fix/alex-etl-polish-250109
AlexZorkin Jan 15, 2025
55e4409
Merge branch 'release-0.2.0' into dependabot/pip/backend/jinja2-3.1.5
AlexZorkin Jan 15, 2025
047e736
Merge branch 'release-0.2.0' into fix/daniel-always-return-options-1677
dhaselhan Jan 15, 2025
a74b0d5
Merge branch 'release-0.2.0' into fix/alex-marine-1498
AlexZorkin Jan 15, 2025
bf6f54d
Remove previous filters
areyeslo Jan 15, 2025
4c3d338
feat: parse location and assign to appropriate lcfs fields
kevin-hashimoto Jan 15, 2025
8cb85dc
Merge pull request #1695 from bcgov/fix/daniel-always-return-options-…
dhaselhan Jan 15, 2025
7878da1
Merge branch 'release-0.2.0' into fix/prashanth-org-status-etl-1649
prv-proton Jan 15, 2025
cf2d749
Merge pull request #1617 from bcgov/dependabot/pip/backend/jinja2-3.1.5
AlexZorkin Jan 15, 2025
ab41acc
fix: Update Cypress Tests
dhaselhan Jan 15, 2025
cdd8a68
chore: merge release
Jan 15, 2025
c86905f
fix: migration order
Jan 15, 2025
57aeb0e
feat: Check and refresh token on each click
dhaselhan Jan 12, 2025
3e7de7a
Code Review Feedback
dhaselhan Jan 15, 2025
ca77fb4
Update cron-cleanup-workflow-runs.yaml (#1710)
kuanfandevops Jan 16, 2025
56e1950
Merge branch 'release-0.2.0' into fix/alex-marine-1498
AlexZorkin Jan 16, 2025
739f08a
Merge branch 'release-0.2.0' into fix/prashanth-org-status-etl-1649
prv-proton Jan 16, 2025
dd9a166
Adding enter key functionality to select editor in ag-grid.
Jan 16, 2025
b10e03b
Merge branch 'release-0.2.0' into feat/daniel-token-refresh-1624
dhaselhan Jan 16, 2025
7359549
Merge branch 'release-0.2.0' into feat/alex-etl-updates-250114
prv-proton Jan 16, 2025
10b4a5a
Merge branch 'release-0.2.0' into LCFS-1706-ClearFiltersOnDashboard
areyeslo Jan 16, 2025
dc3f336
fix: Include approved and assessed transactions for Orgs
dhaselhan Jan 16, 2025
3d94f3e
Merge branch 'release-0.2.0' into feat/daniel-fix-cypress-tests
hamed-valiollahi Jan 16, 2025
24abeda
feat: new fuel code etl script
kevin-hashimoto Jan 16, 2025
f6accaf
Merge branch 'release-0.2.0' into feat/kevin-1602
kevin-hashimoto Jan 16, 2025
56e781b
fix: migration fix
kevin-hashimoto Jan 16, 2025
1f78350
fix: maybe fixes front end test hang?
kevin-hashimoto Jan 16, 2025
dd9cbcb
Merge pull request #1707 from bcgov/LCFS-1706-ClearFiltersOnDashboard
areyeslo Jan 16, 2025
f3e9e97
Merge branch 'release-0.2.0' into fix/kevin-frontend-test-run
kevin-hashimoto Jan 16, 2025
15b230f
Merge branch 'release-0.2.0' into fix/prashanth-accessibility-select-…
prv-proton Jan 16, 2025
186b7a2
Merge pull request #1720 from bcgov/fix/kevin-frontend-test-run
AlexZorkin Jan 16, 2025
148903e
Merge branch 'release-0.2.0' into feat/kevin-1602
kevin-hashimoto Jan 16, 2025
2986ff9
Merge branch 'release-0.2.0' into fix/prashanth-accessibility-select-…
prv-proton Jan 16, 2025
160ff78
Merge branch 'release-0.2.0' into fix/prashanth-org-status-etl-1649
prv-proton Jan 16, 2025
b81d745
Merge branch 'release-0.2.0' into fix/alex-marine-1498
AlexZorkin Jan 16, 2025
1c5baaf
Merge pull request #1704 from bcgov/fix/prashanth-org-status-etl-1649
prv-proton Jan 16, 2025
4e583f1
Merge branch 'release-0.2.0' into fix/prashanth-accessibility-select-…
prv-proton Jan 16, 2025
24a86d7
Update other_uses_fossil_derived in fuel_type table.
areyeslo Jan 10, 2025
54daf57
Update down_revision in migration.
areyeslo Jan 14, 2025
4d2b197
Merge branch 'release-0.2.0' into feat/daniel-fix-cypress-tests
dhaselhan Jan 16, 2025
582ffa8
Merge pull request #1715 from bcgov/fix/prashanth-accessibility-selec…
prv-proton Jan 16, 2025
da5df48
Merge branch 'release-0.2.0' into feat/daniel-fix-cypress-tests
prv-proton Jan 16, 2025
ef67759
Updating migration. Updating label in fuels for other use
areyeslo Jan 16, 2025
e12e5b9
Merge branch 'release-0.2.0' into LCFS-1207-AddFuelCodeCIColumnsFuels…
areyeslo Jan 16, 2025
85b4ae9
Merge branch 'release-0.2.0' into feat/alex-etl-updates-250114
prv-proton Jan 16, 2025
e783917
Merge pull request #1708 from bcgov/feat/daniel-fix-cypress-tests
dhaselhan Jan 16, 2025
e73dba9
Merge branch 'release-0.2.0' into LCFS-1207-AddFuelCodeCIColumnsFuels…
areyeslo Jan 16, 2025
1baa947
Merge branch 'release-0.2.0' into feat/daniel-token-refresh-1624
dhaselhan Jan 16, 2025
e2cdc37
Merge branch 'release-0.2.0' into feat/alex-etl-updates-250114
prv-proton Jan 16, 2025
3ac4f0f
Merge pull request #1658 from bcgov/LCFS-1207-AddFuelCodeCIColumnsFue…
areyeslo Jan 16, 2025
1181dab
Merge branch 'release-0.2.0' into feat/daniel-token-refresh-1624
dhaselhan Jan 16, 2025
9696832
Merge branch 'release-0.2.0' into fix/hamed-unauthorized-page-setup-1616
hamed-valiollahi Jan 16, 2025
7ffaa75
Merge pull request #1675 from bcgov/feat/daniel-token-refresh-1624
dhaselhan Jan 16, 2025
a3123e1
Merge branch 'release-0.2.0' into fix/hamed-unauthorized-page-setup-1616
hamed-valiollahi Jan 16, 2025
2418e76
Merge branch 'release-0.2.0' into feat/kevin-1602
kevin-hashimoto Jan 16, 2025
16edad6
Merge branch 'release-0.2.0' into feat/kevin-1588
kevin-hashimoto Jan 16, 2025
549996a
Merge pull request #1705 from bcgov/fix/hamed-unauthorized-page-setup…
hamed-valiollahi Jan 16, 2025
8be7c1e
Merge branch 'release-0.2.0' into fix/daniel-show-cr-transactions-for…
dhaselhan Jan 16, 2025
e9d70cc
Merge branch 'release-0.2.0' into feat/kevin-1588
kevin-hashimoto Jan 16, 2025
d2620a7
Merge branch 'release-0.2.0' into feat/kevin-1602
kevin-hashimoto Jan 16, 2025
fcc36c7
fix: migration fix
kevin-hashimoto Jan 16, 2025
47192ab
fix: Comments on Admin adjustment and Initiative agreements from gove…
Jan 16, 2025
d175ec2
Merge branch 'release-0.2.0' into fix/prashanth-transactions-comments…
prv-proton Jan 16, 2025
d750c8d
Merge pull request #1699 from bcgov/feat/kevin-1588
kevin-hashimoto Jan 16, 2025
45f25a0
Merge branch 'release-0.2.0' into feat/kevin-1602
kevin-hashimoto Jan 16, 2025
5f38862
Merge branch 'release-0.2.0' into fix/daniel-show-cr-transactions-for…
prv-proton Jan 16, 2025
41abf97
fix: migration fix
kevin-hashimoto Jan 16, 2025
ce7d444
Merge pull request #1713 from bcgov/feat/kevin-1602
kevin-hashimoto Jan 16, 2025
cb2b558
Merge branch 'release-0.2.0' into fix/daniel-show-cr-transactions-for…
dhaselhan Jan 16, 2025
13683bc
Fix for id_token_hint issue
Jan 16, 2025
57b66e5
Merge pull request #1718 from bcgov/fix/daniel-show-cr-transactions-f…
dhaselhan Jan 16, 2025
fb2b497
Merge branch 'release-0.2.0' into fix/prashanth-id-token-issue
hamed-valiollahi Jan 16, 2025
8aacc2f
Merge pull request #1724 from bcgov/fix/prashanth-id-token-issue
prv-proton Jan 16, 2025
a122f39
Add protected routes to compliance report and schedules.
areyeslo Jan 14, 2025
0ee0a75
Revert "Add protected routes to compliance report and schedules."
areyeslo Jan 16, 2025
c402ae7
Protect endpoints from unauthorized use.
areyeslo Jan 16, 2025
d793d7c
Backend throwing 500 error due to organization name
areyeslo Jan 16, 2025
b5d0657
Merge branch 'release-0.2.0' into fix/alex-marine-1498
AlexZorkin Jan 16, 2025
ad2b3fa
Merge branch 'release-0.2.0' into update-node-version-0.2.0
AlexZorkin Jan 16, 2025
dd60091
fix: migration order fix
Jan 16, 2025
d5ebf3b
Merge pull request #1633 from bcgov/update-node-version-0.2.0
AlexZorkin Jan 16, 2025
711b0e2
Merge branch 'release-0.2.0' into fix/alex-marine-1498
AlexZorkin Jan 16, 2025
f786ea2
Merge pull request #1628 from bcgov/fix/alex-marine-1498
AlexZorkin Jan 16, 2025
0ddfee4
chore: merge release
Jan 16, 2025
1a52e70
Merge pull request #1700 from bcgov/feat/alex-etl-updates-250114
AlexZorkin Jan 16, 2025
e3162e6
feat: Add Script to Migrate Compliance Report Summary
dhaselhan Jan 16, 2025
94a7751
Merge branch 'release-0.2.0' into LCFS-1654-Protect-Routes-Compliance…
areyeslo Jan 17, 2025
d1aa408
fix: org txn fixes, compliance report and transfer fixes and optimiza…
Jan 17, 2025
42556b3
Merge pull request #1726 from bcgov/feat/daniel-etl-compliance-report…
dhaselhan Jan 17, 2025
7b863d3
Merge branch 'release-0.2.0' into LCFS-1654-Protect-Routes-Compliance…
areyeslo Jan 17, 2025
3af0a64
Merge pull request #1686 from bcgov/LCFS-1654-Protect-Routes-Complian…
areyeslo Jan 17, 2025
305e969
Merge branch 'release-0.2.0' into fix/prashanth-transactions-comments…
prv-proton Jan 17, 2025
30c4d17
Merge pull request #1723 from bcgov/fix/prashanth-transactions-commen…
prv-proton Jan 17, 2025
c75d9ec
Merge branch 'release-0.2.0' into feat/alex-etl-org-fixes
AlexZorkin Jan 17, 2025
5573ae8
Merge pull request #1727 from bcgov/feat/alex-etl-org-fixes
AlexZorkin Jan 17, 2025
7503fbf
fix: Change Transaction history to full timestamp
dhaselhan Jan 17, 2025
4344e69
Clear provisionOfTheAct field when fuel type or fuel category is sele…
areyeslo Jan 17, 2025
4d5bebc
fix: LCFS - Enhance boundaries of drop down menu options in complianc…
Jan 17, 2025
fccb438
docker fix
Jan 17, 2025
92f0963
Merge branch 'release-0.2.0' into fix/daniel-change-time-format-1697
dhaselhan Jan 17, 2025
e8aaa58
Merge pull request #1731 from bcgov/fix/daniel-change-time-format-1697
dhaselhan Jan 17, 2025
f3529e0
Merge branch 'release-0.2.0' into fix/prashanth-ag-grid-dropdown-1687
prv-proton Jan 17, 2025
bc6a506
.
Jan 17, 2025
67f3660
chore: removed simple migrations
Jan 17, 2025
75f31a7
fix: org pagination fix, credit validation signs
Jan 18, 2025
882bf19
Merge branch 'release-0.2.0' into LCFS-1696-FuelTypeDeterminingCI
areyeslo Jan 18, 2025
cd7915c
Merge pull request #1732 from bcgov/LCFS-1696-FuelTypeDeterminingCI
areyeslo Jan 18, 2025
9934e5d
Merge branch 'release-0.2.0' into fix/prashanth-ag-grid-dropdown-1687
prv-proton Jan 20, 2025
c501b65
Merge pull request #1733 from bcgov/fix/prashanth-ag-grid-dropdown-1687
prv-proton Jan 20, 2025
9dcd832
feat: squashed all migrations into 3 step process, initial migration,…
Jan 20, 2025
60959bd
Fix: LCFS - Download Organization Information in PROD needs balances …
Jan 20, 2025
0562aed
chore: string cast
Jan 20, 2025
43e71b0
fix: filter transactions on assessed only
Jan 20, 2025
b4b7966
fix: reassessed including in transaction cr filter
Jan 20, 2025
f86c9be
Merge branch 'release-0.2.0' into chore/alex-etl-250117
AlexZorkin Jan 20, 2025
2e69e0e
fix: Update view table labels to match input tables
dhaselhan Jan 20, 2025
385b52c
feat: Add Env to Config
dhaselhan Jan 21, 2025
97b1d56
Merge pull request #1747 from bcgov/fix/prashanth-org-balances-export…
prv-proton Jan 21, 2025
bd28d9b
fix: remove fuel measurement type from fse
kevin-hashimoto Jan 21, 2025
e755006
Feat: LCFS - Update the history record to save name #1693
Jan 21, 2025
5ccf4c0
feat: migrate notional transfer records with version chaining
hamed-valiollahi Jan 21, 2025
19b6d67
fix: make kwh optional for fse
kevin-hashimoto Jan 21, 2025
c9ae038
Merge branch 'release-0.2.0' into fix/kevin-1683
kevin-hashimoto Jan 21, 2025
fb1d50c
fix for frontend test cases
Jan 21, 2025
8203048
fix backend test cases.
Jan 21, 2025
db7eea4
Merge pull request #1753 from bcgov/feat/kevin-1701
kevin-hashimoto Jan 21, 2025
857e692
Merge branch 'release-0.2.0' into fix/kevin-1683
kevin-hashimoto Jan 21, 2025
b6e0749
Merge branch 'release-0.2.0' into feat/prashanth-history-save-name-1693
prv-proton Jan 21, 2025
468ee9d
test case fixes
Jan 21, 2025
916db38
.
Jan 21, 2025
629d852
.
Jan 21, 2025
16e1a1d
Merge branch 'release-0.2.0' into chore/alex-squash-250117
prv-proton Jan 21, 2025
ea16482
chore: remove log
kevin-hashimoto Jan 21, 2025
d762fc5
Merge pull request #1754 from bcgov/fix/kevin-1683
kevin-hashimoto Jan 21, 2025
090fda7
Always provide an email during migration from TFRS to LCFS
areyeslo Jan 20, 2025
4088f4e
Merge branch 'release-0.2.0' into feat/prashanth-history-save-name-1693
prv-proton Jan 21, 2025
53636bd
Merge branch 'release-0.2.0' into fix/daniel-fix-view-column-labels-1729
dhaselhan Jan 21, 2025
56fc7ef
Merge pull request #1749 from bcgov/fix/daniel-fix-view-column-labels…
dhaselhan Jan 21, 2025
1338f66
Merge branch 'release-0.2.0' into chore/alex-squash-250117
AlexZorkin Jan 21, 2025
417dd98
Merge branch 'release-0.2.0' into chore/alex-etl-250117
AlexZorkin Jan 21, 2025
2639a06
Merge pull request #1742 from bcgov/chore/alex-etl-250117
AlexZorkin Jan 21, 2025
cb3bfce
Merge branch 'release-0.2.0' into feat/prashanth-history-save-name-1693
prv-proton Jan 21, 2025
19f14e7
Merge branch 'release-0.2.0' into chore/alex-squash-250117
AlexZorkin Jan 21, 2025
766292a
migrations fix
Jan 21, 2025
2475b91
Merge pull request #1751 from bcgov/feat/prashanth-history-save-name-…
prv-proton Jan 21, 2025
060a350
Merge branch 'release-0.2.0' into LCFS-1385-OnlyETLUsersWithVlidEmails
prv-proton Jan 21, 2025
22e78b3
chore: Merge branch 'release-0.2.0' into feat/hamed-migrate-notional-…
hamed-valiollahi Jan 21, 2025
323efdf
Merge pull request #1752 from bcgov/feat/hamed-migrate-notional-trans…
hamed-valiollahi Jan 21, 2025
855f8da
feat: Add Organization Address Snapshot
dhaselhan Jan 20, 2025
0f44fd6
Merge pull request #1748 from bcgov/feat/daniel-add-org-address-snaps…
dhaselhan Jan 21, 2025
0529a56
Merge branch 'release-0.2.0' into feat/daniel-hide-red-toasts
dhaselhan Jan 21, 2025
8299811
feat: merged latest migrations before deployment
Jan 21, 2025
1a9d0c2
Merge pull request #1750 from bcgov/feat/daniel-hide-red-toasts
dhaselhan Jan 21, 2025
7270626
Users component having infinite re-renders affecting pagination
areyeslo Jan 21, 2025
408d1f6
Merge branch 'release-0.2.0' into LCFS-1385-OnlyETLUsersWithVlidEmails
areyeslo Jan 21, 2025
5365282
Merge branch 'release-0.2.0' into LCFS-1746-UserPagination
dhaselhan Jan 21, 2025
201879b
Merge pull request #1745 from bcgov/chore/alex-squash-250117
AlexZorkin Jan 21, 2025
e41366c
Fix: Fix Transaction From and Sorting by Report Type
dhaselhan Jan 22, 2025
84c7d21
fix: Move renewable flag to DB
dhaselhan Jan 22, 2025
4aa43d3
Merge branch 'release-0.2.0' into LCFS-1746-UserPagination
areyeslo Jan 22, 2025
7f74bdc
Merge pull request #1764 from bcgov/LCFS-1746-UserPagination
areyeslo Jan 22, 2025
4e3617f
Merge branch 'release-0.2.0' into LCFS-1385-OnlyETLUsersWithVlidEmails
areyeslo Jan 22, 2025
2387a23
Merge pull request #1759 from bcgov/LCFS-1385-OnlyETLUsersWithVlidEmails
areyeslo Jan 22, 2025
e9a268e
Merge branch 'release-0.2.0' into fix/daniel-fix-line2-calcs-1738
dhaselhan Jan 22, 2025
375f1d7
Merge pull request #1767 from bcgov/fix/daniel-fix-line2-calcs-1738
dhaselhan Jan 22, 2025
4423489
Merge branch 'release-0.2.0' into fix/daniel-bug-fixes-1739
dhaselhan Jan 22, 2025
ec1fd87
Merge pull request #1768 from bcgov/fix/daniel-bug-fixes-1739
dhaselhan Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified .DS_Store
Binary file not shown.
93 changes: 93 additions & 0 deletions .github/workflows/cleanup-images.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
name: Scheduled cleanup unused images
on:
workflow_dispatch:
schedule:
- cron: "0 0 * * 0"
# At 00:00 on Sunday.

jobs:
cleanup-images:
runs-on: ubuntu-latest
steps:
- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
insecure_skip_tls_verify: true
namespace: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools

- name: cleanup-images
continue-on-error: true
run: |

#!/bin/bash

# This script will delete all image tags for both frontend and backend except the one being referenced

# The sample of search_string is lcfs-backend:0.2.0-20240403221450
# The sample of oc_output could include
# lcfs-backend:0.2.0-20240403210040
# lcfs-backend:0.2.0-20240403211844
# lcfs-backend:0.2.0-20240403221450
# The script will remove the first two image tags

delete_resources() {
local search_string="$1"
local oc_output="$2"
local namepace="$3"

# Check if the oc_output is empty
if [ -z "$oc_output" ]; then
echo "Error: No output provided."
return 1
fi

# Loop through each line in the oc output
while IFS= read -r line; do
# Check if the line contains the search string
if [[ "$line" != *"$search_string"* ]]; then
# Extract the name of the resource from the line
resource_name=$(echo "$line" | awk '{print $1}')
# Delete the resource
oc -n "$namepace" delete imagetag/"$resource_name"
fi
done <<< "$oc_output"
}

# Define the search string
search_string=$(oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev describe deployment/lcfs-backend-dev | grep Image | awk -F '/' '{print $NF}')
# Run the oc command and store the output in a variable
oc_output=$(oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev get imagetags | grep lcfs-backend | awk '{print $1}')
namespace="${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev"
echo "Will delete all lcfs-bakcend image tags in ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev except $search_string"
delete_resources "$search_string" "$oc_output" "$namespace"

# Define the search string
search_string=$(oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev describe deployment/lcfs-frontend-dev | grep Image | awk -F '/' '{print $NF}')
# Run the oc command and store the output in a variable
oc_output=$(oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev get imagetags | grep lcfs-frontend | awk '{print $1}')
echo "Will delete all lcfs-frontend image tags in ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev except $search_string"
namespace="${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev"
delete_resources "$search_string" "$oc_output" "$namespace"

echo "will delete images in tools env"
frontendimages=$(oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools get imagetags | grep lcfs-frontend | awk '{print $1}')
if [ ! -z "$frontendimages" ]; then
oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools get imagetags | grep lcfs-frontend | awk '{print $1}' | xargs oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools delete imagetag
fi

backendimages=$(oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools get imagetags | grep lcfs-backend | awk '{print $1}')
if [ ! -z "$backendimages" ]; then
oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools get imagetags | grep lcfs-backend | awk '{print $1}' | xargs oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools delete imagetag
fi

echo "Cleaning up Completed pods on Dev except CrunchyDB pods"
oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev get pods | grep Completed | grep -v crunchy | awk '{print $1}' | xargs oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev delete pod || true

echo "Cleaning up Complete and Failed builds on Tools"
oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools get builds | grep Complete | awk '{print $1}' | xargs oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools delete build || true
oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools get builds | grep Failed | awk '{print $1}' | xargs oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools delete build || true

echo "Cleaning up buildconfigs on Tools"
oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools get buildconfig | awk '{print $1}' | xargs oc -n ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools delete buildconfig || true
19 changes: 19 additions & 0 deletions .github/workflows/cron-cleanup-workflow-runs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Scheduled cleanup old workflow runs
on:
workflow_dispatch:
schedule:
- cron: "0 8 * * *"

jobs:
del_runs:
runs-on: ubuntu-latest
permissions:
actions: write
steps:
- name: Delete workflow runs
uses: Mattraks/[email protected]
with:
token: ${{ github.token }}
repository: ${{ github.repository }}
retain_days: 5
keep_minimum_runs: 0
81 changes: 81 additions & 0 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: Cypress Daily

on:
schedule:
- cron: '0 16 * * *' # Runs daily at 16:00 UTC (8 AM PST)
workflow_dispatch: # Allows manual triggering of the workflow

jobs:
cypress:
runs-on: ubuntu-latest
services:
db:
image: postgres:14.2
env:
POSTGRES_DB: lcfs
POSTGRES_USER: lcfs
POSTGRES_PASSWORD: development_only
ports:
- 5432:5432
redis:
image: bitnami/redis:6.2.5
env:
ALLOW_EMPTY_PASSWORD: "yes"
ports:
- 6379:6379
rabbitmq:
image: rabbitmq:3-management
env:
RABBITMQ_DEFAULT_USER: lcfs
RABBITMQ_DEFAULT_PASS: development_only
RABBITMQ_DEFAULT_VHOST: lcfs
ports:
- "15672:15672"
steps:
- uses: actions/checkout@v2

- name: Build and Run Backend Service
run: |
docker build -t backend-service -f ./backend/Dockerfile ./backend
docker run -d --name backend \
--network=host \
-e LCFS_DB_HOST=localhost \
-e LCFS_REDIS_HOST=localhost \
backend-service

- name: Wait for DB to be Ready
run: sleep 20

- name: Run Alembic Migrations
run: docker exec backend poetry run alembic upgrade head

- name: Data Seeding
run: docker exec backend poetry run python /app/lcfs/db/seeders/seed_database.py

- name: Build and Run Frontend Service
run: |
docker build -t frontend-service -f ./frontend/Dockerfile.dev ./frontend
docker run -d --name frontend \
--network=host \
frontend-service

- name: Cypress run
uses: cypress-io/github-action@v2
with:
browser: chrome
wait-on: 'http://localhost:3000'
wait-on-timeout: 60
record: false
config-file: cypress.config.js
working-directory: frontend
env:
IDIR_TEST_USER: ${{ secrets.CYPRESS_IDIR_TEST_USER }}
IDIR_TEST_PASS: ${{ secrets.CYPRESS_IDIR_TEST_PASS }}
BCEID_TEST_USER: ${{ secrets.CYPRESS_BCEID_TEST_USER }}
BCEID_TEST_PASS: ${{ secrets.CYPRESS_BCEID_TEST_PASS }}

- name: Cleanup
if: always()
run: |
docker stop backend frontend
docker rm backend frontend
146 changes: 146 additions & 0 deletions .github/workflows/dev-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
## For each release, the value of workflow name, branches and VERSION need to be adjusted accordingly

name: LCFS 0.2.0 Dev CI

on:
push:
branches: [ release-0.2.0 ]
paths:
- frontend/**
- backend/**
workflow_dispatch:

env:
VERSION: 0.2.0
GIT_URL: https://github.com/bcgov/lcfs.git
TOOLS_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-tools
DEV_NAMESPACE: ${{ secrets.OPENSHIFT_NAMESPACE_PLATE }}-dev


concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:

install-oc:
runs-on: ubuntu-latest
outputs:
cache-hit: ${{ steps.cache.outputs.cache-hit }}
steps:
- name: Check out repository
uses: actions/[email protected]

- name: Set up cache for OpenShift CLI
id: cache
uses: actions/[email protected]
with:
path: /usr/local/bin/oc # Path where the `oc` binary will be installed
key: oc-cli-${{ runner.os }}

- name: Install OpenShift CLI (if not cached)
if: steps.cache.outputs.cache-hit != 'true'
run: |
curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable/openshift-client-linux.tar.gz
tar -xvf openshift-client-linux.tar.gz
sudo mv oc /usr/local/bin/
oc version --client

- name: Confirm OpenShift CLI is Available
run: oc version --client

set-pre-release:
name: Calculate pre-release number
runs-on: ubuntu-latest
needs: [install-oc]

outputs:
output1: ${{ steps.set-pre-release.outputs.PRE_RELEASE }}

steps:
- id: set-pre-release
run: echo "PRE_RELEASE=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT

build:

name: Build LCFS
runs-on: ubuntu-latest
needs: set-pre-release
timeout-minutes: 60

env:
PRE_RELEASE: ${{ needs.set-pre-release.outputs.output1 }}

steps:

- name: Check out repository
uses: actions/[email protected]

- name: Restore oc command from Cache
uses: actions/[email protected]
with:
path: /usr/local/bin/oc
key: oc-cli-${{ runner.os }}

- name: Log in to Openshift
uses: redhat-actions/[email protected]
with:
openshift_server_url: ${{ secrets.OPENSHIFT_SERVER }}
openshift_token: ${{ secrets.OPENSHIFT_TOKEN }}
insecure_skip_tls_verify: true
namespace: ${{ env.TOOLS_NAMESPACE }}

- name: Build LCFS Backend
run: |
cd openshift/templates
oc process -f ./backend-bc.yaml VERSION=${{ env.VERSION }}-${{ env.PRE_RELEASE }} GIT_URL=${{ env.GIT_URL }} GIT_REF=release-${{ env.VERSION }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }}
sleep 2s
oc -n ${{ env.TOOLS_NAMESPACE }} start-build lcfs-backend-${{ env.VERSION }}-${{ env.PRE_RELEASE }} --wait=true
oc tag ${{ env.TOOLS_NAMESPACE }}/lcfs-backend:${{ env.VERSION }}-${{ env.PRE_RELEASE }} ${{ env.DEV_NAMESPACE }}/lcfs-backend:${{ env.VERSION }}-${{ env.PRE_RELEASE }}

- name: Build LCFS Frontend
run: |
cd openshift/templates
oc process -f ./frontend-bc.yaml VERSION=${{ env.VERSION }}-${{ env.PRE_RELEASE }} GIT_URL=${{ env.GIT_URL }} GIT_REF=release-${{ env.VERSION }} | oc apply --wait=true -f - -n ${{ env.TOOLS_NAMESPACE }}
sleep 2s
oc -n ${{ env.TOOLS_NAMESPACE }} start-build lcfs-frontend-${{ env.VERSION }}-${{ env.PRE_RELEASE }} --wait=true
oc tag ${{ env.TOOLS_NAMESPACE }}/lcfs-frontend:${{ env.VERSION }}-${{ env.PRE_RELEASE }} ${{ env.DEV_NAMESPACE }}/lcfs-frontend:${{ env.VERSION }}-${{ env.PRE_RELEASE }}

deploy:

name: Deploy LCFS
runs-on: ubuntu-latest
timeout-minutes: 60
needs: [set-pre-release, build]

env:
PRE_RELEASE: ${{ needs.set-pre-release.outputs.output1 }}

steps:

- name: Checkout Manifest repository
uses: actions/[email protected]
with:
repository: bcgov-c/tenant-gitops-d2bd59
ref: main
ssh-key: ${{ secrets.MANIFEST_REPO_DEPLOY_KEY }}

- name: Update frontend tag
uses: mikefarah/[email protected]
with:
cmd: yq -i '.image.tag = "${{ env.VERSION }}-${{ env.PRE_RELEASE }}"' lcfs/charts/lcfs-frontend/values-dev.yaml

- name: Update backend tag
uses: mikefarah/[email protected]
with:
cmd: yq -i '.image.tag = "${{ env.VERSION }}-${{ env.PRE_RELEASE }}"' lcfs/charts/lcfs-backend/values-dev.yaml

- name: GitHub Commit & Push
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub Actions"
git add lcfs/charts/lcfs-frontend/values-dev.yaml
git add lcfs/charts/lcfs-backend/values-dev.yaml
git commit -m "update the image tag to ${{ env.VERSION }}-${{ env.PRE_RELEASE }}"
git push

Loading
Loading