The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
cleanup: fix import order and prefixes for studio/data (#44501)
Charis3b7052b5a96f
diff --git a/apps/studio/data/__templates/resource-query.ts b/apps/studio/data/__templates/resource-query.tsindex 7bb872e996b..0de9ce05966 100644--- a/apps/studio/data/__templates/resource-query.ts+++ b/apps/studio/data/__templates/resource-query.ts@@ -1,9 +1,9 @@import { useQuery, useQueryClient } from '@tanstack/react-query'import { useCallback } from 'react'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { resourceKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ResourceVariables = {projectRef?: stringdiff --git a/apps/studio/data/__templates/resource-update-mutation.ts b/apps/studio/data/__templates/resource-update-mutation.tsindex 478d6785ae7..48613813db7 100644--- a/apps/studio/data/__templates/resource-update-mutation.ts+++ b/apps/studio/data/__templates/resource-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { resourceKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ResourceUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/__templates/resources-query.ts b/apps/studio/data/__templates/resources-query.tsindex 095d920f7d4..c198e9fe3ec 100644--- a/apps/studio/data/__templates/resources-query.ts+++ b/apps/studio/data/__templates/resources-query.ts@@ -1,9 +1,9 @@import { useQuery, useQueryClient } from '@tanstack/react-query'import { useCallback } from 'react'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { resourceKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ResourcesVariables = {projectRef?: stringdiff --git a/apps/studio/data/access-tokens/access-tokens-create-mutation.ts b/apps/studio/data/access-tokens/access-tokens-create-mutation.tsindex e932b878778..d72c444dadc 100644--- a/apps/studio/data/access-tokens/access-tokens-create-mutation.ts+++ b/apps/studio/data/access-tokens/access-tokens-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { accessTokenKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type AccessTokenCreateVariables = components['schemas']['CreateAccessTokenBody']diff --git a/apps/studio/data/access-tokens/access-tokens-delete-mutation.ts b/apps/studio/data/access-tokens/access-tokens-delete-mutation.tsindex 2b5dd614d48..bc06197d38b 100644--- a/apps/studio/data/access-tokens/access-tokens-delete-mutation.ts+++ b/apps/studio/data/access-tokens/access-tokens-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { accessTokenKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type AccessTokenDeleteVariables = {id: numberdiff --git a/apps/studio/data/access-tokens/access-tokens-query.ts b/apps/studio/data/access-tokens/access-tokens-query.tsindex 7713cc6ee70..a2f6bfd97b1 100644--- a/apps/studio/data/access-tokens/access-tokens-query.ts+++ b/apps/studio/data/access-tokens/access-tokens-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { accessTokenKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getAccessTokens(signal?: AbortSignal) {const { data, error } = await get('/platform/profile/access-tokens', { signal })diff --git a/apps/studio/data/actions/action-detail-query.ts b/apps/studio/data/actions/action-detail-query.tsindex 995b1c44621..5616bd7ba50 100644--- a/apps/studio/data/actions/action-detail-query.ts+++ b/apps/studio/data/actions/action-detail-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { actionKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ActionRunVariables = {projectRef?: stringdiff --git a/apps/studio/data/actions/action-logs-query.ts b/apps/studio/data/actions/action-logs-query.tsindex 817f8e687cf..c9bc307ab02 100644--- a/apps/studio/data/actions/action-logs-query.ts+++ b/apps/studio/data/actions/action-logs-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { actionKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ActionLogsVariables = {projectRef?: stringdiff --git a/apps/studio/data/actions/action-runs-query.ts b/apps/studio/data/actions/action-runs-query.tsindex 616b1c1cd3f..62ccdd101ef 100644--- a/apps/studio/data/actions/action-runs-query.ts+++ b/apps/studio/data/actions/action-runs-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { operations } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { actionKeys } from './keys'+import type { operations } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ActionsVariables = operations['v1-list-action-runs']['parameters']['path']diff --git a/apps/studio/data/ai/check-api-key-query.ts b/apps/studio/data/ai/check-api-key-query.tsindex f1f74a5d4f0..ad5f287d1a0 100644--- a/apps/studio/data/ai/check-api-key-query.ts+++ b/apps/studio/data/ai/check-api-key-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { constructHeaders, fetchHandler } from 'data/fetchers'-import { BASE_PATH, IS_PLATFORM } from 'lib/constants'-import { ResponseError, UseCustomQueryOptions } from 'types'import { aiKeys } from './keys'+import { constructHeaders, fetchHandler } from '@/data/fetchers'+import { BASE_PATH, IS_PLATFORM } from '@/lib/constants'+import { ResponseError, UseCustomQueryOptions } from '@/types'// check to see if the OPENAI_API_KEY env var is set in self-hosted// so we can disable the chat editor and add a warning about manually adding the keydiff --git a/apps/studio/data/ai/rate-message-mutation.ts b/apps/studio/data/ai/rate-message-mutation.tsindex 556c3a7bbd9..c6f62365a3b 100644--- a/apps/studio/data/ai/rate-message-mutation.ts+++ b/apps/studio/data/ai/rate-message-mutation.ts@@ -1,10 +1,10 @@import { UIMessage } from '@ai-sdk/react'import { useMutation } from '@tanstack/react-query'-import type { RateMessageResponse } from 'components/ui/AIAssistantPanel/Message.utils'-import { constructHeaders, fetchHandler } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import { ResponseError, UseCustomMutationOptions } from 'types'+import type { RateMessageResponse } from '@/components/ui/AIAssistantPanel/Message.utils'+import { constructHeaders, fetchHandler } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import { ResponseError, UseCustomMutationOptions } from '@/types'export type RateMessageVariables = {rating: 'positive' | 'negative'diff --git a/apps/studio/data/ai/sql-cron-mutation.ts b/apps/studio/data/ai/sql-cron-mutation.tsindex ffa453f3d7d..bae1e3abe6c 100644--- a/apps/studio/data/ai/sql-cron-mutation.ts+++ b/apps/studio/data/ai/sql-cron-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { constructHeaders, fetchHandler } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import { ResponseError, UseCustomMutationOptions } from 'types'+import { constructHeaders, fetchHandler } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import { ResponseError, UseCustomMutationOptions } from '@/types'export type SqlCronGenerateResponse = stringdiff --git a/apps/studio/data/ai/sql-filter-mutation.ts b/apps/studio/data/ai/sql-filter-mutation.tsindex 00e5fb770d8..4a6f5c8d13e 100644--- a/apps/studio/data/ai/sql-filter-mutation.ts+++ b/apps/studio/data/ai/sql-filter-mutation.ts@@ -1,11 +1,11 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'--import { constructHeaders, fetchHandler } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import { ResponseError, UseCustomMutationOptions } from 'types'import { AIFilterRequestPayload, FilterGroup } from 'ui-patterns/FilterBar'+import { constructHeaders, fetchHandler } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import { ResponseError, UseCustomMutationOptions } from '@/types'+export type SqlFilterGenerateResponse = FilterGroupexport async function generateSqlFilters({diff --git a/apps/studio/data/ai/sql-policy-mutation.ts b/apps/studio/data/ai/sql-policy-mutation.tsindex fde77f775cb..a87340c0e1b 100644--- a/apps/studio/data/ai/sql-policy-mutation.ts+++ b/apps/studio/data/ai/sql-policy-mutation.ts@@ -1,10 +1,10 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import type { CreatePolicyBody } from 'data/database-policies/database-policy-create-mutation'-import { fetchPost } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import { ResponseError, UseCustomMutationOptions } from 'types'+import type { CreatePolicyBody } from '@/data/database-policies/database-policy-create-mutation'+import { fetchPost } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import { ResponseError, UseCustomMutationOptions } from '@/types'export type SqlPolicyGenerateVariables = {tableName: stringdiff --git a/apps/studio/data/ai/sql-title-mutation.ts b/apps/studio/data/ai/sql-title-mutation.tsindex e810d914851..c384d686cc3 100644--- a/apps/studio/data/ai/sql-title-mutation.ts+++ b/apps/studio/data/ai/sql-title-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { constructHeaders, fetchHandler } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import { ResponseError, UseCustomMutationOptions } from 'types'+import { constructHeaders, fetchHandler } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import { ResponseError, UseCustomMutationOptions } from '@/types'export type SqlTitleGenerateResponse = {title: stringdiff --git a/apps/studio/data/analytics/functions-combined-stats-query.ts b/apps/studio/data/analytics/functions-combined-stats-query.tsindex d22181c45a2..1fa9806c92d 100644--- a/apps/studio/data/analytics/functions-combined-stats-query.ts+++ b/apps/studio/data/analytics/functions-combined-stats-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'import { operations } from 'api-types'-import { get, handleError } from 'data/fetchers'+import { analyticsKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type FunctionsCombinedStatsVariables = {projectRef?: stringdiff --git a/apps/studio/data/analytics/functions-req-stats-query.ts b/apps/studio/data/analytics/functions-req-stats-query.tsindex 90ec7709313..88f04586fbe 100644--- a/apps/studio/data/analytics/functions-req-stats-query.ts+++ b/apps/studio/data/analytics/functions-req-stats-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'import { operations } from 'api-types'-import { get, handleError } from 'data/fetchers'+import { analyticsKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type FunctionsReqStatsVariables = {projectRef?: stringdiff --git a/apps/studio/data/analytics/functions-resource-usage-query.ts b/apps/studio/data/analytics/functions-resource-usage-query.tsindex dd49f11567b..44622300a9d 100644--- a/apps/studio/data/analytics/functions-resource-usage-query.ts+++ b/apps/studio/data/analytics/functions-resource-usage-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'import { operations } from 'api-types'-import { get, handleError } from 'data/fetchers'+import { analyticsKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type FunctionsResourceUsageVariables = {projectRef?: stringdiff --git a/apps/studio/data/analytics/infra-monitoring-queries.test.ts b/apps/studio/data/analytics/infra-monitoring-queries.test.tsindex be9d0d3198c..0720e41806f 100644--- a/apps/studio/data/analytics/infra-monitoring-queries.test.ts+++ b/apps/studio/data/analytics/infra-monitoring-queries.test.ts@@ -1,16 +1,16 @@import dayjs from 'dayjs'import { describe, expect, it } from 'vitest'+import {+ aggregate1MinTo2Min,+ mapMultiResponseToAnalyticsData,+ mapResponseToAnalyticsData,+} from './infra-monitoring-queries'import type {InfraMonitoringMultiData,InfraMonitoringMultiResponse,InfraMonitoringSingleResponse,} from './infra-monitoring-query'-import {- aggregate1MinTo2Min,- mapResponseToAnalyticsData,- mapMultiResponseToAnalyticsData,-} from './infra-monitoring-queries'const mockMultiResponse: InfraMonitoringMultiResponse = {data: [diff --git a/apps/studio/data/analytics/infra-monitoring-queries.ts b/apps/studio/data/analytics/infra-monitoring-queries.tsindex 0b6d2bbb9eb..f3f812dcebd 100644--- a/apps/studio/data/analytics/infra-monitoring-queries.ts+++ b/apps/studio/data/analytics/infra-monitoring-queries.ts@@ -1,7 +1,6 @@-import { useMemo } from 'react'import type { UseQueryResult } from '@tanstack/react-query'-import dayjs from 'dayjs'+import { useMemo } from 'react'import type { AnalyticsData, AnalyticsInterval, DataPoint } from './constants'import type {@@ -10,8 +9,8 @@ import type {InfraMonitoringSingleResponse,} from './infra-monitoring-query'import {- InfraMonitoringMultiData,InfraMonitoringError,+ InfraMonitoringMultiData,useInfraMonitoringAttributesQuery,} from './infra-monitoring-query'diff --git a/apps/studio/data/analytics/infra-monitoring-query.ts b/apps/studio/data/analytics/infra-monitoring-query.tsindex 322bc4bf3ac..fe4b5fcdabe 100644--- a/apps/studio/data/analytics/infra-monitoring-query.ts+++ b/apps/studio/data/analytics/infra-monitoring-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'import { paths } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { UseCustomQueryOptions } from 'types'import type { AnalyticsInterval } from './constants'import { analyticsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type InfraMonitoringAttribute = NonNullable<paths['/platform/projects/{ref}/infra-monitoring']['get']['parameters']['query']['attributes']diff --git a/apps/studio/data/analytics/org-daily-stats-query.test.ts b/apps/studio/data/analytics/org-daily-stats-query.test.tsindex a3636d90758..fb9c5fc4994 100644--- a/apps/studio/data/analytics/org-daily-stats-query.test.ts+++ b/apps/studio/data/analytics/org-daily-stats-query.test.ts@@ -1,4 +1,5 @@import { beforeEach, describe, expect, it, vi } from 'vitest'+import { getOrgDailyStats } from './org-daily-stats-query'vi.mock('data/fetchers', () => ({diff --git a/apps/studio/data/analytics/org-daily-stats-query.ts b/apps/studio/data/analytics/org-daily-stats-query.tsindex 536210d6500..dade33722e5 100644--- a/apps/studio/data/analytics/org-daily-stats-query.ts+++ b/apps/studio/data/analytics/org-daily-stats-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { analyticsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export enum EgressType {REST = 'egress_rest',diff --git a/apps/studio/data/analytics/project-daily-stats-query.ts b/apps/studio/data/analytics/project-daily-stats-query.tsindex 03308280cd1..f454fc753ea 100644--- a/apps/studio/data/analytics/project-daily-stats-query.ts+++ b/apps/studio/data/analytics/project-daily-stats-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { operations } from 'api-types'-import { get, handleError } from 'data/fetchers'+import type { AnalyticsData } from './constants'import { analyticsKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type ProjectDailyStatsAttribute =operations['DailyStatsController_getDailyStats']['parameters']['query']['attribute']diff --git a/apps/studio/data/analytics/project-log-requests-count-query.ts b/apps/studio/data/analytics/project-log-requests-count-query.tsindex e8ef75ffb50..9c4697495df 100644--- a/apps/studio/data/analytics/project-log-requests-count-query.ts+++ b/apps/studio/data/analytics/project-log-requests-count-query.ts@@ -1,8 +1,8 @@import { QueryClient, useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { analyticsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectLogRequestsCountVariables = {projectRef?: stringdiff --git a/apps/studio/data/analytics/project-log-stats-query.ts b/apps/studio/data/analytics/project-log-stats-query.tsindex b0eaeea269f..514d673184e 100644--- a/apps/studio/data/analytics/project-log-stats-query.ts+++ b/apps/studio/data/analytics/project-log-stats-query.ts@@ -1,9 +1,9 @@import { QueryClient, useQuery } from '@tanstack/react-query'import { operations } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { UseCustomQueryOptions } from 'types'import { analyticsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type ProjectLogStatsVariables = {projectRef?: stringdiff --git a/apps/studio/data/analytics/utils.ts b/apps/studio/data/analytics/utils.tsindex 67f5249a73d..3bf2da434a9 100644--- a/apps/studio/data/analytics/utils.ts+++ b/apps/studio/data/analytics/utils.ts@@ -1,4 +1,5 @@import { useQueryClient } from '@tanstack/react-query'+import { analyticsKeys } from './keys'export const useInvalidateAnalyticsQuery = () => {diff --git a/apps/studio/data/api-authorization/api-authorization-approve-mutation.ts b/apps/studio/data/api-authorization/api-authorization-approve-mutation.tsindex 6d548342fe8..d4011184bb9 100644--- a/apps/studio/data/api-authorization/api-authorization-approve-mutation.ts+++ b/apps/studio/data/api-authorization/api-authorization-approve-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ApiAuthorizationApproveVariables = {id: stringdiff --git a/apps/studio/data/api-authorization/api-authorization-decline-mutation.ts b/apps/studio/data/api-authorization/api-authorization-decline-mutation.tsindex 9f47d22cdeb..8cc02eb7a4a 100644--- a/apps/studio/data/api-authorization/api-authorization-decline-mutation.ts+++ b/apps/studio/data/api-authorization/api-authorization-decline-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ApiAuthorizationDeclineVariables = {id: stringdiff --git a/apps/studio/data/api-authorization/api-authorization-query.ts b/apps/studio/data/api-authorization/api-authorization-query.tsindex 92f8672caa4..f9cc58cfd63 100644--- a/apps/studio/data/api-authorization/api-authorization-query.ts+++ b/apps/studio/data/api-authorization/api-authorization-query.ts@@ -1,9 +1,9 @@import type { OAuthScope } from '@supabase/shared-types/out/constants'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'import { resourceKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type ApiAuthorizationVariables = {id?: stringdiff --git a/apps/studio/data/api-keys/api-key-create-mutation.ts b/apps/studio/data/api-keys/api-key-create-mutation.tsindex 3a9c3071780..1aa32df38b2 100644--- a/apps/studio/data/api-keys/api-key-create-mutation.ts+++ b/apps/studio/data/api-keys/api-key-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { apiKeysKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type APIKeyCreateVariables = {projectRef?: stringdiff --git a/apps/studio/data/api-keys/api-key-delete-mutation.ts b/apps/studio/data/api-keys/api-key-delete-mutation.tsindex fd290dbda95..18d0e767c4f 100644--- a/apps/studio/data/api-keys/api-key-delete-mutation.ts+++ b/apps/studio/data/api-keys/api-key-delete-mutation.ts@@ -1,8 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { del, handleError } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { apiKeysKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type APIKeyDeleteVariables = {projectRef?: stringdiff --git a/apps/studio/data/api-keys/api-key-id-query.ts b/apps/studio/data/api-keys/api-key-id-query.tsindex fcb66961471..fb7b8b1a525 100644--- a/apps/studio/data/api-keys/api-key-id-query.ts+++ b/apps/studio/data/api-keys/api-key-id-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { apiKeysKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export interface APIKeyVariables {projectRef?: stringdiff --git a/apps/studio/data/api-keys/api-key-id-update-mutation.ts b/apps/studio/data/api-keys/api-key-id-update-mutation.tsindex debc26412af..600c986b1db 100644--- a/apps/studio/data/api-keys/api-key-id-update-mutation.ts+++ b/apps/studio/data/api-keys/api-key-id-update-mutation.ts@@ -1,9 +1,9 @@+import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { apiKeysKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export interface UpdateAPIKeybyIdVariables {projectRef?: stringdiff --git a/apps/studio/data/api-keys/api-keys-query.ts b/apps/studio/data/api-keys/api-keys-query.tsindex 4f94bd35599..bf18a6f1d32 100644--- a/apps/studio/data/api-keys/api-keys-query.ts+++ b/apps/studio/data/api-keys/api-keys-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { apiKeysKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type LegacyKeys = {api_key: stringdiff --git a/apps/studio/data/api-keys/legacy-api-key-toggle-mutation.ts b/apps/studio/data/api-keys/legacy-api-key-toggle-mutation.tsindex 5fbb64148f5..72799e7686a 100644--- a/apps/studio/data/api-keys/legacy-api-key-toggle-mutation.ts+++ b/apps/studio/data/api-keys/legacy-api-key-toggle-mutation.ts@@ -1,8 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, put } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { apiKeysKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ToggleLegacyAPIKeysVariables = {projectRef?: stringdiff --git a/apps/studio/data/api-keys/legacy-api-keys-status-query.ts b/apps/studio/data/api-keys/legacy-api-keys-status-query.tsindex a513906d3b9..f6d511f6195 100644--- a/apps/studio/data/api-keys/legacy-api-keys-status-query.ts+++ b/apps/studio/data/api-keys/legacy-api-keys-status-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { apiKeysKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'interface LegacyAPIKeysStatusVariables {projectRef?: stringdiff --git a/apps/studio/data/api-keys/temp-api-keys-query.ts b/apps/studio/data/api-keys/temp-api-keys-query.tsindex 0f4de86ef2f..404786aa245 100644--- a/apps/studio/data/api-keys/temp-api-keys-query.ts+++ b/apps/studio/data/api-keys/temp-api-keys-query.ts@@ -1,4 +1,4 @@-import { handleError, post } from 'data/fetchers'+import { handleError, post } from '@/data/fetchers'interface getTemporaryAPIKeyVariables {projectRef?: stringdiff --git a/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.ts b/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.tsindex 8b66ced7d5c..55463395d70 100644--- a/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.ts+++ b/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.ts@@ -1,12 +1,12 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { configKeys } from 'data/config/keys'-import { databaseKeys } from 'data/database/keys'-import { handleError, patch } from 'data/fetchers'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { configKeys } from '@/data/config/keys'+import { databaseKeys } from '@/data/database/keys'+import { handleError, patch } from '@/data/fetchers'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateAndExposeAPISchemaVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/auth-config-query.ts b/apps/studio/data/auth/auth-config-query.tsindex 78629c57d95..b7b7d3a69c2 100644--- a/apps/studio/data/auth/auth-config-query.ts+++ b/apps/studio/data/auth/auth-config-query.ts@@ -1,11 +1,11 @@import { useQuery, useQueryClient } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'import { useCallback } from 'react'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { authKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type AuthConfigVariables = {projectRef?: stringdiff --git a/apps/studio/data/auth/auth-config-update-mutation.ts b/apps/studio/data/auth/auth-config-update-mutation.tsindex f2d4fc47dbe..46f37188db6 100644--- a/apps/studio/data/auth/auth-config-update-mutation.ts+++ b/apps/studio/data/auth/auth-config-update-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, patch } from 'data/fetchers'-import { lintKeys } from 'data/lint/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { authKeys } from './keys'+import type { components } from '@/data/api'+import { handleError, patch } from '@/data/fetchers'+import { lintKeys } from '@/data/lint/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type AuthConfigUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/auth-hooks-update-mutation.ts b/apps/studio/data/auth/auth-hooks-update-mutation.tsindex 7da20512265..29f1dc0db12 100644--- a/apps/studio/data/auth/auth-hooks-update-mutation.ts+++ b/apps/studio/data/auth/auth-hooks-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { authKeys } from './keys'+import type { components } from '@/data/api'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type AuthHooksUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/auth-overview-query.ts b/apps/studio/data/auth/auth-overview-query.tsindex 8fb6a39538e..69324b150ea 100644--- a/apps/studio/data/auth/auth-overview-query.ts+++ b/apps/studio/data/auth/auth-overview-query.ts@@ -1,11 +1,12 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'++import { authKeys } from './keys'import {RawAuthMetricsResponseSchema,type RawAuthMetricsResponse,-} from 'components/interfaces/Auth/Overview/OverviewUsage.schema'-import type { UseCustomQueryOptions } from 'types'-import { authKeys } from './keys'+} from '@/components/interfaces/Auth/Overview/OverviewUsage.schema'+import { get, handleError } from '@/data/fetchers'+import type { UseCustomQueryOptions } from '@/types'export type AuthOverviewVariables = {projectRef?: stringdiff --git a/apps/studio/data/auth/index-worker-status-query.ts b/apps/studio/data/auth/index-worker-status-query.tsindex 2ac8ae3d7c9..d72110ac746 100644--- a/apps/studio/data/auth/index-worker-status-query.ts+++ b/apps/studio/data/auth/index-worker-status-query.ts@@ -1,9 +1,9 @@import { getIndexWorkerStatusSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { executeSql, type ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { authKeys } from './keys'+import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type IndexWorkerStatusVariables = {projectRef?: stringdiff --git a/apps/studio/data/auth/session-access-token-query.ts b/apps/studio/data/auth/session-access-token-query.tsindex b72fb1820e6..5f4100f61cf 100644--- a/apps/studio/data/auth/session-access-token-query.ts+++ b/apps/studio/data/auth/session-access-token-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { getAccessToken } from 'common'+import { authKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { UseCustomQueryOptions } from '@/types'export async function getSessionAccessToken() {// ignore if server-sidediff --git a/apps/studio/data/auth/user-create-mutation.ts b/apps/studio/data/auth/user-create-mutation.tsindex 17df73f246f..bf622b83d9e 100644--- a/apps/studio/data/auth/user-create-mutation.ts+++ b/apps/studio/data/auth/user-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { authKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/user-delete-mfa-factors-mutation.ts b/apps/studio/data/auth/user-delete-mfa-factors-mutation.tsindex d27a9526d5c..eee2030e5e3 100644--- a/apps/studio/data/auth/user-delete-mfa-factors-mutation.ts+++ b/apps/studio/data/auth/user-delete-mfa-factors-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserDeleteMFAFactorsVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/user-delete-mutation.ts b/apps/studio/data/auth/user-delete-mutation.tsindex 17e0d9bd482..d084fa43180 100644--- a/apps/studio/data/auth/user-delete-mutation.ts+++ b/apps/studio/data/auth/user-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { authKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/user-invite-mutation.ts b/apps/studio/data/auth/user-invite-mutation.tsindex 15e149e72ee..f623d671050 100644--- a/apps/studio/data/auth/user-invite-mutation.ts+++ b/apps/studio/data/auth/user-invite-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { authKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserInviteVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/user-query.ts b/apps/studio/data/auth/user-query.tsindex 8e067d003a5..73ac5546686 100644--- a/apps/studio/data/auth/user-query.ts+++ b/apps/studio/data/auth/user-query.ts@@ -1,11 +1,11 @@import { getUserSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { executeSql, type ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { authKeys } from './keys'import { User } from './users-infinite-query'+import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'import { UUID_REGEX } from '@/lib/constants'+import { UseCustomQueryOptions } from '@/types'type UserVariables = {projectRef?: stringdiff --git a/apps/studio/data/auth/user-reset-password-mutation.ts b/apps/studio/data/auth/user-reset-password-mutation.tsindex fa1f5b22d4d..739424ef561 100644--- a/apps/studio/data/auth/user-reset-password-mutation.ts+++ b/apps/studio/data/auth/user-reset-password-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import type { User } from './users-infinite-query'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserResetPasswordVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/user-search-indexes-query.ts b/apps/studio/data/auth/user-search-indexes-query.tsindex 3894d392588..02400b752ce 100644--- a/apps/studio/data/auth/user-search-indexes-query.ts+++ b/apps/studio/data/auth/user-search-indexes-query.ts@@ -1,9 +1,9 @@import { getIndexStatusesSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { executeSql, type ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { authKeys } from './keys'+import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type UsersIndexStatusesVariables = {projectRef?: stringdiff --git a/apps/studio/data/auth/user-send-magic-link-mutation.ts b/apps/studio/data/auth/user-send-magic-link-mutation.tsindex cf3eca6b50a..e13a982b0af 100644--- a/apps/studio/data/auth/user-send-magic-link-mutation.ts+++ b/apps/studio/data/auth/user-send-magic-link-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import type { User } from './users-infinite-query'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserSendMagicLinkVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/user-send-otp-mutation.ts b/apps/studio/data/auth/user-send-otp-mutation.tsindex ab780629642..b4dd6a5f1ce 100644--- a/apps/studio/data/auth/user-send-otp-mutation.ts+++ b/apps/studio/data/auth/user-send-otp-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import type { User } from './users-infinite-query'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserSendOTPVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/user-update-mutation.ts b/apps/studio/data/auth/user-update-mutation.tsindex 2c50c824855..934cbe95b46 100644--- a/apps/studio/data/auth/user-update-mutation.ts+++ b/apps/studio/data/auth/user-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, patch } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { authKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UserUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/auth/users-count-query.ts b/apps/studio/data/auth/users-count-query.tsindex bb8a41038fd..4bfabf2a388 100644--- a/apps/studio/data/auth/users-count-query.ts+++ b/apps/studio/data/auth/users-count-query.ts@@ -1,11 +1,11 @@import type { OptimizedSearchColumns } from '@supabase/pg-meta'import { getUsersCountSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { executeSql, type ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { authKeys } from './keys'import { type Filter } from './users-infinite-query'+import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type UsersCountVariables = {projectRef?: stringdiff --git a/apps/studio/data/auth/users-infinite-query.ts b/apps/studio/data/auth/users-infinite-query.tsindex 5cff74bcfca..eca57f51fad 100644--- a/apps/studio/data/auth/users-infinite-query.ts+++ b/apps/studio/data/auth/users-infinite-query.ts@@ -1,12 +1,12 @@import { getPaginatedUsersSQL, OptimizedSearchColumns, UsersCursor } from '@supabase/pg-meta'import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { executeSql, ExecuteSqlError } from 'data/sql/execute-sql-query'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import { UseCustomInfiniteQueryOptions } from 'types'import { authKeys } from './keys'+import type { components } from '@/data/api'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import { UseCustomInfiniteQueryOptions } from '@/types'const USERS_PAGE_LIMIT = 50type UsersData = { result: User[] }diff --git a/apps/studio/data/auth/validate-spam-mutation.ts b/apps/studio/data/auth/validate-spam-mutation.tsindex 067b8945f07..306e6720c2c 100644--- a/apps/studio/data/auth/validate-spam-mutation.ts+++ b/apps/studio/data/auth/validate-spam-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import type { components } from '@/data/api'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ValidateSpamVariables = {projectRef: stringdiff --git a/apps/studio/data/aws-accounts/aws-account-create-mutation.ts b/apps/studio/data/aws-accounts/aws-account-create-mutation.tsindex a331c8a92c7..5680685cb76 100644--- a/apps/studio/data/aws-accounts/aws-account-create-mutation.ts+++ b/apps/studio/data/aws-accounts/aws-account-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError } from 'types'import { awsAccountKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError } from '@/types'export type AWSAccountCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/aws-accounts/aws-account-delete-mutation.ts b/apps/studio/data/aws-accounts/aws-account-delete-mutation.tsindex 5d49f260a9b..9d01fec1af6 100644--- a/apps/studio/data/aws-accounts/aws-account-delete-mutation.ts+++ b/apps/studio/data/aws-accounts/aws-account-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError } from 'types'import { awsAccountKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError } from '@/types'export type AWSAccountDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/aws-accounts/aws-accounts-query.ts b/apps/studio/data/aws-accounts/aws-accounts-query.tsindex 0407e1a9101..3800425bd63 100644--- a/apps/studio/data/aws-accounts/aws-accounts-query.ts+++ b/apps/studio/data/aws-accounts/aws-accounts-query.ts@@ -1,10 +1,10 @@import type { UseQueryOptions } from '@tanstack/react-query'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError } from 'types'import { awsAccountKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError } from '@/types'type AWSAccountsVariables = {projectRef?: stringdiff --git a/apps/studio/data/banned-ips/banned-ips-delete-mutations.ts b/apps/studio/data/banned-ips/banned-ips-delete-mutations.tsindex 1d592df0764..ff62600004b 100644--- a/apps/studio/data/banned-ips/banned-ips-delete-mutations.ts+++ b/apps/studio/data/banned-ips/banned-ips-delete-mutations.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { BannedIPKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type IPDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/banned-ips/banned-ips-query.ts b/apps/studio/data/banned-ips/banned-ips-query.tsindex e79a52f9913..93f2d6f2841 100644--- a/apps/studio/data/banned-ips/banned-ips-query.ts+++ b/apps/studio/data/banned-ips/banned-ips-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { BannedIPKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type BannedIPVariables = {projectRef?: stringdiff --git a/apps/studio/data/branches/branch-create-mutation.ts b/apps/studio/data/branches/branch-create-mutation.tsindex b03bcf95a05..b106d1980fd 100644--- a/apps/studio/data/branches/branch-create-mutation.ts+++ b/apps/studio/data/branches/branch-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { branchKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BranchCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/branches/branch-delete-mutation.ts b/apps/studio/data/branches/branch-delete-mutation.tsindex 55d52338ded..ff5fb1d4bb5 100644--- a/apps/studio/data/branches/branch-delete-mutation.ts+++ b/apps/studio/data/branches/branch-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { BranchesData } from './branches-query'import { branchKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BranchDeleteVariables = {branchRef: stringdiff --git a/apps/studio/data/branches/branch-diff-query.ts b/apps/studio/data/branches/branch-diff-query.tsindex b531fadd106..a858a48a3a4 100644--- a/apps/studio/data/branches/branch-diff-query.ts+++ b/apps/studio/data/branches/branch-diff-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { branchKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type BranchDiffVariables = {branchRef: stringdiff --git a/apps/studio/data/branches/branch-merge-mutation.ts b/apps/studio/data/branches/branch-merge-mutation.tsindex 105b4845ce3..fc673688b75 100644--- a/apps/studio/data/branches/branch-merge-mutation.ts+++ b/apps/studio/data/branches/branch-merge-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'-import { upsertMigration } from '../database/migration-upsert-mutation'import { getBranchDiff } from './branch-diff-query'import { branchKeys } from './keys'+import { upsertMigration } from '@/data/database/migration-upsert-mutation'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BranchMergeVariables = {branchProjectRef: stringdiff --git a/apps/studio/data/branches/branch-push-mutation.ts b/apps/studio/data/branches/branch-push-mutation.tsindex 499b091ccb5..2a2055a73a9 100644--- a/apps/studio/data/branches/branch-push-mutation.ts+++ b/apps/studio/data/branches/branch-push-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { branchKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BranchPushVariables = {branchRef: stringdiff --git a/apps/studio/data/branches/branch-query.ts b/apps/studio/data/branches/branch-query.tsindex c22d6fd3cf5..fda347aefb6 100644--- a/apps/studio/data/branches/branch-query.ts+++ b/apps/studio/data/branches/branch-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { branchKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type BranchVariables = {branchRef?: stringdiff --git a/apps/studio/data/branches/branch-reset-mutation.ts b/apps/studio/data/branches/branch-reset-mutation.tsindex 7654bc90801..72c81003f51 100644--- a/apps/studio/data/branches/branch-reset-mutation.ts+++ b/apps/studio/data/branches/branch-reset-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { branchKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BranchResetVariables = {branchRef: stringdiff --git a/apps/studio/data/branches/branch-restore-mutation.ts b/apps/studio/data/branches/branch-restore-mutation.tsindex 0ac798a371e..c85f2ea31ca 100644--- a/apps/studio/data/branches/branch-restore-mutation.ts+++ b/apps/studio/data/branches/branch-restore-mutation.ts@@ -1,8 +1,9 @@-import { type UseMutationOptions, useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'+import { useMutation, useQueryClient, type UseMutationOptions } from '@tanstack/react-query'import { toast } from 'sonner'-import type { ResponseError } from 'types'+import { branchKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError } from '@/types'export type BranchRestoreVariables = {branchRef: stringdiff --git a/apps/studio/data/branches/branch-update-mutation.ts b/apps/studio/data/branches/branch-update-mutation.tsindex 90674f6ced8..93146f4e64c 100644--- a/apps/studio/data/branches/branch-update-mutation.ts+++ b/apps/studio/data/branches/branch-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { branchKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BranchUpdateVariables = {branchRef: stringdiff --git a/apps/studio/data/branches/branches-query.ts b/apps/studio/data/branches/branches-query.tsindex e4191a80cc2..6659c11345a 100644--- a/apps/studio/data/branches/branches-query.ts+++ b/apps/studio/data/branches/branches-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { branchKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type BranchesVariables = {projectRef?: stringdiff --git a/apps/studio/data/cli/login.ts b/apps/studio/data/cli/login.tsindex 37d6741f1e2..ed1fa3eef69 100644--- a/apps/studio/data/cli/login.ts+++ b/apps/studio/data/cli/login.ts@@ -1,4 +1,4 @@-import { post } from 'data/fetchers'+import { post } from '@/data/fetchers'export async function createCliLoginSession(sessionId: string,diff --git a/apps/studio/data/config/disk-attributes-query.ts b/apps/studio/data/config/disk-attributes-query.tsindex 55d630a3fe4..cd098620557 100644--- a/apps/studio/data/config/disk-attributes-query.ts+++ b/apps/studio/data/config/disk-attributes-query.ts@@ -2,11 +2,11 @@ import { useQuery } from '@tanstack/react-query'import dayjs from 'dayjs'import { useMemo } from 'react'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { COOLDOWN_DURATION } from './disk-attributes-update-mutation'import { configKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DiskAttributesVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/disk-attributes-update-mutation.ts b/apps/studio/data/config/disk-attributes-update-mutation.tsindex df4d7e84271..d32597526fa 100644--- a/apps/studio/data/config/disk-attributes-update-mutation.ts+++ b/apps/studio/data/config/disk-attributes-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { configKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export const COOLDOWN_DURATION = 60 * 60 * 4diff --git a/apps/studio/data/config/disk-autoscale-config-query.ts b/apps/studio/data/config/disk-autoscale-config-query.tsindex 146d911d70c..d4e7503d6e4 100644--- a/apps/studio/data/config/disk-autoscale-config-query.ts+++ b/apps/studio/data/config/disk-autoscale-config-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DiskAutoscaleCustomConfigVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/disk-autoscale-config-update-mutation.ts b/apps/studio/data/config/disk-autoscale-config-update-mutation.tsindex d1788cc5e77..4164f78aead 100644--- a/apps/studio/data/config/disk-autoscale-config-update-mutation.ts+++ b/apps/studio/data/config/disk-autoscale-config-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { configKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpdateDiskAutoscaleConfigVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/disk-breakdown-query.ts b/apps/studio/data/config/disk-breakdown-query.tsindex 2e2c9b7e0f2..ebfbc28521f 100644--- a/apps/studio/data/config/disk-breakdown-query.ts+++ b/apps/studio/data/config/disk-breakdown-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DiskBreakdownVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/disk-utilization-query.ts b/apps/studio/data/config/disk-utilization-query.tsindex 0f7c8903c8b..98326cac4ab 100644--- a/apps/studio/data/config/disk-utilization-query.ts+++ b/apps/studio/data/config/disk-utilization-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DiskUtilizationVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/jwt-secret-update-mutation.ts b/apps/studio/data/config/jwt-secret-update-mutation.tsindex d03d7dff928..1d97a107f58 100644--- a/apps/studio/data/config/jwt-secret-update-mutation.ts+++ b/apps/studio/data/config/jwt-secret-update-mutation.ts@@ -1,8 +1,8 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { configKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type JwtSecretUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/config/jwt-secret-updating-status-query.ts b/apps/studio/data/config/jwt-secret-updating-status-query.tsindex f5f429ffefd..fcc1bb002c7 100644--- a/apps/studio/data/config/jwt-secret-updating-status-query.ts+++ b/apps/studio/data/config/jwt-secret-updating-status-query.ts@@ -2,9 +2,9 @@ import { JwtSecretUpdateStatus } from '@supabase/shared-types/out/events'import { useQuery, useQueryClient } from '@tanstack/react-query'import { useEffect } from 'react'-import { get, handleError } from 'data/fetchers'-import { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type JwtSecretUpdatingStatusVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/project-compliance-config-mutation.ts b/apps/studio/data/config/project-compliance-config-mutation.tsindex dd6a11f4190..35aaf13a8a6 100644--- a/apps/studio/data/config/project-compliance-config-mutation.ts+++ b/apps/studio/data/config/project-compliance-config-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { configKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ComplianceConfigUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/config/project-creation-postgres-versions-query.ts b/apps/studio/data/config/project-creation-postgres-versions-query.tsindex f5aab54e986..edb53b53051 100644--- a/apps/studio/data/config/project-creation-postgres-versions-query.ts+++ b/apps/studio/data/config/project-creation-postgres-versions-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'import { CloudProvider } from 'shared-data'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectCreationPostgresVersionsVariables = {cloudProvider: CloudProviderdiff --git a/apps/studio/data/config/project-disk-resize-mutation.ts b/apps/studio/data/config/project-disk-resize-mutation.tsindex f77fe2f1836..2caaf2cde69 100644--- a/apps/studio/data/config/project-disk-resize-mutation.ts+++ b/apps/studio/data/config/project-disk-resize-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'-import { usageKeys } from '../usage/keys'+import { handleError, post } from '@/data/fetchers'+import { usageKeys } from '@/data/usage/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectDiskResizeVariables = {projectRef: stringdiff --git a/apps/studio/data/config/project-postgrest-config-query.ts b/apps/studio/data/config/project-postgrest-config-query.tsindex 4c455992003..3143826c613 100644--- a/apps/studio/data/config/project-postgrest-config-query.ts+++ b/apps/studio/data/config/project-postgrest-config-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { configKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'/*** Parses the exposed schema string returned from PostgREST config.diff --git a/apps/studio/data/config/project-postgrest-config-update-mutation.ts b/apps/studio/data/config/project-postgrest-config-update-mutation.tsindex 44aa1f70dfc..f216f92a940 100644--- a/apps/studio/data/config/project-postgrest-config-update-mutation.ts+++ b/apps/studio/data/config/project-postgrest-config-update-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, patch } from 'data/fetchers'-import { lintKeys } from 'data/lint/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { configKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import { lintKeys } from '@/data/lint/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectPostgrestConfigUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/config/project-settings-v2-query.ts b/apps/studio/data/config/project-settings-v2-query.tsindex abec2e80236..8c0f3c361c1 100644--- a/apps/studio/data/config/project-settings-v2-query.ts+++ b/apps/studio/data/config/project-settings-v2-query.ts@@ -1,11 +1,11 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectSettingsVariables = { projectRef?: string }diff --git a/apps/studio/data/config/project-storage-config-query.ts b/apps/studio/data/config/project-storage-config-query.tsindex 49f78d1fdda..37e21ec49e5 100644--- a/apps/studio/data/config/project-storage-config-query.ts+++ b/apps/studio/data/config/project-storage-config-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectStorageConfigVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/project-storage-config-update-mutation.ts b/apps/studio/data/config/project-storage-config-update-mutation.tsindex 6f8b262df33..524457c3a65 100644--- a/apps/studio/data/config/project-storage-config-update-mutation.ts+++ b/apps/studio/data/config/project-storage-config-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { configKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type StorageConfigUpdatePayload = components['schemas']['UpdateStorageConfigBody']diff --git a/apps/studio/data/config/project-temp-disable-read-only-mutation.ts b/apps/studio/data/config/project-temp-disable-read-only-mutation.tsindex eaf52adc75b..e65666b86f3 100644--- a/apps/studio/data/config/project-temp-disable-read-only-mutation.ts+++ b/apps/studio/data/config/project-temp-disable-read-only-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import { usageKeys } from 'data/usage/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import { usageKeys } from '@/data/usage/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TempDisableReadOnlyModeVariables = {projectRef: stringdiff --git a/apps/studio/data/config/project-unpause-postgres-versions-query.ts b/apps/studio/data/config/project-unpause-postgres-versions-query.tsindex 9c9be3cef35..88b10e3c29d 100644--- a/apps/studio/data/config/project-unpause-postgres-versions-query.ts+++ b/apps/studio/data/config/project-unpause-postgres-versions-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectUnpausePostgresVersionsVariables = {projectRef?: stringdiff --git a/apps/studio/data/config/project-upgrade-eligibility-query.ts b/apps/studio/data/config/project-upgrade-eligibility-query.tsindex e4a94e70839..8e62c0441f2 100644--- a/apps/studio/data/config/project-upgrade-eligibility-query.ts+++ b/apps/studio/data/config/project-upgrade-eligibility-query.ts@@ -1,12 +1,12 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'import { IS_PLATFORM } from 'common'-import { get, handleError } from 'data/fetchers'-import { useProjectDetailQuery } from 'data/projects/project-detail-query'-import { PROJECT_STATUS } from 'lib/constants/infrastructure'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { configKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useProjectDetailQuery } from '@/data/projects/project-detail-query'+import { PROJECT_STATUS } from '@/lib/constants/infrastructure'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectUpgradeTargetVersion = { postgres_version: string; release_channel: string }export type ProjectUpgradeEligibilityVariables = { projectRef?: string }diff --git a/apps/studio/data/config/project-upgrade-status-query.ts b/apps/studio/data/config/project-upgrade-status-query.tsindex 5c5fb43f552..1ed6334bbd8 100644--- a/apps/studio/data/config/project-upgrade-status-query.ts+++ b/apps/studio/data/config/project-upgrade-status-query.ts@@ -2,10 +2,10 @@ import { DatabaseUpgradeStatus } from '@supabase/shared-types/out/events'import { useQuery, useQueryClient } from '@tanstack/react-query'import { useEffect } from 'react'-import { get, handleError } from 'data/fetchers'-import { PROJECT_STATUS } from 'lib/constants'-import { UseCustomQueryOptions } from 'types'import { configKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { PROJECT_STATUS } from '@/lib/constants'+import { UseCustomQueryOptions } from '@/types'export type ProjectUpgradingStatusVariables = {projectRef?: stringdiff --git a/apps/studio/data/content-api/docs-error-codes-query.ts b/apps/studio/data/content-api/docs-error-codes-query.tsindex 21dec4f800e..59c3ed950bf 100644--- a/apps/studio/data/content-api/docs-error-codes-query.ts+++ b/apps/studio/data/content-api/docs-error-codes-query.ts@@ -1,9 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { executeGraphQL } from 'data/graphql/execute'-import { graphql } from 'data/graphql/gql'-import { Service } from 'data/graphql/graphql'+import { contentApiKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { executeGraphQL } from '@/data/graphql/execute'+import { graphql } from '@/data/graphql/gql'+import { Service } from '@/data/graphql/graphql'+import { UseCustomQueryOptions } from '@/types'const ErrorCodeQuery = graphql(`query ErrorCodeQuery($code: String!, $service: Service) {diff --git a/apps/studio/data/content/content-count-query.ts b/apps/studio/data/content/content-count-query.tsindex 7ec39630cf9..703fd664be3 100644--- a/apps/studio/data/content/content-count-query.ts+++ b/apps/studio/data/content/content-count-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { operations } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { contentKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type GetContentCountVariables =operations['ContentController_getContentCountV2']['parameters']['query'] & {diff --git a/apps/studio/data/content/content-delete-mutation.ts b/apps/studio/data/content/content-delete-mutation.tsindex 87406dddbfb..7466cced8ca 100644--- a/apps/studio/data/content/content-delete-mutation.ts+++ b/apps/studio/data/content/content-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { contentKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type DeleteContentVariables = { projectRef: string; ids: string[] }diff --git a/apps/studio/data/content/content-id-query.ts b/apps/studio/data/content/content-id-query.tsindex 74c3c828827..b86b00451fa 100644--- a/apps/studio/data/content/content-id-query.ts+++ b/apps/studio/data/content/content-id-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import type { Content } from './content-query'import { contentKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type GetUserContentByIdResponse = Omit<components['schemas']['GetUserContentByIdResponse'],diff --git a/apps/studio/data/content/content-infinite-query.ts b/apps/studio/data/content/content-infinite-query.tsindex e45fd2a09fa..8f2bc501f60 100644--- a/apps/studio/data/content/content-infinite-query.ts+++ b/apps/studio/data/content/content-infinite-query.ts@@ -1,9 +1,9 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { UseCustomInfiniteQueryOptions } from 'types'import { Content, ContentType } from './content-query'import { contentKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { UseCustomInfiniteQueryOptions } from '@/types'interface GetContentVariables {projectRef?: stringdiff --git a/apps/studio/data/content/content-query.ts b/apps/studio/data/content/content-query.tsindex 4ea548a0b60..f628a867f49 100644--- a/apps/studio/data/content/content-query.ts+++ b/apps/studio/data/content/content-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { Dashboards, LogSqlSnippets, SqlSnippets, UseCustomQueryOptions } from 'types'+import { contentKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { Dashboards, LogSqlSnippets, SqlSnippets, UseCustomQueryOptions } from '@/types'export type ContentBase = components['schemas']['GetUserContentResponse']['data'][number]diff --git a/apps/studio/data/content/content-upsert-mutation.ts b/apps/studio/data/content/content-upsert-mutation.tsindex ed510807bb4..542520e184d 100644--- a/apps/studio/data/content/content-upsert-mutation.ts+++ b/apps/studio/data/content/content-upsert-mutation.ts@@ -1,12 +1,12 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, put } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import type { Content } from './content-query'import { contentKeys } from './keys'import type { Snippet } from './sql-folders-query'+import type { components } from '@/data/api'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpsertContentPayload = Omit<components['schemas']['UpsertContentBody'], 'content'> & {id: stringdiff --git a/apps/studio/data/content/sql-folder-contents-query.ts b/apps/studio/data/content/sql-folder-contents-query.tsindex 9a8b9360bce..94a275e4eb4 100644--- a/apps/studio/data/content/sql-folder-contents-query.ts+++ b/apps/studio/data/content/sql-folder-contents-query.ts@@ -1,9 +1,9 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import { contentKeys } from './keys'import { SNIPPET_PAGE_LIMIT } from './sql-folders-query'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export type SQLSnippetFolderContentsVariables = {projectRef?: stringdiff --git a/apps/studio/data/content/sql-folder-create-mutation.ts b/apps/studio/data/content/sql-folder-create-mutation.tsindex ff604a86e1d..c47f87bed9f 100644--- a/apps/studio/data/content/sql-folder-create-mutation.ts+++ b/apps/studio/data/content/sql-folder-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { contentKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateSQLSnippetFolderVariables = {projectRef: stringdiff --git a/apps/studio/data/content/sql-folder-update-mutation.ts b/apps/studio/data/content/sql-folder-update-mutation.tsindex cef8792a03c..50ad274937d 100644--- a/apps/studio/data/content/sql-folder-update-mutation.ts+++ b/apps/studio/data/content/sql-folder-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { contentKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpdateSQLSnippetFolderVariables = {projectRef: stringdiff --git a/apps/studio/data/content/sql-folders-delete-mutation.ts b/apps/studio/data/content/sql-folders-delete-mutation.tsindex 5b3ff5f5c73..9cf2321aaf8 100644--- a/apps/studio/data/content/sql-folders-delete-mutation.ts+++ b/apps/studio/data/content/sql-folders-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { contentKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DeleteSQLSnippetFoldersVariables = {projectRef: stringdiff --git a/apps/studio/data/content/sql-folders-query.ts b/apps/studio/data/content/sql-folders-query.tsindex d91904fc791..9aa534fc84a 100644--- a/apps/studio/data/content/sql-folders-query.ts+++ b/apps/studio/data/content/sql-folders-query.ts@@ -1,9 +1,9 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'+import { contentKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export type SnippetFolderResponse = components['schemas']['GetUserContentFolderResponse']['data']export type SnippetFolder =diff --git a/apps/studio/data/content/sql-snippets-query.ts b/apps/studio/data/content/sql-snippets-query.tsindex f6eefe42df6..a71cf24bab2 100644--- a/apps/studio/data/content/sql-snippets-query.ts+++ b/apps/studio/data/content/sql-snippets-query.ts@@ -1,10 +1,10 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { get } from 'data/fetchers'-import { UseCustomInfiniteQueryOptions } from 'types'import { Content } from './content-query'import { contentKeys } from './keys'import { SNIPPET_PAGE_LIMIT } from './sql-folders-query'+import { get } from '@/data/fetchers'+import { UseCustomInfiniteQueryOptions } from '@/types'export type SqlSnippet = Extract<Content, { type: 'sql' }>diff --git a/apps/studio/data/custom-domains/check-cname-mutation.ts b/apps/studio/data/custom-domains/check-cname-mutation.tsindex c7bfe741ce0..41261f18ad4 100644--- a/apps/studio/data/custom-domains/check-cname-mutation.ts+++ b/apps/studio/data/custom-domains/check-cname-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'-import { fetchHandler, handleError } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { fetchHandler, handleError } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CheckCNAMERecordVariables = {domain: stringdiff --git a/apps/studio/data/custom-domains/custom-domains-activate-mutation.ts b/apps/studio/data/custom-domains/custom-domains-activate-mutation.tsindex f6b49ef7fd1..4d60016b6aa 100644--- a/apps/studio/data/custom-domains/custom-domains-activate-mutation.ts+++ b/apps/studio/data/custom-domains/custom-domains-activate-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { customDomainKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CustomDomainActivateVariables = {projectRef: stringdiff --git a/apps/studio/data/custom-domains/custom-domains-create-mutation.ts b/apps/studio/data/custom-domains/custom-domains-create-mutation.tsindex e70d671d9ca..190404fe9c8 100644--- a/apps/studio/data/custom-domains/custom-domains-create-mutation.ts+++ b/apps/studio/data/custom-domains/custom-domains-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { customDomainKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CustomDomainCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/custom-domains/custom-domains-delete-mutation.ts b/apps/studio/data/custom-domains/custom-domains-delete-mutation.tsindex 8ec84dd46af..66b15dfcd0e 100644--- a/apps/studio/data/custom-domains/custom-domains-delete-mutation.ts+++ b/apps/studio/data/custom-domains/custom-domains-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import { subscriptionKeys } from 'data/subscriptions/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { customDomainKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import { subscriptionKeys } from '@/data/subscriptions/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CustomDomainDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/custom-domains/custom-domains-query.ts b/apps/studio/data/custom-domains/custom-domains-query.tsindex bbfbb4eb76e..b3fe24ba2fd 100644--- a/apps/studio/data/custom-domains/custom-domains-query.ts+++ b/apps/studio/data/custom-domains/custom-domains-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { useProjectAddonsQuery } from 'data/subscriptions/project-addons-query'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { customDomainKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type CustomDomainsVariables = {projectRef?: stringdiff --git a/apps/studio/data/custom-domains/custom-domains-reverify-query.ts b/apps/studio/data/custom-domains/custom-domains-reverify-query.tsindex e9ef3b027f6..60fd3e443c4 100644--- a/apps/studio/data/custom-domains/custom-domains-reverify-query.ts+++ b/apps/studio/data/custom-domains/custom-domains-reverify-query.ts@@ -1,9 +1,9 @@import { useQuery, useQueryClient } from '@tanstack/react-query'--import { handleError, post } from 'data/fetchers'import { useEffect } from 'react'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { customDomainKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type CustomDomainReverifyVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-columns/database-column-create-mutation.ts b/apps/studio/data/database-columns/database-column-create-mutation.tsindex f19f64bec26..68150e4c992 100644--- a/apps/studio/data/database-columns/database-column-create-mutation.ts+++ b/apps/studio/data/database-columns/database-column-create-mutation.ts@@ -2,8 +2,8 @@ import pgMeta from '@supabase/pg-meta'import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateColumnBody = {schema: stringdiff --git a/apps/studio/data/database-columns/database-column-delete-mutation.ts b/apps/studio/data/database-columns/database-column-delete-mutation.tsindex d37fc390f5b..c0d1016a920 100644--- a/apps/studio/data/database-columns/database-column-delete-mutation.ts+++ b/apps/studio/data/database-columns/database-column-delete-mutation.ts@@ -3,13 +3,13 @@ import { PGColumn } from '@supabase/pg-meta/src/pg-meta-columns'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { databaseKeys } from 'data/database/keys'-import { entityTypeKeys } from 'data/entity-types/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { tableEditorKeys } from 'data/table-editor/keys'-import { tableRowKeys } from 'data/table-rows/keys'-import { viewKeys } from 'data/views/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { databaseKeys } from '@/data/database/keys'+import { entityTypeKeys } from '@/data/entity-types/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { tableEditorKeys } from '@/data/table-editor/keys'+import { tableRowKeys } from '@/data/table-rows/keys'+import { viewKeys } from '@/data/views/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseColumnDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/database-columns/database-column-update-mutation.ts b/apps/studio/data/database-columns/database-column-update-mutation.tsindex 58eafce8968..4c7047ab4bc 100644--- a/apps/studio/data/database-columns/database-column-update-mutation.ts+++ b/apps/studio/data/database-columns/database-column-update-mutation.ts@@ -3,9 +3,9 @@ import { PGColumn } from '@supabase/pg-meta/src/pg-meta-columns'import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { CreateColumnBody } from './database-column-create-mutation'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpdateColumnBody = Partial<Omit<CreateColumnBody, 'schema' | 'table' | 'isPrimaryKey'>diff --git a/apps/studio/data/database-cron-jobs/database-cron-job-query.ts b/apps/studio/data/database-cron-jobs/database-cron-job-query.tsindex 237b038e82d..e83bdf00109 100644--- a/apps/studio/data/database-cron-jobs/database-cron-job-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-job-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { CronJob } from './database-cron-jobs-infinite-query'import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseCronJobVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.tsindex 9f5491954b6..3846630be03 100644--- a/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobRunVariables = {projectRef: stringdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.tsindex 7216a25bb8f..5d201a29014 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.ts@@ -1,10 +1,10 @@import { getLiveTupleEstimate } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import type { ConnectionVars } from 'data/common.types'-import { executeSql } from 'data/sql/execute-sql-query'-import type { UseCustomQueryOptions } from 'types'-import { getLiveTupleEstimateKey } from '../database/keys'+import type { ConnectionVars } from '@/data/common.types'+import { getLiveTupleEstimateKey } from '@/data/database/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { UseCustomQueryOptions } from '@/types'type DatabaseCronJobsCountEstimateVariables = ConnectionVarsdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.tsindex 86f9f4d08cb..49270d0cc4c 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type DatabaseCronJobsCountVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.tsindex 04d31d6a67f..22a5b49989c 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.tsindex 43f3e8891f3..986c84e2187 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.tsindex 7724468a72e..68c1cd1310d 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.ts@@ -1,9 +1,9 @@import { getCronJobsSql } from '@supabase/pg-meta'import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { COST_THRESHOLD_ERROR, executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import { databaseCronJobsKeys } from './keys'+import { COST_THRESHOLD_ERROR, executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export const CRON_JOBS_PAGE_LIMIT = 20diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.tsindex 4a4218ce8de..1b83cb5ac0d 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.ts@@ -1,7 +1,5 @@import { getCronJobsMinimalSql } from '@supabase/pg-meta'import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import {CRON_JOBS_PAGE_LIMIT,@@ -9,6 +7,8 @@ import {DatabaseCronJobRunsVariables,} from './database-cron-jobs-infinite-query'import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export async function getDatabaseCronJobsMinimal({projectRef,diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.tsindex 747b181ffb8..82719814776 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts@@ -1,9 +1,9 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'import { last } from 'lodash'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export type DatabaseCronJobRunsVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.tsindex b3884d9853f..b091d159181 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobToggleVariables = {projectRef: stringdiff --git a/apps/studio/data/database-cron-jobs/database-cron-timezone-query.ts b/apps/studio/data/database-cron-jobs/database-cron-timezone-query.tsindex a2da99eacc1..a85a0e5521b 100644--- a/apps/studio/data/database-cron-jobs/database-cron-timezone-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-timezone-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { databaseCronJobsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseCronJobsVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-cron-jobs/keys.ts b/apps/studio/data/database-cron-jobs/keys.tsindex 079e0c071ab..835fd1fa5a2 100644--- a/apps/studio/data/database-cron-jobs/keys.ts+++ b/apps/studio/data/database-cron-jobs/keys.ts@@ -1,4 +1,4 @@-import { sqlKeys } from '../sql/keys'+import { sqlKeys } from '@/data/sql/keys'export const databaseCronJobsKeys = {create: () => ['cron-jobs', 'create'] as const,diff --git a/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.ts b/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.tsindex 586f9d67b39..1dd967eca45 100644--- a/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.ts+++ b/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.ts@@ -1,10 +1,10 @@import { getScheduleDeleteCronJobRunDetailsSql } from '@supabase/pg-meta'import { useMutation } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { getScheduleDeleteCronJobRunDetailsKey } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ScheduleCronJobRunDetailsCleanupVariables = {projectRef: stringdiff --git a/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.ts b/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.tsindex 5a2953d1e7c..b193ea1a593 100644--- a/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.ts+++ b/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.ts@@ -1,8 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { databaseEventTriggerKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseEventTriggerCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.ts b/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.tsindex b6f7045548b..7fd3fae7f4c 100644--- a/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.ts+++ b/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.ts@@ -1,9 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import type { DatabaseEventTrigger } from './database-event-triggers-query'import { databaseEventTriggerKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'const escapeIdentifier = (value: string) => value.replace(/"/g, '""')diff --git a/apps/studio/data/database-event-triggers/database-event-triggers-query.ts b/apps/studio/data/database-event-triggers/database-event-triggers-query.tsindex 11c833aef8d..df08c976fe6 100644--- a/apps/studio/data/database-event-triggers/database-event-triggers-query.ts+++ b/apps/studio/data/database-event-triggers/database-event-triggers-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseEventTriggerKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseEventTriggersVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-extensions/database-extension-disable-mutation.ts b/apps/studio/data/database-extensions/database-extension-disable-mutation.tsindex 0482da165be..3fc868124c4 100644--- a/apps/studio/data/database-extensions/database-extension-disable-mutation.ts+++ b/apps/studio/data/database-extensions/database-extension-disable-mutation.ts@@ -2,10 +2,10 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { configKeys } from 'data/config/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseExtensionsKeys } from './keys'+import { configKeys } from '@/data/config/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseExtensionDisableVariables = {projectRef: stringdiff --git a/apps/studio/data/database-extensions/database-extension-enable-mutation.ts b/apps/studio/data/database-extensions/database-extension-enable-mutation.tsindex 172d597cede..dffd9f1b50d 100644--- a/apps/studio/data/database-extensions/database-extension-enable-mutation.ts+++ b/apps/studio/data/database-extensions/database-extension-enable-mutation.ts@@ -1,11 +1,11 @@import { getEnableDatabaseExtensionSQL } from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { configKeys } from 'data/config/keys'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseExtensionsKeys } from './keys'+import { configKeys } from '@/data/config/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseExtensionEnableVariables = {projectRef: stringdiff --git a/apps/studio/data/database-extensions/database-extensions-query.ts b/apps/studio/data/database-extensions/database-extensions-query.tsindex f77cc84ce09..3f47ce91bbf 100644--- a/apps/studio/data/database-extensions/database-extensions-query.ts+++ b/apps/studio/data/database-extensions/database-extensions-query.ts@@ -1,12 +1,12 @@import { getDatabaseExtensionsSQL } from '@supabase/pg-meta/src'import { useQuery } from '@tanstack/react-query'import { components } from 'api-types'-import { executeSql } from 'data/sql/execute-sql-query'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseExtensionsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseExtension = components['schemas']['PostgresExtension'] & {default_version_schema: string | nulldiff --git a/apps/studio/data/database-functions/database-functions-create-mutation.ts b/apps/studio/data/database-functions/database-functions-create-mutation.tsindex 06fc71cda19..21a99b13b4d 100644--- a/apps/studio/data/database-functions/database-functions-create-mutation.ts+++ b/apps/studio/data/database-functions/database-functions-create-mutation.ts@@ -1,11 +1,11 @@+import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { z } from 'zod'-import pgMeta from '@supabase/pg-meta'-import { databaseKeys } from 'data/database/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { databaseKeys } from '@/data/database/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseFunctionCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-functions/database-functions-delete-mutation.ts b/apps/studio/data/database-functions/database-functions-delete-mutation.tsindex 195a38b2a27..fb0929d5f32 100644--- a/apps/studio/data/database-functions/database-functions-delete-mutation.ts+++ b/apps/studio/data/database-functions/database-functions-delete-mutation.ts@@ -1,12 +1,12 @@+import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { z } from 'zod'-import pgMeta from '@supabase/pg-meta'-import { databaseKeys } from 'data/database/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { DatabaseFunction } from './database-functions-query'+import { databaseKeys } from '@/data/database/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseFunctionDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/database-functions/database-functions-query.ts b/apps/studio/data/database-functions/database-functions-query.tsindex ea68e83fe6f..e251a9267f4 100644--- a/apps/studio/data/database-functions/database-functions-query.ts+++ b/apps/studio/data/database-functions/database-functions-query.ts@@ -1,10 +1,11 @@import pgMeta from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { databaseKeys } from 'data/database/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { z } from 'zod'+import { databaseKeys } from '@/data/database/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'+export type DatabaseFunctionsVariables = {projectRef?: stringconnectionString?: string | nulldiff --git a/apps/studio/data/database-functions/database-functions-update-mutation.ts b/apps/studio/data/database-functions/database-functions-update-mutation.tsindex a81c1415a4f..ced03309ec3 100644--- a/apps/studio/data/database-functions/database-functions-update-mutation.ts+++ b/apps/studio/data/database-functions/database-functions-update-mutation.ts@@ -1,12 +1,12 @@+import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { z } from 'zod'-import pgMeta from '@supabase/pg-meta'-import { databaseKeys } from 'data/database/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import type { DatabaseFunction } from './database-functions-query'+import { databaseKeys } from '@/data/database/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseFunctionUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-indexes/index-create-mutation.ts b/apps/studio/data/database-indexes/index-create-mutation.tsindex e9159ceaaec..cfe66156552 100644--- a/apps/studio/data/database-indexes/index-create-mutation.ts+++ b/apps/studio/data/database-indexes/index-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseIndexesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseIndexCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-indexes/index-delete-mutation.ts b/apps/studio/data/database-indexes/index-delete-mutation.tsindex 989045ffe2a..6540d8b0562 100644--- a/apps/studio/data/database-indexes/index-delete-mutation.ts+++ b/apps/studio/data/database-indexes/index-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseIndexesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseIndexDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/database-indexes/indexes-query.ts b/apps/studio/data/database-indexes/indexes-query.tsindex 5362e777efb..908dc047985 100644--- a/apps/studio/data/database-indexes/indexes-query.ts+++ b/apps/studio/data/database-indexes/indexes-query.ts@@ -1,9 +1,9 @@import { getIndexesSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseIndexesKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type GetIndexesArgs = {schema?: stringdiff --git a/apps/studio/data/database-integrations/stripe/stripe-sync-install-mutation.ts b/apps/studio/data/database-integrations/stripe/stripe-sync-install-mutation.tsindex a0ce42e41b3..663eb425386 100644--- a/apps/studio/data/database-integrations/stripe/stripe-sync-install-mutation.ts+++ b/apps/studio/data/database-integrations/stripe/stripe-sync-install-mutation.ts@@ -1,12 +1,12 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { getAccessToken } from 'common'-import { databaseKeys } from 'data/database/keys'-import { BASE_PATH } from 'lib/constants'-import { useTrack } from 'lib/telemetry/track'import { toast } from 'sonner'-import type { ResponseError } from 'types'import { stripeSyncKeys } from './keys'+import { databaseKeys } from '@/data/database/keys'+import { BASE_PATH } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'+import type { ResponseError } from '@/types'export type StripeSyncInstallVariables = {projectRef: stringdiff --git a/apps/studio/data/database-integrations/stripe/stripe-sync-uninstall-mutation.ts b/apps/studio/data/database-integrations/stripe/stripe-sync-uninstall-mutation.tsindex ce32dcb8e85..19057aa0ebc 100644--- a/apps/studio/data/database-integrations/stripe/stripe-sync-uninstall-mutation.ts+++ b/apps/studio/data/database-integrations/stripe/stripe-sync-uninstall-mutation.ts@@ -1,12 +1,12 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { getAccessToken } from 'common'-import { databaseKeys } from 'data/database/keys'-import { BASE_PATH } from 'lib/constants'-import { useTrack } from 'lib/telemetry/track'import { toast } from 'sonner'-import type { ResponseError } from 'types'import { stripeSyncKeys } from './keys'+import { databaseKeys } from '@/data/database/keys'+import { BASE_PATH } from '@/lib/constants'+import { useTrack } from '@/lib/telemetry/track'+import type { ResponseError } from '@/types'export type StripeSyncUninstallVariables = {projectRef: stringdiff --git a/apps/studio/data/database-integrations/stripe/sync-state-query.ts b/apps/studio/data/database-integrations/stripe/sync-state-query.tsindex 4e0f0db09ab..226e304d1f2 100644--- a/apps/studio/data/database-integrations/stripe/sync-state-query.ts+++ b/apps/studio/data/database-integrations/stripe/sync-state-query.ts@@ -1,8 +1,8 @@import { QueryClient, useQuery, UseQueryOptions } from '@tanstack/react-query'import { z } from 'zod'-import { executeSql, ExecuteSqlError } from 'data/sql/execute-sql-query'import { stripeSyncKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'export type DbConnection = {projectRef: stringdiff --git a/apps/studio/data/database-policies/database-policies-query.ts b/apps/studio/data/database-policies/database-policies-query.tsindex 22f54eb9be9..7b3cf6fd840 100644--- a/apps/studio/data/database-policies/database-policies-query.ts+++ b/apps/studio/data/database-policies/database-policies-query.ts@@ -1,11 +1,11 @@+import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { useQuery } from '@tanstack/react-query'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'-import { get, handleError } from 'data/fetchers'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databasePoliciesKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type DatabasePoliciesVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-policies/database-policy-create-mutation.ts b/apps/studio/data/database-policies/database-policy-create-mutation.tsindex a952aeda8f0..36383fea2e5 100644--- a/apps/studio/data/database-policies/database-policy-create-mutation.ts+++ b/apps/studio/data/database-policies/database-policy-create-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databasePoliciesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreatePolicyBody = {name: stringdiff --git a/apps/studio/data/database-policies/database-policy-delete-mutation.ts b/apps/studio/data/database-policies/database-policy-delete-mutation.tsindex c91a016e836..7fc055b8ff0 100644--- a/apps/studio/data/database-policies/database-policy-delete-mutation.ts+++ b/apps/studio/data/database-policies/database-policy-delete-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databasePoliciesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePolicyDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/database-policies/database-policy-update-mutation.ts b/apps/studio/data/database-policies/database-policy-update-mutation.tsindex 790edef1843..ed2d893022d 100644--- a/apps/studio/data/database-policies/database-policy-update-mutation.ts+++ b/apps/studio/data/database-policies/database-policy-update-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databasePoliciesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePolicyUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-publications/database-publications-create-mutation.ts b/apps/studio/data/database-publications/database-publications-create-mutation.tsindex 9ec3b901272..45bfbfa2615 100644--- a/apps/studio/data/database-publications/database-publications-create-mutation.ts+++ b/apps/studio/data/database-publications/database-publications-create-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databasePublicationsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePublicationCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-publications/database-publications-query.ts b/apps/studio/data/database-publications/database-publications-query.tsindex cb30108dc87..974ffd607ba 100644--- a/apps/studio/data/database-publications/database-publications-query.ts+++ b/apps/studio/data/database-publications/database-publications-query.ts@@ -1,8 +1,9 @@import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { databasePublicationsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabasePublicationsVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-publications/database-publications-update-mutation.ts b/apps/studio/data/database-publications/database-publications-update-mutation.tsindex 86d32c2a73e..60178e6aa71 100644--- a/apps/studio/data/database-publications/database-publications-update-mutation.ts+++ b/apps/studio/data/database-publications/database-publications-update-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databasePublicationsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePublicationUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queue-messages-archive-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-archive-mutation.tsindex 7fbf8082e32..e9cee99445c 100644--- a/apps/studio/data/database-queues/database-queue-messages-archive-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-archive-mutation.ts@@ -1,11 +1,11 @@import { literal } from '@supabase/pg-meta/src/pg-format'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageArchiveVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queue-messages-delete-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-delete-mutation.tsindex 348a3f672c8..31efddebde8 100644--- a/apps/studio/data/database-queues/database-queue-messages-delete-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-delete-mutation.ts@@ -1,11 +1,11 @@import { literal } from '@supabase/pg-meta/src/pg-format'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queue-messages-infinite-query.ts b/apps/studio/data/database-queues/database-queue-messages-infinite-query.tsindex 7cac5705bd3..f96e55089e9 100644--- a/apps/studio/data/database-queues/database-queue-messages-infinite-query.ts+++ b/apps/studio/data/database-queues/database-queue-messages-infinite-query.ts@@ -1,14 +1,14 @@import { literal } from '@supabase/pg-meta/src/pg-format'import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'-import { QUEUE_MESSAGE_TYPE } from 'components/interfaces/Integrations/Queues/SingleQueue/Queue.utils'-import { executeSql } from 'data/sql/execute-sql-query'import dayjs from 'dayjs'-import { DATE_FORMAT } from 'lib/constants'import { last } from 'lodash'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { QUEUE_MESSAGE_TYPE } from '@/components/interfaces/Integrations/Queues/SingleQueue/Queue.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import { DATE_FORMAT } from '@/lib/constants'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export type DatabaseQueueVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-read-mutation.tsindex 70cbeffa9d8..480a1df3315 100644--- a/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageReadVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queue-messages-send-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-send-mutation.tsindex 81ac71e3bd1..4b181760e44 100644--- a/apps/studio/data/database-queues/database-queue-messages-send-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-send-mutation.ts@@ -1,11 +1,11 @@import { literal } from '@supabase/pg-meta/src/pg-format'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageSendVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queues-create-mutation.ts b/apps/studio/data/database-queues/database-queues-create-mutation.tsindex 4a6f2adbe38..fc968ea3fd1 100644--- a/apps/studio/data/database-queues/database-queues-create-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import { tableKeys } from 'data/tables/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { tableKeys } from '@/data/tables/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queues-delete-mutation.ts b/apps/studio/data/database-queues/database-queues-delete-mutation.tsindex 8d85b74608a..178dbff86b7 100644--- a/apps/studio/data/database-queues/database-queues-delete-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts b/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.tsindex af1a4af7300..b4265893f07 100644--- a/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts+++ b/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts@@ -1,9 +1,9 @@import { getQueuesExposePostgrestStatusSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseQueuesVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-queues/database-queues-metrics-query.ts b/apps/studio/data/database-queues/database-queues-metrics-query.tsindex 29a5bc8e433..dd0548e2a82 100644--- a/apps/studio/data/database-queues/database-queues-metrics-query.ts+++ b/apps/studio/data/database-queues/database-queues-metrics-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseQueuesMetricsVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-queues/database-queues-purge-mutation.ts b/apps/studio/data/database-queues/database-queues-purge-mutation.tsindex 963643154a5..983a0fe4a72 100644--- a/apps/studio/data/database-queues/database-queues-purge-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-purge-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { isQueueNameValid } from 'components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueuePurgeVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queues-query.ts b/apps/studio/data/database-queues/database-queues-query.tsindex 80667fd5778..5360e28a989 100644--- a/apps/studio/data/database-queues/database-queues-query.ts+++ b/apps/studio/data/database-queues/database-queues-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { databaseQueuesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseQueuesVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts b/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.tsindex 049c3494e6c..e7f9cc16e26 100644--- a/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts@@ -1,12 +1,12 @@import { getExposeQueuesSQL, HIDE_QUEUES_FROM_POSTGREST_SQL } from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { databaseKeys } from 'data/database/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { isGreaterThanOrEqual } from 'lib/semver'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseQueuesKeys } from './keys'+import { databaseKeys } from '@/data/database/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { isGreaterThanOrEqual } from '@/lib/semver'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueExposePostgrestVariables = {projectRef: stringdiff --git a/apps/studio/data/database-queues/database-queues-version-query.ts b/apps/studio/data/database-queues/database-queues-version-query.tsindex 013b3587824..8dc1666482f 100644--- a/apps/studio/data/database-queues/database-queues-version-query.ts+++ b/apps/studio/data/database-queues/database-queues-version-query.ts@@ -1,6 +1,6 @@-import { useDatabaseExtensionsQuery } from 'data/database-extensions/database-extensions-query'-import { ResponseError } from 'types'import { PGMQ_EXTENSION_NAME } from './constants'+import { useDatabaseExtensionsQuery } from '@/data/database-extensions/database-extensions-query'+import { ResponseError } from '@/types'export type DatabaseQueuesVersionVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-roles/database-role-create-mutation.ts b/apps/studio/data/database-roles/database-role-create-mutation.tsindex 16dc76ccb48..4b607d7b383 100644--- a/apps/studio/data/database-roles/database-role-create-mutation.ts+++ b/apps/studio/data/database-roles/database-role-create-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { invalidateRolesQuery } from './database-roles-query'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type CreateRoleBody = Parameters<typeof pgMeta.roles.create>[0]diff --git a/apps/studio/data/database-roles/database-role-delete-mutation.ts b/apps/studio/data/database-roles/database-role-delete-mutation.tsindex 7fde28eb9e2..f1cac6497ca 100644--- a/apps/studio/data/database-roles/database-role-delete-mutation.ts+++ b/apps/studio/data/database-roles/database-role-delete-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { invalidateRolesQuery } from './database-roles-query'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type DropRoleBody = Parameters<typeof pgMeta.roles.remove>[1]diff --git a/apps/studio/data/database-roles/database-role-update-mutation.ts b/apps/studio/data/database-roles/database-role-update-mutation.tsindex 75108b95433..c34483c1e6b 100644--- a/apps/studio/data/database-roles/database-role-update-mutation.ts+++ b/apps/studio/data/database-roles/database-role-update-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { invalidateRolesQuery } from './database-roles-query'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type UpdateRoleBody = Parameters<typeof pgMeta.roles.update>[1]diff --git a/apps/studio/data/database-roles/database-roles-query.ts b/apps/studio/data/database-roles/database-roles-query.tsindex f86ebb90fa8..eeff0bfa518 100644--- a/apps/studio/data/database-roles/database-roles-query.ts+++ b/apps/studio/data/database-roles/database-roles-query.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { QueryClient, useQuery } from '@tanstack/react-query'import { z } from 'zod'-import { executeSql, ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { databaseRoleKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type DatabaseRolesVariables = {projectRef?: stringdiff --git a/apps/studio/data/database-triggers/database-trigger-create-mutation.ts b/apps/studio/data/database-triggers/database-trigger-create-mutation.tsindex d0209380568..57ba0c9ac36 100644--- a/apps/studio/data/database-triggers/database-trigger-create-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-create-mutation.ts@@ -1,10 +1,11 @@import pgMeta from '@supabase/pg-meta'import { PGTriggerCreate } from '@supabase/pg-meta/src/pg-meta-triggers'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { databaseTriggerKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseTriggerCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/database-triggers/database-trigger-delete-mutation.ts b/apps/studio/data/database-triggers/database-trigger-delete-mutation.tsindex d9ec7dd34b8..663188a8dc1 100644--- a/apps/studio/data/database-triggers/database-trigger-delete-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-delete-mutation.ts@@ -1,9 +1,10 @@import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { databaseTriggerKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseTriggerDeleteVariables = {trigger: {diff --git a/apps/studio/data/database-triggers/database-trigger-update-mutation.ts b/apps/studio/data/database-triggers/database-trigger-update-mutation.tsindex 46beecfcf00..236bf7c28f4 100644--- a/apps/studio/data/database-triggers/database-trigger-update-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-update-mutation.ts@@ -1,10 +1,11 @@import pgMeta from '@supabase/pg-meta'import { PGTriggerUpdate } from '@supabase/pg-meta/src/pg-meta-triggers'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { databaseTriggerKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseTriggerUpdateVariables = {originalTrigger: {diff --git a/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.ts b/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.tsindex 4786808fc8e..64897d5ac32 100644--- a/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.ts@@ -2,11 +2,11 @@ import { getDatabaseTriggerUpdateSQL } from '@supabase/pg-meta'import { PGTrigger, PGTriggerCreate } from '@supabase/pg-meta/src/pg-meta-triggers'import { PostgresTrigger } from '@supabase/postgres-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseTriggerKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'// [Joshen] Writing this query within FE as the PATCH endpoint from pg-meta only supports updating// trigger name and enabled mode. So we'll delete and create the trigger, within a single transactiondiff --git a/apps/studio/data/database-triggers/database-triggers-query.ts b/apps/studio/data/database-triggers/database-triggers-query.tsindex 59778901977..967c560ae21 100644--- a/apps/studio/data/database-triggers/database-triggers-query.ts+++ b/apps/studio/data/database-triggers/database-triggers-query.ts@@ -1,8 +1,9 @@import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { databaseTriggerKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseTriggersVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/backup-download-mutation.ts b/apps/studio/data/database/backup-download-mutation.tsindex 2c1371c0f4e..479d6945dd5 100644--- a/apps/studio/data/database/backup-download-mutation.ts+++ b/apps/studio/data/database/backup-download-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BackupDownloadVariables = {ref: stringdiff --git a/apps/studio/data/database/backup-query.ts b/apps/studio/data/database/backup-query.tsindex 03f2c752460..eb4a931b024 100644--- a/apps/studio/data/database/backup-query.ts+++ b/apps/studio/data/database/backup-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DownloadableBackupVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/backup-restore-mutation.ts b/apps/studio/data/database/backup-restore-mutation.tsindex 95b95c2475b..825beb8e6a2 100644--- a/apps/studio/data/database/backup-restore-mutation.ts+++ b/apps/studio/data/database/backup-restore-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import type { components } from '@/data/api'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BackupRestoreVariables = {ref: stringdiff --git a/apps/studio/data/database/backups-query.ts b/apps/studio/data/database/backups-query.tsindex 1f9ba0274ea..6fa3431b9ce 100644--- a/apps/studio/data/database/backups-query.ts+++ b/apps/studio/data/database/backups-query.ts@@ -1,11 +1,11 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { useIsOrioleDbInAws } from 'hooks/misc/useSelectedProject'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { useIsOrioleDbInAws } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type BackupsVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/constraints-query.ts b/apps/studio/data/database/constraints-query.tsindex 2be0ade1e49..ae1b3e9037f 100644--- a/apps/studio/data/database/constraints-query.ts+++ b/apps/studio/data/database/constraints-query.ts@@ -1,9 +1,9 @@import { getTableConstraintsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type GetTableConstraintsVariables = {id?: numberdiff --git a/apps/studio/data/database/database-password-reset-mutation.ts b/apps/studio/data/database/database-password-reset-mutation.tsindex 9a6238dae02..cd057e8d6b3 100644--- a/apps/studio/data/database/database-password-reset-mutation.ts+++ b/apps/studio/data/database/database-password-reset-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import { projectKeys } from 'data/projects/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, patch } from '@/data/fetchers'+import { projectKeys } from '@/data/projects/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePasswordResetVariables = {ref: stringdiff --git a/apps/studio/data/database/database-size-query.ts b/apps/studio/data/database/database-size-query.tsindex 9601c6ed8e3..9ea3f4e464b 100644--- a/apps/studio/data/database/database-size-query.ts+++ b/apps/studio/data/database/database-size-query.ts@@ -1,9 +1,9 @@import { getDatabaseSizeSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type DatabaseSizeVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/enable-physical-backups-mutation.ts b/apps/studio/data/database/enable-physical-backups-mutation.tsindex cb82cd9cbd4..ca3d97a9b5c 100644--- a/apps/studio/data/database/enable-physical-backups-mutation.ts+++ b/apps/studio/data/database/enable-physical-backups-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EnablePhysicalBackupsVariables = {ref: stringdiff --git a/apps/studio/data/database/entity-definitions-query.ts b/apps/studio/data/database/entity-definitions-query.tsindex 1a9dd14ba94..01090f76975 100644--- a/apps/studio/data/database/entity-definitions-query.ts+++ b/apps/studio/data/database/entity-definitions-query.ts@@ -1,9 +1,9 @@import { getEntityDefinitionsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type EntityDefinitionsVariables = {limit?: numberdiff --git a/apps/studio/data/database/foreign-key-constraints-query.ts b/apps/studio/data/database/foreign-key-constraints-query.tsindex e68c5660e73..ab051d21fa7 100644--- a/apps/studio/data/database/foreign-key-constraints-query.ts+++ b/apps/studio/data/database/foreign-key-constraints-query.ts@@ -1,11 +1,11 @@import { getForeignKeyConstraintsSql } from '@supabase/pg-meta'import { QueryClient, useQuery } from '@tanstack/react-query'import { IS_PLATFORM } from 'common'-import { UseCustomQueryOptions } from 'types'-import { useConnectionStringForReadOps } from '../read-replicas/replicas-query'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type GetForeignKeyConstraintsVariables = {schema?: stringdiff --git a/apps/studio/data/database/hooks-enable-mutation.ts b/apps/studio/data/database/hooks-enable-mutation.tsindex 88b88eacee5..05683e60f72 100644--- a/apps/studio/data/database/hooks-enable-mutation.ts+++ b/apps/studio/data/database/hooks-enable-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { invalidateSchemasQuery } from './schemas-query'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type HooksEnableVariables = {ref: stringdiff --git a/apps/studio/data/database/keys.ts b/apps/studio/data/database/keys.tsindex f887f688e83..45fd39dc825 100644--- a/apps/studio/data/database/keys.ts+++ b/apps/studio/data/database/keys.ts@@ -1,4 +1,4 @@-import { sqlKeys } from '../sql/keys'+import { sqlKeys } from '@/data/sql/keys'export const databaseKeys = {schemas: (projectRef: string | undefined) => ['projects', projectRef, 'schemas'] as const,diff --git a/apps/studio/data/database/keywords-query.ts b/apps/studio/data/database/keywords-query.tsindex b1f2c3667c8..56def22cde2 100644--- a/apps/studio/data/database/keywords-query.ts+++ b/apps/studio/data/database/keywords-query.ts@@ -1,9 +1,9 @@import { getKeywordsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type KeywordsVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/max-connections-query.ts b/apps/studio/data/database/max-connections-query.tsindex 1575cc4fe3e..7877ee0cfda 100644--- a/apps/studio/data/database/max-connections-query.ts+++ b/apps/studio/data/database/max-connections-query.ts@@ -1,9 +1,9 @@import { getMaxConnectionsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type MaxConnectionsVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/migration-upsert-mutation.ts b/apps/studio/data/database/migration-upsert-mutation.tsindex a31807138b2..af8f095c401 100644--- a/apps/studio/data/database/migration-upsert-mutation.ts+++ b/apps/studio/data/database/migration-upsert-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, put } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type MigrationUpsertVariables = {projectRef: stringdiff --git a/apps/studio/data/database/migrations-query.ts b/apps/studio/data/database/migrations-query.tsindex b661c0e3ef4..e5019692a97 100644--- a/apps/studio/data/database/migrations-query.ts+++ b/apps/studio/data/database/migrations-query.ts@@ -1,10 +1,10 @@import { getMigrationsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'import { PROJECT_STATUS } from '@/lib/constants'+import { UseCustomQueryOptions } from '@/types'export type DatabaseMigration = {version: stringdiff --git a/apps/studio/data/database/pgbouncer-config-query.ts b/apps/studio/data/database/pgbouncer-config-query.tsindex 924ebd59b7c..b4bdad90803 100644--- a/apps/studio/data/database/pgbouncer-config-query.ts+++ b/apps/studio/data/database/pgbouncer-config-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type PgbouncerConfigVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/pgbouncer-config-update-mutation.ts b/apps/studio/data/database/pgbouncer-config-update-mutation.tsindex 1039aea7623..138ceb39ec4 100644--- a/apps/studio/data/database/pgbouncer-config-update-mutation.ts+++ b/apps/studio/data/database/pgbouncer-config-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { databaseKeys } from './keys'+import type { components } from '@/data/api'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PgbouncerConfigurationUpdateVariables = {ref: stringdiff --git a/apps/studio/data/database/pgbouncer-status-query.ts b/apps/studio/data/database/pgbouncer-status-query.tsindex 333af72e554..6354168e155 100644--- a/apps/studio/data/database/pgbouncer-status-query.ts+++ b/apps/studio/data/database/pgbouncer-status-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type PgbouncerStatusVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/pitr-restore-mutation.ts b/apps/studio/data/database/pitr-restore-mutation.tsindex 01e152360c5..f5a1f44cf5d 100644--- a/apps/studio/data/database/pitr-restore-mutation.ts+++ b/apps/studio/data/database/pitr-restore-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PitrRestoreVariables = {ref: stringdiff --git a/apps/studio/data/database/retrieve-index-advisor-result-query.ts b/apps/studio/data/database/retrieve-index-advisor-result-query.tsindex 750be63810b..ff284bc44ea 100644--- a/apps/studio/data/database/retrieve-index-advisor-result-query.ts+++ b/apps/studio/data/database/retrieve-index-advisor-result-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'import { z } from 'zod'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'-import { filterProtectedSchemaIndexAdvisorResult } from 'components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils'+import { filterProtectedSchemaIndexAdvisorResult } from '@/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type GetIndexAdvisorResultVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/retrieve-index-from-select-query.ts b/apps/studio/data/database/retrieve-index-from-select-query.tsindex a1002b542ae..8ed2108728e 100644--- a/apps/studio/data/database/retrieve-index-from-select-query.ts+++ b/apps/studio/data/database/retrieve-index-from-select-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type GetInvolvedIndexesFromSelectQueryVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/schema-create-mutation.ts b/apps/studio/data/database/schema-create-mutation.tsindex 42e54d4d24f..0b3b15b225c 100644--- a/apps/studio/data/database/schema-create-mutation.ts+++ b/apps/studio/data/database/schema-create-mutation.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { invalidateSchemasQuery } from './schemas-query'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SchemaCreateVariables = {name: stringdiff --git a/apps/studio/data/database/schemas-query.ts b/apps/studio/data/database/schemas-query.tsindex 4ec036f2093..c93cfe7a767 100644--- a/apps/studio/data/database/schemas-query.ts+++ b/apps/studio/data/database/schemas-query.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { QueryClient, useQuery } from '@tanstack/react-query'import { z } from 'zod'-import { executeSql, ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type SchemasVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/supamonitor-enabled-query.ts b/apps/studio/data/database/supamonitor-enabled-query.tsindex 0d537e449ed..e0670f12213 100644--- a/apps/studio/data/database/supamonitor-enabled-query.ts+++ b/apps/studio/data/database/supamonitor-enabled-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type SupamonitorEnabledVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/supavisor-configuration-query.ts b/apps/studio/data/database/supavisor-configuration-query.tsindex 1abc99260b5..6be4fca9545 100644--- a/apps/studio/data/database/supavisor-configuration-query.ts+++ b/apps/studio/data/database/supavisor-configuration-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type SupavisorConfigurationVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/table-columns-query.ts b/apps/studio/data/database/table-columns-query.tsindex 55d614a7fb5..53c262e9ad5 100644--- a/apps/studio/data/database/table-columns-query.ts+++ b/apps/studio/data/database/table-columns-query.ts@@ -1,9 +1,9 @@import { getTableColumnsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type TableColumn = {schemaname: stringdiff --git a/apps/studio/data/database/table-definition-query.ts b/apps/studio/data/database/table-definition-query.tsindex 0d472a75a98..e92efb1fa86 100644--- a/apps/studio/data/database/table-definition-query.ts+++ b/apps/studio/data/database/table-definition-query.ts@@ -1,9 +1,9 @@import { getTableDefinitionSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type GetTableDefinitionArgs = {id?: numberdiff --git a/apps/studio/data/database/table-index-advisor-query.ts b/apps/studio/data/database/table-index-advisor-query.tsindex c57d683cdd7..aabbe4b40c7 100644--- a/apps/studio/data/database/table-index-advisor-query.ts+++ b/apps/studio/data/database/table-index-advisor-query.ts@@ -1,10 +1,10 @@import { getTableIndexAdvisorSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { filterProtectedSchemaIndexStatements } from 'components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { databaseKeys } from './keys'+import { filterProtectedSchemaIndexStatements } from '@/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type TableIndexAdvisorVariables = {projectRef?: stringdiff --git a/apps/studio/data/database/view-definition-query.ts b/apps/studio/data/database/view-definition-query.tsindex 4838e1d0a2c..6618f488c75 100644--- a/apps/studio/data/database/view-definition-query.ts+++ b/apps/studio/data/database/view-definition-query.ts@@ -1,9 +1,9 @@import { getViewDefinitionSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { databaseKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type GetViewDefinitionArgs = {id?: numberdiff --git a/apps/studio/data/docs/project-json-schema-query.ts b/apps/studio/data/docs/project-json-schema-query.tsindex 2ce3513a61d..f45f5631b61 100644--- a/apps/studio/data/docs/project-json-schema-query.ts+++ b/apps/studio/data/docs/project-json-schema-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { docsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectJsonSchemaVariables = {projectRef?: stringdiff --git a/apps/studio/data/documents/document-query.ts b/apps/studio/data/documents/document-query.tsindex 1e3edd66be9..cb01257db5d 100644--- a/apps/studio/data/documents/document-query.ts+++ b/apps/studio/data/documents/document-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { documentKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DocType = 'standard-security-questionnaire' | 'soc2-type-2-report'diff --git a/apps/studio/data/documents/dpa-request-mutation.ts b/apps/studio/data/documents/dpa-request-mutation.tsindex 6c732f02f9c..276e382ea38 100644--- a/apps/studio/data/documents/dpa-request-mutation.ts+++ b/apps/studio/data/documents/dpa-request-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DpaRequestVariables = {recipient_email: stringdiff --git a/apps/studio/data/edge-functions/edge-function-body-query.ts b/apps/studio/data/edge-functions/edge-function-body-query.tsindex b9ac31bc1a4..85bdd7d8947 100644--- a/apps/studio/data/edge-functions/edge-function-body-query.ts+++ b/apps/studio/data/edge-functions/edge-function-body-query.ts@@ -1,11 +1,11 @@import { getMultipartBoundary, parseMultipartStream } from '@mjackson/multipart-parser'import * as Sentry from '@sentry/nextjs'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { edgeFunctionsKeys } from './keys'import { FileData } from '@/components/ui/FileExplorerAndEditor/FileExplorerAndEditor.types'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type EdgeFunctionBodyVariables = {projectRef?: stringdiff --git a/apps/studio/data/edge-functions/edge-function-query.ts b/apps/studio/data/edge-functions/edge-function-query.tsindex 16814790bc7..344a1aaadb2 100644--- a/apps/studio/data/edge-functions/edge-function-query.ts+++ b/apps/studio/data/edge-functions/edge-function-query.ts@@ -1,9 +1,10 @@import { useQuery } from '@tanstack/react-query'import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { edgeFunctionsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type EdgeFunctionVariables = {projectRef?: stringdiff --git a/apps/studio/data/edge-functions/edge-function-test-mutation.ts b/apps/studio/data/edge-functions/edge-function-test-mutation.tsindex ee80a79721a..344bba5595c 100644--- a/apps/studio/data/edge-functions/edge-function-test-mutation.ts+++ b/apps/studio/data/edge-functions/edge-function-test-mutation.ts@@ -1,10 +1,10 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { ResponseData } from 'components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.types'-import { constructHeaders, fetchHandler } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { ResponseData } from '@/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.types'+import { constructHeaders, fetchHandler } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EdgeFunctionTestResponse = {title: stringdiff --git a/apps/studio/data/edge-functions/edge-functions-delete-mutation.ts b/apps/studio/data/edge-functions/edge-functions-delete-mutation.tsindex d446d150b97..a183348d410 100644--- a/apps/studio/data/edge-functions/edge-functions-delete-mutation.ts+++ b/apps/studio/data/edge-functions/edge-functions-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { edgeFunctionsKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EdgeFunctionsDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/edge-functions/edge-functions-deploy-mutation.ts b/apps/studio/data/edge-functions/edge-functions-deploy-mutation.tsindex fb473dee9ca..e3f7437fa5f 100644--- a/apps/studio/data/edge-functions/edge-functions-deploy-mutation.ts+++ b/apps/studio/data/edge-functions/edge-functions-deploy-mutation.ts@@ -1,15 +1,15 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'+import { edgeFunctionsKeys } from './keys'import {getFallbackEntrypointPath,getFallbackImportMapPath,getStaticPatterns,-} from 'components/interfaces/EdgeFunctions/EdgeFunctions.utils'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'-import { edgeFunctionsKeys } from './keys'+} from '@/components/interfaces/EdgeFunctions/EdgeFunctions.utils'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type EdgeFunctionsDeployBodyMetadata = components['schemas']['FunctionDeployBody']['metadata']type EdgeFunctionsDeployVariables = {diff --git a/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.test.ts b/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.test.tsindex eafa136ebbf..7cc8be86b17 100644--- a/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.test.ts+++ b/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.test.ts@@ -1,7 +1,7 @@-import { post } from 'data/fetchers'import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'import { getEdgeFunctionsLastHourStats } from './edge-functions-last-hour-stats-query'+import { post } from '@/data/fetchers'vi.mock('data/fetchers', () => ({post: vi.fn(),diff --git a/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.ts b/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.tsindex 3c2f2bc1314..df24a2355a2 100644--- a/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.ts+++ b/apps/studio/data/edge-functions/edge-functions-last-hour-stats-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'import dayjs from 'dayjs'-import { quoteLiteral } from 'lib/pg-format'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { edgeFunctionsKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import { quoteLiteral } from '@/lib/pg-format'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type EdgeFunctionsLastHourStatsVariables = { projectRef?: string; functionIds?: string[] }diff --git a/apps/studio/data/edge-functions/edge-functions-query.ts b/apps/studio/data/edge-functions/edge-functions-query.tsindex ea788f06764..7c5e47c15c1 100644--- a/apps/studio/data/edge-functions/edge-functions-query.ts+++ b/apps/studio/data/edge-functions/edge-functions-query.ts@@ -1,9 +1,10 @@import { useQuery } from '@tanstack/react-query'import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { edgeFunctionsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type EdgeFunctionsVariables = { projectRef?: string }diff --git a/apps/studio/data/edge-functions/edge-functions-update-mutation.ts b/apps/studio/data/edge-functions/edge-functions-update-mutation.tsindex 230f0d7dd8f..cbcbea024fd 100644--- a/apps/studio/data/edge-functions/edge-functions-update-mutation.ts+++ b/apps/studio/data/edge-functions/edge-functions-update-mutation.ts@@ -1,9 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { edgeFunctionsKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'+export type EdgeFunctionsUpdateVariables = {projectRef: stringslug: stringdiff --git a/apps/studio/data/entitlements/entitlements-query.ts b/apps/studio/data/entitlements/entitlements-query.tsindex 8c236c9af7b..832ad627abe 100644--- a/apps/studio/data/entitlements/entitlements-query.ts+++ b/apps/studio/data/entitlements/entitlements-query.ts@@ -1,9 +1,10 @@import { useQuery } from '@tanstack/react-query'import type { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { organizationKeys } from 'data/organizations/keys'-import { UseCustomQueryOptions } from 'types'-import { ResponseError } from 'types/base'++import { get, handleError } from '@/data/fetchers'+import { organizationKeys } from '@/data/organizations/keys'+import { UseCustomQueryOptions } from '@/types'+import { ResponseError } from '@/types/base'export type FeatureKey =components['schemas']['ListEntitlementsResponse']['entitlements'][number]['feature']['key']diff --git a/apps/studio/data/entity-types/entity-types-infinite-query.ts b/apps/studio/data/entity-types/entity-types-infinite-query.tsindex fbec33185cd..65e7fd27d83 100644--- a/apps/studio/data/entity-types/entity-types-infinite-query.ts+++ b/apps/studio/data/entity-types/entity-types-infinite-query.ts@@ -1,10 +1,10 @@import { getEntityTypesSQL } from '@supabase/pg-meta'import { InfiniteData, QueryClient, useInfiniteQuery } from '@tanstack/react-query'-import { executeSql, ExecuteSqlVariables } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import { ENTITY_TYPE } from './entity-type-constants'import { entityTypeKeys } from './keys'+import { executeSql, ExecuteSqlVariables } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export type EntityTypesVariables = {projectRef?: stringdiff --git a/apps/studio/data/enumerated-types/enumerated-type-create-mutation.ts b/apps/studio/data/enumerated-types/enumerated-type-create-mutation.tsindex afd096d583b..d2c5c25ff7c 100644--- a/apps/studio/data/enumerated-types/enumerated-type-create-mutation.ts+++ b/apps/studio/data/enumerated-types/enumerated-type-create-mutation.ts@@ -1,11 +1,11 @@import { getCreateEnumeratedTypeSQL } from '@supabase/pg-meta'import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { enumeratedTypesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EnumeratedTypeCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.ts b/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.tsindex 2a9fabe5276..62f5340a6cd 100644--- a/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.ts+++ b/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.ts@@ -1,10 +1,10 @@import { getDeleteEnumeratedTypeSQL } from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { enumeratedTypesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EnumeratedTypeDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/enumerated-types/enumerated-type-update-mutation.ts b/apps/studio/data/enumerated-types/enumerated-type-update-mutation.tsindex 6ec142828db..e4fa3734ae6 100644--- a/apps/studio/data/enumerated-types/enumerated-type-update-mutation.ts+++ b/apps/studio/data/enumerated-types/enumerated-type-update-mutation.ts@@ -1,11 +1,11 @@import { getUpdateEnumeratedTypeSQL } from '@supabase/pg-meta'import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { enumeratedTypesKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EnumeratedTypeUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/enumerated-types/enumerated-types-query.ts b/apps/studio/data/enumerated-types/enumerated-types-query.tsindex f7aff0c7035..ec0b378094a 100644--- a/apps/studio/data/enumerated-types/enumerated-types-query.ts+++ b/apps/studio/data/enumerated-types/enumerated-types-query.ts@@ -1,10 +1,10 @@+import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { useQuery } from '@tanstack/react-query'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { enumeratedTypesKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type EnumeratedTypesVariables = {projectRef?: stringdiff --git a/apps/studio/data/error-patterns.ts b/apps/studio/data/error-patterns.tsindex 20b7542a6fd..bd94f1e3003 100644--- a/apps/studio/data/error-patterns.ts+++ b/apps/studio/data/error-patterns.ts@@ -1,6 +1,6 @@-import { ConnectionTimeoutError } from 'types/api-errors'-import type { ClassifiedError } from 'types/api-errors'-import type { ResponseError } from 'types/base'+import { ConnectionTimeoutError } from '@/types/api-errors'+import type { ClassifiedError } from '@/types/api-errors'+import type { ResponseError } from '@/types/base'type ErrorConstructor = new (...args: ConstructorParameters<typeof ResponseError>diff --git a/apps/studio/data/fdw/fdw-create-mutation.ts b/apps/studio/data/fdw/fdw-create-mutation.tsindex 13b1dab55f0..da5842e5679 100644--- a/apps/studio/data/fdw/fdw-create-mutation.ts+++ b/apps/studio/data/fdw/fdw-create-mutation.ts@@ -1,15 +1,15 @@import { getCreateFDWSql } from '@supabase/pg-meta'import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { WrapperMeta } from 'components/interfaces/Integrations/Wrappers/Wrappers.types'-import { entityTypeKeys } from 'data/entity-types/keys'-import { foreignTableKeys } from 'data/foreign-tables/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { vaultSecretsKeys } from 'data/vault/keys'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { fdwKeys } from './keys'+import { WrapperMeta } from '@/components/interfaces/Integrations/Wrappers/Wrappers.types'+import { entityTypeKeys } from '@/data/entity-types/keys'+import { foreignTableKeys } from '@/data/foreign-tables/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { vaultSecretsKeys } from '@/data/vault/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type FDWCreateVariables = {projectRef?: stringdiff --git a/apps/studio/data/fdw/fdw-delete-mutation.ts b/apps/studio/data/fdw/fdw-delete-mutation.tsindex b2088ffd012..72609ac021f 100644--- a/apps/studio/data/fdw/fdw-delete-mutation.ts+++ b/apps/studio/data/fdw/fdw-delete-mutation.ts@@ -1,15 +1,15 @@import { getDeleteFDWSql } from '@supabase/pg-meta'import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import type { WrapperMeta } from 'components/interfaces/Integrations/Wrappers/Wrappers.types'-import { entityTypeKeys } from 'data/entity-types/keys'-import { foreignTableKeys } from 'data/foreign-tables/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { vaultSecretsKeys } from 'data/vault/keys'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { fdwKeys } from './keys'+import type { WrapperMeta } from '@/components/interfaces/Integrations/Wrappers/Wrappers.types'+import { entityTypeKeys } from '@/data/entity-types/keys'+import { foreignTableKeys } from '@/data/foreign-tables/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { vaultSecretsKeys } from '@/data/vault/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type FDWDeleteVariables = {projectRef?: stringdiff --git a/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.ts b/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.tsindex 81f7e90cb8a..f3832fa9cd4 100644--- a/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.ts+++ b/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.ts@@ -1,13 +1,13 @@import { getDropForeignTableSql } from '@supabase/pg-meta'import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { entityTypeKeys } from 'data/entity-types/keys'-import { foreignTableKeys } from 'data/foreign-tables/keys'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { fdwKeys } from './keys'+import { entityTypeKeys } from '@/data/entity-types/keys'+import { foreignTableKeys } from '@/data/foreign-tables/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type FDWDropForeignTableVariables = {projectRef?: stringdiff --git a/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts b/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.tsindex c59421f3e36..a390d5dfe8a 100644--- a/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts+++ b/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts@@ -1,14 +1,14 @@import { getImportForeignSchemaSql } from '@supabase/pg-meta'import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { entityTypeKeys } from 'data/entity-types/keys'-import { foreignTableKeys } from 'data/foreign-tables/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { vaultSecretsKeys } from 'data/vault/keys'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { fdwKeys } from './keys'+import { entityTypeKeys } from '@/data/entity-types/keys'+import { foreignTableKeys } from '@/data/foreign-tables/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { vaultSecretsKeys } from '@/data/vault/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type FDWImportForeignSchemaVariables = {projectRef?: stringdiff --git a/apps/studio/data/fdw/fdw-update-mutation.ts b/apps/studio/data/fdw/fdw-update-mutation.tsindex c7c8db15701..a577aa136bb 100644--- a/apps/studio/data/fdw/fdw-update-mutation.ts+++ b/apps/studio/data/fdw/fdw-update-mutation.ts@@ -1,16 +1,16 @@import { getCreateFDWSql, getDeleteFDWSql, getUpdateFDWSql } from '@supabase/pg-meta'import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import type { WrapperMeta } from 'components/interfaces/Integrations/Wrappers/Wrappers.types'-import { entityTypeKeys } from 'data/entity-types/keys'-import { foreignTableKeys } from 'data/foreign-tables/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { vaultSecretsKeys } from 'data/vault/keys'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { FDW } from './fdws-query'import { fdwKeys } from './keys'+import type { WrapperMeta } from '@/components/interfaces/Integrations/Wrappers/Wrappers.types'+import { entityTypeKeys } from '@/data/entity-types/keys'+import { foreignTableKeys } from '@/data/foreign-tables/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { vaultSecretsKeys } from '@/data/vault/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type FDWUpdateVariables = {projectRef?: stringdiff --git a/apps/studio/data/fdw/fdws-query.ts b/apps/studio/data/fdw/fdws-query.tsindex ab8d1700f39..4fd04b8b999 100644--- a/apps/studio/data/fdw/fdws-query.ts+++ b/apps/studio/data/fdw/fdws-query.ts@@ -1,9 +1,9 @@import { getFDWsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { fdwKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type FDWColumn = {name: stringdiff --git a/apps/studio/data/feedback/exit-survey-send.ts b/apps/studio/data/feedback/exit-survey-send.tsindex 7910ae26f56..530c715378b 100644--- a/apps/studio/data/feedback/exit-survey-send.ts+++ b/apps/studio/data/feedback/exit-survey-send.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SendDowngradeFeedbackVariables = {projectRef?: stringdiff --git a/apps/studio/data/feedback/feedback-category.ts b/apps/studio/data/feedback/feedback-category.tsindex f0c4c2c6e3c..652e5befe75 100644--- a/apps/studio/data/feedback/feedback-category.ts+++ b/apps/studio/data/feedback/feedback-category.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { constructHeaders, fetchHandler, handleError } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import { UseCustomQueryOptions } from 'types'++import { constructHeaders, fetchHandler, handleError } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import { UseCustomQueryOptions } from '@/types'export type FeedbackCategoryVariables = {prompt: stringdiff --git a/apps/studio/data/feedback/feedback-send.ts b/apps/studio/data/feedback/feedback-send.tsindex 68463c9da8b..348c9f1be47 100644--- a/apps/studio/data/feedback/feedback-send.ts+++ b/apps/studio/data/feedback/feedback-send.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SendFeedbackVariables = {message: stringdiff --git a/apps/studio/data/feedback/link-support-ticket-mutation.ts b/apps/studio/data/feedback/link-support-ticket-mutation.tsindex f5d77a2974c..0175d6c7f3d 100644--- a/apps/studio/data/feedback/link-support-ticket-mutation.ts+++ b/apps/studio/data/feedback/link-support-ticket-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import type { ExtendedSupportCategories } from 'components/interfaces/Support/Support.constants'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import type { ExtendedSupportCategories } from '@/components/interfaces/Support/Support.constants'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type LinkSupportTicketVariables = {conversation_id: stringdiff --git a/apps/studio/data/feedback/support-ticket-send.ts b/apps/studio/data/feedback/support-ticket-send.tsindex bebf3168f4b..8e14bf50b40 100644--- a/apps/studio/data/feedback/support-ticket-send.ts+++ b/apps/studio/data/feedback/support-ticket-send.ts@@ -1,10 +1,11 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'+// End of third-party imports-import type { ExtendedSupportCategories } from 'components/interfaces/Support/Support.constants'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import type { ExtendedSupportCategories } from '@/components/interfaces/Support/Support.constants'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type sendSupportTicketVariables = {subject: stringdiff --git a/apps/studio/data/feedback/upgrade-survey-send.ts b/apps/studio/data/feedback/upgrade-survey-send.tsindex 09e70bf4f7e..8a973238457 100644--- a/apps/studio/data/feedback/upgrade-survey-send.ts+++ b/apps/studio/data/feedback/upgrade-survey-send.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SendUpgradeFeedbackVariables = {orgSlug?: stringdiff --git a/apps/studio/data/fetchers.ts b/apps/studio/data/fetchers.tsindex 1efd4ab910e..20f7fd5c0fb 100644--- a/apps/studio/data/fetchers.ts+++ b/apps/studio/data/fetchers.ts@@ -1,14 +1,14 @@import * as Sentry from '@sentry/nextjs'import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { getAccessToken, IS_PLATFORM } from 'common'-import { API_URL } from 'lib/constants'-import { uuidv4 } from 'lib/helpers'import createClient from 'openapi-fetch'-import { ResponseError } from 'types'-import { UnknownAPIResponseError } from 'types/api-errors'import type { paths } from './api'import { ERROR_PATTERNS } from './error-patterns'+import { API_URL } from '@/lib/constants'+import { uuidv4 } from '@/lib/helpers'+import { ResponseError } from '@/types'+import { UnknownAPIResponseError } from '@/types/api-errors'import { ErrorMetadata } from '@/types/base'// generated from openapi-typescriptdiff --git a/apps/studio/data/foreign-tables/foreign-tables-query.ts b/apps/studio/data/foreign-tables/foreign-tables-query.tsindex c657b2ae2dd..81714ed5397 100644--- a/apps/studio/data/foreign-tables/foreign-tables-query.ts+++ b/apps/studio/data/foreign-tables/foreign-tables-query.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { PostgresView } from '@supabase/postgres-meta'import { useQuery } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { foreignTableKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ForeignTablesVariables = {projectRef?: stringdiff --git a/apps/studio/data/graphql/execute.ts b/apps/studio/data/graphql/execute.tsindex 58230278163..fbafe81079d 100644--- a/apps/studio/data/graphql/execute.ts+++ b/apps/studio/data/graphql/execute.ts@@ -1,5 +1,5 @@-import { handleError } from 'data/fetchers'import type { TypedDocumentString } from './graphql'+import { handleError } from '@/data/fetchers'export async function executeGraphQL<TResult, TVariables>(query: TypedDocumentString<TResult, TVariables>,diff --git a/apps/studio/data/graphql/fragment-masking.ts b/apps/studio/data/graphql/fragment-masking.tsindex 20d21c67a3a..3b8061ec76e 100644--- a/apps/studio/data/graphql/fragment-masking.ts+++ b/apps/studio/data/graphql/fragment-masking.ts@@ -1,4 +1,5 @@import { DocumentTypeDecoration, ResultOf } from '@graphql-typed-document-node/core'+import { Incremental, TypedDocumentString } from './graphql'export type FragmentType<TDocumentType extends DocumentTypeDecoration<any, any>> =diff --git a/apps/studio/data/graphql/graphql.ts b/apps/studio/data/graphql/graphql.tsindex aac84b54d99..d668a2062b6 100644--- a/apps/studio/data/graphql/graphql.ts+++ b/apps/studio/data/graphql/graphql.ts@@ -1,4 +1,5 @@import { DocumentTypeDecoration } from '@graphql-typed-document-node/core'+export type Maybe<T> = T | nullexport type InputMaybe<T> = Maybe<T>export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] }diff --git a/apps/studio/data/handleError.test.ts b/apps/studio/data/handleError.test.tsindex c0e086ff428..4eb1fe0cb48 100644--- a/apps/studio/data/handleError.test.ts+++ b/apps/studio/data/handleError.test.ts@@ -1,7 +1,8 @@-import { ConnectionTimeoutError, UnknownAPIResponseError } from 'types/api-errors'-import { ResponseError } from 'types/base'import { beforeEach, describe, expect, it, vi } from 'vitest'+import { ConnectionTimeoutError, UnknownAPIResponseError } from '@/types/api-errors'+import { ResponseError } from '@/types/base'+vi.mock('@sentry/nextjs', () => ({ captureException: vi.fn() }))vi.mock('common', () => ({ IS_PLATFORM: false, getAccessToken: vi.fn() }))vi.mock('lib/constants', () => ({ API_URL: 'http://localhost' }))diff --git a/apps/studio/data/integrations/aws-redirect-query.ts b/apps/studio/data/integrations/aws-redirect-query.tsindex a70f909acd1..8759bf3c4bf 100644--- a/apps/studio/data/integrations/aws-redirect-query.ts+++ b/apps/studio/data/integrations/aws-redirect-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { integrationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type AwsRedirectVariables = {organizationSlug?: stringdiff --git a/apps/studio/data/integrations/github-authorization-create-mutation.ts b/apps/studio/data/integrations/github-authorization-create-mutation.tsindex 18b1efea594..d54d091d374 100644--- a/apps/studio/data/integrations/github-authorization-create-mutation.ts+++ b/apps/studio/data/integrations/github-authorization-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { LOCAL_STORAGE_KEYS } from 'common'import { toast } from 'sonner'-import { LOCAL_STORAGE_KEYS } from 'common'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { integrationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type GitHubAuthorizationCreateVariables = {code: stringdiff --git a/apps/studio/data/integrations/github-authorization-delete-mutation.ts b/apps/studio/data/integrations/github-authorization-delete-mutation.tsindex 355ec5fc4f3..e275bdc0f44 100644--- a/apps/studio/data/integrations/github-authorization-delete-mutation.ts+++ b/apps/studio/data/integrations/github-authorization-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { integrationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export async function deleteGitHubAuthorization(signal?: AbortSignal) {const { data, error } = await del('/platform/integrations/github/authorization', { signal })diff --git a/apps/studio/data/integrations/github-authorization-query.ts b/apps/studio/data/integrations/github-authorization-query.tsindex 78f9586efb7..ff149f80354 100644--- a/apps/studio/data/integrations/github-authorization-query.ts+++ b/apps/studio/data/integrations/github-authorization-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { integrationKeys } from './keys'+import { get } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'// FIXME(kamil): Do not retry, a single check is fine.export async function getGitHubAuthorization(signal?: AbortSignal) {diff --git a/apps/studio/data/integrations/github-branch-check-query.ts b/apps/studio/data/integrations/github-branch-check-query.tsindex 2abf3892c12..81cf40a8db6 100644--- a/apps/studio/data/integrations/github-branch-check-query.ts+++ b/apps/studio/data/integrations/github-branch-check-query.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type GithubBranchVariables = {repositoryId: numberdiff --git a/apps/studio/data/integrations/github-connection-create-mutation.ts b/apps/studio/data/integrations/github-connection-create-mutation.tsindex cb23822a737..d2c231ab739 100644--- a/apps/studio/data/integrations/github-connection-create-mutation.ts+++ b/apps/studio/data/integrations/github-connection-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { integrationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type GitHubConnectionCreateVariables = {organizationId: numberdiff --git a/apps/studio/data/integrations/github-connection-delete-mutation.ts b/apps/studio/data/integrations/github-connection-delete-mutation.tsindex 9907c36b1a2..8a37ae6e9ca 100644--- a/apps/studio/data/integrations/github-connection-delete-mutation.ts+++ b/apps/studio/data/integrations/github-connection-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { integrationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type DeleteVariables = {connectionId: string | numberdiff --git a/apps/studio/data/integrations/github-connection-update-mutation.ts b/apps/studio/data/integrations/github-connection-update-mutation.tsindex cbec34ad222..08e00b53760 100644--- a/apps/studio/data/integrations/github-connection-update-mutation.ts+++ b/apps/studio/data/integrations/github-connection-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { integrationKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type GitHubConnectionUpdateVariables = {connectionId: string | numberdiff --git a/apps/studio/data/integrations/github-connections-query.ts b/apps/studio/data/integrations/github-connections-query.tsindex 16e066e9911..336171ef15a 100644--- a/apps/studio/data/integrations/github-connections-query.ts+++ b/apps/studio/data/integrations/github-connections-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { integrationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type GitHubConnectionsVariables = {organizationId?: numberdiff --git a/apps/studio/data/integrations/github-repositories-query.ts b/apps/studio/data/integrations/github-repositories-query.tsindex 6d6739321ff..bbb8870dfcb 100644--- a/apps/studio/data/integrations/github-repositories-query.ts+++ b/apps/studio/data/integrations/github-repositories-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { integrationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getGitHubRepositories(signal?: AbortSignal) {const { data, error } = await get('/platform/integrations/github/repositories', {diff --git a/apps/studio/data/integrations/integrations-query-org-only.ts b/apps/studio/data/integrations/integrations-query-org-only.tsindex 72afeab33a6..8f83945d05f 100644--- a/apps/studio/data/integrations/integrations-query-org-only.ts+++ b/apps/studio/data/integrations/integrations-query-org-only.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { Integration } from './integrations.types'import { integrationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type IntegrationsVariables = {orgSlug?: stringdiff --git a/apps/studio/data/integrations/integrations-query.ts b/apps/studio/data/integrations/integrations-query.tsindex 8e18d74b8ce..b76a585259e 100644--- a/apps/studio/data/integrations/integrations-query.ts+++ b/apps/studio/data/integrations/integrations-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { integrationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getIntegrations(signal?: AbortSignal) {const { data, error } = await get('/platform/integrations', {diff --git a/apps/studio/data/integrations/integrations-vercel-connection-sync-envs-mutation.ts b/apps/studio/data/integrations/integrations-vercel-connection-sync-envs-mutation.tsindex 057e3edc21a..9fb7630be49 100644--- a/apps/studio/data/integrations/integrations-vercel-connection-sync-envs-mutation.ts+++ b/apps/studio/data/integrations/integrations-vercel-connection-sync-envs-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type IntegrationsVercelConnectionSyncEnvsVariables = {connectionId: stringdiff --git a/apps/studio/data/integrations/integrations-vercel-connections-create-mutation.ts b/apps/studio/data/integrations/integrations-vercel-connections-create-mutation.tsindex fdae57ee171..51238c1daae 100644--- a/apps/studio/data/integrations/integrations-vercel-connections-create-mutation.ts+++ b/apps/studio/data/integrations/integrations-vercel-connections-create-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import { useIntegrationInstallationSnapshot } from 'state/integration-installation'-import type { ResponseError, UseCustomMutationOptions } from 'types'import type { IntegrationConnectionsCreateVariables } from './integrations.types'import { integrationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import { useIntegrationInstallationSnapshot } from '@/state/integration-installation'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export async function createIntegrationVercelConnections({organizationIntegrationId,diff --git a/apps/studio/data/integrations/integrations-vercel-installed-connection-delete-mutation.ts b/apps/studio/data/integrations/integrations-vercel-installed-connection-delete-mutation.tsindex 41d0768f7cd..88044e7d299 100644--- a/apps/studio/data/integrations/integrations-vercel-installed-connection-delete-mutation.ts+++ b/apps/studio/data/integrations/integrations-vercel-installed-connection-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { integrationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type DeleteVariables = {id: stringdiff --git a/apps/studio/data/integrations/integrations-vercel-projects-query.ts b/apps/studio/data/integrations/integrations-vercel-projects-query.tsindex 634ef1d9322..b5f91b61f90 100644--- a/apps/studio/data/integrations/integrations-vercel-projects-query.ts+++ b/apps/studio/data/integrations/integrations-vercel-projects-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'+import { integrationKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type VercelProjectsVariables = {organization_integration_id: string | undefineddiff --git a/apps/studio/data/integrations/vercel-connection-update-mutate.ts b/apps/studio/data/integrations/vercel-connection-update-mutate.tsindex 5c9e020cc30..b95893e7b63 100644--- a/apps/studio/data/integrations/vercel-connection-update-mutate.ts+++ b/apps/studio/data/integrations/vercel-connection-update-mutate.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { EnvironmentTargets } from './integrations.types'import { integrationKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type UpdateConnectionPayload = {id: stringdiff --git a/apps/studio/data/integrations/vercel-integration-create-mutation.ts b/apps/studio/data/integrations/vercel-integration-create-mutation.tsindex 4eb1e164389..35603b759b5 100644--- a/apps/studio/data/integrations/vercel-integration-create-mutation.ts+++ b/apps/studio/data/integrations/vercel-integration-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { integrationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type VercelIntegrationCreateVariables = {code: stringdiff --git a/apps/studio/data/integrations/vercel-redirect-query.ts b/apps/studio/data/integrations/vercel-redirect-query.tsindex bf89940f8ad..19a690a15f1 100644--- a/apps/studio/data/integrations/vercel-redirect-query.ts+++ b/apps/studio/data/integrations/vercel-redirect-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { integrationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type VercelRedirectVariables = {installationId?: stringdiff --git a/apps/studio/data/invoices/invoice-payment-link-mutation.ts b/apps/studio/data/invoices/invoice-payment-link-mutation.tsindex 5433633f444..a29b44a264e 100644--- a/apps/studio/data/invoices/invoice-payment-link-mutation.ts+++ b/apps/studio/data/invoices/invoice-payment-link-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { invoicesKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type InvoicePaymentLinkGetVariables = {slug?: stringdiff --git a/apps/studio/data/invoices/invoice-query.ts b/apps/studio/data/invoices/invoice-query.tsindex c0133fdede1..9f33c850e74 100644--- a/apps/studio/data/invoices/invoice-query.ts+++ b/apps/studio/data/invoices/invoice-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { invoicesKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type InvoiceVariables = {invoiceId?: stringdiff --git a/apps/studio/data/invoices/invoice-receipt-query.ts b/apps/studio/data/invoices/invoice-receipt-query.tsindex 4f0c17066f5..b4faab88ff9 100644--- a/apps/studio/data/invoices/invoice-receipt-query.ts+++ b/apps/studio/data/invoices/invoice-receipt-query.ts@@ -1,4 +1,4 @@-import { get, handleError } from 'data/fetchers'+import { get, handleError } from '@/data/fetchers'export type InvoiceReceiptVariables = {invoiceId: stringdiff --git a/apps/studio/data/invoices/invoices-count-query.ts b/apps/studio/data/invoices/invoices-count-query.tsindex 985993704f5..f7fd7cd9e48 100644--- a/apps/studio/data/invoices/invoices-count-query.ts+++ b/apps/studio/data/invoices/invoices-count-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { head } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { invoicesKeys } from './keys'+import { head } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type InvoicesCountVariables = {slug?: stringdiff --git a/apps/studio/data/invoices/invoices-overdue-query.ts b/apps/studio/data/invoices/invoices-overdue-query.tsindex 87a6d5e27db..f1619de8edc 100644--- a/apps/studio/data/invoices/invoices-overdue-query.ts+++ b/apps/studio/data/invoices/invoices-overdue-query.ts@@ -1,10 +1,11 @@import { useQuery } from '@tanstack/react-query'import { useIsLoggedIn } from 'common'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'+import { invoicesKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import { UseCustomQueryOptions } from '@/types'export type OverdueInvoicesResponse = components['schemas']['OverdueInvoiceCount']diff --git a/apps/studio/data/invoices/invoices-query.ts b/apps/studio/data/invoices/invoices-query.tsindex ba72cd2b38a..e3d7202a9b8 100644--- a/apps/studio/data/invoices/invoices-query.ts+++ b/apps/studio/data/invoices/invoices-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { invoicesKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type InvoicesVariables = {slug?: stringdiff --git a/apps/studio/data/invoices/org-invoice-upcoming-query.ts b/apps/studio/data/invoices/org-invoice-upcoming-query.tsindex 2a187425a1a..60a93ac1b2e 100644--- a/apps/studio/data/invoices/org-invoice-upcoming-query.ts+++ b/apps/studio/data/invoices/org-invoice-upcoming-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { PricingMetric } from 'data/analytics/org-daily-stats-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { invoicesKeys } from './keys'+import { PricingMetric } from '@/data/analytics/org-daily-stats-query'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type UpcomingInvoiceVariables = {orgSlug?: stringdiff --git a/apps/studio/data/jit-db-access/jit-db-access-grant-mutation.ts b/apps/studio/data/jit-db-access/jit-db-access-grant-mutation.tsindex 7e5efa4e622..98a83cedde6 100644--- a/apps/studio/data/jit-db-access/jit-db-access-grant-mutation.ts+++ b/apps/studio/data/jit-db-access/jit-db-access-grant-mutation.ts@@ -1,9 +1,9 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'-import { handleError, put } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError } from 'types'import { jitDbAccessKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError } from '@/types'type JitDbAccessGrantVariables = {projectRef: stringdiff --git a/apps/studio/data/jit-db-access/jit-db-access-members-query.ts b/apps/studio/data/jit-db-access/jit-db-access-members-query.tsindex 214f5888030..f2aaa83797b 100644--- a/apps/studio/data/jit-db-access/jit-db-access-members-query.ts+++ b/apps/studio/data/jit-db-access/jit-db-access-members-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { jitDbAccessKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type JitDbAccessMembersVariables = { projectRef?: string }diff --git a/apps/studio/data/jit-db-access/jit-db-access-query.ts b/apps/studio/data/jit-db-access/jit-db-access-query.tsindex 2ee784c810d..7ebc094d7c8 100644--- a/apps/studio/data/jit-db-access/jit-db-access-query.ts+++ b/apps/studio/data/jit-db-access/jit-db-access-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { jitDbAccessKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type JitDbAccessVariables = { projectRef?: string }diff --git a/apps/studio/data/jit-db-access/jit-db-access-revoke-mutation.ts b/apps/studio/data/jit-db-access/jit-db-access-revoke-mutation.tsindex a4225be2740..c51a166ecb8 100644--- a/apps/studio/data/jit-db-access/jit-db-access-revoke-mutation.ts+++ b/apps/studio/data/jit-db-access/jit-db-access-revoke-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { del, handleError } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { jitDbAccessKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type JitDbAccessRevokeVariables = {projectRef: stringdiff --git a/apps/studio/data/jit-db-access/jit-db-access-update-mutation.ts b/apps/studio/data/jit-db-access/jit-db-access-update-mutation.tsindex ea445ef4894..d61c0e7c4f4 100644--- a/apps/studio/data/jit-db-access/jit-db-access-update-mutation.ts+++ b/apps/studio/data/jit-db-access/jit-db-access-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, put } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { jitDbAccessKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type JitDbAccessUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/jwt-signing-keys/jwt-signing-key-create-mutation.ts b/apps/studio/data/jwt-signing-keys/jwt-signing-key-create-mutation.tsindex a9ad8ac9649..e8a6669aeec 100644--- a/apps/studio/data/jwt-signing-keys/jwt-signing-key-create-mutation.ts+++ b/apps/studio/data/jwt-signing-keys/jwt-signing-key-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { JWTAlgorithm } from './jwt-signing-keys-query'import { jwtSigningKeysKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'interface JWTSigningKeyCreateVariables {projectRef?: stringdiff --git a/apps/studio/data/jwt-signing-keys/jwt-signing-key-delete-mutation.ts b/apps/studio/data/jwt-signing-keys/jwt-signing-key-delete-mutation.tsindex 1b5791894f3..6db73737b81 100644--- a/apps/studio/data/jwt-signing-keys/jwt-signing-key-delete-mutation.ts+++ b/apps/studio/data/jwt-signing-keys/jwt-signing-key-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { jwtSigningKeysKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'interface JWTSigningKeyDeleteVariables {projectRef?: stringdiff --git a/apps/studio/data/jwt-signing-keys/jwt-signing-key-update-mutation.ts b/apps/studio/data/jwt-signing-keys/jwt-signing-key-update-mutation.tsindex 67e6c950baf..7e2cb62cf4a 100644--- a/apps/studio/data/jwt-signing-keys/jwt-signing-key-update-mutation.ts+++ b/apps/studio/data/jwt-signing-keys/jwt-signing-key-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { jwtSigningKeysKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'interface JWTSigningKeyUpdateVariables {projectRef?: stringdiff --git a/apps/studio/data/jwt-signing-keys/jwt-signing-keys-query.ts b/apps/studio/data/jwt-signing-keys/jwt-signing-keys-query.tsindex b990cc694b2..2663db796bb 100644--- a/apps/studio/data/jwt-signing-keys/jwt-signing-keys-query.ts+++ b/apps/studio/data/jwt-signing-keys/jwt-signing-keys-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { jwtSigningKeysKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type JWTSigningKey = components['schemas']['SigningKeyResponse']diff --git a/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-create-mutation.ts b/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-create-mutation.tsindex 495bee859bf..6550110c8c0 100644--- a/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-create-mutation.ts+++ b/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { jwtSigningKeysKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'interface LegacyJWTSigningKeyCreateVariables {projectRef?: stringdiff --git a/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-query.ts b/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-query.tsindex 122c6c7a645..6ae62dc5130 100644--- a/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-query.ts+++ b/apps/studio/data/jwt-signing-keys/legacy-jwt-signing-key-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { jwtSigningKeysKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'interface LegacyJWTSigningKeyVariables {projectRef?: stringdiff --git a/apps/studio/data/lint/create-lint-rule-mutation.ts b/apps/studio/data/lint/create-lint-rule-mutation.tsindex 37741c58dc0..1c8764f32c7 100644--- a/apps/studio/data/lint/create-lint-rule-mutation.ts+++ b/apps/studio/data/lint/create-lint-rule-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { lintKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type ExceptionPayload = components['schemas']['CreateNotificationExceptionsBody']['exceptions'][0]diff --git a/apps/studio/data/lint/delete-lint-rule-mutation.ts b/apps/studio/data/lint/delete-lint-rule-mutation.tsindex 5c255b7cd73..c201c91f494 100644--- a/apps/studio/data/lint/delete-lint-rule-mutation.ts+++ b/apps/studio/data/lint/delete-lint-rule-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { lintKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type LintRuleDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/lint/lint-query.ts b/apps/studio/data/lint/lint-query.tsindex f73adbcbe74..caabf030d59 100644--- a/apps/studio/data/lint/lint-query.ts+++ b/apps/studio/data/lint/lint-query.ts@@ -1,11 +1,11 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { lintKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ProjectLintsVariables = {projectRef?: stringdiff --git a/apps/studio/data/lint/lint-rules-query.ts b/apps/studio/data/lint/lint-rules-query.tsindex 56dd4c0ca9c..38b2220f580 100644--- a/apps/studio/data/lint/lint-rules-query.ts+++ b/apps/studio/data/lint/lint-rules-query.ts@@ -1,11 +1,11 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { lintKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ProjectLintRulesVariables = {projectRef?: stringdiff --git a/apps/studio/data/log-drains/create-log-drain-mutation.ts b/apps/studio/data/log-drains/create-log-drain-mutation.tsindex 4b92b00a9e0..7739690b403 100644--- a/apps/studio/data/log-drains/create-log-drain-mutation.ts+++ b/apps/studio/data/log-drains/create-log-drain-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { LogDrainType } from 'components/interfaces/LogDrains/LogDrains.constants'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { logDrainsKeys } from './keys'+import { LogDrainType } from '@/components/interfaces/LogDrains/LogDrains.constants'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type LogDrainCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/log-drains/delete-log-drain-mutation.ts b/apps/studio/data/log-drains/delete-log-drain-mutation.tsindex cfe481deded..1c42323deef 100644--- a/apps/studio/data/log-drains/delete-log-drain-mutation.ts+++ b/apps/studio/data/log-drains/delete-log-drain-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { logDrainsKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type LogDrainDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/log-drains/log-drains-query.ts b/apps/studio/data/log-drains/log-drains-query.tsindex d5567c47fe5..efdc5644960 100644--- a/apps/studio/data/log-drains/log-drains-query.ts+++ b/apps/studio/data/log-drains/log-drains-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { MAX_RETRY_FAILURE_COUNT } from 'data/query-client'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { logDrainsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { MAX_RETRY_FAILURE_COUNT } from '@/data/query-client'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type LogDrainsVariables = {ref?: stringdiff --git a/apps/studio/data/log-drains/update-log-drain-mutation.ts b/apps/studio/data/log-drains/update-log-drain-mutation.tsindex c20359889ae..3a8429eb8c9 100644--- a/apps/studio/data/log-drains/update-log-drain-mutation.ts+++ b/apps/studio/data/log-drains/update-log-drain-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { LogDrainType } from 'components/interfaces/LogDrains/LogDrains.constants'-import { handleError, put } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { logDrainsKeys } from './keys'+import { LogDrainType } from '@/components/interfaces/LogDrains/LogDrains.constants'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type LogDrainUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/logs/get-unified-logs.ts b/apps/studio/data/logs/get-unified-logs.tsindex 2151c5c11c0..65c2cf9834a 100644--- a/apps/studio/data/logs/get-unified-logs.ts+++ b/apps/studio/data/logs/get-unified-logs.ts@@ -1,11 +1,11 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { getUnifiedLogsQuery } from 'components/interfaces/UnifiedLogs/UnifiedLogs.queries'-import { QuerySearchParamsType } from 'components/interfaces/UnifiedLogs/UnifiedLogs.types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { getUnifiedLogsISOStartEnd } from './unified-logs-infinite-query'+import { getUnifiedLogsQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'+import { QuerySearchParamsType } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type getUnifiedLogsVariables = {projectRef: stringdiff --git a/apps/studio/data/logs/keys.ts b/apps/studio/data/logs/keys.tsindex af62b1e3116..9aff8c9c58b 100644--- a/apps/studio/data/logs/keys.ts+++ b/apps/studio/data/logs/keys.ts@@ -1,4 +1,4 @@-import { QuerySearchParamsType } from 'components/interfaces/UnifiedLogs/UnifiedLogs.types'+import { QuerySearchParamsType } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.types'export const logsKeys = {unifiedLogsInfinite: (diff --git a/apps/studio/data/logs/unified-log-inspection-query.ts b/apps/studio/data/logs/unified-log-inspection-query.tsindex b23d231c2f9..b47772b13d1 100644--- a/apps/studio/data/logs/unified-log-inspection-query.ts+++ b/apps/studio/data/logs/unified-log-inspection-query.ts@@ -1,20 +1,20 @@import { useQuery } from '@tanstack/react-query'+import { logsKeys } from './keys'+import {+ getUnifiedLogsISOStartEnd,+ UNIFIED_LOGS_QUERY_OPTIONS,+} from './unified-logs-infinite-query'import {getAuthServiceFlowQuery,getEdgeFunctionServiceFlowQuery,getPostgresServiceFlowQuery,getPostgrestServiceFlowQuery,getStorageServiceFlowQuery,-} from 'components/interfaces/UnifiedLogs/Queries/ServiceFlowQueries/ServiceFlow.sql'-import { QuerySearchParamsType } from 'components/interfaces/UnifiedLogs/UnifiedLogs.types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'-import { logsKeys } from './keys'-import {- getUnifiedLogsISOStartEnd,- UNIFIED_LOGS_QUERY_OPTIONS,-} from './unified-logs-infinite-query'+} from '@/components/interfaces/UnifiedLogs/Queries/ServiceFlowQueries/ServiceFlow.sql'+import { QuerySearchParamsType } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'// Service flow types - subset of LOG_TYPES that support service flowsexport const SERVICE_FLOW_TYPES = [diff --git a/apps/studio/data/logs/unified-logs-chart-query.ts b/apps/studio/data/logs/unified-logs-chart-query.tsindex f4c3cf32105..df60870f445 100644--- a/apps/studio/data/logs/unified-logs-chart-query.ts+++ b/apps/studio/data/logs/unified-logs-chart-query.ts@@ -1,11 +1,11 @@import { keepPreviousData, useQuery } from '@tanstack/react-query'-import { getLogsChartQuery } from 'components/interfaces/UnifiedLogs/UnifiedLogs.queries'-import { handleError, post } from 'data/fetchers'-import { ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { logsKeys } from './keys'import { UNIFIED_LOGS_QUERY_OPTIONS, UnifiedLogsVariables } from './unified-logs-infinite-query'+import { getLogsChartQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'+import { handleError, post } from '@/data/fetchers'+import { ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export async function getUnifiedLogsChart({ projectRef, search }: UnifiedLogsVariables,diff --git a/apps/studio/data/logs/unified-logs-count-query.ts b/apps/studio/data/logs/unified-logs-count-query.tsindex b0408e15499..3cd8612d647 100644--- a/apps/studio/data/logs/unified-logs-count-query.ts+++ b/apps/studio/data/logs/unified-logs-count-query.ts@@ -1,16 +1,16 @@import { useQuery } from '@tanstack/react-query'-import { getLogsCountQuery } from 'components/interfaces/UnifiedLogs/UnifiedLogs.queries'-import { FacetMetadataSchema } from 'components/interfaces/UnifiedLogs/UnifiedLogs.schema'-import { handleError, post } from 'data/fetchers'-import { ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { logsKeys } from './keys'import {getUnifiedLogsISOStartEnd,UNIFIED_LOGS_QUERY_OPTIONS,UnifiedLogsVariables,} from './unified-logs-infinite-query'+import { getLogsCountQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'+import { FacetMetadataSchema } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.schema'+import { handleError, post } from '@/data/fetchers'+import { ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export async function getUnifiedLogsCount({ projectRef, search }: UnifiedLogsVariables,diff --git a/apps/studio/data/logs/unified-logs-facet-count-query.ts b/apps/studio/data/logs/unified-logs-facet-count-query.tsindex d8767876135..3ea1f44f1cd 100644--- a/apps/studio/data/logs/unified-logs-facet-count-query.ts+++ b/apps/studio/data/logs/unified-logs-facet-count-query.ts@@ -1,19 +1,19 @@import { useQuery } from '@tanstack/react-query'-import {- getFacetCountCTE,- getUnifiedLogsCTE,-} from 'components/interfaces/UnifiedLogs/UnifiedLogs.queries'-import { Option } from 'components/ui/DataTable/DataTable.types'-import { handleError, post } from 'data/fetchers'-import { ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { logsKeys } from './keys'import {getUnifiedLogsISOStartEnd,UNIFIED_LOGS_QUERY_OPTIONS,UnifiedLogsVariables,} from './unified-logs-infinite-query'+import {+ getFacetCountCTE,+ getUnifiedLogsCTE,+} from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'+import { Option } from '@/components/ui/DataTable/DataTable.types'+import { handleError, post } from '@/data/fetchers'+import { ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type UnifiedLogsFacetCountVariables = UnifiedLogsVariables & {facet: stringdiff --git a/apps/studio/data/logs/unified-logs-infinite-query.ts b/apps/studio/data/logs/unified-logs-infinite-query.tsindex 5357af0f488..45fb3536fd3 100644--- a/apps/studio/data/logs/unified-logs-infinite-query.ts+++ b/apps/studio/data/logs/unified-logs-infinite-query.ts@@ -1,13 +1,13 @@import { InfiniteData, keepPreviousData, useInfiniteQuery } from '@tanstack/react-query'-import { getUnifiedLogsQuery } from 'components/interfaces/UnifiedLogs/UnifiedLogs.queries'+import { logsKeys } from './keys'+import { getUnifiedLogsQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'import {PageParam,QuerySearchParamsType,-} from 'components/interfaces/UnifiedLogs/UnifiedLogs.types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'-import { logsKeys } from './keys'+} from '@/components/interfaces/UnifiedLogs/UnifiedLogs.types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'const LOGS_PAGE_LIMIT = 50type LogLevel = 'success' | 'warning' | 'error'diff --git a/apps/studio/data/marketplace/integration-categories-query.ts b/apps/studio/data/marketplace/integration-categories-query.tsindex ed41d145e12..e86439ae4a9 100644--- a/apps/studio/data/marketplace/integration-categories-query.ts+++ b/apps/studio/data/marketplace/integration-categories-query.ts@@ -1,8 +1,8 @@import { queryOptions } from '@tanstack/react-query'-import { handleError } from 'data/fetchers'import { marketplaceIntegrationsKeys } from './keys'import { createMarketplaceClient } from './marketplace-client'+import { handleError } from '@/data/fetchers'async function getMarketplaceCategories() {const client = createMarketplaceClient()diff --git a/apps/studio/data/marketplace/integrations-query.ts b/apps/studio/data/marketplace/integrations-query.tsindex 7aedbd00e35..6114ed024c1 100644--- a/apps/studio/data/marketplace/integrations-query.ts+++ b/apps/studio/data/marketplace/integrations-query.ts@@ -1,8 +1,8 @@import { queryOptions } from '@tanstack/react-query'-import { handleError } from 'data/fetchers'import { marketplaceIntegrationsKeys } from './keys'import { createMarketplaceClient } from './marketplace-client'+import { handleError } from '@/data/fetchers'async function getMarketplaceIntegrations() {const client = createMarketplaceClient()diff --git a/apps/studio/data/materialized-views/materialized-views-query.ts b/apps/studio/data/materialized-views/materialized-views-query.tsindex 353e0eba606..a627b5d71b4 100644--- a/apps/studio/data/materialized-views/materialized-views-query.ts+++ b/apps/studio/data/materialized-views/materialized-views-query.ts@@ -1,10 +1,10 @@-import { useQuery } from '@tanstack/react-query'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { PostgresMaterializedView } from '@supabase/postgres-meta'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { useQuery } from '@tanstack/react-query'+import { materializedViewKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type MaterializedViewsVariables = {projectRef?: stringdiff --git a/apps/studio/data/misc/audit-login-mutation.ts b/apps/studio/data/misc/audit-login-mutation.tsindex 780fefae075..edd5f5f32ac 100644--- a/apps/studio/data/misc/audit-login-mutation.ts+++ b/apps/studio/data/misc/audit-login-mutation.ts@@ -2,8 +2,8 @@ import * as Sentry from '@sentry/nextjs'import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export async function addLoginEvent() {const { error } = await post('/platform/profile/audit-login')diff --git a/apps/studio/data/misc/cli-release-version-query.ts b/apps/studio/data/misc/cli-release-version-query.tsindex 653a4f2e31d..04c8b40de22 100644--- a/apps/studio/data/misc/cli-release-version-query.ts+++ b/apps/studio/data/misc/cli-release-version-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { fetchHandler } from 'data/fetchers'-import { BASE_PATH, IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { miscKeys } from './keys'+import { fetchHandler } from '@/data/fetchers'+import { BASE_PATH, IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getCLIReleaseVersion() {try {diff --git a/apps/studio/data/misc/clock-skew-query.ts b/apps/studio/data/misc/clock-skew-query.tsindex a2a0ef5c8d6..47c105ff8cf 100644--- a/apps/studio/data/misc/clock-skew-query.ts+++ b/apps/studio/data/misc/clock-skew-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { fetchHandler } from 'data/fetchers'-import { BASE_PATH, IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { miscKeys } from './keys'+import { fetchHandler } from '@/data/fetchers'+import { BASE_PATH, IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'// Warn if the clock skew is greater than 2 minutesconst CLOCK_SKEW_THRESHOLD = 2 * 60 * 1000diff --git a/apps/studio/data/misc/get-default-region-query.ts b/apps/studio/data/misc/get-default-region-query.tsindex c178769745d..98e5be1c18e 100644--- a/apps/studio/data/misc/get-default-region-query.ts+++ b/apps/studio/data/misc/get-default-region-query.ts@@ -1,17 +1,17 @@import { useQuery } from '@tanstack/react-query'-import { useFlag } from 'common'-import { COUNTRY_LAT_LON } from 'components/interfaces/ProjectCreation/ProjectCreation.constants'-import {- AWS_REGIONS_COORDINATES,- FLY_REGIONS_COORDINATES,-} from 'components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'-import { fetchHandler } from 'data/fetchers'-import { getDistanceLatLonKM, tryParseJson } from 'lib/helpers'import type { CloudProvider } from 'shared-data'import { AWS_REGIONS, FLY_REGIONS } from 'shared-data'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { miscKeys } from './keys'+import { COUNTRY_LAT_LON } from '@/components/interfaces/ProjectCreation/ProjectCreation.constants'+import {+ AWS_REGIONS_COORDINATES,+ FLY_REGIONS_COORDINATES,+} from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'+import { fetchHandler } from '@/data/fetchers'+import { getDistanceLatLonKM, tryParseJson } from '@/lib/helpers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DefaultRegionVariables = {cloudProvider?: CloudProviderdiff --git a/apps/studio/data/misc/reset-password-mutation.ts b/apps/studio/data/misc/reset-password-mutation.tsindex 3fc03ce8fef..7bca4412655 100644--- a/apps/studio/data/misc/reset-password-mutation.ts+++ b/apps/studio/data/misc/reset-password-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import { captureCriticalError } from 'lib/error-reporting'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import { captureCriticalError } from '@/lib/error-reporting'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ResetPasswordVariables = {email: stringdiff --git a/apps/studio/data/misc/signup-mutation.ts b/apps/studio/data/misc/signup-mutation.tsindex bb06a6a82d7..7a03dbadb5e 100644--- a/apps/studio/data/misc/signup-mutation.ts+++ b/apps/studio/data/misc/signup-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import { captureCriticalError } from 'lib/error-reporting'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import { captureCriticalError } from '@/lib/error-reporting'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SignUpVariables = {email: stringdiff --git a/apps/studio/data/misc/user-ip-address-query.ts b/apps/studio/data/misc/user-ip-address-query.tsindex 20233f6f345..8a5d9d7b618 100644--- a/apps/studio/data/misc/user-ip-address-query.ts+++ b/apps/studio/data/misc/user-ip-address-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { fetchHandler } from 'data/fetchers'-import { BASE_PATH, IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { miscKeys } from './keys'+import { fetchHandler } from '@/data/fetchers'+import { BASE_PATH, IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getUserIPAddress() {try {diff --git a/apps/studio/data/network-restrictions/network-restrictions-query.ts b/apps/studio/data/network-restrictions/network-restrictions-query.tsindex 7337ef6f481..b67d55a19fd 100644--- a/apps/studio/data/network-restrictions/network-restrictions-query.ts+++ b/apps/studio/data/network-restrictions/network-restrictions-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'import { networkRestrictionKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type NetworkRestrictionsVariables = { projectRef?: string }diff --git a/apps/studio/data/network-restrictions/network-retrictions-apply-mutation.ts b/apps/studio/data/network-restrictions/network-retrictions-apply-mutation.tsindex 48b69f79e33..3c3b33a4141 100644--- a/apps/studio/data/network-restrictions/network-retrictions-apply-mutation.ts+++ b/apps/studio/data/network-restrictions/network-retrictions-apply-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { networkRestrictionKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type NetworkRestrictionsApplyVariables = {projectRef: stringdiff --git a/apps/studio/data/notifications/notifications-v2-archive-all-mutation.ts b/apps/studio/data/notifications/notifications-v2-archive-all-mutation.tsindex 781c446c681..5a69b77fc0f 100644--- a/apps/studio/data/notifications/notifications-v2-archive-all-mutation.ts+++ b/apps/studio/data/notifications/notifications-v2-archive-all-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { notificationKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export async function archiveAllNotifications() {const { data, error } = await patch('/platform/notifications/archive-all', {diff --git a/apps/studio/data/notifications/notifications-v2-query.ts b/apps/studio/data/notifications/notifications-v2-query.tsindex b79ebf6cc90..df16871bc93 100644--- a/apps/studio/data/notifications/notifications-v2-query.ts+++ b/apps/studio/data/notifications/notifications-v2-query.ts@@ -1,9 +1,9 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import { notificationKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'const NOTIFICATIONS_PAGE_LIMIT = 10diff --git a/apps/studio/data/notifications/notifications-v2-summary-query.ts b/apps/studio/data/notifications/notifications-v2-summary-query.tsindex 489e89d7641..c66e9fa7092 100644--- a/apps/studio/data/notifications/notifications-v2-summary-query.ts+++ b/apps/studio/data/notifications/notifications-v2-summary-query.ts@@ -1,9 +1,9 @@import type { Notification } from '@supabase/shared-types/out/notifications'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { notificationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type NotificationsResponse = Notification[]diff --git a/apps/studio/data/notifications/notifications-v2-update-mutation.ts b/apps/studio/data/notifications/notifications-v2-update-mutation.tsindex 4e4586c2cfc..50e739fc3a8 100644--- a/apps/studio/data/notifications/notifications-v2-update-mutation.ts+++ b/apps/studio/data/notifications/notifications-v2-update-mutation.ts@@ -1,8 +1,8 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type NotificationsUpdateVariables = {ids: string[]diff --git a/apps/studio/data/oauth-custom-providers/oauth-custom-provider-delete-mutation.ts b/apps/studio/data/oauth-custom-providers/oauth-custom-provider-delete-mutation.tsindex 7777eacf1d5..218c9956c8c 100644--- a/apps/studio/data/oauth-custom-providers/oauth-custom-provider-delete-mutation.ts+++ b/apps/studio/data/oauth-custom-providers/oauth-custom-provider-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { useAuthConfigQuery } from '../auth/auth-config-query'-import { useProjectApiUrl } from '../config/project-endpoint-query'import { oAuthCustomProvidersKeys } from './keys'+import { useAuthConfigQuery } from '@/data/auth/auth-config-query'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { handleError } from '@/data/fetchers'import { createProjectSupabaseClient } from '@/lib/project-supabase-client'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/oauth-custom-providers/oauth-custom-providers-query.ts b/apps/studio/data/oauth-custom-providers/oauth-custom-providers-query.tsindex 047619c8648..1a8966e0852 100644--- a/apps/studio/data/oauth-custom-providers/oauth-custom-providers-query.ts+++ b/apps/studio/data/oauth-custom-providers/oauth-custom-providers-query.ts@@ -1,8 +1,8 @@import { AuthError, type CustomOAuthProvider } from '@supabase/auth-js'import { useQuery } from '@tanstack/react-query'-import { useAuthConfigQuery } from '../auth/auth-config-query'import { oAuthCustomProvidersKeys } from './keys'+import { useAuthConfigQuery } from '@/data/auth/auth-config-query'import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { handleError } from '@/data/fetchers'import { createProjectSupabaseClient } from '@/lib/project-supabase-client'diff --git a/apps/studio/data/oauth-secrets/client-secret-create-mutation.ts b/apps/studio/data/oauth-secrets/client-secret-create-mutation.tsindex 8a6bede51e3..13518fcce3c 100644--- a/apps/studio/data/oauth-secrets/client-secret-create-mutation.ts+++ b/apps/studio/data/oauth-secrets/client-secret-create-mutation.ts@@ -1,8 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { clientSecretKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ClientSecretCreateVariables = {slug: stringdiff --git a/apps/studio/data/oauth-secrets/client-secret-delete-mutation.ts b/apps/studio/data/oauth-secrets/client-secret-delete-mutation.tsindex 1fb503cfb87..075c1c9cdbd 100644--- a/apps/studio/data/oauth-secrets/client-secret-delete-mutation.ts+++ b/apps/studio/data/oauth-secrets/client-secret-delete-mutation.ts@@ -1,8 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { del, handleError } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { clientSecretKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ClientSecretDeleteVariables = {slug: stringdiff --git a/apps/studio/data/oauth-secrets/client-secrets-query.ts b/apps/studio/data/oauth-secrets/client-secrets-query.tsindex 4d509d25fa7..a957883840b 100644--- a/apps/studio/data/oauth-secrets/client-secrets-query.ts+++ b/apps/studio/data/oauth-secrets/client-secrets-query.ts@@ -1,10 +1,9 @@import { useQuery } from '@tanstack/react-query'+import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { clientSecretKeys } from './keys'--import { components } from 'api-types'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type Secret =components['schemas']['ListOAuthAppClientSecretsResponse']['client_secrets'][0] & {diff --git a/apps/studio/data/oauth-server-apps/oauth-server-app-create-mutation.ts b/apps/studio/data/oauth-server-apps/oauth-server-app-create-mutation.tsindex e3b1fc0dffa..b30a09a4e75 100644--- a/apps/studio/data/oauth-server-apps/oauth-server-app-create-mutation.ts+++ b/apps/studio/data/oauth-server-apps/oauth-server-app-create-mutation.ts@@ -2,10 +2,10 @@ import { CreateOAuthClientParams } from '@supabase/supabase-js'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError } from 'data/fetchers'-import { createProjectSupabaseClient } from 'lib/project-supabase-client'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthServerAppKeys } from './keys'+import { handleError } from '@/data/fetchers'+import { createProjectSupabaseClient } from '@/lib/project-supabase-client'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OAuthServerAppCreateVariables = CreateOAuthClientParams & {projectRef: string | undefineddiff --git a/apps/studio/data/oauth-server-apps/oauth-server-app-delete-mutation.ts b/apps/studio/data/oauth-server-apps/oauth-server-app-delete-mutation.tsindex ec82f0b146c..c044854b98b 100644--- a/apps/studio/data/oauth-server-apps/oauth-server-app-delete-mutation.ts+++ b/apps/studio/data/oauth-server-apps/oauth-server-app-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError } from 'data/fetchers'-import { createProjectSupabaseClient } from 'lib/project-supabase-client'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthServerAppKeys } from './keys'+import { handleError } from '@/data/fetchers'+import { createProjectSupabaseClient } from '@/lib/project-supabase-client'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OAuthServerAppDeleteVariables = {clientId: string | undefineddiff --git a/apps/studio/data/oauth-server-apps/oauth-server-app-regenerate-secret-mutation.ts b/apps/studio/data/oauth-server-apps/oauth-server-app-regenerate-secret-mutation.tsindex 62f5a2e2647..2f947ec1df9 100644--- a/apps/studio/data/oauth-server-apps/oauth-server-app-regenerate-secret-mutation.ts+++ b/apps/studio/data/oauth-server-apps/oauth-server-app-regenerate-secret-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError } from 'data/fetchers'-import { createProjectSupabaseClient } from 'lib/project-supabase-client'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthServerAppKeys } from './keys'+import { handleError } from '@/data/fetchers'+import { createProjectSupabaseClient } from '@/lib/project-supabase-client'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OAuthServerAppRegenerateSecretVariables = {projectRef: string | undefineddiff --git a/apps/studio/data/oauth-server-apps/oauth-server-app-update-mutation.ts b/apps/studio/data/oauth-server-apps/oauth-server-app-update-mutation.tsindex 282205d7eb6..a42158f7f6a 100644--- a/apps/studio/data/oauth-server-apps/oauth-server-app-update-mutation.ts+++ b/apps/studio/data/oauth-server-apps/oauth-server-app-update-mutation.ts@@ -2,10 +2,10 @@ import { UpdateOAuthClientParams } from '@supabase/supabase-js'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError } from 'data/fetchers'-import { createProjectSupabaseClient } from 'lib/project-supabase-client'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthServerAppKeys } from './keys'+import { handleError } from '@/data/fetchers'+import { createProjectSupabaseClient } from '@/lib/project-supabase-client'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OAuthServerAppUpdateVariables = UpdateOAuthClientParams & {clientId: string | undefineddiff --git a/apps/studio/data/oauth-server-apps/oauth-server-apps-query.ts b/apps/studio/data/oauth-server-apps/oauth-server-apps-query.tsindex 20d75cdb457..f062fb3cf7c 100644--- a/apps/studio/data/oauth-server-apps/oauth-server-apps-query.ts+++ b/apps/studio/data/oauth-server-apps/oauth-server-apps-query.ts@@ -1,12 +1,12 @@import { useQuery } from '@tanstack/react-query'import { components } from 'api-types'-import { useProjectApiUrl } from 'data/config/project-endpoint-query'-import { handleError } from 'data/fetchers'-import { createProjectSupabaseClient } from 'lib/project-supabase-client'-import type { ResponseError, UseCustomQueryOptions } from 'types'-import { useAuthConfigQuery } from '../auth/auth-config-query'import { oauthServerAppKeys } from './keys'+import { useAuthConfigQuery } from '@/data/auth/auth-config-query'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'+import { handleError } from '@/data/fetchers'+import { createProjectSupabaseClient } from '@/lib/project-supabase-client'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OAuthServerAppsVariables = {projectRef: string | undefineddiff --git a/apps/studio/data/oauth/authorized-app-revoke-mutation.ts b/apps/studio/data/oauth/authorized-app-revoke-mutation.tsindex 75f071e7850..81bf5771417 100644--- a/apps/studio/data/oauth/authorized-app-revoke-mutation.ts+++ b/apps/studio/data/oauth/authorized-app-revoke-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthAppKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type AuthorizedAppRevokeVariables = {id: stringdiff --git a/apps/studio/data/oauth/authorized-apps-query.ts b/apps/studio/data/oauth/authorized-apps-query.tsindex ae2e87a1f10..1fc461ac775 100644--- a/apps/studio/data/oauth/authorized-apps-query.ts+++ b/apps/studio/data/oauth/authorized-apps-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { oauthAppKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type AuthorizedAppsVariables = {slug?: stringdiff --git a/apps/studio/data/oauth/oauth-app-create-mutation.ts b/apps/studio/data/oauth/oauth-app-create-mutation.tsindex 74b0e6c4cc6..e3324b65421 100644--- a/apps/studio/data/oauth/oauth-app-create-mutation.ts+++ b/apps/studio/data/oauth/oauth-app-create-mutation.ts@@ -1,11 +1,11 @@import type { OAuthScope } from '@supabase/shared-types/out/constants'import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthAppKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OAuthAppCreateVariables = {slug: stringdiff --git a/apps/studio/data/oauth/oauth-app-delete-mutation.ts b/apps/studio/data/oauth/oauth-app-delete-mutation.tsindex 8f0a2806c35..b9a862e6ca1 100644--- a/apps/studio/data/oauth/oauth-app-delete-mutation.ts+++ b/apps/studio/data/oauth/oauth-app-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthAppKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OAuthAppDeleteVariables = {id: stringdiff --git a/apps/studio/data/oauth/oauth-app-update-mutation.ts b/apps/studio/data/oauth/oauth-app-update-mutation.tsindex 230c1038663..9341f8482d1 100644--- a/apps/studio/data/oauth/oauth-app-update-mutation.ts+++ b/apps/studio/data/oauth/oauth-app-update-mutation.ts@@ -2,9 +2,9 @@ import type { OAuthScope } from '@supabase/shared-types/out/constants'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, put } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { oauthAppKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OAuthAppUpdateVariables = {id: stringdiff --git a/apps/studio/data/oauth/oauth-apps-query.ts b/apps/studio/data/oauth/oauth-apps-query.tsindex fe63efbc855..de6868e9caf 100644--- a/apps/studio/data/oauth/oauth-apps-query.ts+++ b/apps/studio/data/oauth/oauth-apps-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { oauthAppKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OAuthAppsVariables = {slug?: stringdiff --git a/apps/studio/data/open-api/api-spec-query.ts b/apps/studio/data/open-api/api-spec-query.tsindex b8f2a470fdc..68beb94d13d 100644--- a/apps/studio/data/open-api/api-spec-query.ts+++ b/apps/studio/data/open-api/api-spec-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { openApiKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OpenAPISpecVariables = {projectRef?: stringdiff --git a/apps/studio/data/organization-members/organization-invitation-accept-mutation.ts b/apps/studio/data/organization-members/organization-invitation-accept-mutation.tsindex 09764fb4ed3..c15e19deea5 100644--- a/apps/studio/data/organization-members/organization-invitation-accept-mutation.ts+++ b/apps/studio/data/organization-members/organization-invitation-accept-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import { invalidateOrganizationsQuery } from 'data/organizations/organizations-query'-import { useInvalidateProjectsInfiniteQuery } from 'data/projects/org-projects-infinite-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import { invalidateOrganizationsQuery } from '@/data/organizations/organizations-query'+import { useInvalidateProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationAcceptInvitationVariables = {slug: stringdiff --git a/apps/studio/data/organization-members/organization-invitation-create-mutation.ts b/apps/studio/data/organization-members/organization-invitation-create-mutation.tsindex 9ec3765845f..f28af34d4a0 100644--- a/apps/studio/data/organization-members/organization-invitation-create-mutation.ts+++ b/apps/studio/data/organization-members/organization-invitation-create-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import { organizationKeys as organizationKeysV1 } from 'data/organizations/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import { organizationKeys as organizationKeysV1 } from '@/data/organizations/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationCreateInvitationVariables = {slug: stringdiff --git a/apps/studio/data/organization-members/organization-invitation-delete-mutation.ts b/apps/studio/data/organization-members/organization-invitation-delete-mutation.tsindex 30382c0e918..9c6938290f6 100644--- a/apps/studio/data/organization-members/organization-invitation-delete-mutation.ts+++ b/apps/studio/data/organization-members/organization-invitation-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'-import { organizationKeys as organizationKeysV1 } from '../organizations/keys'import { organizationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import { organizationKeys as organizationKeysV1 } from '@/data/organizations/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationDeleteInvitationVariables = {slug: stringdiff --git a/apps/studio/data/organization-members/organization-invitation-token-query.ts b/apps/studio/data/organization-members/organization-invitation-token-query.tsindex 5d59fb11a4f..d61011de3cc 100644--- a/apps/studio/data/organization-members/organization-invitation-token-query.ts+++ b/apps/studio/data/organization-members/organization-invitation-token-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationInviteTokenVariables = { slug?: string; token?: string }diff --git a/apps/studio/data/organization-members/organization-member-role-assign-mutation.ts b/apps/studio/data/organization-members/organization-member-role-assign-mutation.tsindex 690b962cbb4..1efe6dbaf5b 100644--- a/apps/studio/data/organization-members/organization-member-role-assign-mutation.ts+++ b/apps/studio/data/organization-members/organization-member-role-assign-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, patch } from 'data/fetchers'-import { organizationKeys as organizationKeysV1 } from 'data/organizations/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import { organizationKeys as organizationKeysV1 } from '@/data/organizations/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationMemberAssignRoleVariables = {slug: stringdiff --git a/apps/studio/data/organization-members/organization-member-role-unassign-mutation.ts b/apps/studio/data/organization-members/organization-member-role-unassign-mutation.tsindex a7afc010eb3..97b37644cfa 100644--- a/apps/studio/data/organization-members/organization-member-role-unassign-mutation.ts+++ b/apps/studio/data/organization-members/organization-member-role-unassign-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import { organizationKeys as organizationKeysV1 } from 'data/organizations/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import { organizationKeys as organizationKeysV1 } from '@/data/organizations/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationMemberUnassignRoleVariables = {slug: stringdiff --git a/apps/studio/data/organization-members/organization-member-role-update-mutation.ts b/apps/studio/data/organization-members/organization-member-role-update-mutation.tsindex a964d973783..76ce35270ab 100644--- a/apps/studio/data/organization-members/organization-member-role-update-mutation.ts+++ b/apps/studio/data/organization-members/organization-member-role-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, put } from 'data/fetchers'-import { organizationKeys as organizationKeysV1 } from 'data/organizations/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import { organizationKeys as organizationKeysV1 } from '@/data/organizations/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationMemberUpdateRoleVariables = {slug: stringdiff --git a/apps/studio/data/organization-members/organization-roles-query.ts b/apps/studio/data/organization-members/organization-roles-query.tsindex 0f74e49260e..da13eed6d78 100644--- a/apps/studio/data/organization-members/organization-roles-query.ts+++ b/apps/studio/data/organization-members/organization-roles-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export const FIXED_ROLE_ORDER = ['Owner', 'Administrator', 'Developer', 'Read-only']export type OrganizationRolesVariables = { slug?: string }diff --git a/apps/studio/data/organizations/free-project-limit-check-query.ts b/apps/studio/data/organizations/free-project-limit-check-query.tsindex cbe0e24118e..b1e58bc9458 100644--- a/apps/studio/data/organizations/free-project-limit-check-query.ts+++ b/apps/studio/data/organizations/free-project-limit-check-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'+import { organizationKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type MemberWithFreeProjectLimit = components['schemas']['MemberWithFreeProjectLimit']diff --git a/apps/studio/data/organizations/organization-audit-logs-query.ts b/apps/studio/data/organizations/organization-audit-logs-query.tsindex 23d6368a052..2737a6803e1 100644--- a/apps/studio/data/organizations/organization-audit-logs-query.ts+++ b/apps/studio/data/organizations/organization-audit-logs-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type AuditLog = {action: {diff --git a/apps/studio/data/organizations/organization-available-regions-query.ts b/apps/studio/data/organizations/organization-available-regions-query.tsindex a07be137b65..0c7ec9ec51b 100644--- a/apps/studio/data/organizations/organization-available-regions-query.ts+++ b/apps/studio/data/organizations/organization-available-regions-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'import type { operations } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DesiredInstanceSizeForAvailableRegions =operations['ProjectsController_getRegions']['parameters']['query']['desired_instance_size']diff --git a/apps/studio/data/organizations/organization-billing-subscription-preview.ts b/apps/studio/data/organizations/organization-billing-subscription-preview.tsindex de845902c8f..8707b68abb7 100644--- a/apps/studio/data/organizations/organization-billing-subscription-preview.ts+++ b/apps/studio/data/organizations/organization-billing-subscription-preview.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'-import type { SubscriptionTier } from 'data/subscriptions/types'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { SubscriptionTier } from '@/data/subscriptions/types'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationBillingSubscriptionPreviewVariables = {organizationSlug?: stringdiff --git a/apps/studio/data/organizations/organization-create-mutation.ts b/apps/studio/data/organizations/organization-create-mutation.tsindex acb1058db3c..522ff8bbbff 100644--- a/apps/studio/data/organizations/organization-create-mutation.ts+++ b/apps/studio/data/organizations/organization-create-mutation.ts@@ -1,12 +1,12 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import { permissionKeys } from 'data/permissions/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'import { castOrganizationResponseToOrganization } from './organizations-query'import type { CustomerAddress, CustomerTaxId } from './types'+import { handleError, post } from '@/data/fetchers'+import { permissionKeys } from '@/data/permissions/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationCreateVariables = {name: stringdiff --git a/apps/studio/data/organizations/organization-credit-code-redemption-mutation.ts b/apps/studio/data/organizations/organization-credit-code-redemption-mutation.tsindex daf36dd9e8b..a6d9abf6d13 100644--- a/apps/studio/data/organizations/organization-credit-code-redemption-mutation.ts+++ b/apps/studio/data/organizations/organization-credit-code-redemption-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'-import { subscriptionKeys } from '../subscriptions/keys'import { organizationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import { subscriptionKeys } from '@/data/subscriptions/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationCreditCodeRedemptionVariables = {code: stringdiff --git a/apps/studio/data/organizations/organization-credit-top-up-mutation.ts b/apps/studio/data/organizations/organization-credit-top-up-mutation.tsindex b39996ab60f..88264c9896b 100644--- a/apps/studio/data/organizations/organization-credit-top-up-mutation.ts+++ b/apps/studio/data/organizations/organization-credit-top-up-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import type { CustomerAddress, CustomerTaxId } from './types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationCreditTopUpVariables = {payment_method_id: stringdiff --git a/apps/studio/data/organizations/organization-customer-profile-query.ts b/apps/studio/data/organizations/organization-customer-profile-query.tsindex 9c5f927c046..9966011f9a1 100644--- a/apps/studio/data/organizations/organization-customer-profile-query.ts+++ b/apps/studio/data/organizations/organization-customer-profile-query.ts@@ -1,11 +1,11 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useQuery } from '@tanstack/react-query'-import { IS_PLATFORM } from 'common'-import { get, handleError } from 'data/fetchers'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationCustomerProfileVariables = {slug?: stringdiff --git a/apps/studio/data/organizations/organization-customer-profile-update-mutation.ts b/apps/studio/data/organizations/organization-customer-profile-update-mutation.tsindex bc7507948ca..0448d3b153a 100644--- a/apps/studio/data/organizations/organization-customer-profile-update-mutation.ts+++ b/apps/studio/data/organizations/organization-customer-profile-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, put } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'import type { CustomerAddress } from './types'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationCustomerProfileUpdateVariables = {slug?: stringdiff --git a/apps/studio/data/organizations/organization-delete-mutation.ts b/apps/studio/data/organizations/organization-delete-mutation.tsindex d825d20b937..dee44dbaca0 100644--- a/apps/studio/data/organizations/organization-delete-mutation.ts+++ b/apps/studio/data/organizations/organization-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import { permissionKeys } from 'data/permissions/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import { permissionKeys } from '@/data/permissions/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationDeleteVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.ts b/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.tsindex 79e3cbd7671..481ed87d549 100644--- a/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.ts+++ b/apps/studio/data/organizations/organization-link-aws-marketplace-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from '../../types'-import { handleError, put } from '../fetchers'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationLinkAwsMarketplaceVariables = {buyerId: stringdiff --git a/apps/studio/data/organizations/organization-member-delete-mutation.ts b/apps/studio/data/organizations/organization-member-delete-mutation.tsindex cdff3635248..ad54d84a927 100644--- a/apps/studio/data/organizations/organization-member-delete-mutation.ts+++ b/apps/studio/data/organizations/organization-member-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationMemberDeleteVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-members-query.ts b/apps/studio/data/organizations/organization-members-query.tsindex 6cc5cf0edf7..f31414b0385 100644--- a/apps/studio/data/organizations/organization-members-query.ts+++ b/apps/studio/data/organizations/organization-members-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { organizationKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationMembersVariables = {slug?: stringdiff --git a/apps/studio/data/organizations/organization-mfa-mutation.ts b/apps/studio/data/organizations/organization-mfa-mutation.tsindex b07fbb5c666..5eb95001d2a 100644--- a/apps/studio/data/organizations/organization-mfa-mutation.ts+++ b/apps/studio/data/organizations/organization-mfa-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationMfaToggleVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-mfa-query.ts b/apps/studio/data/organizations/organization-mfa-query.tsindex cd847011bb9..dc6e2d790ab 100644--- a/apps/studio/data/organizations/organization-mfa-query.ts+++ b/apps/studio/data/organizations/organization-mfa-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationMfaVariables = {slug?: stringdiff --git a/apps/studio/data/organizations/organization-payment-method-default-mutation.ts b/apps/studio/data/organizations/organization-payment-method-default-mutation.tsindex a513308853c..516f287a702 100644--- a/apps/studio/data/organizations/organization-payment-method-default-mutation.ts+++ b/apps/studio/data/organizations/organization-payment-method-default-mutation.ts@@ -1,8 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, put } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { organizationKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationPaymentMethodDefaultVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-payment-method-delete-mutation.ts b/apps/studio/data/organizations/organization-payment-method-delete-mutation.tsindex 628f0c79047..2d435d95513 100644--- a/apps/studio/data/organizations/organization-payment-method-delete-mutation.ts+++ b/apps/studio/data/organizations/organization-payment-method-delete-mutation.ts@@ -1,8 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { del, handleError } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { organizationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationPaymentMethodDeleteVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-payment-method-setup-intent-mutation.ts b/apps/studio/data/organizations/organization-payment-method-setup-intent-mutation.tsindex fc1a245d289..52684b83c3d 100644--- a/apps/studio/data/organizations/organization-payment-method-setup-intent-mutation.ts+++ b/apps/studio/data/organizations/organization-payment-method-setup-intent-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationPaymentMethodSetupIntentVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-payment-methods-query.ts b/apps/studio/data/organizations/organization-payment-methods-query.tsindex f346893e6fd..e6a3b7b68fd 100644--- a/apps/studio/data/organizations/organization-payment-methods-query.ts+++ b/apps/studio/data/organizations/organization-payment-methods-query.ts@@ -1,11 +1,11 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationPaymentMethodsVariables = { slug?: string }export type OrganizationPaymentMethod = components['schemas']['PaymentsResponse']['data'][0]diff --git a/apps/studio/data/organizations/organization-project-claim-mutation.ts b/apps/studio/data/organizations/organization-project-claim-mutation.tsindex 3598be82d21..977485fc6e0 100644--- a/apps/studio/data/organizations/organization-project-claim-mutation.ts+++ b/apps/studio/data/organizations/organization-project-claim-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type OrganizationProjectClaimVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-project-claim-query.ts b/apps/studio/data/organizations/organization-project-claim-query.tsindex 7b86012b2a8..b1b43aa108f 100644--- a/apps/studio/data/organizations/organization-project-claim-query.ts+++ b/apps/studio/data/organizations/organization-project-claim-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type OrganizationProjectClaimVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organization-query.ts b/apps/studio/data/organizations/organization-query.tsindex 0a8e75fcda1..c515a22a2e6 100644--- a/apps/studio/data/organizations/organization-query.ts+++ b/apps/studio/data/organizations/organization-query.ts@@ -1,9 +1,9 @@import { QueryClient, useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationVariables = { slug?: string }export type OrganizationDetail = components['schemas']['OrganizationSlugResponse']diff --git a/apps/studio/data/organizations/organization-tax-id-query.ts b/apps/studio/data/organizations/organization-tax-id-query.tsindex 19e148b9ebc..fa8c22cab6b 100644--- a/apps/studio/data/organizations/organization-tax-id-query.ts+++ b/apps/studio/data/organizations/organization-tax-id-query.ts@@ -1,11 +1,11 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationTaxIdVariables = {slug?: stringdiff --git a/apps/studio/data/organizations/organization-tax-id-update-mutation.ts b/apps/studio/data/organizations/organization-tax-id-update-mutation.tsindex 29d1d121c22..cc2bd622998 100644--- a/apps/studio/data/organizations/organization-tax-id-update-mutation.ts+++ b/apps/studio/data/organizations/organization-tax-id-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError, put } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'import { invalidateOrganizationsQuery } from './organizations-query'+import { del, handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationTaxIdUpdateVariables = {slug?: stringdiff --git a/apps/studio/data/organizations/organization-update-mutation.ts b/apps/studio/data/organizations/organization-update-mutation.tsindex 272d332bd43..4812facaca7 100644--- a/apps/studio/data/organizations/organization-update-mutation.ts+++ b/apps/studio/data/organizations/organization-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { organizationKeys } from './keys'+import type { components } from '@/data/api'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OrganizationUpdateVariables = {slug: stringdiff --git a/apps/studio/data/organizations/organizations-query.ts b/apps/studio/data/organizations/organizations-query.tsindex 88c29412143..0837935eb2d 100644--- a/apps/studio/data/organizations/organizations-query.ts+++ b/apps/studio/data/organizations/organizations-query.ts@@ -1,11 +1,11 @@import { QueryClient, useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { MANAGED_BY, ManagedBy } from 'lib/constants/infrastructure'-import { useProfile } from 'lib/profile'-import type { Organization, ResponseError, UseCustomQueryOptions } from 'types'+import { organizationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { MANAGED_BY, ManagedBy } from '@/lib/constants/infrastructure'+import { useProfile } from '@/lib/profile'+import type { Organization, ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationBase = components['schemas']['OrganizationResponse']diff --git a/apps/studio/data/organizations/request-upgrade-mutation.ts b/apps/studio/data/organizations/request-upgrade-mutation.tsindex 89c8f137e11..e5849904623 100644--- a/apps/studio/data/organizations/request-upgrade-mutation.ts+++ b/apps/studio/data/organizations/request-upgrade-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlanRequest = components['schemas']['RequestUpgradeBody']['requested_plan']diff --git a/apps/studio/data/partners/stripe-projects-query.ts b/apps/studio/data/partners/stripe-projects-query.tsindex acbaf67fe35..05afed1fe82 100644--- a/apps/studio/data/partners/stripe-projects-query.ts+++ b/apps/studio/data/partners/stripe-projects-query.ts@@ -1,8 +1,8 @@import { queryOptions } from '@tanstack/react-query'import type { components } from 'api-types'-import { get, handleError } from '../fetchers'import { stripeProjectsKeys } from './keys'+import { get, handleError } from '@/data/fetchers'type GetAccountRequestVariables = {arId?: stringdiff --git a/apps/studio/data/permissions/permissions-query.ts b/apps/studio/data/permissions/permissions-query.tsindex 6e47549e96b..8102973331f 100644--- a/apps/studio/data/permissions/permissions-query.ts+++ b/apps/studio/data/permissions/permissions-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { useIsLoggedIn } from 'common'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { Permission, ResponseError, UseCustomQueryOptions } from 'types'+import { permissionKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { Permission, ResponseError, UseCustomQueryOptions } from '@/types'export type PermissionsResponse = Permission[]diff --git a/apps/studio/data/platform-apps/platform-app-create-mutation.ts b/apps/studio/data/platform-apps/platform-app-create-mutation.tsindex 0417a80a22e..14cda9c0ec3 100644--- a/apps/studio/data/platform-apps/platform-app-create-mutation.ts+++ b/apps/studio/data/platform-apps/platform-app-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { platformAppKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlatformAppCreateVariables = {slug: stringdiff --git a/apps/studio/data/platform-apps/platform-app-delete-mutation.ts b/apps/studio/data/platform-apps/platform-app-delete-mutation.tsindex 23e5eb584e9..3763aa3390c 100644--- a/apps/studio/data/platform-apps/platform-app-delete-mutation.ts+++ b/apps/studio/data/platform-apps/platform-app-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { del, handleError } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { platformAppKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlatformAppDeleteVariables = {slug: stringdiff --git a/apps/studio/data/platform-apps/platform-app-installation-create-mutation.ts b/apps/studio/data/platform-apps/platform-app-installation-create-mutation.tsindex baf11daab6e..89193f14f8d 100644--- a/apps/studio/data/platform-apps/platform-app-installation-create-mutation.ts+++ b/apps/studio/data/platform-apps/platform-app-installation-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { platformAppKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlatformAppInstallationCreateVariables = {slug: stringdiff --git a/apps/studio/data/platform-apps/platform-app-installation-delete-mutation.ts b/apps/studio/data/platform-apps/platform-app-installation-delete-mutation.tsindex ed125331c8b..6133ebad6cf 100644--- a/apps/studio/data/platform-apps/platform-app-installation-delete-mutation.ts+++ b/apps/studio/data/platform-apps/platform-app-installation-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { platformAppKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlatformAppInstallationDeleteVariables = {slug: stringdiff --git a/apps/studio/data/platform-apps/platform-app-installations-query.ts b/apps/studio/data/platform-apps/platform-app-installations-query.tsindex ff14590e4b5..474674eb3d2 100644--- a/apps/studio/data/platform-apps/platform-app-installations-query.ts+++ b/apps/studio/data/platform-apps/platform-app-installations-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { platformAppKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type PlatformAppInstallation =components['schemas']['ListPlatformAppInstallationsResponse']['installations'][number]diff --git a/apps/studio/data/platform-apps/platform-app-query.ts b/apps/studio/data/platform-apps/platform-app-query.tsindex b464061cd5e..7a226300070 100644--- a/apps/studio/data/platform-apps/platform-app-query.ts+++ b/apps/studio/data/platform-apps/platform-app-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'api-types'-import { constructHeaders, fetchHandler, handleError } from 'data/fetchers'-import { API_URL } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { platformAppKeys } from './keys'+import { constructHeaders, fetchHandler, handleError } from '@/data/fetchers'+import { API_URL } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type PlatformAppVariables = {slug?: stringdiff --git a/apps/studio/data/platform-apps/platform-app-signing-key-create-mutation.ts b/apps/studio/data/platform-apps/platform-app-signing-key-create-mutation.tsindex c3319dc78e7..faf36964333 100644--- a/apps/studio/data/platform-apps/platform-app-signing-key-create-mutation.ts+++ b/apps/studio/data/platform-apps/platform-app-signing-key-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { platformAppKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlatformAppSigningKeyCreateVariables = {slug: stringdiff --git a/apps/studio/data/platform-apps/platform-app-signing-key-delete-mutation.ts b/apps/studio/data/platform-apps/platform-app-signing-key-delete-mutation.tsindex 6a3b05a8605..73287f7b625 100644--- a/apps/studio/data/platform-apps/platform-app-signing-key-delete-mutation.ts+++ b/apps/studio/data/platform-apps/platform-app-signing-key-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { platformAppKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlatformAppSigningKeyDeleteVariables = {slug: stringdiff --git a/apps/studio/data/platform-apps/platform-app-update-mutation.ts b/apps/studio/data/platform-apps/platform-app-update-mutation.tsindex c3136879f29..d86991d3d97 100644--- a/apps/studio/data/platform-apps/platform-app-update-mutation.ts+++ b/apps/studio/data/platform-apps/platform-app-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { platformAppKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PlatformAppUpdateVariables = {slug: stringdiff --git a/apps/studio/data/platform-apps/platform-apps-query.ts b/apps/studio/data/platform-apps/platform-apps-query.tsindex 48b33f922aa..5beb64e8c47 100644--- a/apps/studio/data/platform-apps/platform-apps-query.ts+++ b/apps/studio/data/platform-apps/platform-apps-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { platformAppKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type PlatformAppsVariables = {slug?: stringdiff --git a/apps/studio/data/platform/incident-status-query.ts b/apps/studio/data/platform/incident-status-query.tsindex 3c5ce76b8dd..42c6c627259 100644--- a/apps/studio/data/platform/incident-status-query.ts+++ b/apps/studio/data/platform/incident-status-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import type { IncidentInfo } from 'lib/api/incident-status'-import { BASE_PATH, IS_PLATFORM, IS_TEST_ENV } from 'lib/constants'import { partition } from 'lodash'-import { ResponseError, UseCustomQueryOptions } from 'types'import { platformKeys } from './keys'+import type { IncidentInfo } from '@/lib/api/incident-status'+import { BASE_PATH, IS_PLATFORM, IS_TEST_ENV } from '@/lib/constants'+import { ResponseError, UseCustomQueryOptions } from '@/types'export async function getIncidentStatus(signal?: AbortSignaldiff --git a/apps/studio/data/platform/incident-status-utils.ts b/apps/studio/data/platform/incident-status-utils.tsindex 7c9400d56e6..1f53e041c7a 100644--- a/apps/studio/data/platform/incident-status-utils.ts+++ b/apps/studio/data/platform/incident-status-utils.ts@@ -1,4 +1,4 @@-import type { IncidentInfo } from 'lib/api/incident-status'+import type { IncidentInfo } from '@/lib/api/incident-status'export type IncidentImpact = 'critical' | 'major' | 'maintenance' | 'minor' | 'none'diff --git a/apps/studio/data/prefetchers/project.$ref.editor.$id.tsx b/apps/studio/data/prefetchers/project.$ref.editor.$id.tsxindex 439376bb5b4..1fc93b80c9c 100644--- a/apps/studio/data/prefetchers/project.$ref.editor.$id.tsx+++ b/apps/studio/data/prefetchers/project.$ref.editor.$id.tsx@@ -1,22 +1,22 @@import { QueryClient, useQueryClient } from '@tanstack/react-query'+import { useRouter } from 'next/router'+import { PropsWithChildren, useCallback } from 'react'++import PrefetchableLink, { PrefetchableLinkProps } from './PrefetchableLink'import {formatFilterURLParams,formatSortURLParams,loadTableEditorStateFromLocalStorage,parseSupaTable,-} from 'components/grid/SupabaseGrid.utils'-import { Filter, Sort } from 'components/grid/types'-import { prefetchTableEditor } from 'data/table-editor/table-editor-query'-import { prefetchTableRows } from 'data/table-rows/table-rows-query'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { RoleImpersonationState } from 'lib/role-impersonation'-import { useRouter } from 'next/router'-import { PropsWithChildren, useCallback } from 'react'-import { useRoleImpersonationStateSnapshot } from 'state/role-impersonation-state'-import { TABLE_EDITOR_DEFAULT_ROWS_PER_PAGE } from 'state/table-editor'--import { useConnectionStringForReadOps } from '../read-replicas/replicas-query'-import PrefetchableLink, { PrefetchableLinkProps } from './PrefetchableLink'+} from '@/components/grid/SupabaseGrid.utils'+import { Filter, Sort } from '@/components/grid/types'+import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'+import { prefetchTableEditor } from '@/data/table-editor/table-editor-query'+import { prefetchTableRows } from '@/data/table-rows/table-rows-query'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { RoleImpersonationState } from '@/lib/role-impersonation'+import { useRoleImpersonationStateSnapshot } from '@/state/role-impersonation-state'+import { TABLE_EDITOR_DEFAULT_ROWS_PER_PAGE } from '@/state/table-editor'interface PrefetchEditorTablePageArgs {queryClient: QueryClientdiff --git a/apps/studio/data/prefetchers/project.$ref.editor.tsx b/apps/studio/data/prefetchers/project.$ref.editor.tsxindex 8efc57ea3c2..032eae9be7d 100644--- a/apps/studio/data/prefetchers/project.$ref.editor.tsx+++ b/apps/studio/data/prefetchers/project.$ref.editor.tsx@@ -2,12 +2,12 @@ import { useQueryClient } from '@tanstack/react-query'import { useRouter } from 'next/router'import { PropsWithChildren, useCallback } from 'react'-import { prefetchSchemas } from 'data/database/schemas-query'-import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'-import { prefetchEntityTypes } from 'data/entity-types/entity-types-infinite-query'-import { useLocalStorage } from 'hooks/misc/useLocalStorage'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import PrefetchableLink, { PrefetchableLinkProps } from './PrefetchableLink'+import { prefetchSchemas } from '@/data/database/schemas-query'+import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'+import { prefetchEntityTypes } from '@/data/entity-types/entity-types-infinite-query'+import { useLocalStorage } from '@/hooks/misc/useLocalStorage'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'export function usePrefetchEditorIndexPage() {const router = useRouter()diff --git a/apps/studio/data/prefetchers/project.$ref.tsx b/apps/studio/data/prefetchers/project.$ref.tsxindex 8709c0f2d6d..b16b34a5d39 100644--- a/apps/studio/data/prefetchers/project.$ref.tsx+++ b/apps/studio/data/prefetchers/project.$ref.tsx@@ -2,8 +2,8 @@ import { useQueryClient } from '@tanstack/react-query'import { useRouter } from 'next/router'import { PropsWithChildren, useCallback } from 'react'-import { prefetchProjectDetail } from 'data/projects/project-detail-query'import PrefetchableLink, { PrefetchableLinkProps } from './PrefetchableLink'+import { prefetchProjectDetail } from '@/data/projects/project-detail-query'export function usePrefetchProjectIndexPage() {const router = useRouter()diff --git a/apps/studio/data/privileges/column-privileges-grant-mutation.ts b/apps/studio/data/privileges/column-privileges-grant-mutation.tsindex 412b9950c97..3935b54a45e 100644--- a/apps/studio/data/privileges/column-privileges-grant-mutation.ts+++ b/apps/studio/data/privileges/column-privileges-grant-mutation.ts@@ -1,9 +1,10 @@import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { privilegeKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ColumnPrivilegesGrant = {column_id: stringdiff --git a/apps/studio/data/privileges/column-privileges-query.ts b/apps/studio/data/privileges/column-privileges-query.tsindex 7f9ec099832..7b829c21a1a 100644--- a/apps/studio/data/privileges/column-privileges-query.ts+++ b/apps/studio/data/privileges/column-privileges-query.ts@@ -1,10 +1,10 @@+import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { useQuery } from '@tanstack/react-query'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { privilegeKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ColumnPrivilegesVariables = {projectRef?: stringdiff --git a/apps/studio/data/privileges/column-privileges-revoke-mutation.ts b/apps/studio/data/privileges/column-privileges-revoke-mutation.tsindex 578f5d25da6..325e493bdbe 100644--- a/apps/studio/data/privileges/column-privileges-revoke-mutation.ts+++ b/apps/studio/data/privileges/column-privileges-revoke-mutation.ts@@ -1,9 +1,10 @@import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { privilegeKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ColumnPrivilegesRevoke = {column_id: stringdiff --git a/apps/studio/data/privileges/default-privileges-query.ts b/apps/studio/data/privileges/default-privileges-query.tsindex b19629d309a..ef97028a392 100644--- a/apps/studio/data/privileges/default-privileges-query.ts+++ b/apps/studio/data/privileges/default-privileges-query.ts@@ -1,9 +1,9 @@import { getDefaultPrivilegesStateSql } from '@supabase/pg-meta'import { queryOptions } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError } from 'types'import { privilegeKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError } from '@/types'export type DefaultPrivilegesVariables = {projectRef?: stringdiff --git a/apps/studio/data/privileges/exposed-function-counts-query.ts b/apps/studio/data/privileges/exposed-function-counts-query.tsindex e00bb38de04..4798a046c18 100644--- a/apps/studio/data/privileges/exposed-function-counts-query.ts+++ b/apps/studio/data/privileges/exposed-function-counts-query.ts@@ -1,10 +1,10 @@import { getExposedFunctionCountsSql } from '@supabase/pg-meta'import { queryOptions } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError } from 'types'import { privilegeKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'+import type { ResponseError } from '@/types'const IGNORED_SCHEMAS = [...INTERNAL_SCHEMAS, 'pg_catalog']diff --git a/apps/studio/data/privileges/exposed-functions-infinite-query.ts b/apps/studio/data/privileges/exposed-functions-infinite-query.tsindex d60ab94988b..eba84d07ba8 100644--- a/apps/studio/data/privileges/exposed-functions-infinite-query.ts+++ b/apps/studio/data/privileges/exposed-functions-infinite-query.ts@@ -1,10 +1,10 @@import { getExposedFunctionsSql } from '@supabase/pg-meta'import { infiniteQueryOptions } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError } from 'types'import { privilegeKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'+import type { ResponseError } from '@/types'export const IGNORED_SCHEMAS = [...INTERNAL_SCHEMAS, 'pg_catalog']export const EXPOSED_FUNCTIONS_PAGE_LIMIT = 50diff --git a/apps/studio/data/privileges/exposed-table-counts-query.ts b/apps/studio/data/privileges/exposed-table-counts-query.tsindex b86711d90f3..721f25aee8e 100644--- a/apps/studio/data/privileges/exposed-table-counts-query.ts+++ b/apps/studio/data/privileges/exposed-table-counts-query.ts@@ -1,10 +1,10 @@import { getExposedTableCountsSql } from '@supabase/pg-meta'import { queryOptions } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError } from 'types'import { privilegeKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'+import type { ResponseError } from '@/types'const IGNORED_SCHEMAS = [...INTERNAL_SCHEMAS, 'pg_catalog']diff --git a/apps/studio/data/privileges/exposed-tables-infinite-query.ts b/apps/studio/data/privileges/exposed-tables-infinite-query.tsindex e9ddbb4b917..407fbce4a78 100644--- a/apps/studio/data/privileges/exposed-tables-infinite-query.ts+++ b/apps/studio/data/privileges/exposed-tables-infinite-query.ts@@ -1,10 +1,10 @@import { getExposedTablesSql } from '@supabase/pg-meta'import { infiniteQueryOptions } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError } from 'types'import { privilegeKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'+import type { ResponseError } from '@/types'const IGNORED_SCHEMAS = [...INTERNAL_SCHEMAS, 'pg_catalog']export const EXPOSED_TABLES_PAGE_LIMIT = 50diff --git a/apps/studio/data/privileges/table-api-access-mutation.ts b/apps/studio/data/privileges/table-api-access-mutation.tsindex 8b49714e4b4..7c242fd87fe 100644--- a/apps/studio/data/privileges/table-api-access-mutation.ts+++ b/apps/studio/data/privileges/table-api-access-mutation.ts@@ -2,17 +2,17 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'+import { invalidateTablePrivilegesQuery } from './table-privileges-query'+import type { ConnectionVars } from '@/data/common.types'+import { lintKeys } from '@/data/lint/keys'+import { executeSql } from '@/data/sql/execute-sql-query'import {API_ACCESS_ROLES,API_PRIVILEGE_TYPES,type ApiPrivilegesByRole,} from '@/lib/data-api-types'import type { DeepReadonly } from '@/lib/type-helpers'-import { executeSql } from 'data/sql/execute-sql-query'-import type { UseCustomMutationOptions } from 'types'-import type { ConnectionVars } from '../common.types'-import { lintKeys } from '../lint/keys'-import { invalidateTablePrivilegesQuery } from './table-privileges-query'+import type { UseCustomMutationOptions } from '@/types'export type TableApiAccessPrivilegesVariables = ConnectionVars & {relationId: numberdiff --git a/apps/studio/data/privileges/table-api-access-query.ts b/apps/studio/data/privileges/table-api-access-query.tsindex ee7e9a03770..3a18e128a51 100644--- a/apps/studio/data/privileges/table-api-access-query.ts+++ b/apps/studio/data/privileges/table-api-access-query.ts@@ -1,15 +1,15 @@-import type { ConnectionVars } from 'data/common.types'-import { useIsSchemaExposed } from 'hooks/misc/useIsSchemaExposed'-import { isApiAccessRole, isApiPrivilegeType, type ApiPrivilegesByRole } from 'lib/data-api-types'-import type { Prettify } from 'lib/type-helpers'import { useMemo } from 'react'-import type { UseCustomQueryOptions } from 'types'import {useTablePrivilegesQuery,type TablePrivilegesData,type TablePrivilegesError,} from './table-privileges-query'+import type { ConnectionVars } from '@/data/common.types'+import { useIsSchemaExposed } from '@/hooks/misc/useIsSchemaExposed'+import { isApiAccessRole, isApiPrivilegeType, type ApiPrivilegesByRole } from '@/lib/data-api-types'+import type { Prettify } from '@/lib/type-helpers'+import type { UseCustomQueryOptions } from '@/types'// The contents of this array are never used, so any will allow// it to be used anywhere an array of any type is required.diff --git a/apps/studio/data/privileges/table-privileges-grant-mutation.ts b/apps/studio/data/privileges/table-privileges-grant-mutation.tsindex 321d97a3609..6724d49f3ea 100644--- a/apps/studio/data/privileges/table-privileges-grant-mutation.ts+++ b/apps/studio/data/privileges/table-privileges-grant-mutation.ts@@ -2,10 +2,10 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { privilegeKeys } from './keys'import { invalidateTablePrivilegesQuery } from './table-privileges-query'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TablePrivilegesGrant = Parameters<typeof pgMeta.tablePrivileges.grantdiff --git a/apps/studio/data/privileges/table-privileges-query.ts b/apps/studio/data/privileges/table-privileges-query.tsindex 3bbaf06676e..2266b8cdafd 100644--- a/apps/studio/data/privileges/table-privileges-query.ts+++ b/apps/studio/data/privileges/table-privileges-query.ts@@ -2,9 +2,9 @@ import pgMeta from '@supabase/pg-meta'import { QueryClient, useQuery } from '@tanstack/react-query'import { z } from 'zod'-import { executeSql, ExecuteSqlError } from 'data/sql/execute-sql-query'-import { UseCustomQueryOptions } from 'types'import { privilegeKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type TablePrivilegesVariables = {projectRef?: stringdiff --git a/apps/studio/data/privileges/table-privileges-revoke-mutation.ts b/apps/studio/data/privileges/table-privileges-revoke-mutation.tsindex bd886179f39..127eda11859 100644--- a/apps/studio/data/privileges/table-privileges-revoke-mutation.ts+++ b/apps/studio/data/privileges/table-privileges-revoke-mutation.ts@@ -2,10 +2,10 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { privilegeKeys } from './keys'import { invalidateTablePrivilegesQuery } from './table-privileges-query'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TablePrivilegesRevoke = Parameters<typeof pgMeta.tablePrivileges.revokediff --git a/apps/studio/data/privileges/update-default-privileges-mutation.ts b/apps/studio/data/privileges/update-default-privileges-mutation.tsindex 13588674a56..585f514fafa 100644--- a/apps/studio/data/privileges/update-default-privileges-mutation.ts+++ b/apps/studio/data/privileges/update-default-privileges-mutation.ts@@ -1,10 +1,10 @@import { buildDefaultPrivilegesSql } from '@supabase/pg-meta'import { useMutation } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { UseCustomMutationOptions } from 'types'-import type { ConnectionVars } from '../common.types'+import type { ConnectionVars } from '@/data/common.types'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { UseCustomMutationOptions } from '@/types'export type UpdateDefaultPrivilegesVariables = ConnectionVars & {granted: booleandiff --git a/apps/studio/data/privileges/update-exposed-entities-mutation.ts b/apps/studio/data/privileges/update-exposed-entities-mutation.tsindex 239cd80b3c8..7215d7a05de 100644--- a/apps/studio/data/privileges/update-exposed-entities-mutation.ts+++ b/apps/studio/data/privileges/update-exposed-entities-mutation.ts@@ -1,10 +1,10 @@import { buildFunctionPrivilegesSql, buildTablePrivilegesSql } from '@supabase/pg-meta'import { useMutation } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { UseCustomMutationOptions } from 'types'-import type { ConnectionVars } from '../common.types'+import type { ConnectionVars } from '@/data/common.types'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { UseCustomMutationOptions } from '@/types'export type UpdateExposedEntitiesVariables = ConnectionVars & {tableIdsToAdd: number[]diff --git a/apps/studio/data/profile/mfa-authenticator-assurance-level-query.ts b/apps/studio/data/profile/mfa-authenticator-assurance-level-query.tsindex 5e7a797c36d..a450b619ac8 100644--- a/apps/studio/data/profile/mfa-authenticator-assurance-level-query.ts+++ b/apps/studio/data/profile/mfa-authenticator-assurance-level-query.ts@@ -1,9 +1,10 @@import type { AuthMFAGetAuthenticatorAssuranceLevelResponse } from '@supabase/supabase-js'import { useQuery } from '@tanstack/react-query'-import { auth } from 'lib/gotrue'+import { profileKeys } from './keys'import type { Profile } from './types'-import { UseCustomQueryOptions } from 'types'+import { auth } from '@/lib/gotrue'+import { UseCustomQueryOptions } from '@/types'export type ProfileResponse = Profilediff --git a/apps/studio/data/profile/mfa-challenge-and-verify-mutation.ts b/apps/studio/data/profile/mfa-challenge-and-verify-mutation.tsindex 8b2d62fcec6..01f03752c64 100644--- a/apps/studio/data/profile/mfa-challenge-and-verify-mutation.ts+++ b/apps/studio/data/profile/mfa-challenge-and-verify-mutation.ts@@ -2,10 +2,10 @@ import type { AuthMFAVerifyResponse, MFAChallengeAndVerifyParams } from '@supabaimport { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { captureCriticalError } from 'lib/error-reporting'-import { auth } from 'lib/gotrue'import { profileKeys } from './keys'-import { UseCustomMutationOptions } from 'types'+import { captureCriticalError } from '@/lib/error-reporting'+import { auth } from '@/lib/gotrue'+import { UseCustomMutationOptions } from '@/types'interface MFAChallengeAndVerifyVariables extends MFAChallengeAndVerifyParams {refreshFactors?: booleandiff --git a/apps/studio/data/profile/mfa-enroll-mutation.ts b/apps/studio/data/profile/mfa-enroll-mutation.tsindex 31cc58291f4..e62cf54bfb7 100644--- a/apps/studio/data/profile/mfa-enroll-mutation.ts+++ b/apps/studio/data/profile/mfa-enroll-mutation.ts@@ -1,8 +1,9 @@import type { AuthMFAEnrollResponse, MFAEnrollParams } from '@supabase/supabase-js'import { useMutation } from '@tanstack/react-query'-import { auth } from 'lib/gotrue'import { toast } from 'sonner'-import { UseCustomMutationOptions } from 'types'++import { auth } from '@/lib/gotrue'+import { UseCustomMutationOptions } from '@/types'const mfaEnroll = async (params: MFAEnrollParams) => {const { error, data } = await auth.mfa.enroll(params)diff --git a/apps/studio/data/profile/mfa-list-factors-query.ts b/apps/studio/data/profile/mfa-list-factors-query.tsindex fd234db75de..f73e1df1f9c 100644--- a/apps/studio/data/profile/mfa-list-factors-query.ts+++ b/apps/studio/data/profile/mfa-list-factors-query.ts@@ -1,8 +1,9 @@import type { AuthMFAListFactorsResponse, Factor } from '@supabase/supabase-js'import { useQuery } from '@tanstack/react-query'-import { auth } from 'lib/gotrue'+import { profileKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { auth } from '@/lib/gotrue'+import { UseCustomQueryOptions } from '@/types'export async function getMfaListFactors() {const { error, data } = await auth.mfa.listFactors()diff --git a/apps/studio/data/profile/mfa-unenroll-mutation.ts b/apps/studio/data/profile/mfa-unenroll-mutation.tsindex fa6d206ff0b..81378edc69e 100644--- a/apps/studio/data/profile/mfa-unenroll-mutation.ts+++ b/apps/studio/data/profile/mfa-unenroll-mutation.ts@@ -1,9 +1,10 @@import type { AuthMFAUnenrollResponse, MFAUnenrollParams } from '@supabase/supabase-js'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { auth } from 'lib/gotrue'import { toast } from 'sonner'+import { profileKeys } from './keys'-import { UseCustomMutationOptions } from 'types'+import { auth } from '@/lib/gotrue'+import { UseCustomMutationOptions } from '@/types'const mfaUnenroll = async (params: MFAUnenrollParams) => {const { error, data } = await auth.mfa.unenroll(params)diff --git a/apps/studio/data/profile/profile-audit-logs-query.ts b/apps/studio/data/profile/profile-audit-logs-query.tsindex 4164b00a51d..d7934289eb6 100644--- a/apps/studio/data/profile/profile-audit-logs-query.ts+++ b/apps/studio/data/profile/profile-audit-logs-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { AuditLog } from 'data/organizations/organization-audit-logs-query'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { profileKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { AuditLog } from '@/data/organizations/organization-audit-logs-query'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProfileAuditLogsVariables = {iso_timestamp_start: stringdiff --git a/apps/studio/data/profile/profile-create-mutation.ts b/apps/studio/data/profile/profile-create-mutation.tsindex 98809a35579..076adc4727a 100644--- a/apps/studio/data/profile/profile-create-mutation.ts+++ b/apps/studio/data/profile/profile-create-mutation.ts@@ -1,12 +1,12 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import { organizationKeys } from 'data/organizations/keys'-import { permissionKeys } from 'data/permissions/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { profileKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import { organizationKeys } from '@/data/organizations/keys'+import { permissionKeys } from '@/data/permissions/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProfileResponse = components['schemas']['ProfileResponse']diff --git a/apps/studio/data/profile/profile-identities-query.ts b/apps/studio/data/profile/profile-identities-query.tsindex 9c70a3ac0fb..f41bcd98ca8 100644--- a/apps/studio/data/profile/profile-identities-query.ts+++ b/apps/studio/data/profile/profile-identities-query.ts@@ -1,9 +1,9 @@import type { UserIdentity } from '@supabase/supabase-js'import { useQuery } from '@tanstack/react-query'-import { auth } from 'lib/gotrue'import { profileKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { auth } from '@/lib/gotrue'+import { UseCustomQueryOptions } from '@/types'export async function getProfileIdentities() {// getSession() uses a cached user object, which is almost never stale as thediff --git a/apps/studio/data/profile/profile-query.ts b/apps/studio/data/profile/profile-query.tsindex f7553f9b96b..122ce394d3c 100644--- a/apps/studio/data/profile/profile-query.ts+++ b/apps/studio/data/profile/profile-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { profileKeys } from './keys'import type { Profile } from './types'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getProfile(signal?: AbortSignal) {const { data, error } = await get('/platform/profile', {diff --git a/apps/studio/data/profile/profile-unlink-identity-mutation.ts b/apps/studio/data/profile/profile-unlink-identity-mutation.tsindex 4cbd42794fc..e5afc6e2694 100644--- a/apps/studio/data/profile/profile-unlink-identity-mutation.ts+++ b/apps/studio/data/profile/profile-unlink-identity-mutation.ts@@ -2,9 +2,9 @@ import type { UserIdentity } from '@supabase/supabase-js'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { auth } from 'lib/gotrue'-import { UseCustomMutationOptions } from 'types'import { profileKeys } from './keys'+import { auth } from '@/lib/gotrue'+import { UseCustomMutationOptions } from '@/types'const unlinkIdentity = async (identity: UserIdentity) => {const { error, data } = await auth.unlinkIdentity(identity)diff --git a/apps/studio/data/profile/profile-update-email-mutation.ts b/apps/studio/data/profile/profile-update-email-mutation.tsindex 8778d828de3..4ee47db4fad 100644--- a/apps/studio/data/profile/profile-update-email-mutation.ts+++ b/apps/studio/data/profile/profile-update-email-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, put } from 'data/fetchers'-import { auth } from 'lib/gotrue'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { profileKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import { auth } from '@/lib/gotrue'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EmailUpdateVariables = {email: stringdiff --git a/apps/studio/data/profile/profile-update-mutation.ts b/apps/studio/data/profile/profile-update-mutation.tsindex 39fb866292f..2964a9154aa 100644--- a/apps/studio/data/profile/profile-update-mutation.ts+++ b/apps/studio/data/profile/profile-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { profileKeys } from './keys'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProfileUpdateVariables = {firstName: stringdiff --git a/apps/studio/data/profile/types.ts b/apps/studio/data/profile/types.tsindex 0759884e697..0e5b4dbfdd3 100644--- a/apps/studio/data/profile/types.ts+++ b/apps/studio/data/profile/types.ts@@ -1,4 +1,4 @@-import type { components } from 'data/api'+import type { components } from '@/data/api'export type Profile = components['schemas']['ProfileResponse'] & {profileImageUrl?: stringdiff --git a/apps/studio/data/projects/clone-mutation.ts b/apps/studio/data/projects/clone-mutation.tsindex b68997edb96..a850bb0127e 100644--- a/apps/studio/data/projects/clone-mutation.ts+++ b/apps/studio/data/projects/clone-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { projectKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectCloneVariables = {projectRef: stringdiff --git a/apps/studio/data/projects/clone-query.ts b/apps/studio/data/projects/clone-query.tsindex fac667aad75..dc065238e46 100644--- a/apps/studio/data/projects/clone-query.ts+++ b/apps/studio/data/projects/clone-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { InfraInstanceSize } from 'components/interfaces/DiskManagement/DiskManagement.types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { projectKeys } from './keys'+import { InfraInstanceSize } from '@/components/interfaces/DiskManagement/DiskManagement.types'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getCloneBackups(projectRef?: string) {if (!projectRef) throw new Error('Project ref is required')diff --git a/apps/studio/data/projects/clone-status-query.ts b/apps/studio/data/projects/clone-status-query.tsindex 440083da2cb..97aa7b127a2 100644--- a/apps/studio/data/projects/clone-status-query.ts+++ b/apps/studio/data/projects/clone-status-query.ts@@ -1,8 +1,9 @@import { useQuery } from '@tanstack/react-query'import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type CloneStatus = components['schemas']['ProjectClonedStatusResponse']diff --git a/apps/studio/data/projects/new-project.constants.ts b/apps/studio/data/projects/new-project.constants.tsindex accac2b6757..3f67dd7e373 100644--- a/apps/studio/data/projects/new-project.constants.ts+++ b/apps/studio/data/projects/new-project.constants.ts@@ -1,5 +1,6 @@import { components } from 'api-types'-import { PROVIDERS } from 'lib/constants'++import { PROVIDERS } from '@/lib/constants'export type DesiredInstanceSize = Exclude<components['schemas']['CreateProjectBody']['desired_instance_size'],diff --git a/apps/studio/data/projects/org-projects-infinite-query.ts b/apps/studio/data/projects/org-projects-infinite-query.tsindex 02825fb2738..0fd14d17587 100644--- a/apps/studio/data/projects/org-projects-infinite-query.ts+++ b/apps/studio/data/projects/org-projects-infinite-query.ts@@ -1,11 +1,11 @@import { InfiniteData, useInfiniteQuery, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { useCallback } from 'react'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { useProfile } from 'lib/profile'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'import { INFINITE_PROJECTS_KEY_PREFIX, projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useProfile } from '@/lib/profile'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'// [Joshen] Try to keep this value a multiple of 6 (common denominator of 2 and 3) to fit the cards view// So that the last row will always be a full row of cards while there's a next pagediff --git a/apps/studio/data/projects/project-create-mutation.ts b/apps/studio/data/projects/project-create-mutation.tsindex 9c03c9412b3..3bd702726de 100644--- a/apps/studio/data/projects/project-create-mutation.ts+++ b/apps/studio/data/projects/project-create-mutation.ts@@ -1,13 +1,13 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, post } from 'data/fetchers'-import { PROVIDERS } from 'lib/constants'-import { captureCriticalError } from 'lib/error-reporting'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { DesiredInstanceSize, PostgresEngine, ReleaseChannel } from './new-project.constants'import { useInvalidateProjectsInfiniteQuery } from './org-projects-infinite-query'+import type { components } from '@/data/api'+import { handleError, post } from '@/data/fetchers'+import { PROVIDERS } from '@/lib/constants'+import { captureCriticalError } from '@/lib/error-reporting'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type CreateProjectBody = components['schemas']['CreateProjectBody']type CloudProvider = CreateProjectBody['cloud_provider']diff --git a/apps/studio/data/projects/project-delete-mutation.ts b/apps/studio/data/projects/project-delete-mutation.tsindex d54cbbdd85e..97fc816a1d7 100644--- a/apps/studio/data/projects/project-delete-mutation.ts+++ b/apps/studio/data/projects/project-delete-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import { organizationKeys } from 'data/organizations/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { projectKeys } from './keys'import { useInvalidateProjectsInfiniteQuery } from './org-projects-infinite-query'+import { del, handleError } from '@/data/fetchers'+import { organizationKeys } from '@/data/organizations/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/projects/project-detail-query.ts b/apps/studio/data/projects/project-detail-query.tsindex 195155bb520..06f5f8a2499 100644--- a/apps/studio/data/projects/project-detail-query.ts+++ b/apps/studio/data/projects/project-detail-query.ts@@ -1,11 +1,11 @@import { QueryClient, useQuery, useQueryClient } from '@tanstack/react-query'import { useCallback } from 'react'-import type { components } from 'data/api'-import { get, handleError, isValidConnString } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { projectKeys } from './keys'import { OrgProjectsResponse } from './org-projects-infinite-query'+import type { components } from '@/data/api'+import { get, handleError, isValidConnString } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ProjectDetailVariables = { ref?: string }export type ProjectDetail = components['schemas']['ProjectDetailResponse']diff --git a/apps/studio/data/projects/project-members-query.ts b/apps/studio/data/projects/project-members-query.tsindex 98564067792..c7706138472 100644--- a/apps/studio/data/projects/project-members-query.ts+++ b/apps/studio/data/projects/project-members-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectMembersVariables = {projectRef?: stringdiff --git a/apps/studio/data/projects/project-pause-mutation.ts b/apps/studio/data/projects/project-pause-mutation.tsindex 8f17f261c00..7e0390f7fdb 100644--- a/apps/studio/data/projects/project-pause-mutation.ts+++ b/apps/studio/data/projects/project-pause-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectPauseVariables = {ref: stringdiff --git a/apps/studio/data/projects/project-pause-status-query.ts b/apps/studio/data/projects/project-pause-status-query.tsindex 5297ffd73b1..63bd905b01e 100644--- a/apps/studio/data/projects/project-pause-status-query.ts+++ b/apps/studio/data/projects/project-pause-status-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectPauseStatusVariables = { ref?: string }diff --git a/apps/studio/data/projects/project-restart-mutation.ts b/apps/studio/data/projects/project-restart-mutation.tsindex 029d70a7fa1..6bf710ef77b 100644--- a/apps/studio/data/projects/project-restart-mutation.ts+++ b/apps/studio/data/projects/project-restart-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectRestartVariables = {ref: stringdiff --git a/apps/studio/data/projects/project-restart-services-mutation.ts b/apps/studio/data/projects/project-restart-services-mutation.tsindex 5fe3675a38c..3b92badff82 100644--- a/apps/studio/data/projects/project-restart-services-mutation.ts+++ b/apps/studio/data/projects/project-restart-services-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectRestartServicesVariables = {ref: stringdiff --git a/apps/studio/data/projects/project-restore-mutation.ts b/apps/studio/data/projects/project-restore-mutation.tsindex 01b276a5997..b42416972dd 100644--- a/apps/studio/data/projects/project-restore-mutation.ts+++ b/apps/studio/data/projects/project-restore-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { PostgresEngine, ReleaseChannel } from './new-project.constants'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectRestoreVariables = {ref: stringdiff --git a/apps/studio/data/projects/project-service-versions.ts b/apps/studio/data/projects/project-service-versions.tsindex 6411cf2f29f..d72c4b37d2d 100644--- a/apps/studio/data/projects/project-service-versions.ts+++ b/apps/studio/data/projects/project-service-versions.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectServiceVersionsVariables = {projectRef?: stringdiff --git a/apps/studio/data/projects/project-status-query.ts b/apps/studio/data/projects/project-status-query.tsindex 4da0f7cc4dd..d3cd3b534bc 100644--- a/apps/studio/data/projects/project-status-query.ts+++ b/apps/studio/data/projects/project-status-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectStatusVariables = {projectRef?: stringdiff --git a/apps/studio/data/projects/project-transfer-mutation.ts b/apps/studio/data/projects/project-transfer-mutation.tsindex 3e43619313e..4f8ebf62467 100644--- a/apps/studio/data/projects/project-transfer-mutation.ts+++ b/apps/studio/data/projects/project-transfer-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { projectKeys } from './keys'import { useInvalidateProjectsInfiniteQuery } from './org-projects-infinite-query'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectTransferVariables = {projectRef?: stringdiff --git a/apps/studio/data/projects/project-transfer-preview-query.ts b/apps/studio/data/projects/project-transfer-preview-query.tsindex 71624745a4d..6db3c4e4e66 100644--- a/apps/studio/data/projects/project-transfer-preview-query.ts+++ b/apps/studio/data/projects/project-transfer-preview-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'-import { UseCustomQueryOptions } from 'types'import { projectKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type ProjectTransferPreviewVariables = {projectRef?: stringdiff --git a/apps/studio/data/projects/project-type-generation-query.ts b/apps/studio/data/projects/project-type-generation-query.tsindex b1a43d0063d..55d58568a7e 100644--- a/apps/studio/data/projects/project-type-generation-query.ts+++ b/apps/studio/data/projects/project-type-generation-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type GenerateTypesVariables = { ref?: string; included_schemas?: string }diff --git a/apps/studio/data/projects/project-update-mutation.ts b/apps/studio/data/projects/project-update-mutation.tsindex bea6872408a..bd095e47344 100644--- a/apps/studio/data/projects/project-update-mutation.ts+++ b/apps/studio/data/projects/project-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { projectKeys } from './keys'import { useInvalidateProjectsInfiniteQuery } from './org-projects-infinite-query'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectUpdateVariables = {ref: stringdiff --git a/apps/studio/data/projects/project-upgrade-mutation.ts b/apps/studio/data/projects/project-upgrade-mutation.tsindex 0efdafe47fb..450a909f956 100644--- a/apps/studio/data/projects/project-upgrade-mutation.ts+++ b/apps/studio/data/projects/project-upgrade-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectUpgradeVariables = components['schemas']['UpgradeDatabaseBody'] & {ref: stringdiff --git a/apps/studio/data/projects/projects-infinite-query.ts b/apps/studio/data/projects/projects-infinite-query.tsindex f9d147350b6..fe114fa911e 100644--- a/apps/studio/data/projects/projects-infinite-query.ts+++ b/apps/studio/data/projects/projects-infinite-query.ts@@ -1,10 +1,10 @@import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { useProfile } from 'lib/profile'-import type { ResponseError, UseCustomInfiniteQueryOptions } from 'types'+import { projectKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useProfile } from '@/lib/profile'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'const DEFAULT_LIMIT = 100diff --git a/apps/studio/data/query-client.ts b/apps/studio/data/query-client.tsindex 3587efc7948..43306d39139 100644--- a/apps/studio/data/query-client.ts+++ b/apps/studio/data/query-client.ts@@ -1,9 +1,9 @@-import { QueryClient, onlineManager } from '@tanstack/react-query'+import { onlineManager, QueryClient } from '@tanstack/react-query'import { match } from 'path-to-regexp'import { useState } from 'react'-import { IS_PLATFORM } from 'lib/constants'-import { ResponseError } from 'types'+import { IS_PLATFORM } from '@/lib/constants'+import { ResponseError } from '@/types'// When running locally we don't need the internet// so we can pretend we're online all the timediff --git a/apps/studio/data/read-replicas/load-balancers-query.ts b/apps/studio/data/read-replicas/load-balancers-query.tsindex 321575a8bd4..e96fcaed7f9 100644--- a/apps/studio/data/read-replicas/load-balancers-query.ts+++ b/apps/studio/data/read-replicas/load-balancers-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { replicaKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type LoadBalancersVariables = {projectRef?: stringdiff --git a/apps/studio/data/read-replicas/replica-lag-query.ts b/apps/studio/data/read-replicas/replica-lag-query.tsindex b4ce270d565..c4a7460ad14 100644--- a/apps/studio/data/read-replicas/replica-lag-query.ts+++ b/apps/studio/data/read-replicas/replica-lag-query.ts@@ -1,9 +1,9 @@import { replicationLagSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { replicaKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'export type ReplicationLagVariables = {id: stringdiff --git a/apps/studio/data/read-replicas/replica-remove-mutation.ts b/apps/studio/data/read-replicas/replica-remove-mutation.tsindex ac563da61b5..a4b22c5ef7f 100644--- a/apps/studio/data/read-replicas/replica-remove-mutation.ts+++ b/apps/studio/data/read-replicas/replica-remove-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicaKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ReadReplicaRemoveVariables = {projectRef: stringdiff --git a/apps/studio/data/read-replicas/replica-setup-mutation.ts b/apps/studio/data/read-replicas/replica-setup-mutation.tsindex eac1d970fae..a01f7379a21 100644--- a/apps/studio/data/read-replicas/replica-setup-mutation.ts+++ b/apps/studio/data/read-replicas/replica-setup-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicaKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type Region =| 'us-east-1'diff --git a/apps/studio/data/read-replicas/replicas-query.ts b/apps/studio/data/read-replicas/replicas-query.tsindex a119c3b4853..0c98d03e3ed 100644--- a/apps/studio/data/read-replicas/replicas-query.ts+++ b/apps/studio/data/read-replicas/replicas-query.ts@@ -1,13 +1,13 @@import { useQuery } from '@tanstack/react-query'import { LOCAL_STORAGE_KEYS, useFeatureFlags, useFlag, useParams } from 'common'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { replicaKeys } from './keys'import { DashboardPreference } from '@/components/interfaces/Settings/General/DashboardPreferences'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export const MAX_REPLICAS_BELOW_XL = 2export const MAX_REPLICAS_ABOVE_XL = 5diff --git a/apps/studio/data/read-replicas/replicas-status-query.ts b/apps/studio/data/read-replicas/replicas-status-query.tsindex c815755af56..2db76aadc5f 100644--- a/apps/studio/data/read-replicas/replicas-status-query.ts+++ b/apps/studio/data/read-replicas/replicas-status-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { replicaKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'// [Joshen] Is it possible to import this from the code gen?// https://github.com/supabase/platform/blob/develop/api/src/routes/platform/projects/ref/databases-statuses.dto.ts#L7diff --git a/apps/studio/data/read-replicas/replicas.utils.ts b/apps/studio/data/read-replicas/replicas.utils.tsindex c80bc0454a1..9cd7118c3ed 100644--- a/apps/studio/data/read-replicas/replicas.utils.ts+++ b/apps/studio/data/read-replicas/replicas.utils.ts@@ -1,6 +1,7 @@-import { AVAILABLE_REPLICA_REGIONS } from 'components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'import { last } from 'lodash'+import { AVAILABLE_REPLICA_REGIONS } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'+export const formatDatabaseID = (id: string) => last(id.split('-') ?? [])export const formatDatabaseRegion = (region: string) =>diff --git a/apps/studio/data/realtime/realtime-config-mutation.ts b/apps/studio/data/realtime/realtime-config-mutation.tsindex 3aa6e0ef9e8..2490907577a 100644--- a/apps/studio/data/realtime/realtime-config-mutation.ts+++ b/apps/studio/data/realtime/realtime-config-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { realtimeKeys } from './keys'+import type { components } from '@/data/api'+import { handleError, patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type RealtimeConfigurationUpdateVariables = {ref: stringdiff --git a/apps/studio/data/realtime/realtime-config-query.ts b/apps/studio/data/realtime/realtime-config-query.tsindex 4867fadd241..bb68a9d72b9 100644--- a/apps/studio/data/realtime/realtime-config-query.ts+++ b/apps/studio/data/realtime/realtime-config-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { realtimeKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type RealtimeConfigurationVariables = {projectRef?: stringdiff --git a/apps/studio/data/replication/create-destination-pipeline-mutation.ts b/apps/studio/data/replication/create-destination-pipeline-mutation.tsindex 96e81175306..54f5cf9cf44 100644--- a/apps/studio/data/replication/create-destination-pipeline-mutation.ts+++ b/apps/studio/data/replication/create-destination-pipeline-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DestinationConfig =| {diff --git a/apps/studio/data/replication/create-tenant-source-mutation.ts b/apps/studio/data/replication/create-tenant-source-mutation.tsindex 49ee0e1a209..6854b9d738f 100644--- a/apps/studio/data/replication/create-tenant-source-mutation.ts+++ b/apps/studio/data/replication/create-tenant-source-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateTenantSourceParams = {projectRef: stringdiff --git a/apps/studio/data/replication/delete-destination-pipeline-mutation.ts b/apps/studio/data/replication/delete-destination-pipeline-mutation.tsindex 5ea5dfd66fb..ba7f545e45d 100644--- a/apps/studio/data/replication/delete-destination-pipeline-mutation.ts+++ b/apps/studio/data/replication/delete-destination-pipeline-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DeleteDestinationPipelineParams = {projectRef?: stringdiff --git a/apps/studio/data/replication/destination-by-id-query.ts b/apps/studio/data/replication/destination-by-id-query.tsindex 0fc48cc7471..214a7eba453 100644--- a/apps/studio/data/replication/destination-by-id-query.ts+++ b/apps/studio/data/replication/destination-by-id-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'import type { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { replicationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationDestinationByIdParams = { projectRef?: string; destinationId?: number | null }diff --git a/apps/studio/data/replication/destinations-query.ts b/apps/studio/data/replication/destinations-query.tsindex 961c49ebc7a..99d6a46d184 100644--- a/apps/studio/data/replication/destinations-query.ts+++ b/apps/studio/data/replication/destinations-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { replicationKeys } from './keys'import { checkReplicationFeatureFlagRetry } from './utils'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationDestinationsParams = { projectRef?: string }diff --git a/apps/studio/data/replication/pipeline-by-id-query.ts b/apps/studio/data/replication/pipeline-by-id-query.tsindex ca8c0cfcaea..d48b8fe23d6 100644--- a/apps/studio/data/replication/pipeline-by-id-query.ts+++ b/apps/studio/data/replication/pipeline-by-id-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { replicationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationPipelineByIdParams = { projectRef?: string; pipelineId?: number }diff --git a/apps/studio/data/replication/pipeline-replication-status-query.ts b/apps/studio/data/replication/pipeline-replication-status-query.tsindex 3074d629090..438cdcbbd1b 100644--- a/apps/studio/data/replication/pipeline-replication-status-query.ts+++ b/apps/studio/data/replication/pipeline-replication-status-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { replicationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationPipelineReplicationStatusParams = { projectRef?: string; pipelineId?: number }diff --git a/apps/studio/data/replication/pipeline-status-query.ts b/apps/studio/data/replication/pipeline-status-query.tsindex a3071d9a586..251cf223b95 100644--- a/apps/studio/data/replication/pipeline-status-query.ts+++ b/apps/studio/data/replication/pipeline-status-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { replicationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationPipelinesStatusParams = { projectRef?: string; pipelineId?: number }export type ReplicationPipelineStatusResponse =diff --git a/apps/studio/data/replication/pipeline-version-query.ts b/apps/studio/data/replication/pipeline-version-query.tsindex 024e2874040..3db8ec6a3d0 100644--- a/apps/studio/data/replication/pipeline-version-query.ts+++ b/apps/studio/data/replication/pipeline-version-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { replicationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationPipelineVersionParams = { projectRef?: string; pipelineId?: number }type ReplicationPipelineVersionResponse =diff --git a/apps/studio/data/replication/pipelines-query.ts b/apps/studio/data/replication/pipelines-query.tsindex 7d1074409e1..37bcdfd6d26 100644--- a/apps/studio/data/replication/pipelines-query.ts+++ b/apps/studio/data/replication/pipelines-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { replicationKeys } from './keys'import { checkReplicationFeatureFlagRetry } from './utils'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationPipelinesParams = { projectRef?: string }diff --git a/apps/studio/data/replication/publication-create-mutation.ts b/apps/studio/data/replication/publication-create-mutation.tsindex c8530d853f5..9b7745cf43f 100644--- a/apps/studio/data/replication/publication-create-mutation.ts+++ b/apps/studio/data/replication/publication-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreatePublicationParams = {projectRef: stringdiff --git a/apps/studio/data/replication/publication-delete-mutation.ts b/apps/studio/data/replication/publication-delete-mutation.tsindex 2457c0a3628..7ed2a6977af 100644--- a/apps/studio/data/replication/publication-delete-mutation.ts+++ b/apps/studio/data/replication/publication-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DeletePublicationParams = {projectRef?: stringdiff --git a/apps/studio/data/replication/publication-update-mutation.ts b/apps/studio/data/replication/publication-update-mutation.tsindex 7eb3789895e..e6ae588cf03 100644--- a/apps/studio/data/replication/publication-update-mutation.ts+++ b/apps/studio/data/replication/publication-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpdatePublicationParams = {projectRef: stringdiff --git a/apps/studio/data/replication/publications-query.ts b/apps/studio/data/replication/publications-query.tsindex e547fbda4a1..e71133add7a 100644--- a/apps/studio/data/replication/publications-query.ts+++ b/apps/studio/data/replication/publications-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { replicationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationPublicationsParams = { projectRef?: string; sourceId?: number }diff --git a/apps/studio/data/replication/restart-pipeline-helper.ts b/apps/studio/data/replication/restart-pipeline-helper.tsindex 75c5b022f29..ca429273e20 100644--- a/apps/studio/data/replication/restart-pipeline-helper.ts+++ b/apps/studio/data/replication/restart-pipeline-helper.ts@@ -1,5 +1,5 @@-import { useStopPipelineMutation } from './stop-pipeline-mutation'import { useStartPipelineMutation } from './start-pipeline-mutation'+import { useStopPipelineMutation } from './stop-pipeline-mutation'export interface RestartPipelineParams {projectRef: stringdiff --git a/apps/studio/data/replication/rollback-tables-mutation.ts b/apps/studio/data/replication/rollback-tables-mutation.tsindex 17407a3a1f1..c6a8b1676fd 100644--- a/apps/studio/data/replication/rollback-tables-mutation.ts+++ b/apps/studio/data/replication/rollback-tables-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'import { useRestartPipelineHelper } from './restart-pipeline-helper'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type RollbackType = 'individual' | 'full'diff --git a/apps/studio/data/replication/sources-query.ts b/apps/studio/data/replication/sources-query.tsindex 54e5a942980..1be9a53a848 100644--- a/apps/studio/data/replication/sources-query.ts+++ b/apps/studio/data/replication/sources-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { replicationKeys } from './keys'import { checkReplicationFeatureFlagRetry } from './utils'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationSourcesParams = { projectRef?: string }diff --git a/apps/studio/data/replication/start-pipeline-mutation.ts b/apps/studio/data/replication/start-pipeline-mutation.tsindex ffa74e096b8..b6dd879e14f 100644--- a/apps/studio/data/replication/start-pipeline-mutation.ts+++ b/apps/studio/data/replication/start-pipeline-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type StartPipelineParams = {projectRef: stringdiff --git a/apps/studio/data/replication/stop-pipeline-mutation.ts b/apps/studio/data/replication/stop-pipeline-mutation.tsindex 33a9e10af0c..a330c44cf06 100644--- a/apps/studio/data/replication/stop-pipeline-mutation.ts+++ b/apps/studio/data/replication/stop-pipeline-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type StopPipelineParams = {projectRef: stringdiff --git a/apps/studio/data/replication/tables-query.ts b/apps/studio/data/replication/tables-query.tsindex bcfa3a9f79e..27083a17bc7 100644--- a/apps/studio/data/replication/tables-query.ts+++ b/apps/studio/data/replication/tables-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { replicationKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type ReplicationTablesParams = { projectRef?: string; sourceId?: number }diff --git a/apps/studio/data/replication/update-destination-pipeline-mutation.ts b/apps/studio/data/replication/update-destination-pipeline-mutation.tsindex d86f1287d6a..ffe037226d0 100644--- a/apps/studio/data/replication/update-destination-pipeline-mutation.ts+++ b/apps/studio/data/replication/update-destination-pipeline-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { BatchConfig, DestinationConfig } from './create-destination-pipeline-mutation'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpdateDestinationPipelineParams = {destinationId: numberdiff --git a/apps/studio/data/replication/update-pipeline-version-mutation.ts b/apps/studio/data/replication/update-pipeline-version-mutation.tsindex ed679ddb976..3e08e9eb22f 100644--- a/apps/studio/data/replication/update-pipeline-version-mutation.ts+++ b/apps/studio/data/replication/update-pipeline-version-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { replicationKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type UpdatePipelineVersionParams = {projectRef: stringdiff --git a/apps/studio/data/replication/utils.ts b/apps/studio/data/replication/utils.tsindex 76d48cda2b1..bf493328fab 100644--- a/apps/studio/data/replication/utils.ts+++ b/apps/studio/data/replication/utils.ts@@ -1,5 +1,5 @@-import { MAX_RETRY_FAILURE_COUNT } from 'data/query-client'-import { ResponseError } from 'types'+import { MAX_RETRY_FAILURE_COUNT } from '@/data/query-client'+import { ResponseError } from '@/types'export const checkReplicationFeatureFlagRetry = (failureCount: number,diff --git a/apps/studio/data/replication/validate-destination-mutation.ts b/apps/studio/data/replication/validate-destination-mutation.tsindex 37c59fafde9..8668a337aa5 100644--- a/apps/studio/data/replication/validate-destination-mutation.ts+++ b/apps/studio/data/replication/validate-destination-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { DestinationConfig } from './create-destination-pipeline-mutation'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type ValidateDestinationParams = {projectRef: stringdiff --git a/apps/studio/data/replication/validate-pipeline-mutation.ts b/apps/studio/data/replication/validate-pipeline-mutation.tsindex a248559aecf..1c90216766b 100644--- a/apps/studio/data/replication/validate-pipeline-mutation.ts+++ b/apps/studio/data/replication/validate-pipeline-mutation.ts@@ -1,7 +1,8 @@import { useMutation } from '@tanstack/react-query'import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'++import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type ValidatePipelineParams = {projectRef: stringdiff --git a/apps/studio/data/reports/api-report-query.ts b/apps/studio/data/reports/api-report-query.tsindex 71142452755..102e9bcc467 100644--- a/apps/studio/data/reports/api-report-query.ts+++ b/apps/studio/data/reports/api-report-query.ts@@ -1,12 +1,12 @@+import { useParams } from 'common'import { isEqual } from 'lodash'import { useEffect, useState } from 'react'-import { useParams } from 'common'-import { PRESET_CONFIG } from 'components/interfaces/Reports/Reports.constants'-import { ReportFilterItem } from 'components/interfaces/Reports/Reports.types'-import { queriesFactory } from 'components/interfaces/Reports/Reports.utils'-import type { LogsEndpointParams } from 'components/interfaces/Settings/Logs/Logs.types'-import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'+import { PRESET_CONFIG } from '@/components/interfaces/Reports/Reports.constants'+import { ReportFilterItem } from '@/components/interfaces/Reports/Reports.types'+import { queriesFactory } from '@/components/interfaces/Reports/Reports.utils'+import type { LogsEndpointParams } from '@/components/interfaces/Settings/Logs/Logs.types'+import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'export const useApiReport = () => {const { ref: projectRef } = useParams()diff --git a/apps/studio/data/reports/database-charts.ts b/apps/studio/data/reports/database-charts.tsindex 8c3cdbea739..a29be6705ab 100644--- a/apps/studio/data/reports/database-charts.ts+++ b/apps/studio/data/reports/database-charts.ts@@ -1,11 +1,10 @@-import { compactNumberFormatter } from 'components/ui/Charts/Charts.utils'-import { ReportAttributes } from 'components/ui/Charts/ComposedChart.utils'-import { DOCS_URL } from 'lib/constants'-import { formatBytes } from 'lib/helpers'--import { DiskAttributesData } from '../config/disk-attributes-query'-import { MaxConnectionsData } from '../database/max-connections-query'-import { Project } from '../projects/project-detail-query'+import { compactNumberFormatter } from '@/components/ui/Charts/Charts.utils'+import { ReportAttributes } from '@/components/ui/Charts/ComposedChart.utils'+import { DiskAttributesData } from '@/data/config/disk-attributes-query'+import { MaxConnectionsData } from '@/data/database/max-connections-query'+import { Project } from '@/data/projects/project-detail-query'+import { DOCS_URL } from '@/lib/constants'+import { formatBytes } from '@/lib/helpers'export const getReportAttributesV2: (entitledFeatures: string[],diff --git a/apps/studio/data/reports/database-report-query.ts b/apps/studio/data/reports/database-report-query.tsindex b7c52d2fb06..e7d81c57ac7 100644--- a/apps/studio/data/reports/database-report-query.ts+++ b/apps/studio/data/reports/database-report-query.ts@@ -1,7 +1,8 @@import { useParams } from 'common'-import { PRESET_CONFIG } from 'components/interfaces/Reports/Reports.constants'-import { queriesFactory } from 'components/interfaces/Reports/Reports.utils'-import { DbQueryHook } from 'hooks/analytics/useDbQuery'++import { PRESET_CONFIG } from '@/components/interfaces/Reports/Reports.constants'+import { queriesFactory } from '@/components/interfaces/Reports/Reports.utils'+import { DbQueryHook } from '@/hooks/analytics/useDbQuery'export const useDatabaseReport = () => {const { ref: projectRef } = useParams()diff --git a/apps/studio/data/reports/report.utils.ts b/apps/studio/data/reports/report.utils.tsindex 12be4e71e32..409d233b4c8 100644--- a/apps/studio/data/reports/report.utils.ts+++ b/apps/studio/data/reports/report.utils.ts@@ -1,6 +1,6 @@-import { AnalyticsInterval } from 'data/analytics/constants'-import { useEdgeFunctionsQuery } from 'data/edge-functions/edge-functions-query'-import { get } from 'data/fetchers'+import { AnalyticsInterval } from '@/data/analytics/constants'+import { useEdgeFunctionsQuery } from '@/data/edge-functions/edge-functions-query'+import { get } from '@/data/fetchers'export type Granularity = 'minute' | 'hour' | 'day'export function analyticsIntervalToGranularity(interval: AnalyticsInterval): Granularity {diff --git a/apps/studio/data/reports/storage-report-query.ts b/apps/studio/data/reports/storage-report-query.tsindex f994fe6fd0a..de2add16889 100644--- a/apps/studio/data/reports/storage-report-query.ts+++ b/apps/studio/data/reports/storage-report-query.ts@@ -1,13 +1,12 @@+import { useParams } from 'common'import isEqual from 'lodash/isEqual'import { useEffect, useState } from 'react'-import { useParams } from 'common'-import { PRESET_CONFIG } from 'components/interfaces/Reports/Reports.constants'-import { ReportFilterItem } from 'components/interfaces/Reports/Reports.types'-import { queriesFactory } from 'components/interfaces/Reports/Reports.utils'-import { useDatabaseSelectorStateSnapshot } from 'state/database-selector'--import type { LogsEndpointParams } from 'components/interfaces/Settings/Logs/Logs.types'+import { PRESET_CONFIG } from '@/components/interfaces/Reports/Reports.constants'+import { ReportFilterItem } from '@/components/interfaces/Reports/Reports.types'+import { queriesFactory } from '@/components/interfaces/Reports/Reports.utils'+import type { LogsEndpointParams } from '@/components/interfaces/Settings/Logs/Logs.types'+import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'export const useStorageReport = () => {const { ref: projectRef } = useParams()diff --git a/apps/studio/data/reports/v2/auth-report.test.tsx b/apps/studio/data/reports/v2/auth-report.test.tsxindex 3a80edf7583..76b265abf8a 100644--- a/apps/studio/data/reports/v2/auth-report.test.tsx+++ b/apps/studio/data/reports/v2/auth-report.test.tsx@@ -1,4 +1,5 @@import { describe, expect, it } from 'vitest'+import { defaultAuthReportFormatter } from './auth.config'describe('defaultAuthReportFormatter', () => {diff --git a/apps/studio/data/reports/v2/auth.config.ts b/apps/studio/data/reports/v2/auth.config.tsindex bf0c4bc4af7..8ef1518e206 100644--- a/apps/studio/data/reports/v2/auth.config.ts+++ b/apps/studio/data/reports/v2/auth.config.ts@@ -1,17 +1,16 @@-import type { AnalyticsInterval } from 'data/analytics/constants'+import { AUTH_ERROR_CODES } from 'common/constants/auth-error-codes'+import z from 'zod'-import { analyticsIntervalToGranularity } from 'data/reports/report.utils'import { ReportConfig, ReportDataProviderAttribute } from './reports.types'-import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'-import { fetchLogs } from 'data/reports/report.utils'-import z from 'zod'import {extractStatusCodesFromData,generateStatusCodeAttributes,transformCategoricalCountData,transformStatusCodeData,-} from 'components/interfaces/Reports/Reports.utils'-import { AUTH_ERROR_CODES } from 'common/constants/auth-error-codes'+} from '@/components/interfaces/Reports/Reports.utils'+import { NumericFilter } from '@/components/interfaces/Reports/v2/ReportsNumericFilter'+import type { AnalyticsInterval } from '@/data/analytics/constants'+import { analyticsIntervalToGranularity, fetchLogs } from '@/data/reports/report.utils'const AUTH_ERROR_CODE_LIST = Object.entries(AUTH_ERROR_CODES).map(([key, value]) => ({key,diff --git a/apps/studio/data/reports/v2/edge-functions.config.ts b/apps/studio/data/reports/v2/edge-functions.config.tsindex 202e09ac1d9..16aba4cd97e 100644--- a/apps/studio/data/reports/v2/edge-functions.config.ts+++ b/apps/studio/data/reports/v2/edge-functions.config.ts@@ -1,21 +1,20 @@import dayjs from 'dayjs'-import {- isUnixMicro,- unixMicroToIsoTimestamp,-} from 'components/interfaces/Settings/Logs/Logs.utils'-import type { AnalyticsInterval } from 'data/analytics/constants'-import { get } from 'data/fetchers'-import { analyticsIntervalToGranularity } from 'data/reports/report.utils'import { ReportConfig } from './reports.types'-import { NumericFilter } from 'components/interfaces/Reports/v2/ReportsNumericFilter'-import { SelectFilters } from 'components/interfaces/Reports/v2/ReportsSelectFilter'-import { fetchLogs } from 'data/reports/report.utils'import {extractStatusCodesFromData,generateStatusCodeAttributes,transformStatusCodeData,-} from 'components/interfaces/Reports/Reports.utils'+} from '@/components/interfaces/Reports/Reports.utils'+import { NumericFilter } from '@/components/interfaces/Reports/v2/ReportsNumericFilter'+import { SelectFilters } from '@/components/interfaces/Reports/v2/ReportsSelectFilter'+import {+ isUnixMicro,+ unixMicroToIsoTimestamp,+} from '@/components/interfaces/Settings/Logs/Logs.utils'+import type { AnalyticsInterval } from '@/data/analytics/constants'+import { get } from '@/data/fetchers'+import { analyticsIntervalToGranularity, fetchLogs } from '@/data/reports/report.utils'type EdgeFunctionReportFilters = {status_code: NumericFilter | nulldiff --git a/apps/studio/data/reports/v2/edge-functions.test.tsx b/apps/studio/data/reports/v2/edge-functions.test.tsxindex c7d60954abd..e5d274c8d2e 100644--- a/apps/studio/data/reports/v2/edge-functions.test.tsx+++ b/apps/studio/data/reports/v2/edge-functions.test.tsx@@ -1,14 +1,15 @@import { describe, expect, it } from 'vitest'+import {- transformInvocationData,aggregateInvocationsByTimestamp,filterToWhereClause,+ transformInvocationData,} from './edge-functions.config'import {extractStatusCodesFromData,generateStatusCodeAttributes,transformStatusCodeData,-} from 'components/interfaces/Reports/Reports.utils'+} from '@/components/interfaces/Reports/Reports.utils'const defaultFilters = {status_code: null,diff --git a/apps/studio/data/reports/v2/realtime.config.ts b/apps/studio/data/reports/v2/realtime.config.tsindex d91960b145a..97903453172 100644--- a/apps/studio/data/reports/v2/realtime.config.ts+++ b/apps/studio/data/reports/v2/realtime.config.ts@@ -1,10 +1,10 @@-import type { AnalyticsData, AnalyticsInterval } from 'data/analytics/constants'-import { mapResponseToAnalyticsData } from 'data/analytics/infra-monitoring-queries'+import { ReportConfig } from './reports.types'+import type { AnalyticsData, AnalyticsInterval } from '@/data/analytics/constants'+import { mapResponseToAnalyticsData } from '@/data/analytics/infra-monitoring-queries'import {getInfraMonitoringAttributes,InfraMonitoringAttribute,-} from 'data/analytics/infra-monitoring-query'-import { ReportConfig } from './reports.types'+} from '@/data/analytics/infra-monitoring-query'async function runInfraMonitoringQuery(projectRef: string,diff --git a/apps/studio/data/reports/v2/reports.types.ts b/apps/studio/data/reports/v2/reports.types.tsindex 4410428a2bf..109e63f921f 100644--- a/apps/studio/data/reports/v2/reports.types.ts+++ b/apps/studio/data/reports/v2/reports.types.ts@@ -1,6 +1,7 @@-import { AnalyticsInterval } from 'data/analytics/constants'import { YAxisProps } from 'recharts'+import { AnalyticsInterval } from '@/data/analytics/constants'+export type ReportDataProviderAttribute = {attribute: stringlabel: stringdiff --git a/apps/studio/data/scoped-access-tokens/scoped-access-token-create-mutation.ts b/apps/studio/data/scoped-access-tokens/scoped-access-token-create-mutation.tsindex 3c02d2a794a..7ec01cb363c 100644--- a/apps/studio/data/scoped-access-tokens/scoped-access-token-create-mutation.ts+++ b/apps/studio/data/scoped-access-tokens/scoped-access-token-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { scopedAccessTokenKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ScopedAccessTokenCreateVariables = components['schemas']['CreateScopedAccessTokenBody']diff --git a/apps/studio/data/scoped-access-tokens/scoped-access-token-query.ts b/apps/studio/data/scoped-access-tokens/scoped-access-token-query.tsindex 849b3812e93..21691fbfe3f 100644--- a/apps/studio/data/scoped-access-tokens/scoped-access-token-query.ts+++ b/apps/studio/data/scoped-access-tokens/scoped-access-token-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { scopedAccessTokenKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getScopedAccessTokens(signal?: AbortSignal) {const { data, error } = await get('/platform/profile/scoped-access-tokens', { signal })diff --git a/apps/studio/data/scoped-access-tokens/scoped-access-tokens-delete-mutation.ts b/apps/studio/data/scoped-access-tokens/scoped-access-tokens-delete-mutation.tsindex 701991ad40c..9bdf6533b9c 100644--- a/apps/studio/data/scoped-access-tokens/scoped-access-tokens-delete-mutation.ts+++ b/apps/studio/data/scoped-access-tokens/scoped-access-tokens-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError } from 'types'import { scopedAccessTokenKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError } from '@/types'export type ScopedAccessTokenDeleteVariables = {id: stringdiff --git a/apps/studio/data/secrets/secrets-create-mutation.ts b/apps/studio/data/secrets/secrets-create-mutation.tsindex 7518c2338eb..4e43d6fd5cd 100644--- a/apps/studio/data/secrets/secrets-create-mutation.ts+++ b/apps/studio/data/secrets/secrets-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { secretsKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SecretsCreateVariables = {projectRef?: stringdiff --git a/apps/studio/data/secrets/secrets-delete-mutation.ts b/apps/studio/data/secrets/secrets-delete-mutation.tsindex 834410e9826..f49099b07c8 100644--- a/apps/studio/data/secrets/secrets-delete-mutation.ts+++ b/apps/studio/data/secrets/secrets-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { secretsKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SecretsDeleteVariables = {projectRef?: stringdiff --git a/apps/studio/data/secrets/secrets-query.ts b/apps/studio/data/secrets/secrets-query.tsindex 512aafb1fe3..93cf439f094 100644--- a/apps/studio/data/secrets/secrets-query.ts+++ b/apps/studio/data/secrets/secrets-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { secretsKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type SecretsVariables = {projectRef?: stringdiff --git a/apps/studio/data/service-status/edge-functions-status-query.ts b/apps/studio/data/service-status/edge-functions-status-query.tsindex 9ec5dce7ad4..b3c7810678a 100644--- a/apps/studio/data/service-status/edge-functions-status-query.ts+++ b/apps/studio/data/service-status/edge-functions-status-query.ts@@ -1,7 +1,7 @@import { useQuery } from '@tanstack/react-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { serviceStatusKeys } from './keys'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type EdgeFunctionServiceStatusVariables = {projectRef?: stringdiff --git a/apps/studio/data/service-status/service-status-query.ts b/apps/studio/data/service-status/service-status-query.tsindex 4b8f2d3c422..e49fd7931c4 100644--- a/apps/studio/data/service-status/service-status-query.ts+++ b/apps/studio/data/service-status/service-status-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { serviceStatusKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectServiceStatusVariables = {projectRef?: stringdiff --git a/apps/studio/data/sql/abort-query-mutation.ts b/apps/studio/data/sql/abort-query-mutation.tsindex 13f8a7e87de..5d517fff2b5 100644--- a/apps/studio/data/sql/abort-query-mutation.ts+++ b/apps/studio/data/sql/abort-query-mutation.ts@@ -1,10 +1,10 @@import { getAbortQuerySQL } from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { sqlKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type QueryAbortVariables = {pid: numberdiff --git a/apps/studio/data/sql/execute-sql-mutation.ts b/apps/studio/data/sql/execute-sql-mutation.tsindex 34df6a79449..29b39e8f181 100644--- a/apps/studio/data/sql/execute-sql-mutation.ts+++ b/apps/studio/data/sql/execute-sql-mutation.ts@@ -1,11 +1,11 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { useSendEventMutation } from 'data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'-import { sqlEventParser } from 'lib/sql-event-parser'import { toast } from 'sonner'-import { UseCustomMutationOptions } from 'types'-import { ExecuteSqlData, ExecuteSqlVariables, executeSql } from './execute-sql-query'+import { executeSql, ExecuteSqlData, ExecuteSqlVariables } from './execute-sql-query'+import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'+import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { sqlEventParser } from '@/lib/sql-event-parser'+import { UseCustomMutationOptions } from '@/types'// [Joshen] Intention is that we invalidate all database related keys whenever running a mutation related query// So we attempt to ignore all the non-related query keys. We could probably look into grouping our query keys betterdiff --git a/apps/studio/data/sql/execute-sql-query.ts b/apps/studio/data/sql/execute-sql-query.tsindex fbb8221f398..337665f9dda 100644--- a/apps/studio/data/sql/execute-sql-query.ts+++ b/apps/studio/data/sql/execute-sql-query.ts@@ -1,16 +1,16 @@import { ROLE_IMPERSONATION_NO_RESULTS, ROLE_IMPERSONATION_SQL_LINE_COUNT } from '@supabase/pg-meta'import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { QueryKey, useQuery } from '@tanstack/react-query'-import { handleError as handleErrorFetchers, post } from 'data/fetchers'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { MB, PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { sqlKeys } from './keys'import {calculateSummary,createNodeTree,} from '@/components/interfaces/ExplainVisualizer/ExplainVisualizer.parser'+import { handleError as handleErrorFetchers, post } from '@/data/fetchers'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { MB, PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'/*** [Joshen] Done a bit of stress testing and experimentation, tho we should still observe and tweak where necessarydiff --git a/apps/studio/data/sql/ongoing-queries-query.ts b/apps/studio/data/sql/ongoing-queries-query.tsindex 9ca249d37e3..377a06240e8 100644--- a/apps/studio/data/sql/ongoing-queries-query.ts+++ b/apps/studio/data/sql/ongoing-queries-query.ts@@ -1,9 +1,9 @@import { getOngoingQueriesSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { sqlKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type OngoingQuery = {pid: numberdiff --git a/apps/studio/data/ssl-enforcement/ssl-enforcement-query.ts b/apps/studio/data/ssl-enforcement/ssl-enforcement-query.tsindex 3a8b9228d86..a8572555506 100644--- a/apps/studio/data/ssl-enforcement/ssl-enforcement-query.ts+++ b/apps/studio/data/ssl-enforcement/ssl-enforcement-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'+import { sslEnforcementKeys } from './keys'-import { UseCustomQueryOptions } from 'types'+import { get, handleError } from '@/data/fetchers'+import { UseCustomQueryOptions } from '@/types'export type SSLEnforcementVariables = { projectRef?: string }diff --git a/apps/studio/data/ssl-enforcement/ssl-enforcement-update-mutation.ts b/apps/studio/data/ssl-enforcement/ssl-enforcement-update-mutation.tsindex b4398355e9e..9922f05b490 100644--- a/apps/studio/data/ssl-enforcement/ssl-enforcement-update-mutation.ts+++ b/apps/studio/data/ssl-enforcement/ssl-enforcement-update-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, put } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { sslEnforcementKeys } from './keys'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SSLEnforcementUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/sso/sso-config-create-mutation.ts b/apps/studio/data/sso/sso-config-create-mutation.tsindex 241935f6dc6..4ef7331c7dc 100644--- a/apps/studio/data/sso/sso-config-create-mutation.ts+++ b/apps/studio/data/sso/sso-config-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { orgSSOKeys } from './keys'+import type { components } from '@/data/api'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SSOConfigCreateVariables = {slug: stringdiff --git a/apps/studio/data/sso/sso-config-delete-mutation.ts b/apps/studio/data/sso/sso-config-delete-mutation.tsindex 97e04ca5911..efd6d9fbde6 100644--- a/apps/studio/data/sso/sso-config-delete-mutation.ts+++ b/apps/studio/data/sso/sso-config-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, del } from 'data/fetchers'-import { organizationKeys as organizationKeysV1 } from 'data/organizations/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { orgSSOKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import { organizationKeys as organizationKeysV1 } from '@/data/organizations/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SSOConfigDeleteVariables = {slug: stringdiff --git a/apps/studio/data/sso/sso-config-query.ts b/apps/studio/data/sso/sso-config-query.tsindex 564f35c02f4..421eec5143c 100644--- a/apps/studio/data/sso/sso-config-query.ts+++ b/apps/studio/data/sso/sso-config-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'--import { get, handleError } from 'data/fetchers'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { orgSSOKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrgSSOConfigVariables = {orgSlug?: stringdiff --git a/apps/studio/data/sso/sso-config-update-mutation.ts b/apps/studio/data/sso/sso-config-update-mutation.tsindex 5bd1eaf87bf..8244875a30e 100644--- a/apps/studio/data/sso/sso-config-update-mutation.ts+++ b/apps/studio/data/sso/sso-config-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import type { components } from 'data/api'-import { handleError, put } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { orgSSOKeys } from './keys'+import type { components } from '@/data/api'+import { handleError, put } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SSOConfigUpdateVariables = {slug: stringdiff --git a/apps/studio/data/storage/analytics-bucket-create-mutation.ts b/apps/studio/data/storage/analytics-bucket-create-mutation.tsindex 5a39884b1f3..6df81b96a56 100644--- a/apps/studio/data/storage/analytics-bucket-create-mutation.ts+++ b/apps/studio/data/storage/analytics-bucket-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type AnalyticsBucketCreateVariables = CreateAnalyticsBucketBody & {projectRef: stringdiff --git a/apps/studio/data/storage/analytics-bucket-delete-mutation.ts b/apps/studio/data/storage/analytics-bucket-delete-mutation.tsindex 0028d180223..a534f22d59f 100644--- a/apps/studio/data/storage/analytics-bucket-delete-mutation.ts+++ b/apps/studio/data/storage/analytics-bucket-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type AnalyticsBucketDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/storage/analytics-buckets-query.ts b/apps/studio/data/storage/analytics-buckets-query.tsindex 37b60fbe406..e200218e8ad 100644--- a/apps/studio/data/storage/analytics-buckets-query.ts+++ b/apps/studio/data/storage/analytics-buckets-query.ts@@ -1,12 +1,12 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { useIsAnalyticsBucketsEnabled } from 'data/config/project-storage-config-query'-import { get, handleError } from 'data/fetchers'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { storageKeys } from './keys'+import { useIsAnalyticsBucketsEnabled } from '@/data/config/project-storage-config-query'+import { get, handleError } from '@/data/fetchers'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type AnalyticsBucketsVariables = { projectRef?: string }export type AnalyticsBucket = components['schemas']['StorageAnalyticsBucketResponse']diff --git a/apps/studio/data/storage/bucket-create-mutation.ts b/apps/studio/data/storage/bucket-create-mutation.tsindex cbfbf784996..9628a6af997 100644--- a/apps/studio/data/storage/bucket-create-mutation.ts+++ b/apps/studio/data/storage/bucket-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type BucketCreateVariables = Omit<CreateStorageBucketBody, 'public'> & {projectRef: stringdiff --git a/apps/studio/data/storage/bucket-delete-mutation.ts b/apps/studio/data/storage/bucket-delete-mutation.tsindex 086610fdec8..e789f7de73e 100644--- a/apps/studio/data/storage/bucket-delete-mutation.ts+++ b/apps/studio/data/storage/bucket-delete-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'-import { storageKeys } from './keys'import { pollUntilBucketEmpty } from './bucket-util'+import { storageKeys } from './keys'+import { del, handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type BucketDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/storage/bucket-empty-mutation.ts b/apps/studio/data/storage/bucket-empty-mutation.tsindex 7710572e142..03f9057ef3b 100644--- a/apps/studio/data/storage/bucket-empty-mutation.ts+++ b/apps/studio/data/storage/bucket-empty-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type BucketEmptyVariables = {projectRef: stringdiff --git a/apps/studio/data/storage/bucket-object-delete-mutation.ts b/apps/studio/data/storage/bucket-object-delete-mutation.tsindex 3d692fa9c5b..e96e456ed8e 100644--- a/apps/studio/data/storage/bucket-object-delete-mutation.ts+++ b/apps/studio/data/storage/bucket-object-delete-mutation.ts@@ -1,8 +1,8 @@import { useMutation, useQueryClient } from '@tanstack/react-query'--import { del, handleError } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'++import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type DeleteBucketObjectParams = {projectRef: stringdiff --git a/apps/studio/data/storage/bucket-object-get-public-url-mutation.ts b/apps/studio/data/storage/bucket-object-get-public-url-mutation.tsindex 88718fa9926..f7b19c705c8 100644--- a/apps/studio/data/storage/bucket-object-get-public-url-mutation.ts+++ b/apps/studio/data/storage/bucket-object-get-public-url-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { components } from 'data/api'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { components } from '@/data/api'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type BucketObjectPublicUrlParams = {projectRef: stringdiff --git a/apps/studio/data/storage/bucket-object-sign-mutation.ts b/apps/studio/data/storage/bucket-object-sign-mutation.tsindex 360f0e6d913..2538909e45c 100644--- a/apps/studio/data/storage/bucket-object-sign-mutation.ts+++ b/apps/studio/data/storage/bucket-object-sign-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { components } from 'data/api'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { components } from '@/data/api'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type SignBucketObjectParams = {projectRef: stringdiff --git a/apps/studio/data/storage/bucket-objects-list-mutation.ts b/apps/studio/data/storage/bucket-objects-list-mutation.tsindex 3e1ba39f8b5..f0ea6666224 100644--- a/apps/studio/data/storage/bucket-objects-list-mutation.ts+++ b/apps/studio/data/storage/bucket-objects-list-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { components } from 'data/api'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { components } from '@/data/api'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type ListBucketObjectsParams = {projectRef: stringdiff --git a/apps/studio/data/storage/bucket-prefix-delete-mutation.ts b/apps/studio/data/storage/bucket-prefix-delete-mutation.tsindex e659ab82add..3f0f0c6de5a 100644--- a/apps/studio/data/storage/bucket-prefix-delete-mutation.ts+++ b/apps/studio/data/storage/bucket-prefix-delete-mutation.ts@@ -1,5 +1,6 @@import { getDeleteBucketPrefixSQL } from '@supabase/pg-meta'-import { executeSql } from 'data/sql/execute-sql-query'++import { executeSql } from '@/data/sql/execute-sql-query'/*** [Joshen] JFYI this is solely being used in storage-explorer.tsx and hence doesn't have a useMutation hookdiff --git a/apps/studio/data/storage/bucket-update-mutation.ts b/apps/studio/data/storage/bucket-update-mutation.tsindex bb0cf7a44b4..057a6659797 100644--- a/apps/studio/data/storage/bucket-update-mutation.ts+++ b/apps/studio/data/storage/bucket-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { patch } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { patch } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type BucketUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/storage/buckets-max-size-limit-query.ts b/apps/studio/data/storage/buckets-max-size-limit-query.tsindex 4c3b97b1094..714a4f831ab 100644--- a/apps/studio/data/storage/buckets-max-size-limit-query.ts+++ b/apps/studio/data/storage/buckets-max-size-limit-query.ts@@ -1,11 +1,11 @@import { getLargestSizeLimitBucketsSqlUnoptimized, getLiveTupleEstimate } from '@supabase/pg-meta'import { useQuery, useQueryClient } from '@tanstack/react-query'-import type { ConnectionVars } from 'data/common.types'-import { executeSql } from 'data/sql/execute-sql-query'import { useCallback } from 'react'-import { getLiveTupleEstimateKey } from '../database/keys'-import { sqlKeys } from '../sql/keys'+import type { ConnectionVars } from '@/data/common.types'+import { getLiveTupleEstimateKey } from '@/data/database/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { sqlKeys } from '@/data/sql/keys'export const THRESHOLD_FOR_AUTO_QUERYING_BUCKET_LIMITS = 10_000diff --git a/apps/studio/data/storage/buckets-query.ts b/apps/studio/data/storage/buckets-query.tsindex 15a4efee5be..f566d1b7445 100644--- a/apps/studio/data/storage/buckets-query.ts+++ b/apps/studio/data/storage/buckets-query.ts@@ -5,20 +5,20 @@ import {useQuery,useQueryClient,} from '@tanstack/react-query'+import { components } from 'api-types'import { useMemo } from 'react'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { MAX_RETRY_FAILURE_COUNT } from 'data/query-client'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'+import { getBucketNumberEstimate, getBucketNumberEstimateKey } from './buckets-max-size-limit-query'+import { storageKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { MAX_RETRY_FAILURE_COUNT } from '@/data/query-client'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'import {ResponseError,type UseCustomInfiniteQueryOptions,type UseCustomQueryOptions,-} from 'types'-import { getBucketNumberEstimate, getBucketNumberEstimateKey } from './buckets-max-size-limit-query'-import { storageKeys } from './keys'+} from '@/types'export type BucketsVariables = { projectRef?: string }diff --git a/apps/studio/data/storage/iceberg-namespace-create-mutation.ts b/apps/studio/data/storage/iceberg-namespace-create-mutation.tsindex 86a1bd89784..df54753c6e2 100644--- a/apps/studio/data/storage/iceberg-namespace-create-mutation.ts+++ b/apps/studio/data/storage/iceberg-namespace-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type CreateIcebergNamespaceVariables = {projectRef?: stringdiff --git a/apps/studio/data/storage/iceberg-namespace-delete-mutation.ts b/apps/studio/data/storage/iceberg-namespace-delete-mutation.tsindex 43d3e55b4ff..b0be03bb837 100644--- a/apps/studio/data/storage/iceberg-namespace-delete-mutation.ts+++ b/apps/studio/data/storage/iceberg-namespace-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type DeleteIcebergNamespaceVariables = {projectRef?: stringdiff --git a/apps/studio/data/storage/iceberg-namespace-table-create-mutation.ts b/apps/studio/data/storage/iceberg-namespace-table-create-mutation.tsindex 4b5ae9df424..4b64e0d7449 100644--- a/apps/studio/data/storage/iceberg-namespace-table-create-mutation.ts+++ b/apps/studio/data/storage/iceberg-namespace-table-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type NamespaceTableFields = components['schemas']['CreateNamespaceTableBody']['fields']diff --git a/apps/studio/data/storage/iceberg-namespace-table-delete-mutation.ts b/apps/studio/data/storage/iceberg-namespace-table-delete-mutation.tsindex cd16fb305d5..d14f52fca5c 100644--- a/apps/studio/data/storage/iceberg-namespace-table-delete-mutation.ts+++ b/apps/studio/data/storage/iceberg-namespace-table-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type DeleteIcebergNamespaceTableVariables = {warehouse: stringdiff --git a/apps/studio/data/storage/iceberg-namespace-tables-query.ts b/apps/studio/data/storage/iceberg-namespace-tables-query.tsindex fd699bb6674..8c8fe419a8d 100644--- a/apps/studio/data/storage/iceberg-namespace-tables-query.ts+++ b/apps/studio/data/storage/iceberg-namespace-tables-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { storageKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type GetNamespaceTablesVariables = {warehouse?: stringdiff --git a/apps/studio/data/storage/iceberg-namespaces-query.ts b/apps/studio/data/storage/iceberg-namespaces-query.tsindex 651efe03054..c3e03bada0b 100644--- a/apps/studio/data/storage/iceberg-namespaces-query.ts+++ b/apps/studio/data/storage/iceberg-namespaces-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { storageKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type GetNamespacesVariables = {warehouse?: stringdiff --git a/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts b/apps/studio/data/storage/iceberg-wrapper-create-mutation.tsindex e0cd094e623..3876f34ff2a 100644--- a/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts+++ b/apps/studio/data/storage/iceberg-wrapper-create-mutation.ts@@ -1,20 +1,20 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { WRAPPERS } from 'components/interfaces/Integrations/Wrappers/Wrappers.constants'+import { useS3AccessKeyCreateMutation } from './s3-access-key-create-mutation'+import { WRAPPERS } from '@/components/interfaces/Integrations/Wrappers/Wrappers.constants'import {getAnalyticsBucketFDWName,getAnalyticsBucketS3KeyName,-} from 'components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/AnalyticsBucketDetails.utils'+} from '@/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/AnalyticsBucketDetails.utils'import {getCatalogURI,getConnectionURL,-} from 'components/interfaces/Storage/StorageSettings/StorageSettings.utils'-import { getKeys, useAPIKeysQuery } from 'data/api-keys/api-keys-query'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'-import { FDWCreateVariables, useFDWCreateMutation } from 'data/fdw/fdw-create-mutation'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { useS3AccessKeyCreateMutation } from './s3-access-key-create-mutation'+} from '@/components/interfaces/Storage/StorageSettings/StorageSettings.utils'+import { getKeys, useAPIKeysQuery } from '@/data/api-keys/api-keys-query'+import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'+import { FDWCreateVariables, useFDWCreateMutation } from '@/data/fdw/fdw-create-mutation'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'export const useIcebergWrapperCreateMutation = () => {const { data: project } = useSelectedProjectQuery()diff --git a/apps/studio/data/storage/object-move-mutation.ts b/apps/studio/data/storage/object-move-mutation.tsindex f1869fb523e..dd2658e5948 100644--- a/apps/studio/data/storage/object-move-mutation.ts+++ b/apps/studio/data/storage/object-move-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type MoveStorageObjectParams = {projectRef: stringdiff --git a/apps/studio/data/storage/s3-access-key-create-mutation.ts b/apps/studio/data/storage/s3-access-key-create-mutation.tsindex 2536773648e..63b583d2a37 100644--- a/apps/studio/data/storage/s3-access-key-create-mutation.ts+++ b/apps/studio/data/storage/s3-access-key-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageCredentialsKeys } from './s3-access-key-keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateS3AccessKeyCredentialVariables = {description: stringdiff --git a/apps/studio/data/storage/s3-access-key-delete-mutation.ts b/apps/studio/data/storage/s3-access-key-delete-mutation.tsindex da77560d205..90ed92e463d 100644--- a/apps/studio/data/storage/s3-access-key-delete-mutation.ts+++ b/apps/studio/data/storage/s3-access-key-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageCredentialsKeys } from './s3-access-key-keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type S3AccessKeyDeleteVariables = {projectRef?: stringdiff --git a/apps/studio/data/storage/s3-access-key-query.ts b/apps/studio/data/storage/s3-access-key-query.tsindex 9f1a11962f4..deb2ebdb976 100644--- a/apps/studio/data/storage/s3-access-key-query.ts+++ b/apps/studio/data/storage/s3-access-key-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { storageCredentialsKeys } from './s3-access-key-keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type StorageCredentialsVariables = { projectRef?: string }diff --git a/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.ts b/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.tsindex 2719fc70bb4..da9f22f595b 100644--- a/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.ts+++ b/apps/studio/data/storage/s3-vectors-wrapper-create-mutation.ts@@ -1,17 +1,17 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import { WRAPPERS } from 'components/interfaces/Integrations/Wrappers/Wrappers.constants'-import { getVectorURI } from 'components/interfaces/Storage/StorageSettings/StorageSettings.utils'+import { useS3AccessKeyCreateMutation } from './s3-access-key-create-mutation'+import { WRAPPERS } from '@/components/interfaces/Integrations/Wrappers/Wrappers.constants'+import { getVectorURI } from '@/components/interfaces/Storage/StorageSettings/StorageSettings.utils'import {getVectorBucketFDWName,getVectorBucketFDWServerName,getVectorBucketS3KeyName,-} from 'components/interfaces/Storage/VectorBuckets/VectorBuckets.utils'-import { useProjectSettingsV2Query } from 'data/config/project-settings-v2-query'-import { FDWCreateVariables, useFDWCreateMutation } from 'data/fdw/fdw-create-mutation'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { useS3AccessKeyCreateMutation } from './s3-access-key-create-mutation'+} from '@/components/interfaces/Storage/VectorBuckets/VectorBuckets.utils'+import { useProjectSettingsV2Query } from '@/data/config/project-settings-v2-query'+import { FDWCreateVariables, useFDWCreateMutation } from '@/data/fdw/fdw-create-mutation'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'export const useS3VectorsWrapperCreateMutation = () => {const { data: project } = useSelectedProjectQuery()diff --git a/apps/studio/data/storage/storage-archive-create-mutation.ts b/apps/studio/data/storage/storage-archive-create-mutation.tsindex e1ade6a6ff5..7b216f0e47e 100644--- a/apps/studio/data/storage/storage-archive-create-mutation.ts+++ b/apps/studio/data/storage/storage-archive-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'type StorageArchiveCreateVariables = {projectRef?: stringdiff --git a/apps/studio/data/storage/storage-archive-query.ts b/apps/studio/data/storage/storage-archive-query.tsindex 7eeabe1a790..edea134233e 100644--- a/apps/studio/data/storage/storage-archive-query.ts+++ b/apps/studio/data/storage/storage-archive-query.ts@@ -1,8 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { storageKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'type StorageArchiveVariables = { projectRef?: string }diff --git a/apps/studio/data/storage/vector-bucket-create-mutation.ts b/apps/studio/data/storage/vector-bucket-create-mutation.tsindex ece577f073c..8d6ca5c45e9 100644--- a/apps/studio/data/storage/vector-bucket-create-mutation.ts+++ b/apps/studio/data/storage/vector-bucket-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError } from '@/types'type VectorBucketCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/storage/vector-bucket-delete-mutation.ts b/apps/studio/data/storage/vector-bucket-delete-mutation.tsindex 88765225d51..684f63f0492 100644--- a/apps/studio/data/storage/vector-bucket-delete-mutation.ts+++ b/apps/studio/data/storage/vector-bucket-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError } from 'types'import { storageKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError } from '@/types'type VectorBucketDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/storage/vector-bucket-index-create-mutation.ts b/apps/studio/data/storage/vector-bucket-index-create-mutation.tsindex f34e7a6dde8..b96d701d5bb 100644--- a/apps/studio/data/storage/vector-bucket-index-create-mutation.ts+++ b/apps/studio/data/storage/vector-bucket-index-create-mutation.ts@@ -1,10 +1,10 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError } from 'types'import { storageKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError } from '@/types'type VectorBucketIndexCreateVariables = components['schemas']['CreateBucketIndexBody'] & {projectRef: stringdiff --git a/apps/studio/data/storage/vector-bucket-index-delete-mutation.ts b/apps/studio/data/storage/vector-bucket-index-delete-mutation.tsindex 7e95cef493e..ffaded0b0b9 100644--- a/apps/studio/data/storage/vector-bucket-index-delete-mutation.ts+++ b/apps/studio/data/storage/vector-bucket-index-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError } from 'types'import { storageKeys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError } from '@/types'type VectorBucketIndexDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/storage/vector-bucket-query.ts b/apps/studio/data/storage/vector-bucket-query.tsindex 2a15fe3cdd5..0edb2671bae 100644--- a/apps/studio/data/storage/vector-bucket-query.ts+++ b/apps/studio/data/storage/vector-bucket-query.ts@@ -1,11 +1,11 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { storageKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'// [Joshen] JFYI typed incorrectly in API, to fix by adding creationTime to APiexport type VectorBucket = components['schemas']['StorageVectorBucketResponse'] & {diff --git a/apps/studio/data/storage/vector-buckets-indexes-query.ts b/apps/studio/data/storage/vector-buckets-indexes-query.tsindex f7a9a03f866..158164680dc 100644--- a/apps/studio/data/storage/vector-buckets-indexes-query.ts+++ b/apps/studio/data/storage/vector-buckets-indexes-query.ts@@ -1,11 +1,11 @@import { useQuery } from '@tanstack/react-query'-import { components } from 'api-types'-import { get, handleError } from 'data/fetchers'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { storageKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type VectorBucketIndex =components['schemas']['StorageVectorBucketListIndexesResponse']['indexes'][number]diff --git a/apps/studio/data/storage/vector-buckets-query.ts b/apps/studio/data/storage/vector-buckets-query.tsindex 031b40d4286..4c3ecf0171a 100644--- a/apps/studio/data/storage/vector-buckets-query.ts+++ b/apps/studio/data/storage/vector-buckets-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'-import { PROJECT_STATUS } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { storageKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { PROJECT_STATUS } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type VectorBucketsVariables = { projectRef?: string }diff --git a/apps/studio/data/stripe/setup-intent-mutation.ts b/apps/studio/data/stripe/setup-intent-mutation.tsindex 68caf34d4a1..b3cf45d694f 100644--- a/apps/studio/data/stripe/setup-intent-mutation.ts+++ b/apps/studio/data/stripe/setup-intent-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'+import { components } from 'api-types'import { toast } from 'sonner'-import { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SetupIntentVariables = {hcaptchaToken: stringdiff --git a/apps/studio/data/subscriptions/org-plans-query.ts b/apps/studio/data/subscriptions/org-plans-query.tsindex d7239cc44ee..2c35509d2df 100644--- a/apps/studio/data/subscriptions/org-plans-query.ts+++ b/apps/studio/data/subscriptions/org-plans-query.ts@@ -1,10 +1,10 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { UseCustomQueryOptions } from 'types'import { subscriptionKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import { UseCustomQueryOptions } from '@/types'export type OrgPlansVariables = {orgSlug?: stringdiff --git a/apps/studio/data/subscriptions/org-subscription-confirm-pending-change.ts b/apps/studio/data/subscriptions/org-subscription-confirm-pending-change.tsindex 82d1e2794c6..9f169808d90 100644--- a/apps/studio/data/subscriptions/org-subscription-confirm-pending-change.ts+++ b/apps/studio/data/subscriptions/org-subscription-confirm-pending-change.ts@@ -1,13 +1,13 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import { invoicesKeys } from 'data/invoices/keys'-import { organizationKeys } from 'data/organizations/keys'-import { usageKeys } from 'data/usage/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { subscriptionKeys } from './keys'+import { handleError, post } from '@/data/fetchers'+import { invoicesKeys } from '@/data/invoices/keys'+import { organizationKeys } from '@/data/organizations/keys'+import { usageKeys } from '@/data/usage/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PendingSubscriptionChangeVariables = {payment_intent_id: stringdiff --git a/apps/studio/data/subscriptions/org-subscription-confirm-pending-create.ts b/apps/studio/data/subscriptions/org-subscription-confirm-pending-create.tsindex 07054aefcf9..2fd072d26c3 100644--- a/apps/studio/data/subscriptions/org-subscription-confirm-pending-create.ts+++ b/apps/studio/data/subscriptions/org-subscription-confirm-pending-create.ts@@ -1,12 +1,12 @@import { useMutation, useQueryClient } from '@tanstack/react-query'+import type { components } from 'api-types'import { toast } from 'sonner'-import type { components } from 'api-types'-import { handleError, post } from 'data/fetchers'-import { organizationKeys } from 'data/organizations/keys'-import { castOrganizationResponseToOrganization } from 'data/organizations/organizations-query'-import { permissionKeys } from 'data/permissions/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import { organizationKeys } from '@/data/organizations/keys'+import { castOrganizationResponseToOrganization } from '@/data/organizations/organizations-query'+import { permissionKeys } from '@/data/permissions/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type PendingSubscriptionCreateVariables = {payment_intent_id: stringdiff --git a/apps/studio/data/subscriptions/org-subscription-query.ts b/apps/studio/data/subscriptions/org-subscription-query.tsindex 82ba5b9979d..8e3cfc47439 100644--- a/apps/studio/data/subscriptions/org-subscription-query.ts+++ b/apps/studio/data/subscriptions/org-subscription-query.ts@@ -1,11 +1,11 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { subscriptionKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrgSubscriptionVariables = {orgSlug?: stringdiff --git a/apps/studio/data/subscriptions/org-subscription-update-mutation.ts b/apps/studio/data/subscriptions/org-subscription-update-mutation.tsindex 8d17514fcd4..c668c1bcd98 100644--- a/apps/studio/data/subscriptions/org-subscription-update-mutation.ts+++ b/apps/studio/data/subscriptions/org-subscription-update-mutation.ts@@ -1,14 +1,15 @@import { useMutation, useQueryClient } from '@tanstack/react-query'-import { handleError, put } from 'data/fetchers'-import { invoicesKeys } from 'data/invoices/keys'-import { organizationKeys } from 'data/organizations/keys'-import type { CustomerAddress, CustomerTaxId } from 'data/organizations/types'-import { usageKeys } from 'data/usage/keys'import { toast } from 'sonner'-import type { ResponseError } from 'types/base'+import { subscriptionKeys } from './keys'import type { SubscriptionTier } from './types'-import { UseCustomMutationOptions } from 'types'+import { handleError, put } from '@/data/fetchers'+import { invoicesKeys } from '@/data/invoices/keys'+import { organizationKeys } from '@/data/organizations/keys'+import type { CustomerAddress, CustomerTaxId } from '@/data/organizations/types'+import { usageKeys } from '@/data/usage/keys'+import { UseCustomMutationOptions } from '@/types'+import type { ResponseError } from '@/types/base'export type OrgSubscriptionUpdateVariables = {slug: stringdiff --git a/apps/studio/data/subscriptions/project-addon-remove-mutation.ts b/apps/studio/data/subscriptions/project-addon-remove-mutation.tsindex 077d21b0144..4769c0b5619 100644--- a/apps/studio/data/subscriptions/project-addon-remove-mutation.ts+++ b/apps/studio/data/subscriptions/project-addon-remove-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { subscriptionKeys } from './keys'import type { AddonVariantId } from './types'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectAddonRemoveVariables = {projectRef: stringdiff --git a/apps/studio/data/subscriptions/project-addon-update-mutation.ts b/apps/studio/data/subscriptions/project-addon-update-mutation.tsindex 9765b15071d..3e0a2842311 100644--- a/apps/studio/data/subscriptions/project-addon-update-mutation.ts+++ b/apps/studio/data/subscriptions/project-addon-update-mutation.ts@@ -1,10 +1,10 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { subscriptionKeys } from './keys'import type { AddonVariantId, ProjectAddonType } from './types'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ProjectAddonUpdateVariables = {projectRef?: stringdiff --git a/apps/studio/data/subscriptions/project-addons-query.ts b/apps/studio/data/subscriptions/project-addons-query.tsindex b061f037938..5f98d4c310e 100644--- a/apps/studio/data/subscriptions/project-addons-query.ts+++ b/apps/studio/data/subscriptions/project-addons-query.ts@@ -1,9 +1,9 @@import { useQuery } from '@tanstack/react-query'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { subscriptionKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ProjectAddonsVariables = {projectRef?: stringdiff --git a/apps/studio/data/subscriptions/types.ts b/apps/studio/data/subscriptions/types.tsindex 3a0d3ab9517..bd896d67696 100644--- a/apps/studio/data/subscriptions/types.ts+++ b/apps/studio/data/subscriptions/types.ts@@ -1,4 +1,4 @@-import type { components } from 'data/api'+import type { components } from '@/data/api'export type SubscriptionTier =| 'tier_free'diff --git a/apps/studio/data/support/generate-attachment-urls-mutation.ts b/apps/studio/data/support/generate-attachment-urls-mutation.tsindex 65efe6a6353..56ff2a306f0 100644--- a/apps/studio/data/support/generate-attachment-urls-mutation.ts+++ b/apps/studio/data/support/generate-attachment-urls-mutation.ts@@ -1,9 +1,9 @@import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { constructHeaders } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { constructHeaders } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type GenerateAttachmentURLsResponse = {title: stringdiff --git a/apps/studio/data/table-editor/table-editor-query.ts b/apps/studio/data/table-editor/table-editor-query.tsindex d03fc2c6bf4..a7f82fda337 100644--- a/apps/studio/data/table-editor/table-editor-query.ts+++ b/apps/studio/data/table-editor/table-editor-query.ts@@ -1,10 +1,10 @@import { getTableEditorSql } from '@supabase/pg-meta'import { QueryClient, queryOptions, useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { tableEditorKeys } from './keys'import { Entity } from './table-editor-types'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type TableEditorArgs = {id?: numberdiff --git a/apps/studio/data/table-editor/table-editor-types.ts b/apps/studio/data/table-editor/table-editor-types.tsindex df65503bd78..7e2e54443b8 100644--- a/apps/studio/data/table-editor/table-editor-types.ts+++ b/apps/studio/data/table-editor/table-editor-types.ts@@ -5,8 +5,9 @@ import type {PostgresTable,PostgresView,} from '@supabase/postgres-meta'-import { WRAPPER_HANDLERS } from 'components/interfaces/Integrations/Wrappers/Wrappers.constants'-import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'++import { WRAPPER_HANDLERS } from '@/components/interfaces/Integrations/Wrappers/Wrappers.constants'+import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'interface TableRelationship extends PostgresRelationship {deletion_action: 'a' | 'r' | 'c' | 'n' | 'd'diff --git a/apps/studio/data/table-rows/get-cell-value-mutation.ts b/apps/studio/data/table-rows/get-cell-value-mutation.tsindex 7cf2454078f..05b4ba06e89 100644--- a/apps/studio/data/table-rows/get-cell-value-mutation.ts+++ b/apps/studio/data/table-rows/get-cell-value-mutation.ts@@ -1,9 +1,9 @@+import { Query } from '@supabase/pg-meta/src/query'import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { Query } from '@supabase/pg-meta/src/query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type GetCellValueVariables = {projectRef: stringdiff --git a/apps/studio/data/table-rows/operation-queue-save-mutation.ts b/apps/studio/data/table-rows/operation-queue-save-mutation.tsindex 23fe3454517..835d9e43774 100644--- a/apps/studio/data/table-rows/operation-queue-save-mutation.ts+++ b/apps/studio/data/table-rows/operation-queue-save-mutation.ts@@ -1,17 +1,17 @@import { wrapWithTransaction } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import type { PendingAddRow } from 'components/grid/types'-import { executeSql } from 'data/sql/execute-sql-query'-import { RoleImpersonationState, wrapWithRoleImpersonation } from 'lib/role-impersonation'import { toast } from 'sonner'-import { isRoleImpersonationEnabled } from 'state/role-impersonation-state'-import { QueuedOperation, QueuedOperationType } from 'state/table-editor-operation-queue.types'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableRowKeys } from './keys'import { getTableRowCreateSql } from './table-row-create-mutation'import { getTableRowDeleteSql } from './table-row-delete-mutation'import { getTableRowUpdateSql } from './table-row-update-mutation'+import type { PendingAddRow } from '@/components/grid/types'+import { executeSql } from '@/data/sql/execute-sql-query'+import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'+import { QueuedOperation, QueuedOperationType } from '@/state/table-editor-operation-queue.types'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type OperationQueueSaveVariables = {projectRef: stringdiff --git a/apps/studio/data/table-rows/table-row-create-mutation.ts b/apps/studio/data/table-rows/table-row-create-mutation.tsindex bba048fcebf..772e2d80329 100644--- a/apps/studio/data/table-rows/table-row-create-mutation.ts+++ b/apps/studio/data/table-rows/table-row-create-mutation.ts@@ -1,14 +1,14 @@import { Query } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'-import { useSendEventMutation } from 'data/telemetry/send-event-mutation'-import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'-import { RoleImpersonationState, wrapWithRoleImpersonation } from 'lib/role-impersonation'import { toast } from 'sonner'-import { isRoleImpersonationEnabled } from 'state/role-impersonation-state'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableRowKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'+import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'+import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TableRowCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/table-rows/table-row-delete-all-mutation.ts b/apps/studio/data/table-rows/table-row-delete-all-mutation.tsindex fbd0addedc2..dffc16ce513 100644--- a/apps/studio/data/table-rows/table-row-delete-all-mutation.ts+++ b/apps/studio/data/table-rows/table-row-delete-all-mutation.ts@@ -1,15 +1,15 @@+import { Query } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { Query } from '@supabase/pg-meta/src/query'-import type { Filter } from 'components/grid/types'-import { executeSql } from 'data/sql/execute-sql-query'-import { Entity } from 'data/table-editor/table-editor-types'-import { RoleImpersonationState, wrapWithRoleImpersonation } from 'lib/role-impersonation'-import { isRoleImpersonationEnabled } from 'state/role-impersonation-state'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableRowKeys } from './keys'import { formatFilterValue } from './utils'+import type { Filter } from '@/components/grid/types'+import { executeSql } from '@/data/sql/execute-sql-query'+import { Entity } from '@/data/table-editor/table-editor-types'+import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TableRowDeleteAllVariables = {projectRef: stringdiff --git a/apps/studio/data/table-rows/table-row-delete-mutation.tsx b/apps/studio/data/table-rows/table-row-delete-mutation.tsxindex 44cd66eac91..19b1d8db1e4 100644--- a/apps/studio/data/table-rows/table-row-delete-mutation.tsx+++ b/apps/studio/data/table-rows/table-row-delete-mutation.tsx@@ -1,18 +1,18 @@+import { Query } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { Query } from '@supabase/pg-meta/src/query'-import type { SupaRow } from 'components/grid/types'-import { Markdown } from 'components/interfaces/Markdown'-import { DocsButton } from 'components/ui/DocsButton'-import { executeSql } from 'data/sql/execute-sql-query'-import { Entity } from 'data/table-editor/table-editor-types'-import { DOCS_URL } from 'lib/constants'-import { RoleImpersonationState, wrapWithRoleImpersonation } from 'lib/role-impersonation'-import { isRoleImpersonationEnabled } from 'state/role-impersonation-state'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableRowKeys } from './keys'import { getPrimaryKeys } from './utils'+import type { SupaRow } from '@/components/grid/types'+import { Markdown } from '@/components/interfaces/Markdown'+import { DocsButton } from '@/components/ui/DocsButton'+import { executeSql } from '@/data/sql/execute-sql-query'+import { Entity } from '@/data/table-editor/table-editor-types'+import { DOCS_URL } from '@/lib/constants'+import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TableRowDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/table-rows/table-row-truncate-mutation.ts b/apps/studio/data/table-rows/table-row-truncate-mutation.tsindex 1a998d54597..4a15ec6f044 100644--- a/apps/studio/data/table-rows/table-row-truncate-mutation.ts+++ b/apps/studio/data/table-rows/table-row-truncate-mutation.ts@@ -1,10 +1,10 @@+import { Query } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { Query } from '@supabase/pg-meta/src/query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableRowKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TableRowTruncateVariables = {projectRef: stringdiff --git a/apps/studio/data/table-rows/table-row-update-mutation.ts b/apps/studio/data/table-rows/table-row-update-mutation.tsindex 8f615247424..107a38f2eff 100644--- a/apps/studio/data/table-rows/table-row-update-mutation.ts+++ b/apps/studio/data/table-rows/table-row-update-mutation.ts@@ -1,12 +1,12 @@+import { Query } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { Query } from '@supabase/pg-meta/src/query'-import { executeSql } from 'data/sql/execute-sql-query'-import { RoleImpersonationState, wrapWithRoleImpersonation } from 'lib/role-impersonation'-import { isRoleImpersonationEnabled } from 'state/role-impersonation-state'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableRowKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TableRowUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/table-rows/table-rows-count-query.ts b/apps/studio/data/table-rows/table-rows-count-query.tsindex 85b04b3c22a..b751ccee5a3 100644--- a/apps/studio/data/table-rows/table-rows-count-query.ts+++ b/apps/studio/data/table-rows/table-rows-count-query.ts@@ -1,17 +1,17 @@import { getTableRowsCountSql } from '@supabase/pg-meta'import { QueryClient, useQuery, useQueryClient } from '@tanstack/react-query'import { IS_PLATFORM } from 'common'-import { parseSupaTable } from 'components/grid/SupabaseGrid.utils'-import type { Filter, SupaTable } from 'components/grid/types'-import { prefetchTableEditor } from 'data/table-editor/table-editor-query'-import { RoleImpersonationState, wrapWithRoleImpersonation } from 'lib/role-impersonation'-import { isRoleImpersonationEnabled } from 'state/role-impersonation-state'-import { UseCustomQueryOptions } from 'types'-import { useConnectionStringForReadOps } from '../read-replicas/replicas-query'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { tableRowKeys } from './keys'import { formatFilterValue } from './utils'+import { parseSupaTable } from '@/components/grid/SupabaseGrid.utils'+import type { Filter, SupaTable } from '@/components/grid/types'+import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { prefetchTableEditor } from '@/data/table-editor/table-editor-query'+import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'+import { UseCustomQueryOptions } from '@/types'export type GetTableRowsCountArgs = {table?: SupaTablediff --git a/apps/studio/data/table-rows/table-rows-query.test.ts b/apps/studio/data/table-rows/table-rows-query.test.tsindex 7b3af9a0575..7803ddf68a5 100644--- a/apps/studio/data/table-rows/table-rows-query.test.ts+++ b/apps/studio/data/table-rows/table-rows-query.test.ts@@ -1,4 +1,5 @@import { describe, expect, it, vi } from 'vitest'+import { executeWithRetry } from './table-rows-query'describe('executeWithRetry', () => {diff --git a/apps/studio/data/table-rows/table-rows-query.ts b/apps/studio/data/table-rows/table-rows-query.tsindex efc3cb72769..524479225ed 100644--- a/apps/studio/data/table-rows/table-rows-query.ts+++ b/apps/studio/data/table-rows/table-rows-query.ts@@ -3,21 +3,21 @@ import { Query, type QueryFilter } from '@supabase/pg-meta/src/query'import { getTableRowsSql } from '@supabase/pg-meta/src/query/table-row-query'import { useQuery, useQueryClient, type QueryClient } from '@tanstack/react-query'import { IS_PLATFORM } from 'common'-import { parseSupaTable } from 'components/grid/SupabaseGrid.utils'-import { Filter, Sort, SupaRow, SupaTable } from 'components/grid/types'-import { ENTITY_TYPE } from 'data/entity-types/entity-type-constants'-import { prefetchTableEditor } from 'data/table-editor/table-editor-query'-import { isMsSqlForeignTable } from 'data/table-editor/table-editor-types'-import { RoleImpersonationState, wrapWithRoleImpersonation } from 'lib/role-impersonation'-import { isRoleImpersonationEnabled } from 'state/role-impersonation-state'-import { ResponseError, UseCustomQueryOptions } from 'types'--import { handleError } from '../fetchers'-import { useConnectionStringForReadOps } from '../read-replicas/replicas-query'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'+import { tableRowKeys } from './keys'import { formatFilterValue } from './utils'+import { parseSupaTable } from '@/components/grid/SupabaseGrid.utils'+import { Filter, Sort, SupaRow, SupaTable } from '@/components/grid/types'+import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'+import { handleError } from '@/data/fetchers'+import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { prefetchTableEditor } from '@/data/table-editor/table-editor-query'+import { isMsSqlForeignTable } from '@/data/table-editor/table-editor-types'import { timeout } from '@/lib/helpers'+import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'+import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'+import { ResponseError, UseCustomQueryOptions } from '@/types'interface GetTableRowsArgs {table?: SupaTablediff --git a/apps/studio/data/table-rows/utils.ts b/apps/studio/data/table-rows/utils.tsindex bb6e78a811f..4feb6adb43d 100644--- a/apps/studio/data/table-rows/utils.ts+++ b/apps/studio/data/table-rows/utils.ts@@ -1,6 +1,6 @@-import type { Filter, ServiceError } from 'components/grid/types'-import { isNumericalColumn } from 'components/grid/utils/types'-import { Entity, isTableLike } from 'data/table-editor/table-editor-types'+import type { Filter, ServiceError } from '@/components/grid/types'+import { isNumericalColumn } from '@/components/grid/utils/types'+import { Entity, isTableLike } from '@/data/table-editor/table-editor-types'/*** temporary fix until we implement a better filter UIdiff --git a/apps/studio/data/tables/table-create-mutation.ts b/apps/studio/data/tables/table-create-mutation.tsindex 7129ce74531..66cefe4329b 100644--- a/apps/studio/data/tables/table-create-mutation.ts+++ b/apps/studio/data/tables/table-create-mutation.ts@@ -2,10 +2,10 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from 'data/sql/execute-sql-query'-import { privilegeKeys } from 'data/privileges/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableKeys } from './keys'+import { privilegeKeys } from '@/data/privileges/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateTableBody = {name: stringdiff --git a/apps/studio/data/tables/table-delete-mutation.ts b/apps/studio/data/tables/table-delete-mutation.tsindex cf68bcce577..dd82ce5d0b2 100644--- a/apps/studio/data/tables/table-delete-mutation.ts+++ b/apps/studio/data/tables/table-delete-mutation.ts@@ -2,12 +2,12 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { entityTypeKeys } from 'data/entity-types/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { tableEditorKeys } from 'data/table-editor/keys'-import { viewKeys } from 'data/views/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableKeys } from './keys'+import { entityTypeKeys } from '@/data/entity-types/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { tableEditorKeys } from '@/data/table-editor/keys'+import { viewKeys } from '@/data/views/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TableDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/tables/table-retrieve-query.ts b/apps/studio/data/tables/table-retrieve-query.tsindex ddda1c817b7..67c82b58236 100644--- a/apps/studio/data/tables/table-retrieve-query.ts+++ b/apps/studio/data/tables/table-retrieve-query.ts@@ -1,10 +1,10 @@import pgMeta from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { getQueryClient } from 'data/query-client'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { tableKeys } from './keys'+import { getQueryClient } from '@/data/query-client'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type TablesVariables = {projectRef?: stringdiff --git a/apps/studio/data/tables/table-update-mutation.ts b/apps/studio/data/tables/table-update-mutation.tsindex fc65061fe8a..2551594fb1d 100644--- a/apps/studio/data/tables/table-update-mutation.ts+++ b/apps/studio/data/tables/table-update-mutation.ts@@ -2,12 +2,12 @@ import pgMeta from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { lintKeys } from 'data/lint/keys'-import { executeSql } from 'data/sql/execute-sql-query'-import { tableEditorKeys } from 'data/table-editor/keys'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { tableKeys } from './keys'import { CreateTableBody } from './table-create-mutation'+import { lintKeys } from '@/data/lint/keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { tableEditorKeys } from '@/data/table-editor/keys'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpdateTableBody = Partial<CreateTableBody> & {id?: numberdiff --git a/apps/studio/data/tables/tables-query.ts b/apps/studio/data/tables/tables-query.tsindex 5ac76f2df89..da7e556cc09 100644--- a/apps/studio/data/tables/tables-query.ts+++ b/apps/studio/data/tables/tables-query.ts@@ -1,12 +1,12 @@+import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import type { PostgresTable } from '@supabase/postgres-meta'import { useQuery, useQueryClient } from '@tanstack/react-query'import { sortBy } from 'lodash'import { useCallback } from 'react'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { tableKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type TablesVariables = {projectRef?: stringdiff --git a/apps/studio/data/tables/tables-roles-access-query.ts b/apps/studio/data/tables/tables-roles-access-query.tsindex dad21c73699..99b393e3b15 100644--- a/apps/studio/data/tables/tables-roles-access-query.ts+++ b/apps/studio/data/tables/tables-roles-access-query.ts@@ -1,9 +1,9 @@import { getTablesWithAnonAuthenticatedAccessSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { tableKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'type TablesRolesAccessArgs = {schema: stringdiff --git a/apps/studio/data/telemetry/send-event-mutation.ts b/apps/studio/data/telemetry/send-event-mutation.tsindex 68ad02967b4..c70791ec5e5 100644--- a/apps/studio/data/telemetry/send-event-mutation.ts+++ b/apps/studio/data/telemetry/send-event-mutation.ts@@ -1,11 +1,11 @@import { useMutation } from '@tanstack/react-query'-import { sendTelemetryEvent } from 'common'import { TelemetryEvent } from 'common/telemetry-constants'-import { handleError } from 'data/fetchers'-import { API_URL } from 'lib/constants'import { useRouter } from 'next/router'-import type { ResponseError, UseCustomMutationOptions } from 'types'++import { handleError } from '@/data/fetchers'+import { API_URL } from '@/lib/constants'+import type { ResponseError, UseCustomMutationOptions } from '@/types'interface SendEventVariables {event: TelemetryEventdiff --git a/apps/studio/data/telemetry/send-reset-mutation.ts b/apps/studio/data/telemetry/send-reset-mutation.tsindex 7d609358883..a4b384be4a0 100644--- a/apps/studio/data/telemetry/send-reset-mutation.ts+++ b/apps/studio/data/telemetry/send-reset-mutation.ts@@ -1,8 +1,8 @@import { useMutation } from '@tanstack/react-query'-import { handleError, post } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomMutationOptions } from 'types'+import { handleError, post } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export async function sendReset() {if (!IS_PLATFORM) return undefineddiff --git a/apps/studio/data/third-party-auth/integration-create-mutation.ts b/apps/studio/data/third-party-auth/integration-create-mutation.tsindex 571dbba49b7..b6a517404bd 100644--- a/apps/studio/data/third-party-auth/integration-create-mutation.ts+++ b/apps/studio/data/third-party-auth/integration-create-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { handleError, post } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { keys } from './keys'+import { handleError, post } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateThirdPartyAuthVariables = {projectRef: stringdiff --git a/apps/studio/data/third-party-auth/integration-delete-mutation.ts b/apps/studio/data/third-party-auth/integration-delete-mutation.tsindex e703a26c0fa..299a6772758 100644--- a/apps/studio/data/third-party-auth/integration-delete-mutation.ts+++ b/apps/studio/data/third-party-auth/integration-delete-mutation.ts@@ -1,9 +1,9 @@import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { del, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { keys } from './keys'+import { del, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DeleteThirdPartyAuthIntegrationVariables = {projectRef: stringdiff --git a/apps/studio/data/usage/org-usage-query.test.ts b/apps/studio/data/usage/org-usage-query.test.tsindex e694790dffc..2583a102df4 100644--- a/apps/studio/data/usage/org-usage-query.test.ts+++ b/apps/studio/data/usage/org-usage-query.test.ts@@ -1,4 +1,5 @@import { beforeEach, describe, expect, it, vi } from 'vitest'+import { getOrgUsage } from './org-usage-query'vi.mock('data/fetchers', () => ({diff --git a/apps/studio/data/usage/org-usage-query.ts b/apps/studio/data/usage/org-usage-query.tsindex 74c7138258a..6b2a0130b5a 100644--- a/apps/studio/data/usage/org-usage-query.ts+++ b/apps/studio/data/usage/org-usage-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import { IS_PLATFORM } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'import { usageKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import { IS_PLATFORM } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrgUsageVariables = {orgSlug?: stringdiff --git a/apps/studio/data/usage/resource-warnings-query.ts b/apps/studio/data/usage/resource-warnings-query.tsindex fff37917a5c..df7385ea546 100644--- a/apps/studio/data/usage/resource-warnings-query.ts+++ b/apps/studio/data/usage/resource-warnings-query.ts@@ -1,10 +1,10 @@import { useQuery } from '@tanstack/react-query'-import { IS_PLATFORM } from 'common'-import type { components } from 'data/api'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { usageKeys } from './keys'+import type { components } from '@/data/api'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ResourceWarningsVariables = {ref?: stringdiff --git a/apps/studio/data/utils/deployment-commit-query.ts b/apps/studio/data/utils/deployment-commit-query.tsindex f434268ac26..bdee01bccf8 100644--- a/apps/studio/data/utils/deployment-commit-query.ts+++ b/apps/studio/data/utils/deployment-commit-query.ts@@ -1,7 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { fetchHandler } from 'data/fetchers'-import { BASE_PATH } from 'lib/constants'-import type { ResponseError, UseCustomQueryOptions } from 'types'++import { fetchHandler } from '@/data/fetchers'+import { BASE_PATH } from '@/lib/constants'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export async function getDeploymentCommit(signal?: AbortSignal) {const response = await fetchHandler(`${BASE_PATH}/api/get-deployment-commit`)diff --git a/apps/studio/data/vault/vault-secret-create-mutation.ts b/apps/studio/data/vault/vault-secret-create-mutation.tsindex 3d3334bf0fb..9fcfd945d93 100644--- a/apps/studio/data/vault/vault-secret-create-mutation.ts+++ b/apps/studio/data/vault/vault-secret-create-mutation.ts@@ -1,10 +1,10 @@import { getCreateVaultSecretSQL } from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions, VaultSecret } from 'types'import { vaultSecretsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions, VaultSecret } from '@/types'export type VaultSecretCreateVariables = {projectRef: stringdiff --git a/apps/studio/data/vault/vault-secret-decrypted-value-query.ts b/apps/studio/data/vault/vault-secret-decrypted-value-query.tsindex 6c628068fe0..66e902271e5 100644--- a/apps/studio/data/vault/vault-secret-decrypted-value-query.ts+++ b/apps/studio/data/vault/vault-secret-decrypted-value-query.ts@@ -1,9 +1,9 @@import { Query } from '@supabase/pg-meta/src/query'import { useQuery } from '@tanstack/react-query'-import { UseCustomQueryOptions } from 'types'-import { executeSql } from '../sql/execute-sql-query'import { vaultSecretsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import { UseCustomQueryOptions } from '@/types'const vaultSecretDecryptedValueQuery = (id: string) => {const sql = new Query()diff --git a/apps/studio/data/vault/vault-secret-delete-mutation.ts b/apps/studio/data/vault/vault-secret-delete-mutation.tsindex 541243afa84..be2069d4c24 100644--- a/apps/studio/data/vault/vault-secret-delete-mutation.ts+++ b/apps/studio/data/vault/vault-secret-delete-mutation.ts@@ -1,10 +1,10 @@+import { Query } from '@supabase/pg-meta/src/query'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { Query } from '@supabase/pg-meta/src/query'-import { executeSql } from 'data/sql/execute-sql-query'-import type { ResponseError, UseCustomMutationOptions } from 'types'import { vaultSecretsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions } from '@/types'export type VaultSecretDeleteVariables = {projectRef: stringdiff --git a/apps/studio/data/vault/vault-secret-update-mutation.ts b/apps/studio/data/vault/vault-secret-update-mutation.tsindex e9c466b9f0c..60259a2486d 100644--- a/apps/studio/data/vault/vault-secret-update-mutation.ts+++ b/apps/studio/data/vault/vault-secret-update-mutation.ts@@ -1,10 +1,10 @@import { getUpdateVaultSecretSQL } from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { executeSql } from 'data/sql/execute-sql-query'import { toast } from 'sonner'-import type { ResponseError, UseCustomMutationOptions, VaultSecret } from 'types'import { vaultSecretsKeys } from './keys'+import { executeSql } from '@/data/sql/execute-sql-query'+import type { ResponseError, UseCustomMutationOptions, VaultSecret } from '@/types'export type VaultSecretUpdateVariables = {projectRef: stringdiff --git a/apps/studio/data/vault/vault-secrets-query.ts b/apps/studio/data/vault/vault-secrets-query.tsindex 30b4ac0f2e8..b2f9b59990f 100644--- a/apps/studio/data/vault/vault-secrets-query.ts+++ b/apps/studio/data/vault/vault-secrets-query.ts@@ -1,9 +1,9 @@import { Query } from '@supabase/pg-meta/src/query'import { useQuery } from '@tanstack/react-query'-import type { UseCustomQueryOptions, VaultSecret } from 'types'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'import { vaultSecretsKeys } from './keys'+import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import type { UseCustomQueryOptions, VaultSecret } from '@/types'export const getVaultSecretsSql = () => {const sql = new Query()diff --git a/apps/studio/data/views/views-query.ts b/apps/studio/data/views/views-query.tsindex 31d6621e4bf..93e26a6254a 100644--- a/apps/studio/data/views/views-query.ts+++ b/apps/studio/data/views/views-query.ts@@ -1,10 +1,10 @@-import { useQuery } from '@tanstack/react-query'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'import { PostgresView } from '@supabase/postgres-meta'-import { get, handleError } from 'data/fetchers'-import type { ResponseError, UseCustomQueryOptions } from 'types'+import { useQuery } from '@tanstack/react-query'+import { viewKeys } from './keys'+import { get, handleError } from '@/data/fetchers'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ViewsVariables = {projectRef?: stringdiff --git a/prettier.config.mjs b/prettier.config.mjsindex 3c6c58a505a..ed631d171b0 100644--- a/prettier.config.mjs+++ b/prettier.config.mjs@@ -28,7 +28,7 @@ if (process.env.SORT_IMPORTS !== 'false') {options = { ...options, ...sortImportsOptions }} else {options.overrides.push({- files: 'apps/studio/{components,hooks}/**/*.{js,jsx,ts,tsx}',+ files: 'apps/studio/{components,data,hooks}/**/*.{js,jsx,ts,tsx}',options: sortImportsOptions,})}