feat(organizations): handle user removes itself flow TASK-1354 #5393
+58
−20
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
pauloamorimbr
requested review from
jamesrkiger and
magicznyleszek
as code owners
p2edwards
reviewed
Dec 23, 2024
| @@ -119,11 +119,11 @@ export const useOrganizationQuery = (params?: OrganizationQueryParams) => { | |||
| // the session data loaded. Account data is needed to fetch the organization | |||
| // data. | |||
|
|
|||
| const query = useQuery<Organization, FailResponse, Organization, QueryKeys[]>({ | |||
| const query = useQuery<Organization, FailResponse, Organization, string[]>({ | |||
There was a problem hiding this comment.
Unrelated to this PR, but note to self: do we need to specify angle brackets here, or can we get better type safety and readability by leaving this blank and fixing types upstream of it?
- 📚 reference: "Type-safe React Query # About angle brackets"
|
Skimmed, will test soon. |
pauloamorimbr
force-pushed
the
pamorim/task-1354-handle-ux-flow-admin-leaving-mmo
branch
from
15bae53 to
f0541cb
Compare
Akuukis
requested changes
Jan 6, 2025
Comment on lines
+113
to
+117
| if (params?.isRemovingSelf) { | ||
| session.refreshAccount(); | ||
| } else { | ||
| queryClient.invalidateQueries({queryKey: [QueryKeys.organizationMembers]}); | ||
| } |
There was a problem hiding this comment.
Why removing self should skip invalidation? 🤔
Even if removing self invalidates it indirectly, AFAIK multiple invalidations are batched, so let's keep it simple and with a clearer intent.
Suggested change
| if (params?.isRemovingSelf) { | |
| session.refreshAccount(); | |
| } else { | |
| queryClient.invalidateQueries({queryKey: [QueryKeys.organizationMembers]}); | |
| } | |
| queryClient.invalidateQueries({queryKey: [QueryKeys.organizationMembers]}); | |
| if (params?.isRemovingSelf) { | |
| session.refreshAccount(); | |
| } |
Comment on lines
112
to
+113
| onSettled: () => { | ||
| queryClient.invalidateQueries({queryKey: [QueryKeys.organizationMembers]}); | ||
| if (params?.isRemovingSelf) { |
There was a problem hiding this comment.
IMHO this hook can be simplified by removing the isRemovingSelf parameter and accessing variables within onSettled instead.
onSettled: (_data, _error, username) => {
if (session.currentLoggedAccount?.username === username) {| fetchDelete(getMemberEndpoint(orgId!, username)) | ||
| ), | ||
| return fetchDelete(getMemberEndpoint(orgId!, username)); | ||
| }, | ||
| onSettled: () => { |
There was a problem hiding this comment.
perhaps use onSuccess instead? It would be confusing to get logged out on a failure to remove oneself.
jamesrkiger
reviewed
Jan 6, 2025
| @@ -12,6 +12,8 @@ import envStore from 'jsapp/js/envStore'; | |||
| import subscriptionStore from 'jsapp/js/account/subscriptionStore'; | |||
| import {useRemoveOrganizationMember} from './membersQuery'; | |||
| import {notify} from 'alertifyjs'; | |||
| import {ROUTES} from 'jsapp/js/router/routerConstants'; | |||
| import router from 'jsapp/js/router/router'; | |||
jamesrkiger
reviewed
Jan 6, 2025
| @@ -18,6 +18,11 @@ import {OrganizationUserRole} from './organizationQuery'; | |||
|
|
|||
| // Styles | |||
| import styles from './memberActionsDropdown.module.scss'; | |||
| import {queryClient} from 'jsapp/js/query/queryClient'; | |||
| import {QueryKeys} from 'jsapp/js/query/queryKeys'; | |||
jamesrkiger
requested changes
Jan 6, 2025
pauloamorimbr
changed the title
pauloamorimbr
changed the title
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.
🗒️ Checklist
<type>(<scope>)<!>: <title> TASK-1234frontendorbackendunless it's global📣 Summary
The navigation and data flow is improved when an MMO organization admin removes itself from the organization.
📖 Description
The objective of this PR is to:
There's still a big margin for improving, mainly due to some work needed in
useUsage, but it unfolds into several other files and flows, so it's better to be handled in a separated PR👀 Preview steps