Org settings partial updates improvements #20626
Merged
Conversation
This file contains hidden or 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
Tool: gitpod/catfood.gitpod.cloud fix for getting settings (also resolve avatar) Tool: gitpod/catfood.gitpod.cloud
Tool: gitpod/catfood.gitpod.cloud
The hack was introduced in #20620 - Update welcome message configuration to handle optional enabled field - Simplify welcome message update logic in various components - Modify protobuf definitions to make enabled field optional - Remove redundant checks and simplify type handling in converters and components Tool: gitpod/catfood.gitpod.cloud
filiptronicek
force-pushed
the
ft/gpl/org-settings-refresh
branch
from
3334f6d to
8b563ec
Compare
filiptronicek
changed the title
geropl
reviewed
Feb 25, 2025
| @@ -27,13 +28,12 @@ export type SuggestedOrgRepository = PlainMessage<SuggestedRepository> & { | |||
|
|
|||
| export function useOrgSuggestedRepos() { | |||
| const organizationId = useCurrentOrg().data?.id; | |||
| const orgSettings = useOrgSettingsQuery(); | |||
geropl
reviewed
Feb 25, 2025
geropl
reviewed
Feb 25, 2025
geropl
reviewed
Feb 25, 2025
geropl
reviewed
Feb 25, 2025
Tool: gitpod/catfood.gitpod.cloud
Tool: gitpod/catfood.gitpod.cloud
filiptronicek
commented
Feb 25, 2025
| invalidateWorkspaceClasses(); | ||
| invalidateOrgRepoSuggestions(); | ||
|
|
||
| if (settings) { | ||
| queryClient.setQueryData(getQueryKey(organizationId), settings); |
There was a problem hiding this comment.
this set's the query's data to not have to re-fetch data we have available to us. We do the same with updating Configurations
filiptronicek
commented
Feb 25, 2025
| @@ -26,7 +26,7 @@ export const OrgMemberAvatarInput = ({ settings, setFeaturedMemberId }: Props) = | |||
| const handleSelectionChange = useCallback( | |||
| (selectedId: string) => { | |||
| const member = members?.find((m) => m.userId === selectedId); | |||
| setFeaturedMemberId(selectedId || undefined); | |||
| setFeaturedMemberId(selectedId); | |||
There was a problem hiding this comment.
This change was necessary to force the default value and not just make an empty update.
filiptronicek
merged commit f36f3a1
into
gpl/org-settings-refresh
32 of 33 checks passed
geropl
added a commit
that referenced
this pull request
Feb 25, 2025
Tool: gitpod/catfood.gitpod.cloud
geropl
added a commit
that referenced
this pull request
Feb 25, 2025
Tool: gitpod/catfood.gitpod.cloud
roboquat
pushed a commit
that referenced
this pull request
Feb 25, 2025
* [api, server, dashboard] Cleanup UpdateOrganizationSettings API Tool: gitpod/catfood.gitpod.cloud * Org settings partial updates improvements (#20626) Tool: gitpod/catfood.gitpod.cloud * review comment Tool: gitpod/catfood.gitpod.cloud
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.
Description
This PR contains the following fixes on top of #20603:
resolveWelcomeMessagefnThe existing caveat that this doesn't tackle (and that I realized just now) is that when you delete your user account, the featured member won't be un-set. This is fine for now though, since nothing breaks, just the avatar shows an empty image.
How to test
https://ft-gpl-org7e7f3fc03d.preview.gitpod-dev.com/settings/onboarding
/hold