Improve Organisation select on /users/invitation/new #2426
Merged
Conversation
This file contains 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
Rosa got in touch to say that this Organisation select box is not very usable, particularly in integration. The organisations are sorted in a seemingly random order and they include closed organisations that we never need to assign to new users. This commit fixes both of those issues. The previous tests stubbed `policy_scope` which is a Pundit-provided convenience for `Pundit.policy_scope` automatically passing in `current_user` as the first argument. I wanted to actually call the scope, so I could test that the `not_closed` and `order` scopes I've added were working correctly. To get `policy_scope` to work in the isolated tests I've explicitly included `Pundit::Authorization` in `UsersHelper` and stubbed `current_user` instead.
chrislo
force-pushed
the
improve-organisation-select-on-user-invite-page
branch
from
9024924 to
47e466e
Compare
chrislo
added a commit
that referenced
this pull request
Oct 11, 2023
This makes it easier to select the organisation for a batch of users by excluding closed organisations and sorting the remaining ones alphabetically. We did something similar in #2426 and #2417 - there's enough subtle differences in those two select boxes (indicating a current organisation and adding a "None" option respectively) that I haven't attempted to extract the duplication. I think the new scopes are self-explanatory enough that I'm happy to keep them inline in this view.
chrislo
added a commit
that referenced
this pull request
Oct 11, 2023
This makes it easier to select the organisation for a batch of users by excluding closed organisations and sorting the remaining ones alphabetically. We did something similar in #2426 and #2417 - there's enough subtle differences in those two select boxes (indicating a current organisation and adding a "None" option respectively) that I haven't attempted to extract the duplication. I think the new scopes are self-explanatory enough that I'm happy to keep them inline in this view.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Trello: https://trello.com/c/R9bKDyi5
Rosa got in touch to say that this Organisation select box is not very usable, particularly in integration. The organisations are sorted in a seemingly random order and they include closed organisations that we never need to assign to new users.
This commit fixes both of those issues.
The previous tests stubbed
policy_scopewhich is a Pundit-provided convenience forPundit.policy_scopeautomatically passing incurrent_useras the first argument. I wanted to actually call the scope, so I could test that thenot_closedandorderscopes I've added were working correctly. To getpolicy_scopeto work in the isolated tests I've explicitly includedPundit::AuthorizationinUsersHelperand stubbedcurrent_userinstead.