🪟 🐛 🧹 Fix workspace editing issues in cloud, cleanup CloudWorkspacesService #16942
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
github-actions
bot
added
area/platform
airbyte-webapp/src/packages/cloud/services/workspaces/CloudWorkspacesService.tsx
Outdated
Show resolved
Hide resolved
| const removeWorkspace = useRemoveWorkspace(); | ||
| const updateWorkspace = useUpdateWorkspace(); | ||
| const removeCloudWorkspace = useRemoveCloudWorkspace(); | ||
| const updateCloudWorkspace = useUpdateCloudWorkspace(); |
There was a problem hiding this comment.
I think typically we do something like:
Suggested change
| const updateCloudWorkspace = useUpdateCloudWorkspace(); | |
| const { mutateAsync: updateCloudWorkspace } = useUpdateCloudWorkspace(); |
| export const WorkspaceSettingsView: React.FC = () => { | ||
| const { formatMessage } = useIntl(); | ||
| useTrackPage(PageTrackingCodes.SETTINGS_WORKSPACE); | ||
| const { exitWorkspace } = useWorkspaceService(); | ||
| const workspace = useCurrentWorkspace(); | ||
| const removeWorkspace = useRemoveWorkspace(); | ||
| const updateWorkspace = useUpdateWorkspace(); | ||
| const removeCloudWorkspace = useRemoveCloudWorkspace(); |
There was a problem hiding this comment.
Suggested change
| const removeCloudWorkspace = useRemoveCloudWorkspace(); | |
| const const { mutateAsync: removeCloudWorkspace, isLoading } = = useRemoveCloudWorkspace(); |
krishnaglick
approved these changes
Sep 21, 2022
Use i18n string sin WorkspaceSettingsView buttons
…nfusion with WorkspaceService Update functions in CloudWorkspacesServices to include the word Cloud
edmundito
force-pushed
the
edmundito/fix-workspace-settings
branch
from
c6f5cec to
cc7d002
Compare
This was referenced Sep 22, 2022
robbinhan
pushed a commit
to robbinhan/airbyte
that referenced
this pull request
Sep 29, 2022
…ervice (airbytehq#16942) * Add validation to WorkspaceSettingsView Use i18n string sin WorkspaceSettingsView buttons * Invalidate the workspace query when updating the workspace in cloud * Rename Cloud WorkspacesService to CloudWorkspacesServices to avoid confusion with WorkspaceService Update functions in CloudWorkspacesServices to include the word Cloud * useInvalidateWorkspaceQuery -> useInvalidateWorkspace * Remove useWorkspaceService import from CloudWorkspacesService * Update var names using CloudWorkspacesService * Rename useGetUsage to useGetCloudWorkspaceUsage * tsx -> ts * Cleanup mutateAsync usage around CloudWorkspacesService hooks * Remove reference to CloudWorkspacesServices in ConnectionFormService test
jhammarstedt
pushed a commit
to jhammarstedt/airbyte
that referenced
this pull request
Oct 31, 2022
…ervice (airbytehq#16942) * Add validation to WorkspaceSettingsView Use i18n string sin WorkspaceSettingsView buttons * Invalidate the workspace query when updating the workspace in cloud * Rename Cloud WorkspacesService to CloudWorkspacesServices to avoid confusion with WorkspaceService Update functions in CloudWorkspacesServices to include the word Cloud * useInvalidateWorkspaceQuery -> useInvalidateWorkspace * Remove useWorkspaceService import from CloudWorkspacesService * Update var names using CloudWorkspacesService * Rename useGetUsage to useGetCloudWorkspaceUsage * tsx -> ts * Cleanup mutateAsync usage around CloudWorkspacesService hooks * Remove reference to CloudWorkspacesServices in ConnectionFormService test
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.
What
Fixes #16149
This change primarily fixes some issues when editing the cloud workspace name and advanced mode, including:
Also cleans up the cloud workspace code to distinguish it from the workspace code
How
There are two endpoints for getting workspace data: One from the platform and one specific to cloud. The issue when saving the workspace name in cloud was that the workspace data for the platform was not getting invalidated (since it's cached with react-query), and so the name was not getting updated across the app. When the cloud workspace data is updated, the platform workspace data is invalidated, so it's re-fetched.
Additionally, some of the cache keys used with suspenseQuery were not quite matching, so those were fixed. Caused by #11746
There was a lot of mixup in the cloud between what's cloud workspace and platform workspace, so a lot of the functions have been renamed so that it's clear which is which.
Recommended reading order
WorkspaceSettingsView.tsxCloudWorkspacesService.tsWorkspacesService.tsRest of code