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

[ Feature ] Select Organization on the Registration screen #1904

Merged
merged 16 commits into from
May 3, 2024

Conversation

karthxk07
Copy link

What kind of change does this PR introduce?

Feature, Select Organization on the Registration screen

Issue Number:

Fixes #1440

Did you add tests for your changes?

Yes

Snapshots/Videos:

Screencast.from.14-04-24.12.55.33.PM.IST.webm

Summary

Now users can select on the registration screen , which organization they want to join starting with. WIth the updated backend code, if the Organization requires user registration, it will create membershipRequest in that organization, otherwise the user can directly join the organization

Does this PR introduce a breaking change?

No

Other information

Have you read the contributing guide?

Yes

Copy link

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

  1. The overall code coverage drops below the target threshold of the repository
  2. Any file in the pull request has code coverage levels below the repository threshold
  3. Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

Do not assign reviewers. Our Queue Monitors will review your PR and assign them.
When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

  1. comments in this PR or
  2. our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

  1. arbitrators of future discussions with other contributors about the validity of your changes
  2. point of contact for evaluating the validity of your work
  3. person who verifies matching issues by others that should be closed.
  4. person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

  1. PRs with issues not assigned to you will be closed by the reviewer
  2. Fix the first comment in the PR so that each issue listed automatically closes

Other

  1. 🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
  2. Read the CONTRIBUTING.md file make

palisadoes
palisadoes previously approved these changes Apr 15, 2024
@palisadoes
Copy link
Contributor

Please fix the linting and testing tests

@Cioppolo14
Copy link

@karthxk07 Please fix the failing tests.

Copy link

codecov bot commented Apr 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.26%. Comparing base (e50da8a) to head (6e49fd9).
Report is 22 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1904      +/-   ##
===========================================
- Coverage    98.45%   98.26%   -0.20%     
===========================================
  Files          202      210       +8     
  Lines         5238     5690     +452     
  Branches      1504     1697     +193     
===========================================
+ Hits          5157     5591     +434     
- Misses          76       93      +17     
- Partials         5        6       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Azad99-9
Copy link

Azad99-9 commented Apr 20, 2024

@karthxk07 while working on this feature didn't you encounter a bug?
Where, on successful registration to a org which hasuserRegistrationRequired: true the membershipRequest is added to the org's membershipRequests field but at the same time not being reflected in the user's membershipRequests field.

@karthxk07
Copy link
Author

@Azad99-9 I didn't check on that. However, Is it really necessary though?

@Azad99-9
Copy link

Yes it is necessary because it is generating bugs in mobile side.Kindly check on that once.

@karthxk07
Copy link
Author

@Azad99-9 That sure is a problem. However, this PR is made to the admin repo. The changes are simply using the new signup mutation introduced in this PR(PalisadoesFoundation/talawa-api#1703). You might want to open a new issue for that in the api repo.

@karthxk07 karthxk07 requested a review from palisadoes April 22, 2024 10:09
@Azad99-9
Copy link

@karthxk07 The issue I am talking about is this PalisadoesFoundation/talawa-api#2242 (comment) .

Actually there is a requirement in the mobile app to show the org to which the request was sent. To get this functionality we need the signup mutation to work properly.

@Cioppolo14
Copy link

@karthxk07 Please fix the failing tests.

@Cioppolo14 Cioppolo14 removed the request for review from palisadoes April 26, 2024 12:11
@palisadoes palisadoes linked an issue Apr 27, 2024 that may be closed by this pull request
Copy link
Contributor

@palisadoes palisadoes left a comment

Choose a reason for hiding this comment

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

Please find a way to make it easier for the user to select an organization. As you can see all four test organizations are listed using only their names. No other distinguishing feature is used.

image

@palisadoes
Copy link
Contributor

The message text after registering is incorrect:

image

@palisadoes
Copy link
Contributor

It otherwise looks OK

@karthxk07
Copy link
Author

@palisadoes I looked into the issues sir, I have added the address alongside the Organization name. Here is how it looks now(also I changed the plain select component with a material UI Autocomplete component, which will give users ability to search through a large list of organizations instead of scrolling manually to the organization's name)

Screencast.from.28-04-24.04.23.51.PM.IST.webm

@palisadoes
Copy link
Contributor

  1. Why is package-lock.json edited and not package.json?
  2. This means that whenever we next make changes to package.json your changes will be overwritten. It's not a good best practice.
  3. Make your changes to package.json, or exclude package-lock.json from this PR (don't delete it from the repo)

@karthxk07
Copy link
Author

@palisadoes Sir, I didnt realize the package-lock.json file got effected by the changes too. I have reverted back the changes to package-lock.json. Any other changes?

@palisadoes palisadoes merged commit 3c2314d into PalisadoesFoundation:develop May 3, 2024
10 of 12 checks passed
@palisadoes
Copy link
Contributor

Thanks, I've merged it.

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.

Admin - Select organization on registration
4 participants