Skip to content

Commit 17a4eb6

Browse files
keellypkeellyp
authored
chore: enforce vscode import preference in settings (#2008)
1 parent dbe90dc commit 17a4eb6

File tree

122 files changed

+329
-421
lines changed

Some content is hidden

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

122 files changed

+329
-421
lines changed

Diff for: ‎.vscode/settings.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@
77
["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"],
88
["tw\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
99
],
10-
"eslint.useFlatConfig": true
10+
"eslint.useFlatConfig": true,
11+
"javascript.preferences.importModuleSpecifier": "non-relative",
12+
"typescript.preferences.importModuleSpecifier": "non-relative",
1113
}

Diff for: ‎src/App.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import { ErrorBoundary } from '~/components/ErrorBoundary'
99
import { RouteWrapper } from '~/components/RouteWrapper'
1010
import { UserIdentifier } from '~/components/UserIdentifier'
1111
import { envGlobalVar, initializeApolloClient, initializeTranslations } from '~/core/apolloClient'
12+
import { AppEnvEnum } from '~/core/constants/globalTypes'
1213
import { initializeYup } from '~/formValidation/initializeYup'
1314
import { theme } from '~/styles'
1415

15-
import { AppEnvEnum } from './core/constants/globalTypes'
16-
1716
const App = () => {
1817
const [client, setClient] = useState<ApolloClient<NormalizedCacheObject> | null>(null)
1918
const { appEnv } = envGlobalVar()

Diff for: ‎src/components/GenericPlaceholder.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import { ReactNode } from 'react'
22

3+
import { Button, ButtonVariant, Typography } from '~/components/designSystem'
34
import { tw } from '~/styles/utils'
45

5-
import { Button, ButtonVariant } from './designSystem/Button'
6-
import { Typography } from './designSystem/Typography'
7-
86
export interface GenericPlaceholderProps {
97
className?: string
108
title?: string

Diff for: ‎src/components/__tests__/WarningDialog.test.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { act, cleanup, screen, waitFor } from '@testing-library/react'
22
import userEvent from '@testing-library/user-event'
33

4+
import { WarningDialog } from '~/components/WarningDialog'
45
import { render } from '~/test-utils'
56

6-
import { WarningDialog } from '../WarningDialog'
7-
87
const onContinueMock = jest.fn()
98

109
async function prepare() {

Diff for: ‎src/components/auth/GoogleAuthButton.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ import { Stack } from '@mui/material'
33
import { useEffect, useState } from 'react'
44
import { useSearchParams } from 'react-router-dom'
55

6+
import { Alert, Button, Typography } from '~/components/designSystem'
67
import { hasDefinedGQLError } from '~/core/apolloClient'
78
import { DOCUMENTATION_ENV_VARS } from '~/core/constants/externalUrls'
89
import { addValuesToUrlState } from '~/core/utils/urlUtils'
910
import { LagoApiError, useGetGoogleAuthUrlLazyQuery } from '~/generated/graphql'
1011
import { useInternationalization } from '~/hooks/core/useInternationalization'
1112

12-
import { Alert, Button, Typography } from '../designSystem'
13-
1413
export type GoogleAuthModeEnum = 'login' | 'signup' | 'invite'
1514

1615
const getErrorKey = (errorCode: string): string => {

Diff for: ‎src/components/coupons/__tests__/CouponCaption.test.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { act, cleanup, screen } from '@testing-library/react'
22

3+
import { CouponCaption, CouponMixedType } from '~/components/coupons/CouponCaption'
34
import { CouponFrequency, CurrencyEnum } from '~/generated/graphql'
45
import { render } from '~/test-utils'
56

6-
import { CouponCaption, CouponMixedType } from '../CouponCaption'
7-
87
const amountCurrency = CurrencyEnum.Usd
98

109
const couponsDataSet = [

Diff for: ‎src/components/creditNote/CreditNotesTable.tsx

+14-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,21 @@ import { generatePath } from 'react-router-dom'
44
import styled, { css } from 'styled-components'
55

66
import CreditNoteBadge from '~/components/creditNote/CreditNoteBadge'
7+
import {
8+
VoidCreditNoteDialog,
9+
VoidCreditNoteDialogRef,
10+
} from '~/components/customers/creditNotes/VoidCreditNoteDialog'
11+
import {
12+
ActionItem,
13+
InfiniteScroll,
14+
Skeleton,
15+
Table,
16+
TableColumn,
17+
TableContainerSize,
18+
Typography,
19+
} from '~/components/designSystem'
720
import { AvailableFiltersEnum, Filters } from '~/components/designSystem/Filters'
21+
import { GenericPlaceholder } from '~/components/GenericPlaceholder'
822
import { addToast } from '~/core/apolloClient'
923
import { intlFormatNumber } from '~/core/formats/intlFormatNumber'
1024
import { CUSTOMER_INVOICE_CREDIT_NOTE_DETAILS_ROUTE } from '~/core/router'
@@ -27,21 +41,6 @@ import EmptyImage from '~/public/images/maneki/empty.svg'
2741
import { BaseListItem, theme } from '~/styles'
2842
import { tw } from '~/styles/utils'
2943

30-
import {
31-
VoidCreditNoteDialog,
32-
VoidCreditNoteDialogRef,
33-
} from '../customers/creditNotes/VoidCreditNoteDialog'
34-
import {
35-
ActionItem,
36-
InfiniteScroll,
37-
Skeleton,
38-
Table,
39-
TableColumn,
40-
TableContainerSize,
41-
Typography,
42-
} from '../designSystem'
43-
import { GenericPlaceholder } from '../GenericPlaceholder'
44-
4544
gql`
4645
fragment CreditNoteTableItem on CreditNote {
4746
id

Diff for: ‎src/components/creditNote/__tests__/utils.test.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
import { CurrencyEnum } from '~/generated/graphql'
2-
31
import {
42
addOnFeeMock,
53
addonMockFormatedForEstimate,
64
feeMockFormatedForEstimate,
75
feesMock,
8-
} from './fixtures'
9-
6+
} from '~/components/creditNote/__tests__/fixtures'
107
import {
118
creditNoteFormCalculationCalculation,
129
CreditNoteFormCalculationCalculationProps,
13-
} from '../utils'
10+
} from '~/components/creditNote/utils'
11+
import { CurrencyEnum } from '~/generated/graphql'
1412

1513
const prepare = ({
1614
addonFees = undefined,

Diff for: ‎src/components/customers/CustomerCreditNotesList.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import CreditNotesTable from '~/components/creditNote/CreditNotesTable'
44
import { Avatar, Icon, Typography } from '~/components/designSystem'
55
import { GenericPlaceholder } from '~/components/GenericPlaceholder'
66
import { PageSectionTitle } from '~/components/layouts/Section'
7+
import { SearchInput } from '~/components/SearchInput'
78
import { intlFormatNumber } from '~/core/formats/intlFormatNumber'
89
import { deserializeAmount } from '~/core/serializers/serializeAmount'
910
import {
@@ -16,8 +17,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization'
1617
import { useDebouncedSearch } from '~/hooks/useDebouncedSearch'
1718
import ErrorImage from '~/public/images/maneki/error.svg'
1819

19-
import { SearchInput } from '../SearchInput'
20-
2120
gql`
2221
query getCustomerCreditNotes($customerId: ID!, $page: Int, $limit: Int, $searchTerm: String) {
2322
creditNotes(customerId: $customerId, page: $page, limit: $limit, searchTerm: $searchTerm) {

Diff for: ‎src/components/customers/CustomerInvoicesList.tsx

+11-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,18 @@ import { FetchMoreQueryOptions, gql } from '@apollo/client'
22
import { FC, useRef } from 'react'
33
import { generatePath, useNavigate } from 'react-router-dom'
44

5+
import { createCreditNoteForInvoiceButtonProps } from '~/components/creditNote/utils'
56
import { Chip, InfiniteScroll, Status, Table, Tooltip, Typography } from '~/components/designSystem'
7+
import {
8+
UpdateInvoicePaymentStatusDialog,
9+
UpdateInvoicePaymentStatusDialogRef,
10+
} from '~/components/invoices/EditInvoicePaymentStatusDialog'
11+
import {
12+
FinalizeInvoiceDialog,
13+
FinalizeInvoiceDialogRef,
14+
} from '~/components/invoices/FinalizeInvoiceDialog'
15+
import { VoidInvoiceDialog, VoidInvoiceDialogRef } from '~/components/invoices/VoidInvoiceDialog'
16+
import { PremiumWarningDialog, PremiumWarningDialogRef } from '~/components/PremiumWarningDialog'
617
import { addToast, hasDefinedGQLError } from '~/core/apolloClient'
718
import { CustomerInvoiceDetailsTabsOptionsEnum } from '~/core/constants/NavigationEnum'
819
import { invoiceStatusMapping, paymentStatusMapping } from '~/core/constants/statusInvoiceMapping'
@@ -32,15 +43,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization'
3243
import { useCurrentUser } from '~/hooks/useCurrentUser'
3344
import { usePermissions } from '~/hooks/usePermissions'
3445

35-
import { createCreditNoteForInvoiceButtonProps } from '../creditNote/utils'
36-
import {
37-
UpdateInvoicePaymentStatusDialog,
38-
UpdateInvoicePaymentStatusDialogRef,
39-
} from '../invoices/EditInvoicePaymentStatusDialog'
40-
import { FinalizeInvoiceDialog, FinalizeInvoiceDialogRef } from '../invoices/FinalizeInvoiceDialog'
41-
import { VoidInvoiceDialog, VoidInvoiceDialogRef } from '../invoices/VoidInvoiceDialog'
42-
import { PremiumWarningDialog, PremiumWarningDialogRef } from '../PremiumWarningDialog'
43-
4446
gql`
4547
fragment InvoiceListItem on Invoice {
4648
id

Diff for: ‎src/components/customers/CustomerInvoicesTab.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { generatePath } from 'react-router-dom'
44
import { CustomerOverview } from '~/components/customers/overview/CustomerOverview'
55
import { ButtonLink, Skeleton, Typography } from '~/components/designSystem'
66
import { PageSectionTitle } from '~/components/layouts/Section'
7+
import { SearchInput } from '~/components/SearchInput'
78
import { CUSTOMER_DRAFT_INVOICES_LIST_ROUTE } from '~/core/router'
89
import {
910
CurrencyEnum,
@@ -18,8 +19,6 @@ import { useDebouncedSearch } from '~/hooks/useDebouncedSearch'
1819

1920
import { CustomerInvoicesList } from './CustomerInvoicesList'
2021

21-
import { SearchInput } from '../SearchInput'
22-
2322
const DRAFT_INVOICES_ITEMS_COUNT = 4
2423

2524
gql`

Diff for: ‎src/components/customers/CustomerSettings.tsx

+39-41
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,42 @@
11
import { gql } from '@apollo/client'
22
import { useRef } from 'react'
33

4+
import {
5+
DeleteCustomerDocumentLocaleDialog,
6+
DeleteCustomerDocumentLocaleDialogRef,
7+
} from '~/components/customers/DeleteCustomerDocumentLocaleDialog'
48
import {
59
DeleteCustomerFinalizeZeroAmountInvoiceDialog,
610
DeleteCustomerFinalizeZeroAmountInvoiceDialogRef,
711
} from '~/components/customers/DeleteCustomerFinalizeZeroAmountInvoiceDialog'
12+
import {
13+
DeleteCustomerGracePeriodeDialog,
14+
DeleteCustomerGracePeriodeDialogRef,
15+
} from '~/components/customers/DeleteCustomerGracePeriodeDialog'
16+
import {
17+
DeleteOrganizationNetPaymentTermDialog,
18+
DeleteOrganizationNetPaymentTermDialogRef,
19+
} from '~/components/customers/DeleteCustomerNetPaymentTermDialog'
20+
import {
21+
DeleteCustomerVatRateDialog,
22+
DeleteCustomerVatRateDialogRef,
23+
} from '~/components/customers/DeleteCustomerVatRateDialog'
24+
import {
25+
EditCustomerDocumentLocaleDialog,
26+
EditCustomerDocumentLocaleDialogRef,
27+
} from '~/components/customers/EditCustomerDocumentLocaleDialog'
28+
import {
29+
EditCustomerDunningCampaignDialog,
30+
EditCustomerDunningCampaignDialogRef,
31+
} from '~/components/customers/EditCustomerDunningCampaignDialog'
32+
import {
33+
EditCustomerInvoiceCustomSectionsDialog,
34+
EditCustomerInvoiceCustomSectionsDialogRef,
35+
} from '~/components/customers/EditCustomerInvoiceCustomSectionsDialog'
36+
import {
37+
EditCustomerInvoiceGracePeriodDialog,
38+
EditCustomerInvoiceGracePeriodDialogRef,
39+
} from '~/components/customers/EditCustomerInvoiceGracePeriodDialog'
840
import {
941
EditCustomerVatRateDialog,
1042
EditCustomerVatRateDialogRef,
@@ -21,6 +53,13 @@ import {
2153
Typography,
2254
} from '~/components/designSystem'
2355
import { GenericPlaceholder } from '~/components/GenericPlaceholder'
56+
import {
57+
SettingsListItem,
58+
SettingsListItemHeader,
59+
SettingsListItemLoadingSkeleton,
60+
SettingsListWrapper,
61+
SettingsPaddedContainer,
62+
} from '~/components/layouts/Settings'
2463
import { PremiumWarningDialog, PremiumWarningDialogRef } from '~/components/PremiumWarningDialog'
2564
import {
2665
EditFinalizeZeroAmountInvoiceDialog,
@@ -54,47 +93,6 @@ import ErrorImage from '~/public/images/maneki/error.svg'
5493
import { MenuPopper } from '~/styles'
5594
import { tw } from '~/styles/utils'
5695

57-
import {
58-
DeleteCustomerDocumentLocaleDialog,
59-
DeleteCustomerDocumentLocaleDialogRef,
60-
} from './DeleteCustomerDocumentLocaleDialog'
61-
import {
62-
DeleteCustomerGracePeriodeDialog,
63-
DeleteCustomerGracePeriodeDialogRef,
64-
} from './DeleteCustomerGracePeriodeDialog'
65-
import {
66-
DeleteOrganizationNetPaymentTermDialog,
67-
DeleteOrganizationNetPaymentTermDialogRef,
68-
} from './DeleteCustomerNetPaymentTermDialog'
69-
import {
70-
DeleteCustomerVatRateDialog,
71-
DeleteCustomerVatRateDialogRef,
72-
} from './DeleteCustomerVatRateDialog'
73-
import {
74-
EditCustomerDocumentLocaleDialog,
75-
EditCustomerDocumentLocaleDialogRef,
76-
} from './EditCustomerDocumentLocaleDialog'
77-
import {
78-
EditCustomerDunningCampaignDialog,
79-
EditCustomerDunningCampaignDialogRef,
80-
} from './EditCustomerDunningCampaignDialog'
81-
import {
82-
EditCustomerInvoiceCustomSectionsDialog,
83-
EditCustomerInvoiceCustomSectionsDialogRef,
84-
} from './EditCustomerInvoiceCustomSectionsDialog'
85-
import {
86-
EditCustomerInvoiceGracePeriodDialog,
87-
EditCustomerInvoiceGracePeriodDialogRef,
88-
} from './EditCustomerInvoiceGracePeriodDialog'
89-
90-
import {
91-
SettingsListItem,
92-
SettingsListItemHeader,
93-
SettingsListItemLoadingSkeleton,
94-
SettingsListWrapper,
95-
SettingsPaddedContainer,
96-
} from '../layouts/Settings'
97-
9896
gql`
9997
fragment CustomerAppliedTaxRatesForSettings on Customer {
10098
id

Diff for: ‎src/components/customers/DeleteCustomerVatRateDialog.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { gql } from '@apollo/client'
22
import { forwardRef, useImperativeHandle, useRef, useState } from 'react'
33

44
import { DialogRef } from '~/components/designSystem'
5+
import { WarningDialog } from '~/components/WarningDialog'
56
import { addToast } from '~/core/apolloClient'
67
import {
78
CustomerAppliedTaxRatesForSettingsFragmentDoc,
@@ -11,8 +12,6 @@ import {
1112
} from '~/generated/graphql'
1213
import { useInternationalization } from '~/hooks/core/useInternationalization'
1314

14-
import { WarningDialog } from '../WarningDialog'
15-
1615
gql`
1716
fragment CustomerForDeleteVatRateDialog on Customer {
1817
id

Diff for: ‎src/components/customers/EditCustomerDunningCampaignDialog.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { forwardRef } from 'react'
44
import { mixed, object, string } from 'yup'
55

66
import { Button, Dialog, DialogRef } from '~/components/designSystem'
7+
import { ComboBoxField, RadioField } from '~/components/form'
78
import { addToast } from '~/core/apolloClient'
89
import {
910
EditCustomerDunningCampaignFragment,
@@ -13,8 +14,6 @@ import {
1314
} from '~/generated/graphql'
1415
import { useInternationalization } from '~/hooks/core/useInternationalization'
1516

16-
import { ComboBoxField, RadioField } from '../form'
17-
1817
gql`
1918
fragment EditCustomerDunningCampaign on Customer {
2019
id

Diff for: ‎src/components/customers/EditCustomerInvoiceCustomSectionsDialog.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { forwardRef } from 'react'
44
import { array, mixed, object, string } from 'yup'
55

66
import { Button, Dialog, DialogRef } from '~/components/designSystem'
7+
import { MultipleComboBox, RadioField } from '~/components/form'
78
import { addToast } from '~/core/apolloClient'
89
import {
910
CustomerAppliedInvoiceCustomSectionsFragmentDoc,
@@ -14,8 +15,6 @@ import {
1415
} from '~/generated/graphql'
1516
import { useInternationalization } from '~/hooks/core/useInternationalization'
1617

17-
import { MultipleComboBox, RadioField } from '../form'
18-
1918
gql`
2019
fragment EditCustomerInvoiceCustomSection on Customer {
2120
id

Diff for: ‎src/components/customers/__tests__/EditCustomerVatRateDialog.test.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { act, cleanup, screen, waitFor } from '@testing-library/react'
22
import userEvent from '@testing-library/user-event'
33

4+
import { EditCustomerVatRateDialog } from '~/components/customers/EditCustomerVatRateDialog'
45
import {
56
MUI_INPUT_BASE_ROOT_CLASSNAME,
67
SEARCH_TAX_INPUT_FOR_CUSTOMER_CLASSNAME,
@@ -9,8 +10,6 @@ import { CREATE_TAX_ROUTE } from '~/core/router'
910
import { GetTaxRatesForEditCustomerDocument } from '~/generated/graphql'
1011
import { render, TestMocksType } from '~/test-utils'
1112

12-
import { EditCustomerVatRateDialog } from '../EditCustomerVatRateDialog'
13-
1413
const membershipWithPermissions = {
1514
id: '2',
1615
organization: {

0 commit comments

Comments
 (0)