Skip to content

Commit 205cbe7

Browse files
charislamcharislam
authored
chore(studio}: enforce import order, remove bare import specifiers (supabase#44585)
1 parent c6b5a1a commit 205cbe7

File tree

445 files changed

+2498
-2315
lines changed

Some content is hidden

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

445 files changed

+2498
-2315
lines changed

‎apps/studio/components/grid/hooks/useOperationQueueShortcuts.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useQueryClient } from '@tanstack/react-query'
2-
import { useIsQueueOperationsEnabled } from 'components/interfaces/Account/Preferences/useDashboardSettings'
32

43
import { useOperationQueueActions } from './useOperationQueueActions'
4+
import { useIsQueueOperationsEnabled } from '@/components/interfaces/Account/Preferences/useDashboardSettings'
55
import { tableRowKeys } from '@/data/table-rows/keys'
66
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
77
import { useHotKey } from '@/hooks/ui/useHotKey'

‎apps/studio/components/interfaces/Account/Preferences/DashboardSettingsToggles.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { zodResolver } from '@hookform/resolvers/zod'
2-
import { useSendEventMutation } from 'data/telemetry/send-event-mutation'
3-
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
42
import { useForm } from 'react-hook-form'
53
import { toast } from 'sonner'
64
import { Card, Form_Shadcn_ } from 'ui'
75
import * as z from 'zod'
86

97
import { DashboardToggle } from './DashboardToggle'
108
import { useIsInlineEditorSetting, useIsQueueOperationsSetting } from './useDashboardSettings'
9+
import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'
10+
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
1111

