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.

Sign up for GitHub

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

Jump to bottom

Crossfeed Registration and Approval Process #2401

Merged
merged 70 commits into from
Dec 1, 2023
Merged

Crossfeed Registration and Approval Process #2401

merged 70 commits into from
Dec 1, 2023

Conversation

nickviola
Copy link
Contributor

🗣 Description

💭 Motivation and context

🧪 Testing

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced
    in code comments.
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated
    to reflect the changes in this PR.
  • Tests have been added and/or modified to cover the changes in this PR.
  • All new and existing tests pass.

✅ Pre-merge checklist

  • Revert dependencies to default branches.
  • Finalize version.

✅ Post-merge checklist

  • Create a release.

nickviola and others added 30 commits November 2, 2023 09:56
@nickviola
Add base Registration dialog and update login page
49e6497
@nickviola
Update user schema backend/frontend
1c4f476
@nickviola
Remove old registration page route
c26df4d
@nickviola
Update User and Organization schema and update test-utils
c9a6154
@ameliav
Add new package mui/x-data-grid to package.json
c76f9d2
@ameliav
Update formatting for RegisterForm.tsx
52e45c5
@ameliav
Update formatting on AuthLogin.tsx
1b0bcbc
@ameliav
Add Dialog folder with ConfirmDialog and InfoDialog components
c415b85
@ameliav
Update user and organization types in types folder
f2a1b35
@ameliav
Add RegionUsers folder with files for Region Admin dashboard
861fcdc
@ameliav
Update App.tsx and pages/index.ts to include RegionUsers
6125b64
@ameliav
Remove unneeded comments in RegionUsers.tsx
843a593
@nickviola
Add endpoints for user and organization by regionId and state
79c388a
@nickviola
Fix eslint errors in frontend/src
557192d
@ameliav
Run npm audit fix package-lock.json
11723de
@nickviola
Add new v2 endpoint for organizations for modifying registration and …
e550381 
…region metadata
@nickviola
Adding new organizations api endpoint for updating in frontend
a90edf7
@nickviola
Add regionId to organization schema and update isRegionalAdmin permis…
8de8a7a 
…sions for endpoints
@nickviola
Add regionId and state to validate body function
e8867aa
@nickviola
Add build and rebuild scripts to save time in rebuilding backend changes
9f3fbb1
@JCantu248
Add HTML email delivery function to helpers.ts
f0c7a1d
@ameliav
Replace orgs test data with API data in RegionUsers.tsx
156afb6
@nickviola
Update test organiation data to include regionId and state
0c89ec1
@nickviola
Add new v2 endpoints for orgs and users and add query filters for new…
9f16a3d 
… get endpoints
@JCantu248
Add sendNotificationEmail() to helpers.tst.
90b3a64
@nickviola
Add user register endpoint for new user registrations.
09b539a
@JCantu248
Fix compile errors in helpers.ts, add new dependencies.
66208c9
@JCantu248
Merge branch 'issue-2315/create-registration-page-and-process' into i…
27a0f60 
…ssue-2380/create_html_email_delivery_process
@nickviola
Add new endpoint for adding user to organization
d23ad7a
@ameliav
Replace users test data with API data in RegionUsers.tsx
7129544
github-advanced-security[bot]
github-advanced-security bot found potential problems Nov 30, 2023
View reviewed changes
backend/src/api/users.ts Fixed Show fixed Hide fixed
@nickviola
Copy link
Contributor Author

nickviola commented Dec 1, 2023 •
edited
Loading

We are aware of the vulnerability issues, can someone please confirm that these are known issues that will be addressed in a seperate PR?

@nickviola nickviola marked this pull request as ready for review December 1, 2023 16:32
schmelz21
schmelz21 approved these changes Dec 1, 2023
View reviewed changes
Copy link
Collaborator

@schmelz21 schmelz21 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved on local tests conducted by multiple devs.

@schmelz21
Copy link
Collaborator

We are aware of the vulnerability issues, can someone please confirm that these are known issues that will be addressed in a seperate PR?

@aloftus23 or @DJensen94 - I think we are okay with the Vulns, but can either of you give a approve or thumbs up to confirm. We'll then merge to master.

@schmelz21
Copy link
Collaborator

schmelz21 commented Dec 1, 2023 •
edited
Loading

We are aware of the vulnerability issues, can someone please confirm that these are known issues that will be addressed in a seperate PR?

@aloftus23 or @DJensen94 - I think we are okay with the Vulns, but can either of you give a approve or thumbs up to confirm. We'll then merge to master.>

Actually, we can demonstrate that all Vulnerabilities are known via these PRs and Issues. @nickviola , Please go ahead and merge.

Address scrapy Vulnerability flagged by Github Actions
Bump axios from 0.27.2 to 1.6.2 in /backend
Bump axios and aws-amplify in /frontend
Bump node from 18-alpine3.17 to 21-alpine3.17

@JCantu248 JCantu248 merged commit 531f2f9 into master Dec 1, 2023
16 of 19 checks passed
@JCantu248 JCantu248 deleted the issue-2315/create-registration-page-and-process branch December 1, 2023 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@schmelz21 schmelz21 schmelz21 approved these changes

@DJensen94 DJensen94 Awaiting requested review from DJensen94

@aloftus23 aloftus23 Awaiting requested review from aloftus23 aloftus23 is a code owner

Assignees

@nickviola nickviola

@ameliav ameliav

@JCantu248 JCantu248

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nickviola @schmelz21 @ameliav @JCantu248