From 17a4eb679cc38ba30049db6f0da603f1ffe74385 Mon Sep 17 00:00:00 2001 From: Kelly Phan Date: Fri, 31 Jan 2025 12:49:48 +0100 Subject: [PATCH] chore: enforce vscode import preference in settings (#2008) --- .vscode/settings.json | 4 +- src/App.tsx | 3 +- src/components/GenericPlaceholder.tsx | 4 +- .../__tests__/WarningDialog.test.tsx | 3 +- src/components/auth/GoogleAuthButton.tsx | 3 +- .../coupons/__tests__/CouponCaption.test.tsx | 3 +- .../creditNote/CreditNotesTable.tsx | 29 ++++--- .../creditNote/__tests__/utils.test.ts | 8 +- .../customers/CustomerCreditNotesList.tsx | 3 +- .../customers/CustomerInvoicesList.tsx | 20 ++--- .../customers/CustomerInvoicesTab.tsx | 3 +- src/components/customers/CustomerSettings.tsx | 80 +++++++++---------- .../customers/DeleteCustomerVatRateDialog.tsx | 3 +- .../EditCustomerDunningCampaignDialog.tsx | 3 +- ...ditCustomerInvoiceCustomSectionsDialog.tsx | 3 +- .../EditCustomerVatRateDialog.test.tsx | 3 +- .../customers/overview/CustomerCoupons.tsx | 9 +-- .../overview/CustomerSubscriptionsList.tsx | 13 ++- ...riptionDatesOffsetHelperComponent.test.tsx | 9 +-- .../developers/RotateApiKeyDialog.tsx | 3 +- src/components/emails/DunningEmail.tsx | 3 +- src/components/exports/ExportDialog.tsx | 3 +- .../form/AmountInput/AmountInput.tsx | 8 +- .../form/ButtonSelector/TabButton.tsx | 4 +- src/components/graphs/Gross.tsx | 9 +-- src/components/graphs/Invoices.tsx | 13 ++- .../graphs/MonthSelectorDropdown.tsx | 5 +- src/components/graphs/Mrr.tsx | 9 +-- src/components/graphs/Usage.tsx | 13 ++- src/components/graphs/__tests__/Gross.test.ts | 7 +- .../graphs/__tests__/Invoices.test.ts | 9 +-- src/components/graphs/__tests__/Mrr.test.ts | 7 +- src/components/graphs/__tests__/Usage.test.ts | 7 +- src/components/graphs/__tests__/utils.test.ts | 7 +- src/components/graphs/utils.ts | 3 +- .../invoices/InvoiceCustomerInfos.tsx | 3 +- src/components/invoices/InvoicesList.tsx | 27 +++---- .../invoices/details/InvoiceDetailsTable.tsx | 17 ++-- .../InvoiceDetailsTableBodyLine.test.ts | 3 +- src/components/layouts/Settings.tsx | 3 +- src/components/plans/ChargeAccordion.tsx | 9 +-- src/components/plans/ChargeFilter.tsx | 5 +- src/components/plans/ChargePercentage.tsx | 3 +- src/components/plans/ChargeWrapperSwitch.tsx | 18 +++-- src/components/plans/ChargesSection.tsx | 5 +- src/components/plans/CommitmentsSection.tsx | 7 +- src/components/plans/DynamicCharge.tsx | 12 +-- src/components/plans/FixedFeeSection.tsx | 3 +- src/components/plans/PackageCharge.tsx | 4 +- src/components/plans/StandardCharge.tsx | 6 +- .../plans/__tests__/ChargeAccordion.test.tsx | 7 +- src/components/plans/__tests__/utils.test.ts | 3 +- .../PlanDetailsAdvancedSettingsSection.tsx | 3 +- .../PlanDetailsChargeWrapperSwitch.tsx | 5 +- .../details/PlanDetailsChargesSection.tsx | 6 +- .../details/PlanDetailsFixedFeeAccordion.tsx | 3 +- .../settings/LanguageSettingsButton.tsx | 3 +- .../settings/PreviewEmailLayout.tsx | 3 +- .../dunnings/PreviewCampaignEmailDrawer.tsx | 5 +- .../invoices/DeleteCustomSectionDialog.tsx | 3 +- .../DeleteOrganizationVatRateDialog.tsx | 3 +- .../SubscriptionCurrentUsageTable.tsx | 9 +-- .../SubscriptionDetailsOverview.tsx | 5 +- .../SubscriptionInformations.tsx | 5 +- .../SubscriptionUsageLifetimeGraph.tsx | 11 ++- .../subscriptions/__tests__/utils.test.ts | 3 +- src/components/wallets/CustomerWalletList.tsx | 18 ++--- src/components/wallets/WalletAccordion.tsx | 10 +-- .../__tests__/index.test.tsx | 6 +- .../apolloClient/__tests__/errorUtils.test.ts | 2 +- .../apolloClient/reactiveVars/authTokenVar.ts | 2 +- .../reactiveVars/customerPortalTokenVar.ts | 2 +- .../reactiveVars/duplicatePlanVar.ts | 3 +- .../reactiveVars/internationalizationVar.ts | 3 +- .../__tests__/countryDataForCombobox.test.ts | 2 +- .../__tests__/formatCreditNotesItems.test.ts | 3 +- .../__tests__/formatInvoiceItemsMap.test.ts | 17 ++-- .../__tests__/intlFormatNumber.test.ts | 7 +- src/core/formats/__tests__/obfuscate.test.ts | 2 +- src/core/formats/countryDataForCombobox.ts | 3 +- src/core/formats/formatInvoiceItemsMap.ts | 3 +- .../__tests__/serializeAmount.test.ts | 7 +- .../serializeCreditNoteInput.test.ts | 3 +- .../__tests__/serializePlanInput.test.ts | 3 +- src/core/timezone/__tests__/config.test.ts | 2 +- src/core/timezone/utils.ts | 6 +- src/core/translations/__tests__/utils.test.ts | 2 +- .../utils/__tests__/copyToClipboard.test.ts | 2 +- .../utils/__tests__/responsiveProps.test.ts | 2 +- src/core/utils/__tests__/urlUtils.test.ts | 2 +- src/core/utils/downloadFiles.ts | 2 +- .../__tests__/chargeSchemaGraduated.test.ts | 3 +- .../chargeSchemaGraduatedPercentage.test.ts | 3 +- .../__tests__/chargeSchemaPackage.test.ts | 3 +- .../__tests__/chargeSchemaPercentage.test.ts | 3 +- .../__tests__/chargeSchemaStandard.test.ts | 3 +- .../__tests__/chargeSchemaVolume.test.ts | 3 +- .../__tests__/feesSchema.test.ts | 3 +- .../__tests__/metadataSchema.test.ts | 2 +- .../__tests__/useCreateCreditNote.test.ts | 5 +- .../__tests__/useDebouncedSearch.test.ts | 3 +- src/hooks/__tests__/usePermissions.test.ts | 3 +- .../useInternationalization.test.tsx | 3 +- .../core/__tests__/useLocationHistory.test.ts | 3 +- src/hooks/core/useLocationHistory.ts | 5 +- src/hooks/customer/useAddSubscription.tsx | 3 +- .../plans/__tests__/useChargeForm.test.tsx | 5 +- .../__tests__/useGraduatedChargeForm.test.tsx | 6 +- .../useGraduatedPercentageChargeForm.test.tsx | 3 +- .../__tests__/useVolumeChargeForm.test.tsx | 3 +- src/hooks/plans/useChargeForm.tsx | 3 +- src/hooks/plans/usePlanForm.tsx | 5 +- .../__tests__/useListKeyNavigation.test.tsx | 2 +- src/hooks/ui/__tests__/useShortcuts.test.tsx | 2 +- src/hooks/useCreateEditDunningCampaign.ts | 3 +- src/pages/CreateAddOn.tsx | 3 +- src/pages/CreateCoupon.tsx | 3 +- src/pages/WalletForm/WalletForm.tsx | 14 ++-- .../WalletForm/components/SettingsCard.tsx | 3 +- src/pages/WalletForm/components/TopUpCard.tsx | 3 +- src/pages/auth/PortalInit.tsx | 3 +- src/test-utils.tsx | 9 +-- 122 files changed, 329 insertions(+), 421 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3d2aaef3a..d3d9f5730 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,7 @@ ["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"], ["tw\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"] ], - "eslint.useFlatConfig": true + "eslint.useFlatConfig": true, + "javascript.preferences.importModuleSpecifier": "non-relative", + "typescript.preferences.importModuleSpecifier": "non-relative", } diff --git a/src/App.tsx b/src/App.tsx index 3bbff60df..fd840e810 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -9,11 +9,10 @@ import { ErrorBoundary } from '~/components/ErrorBoundary' import { RouteWrapper } from '~/components/RouteWrapper' import { UserIdentifier } from '~/components/UserIdentifier' import { envGlobalVar, initializeApolloClient, initializeTranslations } from '~/core/apolloClient' +import { AppEnvEnum } from '~/core/constants/globalTypes' import { initializeYup } from '~/formValidation/initializeYup' import { theme } from '~/styles' -import { AppEnvEnum } from './core/constants/globalTypes' - const App = () => { const [client, setClient] = useState | null>(null) const { appEnv } = envGlobalVar() diff --git a/src/components/GenericPlaceholder.tsx b/src/components/GenericPlaceholder.tsx index ea3cd5c16..994ec0736 100644 --- a/src/components/GenericPlaceholder.tsx +++ b/src/components/GenericPlaceholder.tsx @@ -1,10 +1,8 @@ import { ReactNode } from 'react' +import { Button, ButtonVariant, Typography } from '~/components/designSystem' import { tw } from '~/styles/utils' -import { Button, ButtonVariant } from './designSystem/Button' -import { Typography } from './designSystem/Typography' - export interface GenericPlaceholderProps { className?: string title?: string diff --git a/src/components/__tests__/WarningDialog.test.tsx b/src/components/__tests__/WarningDialog.test.tsx index 87b48db3b..fc3eb90fa 100644 --- a/src/components/__tests__/WarningDialog.test.tsx +++ b/src/components/__tests__/WarningDialog.test.tsx @@ -1,10 +1,9 @@ import { act, cleanup, screen, waitFor } from '@testing-library/react' import userEvent from '@testing-library/user-event' +import { WarningDialog } from '~/components/WarningDialog' import { render } from '~/test-utils' -import { WarningDialog } from '../WarningDialog' - const onContinueMock = jest.fn() async function prepare() { diff --git a/src/components/auth/GoogleAuthButton.tsx b/src/components/auth/GoogleAuthButton.tsx index 8be062b2d..7a9556f9f 100644 --- a/src/components/auth/GoogleAuthButton.tsx +++ b/src/components/auth/GoogleAuthButton.tsx @@ -3,14 +3,13 @@ import { Stack } from '@mui/material' import { useEffect, useState } from 'react' import { useSearchParams } from 'react-router-dom' +import { Alert, Button, Typography } from '~/components/designSystem' import { hasDefinedGQLError } from '~/core/apolloClient' import { DOCUMENTATION_ENV_VARS } from '~/core/constants/externalUrls' import { addValuesToUrlState } from '~/core/utils/urlUtils' import { LagoApiError, useGetGoogleAuthUrlLazyQuery } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { Alert, Button, Typography } from '../designSystem' - export type GoogleAuthModeEnum = 'login' | 'signup' | 'invite' const getErrorKey = (errorCode: string): string => { diff --git a/src/components/coupons/__tests__/CouponCaption.test.tsx b/src/components/coupons/__tests__/CouponCaption.test.tsx index c18f15755..83c0ee1a3 100644 --- a/src/components/coupons/__tests__/CouponCaption.test.tsx +++ b/src/components/coupons/__tests__/CouponCaption.test.tsx @@ -1,10 +1,9 @@ import { act, cleanup, screen } from '@testing-library/react' +import { CouponCaption, CouponMixedType } from '~/components/coupons/CouponCaption' import { CouponFrequency, CurrencyEnum } from '~/generated/graphql' import { render } from '~/test-utils' -import { CouponCaption, CouponMixedType } from '../CouponCaption' - const amountCurrency = CurrencyEnum.Usd const couponsDataSet = [ diff --git a/src/components/creditNote/CreditNotesTable.tsx b/src/components/creditNote/CreditNotesTable.tsx index 99aa03d4a..3c4a6ea35 100644 --- a/src/components/creditNote/CreditNotesTable.tsx +++ b/src/components/creditNote/CreditNotesTable.tsx @@ -4,7 +4,21 @@ import { generatePath } from 'react-router-dom' import styled, { css } from 'styled-components' import CreditNoteBadge from '~/components/creditNote/CreditNoteBadge' +import { + VoidCreditNoteDialog, + VoidCreditNoteDialogRef, +} from '~/components/customers/creditNotes/VoidCreditNoteDialog' +import { + ActionItem, + InfiniteScroll, + Skeleton, + Table, + TableColumn, + TableContainerSize, + Typography, +} from '~/components/designSystem' import { AvailableFiltersEnum, Filters } from '~/components/designSystem/Filters' +import { GenericPlaceholder } from '~/components/GenericPlaceholder' import { addToast } from '~/core/apolloClient' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { CUSTOMER_INVOICE_CREDIT_NOTE_DETAILS_ROUTE } from '~/core/router' @@ -27,21 +41,6 @@ import EmptyImage from '~/public/images/maneki/empty.svg' import { BaseListItem, theme } from '~/styles' import { tw } from '~/styles/utils' -import { - VoidCreditNoteDialog, - VoidCreditNoteDialogRef, -} from '../customers/creditNotes/VoidCreditNoteDialog' -import { - ActionItem, - InfiniteScroll, - Skeleton, - Table, - TableColumn, - TableContainerSize, - Typography, -} from '../designSystem' -import { GenericPlaceholder } from '../GenericPlaceholder' - gql` fragment CreditNoteTableItem on CreditNote { id diff --git a/src/components/creditNote/__tests__/utils.test.ts b/src/components/creditNote/__tests__/utils.test.ts index 27ec3b9be..dbc4c935c 100644 --- a/src/components/creditNote/__tests__/utils.test.ts +++ b/src/components/creditNote/__tests__/utils.test.ts @@ -1,16 +1,14 @@ -import { CurrencyEnum } from '~/generated/graphql' - import { addOnFeeMock, addonMockFormatedForEstimate, feeMockFormatedForEstimate, feesMock, -} from './fixtures' - +} from '~/components/creditNote/__tests__/fixtures' import { creditNoteFormCalculationCalculation, CreditNoteFormCalculationCalculationProps, -} from '../utils' +} from '~/components/creditNote/utils' +import { CurrencyEnum } from '~/generated/graphql' const prepare = ({ addonFees = undefined, diff --git a/src/components/customers/CustomerCreditNotesList.tsx b/src/components/customers/CustomerCreditNotesList.tsx index 59d92b46f..e2f405e18 100644 --- a/src/components/customers/CustomerCreditNotesList.tsx +++ b/src/components/customers/CustomerCreditNotesList.tsx @@ -4,6 +4,7 @@ import CreditNotesTable from '~/components/creditNote/CreditNotesTable' import { Avatar, Icon, Typography } from '~/components/designSystem' import { GenericPlaceholder } from '~/components/GenericPlaceholder' import { PageSectionTitle } from '~/components/layouts/Section' +import { SearchInput } from '~/components/SearchInput' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { @@ -16,8 +17,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization' import { useDebouncedSearch } from '~/hooks/useDebouncedSearch' import ErrorImage from '~/public/images/maneki/error.svg' -import { SearchInput } from '../SearchInput' - gql` query getCustomerCreditNotes($customerId: ID!, $page: Int, $limit: Int, $searchTerm: String) { creditNotes(customerId: $customerId, page: $page, limit: $limit, searchTerm: $searchTerm) { diff --git a/src/components/customers/CustomerInvoicesList.tsx b/src/components/customers/CustomerInvoicesList.tsx index 7526ec436..0ae678552 100644 --- a/src/components/customers/CustomerInvoicesList.tsx +++ b/src/components/customers/CustomerInvoicesList.tsx @@ -2,7 +2,18 @@ import { FetchMoreQueryOptions, gql } from '@apollo/client' import { FC, useRef } from 'react' import { generatePath, useNavigate } from 'react-router-dom' +import { createCreditNoteForInvoiceButtonProps } from '~/components/creditNote/utils' import { Chip, InfiniteScroll, Status, Table, Tooltip, Typography } from '~/components/designSystem' +import { + UpdateInvoicePaymentStatusDialog, + UpdateInvoicePaymentStatusDialogRef, +} from '~/components/invoices/EditInvoicePaymentStatusDialog' +import { + FinalizeInvoiceDialog, + FinalizeInvoiceDialogRef, +} from '~/components/invoices/FinalizeInvoiceDialog' +import { VoidInvoiceDialog, VoidInvoiceDialogRef } from '~/components/invoices/VoidInvoiceDialog' +import { PremiumWarningDialog, PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { addToast, hasDefinedGQLError } from '~/core/apolloClient' import { CustomerInvoiceDetailsTabsOptionsEnum } from '~/core/constants/NavigationEnum' import { invoiceStatusMapping, paymentStatusMapping } from '~/core/constants/statusInvoiceMapping' @@ -32,15 +43,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization' import { useCurrentUser } from '~/hooks/useCurrentUser' import { usePermissions } from '~/hooks/usePermissions' -import { createCreditNoteForInvoiceButtonProps } from '../creditNote/utils' -import { - UpdateInvoicePaymentStatusDialog, - UpdateInvoicePaymentStatusDialogRef, -} from '../invoices/EditInvoicePaymentStatusDialog' -import { FinalizeInvoiceDialog, FinalizeInvoiceDialogRef } from '../invoices/FinalizeInvoiceDialog' -import { VoidInvoiceDialog, VoidInvoiceDialogRef } from '../invoices/VoidInvoiceDialog' -import { PremiumWarningDialog, PremiumWarningDialogRef } from '../PremiumWarningDialog' - gql` fragment InvoiceListItem on Invoice { id diff --git a/src/components/customers/CustomerInvoicesTab.tsx b/src/components/customers/CustomerInvoicesTab.tsx index fdd59f51c..96fd29c28 100644 --- a/src/components/customers/CustomerInvoicesTab.tsx +++ b/src/components/customers/CustomerInvoicesTab.tsx @@ -4,6 +4,7 @@ import { generatePath } from 'react-router-dom' import { CustomerOverview } from '~/components/customers/overview/CustomerOverview' import { ButtonLink, Skeleton, Typography } from '~/components/designSystem' import { PageSectionTitle } from '~/components/layouts/Section' +import { SearchInput } from '~/components/SearchInput' import { CUSTOMER_DRAFT_INVOICES_LIST_ROUTE } from '~/core/router' import { CurrencyEnum, @@ -18,8 +19,6 @@ import { useDebouncedSearch } from '~/hooks/useDebouncedSearch' import { CustomerInvoicesList } from './CustomerInvoicesList' -import { SearchInput } from '../SearchInput' - const DRAFT_INVOICES_ITEMS_COUNT = 4 gql` diff --git a/src/components/customers/CustomerSettings.tsx b/src/components/customers/CustomerSettings.tsx index 8a46273a1..ce91810dd 100644 --- a/src/components/customers/CustomerSettings.tsx +++ b/src/components/customers/CustomerSettings.tsx @@ -1,10 +1,42 @@ import { gql } from '@apollo/client' import { useRef } from 'react' +import { + DeleteCustomerDocumentLocaleDialog, + DeleteCustomerDocumentLocaleDialogRef, +} from '~/components/customers/DeleteCustomerDocumentLocaleDialog' import { DeleteCustomerFinalizeZeroAmountInvoiceDialog, DeleteCustomerFinalizeZeroAmountInvoiceDialogRef, } from '~/components/customers/DeleteCustomerFinalizeZeroAmountInvoiceDialog' +import { + DeleteCustomerGracePeriodeDialog, + DeleteCustomerGracePeriodeDialogRef, +} from '~/components/customers/DeleteCustomerGracePeriodeDialog' +import { + DeleteOrganizationNetPaymentTermDialog, + DeleteOrganizationNetPaymentTermDialogRef, +} from '~/components/customers/DeleteCustomerNetPaymentTermDialog' +import { + DeleteCustomerVatRateDialog, + DeleteCustomerVatRateDialogRef, +} from '~/components/customers/DeleteCustomerVatRateDialog' +import { + EditCustomerDocumentLocaleDialog, + EditCustomerDocumentLocaleDialogRef, +} from '~/components/customers/EditCustomerDocumentLocaleDialog' +import { + EditCustomerDunningCampaignDialog, + EditCustomerDunningCampaignDialogRef, +} from '~/components/customers/EditCustomerDunningCampaignDialog' +import { + EditCustomerInvoiceCustomSectionsDialog, + EditCustomerInvoiceCustomSectionsDialogRef, +} from '~/components/customers/EditCustomerInvoiceCustomSectionsDialog' +import { + EditCustomerInvoiceGracePeriodDialog, + EditCustomerInvoiceGracePeriodDialogRef, +} from '~/components/customers/EditCustomerInvoiceGracePeriodDialog' import { EditCustomerVatRateDialog, EditCustomerVatRateDialogRef, @@ -21,6 +53,13 @@ import { Typography, } from '~/components/designSystem' import { GenericPlaceholder } from '~/components/GenericPlaceholder' +import { + SettingsListItem, + SettingsListItemHeader, + SettingsListItemLoadingSkeleton, + SettingsListWrapper, + SettingsPaddedContainer, +} from '~/components/layouts/Settings' import { PremiumWarningDialog, PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { EditFinalizeZeroAmountInvoiceDialog, @@ -54,47 +93,6 @@ import ErrorImage from '~/public/images/maneki/error.svg' import { MenuPopper } from '~/styles' import { tw } from '~/styles/utils' -import { - DeleteCustomerDocumentLocaleDialog, - DeleteCustomerDocumentLocaleDialogRef, -} from './DeleteCustomerDocumentLocaleDialog' -import { - DeleteCustomerGracePeriodeDialog, - DeleteCustomerGracePeriodeDialogRef, -} from './DeleteCustomerGracePeriodeDialog' -import { - DeleteOrganizationNetPaymentTermDialog, - DeleteOrganizationNetPaymentTermDialogRef, -} from './DeleteCustomerNetPaymentTermDialog' -import { - DeleteCustomerVatRateDialog, - DeleteCustomerVatRateDialogRef, -} from './DeleteCustomerVatRateDialog' -import { - EditCustomerDocumentLocaleDialog, - EditCustomerDocumentLocaleDialogRef, -} from './EditCustomerDocumentLocaleDialog' -import { - EditCustomerDunningCampaignDialog, - EditCustomerDunningCampaignDialogRef, -} from './EditCustomerDunningCampaignDialog' -import { - EditCustomerInvoiceCustomSectionsDialog, - EditCustomerInvoiceCustomSectionsDialogRef, -} from './EditCustomerInvoiceCustomSectionsDialog' -import { - EditCustomerInvoiceGracePeriodDialog, - EditCustomerInvoiceGracePeriodDialogRef, -} from './EditCustomerInvoiceGracePeriodDialog' - -import { - SettingsListItem, - SettingsListItemHeader, - SettingsListItemLoadingSkeleton, - SettingsListWrapper, - SettingsPaddedContainer, -} from '../layouts/Settings' - gql` fragment CustomerAppliedTaxRatesForSettings on Customer { id diff --git a/src/components/customers/DeleteCustomerVatRateDialog.tsx b/src/components/customers/DeleteCustomerVatRateDialog.tsx index 5cdd3ae34..aac44fb5c 100644 --- a/src/components/customers/DeleteCustomerVatRateDialog.tsx +++ b/src/components/customers/DeleteCustomerVatRateDialog.tsx @@ -2,6 +2,7 @@ import { gql } from '@apollo/client' import { forwardRef, useImperativeHandle, useRef, useState } from 'react' import { DialogRef } from '~/components/designSystem' +import { WarningDialog } from '~/components/WarningDialog' import { addToast } from '~/core/apolloClient' import { CustomerAppliedTaxRatesForSettingsFragmentDoc, @@ -11,8 +12,6 @@ import { } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { WarningDialog } from '../WarningDialog' - gql` fragment CustomerForDeleteVatRateDialog on Customer { id diff --git a/src/components/customers/EditCustomerDunningCampaignDialog.tsx b/src/components/customers/EditCustomerDunningCampaignDialog.tsx index 001eab40d..441772061 100644 --- a/src/components/customers/EditCustomerDunningCampaignDialog.tsx +++ b/src/components/customers/EditCustomerDunningCampaignDialog.tsx @@ -4,6 +4,7 @@ import { forwardRef } from 'react' import { mixed, object, string } from 'yup' import { Button, Dialog, DialogRef } from '~/components/designSystem' +import { ComboBoxField, RadioField } from '~/components/form' import { addToast } from '~/core/apolloClient' import { EditCustomerDunningCampaignFragment, @@ -13,8 +14,6 @@ import { } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { ComboBoxField, RadioField } from '../form' - gql` fragment EditCustomerDunningCampaign on Customer { id diff --git a/src/components/customers/EditCustomerInvoiceCustomSectionsDialog.tsx b/src/components/customers/EditCustomerInvoiceCustomSectionsDialog.tsx index 21576aba2..5fc39b2cc 100644 --- a/src/components/customers/EditCustomerInvoiceCustomSectionsDialog.tsx +++ b/src/components/customers/EditCustomerInvoiceCustomSectionsDialog.tsx @@ -4,6 +4,7 @@ import { forwardRef } from 'react' import { array, mixed, object, string } from 'yup' import { Button, Dialog, DialogRef } from '~/components/designSystem' +import { MultipleComboBox, RadioField } from '~/components/form' import { addToast } from '~/core/apolloClient' import { CustomerAppliedInvoiceCustomSectionsFragmentDoc, @@ -14,8 +15,6 @@ import { } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { MultipleComboBox, RadioField } from '../form' - gql` fragment EditCustomerInvoiceCustomSection on Customer { id diff --git a/src/components/customers/__tests__/EditCustomerVatRateDialog.test.tsx b/src/components/customers/__tests__/EditCustomerVatRateDialog.test.tsx index 2a68be5ab..21093d3c7 100644 --- a/src/components/customers/__tests__/EditCustomerVatRateDialog.test.tsx +++ b/src/components/customers/__tests__/EditCustomerVatRateDialog.test.tsx @@ -1,6 +1,7 @@ import { act, cleanup, screen, waitFor } from '@testing-library/react' import userEvent from '@testing-library/user-event' +import { EditCustomerVatRateDialog } from '~/components/customers/EditCustomerVatRateDialog' import { MUI_INPUT_BASE_ROOT_CLASSNAME, SEARCH_TAX_INPUT_FOR_CUSTOMER_CLASSNAME, @@ -9,8 +10,6 @@ import { CREATE_TAX_ROUTE } from '~/core/router' import { GetTaxRatesForEditCustomerDocument } from '~/generated/graphql' import { render, TestMocksType } from '~/test-utils' -import { EditCustomerVatRateDialog } from '../EditCustomerVatRateDialog' - const membershipWithPermissions = { id: '2', organization: { diff --git a/src/components/customers/overview/CustomerCoupons.tsx b/src/components/customers/overview/CustomerCoupons.tsx index dfc6500e1..64312cd29 100644 --- a/src/components/customers/overview/CustomerCoupons.tsx +++ b/src/components/customers/overview/CustomerCoupons.tsx @@ -3,6 +3,10 @@ import { memo, useRef } from 'react' import { useParams } from 'react-router-dom' import { CouponCaption, CouponMixedType } from '~/components/coupons/CouponCaption' +import { + AddCouponToCustomerDialog, + AddCouponToCustomerDialogRef, +} from '~/components/customers/AddCouponToCustomerDialog' import { Button, Icon, Table, Tooltip, Typography } from '~/components/designSystem' import { PageSectionTitle } from '~/components/layouts/Section' import { WarningDialog, WarningDialogRef } from '~/components/WarningDialog' @@ -15,11 +19,6 @@ import { import { useInternationalization } from '~/hooks/core/useInternationalization' import { usePermissions } from '~/hooks/usePermissions' -import { - AddCouponToCustomerDialog, - AddCouponToCustomerDialogRef, -} from '../AddCouponToCustomerDialog' - gql` fragment CustomerCoupon on AppliedCoupon { id diff --git a/src/components/customers/overview/CustomerSubscriptionsList.tsx b/src/components/customers/overview/CustomerSubscriptionsList.tsx index b2043c613..9c2205b0d 100644 --- a/src/components/customers/overview/CustomerSubscriptionsList.tsx +++ b/src/components/customers/overview/CustomerSubscriptionsList.tsx @@ -1,7 +1,11 @@ import { gql } from '@apollo/client' -import { useRef } from 'react' +import { RefObject, useRef } from 'react' import { generatePath, NavigateFunction, useNavigate, useParams } from 'react-router-dom' +import { + TerminateCustomerSubscriptionDialog, + TerminateCustomerSubscriptionDialogRef, +} from '~/components/customers/subscriptions/TerminateCustomerSubscriptionDialog' import { ActionItem, Icon, @@ -34,11 +38,6 @@ import { TranslateFunc, useInternationalization } from '~/hooks/core/useInternat import { usePermissions } from '~/hooks/usePermissions' import { tw } from '~/styles/utils' -import { - TerminateCustomerSubscriptionDialog, - TerminateCustomerSubscriptionDialogRef, -} from '../subscriptions/TerminateCustomerSubscriptionDialog' - gql` query getCustomerSubscriptionForList($id: ID!) { customer(id: $id) { @@ -174,7 +173,7 @@ const generateActionColumn = ({ subscription: AnnotatedSubscription hasSubscriptionsUpdatePermission: boolean customerId?: string - terminateSubscriptionDialogRef: React.RefObject + terminateSubscriptionDialogRef: RefObject translate: TranslateFunc navigate: NavigateFunction }) => { diff --git a/src/components/customers/subscriptions/__tests__/SubscriptionDatesOffsetHelperComponent.test.tsx b/src/components/customers/subscriptions/__tests__/SubscriptionDatesOffsetHelperComponent.test.tsx index 08f6126b4..b8d799827 100644 --- a/src/components/customers/subscriptions/__tests__/SubscriptionDatesOffsetHelperComponent.test.tsx +++ b/src/components/customers/subscriptions/__tests__/SubscriptionDatesOffsetHelperComponent.test.tsx @@ -5,14 +5,13 @@ import { act, cleanup, renderHook, screen } from '@testing-library/react' import { DateTime } from 'luxon' -import { GetOrganizationInfosDocument, TimezoneEnum } from '~/generated/graphql' -import { useInternationalization } from '~/hooks/core/useInternationalization' -import { render } from '~/test-utils' - import { SubscriptionDatesOffsetHelperComponent, SubscriptionDatesOffsetHelperComponentProps, -} from '../SubscriptionDatesOffsetHelperComponent' +} from '~/components/customers/subscriptions/SubscriptionDatesOffsetHelperComponent' +import { GetOrganizationInfosDocument, TimezoneEnum } from '~/generated/graphql' +import { useInternationalization } from '~/hooks/core/useInternationalization' +import { render } from '~/test-utils' const DATA_TEST_ID = 'subscription-dates-offset-helper-component' // const DEFAULT_SUBSCRIPTION_AT_NOW = DateTime.now().toISO() as string diff --git a/src/components/developers/RotateApiKeyDialog.tsx b/src/components/developers/RotateApiKeyDialog.tsx index b9130fce1..3b8e4b4b5 100644 --- a/src/components/developers/RotateApiKeyDialog.tsx +++ b/src/components/developers/RotateApiKeyDialog.tsx @@ -5,6 +5,7 @@ import { forwardRef, useImperativeHandle, useRef, useState } from 'react' import { object, string } from 'yup' import { Button, Dialog, DialogRef, Icon, Typography } from '~/components/designSystem' +import { RadioField } from '~/components/form' import { addToast } from '~/core/apolloClient' import { formatDateToTZ } from '~/core/timezone/utils' import { @@ -18,8 +19,6 @@ import { import { useInternationalization } from '~/hooks/core/useInternationalization' import { useCurrentUser } from '~/hooks/useCurrentUser' -import { RadioField } from '../form' - const ExpirationValuesEnum = { Now: 'Now', OneHour: 'OneHour', diff --git a/src/components/emails/DunningEmail.tsx b/src/components/emails/DunningEmail.tsx index c19292469..33e35e94d 100644 --- a/src/components/emails/DunningEmail.tsx +++ b/src/components/emails/DunningEmail.tsx @@ -1,6 +1,7 @@ import { gql } from '@apollo/client' import { FC } from 'react' +import { Button, Skeleton, Table, Typography } from '~/components/designSystem' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { LocaleEnum } from '~/core/translations' @@ -14,8 +15,6 @@ import { import { useContextualLocale } from '~/hooks/core/useContextualLocale' import { tw } from '~/styles/utils' -import { Button, Skeleton, Table, Typography } from '../designSystem' - gql` fragment CustomerForDunningEmail on Customer { displayName diff --git a/src/components/exports/ExportDialog.tsx b/src/components/exports/ExportDialog.tsx index f9ae45413..c2562c24d 100644 --- a/src/components/exports/ExportDialog.tsx +++ b/src/components/exports/ExportDialog.tsx @@ -4,6 +4,7 @@ import styled from 'styled-components' import { object, string } from 'yup' import { Button, Dialog, Typography } from '~/components/designSystem' +import { RadioGroupField } from '~/components/form' import { CreditNoteExportTypeEnum, DataExportFormatTypeEnum, @@ -13,8 +14,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization' import { useCurrentUser } from '~/hooks/useCurrentUser' import { theme } from '~/styles' -import { RadioGroupField } from '../form' - type ExportTypeEnum = CreditNoteExportTypeEnum | InvoiceExportTypeEnum type ExportForm = { diff --git a/src/components/form/AmountInput/AmountInput.tsx b/src/components/form/AmountInput/AmountInput.tsx index 8e04efa9a..df3874e24 100644 --- a/src/components/form/AmountInput/AmountInput.tsx +++ b/src/components/form/AmountInput/AmountInput.tsx @@ -1,11 +1,15 @@ import { forwardRef } from 'react' +import { + TextInput, + TextInputProps, + ValueFormatter, + ValueFormatterType, +} from '~/components/form/TextInput' import { getCurrencyPrecision } from '~/core/serializers/serializeAmount' import { CurrencyEnum } from '~/generated/graphql' import { TranslateFunc, useInternationalization } from '~/hooks/core/useInternationalization' -import { TextInput, TextInputProps, ValueFormatter, ValueFormatterType } from '../TextInput' - type AmountValueFormatter = Exclude< keyof typeof ValueFormatter, 'int' | 'decimal' | 'triDecimal' | 'quadDecimal' diff --git a/src/components/form/ButtonSelector/TabButton.tsx b/src/components/form/ButtonSelector/TabButton.tsx index e903d0424..c8f841516 100644 --- a/src/components/form/ButtonSelector/TabButton.tsx +++ b/src/components/form/ButtonSelector/TabButton.tsx @@ -2,11 +2,9 @@ import { forwardRef, MouseEvent, ReactNode, useEffect, useRef, useState } from 'react' import styled, { css } from 'styled-components' +import { Icon, IconName, Typography } from '~/components/designSystem' import { theme } from '~/styles' -import { Icon, IconName } from '../../designSystem/Icon' -import { Typography } from '../../designSystem/Typography' - export interface TabButtonProps { active?: boolean title?: string | number | boolean diff --git a/src/components/graphs/Gross.tsx b/src/components/graphs/Gross.tsx index 3b4570ab9..a75951bbc 100644 --- a/src/components/graphs/Gross.tsx +++ b/src/components/graphs/Gross.tsx @@ -2,6 +2,10 @@ import { gql } from '@apollo/client' import { useMemo } from 'react' import styled from 'styled-components' +import AreaChart from '~/components/designSystem/graphs/AreaChart' +import ChartHeader from '~/components/designSystem/graphs/ChartHeader' +import { AreaGrossRevenuesChartFakeData } from '~/components/designSystem/graphs/fixtures' +import { GenericPlaceholder } from '~/components/GenericPlaceholder' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { CurrencyEnum, GetGrossRevenuesQuery, useGetGrossRevenuesQuery } from '~/generated/graphql' @@ -16,11 +20,6 @@ import { import { TGraphProps } from './types' import { formatDataForAreaChart, TAreaChartDataResult } from './utils' -import AreaChart from '../designSystem/graphs/AreaChart' -import ChartHeader from '../designSystem/graphs/ChartHeader' -import { AreaGrossRevenuesChartFakeData } from '../designSystem/graphs/fixtures' -import { GenericPlaceholder } from '../GenericPlaceholder' - gql` query getGrossRevenues($currency: CurrencyEnum!, $externalCustomerId: String, $months: Int) { grossRevenues(currency: $currency, externalCustomerId: $externalCustomerId, months: $months) { diff --git a/src/components/graphs/Invoices.tsx b/src/components/graphs/Invoices.tsx index 6a6ab735e..a31df268f 100644 --- a/src/components/graphs/Invoices.tsx +++ b/src/components/graphs/Invoices.tsx @@ -3,6 +3,12 @@ import { DateTime } from 'luxon' import { useMemo, useState } from 'react' import styled, { css } from 'styled-components' +import { Skeleton, Typography } from '~/components/designSystem' +import ChartHeader from '~/components/designSystem/graphs/ChartHeader' +import { InvoiceCollectionsFakeData } from '~/components/designSystem/graphs/fixtures' +import InlineBarsChart from '~/components/designSystem/graphs/InlineBarsChart' +import { GenericPlaceholder } from '~/components/GenericPlaceholder' +import { ChartWrapper } from '~/components/layouts/Charts' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { @@ -22,13 +28,6 @@ import { import { TGraphProps } from './types' import { getLastTwelveMonthsNumbersUntilNow, GRAPH_YEAR_MONTH_DATE_FORMAT } from './utils' -import { Skeleton, Typography } from '../designSystem' -import ChartHeader from '../designSystem/graphs/ChartHeader' -import { InvoiceCollectionsFakeData } from '../designSystem/graphs/fixtures' -import InlineBarsChart from '../designSystem/graphs/InlineBarsChart' -import { GenericPlaceholder } from '../GenericPlaceholder' -import { ChartWrapper } from '../layouts/Charts' - const DOT_SIZE = 8 const GRAPH_COLORS = [ diff --git a/src/components/graphs/MonthSelectorDropdown.tsx b/src/components/graphs/MonthSelectorDropdown.tsx index a0bbaa3b7..b4f76b84e 100644 --- a/src/components/graphs/MonthSelectorDropdown.tsx +++ b/src/components/graphs/MonthSelectorDropdown.tsx @@ -1,12 +1,11 @@ import { RefObject } from 'react' +import { Button, Popper } from '~/components/designSystem' +import { PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { useInternationalization } from '~/hooks/core/useInternationalization' import { useCurrentUser } from '~/hooks/useCurrentUser' import { MenuPopper } from '~/styles' -import { Button, Popper } from '../designSystem' -import { PremiumWarningDialogRef } from '../PremiumWarningDialog' - export const AnalyticsPeriodScopeEnum = { Year: 'year', Quarter: 'quarter', diff --git a/src/components/graphs/Mrr.tsx b/src/components/graphs/Mrr.tsx index a57c70cc6..fdedd8968 100644 --- a/src/components/graphs/Mrr.tsx +++ b/src/components/graphs/Mrr.tsx @@ -2,6 +2,10 @@ import { gql } from '@apollo/client' import { useMemo } from 'react' import styled from 'styled-components' +import AreaChart from '~/components/designSystem/graphs/AreaChart' +import ChartHeader from '~/components/designSystem/graphs/ChartHeader' +import { AreaMrrChartFakeData } from '~/components/designSystem/graphs/fixtures' +import { GenericPlaceholder } from '~/components/GenericPlaceholder' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { CurrencyEnum, GetMrrQuery, useGetMrrQuery } from '~/generated/graphql' @@ -16,11 +20,6 @@ import { import { TGraphProps } from './types' import { formatDataForAreaChart, TAreaChartDataResult } from './utils' -import AreaChart from '../designSystem/graphs/AreaChart' -import ChartHeader from '../designSystem/graphs/ChartHeader' -import { AreaMrrChartFakeData } from '../designSystem/graphs/fixtures' -import { GenericPlaceholder } from '../GenericPlaceholder' - gql` query getMrr($currency: CurrencyEnum!) { mrrs(currency: $currency) { diff --git a/src/components/graphs/Usage.tsx b/src/components/graphs/Usage.tsx index 389435c7d..856a5750c 100644 --- a/src/components/graphs/Usage.tsx +++ b/src/components/graphs/Usage.tsx @@ -3,6 +3,12 @@ import { DateTime } from 'luxon' import { useMemo, useState } from 'react' import styled, { css } from 'styled-components' +import { Skeleton, Typography } from '~/components/designSystem' +import ChartHeader from '~/components/designSystem/graphs/ChartHeader' +import { InvoicedUsageFakeData } from '~/components/designSystem/graphs/fixtures' +import InlineBarsChart from '~/components/designSystem/graphs/InlineBarsChart' +import { GenericPlaceholder } from '~/components/GenericPlaceholder' +import { ChartWrapper } from '~/components/layouts/Charts' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { @@ -21,13 +27,6 @@ import { import { TGraphProps } from './types' import { getLastTwelveMonthsNumbersUntilNow } from './utils' -import { Skeleton, Typography } from '../designSystem' -import ChartHeader from '../designSystem/graphs/ChartHeader' -import { InvoicedUsageFakeData } from '../designSystem/graphs/fixtures' -import InlineBarsChart from '../designSystem/graphs/InlineBarsChart' -import { GenericPlaceholder } from '../GenericPlaceholder' -import { ChartWrapper } from '../layouts/Charts' - export const LAST_USAGE_GRAPH_LINE_KEY_NAME = 'Others' const NUMBER_OF_BM_DISPLAYED = 5 diff --git a/src/components/graphs/__tests__/Gross.test.ts b/src/components/graphs/__tests__/Gross.test.ts index c5e172931..7c79f32cd 100644 --- a/src/components/graphs/__tests__/Gross.test.ts +++ b/src/components/graphs/__tests__/Gross.test.ts @@ -1,12 +1,11 @@ import { DateTime } from 'luxon' import { AreaGrossRevenuesChartFakeData } from '~/components/designSystem/graphs/fixtures' +import { getAllDataForGrossDisplay } from '~/components/graphs/Gross' +import { AnalyticsPeriodScopeEnum } from '~/components/graphs/MonthSelectorDropdown' +import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '~/components/graphs/utils' import { CurrencyEnum } from '~/generated/graphql' -import { getAllDataForGrossDisplay } from '../Gross' -import { AnalyticsPeriodScopeEnum } from '../MonthSelectorDropdown' -import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '../utils' - describe('components/graphs/Gross', () => { describe('getAllDataForGrossDisplay', () => { it('should return 12 months on year blur mode', () => { diff --git a/src/components/graphs/__tests__/Invoices.test.ts b/src/components/graphs/__tests__/Invoices.test.ts index f6f1b1b61..1af323175 100644 --- a/src/components/graphs/__tests__/Invoices.test.ts +++ b/src/components/graphs/__tests__/Invoices.test.ts @@ -1,16 +1,15 @@ import { DateTime } from 'luxon' import { InvoiceCollectionsFakeData } from '~/components/designSystem/graphs/fixtures' -import { CurrencyEnum, InvoicePaymentStatusTypeEnum } from '~/generated/graphql' - import { extractDataForDisplay, fillInvoicesDataPerMonthForPaymentStatus, formatInvoiceCollectionsData, getAllDataForInvoicesDisplay, -} from '../Invoices' -import { AnalyticsPeriodScopeEnum } from '../MonthSelectorDropdown' -import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '../utils' +} from '~/components/graphs/Invoices' +import { AnalyticsPeriodScopeEnum } from '~/components/graphs/MonthSelectorDropdown' +import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '~/components/graphs/utils' +import { CurrencyEnum, InvoicePaymentStatusTypeEnum } from '~/generated/graphql' describe('components/graphs/Invoices', () => { describe('fillInvoicesDataPerMonthForPaymentStatus', () => { diff --git a/src/components/graphs/__tests__/Mrr.test.ts b/src/components/graphs/__tests__/Mrr.test.ts index 9492da290..49c25161d 100644 --- a/src/components/graphs/__tests__/Mrr.test.ts +++ b/src/components/graphs/__tests__/Mrr.test.ts @@ -1,12 +1,11 @@ import { DateTime } from 'luxon' import { AreaMrrChartFakeData } from '~/components/designSystem/graphs/fixtures' +import { AnalyticsPeriodScopeEnum } from '~/components/graphs/MonthSelectorDropdown' +import { getAllDataForMrrDisplay } from '~/components/graphs/Mrr' +import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '~/components/graphs/utils' import { CurrencyEnum } from '~/generated/graphql' -import { AnalyticsPeriodScopeEnum } from '../MonthSelectorDropdown' -import { getAllDataForMrrDisplay } from '../Mrr' -import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '../utils' - describe('components/graphs/Mrr', () => { describe('getAllDataForMrrDisplay', () => { it('should return 12 months on year blur mode', () => { diff --git a/src/components/graphs/__tests__/Usage.test.ts b/src/components/graphs/__tests__/Usage.test.ts index 218977f5d..5f6d5817b 100644 --- a/src/components/graphs/__tests__/Usage.test.ts +++ b/src/components/graphs/__tests__/Usage.test.ts @@ -1,12 +1,11 @@ import { DateTime } from 'luxon' import { InvoicedUsageFakeData } from '~/components/designSystem/graphs/fixtures' +import { AnalyticsPeriodScopeEnum } from '~/components/graphs/MonthSelectorDropdown' +import { getDataForUsageDisplay, LAST_USAGE_GRAPH_LINE_KEY_NAME } from '~/components/graphs/Usage' +import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '~/components/graphs/utils' import { CurrencyEnum } from '~/generated/graphql' -import { AnalyticsPeriodScopeEnum } from '../MonthSelectorDropdown' -import { getDataForUsageDisplay, LAST_USAGE_GRAPH_LINE_KEY_NAME } from '../Usage' -import { GRAPH_YEAR_MONTH_DATE_FORMAT } from '../utils' - describe('components/graphs/Usage', () => { describe('getDataForUsageDisplay', () => { it('should return data for year blur mode', () => { diff --git a/src/components/graphs/__tests__/utils.test.ts b/src/components/graphs/__tests__/utils.test.ts index d992506cf..6b7c304f7 100644 --- a/src/components/graphs/__tests__/utils.test.ts +++ b/src/components/graphs/__tests__/utils.test.ts @@ -1,15 +1,14 @@ import { DateTime } from 'luxon' -import { intlFormatNumber } from '~/core/formats/intlFormatNumber' -import { CurrencyEnum } from '~/generated/graphql' - import { formatDataForAreaChart, getLastTwelveMonthsNumbersUntilNow, GRAPH_YEAR_MONTH_DATE_FORMAT, padAndTransformDataOverLastTwelveMonth, TAreaChartDataResult, -} from '../utils' +} from '~/components/graphs/utils' +import { intlFormatNumber } from '~/core/formats/intlFormatNumber' +import { CurrencyEnum } from '~/generated/graphql' describe('components/graphs/utils', () => { describe('getLastTwelveMonthsNumbersUntilNow', () => { diff --git a/src/components/graphs/utils.ts b/src/components/graphs/utils.ts index f7cf1c323..f111f9681 100644 --- a/src/components/graphs/utils.ts +++ b/src/components/graphs/utils.ts @@ -1,11 +1,10 @@ import { DateTime } from 'luxon' +import { AreaChartDataType } from '~/components/designSystem/graphs/types' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { CurrencyEnum } from '~/generated/graphql' -import { AreaChartDataType } from '../designSystem/graphs/types' - export const GRAPH_YEAR_MONTH_DATE_FORMAT = 'LLL. yyyy' export type TAreaChartDataResult = { diff --git a/src/components/invoices/InvoiceCustomerInfos.tsx b/src/components/invoices/InvoiceCustomerInfos.tsx index 11c05372a..4c39bc651 100644 --- a/src/components/invoices/InvoiceCustomerInfos.tsx +++ b/src/components/invoices/InvoiceCustomerInfos.tsx @@ -5,6 +5,7 @@ import { memo } from 'react' import { generatePath, Link } from 'react-router-dom' import styled from 'styled-components' +import { ConditionalWrapper } from '~/components/ConditionalWrapper' import { Icon, Status, StatusType, Typography } from '~/components/designSystem' import { CountryCodes } from '~/core/constants/countryCodes' import { invoiceStatusMapping, paymentStatusMapping } from '~/core/constants/statusInvoiceMapping' @@ -14,8 +15,6 @@ import { InvoiceForInvoiceInfosFragment, InvoiceStatusTypeEnum } from '~/generat import { useInternationalization } from '~/hooks/core/useInternationalization' import { theme } from '~/styles' -import { ConditionalWrapper } from '../ConditionalWrapper' - gql` fragment InvoiceForInvoiceInfos on Invoice { number diff --git a/src/components/invoices/InvoicesList.tsx b/src/components/invoices/InvoicesList.tsx index 9d7bf7f76..f04583352 100644 --- a/src/components/invoices/InvoicesList.tsx +++ b/src/components/invoices/InvoicesList.tsx @@ -2,7 +2,19 @@ import { ApolloError, LazyQueryHookOptions } from '@apollo/client' import { useEffect, useRef } from 'react' import { generatePath, useNavigate, useSearchParams } from 'react-router-dom' +import { createCreditNoteForInvoiceButtonProps } from '~/components/creditNote/utils' import { Chip, InfiniteScroll, Status, Table, Tooltip, Typography } from '~/components/designSystem' +import { + AvailableFiltersEnum, + AvailableQuickFilters, + Filters, + isDraftUrlParams, + isOutstandingUrlParams, + isPaymentDisputeLostUrlParams, + isPaymentOverdueUrlParams, + isSucceededUrlParams, + isVoidedUrlParams, +} from '~/components/designSystem/Filters' import { UpdateInvoicePaymentStatusDialog, UpdateInvoicePaymentStatusDialogRef, @@ -12,6 +24,7 @@ import { FinalizeInvoiceDialogRef, } from '~/components/invoices/FinalizeInvoiceDialog' import { VoidInvoiceDialog, VoidInvoiceDialogRef } from '~/components/invoices/VoidInvoiceDialog' +import { PremiumWarningDialog, PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { addToast, hasDefinedGQLError } from '~/core/apolloClient' import { CustomerInvoiceDetailsTabsOptionsEnum } from '~/core/constants/NavigationEnum' import { invoiceStatusMapping, paymentStatusMapping } from '~/core/constants/statusInvoiceMapping' @@ -38,20 +51,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization' import { useCurrentUser } from '~/hooks/useCurrentUser' import { usePermissions } from '~/hooks/usePermissions' -import { createCreditNoteForInvoiceButtonProps } from '../creditNote/utils' -import { - AvailableFiltersEnum, - AvailableQuickFilters, - Filters, - isDraftUrlParams, - isOutstandingUrlParams, - isPaymentDisputeLostUrlParams, - isPaymentOverdueUrlParams, - isSucceededUrlParams, - isVoidedUrlParams, -} from '../designSystem/Filters' -import { PremiumWarningDialog, PremiumWarningDialogRef } from '../PremiumWarningDialog' - type TInvoiceListProps = { error: ApolloError | undefined fetchMore: Function diff --git a/src/components/invoices/details/InvoiceDetailsTable.tsx b/src/components/invoices/details/InvoiceDetailsTable.tsx index ac2bd4a7c..1453d5508 100644 --- a/src/components/invoices/details/InvoiceDetailsTable.tsx +++ b/src/components/invoices/details/InvoiceDetailsTable.tsx @@ -4,6 +4,14 @@ import { memo, RefObject } from 'react' import styled, { css } from 'styled-components' import { Button } from '~/components/designSystem' +import { DeleteAdjustedFeeDialogRef } from '~/components/invoices/details/DeleteAdjustedFeeDialog' +import { EditFeeDrawerRef } from '~/components/invoices/details/EditFeeDrawer' +import { InvoiceDetailsTableBodyLine } from '~/components/invoices/details/InvoiceDetailsTableBodyLine' +import { InvoiceDetailsTableFooter } from '~/components/invoices/details/InvoiceDetailsTableFooter' +import { InvoiceDetailsTableHeader } from '~/components/invoices/details/InvoiceDetailsTableHeader' +import { InvoiceDetailsTablePeriodLine } from '~/components/invoices/details/InvoiceDetailsTablePeriodLine' +import { InvoiceFeeAdvanceDetailsTable } from '~/components/invoices/details/InvoiceFeeAdvanceDetailsTable' +import { InvoiceFeeArrearsDetailsTable } from '~/components/invoices/details/InvoiceFeeArrearsDetailsTable' import { groupAndFormatFees, TExtendedRemainingFee } from '~/core/formats/formatInvoiceItemsMap' import { formatDateToTZ } from '~/core/timezone' import { @@ -25,15 +33,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization' import { useOrganizationInfos } from '~/hooks/useOrganizationInfos' import { theme } from '~/styles' -import { DeleteAdjustedFeeDialogRef } from './DeleteAdjustedFeeDialog' -import { EditFeeDrawerRef } from './EditFeeDrawer' -import { InvoiceDetailsTableBodyLine } from './InvoiceDetailsTableBodyLine' -import { InvoiceDetailsTableFooter } from './InvoiceDetailsTableFooter' -import { InvoiceDetailsTableHeader } from './InvoiceDetailsTableHeader' -import { InvoiceDetailsTablePeriodLine } from './InvoiceDetailsTablePeriodLine' -import { InvoiceFeeAdvanceDetailsTable } from './InvoiceFeeAdvanceDetailsTable' -import { InvoiceFeeArrearsDetailsTable } from './InvoiceFeeArrearsDetailsTable' - gql` fragment FeeForInvoiceDetailsTable on Fee { id diff --git a/src/components/invoices/details/__tests__/InvoiceDetailsTableBodyLine.test.ts b/src/components/invoices/details/__tests__/InvoiceDetailsTableBodyLine.test.ts index fe6bd921b..8089d09b6 100644 --- a/src/components/invoices/details/__tests__/InvoiceDetailsTableBodyLine.test.ts +++ b/src/components/invoices/details/__tests__/InvoiceDetailsTableBodyLine.test.ts @@ -1,8 +1,7 @@ +import { calculateIfDetailsShouldBeDisplayed } from '~/components/invoices/details/InvoiceDetailsTableBodyLine' import { TExtendedRemainingFee } from '~/core/formats/formatInvoiceItemsMap' import { AdjustedFeeTypeEnum, ChargeModelEnum, FeeTypesEnum } from '~/generated/graphql' -import { calculateIfDetailsShouldBeDisplayed } from '../InvoiceDetailsTableBodyLine' - type TPrepare = { fee?: TExtendedRemainingFee isTrueUpFee?: boolean diff --git a/src/components/layouts/Settings.tsx b/src/components/layouts/Settings.tsx index aab52b382..430ac5481 100644 --- a/src/components/layouts/Settings.tsx +++ b/src/components/layouts/Settings.tsx @@ -1,9 +1,8 @@ import { PropsWithChildren } from 'react' +import { Skeleton, Typography } from '~/components/designSystem' import { tw } from '~/styles/utils' -import { Skeleton, Typography } from '../designSystem' - export const SettingsPaddedContainer = ({ children, className, diff --git a/src/components/plans/ChargeAccordion.tsx b/src/components/plans/ChargeAccordion.tsx index 1459b9d8a..4c07b3e8b 100644 --- a/src/components/plans/ChargeAccordion.tsx +++ b/src/components/plans/ChargeAccordion.tsx @@ -4,6 +4,7 @@ import { FormikErrors, FormikProps } from 'formik' import { memo, MouseEvent, RefObject, useCallback, useEffect, useMemo, useState } from 'react' import styled from 'styled-components' +import { ConditionalWrapper } from '~/components/ConditionalWrapper' import { Accordion, Alert, @@ -14,7 +15,9 @@ import { Typography, } from '~/components/designSystem' import { AmountInput, ComboBox, ComboboxItem, RadioGroupField, Switch } from '~/components/form' +import { EditInvoiceDisplayNameRef } from '~/components/invoices/EditInvoiceDisplayName' import { ChargeBillingRadioGroup } from '~/components/plans/ChargeBillingRadioGroup' +import { PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { useDuplicatePlanVar } from '~/core/apolloClient' import { ALL_FILTER_VALUES, @@ -55,10 +58,6 @@ import { ChargeWrapperSwitch } from './ChargeWrapperSwitch' import { RemoveChargeWarningDialogRef } from './RemoveChargeWarningDialog' import { LocalChargeInput, PlanFormInput } from './types' -import { ConditionalWrapper } from '../ConditionalWrapper' -import { EditInvoiceDisplayNameRef } from '../invoices/EditInvoiceDisplayName' -import { PremiumWarningDialogRef } from '../PremiumWarningDialog' - const buildChargeDefaultPropertyId = (chargeIndex: number) => `charge-${chargeIndex}-default-property-accordion` @@ -356,7 +355,7 @@ export const ChargeAccordion = memo( diff --git a/src/components/plans/ChargeFilter.tsx b/src/components/plans/ChargeFilter.tsx index cfd2a897c..ec77ecdfa 100644 --- a/src/components/plans/ChargeFilter.tsx +++ b/src/components/plans/ChargeFilter.tsx @@ -2,6 +2,8 @@ import { Stack } from '@mui/material' import { memo, useEffect, useMemo, useState } from 'react' import styled from 'styled-components' +import { Button, Chip, Tooltip, Typography } from '~/components/designSystem' +import { BasicComboBoxData, MultipleComboBox } from '~/components/form' import { ALL_FILTER_VALUES, MUI_INPUT_BASE_ROOT_CLASSNAME, @@ -14,9 +16,6 @@ import { theme } from '~/styles' import { LocalChargeFilterInput } from './types' import { transformFilterObjectToString } from './utils' -import { Button, Chip, Tooltip, Typography } from '../designSystem' -import { BasicComboBoxData, MultipleComboBox } from '../form' - export const buildChargeFilterAddFilterButtonId = (chargeIndex: number, filterIndex: number) => `charge-${chargeIndex}-add-filter-${filterIndex}` diff --git a/src/components/plans/ChargePercentage.tsx b/src/components/plans/ChargePercentage.tsx index a2594e7d2..33fd54784 100644 --- a/src/components/plans/ChargePercentage.tsx +++ b/src/components/plans/ChargePercentage.tsx @@ -7,6 +7,7 @@ import styled from 'styled-components' import { Alert, Button, Popper, Tooltip, Typography } from '~/components/designSystem' import { AmountInput, TextInput } from '~/components/form' +import { PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { MIN_AMOUNT_SHOULD_BE_LOWER_THAN_MAX_ERROR } from '~/core/constants/form' import { getCurrencySymbol, intlFormatNumber } from '~/core/formats/intlFormatNumber' import { CurrencyEnum } from '~/generated/graphql' @@ -21,8 +22,6 @@ import { PlanFormInput, } from './types' -import { PremiumWarningDialogRef } from '../PremiumWarningDialog' - gql` fragment PercentageCharge on Properties { fixedAmount diff --git a/src/components/plans/ChargeWrapperSwitch.tsx b/src/components/plans/ChargeWrapperSwitch.tsx index 18c65323d..8a730bbde 100644 --- a/src/components/plans/ChargeWrapperSwitch.tsx +++ b/src/components/plans/ChargeWrapperSwitch.tsx @@ -3,18 +3,20 @@ import { memo, RefObject } from 'react' import { ChargePercentage } from '~/components/plans/ChargePercentage' import { CustomCharge } from '~/components/plans/CustomCharge' +import { DynamicCharge } from '~/components/plans/DynamicCharge' import { GraduatedChargeTable } from '~/components/plans/GraduatedChargeTable' +import { GraduatedPercentageChargeTable } from '~/components/plans/GraduatedPercentageChargeTable' import { PackageCharge } from '~/components/plans/PackageCharge' +import { StandardCharge } from '~/components/plans/StandardCharge' +import { + LocalChargeFilterInput, + LocalPropertiesInput, + PlanFormInput, +} from '~/components/plans/types' +import { VolumeChargeTable } from '~/components/plans/VolumeChargeTable' +import { PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { ChargeModelEnum, CurrencyEnum } from '~/generated/graphql' -import { DynamicCharge } from './DynamicCharge' -import { GraduatedPercentageChargeTable } from './GraduatedPercentageChargeTable' -import { StandardCharge } from './StandardCharge' -import { LocalChargeFilterInput, LocalPropertiesInput, PlanFormInput } from './types' -import { VolumeChargeTable } from './VolumeChargeTable' - -import { PremiumWarningDialogRef } from '../PremiumWarningDialog' - interface ChargeWrapperSwitchProps { currency: CurrencyEnum formikProps: FormikProps diff --git a/src/components/plans/ChargesSection.tsx b/src/components/plans/ChargesSection.tsx index 8b3ac44ac..242ce1e6a 100644 --- a/src/components/plans/ChargesSection.tsx +++ b/src/components/plans/ChargesSection.tsx @@ -6,6 +6,8 @@ import styled from 'styled-components' import { Button, Card, Popper, Tooltip, Typography } from '~/components/designSystem' import { ComboBox, ComboboxItem, SwitchField } from '~/components/form' +import { EditInvoiceDisplayNameRef } from '~/components/invoices/EditInvoiceDisplayName' +import { PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { FORM_TYPE_ENUM, MUI_INPUT_BASE_ROOT_CLASSNAME, @@ -30,9 +32,6 @@ import { } from './RemoveChargeWarningDialog' import { LocalChargeInput, PlanFormInput } from './types' -import { EditInvoiceDisplayNameRef } from '../invoices/EditInvoiceDisplayName' -import { PremiumWarningDialogRef } from '../PremiumWarningDialog' - const RESULT_LIMIT = 50 gql` diff --git a/src/components/plans/CommitmentsSection.tsx b/src/components/plans/CommitmentsSection.tsx index c4a0d7dd4..f3eabf6b3 100644 --- a/src/components/plans/CommitmentsSection.tsx +++ b/src/components/plans/CommitmentsSection.tsx @@ -5,6 +5,9 @@ import { RefObject, useEffect, useMemo, useState } from 'react' import styled from 'styled-components' import { Accordion, Button, Chip, Icon, Tooltip, Typography } from '~/components/designSystem' +import { AmountInputField, ComboBox, ComboboxItem } from '~/components/form' +import { EditInvoiceDisplayNameRef } from '~/components/invoices/EditInvoiceDisplayName' +import { PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { MUI_INPUT_BASE_ROOT_CLASSNAME, SEARCH_TAX_INPUT_FOR_MIN_COMMITMENT_CLASSNAME, @@ -22,10 +25,6 @@ import { NAV_HEIGHT, theme } from '~/styles' import { mapChargeIntervalCopy } from './ChargeAccordion' import { PlanFormInput } from './types' -import { AmountInputField, ComboBox, ComboboxItem } from '../form' -import { EditInvoiceDisplayNameRef } from '../invoices/EditInvoiceDisplayName' -import { PremiumWarningDialogRef } from '../PremiumWarningDialog' - gql` query getTaxesForCommitments($limit: Int, $page: Int) { taxes(limit: $limit, page: $page) { diff --git a/src/components/plans/DynamicCharge.tsx b/src/components/plans/DynamicCharge.tsx index 1c685ffe9..10c94bac9 100644 --- a/src/components/plans/DynamicCharge.tsx +++ b/src/components/plans/DynamicCharge.tsx @@ -2,13 +2,15 @@ import { gql } from '@apollo/client' import { FormikProps } from 'formik' import { memo, useCallback, useEffect, useState } from 'react' +import { Alert, Button, Tooltip, Typography } from '~/components/designSystem' +import { TextInput } from '~/components/form' +import { + LocalChargeFilterInput, + LocalPropertiesInput, + PlanFormInput, +} from '~/components/plans/types' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { LocalChargeFilterInput, LocalPropertiesInput, PlanFormInput } from './types' - -import { Alert, Button, Tooltip, Typography } from '../designSystem' -import { TextInput } from '../form' - gql` fragment DynamicCharge on Properties { groupedBy diff --git a/src/components/plans/FixedFeeSection.tsx b/src/components/plans/FixedFeeSection.tsx index 16fc073a2..3eeff21f7 100644 --- a/src/components/plans/FixedFeeSection.tsx +++ b/src/components/plans/FixedFeeSection.tsx @@ -6,6 +6,7 @@ import styled from 'styled-components' import { Accordion, Button, Card, Chip, Icon, Tooltip, Typography } from '~/components/designSystem' import { AmountInputField, RadioGroupField, TextInputField } from '~/components/form' +import { EditInvoiceDisplayNameRef } from '~/components/invoices/EditInvoiceDisplayName' import { FORM_TYPE_ENUM, getIntervalTranslationKey } from '~/core/constants/form' import { getCurrencySymbol, intlFormatNumber } from '~/core/formats/intlFormatNumber' import { CurrencyEnum } from '~/generated/graphql' @@ -14,8 +15,6 @@ import { NAV_HEIGHT, theme } from '~/styles' import { PlanFormInput } from './types' -import { EditInvoiceDisplayNameRef } from '../invoices/EditInvoiceDisplayName' - gql` fragment PlanForFixedFeeSection on Plan { id diff --git a/src/components/plans/PackageCharge.tsx b/src/components/plans/PackageCharge.tsx index 7ef12dda9..db423553b 100644 --- a/src/components/plans/PackageCharge.tsx +++ b/src/components/plans/PackageCharge.tsx @@ -6,7 +6,7 @@ import { memo, useCallback } from 'react' import styled from 'styled-components' import { Alert, Typography } from '~/components/designSystem' -import { TextInput } from '~/components/form' +import { AmountInput, TextInput } from '~/components/form' import { getCurrencySymbol, intlFormatNumber } from '~/core/formats/intlFormatNumber' import { CurrencyEnum } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' @@ -14,8 +14,6 @@ import { theme } from '~/styles' import { LocalChargeFilterInput, LocalPropertiesInput, PlanFormInput } from './types' -import { AmountInput } from '../form/AmountInput/AmountInput' - gql` fragment PackageCharge on Properties { amount diff --git a/src/components/plans/StandardCharge.tsx b/src/components/plans/StandardCharge.tsx index f71cc4b9e..e392ff938 100644 --- a/src/components/plans/StandardCharge.tsx +++ b/src/components/plans/StandardCharge.tsx @@ -4,7 +4,8 @@ import { FormikProps } from 'formik' import { memo, useCallback, useEffect, useState } from 'react' import styled from 'styled-components' -import { TextInput } from '~/components/form' +import { Button, Tooltip, Typography } from '~/components/designSystem' +import { AmountInput, TextInput } from '~/components/form' import { getCurrencySymbol } from '~/core/formats/intlFormatNumber' import { CurrencyEnum } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' @@ -12,9 +13,6 @@ import { theme } from '~/styles' import { LocalChargeFilterInput, LocalPropertiesInput, PlanFormInput } from './types' -import { Button, Tooltip, Typography } from '../designSystem' -import { AmountInput } from '../form/AmountInput/AmountInput' - gql` fragment StandardCharge on Properties { amount diff --git a/src/components/plans/__tests__/ChargeAccordion.test.tsx b/src/components/plans/__tests__/ChargeAccordion.test.tsx index cf727797e..c16894044 100644 --- a/src/components/plans/__tests__/ChargeAccordion.test.tsx +++ b/src/components/plans/__tests__/ChargeAccordion.test.tsx @@ -4,16 +4,15 @@ import { FormikProps, useFormik } from 'formik' import { object } from 'yup' import { EditInvoiceDisplayNameRef } from '~/components/invoices/EditInvoiceDisplayName' +import { ChargeAccordion } from '~/components/plans/ChargeAccordion' +import { LocalChargeInput, PlanFormInput } from '~/components/plans/types' +import { transformFilterObjectToString } from '~/components/plans/utils' import { MUI_BUTTON_BASE_ROOT_CLASSNAME } from '~/core/constants/form' import getPropertyShape from '~/core/serializers/getPropertyShape' import { chargeSchema } from '~/formValidation/chargeSchema' import { AggregationTypeEnum, ChargeModelEnum, CurrencyEnum } from '~/generated/graphql' import { render } from '~/test-utils' -import { ChargeAccordion } from '../ChargeAccordion' -import { LocalChargeInput, PlanFormInput } from '../types' -import { transformFilterObjectToString } from '../utils' - type PrepareProps = { properties?: LocalChargeInput['properties'] filters?: LocalChargeInput['filters'] diff --git a/src/components/plans/__tests__/utils.test.ts b/src/components/plans/__tests__/utils.test.ts index c8051b0cf..d4dcca332 100644 --- a/src/components/plans/__tests__/utils.test.ts +++ b/src/components/plans/__tests__/utils.test.ts @@ -1,7 +1,6 @@ +import { transformFilterObjectToString } from '~/components/plans/utils' import { ALL_FILTER_VALUES } from '~/core/constants/form' -import { transformFilterObjectToString } from '../utils' - describe('utils', () => { describe('transformFilterObjectToString', () => { it('should return a string with the filter object keys and no values', () => { diff --git a/src/components/plans/details/PlanDetailsAdvancedSettingsSection.tsx b/src/components/plans/details/PlanDetailsAdvancedSettingsSection.tsx index ac8366f8f..e953aeffe 100644 --- a/src/components/plans/details/PlanDetailsAdvancedSettingsSection.tsx +++ b/src/components/plans/details/PlanDetailsAdvancedSettingsSection.tsx @@ -3,6 +3,7 @@ import { Stack } from '@mui/material' import styled from 'styled-components' import { Accordion, Typography } from '~/components/designSystem' +import DetailsTableDisplay from '~/components/details/DetailsTableDisplay' import { mapChargeIntervalCopy } from '~/components/plans/ChargeAccordion' import { PROGRESSIVE_BILLING_DOC_URL } from '~/core/constants/externalUrls' import { getIntervalTranslationKey } from '~/core/constants/form' @@ -12,8 +13,6 @@ import { CurrencyEnum, EditPlanFragment, PlanInterval } from '~/generated/graphq import { useInternationalization } from '~/hooks/core/useInternationalization' import { DetailsInfoGrid, DetailsSectionTitle } from '~/styles/detailsPage' -import DetailsTableDisplay from '../../details/DetailsTableDisplay' - const PlanDetailsAdvancedSettingsSection = ({ currency, plan, diff --git a/src/components/plans/details/PlanDetailsChargeWrapperSwitch.tsx b/src/components/plans/details/PlanDetailsChargeWrapperSwitch.tsx index df4010451..aa48990fc 100644 --- a/src/components/plans/details/PlanDetailsChargeWrapperSwitch.tsx +++ b/src/components/plans/details/PlanDetailsChargeWrapperSwitch.tsx @@ -2,15 +2,14 @@ import { useId } from 'react' import styled from 'styled-components' import { Alert, Chip } from '~/components/designSystem' +import DetailsJSONDisplay from '~/components/details/DetailsJSONDisplay' +import DetailsTableDisplay from '~/components/details/DetailsTableDisplay' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { ChargeModelEnum, CurrencyEnum, Maybe, Properties } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' import { theme } from '~/styles' import { DetailsInfoGrid, DetailsInfoItem } from '~/styles/detailsPage' -import DetailsJSONDisplay from '../../details/DetailsJSONDisplay' -import DetailsTableDisplay from '../../details/DetailsTableDisplay' - const PlanDetailsChargeWrapperSwitch = ({ currency, chargeModel, diff --git a/src/components/plans/details/PlanDetailsChargesSection.tsx b/src/components/plans/details/PlanDetailsChargesSection.tsx index c39e06c5c..93bf2c527 100644 --- a/src/components/plans/details/PlanDetailsChargesSection.tsx +++ b/src/components/plans/details/PlanDetailsChargesSection.tsx @@ -2,6 +2,8 @@ import { Stack } from '@mui/material' import styled from 'styled-components' import { Accordion, Typography } from '~/components/designSystem' +import { mapChargeIntervalCopy } from '~/components/plans/ChargeAccordion' +import PlanDetailsChargesSectionAccordion from '~/components/plans/details/PlanDetailsChargesSectionAccordion' import { chargeModelLookupTranslation } from '~/core/constants/form' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' @@ -16,10 +18,6 @@ import { useInternationalization } from '~/hooks/core/useInternationalization' import { theme } from '~/styles' import { DetailsInfoGrid } from '~/styles/detailsPage' -import PlanDetailsChargesSectionAccordion from './PlanDetailsChargesSectionAccordion' - -import { mapChargeIntervalCopy } from '../ChargeAccordion' - const PlanDetailsChargesSection = ({ currency, plan, diff --git a/src/components/plans/details/PlanDetailsFixedFeeAccordion.tsx b/src/components/plans/details/PlanDetailsFixedFeeAccordion.tsx index 6e2f62306..6e26bfcdc 100644 --- a/src/components/plans/details/PlanDetailsFixedFeeAccordion.tsx +++ b/src/components/plans/details/PlanDetailsFixedFeeAccordion.tsx @@ -1,12 +1,11 @@ import { Accordion, Typography } from '~/components/designSystem' +import DetailsTableDisplay from '~/components/details/DetailsTableDisplay' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { CurrencyEnum, EditPlanFragment } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' import { DetailsInfoGrid } from '~/styles/detailsPage' -import DetailsTableDisplay from '../../details/DetailsTableDisplay' - const PlanDetailsFixedFeeAccordion = ({ plan }: { plan?: EditPlanFragment | null }) => { const { translate } = useInternationalization() diff --git a/src/components/settings/LanguageSettingsButton.tsx b/src/components/settings/LanguageSettingsButton.tsx index 588efdd0e..9f14a2c7e 100644 --- a/src/components/settings/LanguageSettingsButton.tsx +++ b/src/components/settings/LanguageSettingsButton.tsx @@ -1,11 +1,10 @@ import { FC } from 'react' +import { Button, Popper } from '~/components/designSystem' import { LocaleEnum } from '~/core/translations' import { useInternationalization } from '~/hooks/core/useInternationalization' import { MenuPopper } from '~/styles' -import { Button, Popper } from '../designSystem' - const mapLanguageKey = (language: LocaleEnum) => { switch (language) { case LocaleEnum.fr: diff --git a/src/components/settings/PreviewEmailLayout.tsx b/src/components/settings/PreviewEmailLayout.tsx index ec8fdb9bd..2dd0c0a73 100644 --- a/src/components/settings/PreviewEmailLayout.tsx +++ b/src/components/settings/PreviewEmailLayout.tsx @@ -1,5 +1,6 @@ import { FC, PropsWithChildren, useRef } from 'react' +import { Avatar, Button, Skeleton, Tooltip, Typography } from '~/components/designSystem' import { LocaleEnum } from '~/core/translations' import { useContextualLocale } from '~/hooks/core/useContextualLocale' import { useInternationalization } from '~/hooks/core/useInternationalization' @@ -11,8 +12,6 @@ import { UpdateOrganizationLogoDialogRef, } from './emails/UpdateOrganizationLogoDialog' -import { Avatar, Button, Skeleton, Tooltip, Typography } from '../designSystem' - interface PreviewEmailLayoutProps extends PropsWithChildren { language: LocaleEnum emailObject: string diff --git a/src/components/settings/dunnings/PreviewCampaignEmailDrawer.tsx b/src/components/settings/dunnings/PreviewCampaignEmailDrawer.tsx index e35b59132..0ccfeda49 100644 --- a/src/components/settings/dunnings/PreviewCampaignEmailDrawer.tsx +++ b/src/components/settings/dunnings/PreviewCampaignEmailDrawer.tsx @@ -3,6 +3,8 @@ import { forwardRef, useImperativeHandle, useRef, useState } from 'react' import { Button, Drawer, DrawerRef, Typography } from '~/components/designSystem' import { DunningEmail, DunningEmailSkeleton } from '~/components/emails/DunningEmail' +import { LanguageSettingsButton } from '~/components/settings/LanguageSettingsButton' +import { PreviewEmailLayout } from '~/components/settings/PreviewEmailLayout' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { LocaleEnum } from '~/core/translations' import { @@ -12,9 +14,6 @@ import { import { useContextualLocale } from '~/hooks/core/useContextualLocale' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { LanguageSettingsButton } from '../LanguageSettingsButton' -import { PreviewEmailLayout } from '../PreviewEmailLayout' - gql` fragment OrganizationInfoForPreviewDunningCampaign on CurrentOrganization { name diff --git a/src/components/settings/invoices/DeleteCustomSectionDialog.tsx b/src/components/settings/invoices/DeleteCustomSectionDialog.tsx index e73fc1f1d..850b2e25b 100644 --- a/src/components/settings/invoices/DeleteCustomSectionDialog.tsx +++ b/src/components/settings/invoices/DeleteCustomSectionDialog.tsx @@ -2,12 +2,11 @@ import { gql } from '@apollo/client' import { forwardRef, useImperativeHandle, useRef, useState } from 'react' import { DialogRef, Typography } from '~/components/designSystem' +import { WarningDialog } from '~/components/WarningDialog' import { addToast } from '~/core/apolloClient' import { DeleteCustomSectionFragment, useDeleteCustomSectionMutation } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { WarningDialog } from '../../WarningDialog' - gql` fragment DeleteCustomSection on InvoiceCustomSection { id diff --git a/src/components/settings/invoices/DeleteOrganizationVatRateDialog.tsx b/src/components/settings/invoices/DeleteOrganizationVatRateDialog.tsx index 3443b6468..67245cb22 100644 --- a/src/components/settings/invoices/DeleteOrganizationVatRateDialog.tsx +++ b/src/components/settings/invoices/DeleteOrganizationVatRateDialog.tsx @@ -2,6 +2,7 @@ import { gql } from '@apollo/client' import { forwardRef, useImperativeHandle, useRef, useState } from 'react' import { DialogRef, Typography } from '~/components/designSystem' +import { WarningDialog } from '~/components/WarningDialog' import { addToast } from '~/core/apolloClient' import { DeleteOrganizationVatRateFragment, @@ -10,8 +11,6 @@ import { } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' -import { WarningDialog } from '../../WarningDialog' - gql` fragment DeleteOrganizationVatRate on Tax { id diff --git a/src/components/subscriptions/SubscriptionCurrentUsageTable.tsx b/src/components/subscriptions/SubscriptionCurrentUsageTable.tsx index 2306532ff..73bc6f926 100644 --- a/src/components/subscriptions/SubscriptionCurrentUsageTable.tsx +++ b/src/components/subscriptions/SubscriptionCurrentUsageTable.tsx @@ -4,6 +4,10 @@ import { useRef } from 'react' import { Link } from 'react-router-dom' import styled from 'styled-components' +import { + SubscriptionUsageDetailDrawer, + SubscriptionUsageDetailDrawerRef, +} from '~/components/customers/usage/SubscriptionUsageDetailDrawer' import { Alert, Button, Skeleton, Table, Tooltip, Typography } from '~/components/designSystem' import { GenericPlaceholder } from '~/components/GenericPlaceholder' import { LagoGQLError } from '~/core/apolloClient' @@ -32,11 +36,6 @@ import EmptyImage from '~/public/images/maneki/empty.svg' import ErrorImage from '~/public/images/maneki/error.svg' import { NAV_HEIGHT, theme } from '~/styles' -import { - SubscriptionUsageDetailDrawer, - SubscriptionUsageDetailDrawerRef, -} from '../customers/usage/SubscriptionUsageDetailDrawer' - gql` query customerForSubscriptionUsage($customerId: ID!) { customer(id: $customerId) { diff --git a/src/components/subscriptions/SubscriptionDetailsOverview.tsx b/src/components/subscriptions/SubscriptionDetailsOverview.tsx index 5401fd288..7115aed73 100644 --- a/src/components/subscriptions/SubscriptionDetailsOverview.tsx +++ b/src/components/subscriptions/SubscriptionDetailsOverview.tsx @@ -2,6 +2,8 @@ import { gql } from '@apollo/client' import { useParams } from 'react-router-dom' import styled from 'styled-components' +import PlanDetailsOverview from '~/components/plans/details/PlanDetailsOverview' +import SkeletonDetailsPage, { LoadingSkeletonWrapper } from '~/components/SkeletonDetailsPage' import { SubscriptionForSubscriptionInformationsFragmentDoc, useGetSubscriptionForDetailsOverviewQuery, @@ -10,9 +12,6 @@ import { theme } from '~/styles' import SubscriptionInformations from './SubscriptionInformations' -import PlanDetailsOverview from '../plans/details/PlanDetailsOverview' -import SkeletonDetailsPage, { LoadingSkeletonWrapper } from '../SkeletonDetailsPage' - gql` query getSubscriptionForDetailsOverview($subscriptionId: ID!) { subscription(id: $subscriptionId) { diff --git a/src/components/subscriptions/SubscriptionInformations.tsx b/src/components/subscriptions/SubscriptionInformations.tsx index 997b72a76..7eaa951ed 100644 --- a/src/components/subscriptions/SubscriptionInformations.tsx +++ b/src/components/subscriptions/SubscriptionInformations.tsx @@ -3,6 +3,8 @@ import { DateTime } from 'luxon' import { generatePath, Link } from 'react-router-dom' import styled from 'styled-components' +import { ConditionalWrapper } from '~/components/ConditionalWrapper' +import { Alert, Status, StatusType } from '~/components/designSystem' import { PlanDetailsTabsOptionsEnum } from '~/core/constants/tabsOptions' import { CUSTOMER_DETAILS_ROUTE, CUSTOMER_SUBSCRIPTION_PLAN_DETAILS } from '~/core/router' import { @@ -14,9 +16,6 @@ import { useOrganizationInfos } from '~/hooks/useOrganizationInfos' import { theme } from '~/styles' import { DetailsInfoGrid, DetailsInfoItem, DetailsSectionTitle } from '~/styles/detailsPage' -import { ConditionalWrapper } from '../ConditionalWrapper' -import { Alert, Status, StatusType } from '../designSystem' - gql` fragment SubscriptionForSubscriptionInformations on Subscription { id diff --git a/src/components/subscriptions/SubscriptionUsageLifetimeGraph.tsx b/src/components/subscriptions/SubscriptionUsageLifetimeGraph.tsx index 623bd5bbd..37e74801f 100644 --- a/src/components/subscriptions/SubscriptionUsageLifetimeGraph.tsx +++ b/src/components/subscriptions/SubscriptionUsageLifetimeGraph.tsx @@ -3,6 +3,11 @@ import { Stack } from '@mui/material' import { useMemo } from 'react' import { generatePath } from 'react-router-dom' +import { ButtonLink, Icon, Skeleton, Tooltip, Typography } from '~/components/designSystem' +import ChartHeader from '~/components/designSystem/graphs/ChartHeader' +import { subscriptionLifetimeUsageFakeData } from '~/components/designSystem/graphs/fixtures' +import InlineBarsChart from '~/components/designSystem/graphs/InlineBarsChart' +import { GenericPlaceholder } from '~/components/GenericPlaceholder' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { UPDATE_PLAN_ROUTE, UPDATE_SUBSCRIPTION } from '~/core/router' import { deserializeAmount } from '~/core/serializers/serializeAmount' @@ -24,12 +29,6 @@ import { tw } from '~/styles/utils' import { getLifetimeGraphPercentages } from './utils' -import { ButtonLink, Icon, Skeleton, Tooltip, Typography } from '../designSystem' -import ChartHeader from '../designSystem/graphs/ChartHeader' -import { subscriptionLifetimeUsageFakeData } from '../designSystem/graphs/fixtures' -import InlineBarsChart from '../designSystem/graphs/InlineBarsChart' -import { GenericPlaceholder } from '../GenericPlaceholder' - export const LAST_USAGE_GRAPH_LINE_KEY_NAME = 'Others' export const REDIRECTION_ORIGIN_SUBSCRIPTION_USAGE = 'subscriptionUsage' diff --git a/src/components/subscriptions/__tests__/utils.test.ts b/src/components/subscriptions/__tests__/utils.test.ts index 6e2e992cd..634a75e57 100644 --- a/src/components/subscriptions/__tests__/utils.test.ts +++ b/src/components/subscriptions/__tests__/utils.test.ts @@ -1,7 +1,6 @@ +import { getLifetimeGraphPercentages } from '~/components/subscriptions/utils' import { SubscriptionLifetimeUsage } from '~/generated/graphql' -import { getLifetimeGraphPercentages } from '../utils' - describe('subscriptions utils tests', () => { it('should return the appropriate calculated percentages', () => { expect( diff --git a/src/components/wallets/CustomerWalletList.tsx b/src/components/wallets/CustomerWalletList.tsx index 889f7fe13..6de33345b 100644 --- a/src/components/wallets/CustomerWalletList.tsx +++ b/src/components/wallets/CustomerWalletList.tsx @@ -5,6 +5,14 @@ import { generatePath, useNavigate } from 'react-router-dom' import { Button, InfiniteScroll, Popper, Typography } from '~/components/designSystem' import { GenericPlaceholder } from '~/components/GenericPlaceholder' import { PageSectionTitle } from '~/components/layouts/Section' +import { PremiumWarningDialog, PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' +import { + TerminateCustomerWalletDialog, + TerminateCustomerWalletDialogRef, +} from '~/components/wallets/TerminateCustomerWalletDialog' +import { TopupWalletDialog, TopupWalletDialogRef } from '~/components/wallets/TopupWalletDialog' +import { VoidWalletDialog, VoidWalletDialogRef } from '~/components/wallets/VoidWalletDialog' +import { WalletAccordion, WalletAccordionSkeleton } from '~/components/wallets/WalletAccordion' import { CREATE_WALLET_ROUTE, EDIT_WALLET_ROUTE } from '~/core/router' import { TimezoneEnum, @@ -20,16 +28,6 @@ import { usePermissions } from '~/hooks/usePermissions' import ErrorImage from '~/public/images/maneki/error.svg' import { MenuPopper } from '~/styles' -import { - TerminateCustomerWalletDialog, - TerminateCustomerWalletDialogRef, -} from './TerminateCustomerWalletDialog' -import { TopupWalletDialog, TopupWalletDialogRef } from './TopupWalletDialog' -import { VoidWalletDialog, VoidWalletDialogRef } from './VoidWalletDialog' -import { WalletAccordion, WalletAccordionSkeleton } from './WalletAccordion' - -import { PremiumWarningDialog, PremiumWarningDialogRef } from '../PremiumWarningDialog' - gql` fragment CustomerWallet on Wallet { ...WalletForTopup diff --git a/src/components/wallets/WalletAccordion.tsx b/src/components/wallets/WalletAccordion.tsx index 48fa59c21..64a901fbb 100644 --- a/src/components/wallets/WalletAccordion.tsx +++ b/src/components/wallets/WalletAccordion.tsx @@ -16,7 +16,11 @@ import { Tooltip, Typography, } from '~/components/designSystem' +import { PremiumWarningDialogRef } from '~/components/PremiumWarningDialog' import { TimezoneDate } from '~/components/TimezoneDate' +import { TopupWalletDialogRef } from '~/components/wallets/TopupWalletDialog' +import { WalletTransactionList } from '~/components/wallets/WalletTransactionList' +import { WalletTransactionListItem } from '~/components/wallets/WalletTransactionListItem' import { intlFormatNumber } from '~/core/formats/intlFormatNumber' import { deserializeAmount } from '~/core/serializers/serializeAmount' import { @@ -32,12 +36,6 @@ import { useCurrentUser } from '~/hooks/useCurrentUser' import { useOrganizationInfos } from '~/hooks/useOrganizationInfos' import { theme } from '~/styles' -import { TopupWalletDialogRef } from './TopupWalletDialog' -import { WalletTransactionList } from './WalletTransactionList' -import { WalletTransactionListItem } from './WalletTransactionListItem' - -import { PremiumWarningDialogRef } from '../PremiumWarningDialog' - gql` fragment WalletAccordion on Wallet { id diff --git a/src/components/wallets/WalletTransactionListItem/__tests__/index.test.tsx b/src/components/wallets/WalletTransactionListItem/__tests__/index.test.tsx index b1ee1d46c..c3c9dcd28 100644 --- a/src/components/wallets/WalletTransactionListItem/__tests__/index.test.tsx +++ b/src/components/wallets/WalletTransactionListItem/__tests__/index.test.tsx @@ -1,5 +1,9 @@ import { act, cleanup, screen } from '@testing-library/react' +import { + WalletTransactionListItem, + WalletTransactionListItemProps, +} from '~/components/wallets/WalletTransactionListItem' import { GetOrganizationInfosDocument, TimezoneEnum, @@ -9,8 +13,6 @@ import { } from '~/generated/graphql' import { render } from '~/test-utils' -import { WalletTransactionListItem, WalletTransactionListItemProps } from '../index' - const CREDITS = '10' const AMOUNT = '100' diff --git a/src/core/apolloClient/__tests__/errorUtils.test.ts b/src/core/apolloClient/__tests__/errorUtils.test.ts index 7cc1c92c9..c760cff11 100644 --- a/src/core/apolloClient/__tests__/errorUtils.test.ts +++ b/src/core/apolloClient/__tests__/errorUtils.test.ts @@ -1,7 +1,7 @@ import { ApolloError } from '@apollo/client' import { GraphQLFormattedError } from 'graphql' -import { hasDefinedGQLError, LagoGQLError } from '../errorUtils' +import { hasDefinedGQLError, LagoGQLError } from '~/core/apolloClient/errorUtils' const createApolloError: (details: Record) => ApolloError = (details) => ({ diff --git a/src/core/apolloClient/reactiveVars/authTokenVar.ts b/src/core/apolloClient/reactiveVars/authTokenVar.ts index 8aa5250a0..8a3288902 100644 --- a/src/core/apolloClient/reactiveVars/authTokenVar.ts +++ b/src/core/apolloClient/reactiveVars/authTokenVar.ts @@ -1,6 +1,6 @@ import { makeVar } from '@apollo/client' -import { getItemFromLS, setItemFromLS } from '../cacheUtils' +import { getItemFromLS, setItemFromLS } from '~/core/apolloClient/cacheUtils' export const AUTH_TOKEN_LS_KEY = 'authToken' diff --git a/src/core/apolloClient/reactiveVars/customerPortalTokenVar.ts b/src/core/apolloClient/reactiveVars/customerPortalTokenVar.ts index b15a68cf3..9aba29880 100644 --- a/src/core/apolloClient/reactiveVars/customerPortalTokenVar.ts +++ b/src/core/apolloClient/reactiveVars/customerPortalTokenVar.ts @@ -1,6 +1,6 @@ import { makeVar } from '@apollo/client' -import { getItemFromLS, setItemFromLS } from '../cacheUtils' +import { getItemFromLS, setItemFromLS } from '~/core/apolloClient/cacheUtils' export const CUSTOMER_PORTAL_TOKEN_LS_KEY = 'customerPortalToken' diff --git a/src/core/apolloClient/reactiveVars/duplicatePlanVar.ts b/src/core/apolloClient/reactiveVars/duplicatePlanVar.ts index 2bf2014db..ae0a4fca6 100644 --- a/src/core/apolloClient/reactiveVars/duplicatePlanVar.ts +++ b/src/core/apolloClient/reactiveVars/duplicatePlanVar.ts @@ -1,10 +1,9 @@ import { makeVar, useReactiveVar } from '@apollo/client' +import { getItemFromLS, setItemFromLS } from '~/core/apolloClient/cacheUtils' import { FORM_TYPE_ENUM } from '~/core/constants/form' import { StatusTypeEnum } from '~/generated/graphql' -import { getItemFromLS, setItemFromLS } from '../cacheUtils' - export type PLAN_FORM_TYPE = keyof typeof FORM_TYPE_ENUM type SubscriptionUpdateInfo = { diff --git a/src/core/apolloClient/reactiveVars/internationalizationVar.ts b/src/core/apolloClient/reactiveVars/internationalizationVar.ts index 4fd7bfc71..58fea71f7 100644 --- a/src/core/apolloClient/reactiveVars/internationalizationVar.ts +++ b/src/core/apolloClient/reactiveVars/internationalizationVar.ts @@ -1,9 +1,8 @@ import { makeVar, useReactiveVar } from '@apollo/client' +import { getItemFromLS, setItemFromLS } from '~/core/apolloClient/cacheUtils' import { getTranslations, Locale, LocaleEnum } from '~/core/translations' -import { getItemFromLS, setItemFromLS } from '../cacheUtils' - const LOCALE_LS_KEY = 'locale' interface InternationalizationVar { diff --git a/src/core/formats/__tests__/countryDataForCombobox.test.ts b/src/core/formats/__tests__/countryDataForCombobox.test.ts index f5553816e..74365c93c 100644 --- a/src/core/formats/__tests__/countryDataForCombobox.test.ts +++ b/src/core/formats/__tests__/countryDataForCombobox.test.ts @@ -1,4 +1,4 @@ -import { countryDataForCombobox } from '../countryDataForCombobox' +import { countryDataForCombobox } from '~/core/formats/countryDataForCombobox' describe('Core > format', () => { describe('countryDataForCombobox()', () => { diff --git a/src/core/formats/__tests__/formatCreditNotesItems.test.ts b/src/core/formats/__tests__/formatCreditNotesItems.test.ts index 8d5e1eab4..32983f853 100644 --- a/src/core/formats/__tests__/formatCreditNotesItems.test.ts +++ b/src/core/formats/__tests__/formatCreditNotesItems.test.ts @@ -1,7 +1,6 @@ +import formatCreditNotesItems from '~/core/formats/formatCreditNotesItems' import { CurrencyEnum, FeeTypesEnum } from '~/generated/graphql' -import formatCreditNotesItems from '../formatCreditNotesItems' - describe('Core > format', () => { describe('formatCreditNotesItems()', () => { it('should not format a simple items without group and with only one subscription', () => { diff --git a/src/core/formats/__tests__/formatInvoiceItemsMap.test.ts b/src/core/formats/__tests__/formatInvoiceItemsMap.test.ts index 040da0dfd..76e243551 100644 --- a/src/core/formats/__tests__/formatInvoiceItemsMap.test.ts +++ b/src/core/formats/__tests__/formatInvoiceItemsMap.test.ts @@ -1,4 +1,12 @@ import { ALL_FILTER_VALUES } from '~/core/constants/form' +import { + composeChargeFilterDisplayName, + composeGroupedByDisplayName, + composeMultipleValuesWithSepator, + getSubscriptionFeeDisplayName, + groupAndFormatFees, + TExtendedRemainingFee, +} from '~/core/formats/formatInvoiceItemsMap' import { InvoiceSubscription } from '~/generated/graphql' import { @@ -21,15 +29,6 @@ import { unorderedSubscriptionWithFees, } from './fixture' -import { - composeChargeFilterDisplayName, - composeGroupedByDisplayName, - composeMultipleValuesWithSepator, - getSubscriptionFeeDisplayName, - groupAndFormatFees, - TExtendedRemainingFee, -} from '../formatInvoiceItemsMap' - describe('formatInvoiceItemsMap', () => { describe('getSubscriptionFeeDisplayName', () => { it('should return the plan name formated by default', () => { diff --git a/src/core/formats/__tests__/intlFormatNumber.test.ts b/src/core/formats/__tests__/intlFormatNumber.test.ts index fb3c8791d..794a93798 100644 --- a/src/core/formats/__tests__/intlFormatNumber.test.ts +++ b/src/core/formats/__tests__/intlFormatNumber.test.ts @@ -1,12 +1,11 @@ -import { deserializeAmount } from '~/core/serializers/serializeAmount' -import { CurrencyEnum } from '~/generated/graphql' - import { bigNumberShortenNotationFormater, getCurrencySymbol, intlFormatNumber, intlFormatOrdinalNumber, -} from '../intlFormatNumber' +} from '~/core/formats/intlFormatNumber' +import { deserializeAmount } from '~/core/serializers/serializeAmount' +import { CurrencyEnum } from '~/generated/graphql' const DAYS_ORDINALS_VALUES = [ '0th', diff --git a/src/core/formats/__tests__/obfuscate.test.ts b/src/core/formats/__tests__/obfuscate.test.ts index 45635dea8..f23514eff 100644 --- a/src/core/formats/__tests__/obfuscate.test.ts +++ b/src/core/formats/__tests__/obfuscate.test.ts @@ -1,4 +1,4 @@ -import { obfuscateValue } from '../obfuscate' +import { obfuscateValue } from '~/core/formats/obfuscate' describe('obfuscate', () => { it('should obfuscate a given string', () => { diff --git a/src/core/formats/countryDataForCombobox.ts b/src/core/formats/countryDataForCombobox.ts index 558eb63bd..77f127024 100644 --- a/src/core/formats/countryDataForCombobox.ts +++ b/src/core/formats/countryDataForCombobox.ts @@ -1,6 +1,5 @@ import { BasicComboBoxData } from '~/components/form' - -import { CountryCodes } from '../constants/countryCodes' +import { CountryCodes } from '~/core/constants/countryCodes' export const countryDataForCombobox: BasicComboBoxData[] = ( Object.keys(CountryCodes) as Array diff --git a/src/core/formats/formatInvoiceItemsMap.ts b/src/core/formats/formatInvoiceItemsMap.ts index f38823fb0..75cca4ef2 100644 --- a/src/core/formats/formatInvoiceItemsMap.ts +++ b/src/core/formats/formatInvoiceItemsMap.ts @@ -1,5 +1,6 @@ import { gql } from '@apollo/client' +import { ALL_FILTER_VALUES } from '~/core/constants/form' import { ChargeFilter, ChargeFilterUsage, @@ -9,8 +10,6 @@ import { InvoiceSubscription, } from '~/generated/graphql' -import { ALL_FILTER_VALUES } from '../constants/form' - gql` fragment InvoiceSubscriptionFormating on InvoiceSubscription { fromDatetime diff --git a/src/core/serializers/__tests__/serializeAmount.test.ts b/src/core/serializers/__tests__/serializeAmount.test.ts index 8cb7cf05a..bd0699042 100644 --- a/src/core/serializers/__tests__/serializeAmount.test.ts +++ b/src/core/serializers/__tests__/serializeAmount.test.ts @@ -1,7 +1,10 @@ +import { + deserializeAmount, + getCurrencyPrecision, + serializeAmount, +} from '~/core/serializers/serializeAmount' import { CurrencyEnum } from '~/generated/graphql' -import { deserializeAmount, getCurrencyPrecision, serializeAmount } from '../serializeAmount' - describe('getCurrencyPrecision()', () => { describe('with currency JPY', () => { it('returns the currect precision', () => { diff --git a/src/core/serializers/__tests__/serializeCreditNoteInput.test.ts b/src/core/serializers/__tests__/serializeCreditNoteInput.test.ts index 268608314..0720568bc 100644 --- a/src/core/serializers/__tests__/serializeCreditNoteInput.test.ts +++ b/src/core/serializers/__tests__/serializeCreditNoteInput.test.ts @@ -1,8 +1,7 @@ import { CreditTypeEnum } from '~/components/creditNote/types' +import { serializeCreditNoteInput } from '~/core/serializers/serializeCreditNoteInput' import { CreditNoteReasonEnum, CurrencyEnum } from '~/generated/graphql' -import { serializeCreditNoteInput } from '../serializeCreditNoteInput' - describe('serializeCreditNoteInput()', () => { describe('a simple credit note one', () => { it('returns serialized credit notes input', () => { diff --git a/src/core/serializers/__tests__/serializePlanInput.test.ts b/src/core/serializers/__tests__/serializePlanInput.test.ts index bc89498d3..5ac4b12fa 100644 --- a/src/core/serializers/__tests__/serializePlanInput.test.ts +++ b/src/core/serializers/__tests__/serializePlanInput.test.ts @@ -1,5 +1,6 @@ import { transformFilterObjectToString } from '~/components/plans/utils' import { ALL_FILTER_VALUES } from '~/core/constants/form' +import { serializePlanInput } from '~/core/serializers/serializePlanInput' import { AggregationTypeEnum, ChargeModelEnum, @@ -7,8 +8,6 @@ import { PlanInterval, } from '~/generated/graphql' -import { serializePlanInput } from '../serializePlanInput' - const fullProperty = { amount: '1', fixedAmount: '2', diff --git a/src/core/timezone/__tests__/config.test.ts b/src/core/timezone/__tests__/config.test.ts index e225167dd..3cd0c44b5 100644 --- a/src/core/timezone/__tests__/config.test.ts +++ b/src/core/timezone/__tests__/config.test.ts @@ -1,4 +1,4 @@ -import { TimeZonesConfig } from '../config' +import { TimeZonesConfig } from '~/core/timezone/config' describe('Timezone fongis', () => { describe('TimeZonesConfig', () => { diff --git a/src/core/timezone/utils.ts b/src/core/timezone/utils.ts index 2d065c93d..767c75b42 100644 --- a/src/core/timezone/utils.ts +++ b/src/core/timezone/utils.ts @@ -1,13 +1,11 @@ import { captureMessage } from '@sentry/react' import { DateTime } from 'luxon' +import { envGlobalVar } from '~/core/apolloClient' +import { TimeZonesConfig } from '~/core/timezone/config' import { LocaleEnum } from '~/core/translations' import { TimezoneEnum } from '~/generated/graphql' -import { TimeZonesConfig } from './config' - -import { envGlobalVar } from '../apolloClient' - const { sentryDsn } = envGlobalVar() export const getTimezoneConfig = (timezone: TimezoneEnum | null | undefined) => { diff --git a/src/core/translations/__tests__/utils.test.ts b/src/core/translations/__tests__/utils.test.ts index 2f61ea41b..e523f8aab 100644 --- a/src/core/translations/__tests__/utils.test.ts +++ b/src/core/translations/__tests__/utils.test.ts @@ -1,4 +1,4 @@ -import { getPluralTranslation, replaceDynamicVarInString } from '../utils' +import { getPluralTranslation, replaceDynamicVarInString } from '~/core/translations/utils' describe('utils', () => { describe('getPluralTranslation', () => { diff --git a/src/core/utils/__tests__/copyToClipboard.test.ts b/src/core/utils/__tests__/copyToClipboard.test.ts index c793fce09..13cfbaf28 100644 --- a/src/core/utils/__tests__/copyToClipboard.test.ts +++ b/src/core/utils/__tests__/copyToClipboard.test.ts @@ -1,4 +1,4 @@ -import { copyToClipboard } from '../copyToClipboard' +import { copyToClipboard } from '~/core/utils/copyToClipboard' Object.assign(window.navigator, { clipboard: { diff --git a/src/core/utils/__tests__/responsiveProps.test.ts b/src/core/utils/__tests__/responsiveProps.test.ts index 46c9aa14b..03a1a0797 100644 --- a/src/core/utils/__tests__/responsiveProps.test.ts +++ b/src/core/utils/__tests__/responsiveProps.test.ts @@ -1,4 +1,4 @@ -import { setResponsiveProperty } from '../responsiveProps' +import { setResponsiveProperty } from '~/core/utils/responsiveProps' describe('setResponsiveProperty', () => { it('should return a responsive style object', () => { diff --git a/src/core/utils/__tests__/urlUtils.test.ts b/src/core/utils/__tests__/urlUtils.test.ts index 96a1f5de6..f4a299f85 100644 --- a/src/core/utils/__tests__/urlUtils.test.ts +++ b/src/core/utils/__tests__/urlUtils.test.ts @@ -1,4 +1,4 @@ -import { addValuesToUrlState } from '../urlUtils' +import { addValuesToUrlState } from '~/core/utils/urlUtils' describe('urlUtils', () => { describe('addValuesToUrlState', () => { diff --git a/src/core/utils/downloadFiles.ts b/src/core/utils/downloadFiles.ts index dd054e42f..5282acbc1 100644 --- a/src/core/utils/downloadFiles.ts +++ b/src/core/utils/downloadFiles.ts @@ -1,4 +1,4 @@ -import { addToast } from '../apolloClient' +import { addToast } from '~/core/apolloClient' export const handleDownloadFile = (fileUrl?: string | null) => { const showError = () => { diff --git a/src/formValidation/__tests__/chargeSchemaGraduated.test.ts b/src/formValidation/__tests__/chargeSchemaGraduated.test.ts index b0f54f38b..9e9b19ee3 100644 --- a/src/formValidation/__tests__/chargeSchemaGraduated.test.ts +++ b/src/formValidation/__tests__/chargeSchemaGraduated.test.ts @@ -1,8 +1,7 @@ import { transformFilterObjectToString } from '~/components/plans/utils' +import { chargeSchema } from '~/formValidation/chargeSchema' import { ChargeModelEnum } from '~/generated/graphql' -import { chargeSchema } from '../chargeSchema' - describe('chargeSchema Graduated', () => { describe('properties', () => { describe('invalid', () => { diff --git a/src/formValidation/__tests__/chargeSchemaGraduatedPercentage.test.ts b/src/formValidation/__tests__/chargeSchemaGraduatedPercentage.test.ts index 486f8de44..ab0ac26c0 100644 --- a/src/formValidation/__tests__/chargeSchemaGraduatedPercentage.test.ts +++ b/src/formValidation/__tests__/chargeSchemaGraduatedPercentage.test.ts @@ -1,8 +1,7 @@ import { transformFilterObjectToString } from '~/components/plans/utils' +import { chargeSchema } from '~/formValidation/chargeSchema' import { ChargeModelEnum } from '~/generated/graphql' -import { chargeSchema } from '../chargeSchema' - describe('chargeSchema GraduatedPercentage', () => { describe('properties', () => { describe('invalid', () => { diff --git a/src/formValidation/__tests__/chargeSchemaPackage.test.ts b/src/formValidation/__tests__/chargeSchemaPackage.test.ts index 3ee61c7b7..aa12302b3 100644 --- a/src/formValidation/__tests__/chargeSchemaPackage.test.ts +++ b/src/formValidation/__tests__/chargeSchemaPackage.test.ts @@ -1,8 +1,7 @@ import { transformFilterObjectToString } from '~/components/plans/utils' +import { chargeSchema } from '~/formValidation/chargeSchema' import { ChargeModelEnum } from '~/generated/graphql' -import { chargeSchema } from '../chargeSchema' - describe('chargeSchema Package', () => { describe('properties', () => { describe('invalid', () => { diff --git a/src/formValidation/__tests__/chargeSchemaPercentage.test.ts b/src/formValidation/__tests__/chargeSchemaPercentage.test.ts index a2f13aa36..ae46c4591 100644 --- a/src/formValidation/__tests__/chargeSchemaPercentage.test.ts +++ b/src/formValidation/__tests__/chargeSchemaPercentage.test.ts @@ -1,8 +1,7 @@ import { transformFilterObjectToString } from '~/components/plans/utils' +import { chargeSchema } from '~/formValidation/chargeSchema' import { ChargeModelEnum } from '~/generated/graphql' -import { chargeSchema } from '../chargeSchema' - describe('chargeSchema Percentage', () => { describe('properties', () => { describe('invalid', () => { diff --git a/src/formValidation/__tests__/chargeSchemaStandard.test.ts b/src/formValidation/__tests__/chargeSchemaStandard.test.ts index 38a0232be..c410a033c 100644 --- a/src/formValidation/__tests__/chargeSchemaStandard.test.ts +++ b/src/formValidation/__tests__/chargeSchemaStandard.test.ts @@ -1,8 +1,7 @@ import { transformFilterObjectToString } from '~/components/plans/utils' +import { chargeSchema } from '~/formValidation/chargeSchema' import { ChargeModelEnum } from '~/generated/graphql' -import { chargeSchema } from '../chargeSchema' - describe('chargeSchema Standard', () => { describe('properties', () => { describe('invalid', () => { diff --git a/src/formValidation/__tests__/chargeSchemaVolume.test.ts b/src/formValidation/__tests__/chargeSchemaVolume.test.ts index fe6bd3a85..5566d3646 100644 --- a/src/formValidation/__tests__/chargeSchemaVolume.test.ts +++ b/src/formValidation/__tests__/chargeSchemaVolume.test.ts @@ -1,8 +1,7 @@ import { transformFilterObjectToString } from '~/components/plans/utils' +import { chargeSchema } from '~/formValidation/chargeSchema' import { ChargeModelEnum } from '~/generated/graphql' -import { chargeSchema } from '../chargeSchema' - describe('chargeSchema Volume', () => { describe('properties', () => { describe('invalid', () => { diff --git a/src/formValidation/__tests__/feesSchema.test.ts b/src/formValidation/__tests__/feesSchema.test.ts index 9cd6b3467..e09463c12 100644 --- a/src/formValidation/__tests__/feesSchema.test.ts +++ b/src/formValidation/__tests__/feesSchema.test.ts @@ -1,7 +1,6 @@ +import { simpleFeeSchema } from '~/formValidation/feesSchema' import { CurrencyEnum } from '~/generated/graphql' -import { simpleFeeSchema } from '../feesSchema' - describe('feesSchema', () => { describe('simpleFeeSchema()', () => { describe('invalid', () => { diff --git a/src/formValidation/__tests__/metadataSchema.test.ts b/src/formValidation/__tests__/metadataSchema.test.ts index cc5383799..32f381df2 100644 --- a/src/formValidation/__tests__/metadataSchema.test.ts +++ b/src/formValidation/__tests__/metadataSchema.test.ts @@ -2,7 +2,7 @@ import { METADATA_KEY_MAX_LENGTH, METADATA_VALUE_MAX_LENGTH_DEFAULT, metadataSchema, -} from '../metadataSchema' +} from '~/formValidation/metadataSchema' describe('metadataSchema', () => { describe('metadataSchema()', () => { diff --git a/src/hooks/__tests__/useCreateCreditNote.test.ts b/src/hooks/__tests__/useCreateCreditNote.test.ts index ed66971e4..f9d3ed193 100644 --- a/src/hooks/__tests__/useCreateCreditNote.test.ts +++ b/src/hooks/__tests__/useCreateCreditNote.test.ts @@ -3,15 +3,14 @@ import { act, renderHook } from '@testing-library/react' import { ERROR_404_ROUTE } from '~/core/router' import { GetInvoiceCreateCreditNoteDocument } from '~/generated/graphql' -import { AllTheProviders, testMockNavigateFn } from '~/test-utils' - import { fourOFourInvoiceMock, fullOneOffInvoiceMockAndExpect, fullSubscriptionInvoiceGroupTrueUpMockAndExpect, fullSubscriptionInvoiceMockAndExpect, INVOICE_FIXTURE_ID, -} from './fixtures' +} from '~/hooks/__tests__/fixtures' +import { AllTheProviders, testMockNavigateFn } from '~/test-utils' import { useCreateCreditNote } from '../useCreateCreditNote' diff --git a/src/hooks/__tests__/useDebouncedSearch.test.ts b/src/hooks/__tests__/useDebouncedSearch.test.ts index 6c9b487d2..6b21aade3 100644 --- a/src/hooks/__tests__/useDebouncedSearch.test.ts +++ b/src/hooks/__tests__/useDebouncedSearch.test.ts @@ -1,9 +1,8 @@ import { act, renderHook } from '@testing-library/react' +import { DEBOUNCE_SEARCH_MS, useDebouncedSearch } from '~/hooks/useDebouncedSearch' import { AllTheProviders } from '~/test-utils' -import { DEBOUNCE_SEARCH_MS, useDebouncedSearch } from '../useDebouncedSearch' - beforeEach(() => { jest.useFakeTimers() }) diff --git a/src/hooks/__tests__/usePermissions.test.ts b/src/hooks/__tests__/usePermissions.test.ts index 307beb379..694226b2e 100644 --- a/src/hooks/__tests__/usePermissions.test.ts +++ b/src/hooks/__tests__/usePermissions.test.ts @@ -1,10 +1,9 @@ import { renderHook } from '@testing-library/react' import { GetCurrentUserInfosDocument } from '~/generated/graphql' +import { usePermissions } from '~/hooks/usePermissions' import { AllTheProviders } from '~/test-utils' -import { usePermissions } from '../usePermissions' - const membershipWithPermissions = { id: '2', organization: { diff --git a/src/hooks/core/__tests__/useInternationalization.test.tsx b/src/hooks/core/__tests__/useInternationalization.test.tsx index 0f7ce8caa..e5440971c 100644 --- a/src/hooks/core/__tests__/useInternationalization.test.tsx +++ b/src/hooks/core/__tests__/useInternationalization.test.tsx @@ -1,8 +1,7 @@ import { renderHook } from '@testing-library/react' import { getPluralTranslation, replaceDynamicVarInString } from '~/core/translations' - -import { useInternationalization } from '../useInternationalization' +import { useInternationalization } from '~/hooks/core/useInternationalization' const mockUpdateIntlLocale = jest.fn() let mockUseInternationalizationVar = {} diff --git a/src/hooks/core/__tests__/useLocationHistory.test.ts b/src/hooks/core/__tests__/useLocationHistory.test.ts index 8fdbac09b..ff455bce2 100644 --- a/src/hooks/core/__tests__/useLocationHistory.test.ts +++ b/src/hooks/core/__tests__/useLocationHistory.test.ts @@ -1,8 +1,7 @@ import { act, renderHook } from '@testing-library/react' import { locationHistoryVar } from '~/core/apolloClient' - -import { useLocationHistory } from '../useLocationHistory' +import { useLocationHistory } from '~/hooks/core/useLocationHistory' const mockNavigate = jest.fn() diff --git a/src/hooks/core/useLocationHistory.ts b/src/hooks/core/useLocationHistory.ts index 34cef1341..a1ee0771a 100644 --- a/src/hooks/core/useLocationHistory.ts +++ b/src/hooks/core/useLocationHistory.ts @@ -9,9 +9,8 @@ import { setItemFromLS, } from '~/core/apolloClient' import { CustomRouteObject, FORBIDDEN_ROUTE, HOME_ROUTE, LOGIN_ROUTE } from '~/core/router' - -import { useCurrentUser } from '../useCurrentUser' -import { usePermissions } from '../usePermissions' +import { useCurrentUser } from '~/hooks/useCurrentUser' +import { usePermissions } from '~/hooks/usePermissions' export const LAST_PRIVATE_VISITED_ROUTE_WHILE_NOT_CONNECTED_LS_KEY = 'lastPrivateVisitedRoute' diff --git a/src/hooks/customer/useAddSubscription.tsx b/src/hooks/customer/useAddSubscription.tsx index 63d636a11..ecdd464de 100644 --- a/src/hooks/customer/useAddSubscription.tsx +++ b/src/hooks/customer/useAddSubscription.tsx @@ -26,8 +26,7 @@ import { useUpdateSubscriptionMutation, } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' - -import { useSalesForceConfig } from '../useSalesForceConfig' +import { useSalesForceConfig } from '~/hooks/useSalesForceConfig' gql` mutation createSubscription($input: CreateSubscriptionInput!) { diff --git a/src/hooks/plans/__tests__/useChargeForm.test.tsx b/src/hooks/plans/__tests__/useChargeForm.test.tsx index 7e2e1b1da..beb777458 100644 --- a/src/hooks/plans/__tests__/useChargeForm.test.tsx +++ b/src/hooks/plans/__tests__/useChargeForm.test.tsx @@ -4,13 +4,12 @@ import { ComboboxTestMatrice, PayinAdvanceOptionDisabledTestMatrice, ProratedOptionDisabledTestMatrice, -} from './fixture' - +} from '~/hooks/plans/__tests__/fixture' import { TGetChargeModelComboboxDataProps, TGetIsPayInAdvanceOptionDisabledProps, useChargeForm, -} from '../useChargeForm' +} from '~/hooks/plans/useChargeForm' const prepareComboboxTest = async ({ aggregationType, diff --git a/src/hooks/plans/__tests__/useGraduatedChargeForm.test.tsx b/src/hooks/plans/__tests__/useGraduatedChargeForm.test.tsx index b77c5212f..e92f37aa8 100644 --- a/src/hooks/plans/__tests__/useGraduatedChargeForm.test.tsx +++ b/src/hooks/plans/__tests__/useGraduatedChargeForm.test.tsx @@ -10,8 +10,10 @@ import { GraduatedRangeInput, PlanInterval, } from '~/generated/graphql' - -import { DEFAULT_GRADUATED_CHARGES, useGraduatedChargeForm } from '../useGraduatedChargeForm' +import { + DEFAULT_GRADUATED_CHARGES, + useGraduatedChargeForm, +} from '~/hooks/plans/useGraduatedChargeForm' type PrepareType = { chargeIndex?: number diff --git a/src/hooks/plans/__tests__/useGraduatedPercentageChargeForm.test.tsx b/src/hooks/plans/__tests__/useGraduatedPercentageChargeForm.test.tsx index 2b0b90776..d462e2c84 100644 --- a/src/hooks/plans/__tests__/useGraduatedPercentageChargeForm.test.tsx +++ b/src/hooks/plans/__tests__/useGraduatedPercentageChargeForm.test.tsx @@ -10,11 +10,10 @@ import { GraduatedRangeInput, PlanInterval, } from '~/generated/graphql' - import { DEFAULT_GRADUATED_PERCENTAGE_CHARGES, useGraduatedPercentageChargeForm, -} from '../useGraduatedPercentageChargeForm' +} from '~/hooks/plans/useGraduatedPercentageChargeForm' type PrepareType = { chargeIndex?: number diff --git a/src/hooks/plans/__tests__/useVolumeChargeForm.test.tsx b/src/hooks/plans/__tests__/useVolumeChargeForm.test.tsx index 64239a357..00daacb6c 100644 --- a/src/hooks/plans/__tests__/useVolumeChargeForm.test.tsx +++ b/src/hooks/plans/__tests__/useVolumeChargeForm.test.tsx @@ -10,8 +10,7 @@ import { PlanInterval, VolumeRangeInput, } from '~/generated/graphql' - -import { DEFAULT_VOLUME_CHARGES, useVolumeChargeForm } from '../useVolumeChargeForm' +import { DEFAULT_VOLUME_CHARGES, useVolumeChargeForm } from '~/hooks/plans/useVolumeChargeForm' type PrepareType = { chargeIndex?: number diff --git a/src/hooks/plans/useChargeForm.tsx b/src/hooks/plans/useChargeForm.tsx index e50308f0a..89f5a6d19 100644 --- a/src/hooks/plans/useChargeForm.tsx +++ b/src/hooks/plans/useChargeForm.tsx @@ -3,10 +3,9 @@ import styled from 'styled-components' import { Icon, Typography } from '~/components/designSystem' import { BasicComboBoxData } from '~/components/form' import { AggregationTypeEnum, ChargeModelEnum } from '~/generated/graphql' +import { useInternationalization } from '~/hooks/core/useInternationalization' import { theme } from '~/styles' -import { useInternationalization } from '../core/useInternationalization' - export type TGetChargeModelComboboxDataProps = { isPremium: boolean aggregationType: AggregationTypeEnum diff --git a/src/hooks/plans/usePlanForm.tsx b/src/hooks/plans/usePlanForm.tsx index 13cad5a0f..9b5111ebb 100644 --- a/src/hooks/plans/usePlanForm.tsx +++ b/src/hooks/plans/usePlanForm.tsx @@ -40,9 +40,8 @@ import { useGetSinglePlanQuery, useUpdatePlanMutation, } from '~/generated/graphql' - -import { useInternationalization } from '../core/useInternationalization' -import { useOrganizationInfos } from '../useOrganizationInfos' +import { useInternationalization } from '~/hooks/core/useInternationalization' +import { useOrganizationInfos } from '~/hooks/useOrganizationInfos' gql` query getSinglePlan($id: ID!) { diff --git a/src/hooks/ui/__tests__/useListKeyNavigation.test.tsx b/src/hooks/ui/__tests__/useListKeyNavigation.test.tsx index 01c5d3535..beb4e4446 100644 --- a/src/hooks/ui/__tests__/useListKeyNavigation.test.tsx +++ b/src/hooks/ui/__tests__/useListKeyNavigation.test.tsx @@ -2,7 +2,7 @@ import { render } from '@testing-library/react' import userEvent from '@testing-library/user-event' import { ReactNode } from 'react' -import { useKeyNavigationOptions, useListKeysNavigation } from '../useListKeyNavigation' +import { useKeyNavigationOptions, useListKeysNavigation } from '~/hooks/ui/useListKeyNavigation' interface PageWrapperProps { conponentProps: useKeyNavigationOptions diff --git a/src/hooks/ui/__tests__/useShortcuts.test.tsx b/src/hooks/ui/__tests__/useShortcuts.test.tsx index 9ac7024d9..6bea4b020 100644 --- a/src/hooks/ui/__tests__/useShortcuts.test.tsx +++ b/src/hooks/ui/__tests__/useShortcuts.test.tsx @@ -1,7 +1,7 @@ import { render } from '@testing-library/react' import userEvent from '@testing-library/user-event' -import { getCleanKey, Shortcut, useShortcuts } from '../useShortcuts' +import { getCleanKey, Shortcut, useShortcuts } from '~/hooks/ui/useShortcuts' const MyTestComponentThatUsesShortcuts = ({ shortcuts }: { shortcuts: Shortcut[] }) => { useShortcuts(shortcuts) diff --git a/src/hooks/useCreateEditDunningCampaign.ts b/src/hooks/useCreateEditDunningCampaign.ts index 2a6775843..b6f982ffb 100644 --- a/src/hooks/useCreateEditDunningCampaign.ts +++ b/src/hooks/useCreateEditDunningCampaign.ts @@ -8,6 +8,7 @@ import { DUNNINGS_SETTINGS_ROUTE, ERROR_404_ROUTE } from '~/core/router' import { serializeAmount } from '~/core/serializers/serializeAmount' import { CreateDunningCampaignInput, + DunningCampaignFormFragment, LagoApiError, useCreateDunningCampaignMutation, useCreateDunningCampaignPaymentProviderQuery, @@ -15,8 +16,6 @@ import { useUpdateDunningCampaignMutation, } from '~/generated/graphql' -import { DunningCampaignFormFragment } from './../generated/graphql' - export type DunningCampaignFormInput = Omit< CreateDunningCampaignInput, 'daysBetweenAttempts' | 'maxAttempts' diff --git a/src/pages/CreateAddOn.tsx b/src/pages/CreateAddOn.tsx index 2a7ba6ecd..4af590e08 100644 --- a/src/pages/CreateAddOn.tsx +++ b/src/pages/CreateAddOn.tsx @@ -5,6 +5,7 @@ import { generatePath, useNavigate, useParams } from 'react-router-dom' import styled from 'styled-components' import { number, object, string } from 'yup' +import { AddOnCodeSnippet } from '~/components/addOns/AddOnCodeSnippet' import { AddOnFormInput } from '~/components/addOns/types' import { Button, Card, Chip, Skeleton, Tooltip, Typography } from '~/components/designSystem' import { @@ -42,8 +43,6 @@ import { Title, } from '~/styles/mainObjectsForm' -import { AddOnCodeSnippet } from '../components/addOns/AddOnCodeSnippet' - gql` query getTaxesForAddOnForm($limit: Int, $page: Int, $searchTerm: String) { taxes(limit: $limit, page: $page, searchTerm: $searchTerm) { diff --git a/src/pages/CreateCoupon.tsx b/src/pages/CreateCoupon.tsx index 1475a4443..af194b0cd 100644 --- a/src/pages/CreateCoupon.tsx +++ b/src/pages/CreateCoupon.tsx @@ -15,6 +15,7 @@ import { AddPlanToCouponDialog, AddPlanToCouponDialogRef, } from '~/components/coupons/AddPlanToCouponDialog' +import { CouponCodeSnippet } from '~/components/coupons/CouponCodeSnippet' import { Alert, Avatar, @@ -60,8 +61,6 @@ import { Title, } from '~/styles/mainObjectsForm' -import { CouponCodeSnippet } from '../components/coupons/CouponCodeSnippet' - const CreateCoupon = () => { const { translate } = useInternationalization() const navigate = useNavigate() diff --git a/src/pages/WalletForm/WalletForm.tsx b/src/pages/WalletForm/WalletForm.tsx index 3cda7cf4f..b75104acf 100644 --- a/src/pages/WalletForm/WalletForm.tsx +++ b/src/pages/WalletForm/WalletForm.tsx @@ -29,17 +29,15 @@ import { } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' import { useOrganizationInfos } from '~/hooks/useOrganizationInfos' +import { CustomerDetailsTabsOptions } from '~/pages/CustomerDetails' +import { LoadingView } from '~/pages/WalletForm/components/LoadingView' +import { SettingsCard } from '~/pages/WalletForm/components/SettingsCard' +import { TopUpCard } from '~/pages/WalletForm/components/TopUpCard' +import { walletFormSchema } from '~/pages/WalletForm/form' +import { TWalletDataForm } from '~/pages/WalletForm/types' import { NAV_HEIGHT, PageHeader, theme } from '~/styles' import { ButtonContainer, Side } from '~/styles/mainObjectsForm' -import { LoadingView } from './components/LoadingView' -import { SettingsCard } from './components/SettingsCard' -import { TopUpCard } from './components/TopUpCard' -import { walletFormSchema } from './form' -import { TWalletDataForm } from './types' - -import { CustomerDetailsTabsOptions } from '../CustomerDetails' - gql` fragment WalletForUpdate on Wallet { id diff --git a/src/pages/WalletForm/components/SettingsCard.tsx b/src/pages/WalletForm/components/SettingsCard.tsx index a0e28db81..231abc14d 100644 --- a/src/pages/WalletForm/components/SettingsCard.tsx +++ b/src/pages/WalletForm/components/SettingsCard.tsx @@ -15,10 +15,9 @@ import { dateErrorCodes, FORM_TYPE_ENUM } from '~/core/constants/form' import { getCurrencySymbol } from '~/core/formats/intlFormatNumber' import { CurrencyEnum, GetCustomerInfosForWalletFormQuery } from '~/generated/graphql' import { useInternationalization } from '~/hooks/core/useInternationalization' +import { TWalletDataForm } from '~/pages/WalletForm/types' import { tw } from '~/styles/utils' -import { TWalletDataForm } from '../types' - interface SettingsCardProps { formikProps: FormikProps customerData?: GetCustomerInfosForWalletFormQuery diff --git a/src/pages/WalletForm/components/TopUpCard.tsx b/src/pages/WalletForm/components/TopUpCard.tsx index 7419bc7ec..e28771769 100644 --- a/src/pages/WalletForm/components/TopUpCard.tsx +++ b/src/pages/WalletForm/components/TopUpCard.tsx @@ -30,10 +30,9 @@ import { import { useInternationalization } from '~/hooks/core/useInternationalization' import { useCurrentUser } from '~/hooks/useCurrentUser' import { walletFormErrorCodes } from '~/pages/WalletForm/form' +import { TWalletDataForm } from '~/pages/WalletForm/types' import { theme } from '~/styles' -import { TWalletDataForm } from '../types' - const AccordionSummary: FC<{ label: string; isValid: boolean; onDelete: VoidFunction }> = ({ label, isValid, diff --git a/src/pages/auth/PortalInit.tsx b/src/pages/auth/PortalInit.tsx index c2b8fdbe7..f6046e9f2 100644 --- a/src/pages/auth/PortalInit.tsx +++ b/src/pages/auth/PortalInit.tsx @@ -2,8 +2,7 @@ import { useEffect } from 'react' import { useParams } from 'react-router-dom' import { onAccessCustomerPortal } from '~/core/apolloClient' - -import CustomerPortal from '../customerPortal/CustomerPortal' +import CustomerPortal from '~/pages/customerPortal/CustomerPortal' const PortalInit = () => { const { token } = useParams() diff --git a/src/test-utils.tsx b/src/test-utils.tsx index ef81d4f71..242feed96 100644 --- a/src/test-utils.tsx +++ b/src/test-utils.tsx @@ -5,9 +5,9 @@ import { configure, render, RenderOptions } from '@testing-library/react' import React, { ReactElement, useEffect } from 'react' import Router, { BrowserRouter } from 'react-router-dom' -import { initializeTranslations } from './core/apolloClient' -import { initializeYup } from './formValidation/initializeYup' -import { theme } from './styles' +import { initializeTranslations } from '~/core/apolloClient' +import { initializeYup } from '~/formValidation/initializeYup' +import { theme } from '~/styles' configure({ testIdAttribute: 'data-test' }) @@ -63,5 +63,4 @@ const customRender = ( ...options, }) -export { customRender as render } -export { mockNavigate as testMockNavigateFn } +export { customRender as render, mockNavigate as testMockNavigateFn }