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

CRDCDH-1993 Submitter Study Assignment (1/2) – User Mgmt #554

Merged
merged 11 commits into from
Dec 11, 2024
Merged

Conversation

amattu2
Copy link
Member

@amattu2 amattu2 commented Dec 3, 2024

Overview

This PR removes the concept of assigning organizations to accounts, and adds the ability to assign studies to a Submitter, among other changes.

Note

I marked User.organization as deprecated, but I left it as apart of the type definition for now. Once collaborators no longer rely on organizations, this should be removed from the type definition and anywhere else it's referenced that I missed.

Warning

The BE has several issues, as noted in CRDCDH-2009. The issues aren't catastrophic, so this can be merged without the fixes.

Change Details (Specifics)

  • Remove the Organization dropdown from the Create a Data Submission dialog
  • Remove the OrganizationContext, filter, and column from the User List admin tool
  • Migrate the Edit User > Studies select to an Autocomplete
  • Migrate User.studies from string[] to ApprovedStudy[]
  • Mark the User.organization as optional and deprecated, and remove it from most places

Related Ticket(s)

CRDCDH-1993 (Task)
CRDCDH-1902 (US)

@amattu2 amattu2 added the 🚧 Do Not Merge This PR is not ready for merging label Dec 3, 2024
@amattu2 amattu2 added this to the 3.2.0 (PMVP-M3) milestone Dec 3, 2024
@coveralls
Copy link
Collaborator

coveralls commented Dec 3, 2024

Pull Request Test Coverage Report for Build 12282310496

Details

  • 10 of 49 (20.41%) changed or added relevant lines in 7 files are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage increased (+0.4%) to 56.691%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/components/Contexts/AuthContext.tsx 0 1 0.0%
src/content/OperationDashboard/DashboardView.tsx 0 2 0.0%
src/content/users/Controller.tsx 0 2 0.0%
src/content/users/ListView.tsx 0 2 0.0%
src/content/users/ProfileView.tsx 0 32 0.0%
Files with Coverage Reduction New Missed Lines %
src/content/users/ProfileView.tsx 1 0.0%
Totals Coverage Status
Change from base Build 12282254806: 0.4%
Covered Lines: 3790
Relevant Lines: 6222

💛 - Coveralls

@amattu2 amattu2 changed the base branch from 3.2.0 to CRDCDH-1991 December 3, 2024 19:21
@amattu2 amattu2 changed the base branch from CRDCDH-1991 to 3.2.0 December 3, 2024 19:22
@amattu2 amattu2 marked this pull request as ready for review December 4, 2024 22:35
@amattu2 amattu2 changed the title CRDCDH-1993 Submitter Study Assignment CRDCDH-1993 Submitter Study Assignment (1/2) Dec 5, 2024
@amattu2 amattu2 changed the title CRDCDH-1993 Submitter Study Assignment (1/2) CRDCDH-1993 Submitter Study Assignment (1/2) – User Mgmt Dec 5, 2024
Alejandro-Vega
Alejandro-Vega previously approved these changes Dec 5, 2024
Copy link
Collaborator

@Alejandro-Vega Alejandro-Vega left a comment

Choose a reason for hiding this comment

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

All of the code LGTM, didn't test locally as the BE is not currently supporting it. Feel free to merge after verifying changes with BE.

@amattu2 amattu2 removed the 🚧 Do Not Merge This PR is not ready for merging label Dec 11, 2024
@amattu2
Copy link
Member Author

amattu2 commented Dec 11, 2024

The updated BE is deployed (and has some issues still). We're going to leave the updated BE deployed so this can be merged. Minor manual merge conflict resolutions dismissed a stale review, but I'm just going to bypass the merge requirements.

@amattu2 amattu2 merged commit 432ce48 into 3.2.0 Dec 11, 2024
5 checks passed
@amattu2 amattu2 deleted the CRDCDH-1993 branch December 11, 2024 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants