Skip to content

Commit da4a40e

Browse files
authored
chore: Migrate RQ functions to use object syntax style (supabase#39895)
* Migrate all uses of invalidateQueries to use object syntax. * Migrate the remainder of useInfiniteQuery. * Migrate all setQueriesData. * Migrate all fetchQuery uses. * Migrate some leftover functions from RQ. * Fix issues found by Charis.
1 parent 5cfc390 commit da4a40e

File tree

227 files changed

+826
-729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+826
-729
lines changed

apps/studio/components/grid/components/grid/Grid.utils.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ export function useOnRowsChange(rows: SupaRow[]) {
2828

2929
const queryKey = tableRowKeys.tableRows(projectRef, { table: { id: table.id } })
3030

31-
await queryClient.cancelQueries(queryKey)
31+
await queryClient.cancelQueries({ queryKey })
3232

33-
const previousRowsQueries = queryClient.getQueriesData<TableRowsData>(queryKey)
33+
const previousRowsQueries = queryClient.getQueriesData<TableRowsData>({ queryKey })
3434

35-
queryClient.setQueriesData<TableRowsData>(queryKey, (old) => {
35+
queryClient.setQueriesData<TableRowsData>({ queryKey }, (old) => {
3636
return {
3737
rows:
3838
old?.rows.map((row) => {
@@ -67,9 +67,9 @@ export function useOnRowsChange(rows: SupaRow[]) {
6767

6868
previousRowsQueries.forEach(([queryKey, previousRows]) => {
6969
if (previousRows) {
70-
queryClient.setQueriesData(queryKey, previousRows)
70+
queryClient.setQueriesData({ queryKey }, previousRows)
7171
}
72-
queryClient.invalidateQueries(queryKey)
72+
queryClient.invalidateQueries({ queryKey })
7373
})
7474

7575
toast.error(error?.message ?? error)

apps/studio/components/grid/components/header/RefreshButton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export const RefreshButton = ({ tableId, isRefetching }: RefreshButtonProps) =>
1616
const queryKey = tableRowKeys.tableRowsAndCount(ref, tableId)
1717

1818
async function onClick() {
19-
await queryClient.invalidateQueries(queryKey)
19+
await queryClient.invalidateQueries({ queryKey })
2020
}
2121

2222
return (

apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ const SecondStep = ({
128128
},
129129
onSuccess: async () => {
130130
if (lastVisitedOrganization) {
131-
await queryClient.invalidateQueries(organizationKeys.members(lastVisitedOrganization))
131+
await queryClient.invalidateQueries({
132+
queryKey: organizationKeys.members(lastVisitedOrganization),
133+
})
132134
}
133135
toast.success(`Successfully added a second factor authentication`)
134136
onClose()

apps/studio/components/interfaces/Account/TOTPFactors/DeleteFactorModal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ const DeleteFactorModal = ({
2929
const { mutate: unenroll, isLoading } = useMfaUnenrollMutation({
3030
onSuccess: async () => {
3131
if (lastVisitedOrganization) {
32-
await queryClient.invalidateQueries(organizationKeys.members(lastVisitedOrganization))
32+
await queryClient.invalidateQueries({
33+
queryKey: organizationKeys.members(lastVisitedOrganization),
34+
})
3335
}
3436
toast.success(`Successfully deleted factor`)
3537
onClose()

apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const PolicyEditorPanel = memo(function ({
125125
const { mutate: executeMutation, isLoading: isExecuting } = useExecuteSqlMutation({
126126
onSuccess: async () => {
127127
// refresh all policies
128-
await queryClient.invalidateQueries(databasePoliciesKeys.list(ref))
128+
await queryClient.invalidateQueries({ queryKey: databasePoliciesKeys.list(ref) })
129129
toast.success('Successfully created new policy')
130130
onSelectCancel()
131131
},

apps/studio/components/interfaces/Auth/Users/UsersV2.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,9 @@ export const UsersV2 = () => {
296296
userIds.map((id) => deleteUser({ projectRef, userId: id, skipInvalidation: true }))
297297
)
298298
// [Joshen] Skip invalidation within RQ to prevent multiple requests, then invalidate once at the end
299-
await Promise.all([queryClient.invalidateQueries(authKeys.usersInfinite(projectRef))])
299+
await Promise.all([
300+
queryClient.invalidateQueries({ queryKey: authKeys.usersInfinite(projectRef) }),
301+
])
300302
toast.success(
301303
`Successfully deleted the selected ${selectedUsers.size} user${selectedUsers.size > 1 ? 's' : ''}`
302304
)

apps/studio/components/interfaces/Billing/Payment/AddPaymentMethodForm.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ const AddPaymentMethodForm = ({ onCancel, onConfirm }: AddPaymentMethodFormProps
7474
paymentMethodId: result.setupIntent.payment_method,
7575
})
7676

77-
await queryClient.invalidateQueries(
78-
organizationKeys.paymentMethods(selectedOrganization.slug)
79-
)
77+
await queryClient.invalidateQueries({
78+
queryKey: organizationKeys.paymentMethods(selectedOrganization.slug),
79+
})
8080

8181
queryClient.setQueriesData(
82-
organizationKeys.paymentMethods(selectedOrganization.slug),
82+
{ queryKey: organizationKeys.paymentMethods(selectedOrganization.slug) },
8383
(prev: any) => {
8484
if (!prev) return prev
8585
return {
@@ -97,9 +97,9 @@ const AddPaymentMethodForm = ({ onCancel, onConfirm }: AddPaymentMethodFormProps
9797
}
9898
} else {
9999
if (selectedOrganization) {
100-
await queryClient.invalidateQueries(
101-
organizationKeys.paymentMethods(selectedOrganization.slug)
102-
)
100+
await queryClient.invalidateQueries({
101+
queryKey: organizationKeys.paymentMethods(selectedOrganization.slug),
102+
})
103103
}
104104
}
105105

apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,9 @@ export const CreateBranchModal = () => {
186186
onSuccess: async (data) => {
187187
toast.success(`Successfully created preview branch "${data.name}"`)
188188
if (projectRef) {
189-
await Promise.all([queryClient.invalidateQueries(projectKeys.detail(projectRef))])
189+
await Promise.all([
190+
queryClient.invalidateQueries({ queryKey: projectKeys.detail(projectRef) }),
191+
])
190192
}
191193
sendEvent({
192194
action: 'branch_create_button_clicked',

apps/studio/components/interfaces/Database/Privileges/Privileges.utils.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,10 @@ export function useApplyPrivilegeOperations(callback?: () => void) {
343343
}
344344

345345
await Promise.all([
346-
queryClient.invalidateQueries(privilegeKeys.tablePrivilegesList(project.ref)),
347-
queryClient.invalidateQueries(privilegeKeys.columnPrivilegesList(project.ref)),
346+
queryClient.invalidateQueries({ queryKey: privilegeKeys.tablePrivilegesList(project.ref) }),
347+
queryClient.invalidateQueries({
348+
queryKey: privilegeKeys.columnPrivilegesList(project.ref),
349+
}),
348350
])
349351

350352
setIsLoading(false)

apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export const CreditTopUp = ({ slug }: { slug: string | undefined }) => {
185185

186186
const onSuccessfulPayment = async () => {
187187
onTopUpDialogVisibilityChange(false)
188-
await queryClient.invalidateQueries(subscriptionKeys.orgSubscription(slug))
188+
await queryClient.invalidateQueries({ queryKey: subscriptionKeys.orgSubscription(slug) })
189189
toast.success(
190190
'Successfully topped up balance. It may take a minute to reflect in your account.'
191191
)

0 commit comments

Comments
 (0)