1212
const DashboardSettingsSchema = z.object({
1313
inlineEditorEnabled: z.boolean(),

‎apps/studio/components/interfaces/Account/Preferences/useDashboardSettings.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { LOCAL_STORAGE_KEYS } from 'common'
2-
import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'
2+
3+
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
34

45
export const useIsInlineEditorSetting = () => {
56
const [inlineEditorEnabled, setInlineEditorEnabled] = useLocalStorageQuery(

‎apps/studio/components/interfaces/App/UpdateBillingAddressModal.tsx‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,6 @@ import { loadStripe, StripeAddressElement, StripeElementsOptions } from '@stripe
33
import { PermissionAction } from '@supabase/shared-types/out/constants'
44
import { useQueryClient } from '@tanstack/react-query'
55
import { useFlag } from 'common'
6-
import {
7-
getAddressElementAppearanceOptions,
8-
STRIPE_ELEMENT_FONTS,
9-
} from 'components/interfaces/Billing/Payment/Payment.utils'
10-
import { BillingCustomerDataForm } from 'components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm'
11-
import { useBillingCustomerDataForm } from 'components/interfaces/Organization/BillingSettings/BillingCustomerData/useBillingCustomerDataForm'
12-
import { useOrganizationCustomerProfileQuery } from 'data/organizations/organization-customer-profile-query'
13-
import { useOrganizationCustomerProfileUpdateMutation } from 'data/organizations/organization-customer-profile-update-mutation'
14-
import { useOrganizationTaxIdQuery } from 'data/organizations/organization-tax-id-query'
15-
import { useOrganizationTaxIdUpdateMutation } from 'data/organizations/organization-tax-id-update-mutation'
16-
import { invalidateOrganizationsQuery } from 'data/organizations/organizations-query'
17-
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
18-
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
19-
import { IS_PLATFORM, STRIPE_PUBLIC_KEY } from 'lib/constants'
206
import { useTheme } from 'next-themes'
217
import { useEffect, useMemo, useRef, useState } from 'react'
228
import { toast } from 'sonner'
@@ -33,6 +19,21 @@ import {
3319
} from 'ui'
3420
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
3521

22+
import {
23+
getAddressElementAppearanceOptions,
24+
STRIPE_ELEMENT_FONTS,
25+
} from '@/components/interfaces/Billing/Payment/Payment.utils'
26+
import { BillingCustomerDataForm } from '@/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm'
27+
import { useBillingCustomerDataForm } from '@/components/interfaces/Organization/BillingSettings/BillingCustomerData/useBillingCustomerDataForm'
28+
import { useOrganizationCustomerProfileQuery } from '@/data/organizations/organization-customer-profile-query'
29+
import { useOrganizationCustomerProfileUpdateMutation } from '@/data/organizations/organization-customer-profile-update-mutation'
30+
import { useOrganizationTaxIdQuery } from '@/data/organizations/organization-tax-id-query'
31+
import { useOrganizationTaxIdUpdateMutation } from '@/data/organizations/organization-tax-id-update-mutation'
32+
import { invalidateOrganizationsQuery } from '@/data/organizations/organizations-query'
33+
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
34+
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
35+
import { IS_PLATFORM, STRIPE_PUBLIC_KEY } from '@/lib/constants'
36+
3637
const stripePromise = loadStripe(STRIPE_PUBLIC_KEY)
3738

3839
export function UpdateBillingAddressModal() {

‎apps/studio/components/interfaces/Auth/RedirectUrls/AddNewURLModal.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { fireEvent, screen, waitFor } from '@testing-library/react'
22
import userEvent from '@testing-library/user-event'
33
import { toast } from 'sonner'
4-
import { render } from 'tests/helpers'
54
import { beforeEach, describe, expect, it, vi } from 'vitest'
65

76
import { AddNewURLModal } from './AddNewURLModal'
7+
import { render } from '@/tests/helpers'
88

99
const { mutateMock, useAuthConfigUpdateMutationMock } = vi.hoisted(() => ({
1010
mutateMock: vi.fn(),
@@ -20,7 +20,7 @@ vi.mock(import('common'), async (importOriginal) => {
2020
}
2121
})
2222

23-
vi.mock('data/auth/auth-config-update-mutation', () => ({
23+
vi.mock('@/data/auth/auth-config-update-mutation', () => ({
2424
useAuthConfigUpdateMutation: useAuthConfigUpdateMutationMock,
2525
}))
2626

‎apps/studio/components/interfaces/Billing/Payment/Payment.utils.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { Appearance, CustomFontSource } from '@stripe/stripe-js'
2-
import { CUSTOM_FONT_BOOK_DATA_URL } from 'fonts/stripe-fonts'
2+
3+
import { CUSTOM_FONT_BOOK_DATA_URL } from '@/fonts/stripe-fonts'
34

45
/**
56
* Custom font for Stripe Elements iframes.

‎apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { zodResolver } from '@hookform/resolvers/zod'
2-
import { type DatabaseExtension } from 'data/database-extensions/database-extensions-query'
32
import { useForm } from 'react-hook-form'
43
import { toast } from 'sonner'
54
import {
@@ -31,6 +30,7 @@ import * as z from 'zod'
3130
import { extensionsWithRecommendedSchemas } from './Extensions.constants'
3231
import { DocsButton } from '@/components/ui/DocsButton'
3332
import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/database-extension-enable-mutation'
33+
import { type DatabaseExtension } from '@/data/database-extensions/database-extensions-query'
3434
import { useSchemasQuery } from '@/data/database/schemas-query'
3535
import { useIsOrioleDb, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
3636
import { useProtectedSchemas } from '@/hooks/useProtectedSchemas'

‎apps/studio/components/interfaces/DiskManagement/fields/ComputeSizeField.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
import { SupportCategories } from '@supabase/shared-types/out/constants'
22
import { useParams } from 'common'
3-
import { SupportLink } from 'components/interfaces/Support/SupportLink'
4-
import { DocsButton } from 'components/ui/DocsButton'
5-
import { InlineLink } from 'components/ui/InlineLink'
6-
import { useProjectAddonsQuery } from 'data/subscriptions/project-addons-query'
7-
import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'
8-
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
9-
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
10-
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
11-
import { getCloudProviderArchitecture } from 'lib/cloudprovider-utils'
12-
import { DOCS_URL } from 'lib/constants'
133
import { ChevronRight, CpuIcon, Lock, Microchip } from 'lucide-react'
144
import { useEffect, useMemo, useState } from 'react'
155
import { UseFormReturn } from 'react-hook-form'
@@ -37,6 +27,16 @@ import {
3727
import { BillingChangeBadge } from '../ui/BillingChangeBadge'
3828
import FormMessage from '../ui/FormMessage'
3929
import { NoticeBar } from '../ui/NoticeBar'
30+
import { SupportLink } from '@/components/interfaces/Support/SupportLink'
31+
import { DocsButton } from '@/components/ui/DocsButton'
32+
import { InlineLink } from '@/components/ui/InlineLink'
33+
import { useProjectAddonsQuery } from '@/data/subscriptions/project-addons-query'
34+
import { useCheckEntitlements } from '@/hooks/misc/useCheckEntitlements'
35+
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
36+
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
37+
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
38+
import { getCloudProviderArchitecture } from '@/lib/cloudprovider-utils'
39+
import { DOCS_URL } from '@/lib/constants'
4040

4141
const INITIALLY_VISIBLE_COUNT = 6
4242

‎apps/studio/components/interfaces/ErrorHandling/ErrorMatcher.test.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import { ErrorMatcher } from './ErrorMatcher'
55
import { ConnectionTimeoutError } from '@/types/api-errors'
66
import { ResponseError } from '@/types/base'
77

8-
vi.mock('lib/telemetry/track', () => ({ useTrack: () => vi.fn() }))
9-
vi.mock('state/ai-assistant-state', () => ({
8+
vi.mock('@/lib/telemetry/track', () => ({ useTrack: () => vi.fn() }))
9+
vi.mock('@/state/ai-assistant-state', () => ({
1010
useAiAssistantStateSnapshot: () => ({ newChat: vi.fn() }),
1111
}))
12-
vi.mock('state/sidebar-manager-state', () => ({
12+
vi.mock('@/state/sidebar-manager-state', () => ({
1313
useSidebarManagerSnapshot: () => ({ openSidebar: vi.fn() }),
1414
}))
15-
vi.mock('components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider', () => ({
15+
vi.mock('@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider', () => ({
1616
SIDEBAR_KEYS: { AI_ASSISTANT: 'ai-assistant' },
1717
}))
1818
vi.mock('./RestartProjectDialog', () => ({

‎apps/studio/components/interfaces/Functions/EdgeFunctionOverview/EdgeFunctionInvocationsSection.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
import AlertError from 'components/ui/AlertError'
21
import type { ComponentProps } from 'react'
32
import { useMemo } from 'react'
4-
import type { ChartIntervals } from 'types'
53
import { Button } from 'ui'
64
import { Chart, ChartActions, ChartLoadingState, ChartMetric } from 'ui-patterns/Chart'
75
import { PageContainer } from 'ui-patterns/PageContainer'
@@ -24,6 +22,8 @@ import {
2422
} from './EdgeFunctionOverview.utils'
2523
import type { InvocationChartDatum, InvocationUpdateAnnotation } from './EdgeFunctionOverview.utils'
2624
import { toAlertError } from './EdgeFunctionRecentErrors.utils'
25+
import AlertError from '@/components/ui/AlertError'
26+
import type { ChartIntervals } from '@/types'
2727

2828
interface EdgeFunctionInvocationsSectionProps {
2929
interval: string

0 commit comments

Comments
 (0)