Merge Develop into Integration#788
Merged
rapidray12 merged 169 commits intointegrationfrom Feb 7, 2025
Merged
Conversation
- Added conditional to render No Filter(s) Applied when no filters are applied. - Only applies to GlobalAdmins as Regional Admins and Standard Users cannot remove their default filters.
- Added a function to sort Region filter values in ascending order. - Edited filtersByColumn to include these sorted values.
- Added severity levels array and sort function to vulnerabilities.severity field.
- Severity levels are now sorted Low, Medium, High, Critical.
- Added sort function to vulnerabilities.cve field.
- CVEs are now sorted by numerical value.
… to ensure correct search result order
- Cleaned up the sort functions for Port, Severity Levels, and CVEs.
- Added a map and sort function the org names accessor function. - Added sortedValues as an arg to the ellipsis function.
- Added sort to IP's, Domain, and Root Domain values in Filter Tags.
…o right, ensuring filters are desplayed in a consistent and logical order, making it easier to understand
…on-gets-distorted-after-unselecting
https://github.com/cisagov/XFD into 732-filter-by-region-gets-distorted-after-unselecting
…-to-be-in-a-consistent-order-as-filterdrawer-components
- Added an additional condition to the update User call to allow for new users to select their State upon account creation. - If invitePending is true, a User can update their state regardless of their Region ID.
- Ensured N/A severity level in Bar Chart includes all permutations of null, undefined, and empty strings. - Ensured filtering by severity level in All Vulns table matches the filtering in the Bar Chart.
- Null, undefined, empty strings, and stringified versions on Null, N/A, and undefined are now grouped into the N/A category in both the Vulns Bar Chart and All Vulns table. - Both components now force Title Case on the severity level strings first then sort and group into their respective categories. - Edited the comporator function in the All Vulns tables to sort the severity levels in the correct order from N/A, Low, Medium, High, Critical, Other.
- Adjusted the number values of the severity levels object to start with 1 instead of 0. - This removes the need for the long if statement previously used to handle N/A values.
- Cancel button is diabled if user.invitePending is true. - Dialog does not close on background click nor escape key press. - This is to prevent the user from closing the dialog before they have made a selection.
…ilter-Chips-CRASM-803
Integration - Python Backend
Create EC2 instance for sending emails
Fix Email Sender terraform bug
Ensure Email Sender profile exists when creating EC2
Fix Email Sender EC2: update the ami to differentiate b/w DMZ/LZ
SQS Bugs: Use direct PE_API_URL instead of CD proxy
aloftus23
requested review from
Matthew-Grayson,
cduhn17,
nickviola,
rapidray12 and
schmelz21
as code owners
rapidray12
approved these changes
Feb 7, 2025
Collaborator
rapidray12
left a comment
rapidray12
left a comment
There was a problem hiding this comment.
This code is already working in the Develop environment. This changes brings the same code into the Integration environment
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
10 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.
🗣 Description
At the end of every sprint we merge the develop branch into the integration branch.
💭 Motivation and context
Workflow.
🧪 Testing
Passes pre-commit and github checks.
✅ Pre-approval checklist
in code comments.
to reflect the changes in this PR.
✅ Pre-merge checklist
✅ Post-merge checklist