feat: Merging Dev To Main - 25 / Aug / 2025#1036
Closed
midhun-aot wants to merge 445 commits intomainfrom
Closed
Conversation
chore: CATS FE - format with `prettier`, add formatting CI step
chore: `@bcgov/design-tokens` version upgrade, css variables cleanup
feat: SRS-783 - Add logic to fetch App Participants
CATS: apollo client setup, update Participants tab to use it
…pdated seed logic in initDB.sh (#992) * fix: Combine -seed and -init initContainers, only have one now, and updated seed logic in initDB.sh * Fixing default database name.
…989) * check-in types.ts * Adding more logs and removed error thrown
…996) * check-in types.ts * fixed undefined in emails & NaN in progress bar --------- Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com>
* check-in types.ts * changes for my tasks & restricting external users * pushing types.ts * fix: Added More Logs & Removed Error Thrown in ApplicatonTypeSeeder (#989) * check-in types.ts * Adding more logs and removed error thrown * fix: Fixed undefined in Email Content and Progress Bar On Assignment (#996) * check-in types.ts * fixed undefined in emails & NaN in progress bar --------- Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com> * pushing types.ts * fixed unit test * Updated ENV Variable in yaml files --------- Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com>
* check-in types.ts * changes for calling protected site api endpoint * Updated implementation & test cases * changes for calling protected site api endpoint * Updated implementation & test cases * Updated 3 new envs in helm charts * fixed failed unit test case --------- Co-authored-by: Adam Coard <adam.coard@aot-technologies.com>
…1001) * changes to handle application having multiple site id (CSSA) * removed console logs
* changes for SIR integration with CATS * Updated unit test case
* Implement Invoice CRUD opteration of FE and BE * fix backend api issues * delete not required files and folder from FE and BE * implement update, create and delete invoice * Implement Invoice CRUD opteration of FE and BE * fix backend api issues * delete not required files and folder from FE and BE * implement update, create and delete invoice * fix conflict * formatting * fix merge conflict errors * feat: SRS-1002 Implement the file upload feature and integrate it with coms (#1000) * complete implementation of upload invoice attachment * formatting * fix merfe issue and minor css * key required in openshift * formatting * add config keys, value and sceret for dev and test only. urls are pointing to dev only * Potential fix for code scanning alert no. 128: DOM text reinterpreted as HTML Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * fix preview issue. check blob to generate safe preview * format * removing from frontend as upload document and invoice will move to backend for security purpose * Potential fix for code scanning alert no. 130: DOM text reinterpreted as HTML Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Potential fix for code scanning alert no. 132: DOM text reinterpreted as HTML Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * fix merge conflict * fix merge issue --------- Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
* Implement Invoice CRUD opteration of FE and BE * fix backend api issues * delete not required files and folder from FE and BE * implement update, create and delete invoice * Implement Invoice CRUD opteration of FE and BE * fix backend api issues * delete not required files and folder from FE and BE * implement update, create and delete invoice * formatting * fix merge conflict errors * feat: SRS-1002 Implement the file upload feature and integrate it with coms (#1000) * complete implementation of upload invoice attachment * formatting * fix merfe issue and minor css * key required in openshift * formatting * implement api to send invoice email with attachment * implement send invoice email on frontend * fix dropdown css issues * graphql * auto generated graphql * fix minor issues and merge conflict * formatting
* Cats prod file, just GHA file testing. * Update gha name * Temporarily enable dry-run for helm before prod deploy, to make we don't affect existing prod ff.ai * Force triggering another dry run check * Another change after modifying branch protection rules to allow feats/cats-prod just for active dev so I don't have to ask people to merge in prs every commit. * Empty commit to start deploy for the day * Modify upload_sql to use append.sql for file * Enable db dry run too for testing purposes * Remove --dry-run from helm charts, will actually run with this push. Both cases showed the release does not exist and is new and is deploying, which is good. * Tweak append content so it's clearer, but it appears to be working after checking in pod * Update append.sql with latest from Nikhila * Adjust append.sql with input from Jaspal and Nikhila to remove unncessary stuff --------- Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com>
* Dummy commit to make PR to test prod data import process in CI/CD * fix MENT issue * Update WAL storage size in dev/test/prod to 2gb. * add null and undefine check * Reorganize append.sql * Update append.sql re-add section per Midhun * Update append.sql Added Review In Progress status insert statement --------- Co-authored-by: Jaspal.Singh-AOT <163812444+jaspalsingh-aot@users.noreply.github.com> Co-authored-by: midhun-aot <105463561+midhun-aot@users.noreply.github.com>
* changes for SIR integration with CATS * NOM Bundle Integration To Cats * updated formId * Form changes * Delete backend/cats/G --------- Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com>
* changes for NIR status changes * form changes for status
* handling empty site id * updated utc
… is available (#1020) * this is for testing only * for testing * testing an issue for empty siteid * this test case is not required * changed siteid as nullable * handling null siteid * this for testing the result application * corrected utc * changed siteid as nullable * site related fields can be nullable * removed unused code
* this is for testing only * for testing * testing an issue for empty siteid * this test case is not required * changed siteid as nullable * handling null siteid * this for testing the result application * corrected utc * changed siteid as nullable * site related fields can be nullable * removed unused code * corrected issues 1040
…ket via coms (#1019) * Implement backend logic to call coms api. work in progress.. * fix get and create object endpoint issue * object already exist handling * integerate the API and FE for invoice attachments * add env variables for backend .env * formattig * Potential fix for code scanning alert no. 133: Type confusion through parameter tampering Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * Potential fix for code scanning alert no. 135: Type confusion through parameter tampering Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * fix review comments as per co pilot * remove unused code * add config keys * revert change * add test site backend urrl for testing purpose * fix crrect site backend test url * fix impacted area because of modal dialog component changes * formatting * we can see page if one got data * add condition for email if site is not working * reverting the email code * formatting * fix invoice unit per cent calculation error --------- Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
* changes for SIR integration with CATS * initial changes for SRCR integration to CATS * form & bpm changes * Form & workflow changes * added missing one * remove nirStatus variable * Delete backend/cats/G
* fix: Application Id and SiteId needs to be a link. * add complatibility with my task component * format
…pdown sign when no one is assigned (#1025) * fix: All Applications - The Staff assigned field shouldn't show a dropdown sign when no one is assigned * format --------- Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com>
* changes for SIR integration with CATS * initial changes for SRCR integration to CATS * form & bpm changes * Form & workflow changes * added missing one * remove nirStatus variable * fixed NIR resubmission issue * changes for SIR integration with CATS * initial changes for SRCR integration to CATS * form & bpm changes * Form & workflow changes * fixed NIR resubmission issue * Delete backend/cats/G * updated the if condition --------- Co-authored-by: nikhila-aot <38471389+nikhila-aot@users.noreply.github.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
-- Merging Dev To Main Branch - 25 / Aug / 2025