Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

bug: fix refetch loop (#42613)

Jordi Enric3f6843a6b160
diff --git a/apps/studio/components/grid/hooks/useFilterLifeCycle.ts b/apps/studio/components/grid/hooks/useFilterLifeCycle.ts
index bb35dbd5db6..68d58c10d69 100644
--- a/apps/studio/components/grid/hooks/useFilterLifeCycle.ts
+++ b/apps/studio/components/grid/hooks/useFilterLifeCycle.ts
@@ -35,8 +35,19 @@ export function useSyncFiltersToUrl() {
const snap = useTableEditorTableStateSnapshot()
const { setParams } = useTableEditorFiltersSort()
const timeoutRef = useRef<NodeJS.Timeout | null>(null)
+ const previousFiltersRef = useRef<string>('')
useEffect(() => {
+ // Serialize filters for comparison
+ const currentFiltersStr = JSON.stringify(snap.filters)
+
+ // Only proceed if filters have actually changed
+ if (currentFiltersStr === previousFiltersRef.current) {
+ return
+ }
+
+ previousFiltersRef.current = currentFiltersStr
+
// Clear any existing timeout
if (timeoutRef.current) {
clearTimeout(timeoutRef.current)
diff --git a/apps/studio/hooks/misc/useTableEditorFiltersSort.ts b/apps/studio/hooks/misc/useTableEditorFiltersSort.ts
index 0ba8fd6fb95..5851a8e4d90 100644
--- a/apps/studio/hooks/misc/useTableEditorFiltersSort.ts
+++ b/apps/studio/hooks/misc/useTableEditorFiltersSort.ts
@@ -1,5 +1,5 @@
import { useRouter } from 'next/router'
-import { useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
export const useTableEditorFiltersSort = () => {
const router = useRouter()
@@ -21,21 +21,29 @@ export const useTableEditorFiltersSort = () => {
sort?: string[]
}
- const setParams = (fn: (prevParams: SetParamsArgs) => SetParamsArgs) => {
- const prevParams = { filter: filters, sort: sorts }
- const newParams = fn(prevParams)
-
- const hasFilter = newParams.filter !== undefined
- const hasSort = newParams.sort !== undefined
-
- router.push({
- query: {
- ...router.query,
- ...(hasFilter ? { filter: newParams.filter } : {}),
- ...(hasSort ? { sort: newParams.sort } : {}),
- },
- })
- }
+ const setParams = useCallback(
+ (fn: (prevParams: SetParamsArgs) => SetParamsArgs) => {
+ const prevParams = { filter: filters, sort: sorts }
+ const newParams = fn(prevParams)
+
+ const hasFilter = newParams.filter !== undefined
+ const hasSort = newParams.sort !== undefined
+
+ router.push(
+ {
+ query: {
+ ...router.query,
+ ...(hasFilter ? { filter: newParams.filter } : {}),
+ ...(hasSort ? { sort: newParams.sort } : {}),
+ },
+ },
+ undefined,
+ { shallow: true }
+ )
+ },
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ [filters, sorts]
+ )
return {
filters,