diff --git a/packages/webapp/src/components/Accounts/AccountsSelect.tsx b/packages/webapp/src/components/Accounts/AccountsSelect.tsx index 414a95467..ebf323e6b 100644 --- a/packages/webapp/src/components/Accounts/AccountsSelect.tsx +++ b/packages/webapp/src/components/Accounts/AccountsSelect.tsx @@ -6,7 +6,7 @@ import { MenuItem } from '@blueprintjs/core'; import { MenuItemNestedText, FSelect } from '@/components'; import { accountPredicate } from './_components'; import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { usePreprocessingAccounts } from './_hooks'; // Create new account renderer. diff --git a/packages/webapp/src/components/Accounts/AccountsSuggestField.tsx b/packages/webapp/src/components/Accounts/AccountsSuggestField.tsx index bc209e67d..9df0997fd 100644 --- a/packages/webapp/src/components/Accounts/AccountsSuggestField.tsx +++ b/packages/webapp/src/components/Accounts/AccountsSuggestField.tsx @@ -4,7 +4,7 @@ import { MenuItem } from '@blueprintjs/core'; import { ItemRenderer, ItemPredicate } from '@blueprintjs/select'; import { DialogsName } from '@/constants/dialogs'; import { FSuggest, Suggest, FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { usePreprocessingAccounts } from './_hooks'; // Account interface diff --git a/packages/webapp/src/components/AppIntlLoader.tsx b/packages/webapp/src/components/AppIntlLoader.tsx index 98b3006a9..96beb6b74 100644 --- a/packages/webapp/src/components/AppIntlLoader.tsx +++ b/packages/webapp/src/components/AppIntlLoader.tsx @@ -11,7 +11,7 @@ import { AppIntlProvider } from './AppIntlProvider'; import { useSplashLoading } from '@/hooks/state'; import { useWatchImmediate } from '../hooks'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; const SUPPORTED_LOCALES = [ { name: 'English', value: 'en' }, diff --git a/packages/webapp/src/components/Contacts/ContactsMultiSelect.tsx b/packages/webapp/src/components/Contacts/ContactsMultiSelect.tsx index 02de5b22d..31d5072dc 100644 --- a/packages/webapp/src/components/Contacts/ContactsMultiSelect.tsx +++ b/packages/webapp/src/components/Contacts/ContactsMultiSelect.tsx @@ -2,7 +2,7 @@ import React, { useCallback } from 'react'; import * as R from 'ramda'; import { FMultiSelect } from '../Forms'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; /** diff --git a/packages/webapp/src/components/Customers/CustomerDrawerLink.tsx b/packages/webapp/src/components/Customers/CustomerDrawerLink.tsx index dc9f8965a..a7a6d971b 100644 --- a/packages/webapp/src/components/Customers/CustomerDrawerLink.tsx +++ b/packages/webapp/src/components/Customers/CustomerDrawerLink.tsx @@ -3,7 +3,7 @@ import React from 'react'; import * as R from 'ramda'; import { ButtonLink } from '../Button'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; function CustomerDrawerLinkComponent({ diff --git a/packages/webapp/src/components/Customers/CustomersSelect.tsx b/packages/webapp/src/components/Customers/CustomersSelect.tsx index 3dde07f3e..09d21795b 100644 --- a/packages/webapp/src/components/Customers/CustomersSelect.tsx +++ b/packages/webapp/src/components/Customers/CustomersSelect.tsx @@ -4,7 +4,7 @@ import * as R from 'ramda'; import { useFormikContext } from 'formik'; import { createNewItemFromQuery, createNewItemRenderer } from './utils'; import { FSelect } from '../Forms'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useCreateAutofillListener } from '@/hooks/state/autofill'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx b/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx index 2471a46e0..cc6f19f5e 100644 --- a/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx +++ b/packages/webapp/src/components/Dashboard/DashboardBackLink.tsx @@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'; import { If, Icon } from '@/components'; import { FormattedMessage as T } from '@/components'; -import withDashboard from '@/containers/Dashboard/withDashboard'; +import { withDashboard } from '@/containers/Dashboard/withDashboard'; import { compose } from '@/utils'; function DashboardBackLink({ dashboardBackLink, breadcrumbs }) { diff --git a/packages/webapp/src/components/Dashboard/DashboardPage.tsx b/packages/webapp/src/components/Dashboard/DashboardPage.tsx index 4bf45336b..a83798646 100644 --- a/packages/webapp/src/components/Dashboard/DashboardPage.tsx +++ b/packages/webapp/src/components/Dashboard/DashboardPage.tsx @@ -1,11 +1,11 @@ // @ts-nocheck import React, { useEffect, Suspense } from 'react'; import { CLASSES } from '@/constants/classes'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose } from '@/utils'; import { Spinner } from '@blueprintjs/core'; -import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions'; +import { withUniversalSearchActions } from '@/containers/UniversalSearch/withUniversalSearchActions'; /** * Dashboard pages wrapper. diff --git a/packages/webapp/src/components/Dashboard/DashboardSplitePane.tsx b/packages/webapp/src/components/Dashboard/DashboardSplitePane.tsx index efe86865a..0e390d622 100644 --- a/packages/webapp/src/components/Dashboard/DashboardSplitePane.tsx +++ b/packages/webapp/src/components/Dashboard/DashboardSplitePane.tsx @@ -3,7 +3,7 @@ import React, { useState, useRef } from 'react'; import SplitPane from 'react-split-pane'; import { debounce } from 'lodash'; -import withDashboard from '@/containers/Dashboard/withDashboard'; +import { withDashboard } from '@/containers/Dashboard/withDashboard'; import { compose } from '@/utils'; function DashboardSplitPane({ diff --git a/packages/webapp/src/components/Dashboard/DashboardTopbar/DashboardTopbar.tsx b/packages/webapp/src/components/Dashboard/DashboardTopbar/DashboardTopbar.tsx index 02eee52ea..3f93222b3 100644 --- a/packages/webapp/src/components/Dashboard/DashboardTopbar/DashboardTopbar.tsx +++ b/packages/webapp/src/components/Dashboard/DashboardTopbar/DashboardTopbar.tsx @@ -21,10 +21,10 @@ import DashboardTopbarUser from '@/components/Dashboard/TopbarUser'; import DashboardBreadcrumbs from '@/components/Dashboard/DashboardBreadcrumbs'; import DashboardBackLink from '@/components/Dashboard/DashboardBackLink'; -import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withDashboard from '@/containers/Dashboard/withDashboard'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withUniversalSearchActions } from '@/containers/UniversalSearch/withUniversalSearchActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withDashboard } from '@/containers/Dashboard/withDashboard'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import QuickNewDropdown from '@/containers/QuickNewDropdown/QuickNewDropdown'; import { diff --git a/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx b/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx index 3b1b83d68..4399e62ae 100644 --- a/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx +++ b/packages/webapp/src/components/Dashboard/GlobalHotkeys.tsx @@ -3,9 +3,9 @@ import React from 'react'; import { useHotkeys } from 'react-hotkeys-hook'; import { useHistory } from 'react-router-dom'; import { getDashboardRoutes } from '@/routes/dashboard'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withUniversalSearchActions from '@/containers/UniversalSearch/withUniversalSearchActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withUniversalSearchActions } from '@/containers/UniversalSearch/withUniversalSearchActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/components/Dashboard/SplashScreen.tsx b/packages/webapp/src/components/Dashboard/SplashScreen.tsx index e24587841..6a3edf5f0 100644 --- a/packages/webapp/src/components/Dashboard/SplashScreen.tsx +++ b/packages/webapp/src/components/Dashboard/SplashScreen.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import * as R from 'ramda'; import BigcapitalLoading from './BigcapitalLoading'; -import withDashboard from '@/containers/Dashboard/withDashboard'; +import { withDashboard } from '@/containers/Dashboard/withDashboard'; function SplashScreenComponent({ splashScreenLoading }) { return splashScreenLoading ? : null; diff --git a/packages/webapp/src/components/Dashboard/TopbarUser.tsx b/packages/webapp/src/components/Dashboard/TopbarUser.tsx index 0c05b0015..a98d741e8 100644 --- a/packages/webapp/src/components/Dashboard/TopbarUser.tsx +++ b/packages/webapp/src/components/Dashboard/TopbarUser.tsx @@ -13,7 +13,7 @@ import { FormattedMessage as T } from '@/components'; import { useAuthActions } from '@/hooks/state'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useAuthenticatedAccount } from '@/hooks/query'; import { firstLettersArgs, compose } from '@/utils'; diff --git a/packages/webapp/src/components/Dialog/Dialog.tsx b/packages/webapp/src/components/Dialog/Dialog.tsx index 7446db4c3..0b3a0440a 100644 --- a/packages/webapp/src/components/Dialog/Dialog.tsx +++ b/packages/webapp/src/components/Dialog/Dialog.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Dialog } from '@blueprintjs/core'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; import '@/style/components/Dialog/Dialog.scss'; diff --git a/packages/webapp/src/components/Drawer/Drawer.tsx b/packages/webapp/src/components/Drawer/Drawer.tsx index ed9aac10c..e8a7d74d9 100644 --- a/packages/webapp/src/components/Drawer/Drawer.tsx +++ b/packages/webapp/src/components/Drawer/Drawer.tsx @@ -5,7 +5,7 @@ import { Position, Drawer } from '@blueprintjs/core'; import '@/style/components/Drawer.scss'; import { DrawerProvider } from './DrawerProvider'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/components/Drawer/DrawerHeaderContent.tsx b/packages/webapp/src/components/Drawer/DrawerHeaderContent.tsx index 24c32291b..3e4548dc1 100644 --- a/packages/webapp/src/components/Drawer/DrawerHeaderContent.tsx +++ b/packages/webapp/src/components/Drawer/DrawerHeaderContent.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { FormattedMessage as T } from '@/components'; import { Classes, Icon, H4, Button } from '@blueprintjs/core'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDrawerContext } from './DrawerProvider'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/components/ExchangeRate/DetailExchangeRate.tsx b/packages/webapp/src/components/ExchangeRate/DetailExchangeRate.tsx index 72eb14d70..7b76eaa02 100644 --- a/packages/webapp/src/components/ExchangeRate/DetailExchangeRate.tsx +++ b/packages/webapp/src/components/ExchangeRate/DetailExchangeRate.tsx @@ -5,7 +5,7 @@ import * as R from 'ramda'; import { DetailItem } from '@/components'; import { isEqual } from 'lodash'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Detail exchange rate item. diff --git a/packages/webapp/src/components/FeatureGuard/FeatureCan.tsx b/packages/webapp/src/components/FeatureGuard/FeatureCan.tsx index 7833b8680..94727b0be 100644 --- a/packages/webapp/src/components/FeatureGuard/FeatureCan.tsx +++ b/packages/webapp/src/components/FeatureGuard/FeatureCan.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import * as R from 'ramda'; -import withFeatureCan from './withFeatureCan'; +import { withFeatureCan } from './withFeatureCan'; function FeatureCanJSX({ feature, children, isFeatureCan }) { return isFeatureCan && children; diff --git a/packages/webapp/src/components/FeatureGuard/withFeatureCan.tsx b/packages/webapp/src/components/FeatureGuard/withFeatureCan.tsx index a287c7630..71bf38156 100644 --- a/packages/webapp/src/components/FeatureGuard/withFeatureCan.tsx +++ b/packages/webapp/src/components/FeatureGuard/withFeatureCan.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getDashboardFeaturesSelector } from '@/store/dashboard/dashboard.selectors'; -export default (mapState) => { +export const withFeatureCan = (mapState) => { const featuresSelector = getDashboardFeaturesSelector(); const mapStateToProps = (state, props) => { diff --git a/packages/webapp/src/components/Guards/EnsureOrganizationIsNotReady.tsx b/packages/webapp/src/components/Guards/EnsureOrganizationIsNotReady.tsx index d139103d3..7c9d7bdcb 100644 --- a/packages/webapp/src/components/Guards/EnsureOrganizationIsNotReady.tsx +++ b/packages/webapp/src/components/Guards/EnsureOrganizationIsNotReady.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { connect } from 'react-redux'; import { Redirect } from 'react-router-dom'; import { compose } from '@/utils'; -import withAuthentication from '@/containers/Authentication/withAuthentication'; -import withOrganization from '@/containers/Organization/withOrganization'; +import { withAuthentication } from '@/containers/Authentication/withAuthentication'; +import { withOrganization } from '@/containers/Organization/withOrganization'; /** * Ensures organization is not ready. diff --git a/packages/webapp/src/components/Guards/EnsureOrganizationIsReady.tsx b/packages/webapp/src/components/Guards/EnsureOrganizationIsReady.tsx index 355452fa9..7c93f02fa 100644 --- a/packages/webapp/src/components/Guards/EnsureOrganizationIsReady.tsx +++ b/packages/webapp/src/components/Guards/EnsureOrganizationIsReady.tsx @@ -4,8 +4,8 @@ import { connect } from 'react-redux'; import { Redirect } from 'react-router-dom'; import { compose } from '@/utils'; -import withAuthentication from '@/containers/Authentication/withAuthentication'; -import withOrganization from '@/containers/Organization/withOrganization'; +import { withAuthentication } from '@/containers/Authentication/withAuthentication'; +import { withOrganization } from '@/containers/Organization/withOrganization'; function EnsureOrganizationIsReady({ // #ownProps diff --git a/packages/webapp/src/components/Guards/EnsureSubscriptionIsActive.tsx b/packages/webapp/src/components/Guards/EnsureSubscriptionIsActive.tsx index 59aea37f6..33a4dab5d 100644 --- a/packages/webapp/src/components/Guards/EnsureSubscriptionIsActive.tsx +++ b/packages/webapp/src/components/Guards/EnsureSubscriptionIsActive.tsx @@ -4,7 +4,7 @@ import { includes } from 'lodash'; import { compose } from '@/utils'; import { Redirect } from 'react-router-dom'; -import withSubscriptions from '@/containers/Subscriptions/withSubscriptions'; +import { withSubscriptions } from '@/containers/Subscriptions/withSubscriptions'; /** * Ensures the given subscription type is active or redirect to the given route. diff --git a/packages/webapp/src/components/Guards/EnsureSubscriptionsIsActive.tsx b/packages/webapp/src/components/Guards/EnsureSubscriptionsIsActive.tsx index f945c5678..04ba896d1 100644 --- a/packages/webapp/src/components/Guards/EnsureSubscriptionsIsActive.tsx +++ b/packages/webapp/src/components/Guards/EnsureSubscriptionsIsActive.tsx @@ -4,7 +4,7 @@ import { includes } from 'lodash'; import { compose } from '@/utils'; import { Redirect } from 'react-router-dom'; -import withSubscriptions from '@/containers/Subscriptions/withSubscriptionss'; +import { withSubscriptions } from '@/containers/Subscriptions/withSubscriptionss'; /** * Ensures the given subscription type is active or redirect to the given route. diff --git a/packages/webapp/src/components/Guards/EnsureSubscriptionsIsInactive.tsx b/packages/webapp/src/components/Guards/EnsureSubscriptionsIsInactive.tsx index 183215c14..9fda9928b 100644 --- a/packages/webapp/src/components/Guards/EnsureSubscriptionsIsInactive.tsx +++ b/packages/webapp/src/components/Guards/EnsureSubscriptionsIsInactive.tsx @@ -4,7 +4,7 @@ import { includes } from 'lodash'; import { compose } from '@/utils'; import { Redirect } from 'react-router-dom'; -import withSubscriptions from '@/containers/Subscriptions/withSubscriptionss'; +import { withSubscriptions } from '@/containers/Subscriptions/withSubscriptionss'; /** * Ensures the given subscription type is active or redirect to the given route. diff --git a/packages/webapp/src/components/Items/ItemsMultiSelect.tsx b/packages/webapp/src/components/Items/ItemsMultiSelect.tsx index aed937376..6e220a9f4 100644 --- a/packages/webapp/src/components/Items/ItemsMultiSelect.tsx +++ b/packages/webapp/src/components/Items/ItemsMultiSelect.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { FMultiSelect } from '@/components/Forms'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Items multi-select. diff --git a/packages/webapp/src/components/Items/ItemsSuggestField.tsx b/packages/webapp/src/components/Items/ItemsSuggestField.tsx index 1c000c017..8d5b7b17c 100644 --- a/packages/webapp/src/components/Items/ItemsSuggestField.tsx +++ b/packages/webapp/src/components/Items/ItemsSuggestField.tsx @@ -9,7 +9,7 @@ import { CLASSES } from '@/constants/classes'; import { FormattedMessage as T } from '@/components'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/components/Preferences/PreferencesPage.tsx b/packages/webapp/src/components/Preferences/PreferencesPage.tsx index 083820df2..cc58a510d 100644 --- a/packages/webapp/src/components/Preferences/PreferencesPage.tsx +++ b/packages/webapp/src/components/Preferences/PreferencesPage.tsx @@ -11,7 +11,7 @@ import PreferencesContentRoute from '@/components/Preferences/PreferencesContent import DashboardErrorBoundary from '@/components/Dashboard/DashboardErrorBoundary'; import PreferencesSidebar from '@/components/Preferences/PreferencesSidebar'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import '@/style/pages/Preferences/Page.scss'; diff --git a/packages/webapp/src/components/Preferences/PreferencesTopbar.tsx b/packages/webapp/src/components/Preferences/PreferencesTopbar.tsx index 0fcbc737b..d3af1e43c 100644 --- a/packages/webapp/src/components/Preferences/PreferencesTopbar.tsx +++ b/packages/webapp/src/components/Preferences/PreferencesTopbar.tsx @@ -10,7 +10,7 @@ import CurrenciesActions from '@/containers/Preferences/Currencies/CurrenciesAct import WarehousesActions from '@/containers/Preferences/Warehouses/WarehousesActions'; import BranchesActions from '@/containers/Preferences/Branches/BranchesActions'; import ApiKeysActions from '@/containers/Preferences/ApiKeys/ApiKeysActions'; -import withDashboard from '@/containers/Dashboard/withDashboard'; +import { withDashboard } from '@/containers/Dashboard/withDashboard'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/components/TaxRates/TaxRatesSelect.tsx b/packages/webapp/src/components/TaxRates/TaxRatesSelect.tsx index f533c6cba..229c518a4 100644 --- a/packages/webapp/src/components/TaxRates/TaxRatesSelect.tsx +++ b/packages/webapp/src/components/TaxRates/TaxRatesSelect.tsx @@ -3,7 +3,7 @@ import * as R from 'ramda'; import intl from 'react-intl-universal'; import { FSelect } from '@/components'; import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { MenuItem } from '@blueprintjs/core'; // Create new account renderer. diff --git a/packages/webapp/src/components/Vendors/VendorDrawerLink.tsx b/packages/webapp/src/components/Vendors/VendorDrawerLink.tsx index b0ff65daf..ef0ed57ee 100644 --- a/packages/webapp/src/components/Vendors/VendorDrawerLink.tsx +++ b/packages/webapp/src/components/Vendors/VendorDrawerLink.tsx @@ -3,7 +3,7 @@ import React from 'react'; import * as R from 'ramda'; import { ButtonLink } from '../Button'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; function VendorDrawerLinkComponent({ diff --git a/packages/webapp/src/components/Vendors/VendorsSelect.tsx b/packages/webapp/src/components/Vendors/VendorsSelect.tsx index 6387ee845..0033f671e 100644 --- a/packages/webapp/src/components/Vendors/VendorsSelect.tsx +++ b/packages/webapp/src/components/Vendors/VendorsSelect.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { useFormikContext } from 'formik'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { createNewItemFromQuery, createNewItemRenderer } from './utils'; import { FSelect } from '../Forms'; import { useCreateAutofillListener } from '@/hooks/state/autofill'; diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx index 38cc5a8eb..42393737f 100644 --- a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx +++ b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.tsx @@ -25,11 +25,11 @@ import { useRefreshJournals } from '@/hooks/query/manualJournals'; import { useManualJournalsContext } from './ManualJournalsListProvider'; import { ManualJournalAction, AbilitySubject } from '@/constants/abilityOption'; -import withManualJournals from './withManualJournals'; -import withManualJournalsActions from './withManualJournalsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withManualJournals } from './withManualJournals'; +import { withManualJournalsActions } from './withManualJournalsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsDataTable.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsDataTable.tsx index eab080da6..5b3106218 100644 --- a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsDataTable.tsx +++ b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsDataTable.tsx @@ -14,11 +14,11 @@ import ManualJournalsEmptyStatus from './ManualJournalsEmptyStatus'; import { ActionsMenu } from './components'; -import withManualJournals from './withManualJournals'; -import withManualJournalsActions from './withManualJournalsActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withManualJournals } from './withManualJournals'; +import { withManualJournalsActions } from './withManualJournalsActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useManualJournalsContext } from './ManualJournalsListProvider'; import { useMemorizedColumnsWidths } from '@/hooks'; @@ -35,7 +35,7 @@ function ManualJournalsDataTable({ setManualJournalsTableState, setManualJournalsSelectedRows, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -157,7 +157,7 @@ export default compose( withManualJournals(({ manualJournalsTableState }) => ({ manualJournalsTableState, })), - withAlertsActions, + withAlertActions, withDrawerActions, withSettings(({ manualJournalsSettings }) => ({ manualJournalsTableSize: manualJournalsSettings?.tableSize, diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsList.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsList.tsx index cd0135010..6a34338b3 100644 --- a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsList.tsx +++ b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsList.tsx @@ -9,7 +9,7 @@ import { transformTableStateToQuery, compose } from '@/utils'; import { ManualJournalsListProvider } from './ManualJournalsListProvider'; import ManualJournalsDataTable from './ManualJournalsDataTable'; import ManualJournalsActionsBar from './ManualJournalActionsBar'; -import withManualJournals from './withManualJournals'; +import { withManualJournals } from './withManualJournals'; /** diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsViewTabs.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsViewTabs.tsx index 9752013e4..4d428fb81 100644 --- a/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsViewTabs.tsx +++ b/packages/webapp/src/containers/Accounting/JournalsLanding/ManualJournalsViewTabs.tsx @@ -5,9 +5,9 @@ import { pick } from 'lodash'; import { DashboardViewsTabs } from '@/components'; import { useManualJournalsContext } from './ManualJournalsListProvider'; -import withManualJournals from './withManualJournals'; -import withManualJournalsActions from './withManualJournalsActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withManualJournals } from './withManualJournals'; +import { withManualJournalsActions } from './withManualJournalsActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournals.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournals.tsx index 74f62f2a4..afec6b152 100644 --- a/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournals.tsx +++ b/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournals.tsx @@ -6,7 +6,7 @@ import { manualJournalTableStateChangedFactory, } from '@/store/manualJournals/manualJournals.selectors'; -export default (mapState) => { +export const withManualJournals = (mapState) => { const getJournalsTableQuery = getManualJournalsTableStateFactory(); const manualJournalTableStateChanged = manualJournalTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournalsActions.tsx b/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournalsActions.tsx index 5989e8f6c..5a51f2fbd 100644 --- a/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournalsActions.tsx +++ b/packages/webapp/src/containers/Accounting/JournalsLanding/withManualJournalsActions.tsx @@ -12,4 +12,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(setManualJournalsSelectedRows(selectedRows)), }); -export default connect(null, mapActionsToProps); +export const withManualJournalsActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.tsx index 5368edca4..8a240ed26 100644 --- a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.tsx +++ b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalEntriesForm.tsx @@ -22,8 +22,8 @@ import MakeJournalFormFooter from './MakeJournalFormFooter'; import MakeJournalFormDialogs from './MakeJournalFormDialogs'; import MakeJournalFormTopBar from './MakeJournalFormTopBar'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { AppToaster } from '@/components'; import { PageForm } from '@/components/PageForm'; diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalTransactionNoField.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalTransactionNoField.tsx index 5aaaeda75..c509d18be 100644 --- a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalTransactionNoField.tsx +++ b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalTransactionNoField.tsx @@ -13,8 +13,8 @@ import { FFormGroup, } from '@/components'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Journal number field of make journal form. diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx index d146bbb08..7e048d1fc 100644 --- a/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx +++ b/packages/webapp/src/containers/Accounting/MakeJournal/components.tsx @@ -25,7 +25,7 @@ import { CellType, Features, Align } from '@/constants'; import { useCurrentOrganization, useFeatureCan } from '@/hooks/state'; import { useJournalIsForeign } from './utils'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { transactionNumber } from '@/utils'; import { useUpdateEffect } from '@/hooks'; diff --git a/packages/webapp/src/containers/Accounting/ManualJournalUniversalSearch.tsx b/packages/webapp/src/containers/Accounting/ManualJournalUniversalSearch.tsx index cdd68ad09..45f23ab26 100644 --- a/packages/webapp/src/containers/Accounting/ManualJournalUniversalSearch.tsx +++ b/packages/webapp/src/containers/Accounting/ManualJournalUniversalSearch.tsx @@ -2,7 +2,7 @@ import intl from 'react-intl-universal'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { AbilitySubject, ManualJournalAction } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; /** diff --git a/packages/webapp/src/containers/Accounts/AccountUniversalSearch.tsx b/packages/webapp/src/containers/Accounts/AccountUniversalSearch.tsx index 67cb1a5dc..4744ed3b3 100644 --- a/packages/webapp/src/containers/Accounts/AccountUniversalSearch.tsx +++ b/packages/webapp/src/containers/Accounts/AccountUniversalSearch.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import intl from 'react-intl-universal'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { AbilitySubject, AccountAction } from '@/constants/abilityOption'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; diff --git a/packages/webapp/src/containers/Accounts/AccountsActionsBar.tsx b/packages/webapp/src/containers/Accounts/AccountsActionsBar.tsx index 0859368e1..b5d7db173 100644 --- a/packages/webapp/src/containers/Accounts/AccountsActionsBar.tsx +++ b/packages/webapp/src/containers/Accounts/AccountsActionsBar.tsx @@ -36,12 +36,12 @@ import { useAccountsChartContext } from './AccountsChartProvider'; import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; import { useBulkDeleteAccountsDialog } from './hooks/use-bulk-delete-accounts-dialog'; -import withAccounts from './withAccounts'; -import withAccountsTableActions from './withAccountsTableActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withAccounts } from './withAccounts'; +import { withAccountsTableActions } from './withAccountsTableActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Accounts/AccountsChart.tsx b/packages/webapp/src/containers/Accounts/AccountsChart.tsx index 4be0c9c6c..41e639950 100644 --- a/packages/webapp/src/containers/Accounts/AccountsChart.tsx +++ b/packages/webapp/src/containers/Accounts/AccountsChart.tsx @@ -8,8 +8,8 @@ import { AccountsChartProvider } from './AccountsChartProvider'; import AccountsActionsBar from './AccountsActionsBar'; import AccountsDataTable from './AccountsDataTable'; -import withAccounts from '@/containers/Accounts/withAccounts'; -import withAccountsTableActions from './withAccountsTableActions'; +import { withAccounts } from '@/containers/Accounts/withAccounts'; +import { withAccountsTableActions } from './withAccountsTableActions'; import { transformAccountsStateToQuery } from './utils'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx b/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx index 9790aaf6c..0f2f6425f 100644 --- a/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx +++ b/packages/webapp/src/containers/Accounts/AccountsDataTable.tsx @@ -18,11 +18,11 @@ import { useMemorizedColumnsWidths } from '@/hooks'; import { TABLES } from '@/constants/tables'; import { DialogsName } from '@/constants/dialogs'; -import withSettings from '@/containers/Settings/withSettings'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withAccountsTableActions from './withAccountsTableActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withAccountsTableActions } from './withAccountsTableActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -145,7 +145,7 @@ function AccountsDataTable({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withAccountsTableActions, diff --git a/packages/webapp/src/containers/Accounts/AccountsViewsTabs.tsx b/packages/webapp/src/containers/Accounts/AccountsViewsTabs.tsx index c55792b1b..b2527aacf 100644 --- a/packages/webapp/src/containers/Accounts/AccountsViewsTabs.tsx +++ b/packages/webapp/src/containers/Accounts/AccountsViewsTabs.tsx @@ -6,8 +6,8 @@ import intl from 'react-intl-universal'; import { DashboardViewsTabs } from '@/components'; import { useAccountsChartContext } from './AccountsChartProvider'; -import withAccounts from './withAccounts'; -import withAccountsTableActions from './withAccountsTableActions'; +import { withAccounts } from './withAccounts'; +import { withAccountsTableActions } from './withAccountsTableActions'; import { compose, transfromViewsToTabs } from '@/utils'; diff --git a/packages/webapp/src/containers/Accounts/withAccounts.tsx b/packages/webapp/src/containers/Accounts/withAccounts.tsx index d926efa37..9c957f1dc 100644 --- a/packages/webapp/src/containers/Accounts/withAccounts.tsx +++ b/packages/webapp/src/containers/Accounts/withAccounts.tsx @@ -5,7 +5,7 @@ import { accountsTableStateChangedFactory, } from '@/store/accounts/accounts.selectors'; -export default (mapState) => { +export const withAccounts = (mapState) => { const getAccountsTableState = getAccountsTableStateFactory(); const accountsTableStateChanged = accountsTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Accounts/withAccountsTableActions.tsx b/packages/webapp/src/containers/Accounts/withAccountsTableActions.tsx index b12caf388..828ff8373 100644 --- a/packages/webapp/src/containers/Accounts/withAccountsTableActions.tsx +++ b/packages/webapp/src/containers/Accounts/withAccountsTableActions.tsx @@ -13,4 +13,5 @@ const mapActionsToProps = (dispatch) => ({ dispatch(setAccountsSelectedRows(selectedRows)), }); -export default connect(null, mapActionsToProps); +export const withAccountsTableActions = connect(null, mapActionsToProps); +export const withAccountsActions = withAccountsTableActions; diff --git a/packages/webapp/src/containers/Alert/withAlertActions.tsx b/packages/webapp/src/containers/Alert/withAlertActions.tsx index 2e9908ae1..1d592effb 100644 --- a/packages/webapp/src/containers/Alert/withAlertActions.tsx +++ b/packages/webapp/src/containers/Alert/withAlertActions.tsx @@ -11,4 +11,4 @@ export const mapDispatchToProps = (dispatch) => ({ closeAlert: (name, payload) => dispatch({ type: t.CLOSE_ALERT, name, payload }), }); -export default connect(null, mapDispatchToProps); \ No newline at end of file +export const withAlertActions = connect(null, mapDispatchToProps); \ No newline at end of file diff --git a/packages/webapp/src/containers/Alert/withAlertStoreConnect.tsx b/packages/webapp/src/containers/Alert/withAlertStoreConnect.tsx index 9614190e9..b2a144ffa 100644 --- a/packages/webapp/src/containers/Alert/withAlertStoreConnect.tsx +++ b/packages/webapp/src/containers/Alert/withAlertStoreConnect.tsx @@ -5,7 +5,7 @@ import { getAlertPayloadFactory, } from '@/store/dashboard/dashboard.selectors'; -export default (mapState) => { +export const withAlertStoreConnect = (mapState) => { const isAlertOpen = isAlertOpenFactory(); const getAlertPayload = getAlertPayloadFactory(); diff --git a/packages/webapp/src/containers/Alerts/Accounts/AccountActivateAlert.tsx b/packages/webapp/src/containers/Alerts/Accounts/AccountActivateAlert.tsx index 962b0ebbe..43563c22e 100644 --- a/packages/webapp/src/containers/Alerts/Accounts/AccountActivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Accounts/AccountActivateAlert.tsx @@ -4,8 +4,8 @@ import intl from 'react-intl-universal'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useActivateAccount } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Accounts/AccountBulkActivateAlert.tsx b/packages/webapp/src/containers/Alerts/Accounts/AccountBulkActivateAlert.tsx index 5e297b2ee..4d86963a7 100644 --- a/packages/webapp/src/containers/Alerts/Accounts/AccountBulkActivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Accounts/AccountBulkActivateAlert.tsx @@ -5,8 +5,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { queryCache } from 'react-query'; import { FormattedMessage as T, AppToaster } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Accounts/AccountBulkInactivateAlert.tsx b/packages/webapp/src/containers/Alerts/Accounts/AccountBulkInactivateAlert.tsx index b51d34d18..6f540b042 100644 --- a/packages/webapp/src/containers/Alerts/Accounts/AccountBulkInactivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Accounts/AccountBulkInactivateAlert.tsx @@ -6,9 +6,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { queryCache } from 'react-query'; import { AppToaster } from '@/components'; -import withAccountsActions from '@/containers/Accounts/withAccountsTableActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAccountsActions } from '@/containers/Accounts/withAccountsTableActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Accounts/AccountDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Accounts/AccountDeleteAlert.tsx index 352081444..06bb3938d 100644 --- a/packages/webapp/src/containers/Alerts/Accounts/AccountDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Accounts/AccountDeleteAlert.tsx @@ -10,9 +10,9 @@ import { import { handleDeleteErrors } from '@/containers/Accounts/utils'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteAccount } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Accounts/AccountInactivateAlert.tsx b/packages/webapp/src/containers/Alerts/Accounts/AccountInactivateAlert.tsx index 03e3d3ca6..0c366125f 100644 --- a/packages/webapp/src/containers/Alerts/Accounts/AccountInactivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Accounts/AccountInactivateAlert.tsx @@ -4,8 +4,8 @@ import intl from 'react-intl-universal'; import { AppToaster, FormattedMessage as T } from '@/components'; import { Intent, Alert } from '@blueprintjs/core'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; import { useInactivateAccount } from '@/hooks/query'; diff --git a/packages/webapp/src/containers/Alerts/Bills/BillDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Bills/BillDeleteAlert.tsx index b1acd287a..5856c31ad 100644 --- a/packages/webapp/src/containers/Alerts/Bills/BillDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Bills/BillDeleteAlert.tsx @@ -4,9 +4,9 @@ import intl from 'react-intl-universal'; import { AppToaster, FormattedMessage as T } from '@/components'; import { Intent, Alert } from '@blueprintjs/core'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { handleDeleteErrors } from '@/containers/Purchases/Bills/BillForm/utils'; import { useDeleteBill } from '@/hooks/query'; diff --git a/packages/webapp/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.tsx index 068ac0a8c..ba4d6f819 100644 --- a/packages/webapp/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Bills/BillLocatedLandedCostDeleteAlert.tsx @@ -7,8 +7,8 @@ import { useDeleteLandedCost } from '@/hooks/query'; import { AppToaster } from '@/components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Bills/BillOpenAlert.tsx b/packages/webapp/src/containers/Alerts/Bills/BillOpenAlert.tsx index 831449261..b545b0772 100644 --- a/packages/webapp/src/containers/Alerts/Bills/BillOpenAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Bills/BillOpenAlert.tsx @@ -4,8 +4,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import intl from 'react-intl-universal'; import { Intent, Alert } from '@blueprintjs/core'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useOpenBill } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Branches/BranchDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Branches/BranchDeleteAlert.tsx index 77681d5a9..b9e9867f9 100644 --- a/packages/webapp/src/containers/Alerts/Branches/BranchDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Branches/BranchDeleteAlert.tsx @@ -11,8 +11,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useDeleteBranch } from '@/hooks/query'; import { handleDeleteErrors } from '@/containers/Preferences/Branches/utils'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.tsx b/packages/webapp/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.tsx index 1c849b2ef..98c240bff 100644 --- a/packages/webapp/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Branches/BranchMarkPrimaryAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useMarkBranchAsPrimary } from '@/hooks/query'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/CashFlow/AccountDeleteTransactionAlert.tsx b/packages/webapp/src/containers/Alerts/CashFlow/AccountDeleteTransactionAlert.tsx index 5b8350780..02f857afe 100644 --- a/packages/webapp/src/containers/Alerts/CashFlow/AccountDeleteTransactionAlert.tsx +++ b/packages/webapp/src/containers/Alerts/CashFlow/AccountDeleteTransactionAlert.tsx @@ -10,9 +10,9 @@ import { import { useDeleteCashflowTransaction } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/Contacts/ContactActivateAlert.tsx b/packages/webapp/src/containers/Alerts/Contacts/ContactActivateAlert.tsx index 1a026345e..2e38d6b05 100644 --- a/packages/webapp/src/containers/Alerts/Contacts/ContactActivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Contacts/ContactActivateAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useActivateContact } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Contacts/ContactInactivateAlert.tsx b/packages/webapp/src/containers/Alerts/Contacts/ContactInactivateAlert.tsx index fadc2d800..c335e44c7 100644 --- a/packages/webapp/src/containers/Alerts/Contacts/ContactInactivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Contacts/ContactInactivateAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useInactivateContact } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteDeleteAlert.tsx index f8c2ba341..161f8fe5c 100644 --- a/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteDeleteAlert.tsx @@ -8,9 +8,9 @@ import { FormattedHTMLMessage, } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteCreditNote } from '@/hooks/query'; import { handleDeleteErrors } from '@/containers/Sales/CreditNotes/CreditNotesLanding/utils'; diff --git a/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteOpenedAlert.tsx b/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteOpenedAlert.tsx index 66880c4cf..f47bd4f14 100644 --- a/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteOpenedAlert.tsx +++ b/packages/webapp/src/containers/Alerts/CreditNotes/CreditNoteOpenedAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useOpenCreditNote } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.tsx index 6506ed8c2..db3777f35 100644 --- a/packages/webapp/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/CreditNotes/ReconcileCreditNoteDeleteAlert.tsx @@ -8,9 +8,9 @@ import { FormattedHTMLMessage, } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteReconcileCredit } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/CreditNotes/RefundCreditNoteDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/CreditNotes/RefundCreditNoteDeleteAlert.tsx index 7ee5aa8de..a28675c76 100644 --- a/packages/webapp/src/containers/Alerts/CreditNotes/RefundCreditNoteDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/CreditNotes/RefundCreditNoteDeleteAlert.tsx @@ -6,9 +6,9 @@ import { FormattedMessage as T, AppToaster } from '@/components'; import { useDeleteRefundCreditNote } from '@/hooks/query'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/Currencies/CurrencyDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Currencies/CurrencyDeleteAlert.tsx index af2106fa6..13570cd3a 100644 --- a/packages/webapp/src/containers/Alerts/Currencies/CurrencyDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Currencies/CurrencyDeleteAlert.tsx @@ -10,8 +10,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useDeleteCurrency } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Customers/CustomerActivateAlert.tsx b/packages/webapp/src/containers/Alerts/Customers/CustomerActivateAlert.tsx index 02baae352..0f3d19e46 100644 --- a/packages/webapp/src/containers/Alerts/Customers/CustomerActivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Customers/CustomerActivateAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useActivateContact } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Customers/CustomerBulkDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Customers/CustomerBulkDeleteAlert.tsx index 373dcc715..a3c59ec6a 100644 --- a/packages/webapp/src/containers/Alerts/Customers/CustomerBulkDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Customers/CustomerBulkDeleteAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster } from '@/components'; import { transformErrors } from '@/containers/Customers/utils'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Customers/CustomerDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Customers/CustomerDeleteAlert.tsx index 57d343e43..e7d577bac 100644 --- a/packages/webapp/src/containers/Alerts/Customers/CustomerDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Customers/CustomerDeleteAlert.tsx @@ -9,9 +9,9 @@ import { } from '@/components'; import { transformErrors } from '@/containers/Customers/utils'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteCustomer } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Customers/CustomerInactivateAlert.tsx b/packages/webapp/src/containers/Alerts/Customers/CustomerInactivateAlert.tsx index fd2d5e355..4f2a3d4be 100644 --- a/packages/webapp/src/containers/Alerts/Customers/CustomerInactivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Customers/CustomerInactivateAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useInactivateContact } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Estimates/EstimateApproveAlert.tsx b/packages/webapp/src/containers/Alerts/Estimates/EstimateApproveAlert.tsx index 7c8a19e66..24a766ce3 100644 --- a/packages/webapp/src/containers/Alerts/Estimates/EstimateApproveAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Estimates/EstimateApproveAlert.tsx @@ -7,8 +7,8 @@ import { queryCache } from 'react-query'; import { useApproveEstimate } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Estimates/EstimateDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Estimates/EstimateDeleteAlert.tsx index 7ef7e5a41..ccccfb41d 100644 --- a/packages/webapp/src/containers/Alerts/Estimates/EstimateDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Estimates/EstimateDeleteAlert.tsx @@ -10,9 +10,9 @@ import { import { useDeleteEstimate } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/Estimates/EstimateDeliveredAlert.tsx b/packages/webapp/src/containers/Alerts/Estimates/EstimateDeliveredAlert.tsx index 32375393a..062cb518d 100644 --- a/packages/webapp/src/containers/Alerts/Estimates/EstimateDeliveredAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Estimates/EstimateDeliveredAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useDeliverEstimate } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Estimates/EstimateRejectAlert.tsx b/packages/webapp/src/containers/Alerts/Estimates/EstimateRejectAlert.tsx index 0c8f0cf86..3b3b62699 100644 --- a/packages/webapp/src/containers/Alerts/Estimates/EstimateRejectAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Estimates/EstimateRejectAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useRejectEstimate } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteAlert.tsx index bd28bab18..0b5d94d72 100644 --- a/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteAlert.tsx @@ -4,9 +4,9 @@ import intl from 'react-intl-universal'; import { AppToaster, FormattedMessage as T } from '@/components'; import { Intent, Alert } from '@blueprintjs/core'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteExpense } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteEntriesAlert.tsx b/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteEntriesAlert.tsx index 88c33e53d..d7d4677b8 100644 --- a/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteEntriesAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Expenses/ExpenseDeleteEntriesAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose, saveInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Expenses/ExpensePublishAlert.tsx b/packages/webapp/src/containers/Alerts/Expenses/ExpensePublishAlert.tsx index bbea1ccae..fa8c3f931 100644 --- a/packages/webapp/src/containers/Alerts/Expenses/ExpensePublishAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Expenses/ExpensePublishAlert.tsx @@ -4,8 +4,8 @@ import intl from 'react-intl-universal'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { usePublishExpense } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Invoices/CancelBadDebtAlert.tsx b/packages/webapp/src/containers/Alerts/Invoices/CancelBadDebtAlert.tsx index a2d1e95f4..85bd094a5 100644 --- a/packages/webapp/src/containers/Alerts/Invoices/CancelBadDebtAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Invoices/CancelBadDebtAlert.tsx @@ -5,8 +5,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { Intent, Alert } from '@blueprintjs/core'; import { useCancelBadDebt } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeleteAlert.tsx index 17d4c7b3c..c50145fd6 100644 --- a/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeleteAlert.tsx @@ -11,9 +11,9 @@ import { useDeleteInvoice } from '@/hooks/query'; import { handleDeleteErrors } from '@/containers/Sales/Invoices/InvoicesLanding/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeliverAlert.tsx b/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeliverAlert.tsx index 8aa585670..38038f697 100644 --- a/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeliverAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Invoices/InvoiceDeliverAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useDeliverInvoice } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentDeleteAlert.tsx index dfedafa80..ebb8bbb61 100644 --- a/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentDeleteAlert.tsx @@ -8,9 +8,9 @@ import { FormattedHTMLMessage, } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteInventoryAdjustment } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentPublishAlert.tsx b/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentPublishAlert.tsx index e90506455..a90fc9090 100644 --- a/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentPublishAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Items/InventoryAdjustmentPublishAlert.tsx @@ -5,8 +5,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; import { usePublishInventoryAdjustment } from '@/hooks/query'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Items/ItemActivateAlert.tsx b/packages/webapp/src/containers/Alerts/Items/ItemActivateAlert.tsx index be7b72939..c2fbda816 100644 --- a/packages/webapp/src/containers/Alerts/Items/ItemActivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Items/ItemActivateAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useActivateItem } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Items/ItemCategoryBulkDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Items/ItemCategoryBulkDeleteAlert.tsx index de0fd5809..f8963e778 100644 --- a/packages/webapp/src/containers/Alerts/Items/ItemCategoryBulkDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Items/ItemCategoryBulkDeleteAlert.tsx @@ -6,9 +6,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { size } from 'lodash'; import { AppToaster } from '@/components'; -import withItemCategoriesActions from '@/containers/ItemsCategories/withItemCategoriesActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withItemCategoriesActions } from '@/containers/ItemsCategories/withItemCategoriesActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Items/ItemCategoryDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Items/ItemCategoryDeleteAlert.tsx index f497119b2..f26812434 100644 --- a/packages/webapp/src/containers/Alerts/Items/ItemCategoryDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Items/ItemCategoryDeleteAlert.tsx @@ -10,8 +10,8 @@ import { import { useDeleteItemCategory } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Items/ItemDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Items/ItemDeleteAlert.tsx index 6d1d46f71..69233ef1f 100644 --- a/packages/webapp/src/containers/Alerts/Items/ItemDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Items/ItemDeleteAlert.tsx @@ -11,10 +11,10 @@ import { import { handleDeleteErrors } from '@/containers/Items/utils'; import { useDeleteItem } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withItemsActions from '@/containers/Items/withItemsActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withItemsActions } from '@/containers/Items/withItemsActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/Items/ItemInactivateAlert.tsx b/packages/webapp/src/containers/Alerts/Items/ItemInactivateAlert.tsx index fef7bea41..762e04395 100644 --- a/packages/webapp/src/containers/Alerts/Items/ItemInactivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Items/ItemInactivateAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useInactivateItem } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/ItemsEntries/ItemsEntriesDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/ItemsEntries/ItemsEntriesDeleteAlert.tsx index e1f178a3d..584c34676 100644 --- a/packages/webapp/src/containers/Alerts/ItemsEntries/ItemsEntriesDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/ItemsEntries/ItemsEntriesDeleteAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose, saveInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteAlert.tsx index 8d09ae6cb..a448a1783 100644 --- a/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteAlert.tsx @@ -5,9 +5,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; import { useDeleteJournal } from '@/hooks/query'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteEntriesAlert.tsx b/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteEntriesAlert.tsx index 370ce50b1..6f2ca6ea0 100644 --- a/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteEntriesAlert.tsx +++ b/packages/webapp/src/containers/Alerts/ManualJournals/JournalDeleteEntriesAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose, saveInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/ManualJournals/JournalPublishAlert.tsx b/packages/webapp/src/containers/Alerts/ManualJournals/JournalPublishAlert.tsx index 32030cd73..163fa753d 100644 --- a/packages/webapp/src/containers/Alerts/ManualJournals/JournalPublishAlert.tsx +++ b/packages/webapp/src/containers/Alerts/ManualJournals/JournalPublishAlert.tsx @@ -5,8 +5,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster,FormattedMessage as T } from '@/components'; import { usePublishJournal } from '@/hooks/query'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/PaymentMades/ChangingFullAmountAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentMades/ChangingFullAmountAlert.tsx index 22380a3be..4bd54f6ed 100644 --- a/packages/webapp/src/containers/Alerts/PaymentMades/ChangingFullAmountAlert.tsx +++ b/packages/webapp/src/containers/Alerts/PaymentMades/ChangingFullAmountAlert.tsx @@ -2,8 +2,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose, saveInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/PaymentMades/ClearTransactionAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentMades/ClearTransactionAlert.tsx index cc7ca487f..f697372d9 100644 --- a/packages/webapp/src/containers/Alerts/PaymentMades/ClearTransactionAlert.tsx +++ b/packages/webapp/src/containers/Alerts/PaymentMades/ClearTransactionAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/PaymentMades/ClearningAllLinesAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentMades/ClearningAllLinesAlert.tsx index 1e5491b49..1e209e4d3 100644 --- a/packages/webapp/src/containers/Alerts/PaymentMades/ClearningAllLinesAlert.tsx +++ b/packages/webapp/src/containers/Alerts/PaymentMades/ClearningAllLinesAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/PaymentMades/PaymentMadeDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentMades/PaymentMadeDeleteAlert.tsx index 51139d29b..6c11d2f46 100644 --- a/packages/webapp/src/containers/Alerts/PaymentMades/PaymentMadeDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/PaymentMades/PaymentMadeDeleteAlert.tsx @@ -4,9 +4,9 @@ import intl from 'react-intl-universal'; import { AppToaster, FormattedMessage as T } from '@/components'; import { Intent, Alert } from '@blueprintjs/core'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeletePaymentMade } from '@/hooks/query'; diff --git a/packages/webapp/src/containers/Alerts/PaymentReceived/ClearingAllLinesAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentReceived/ClearingAllLinesAlert.tsx index 9fba09183..a8352d312 100644 --- a/packages/webapp/src/containers/Alerts/PaymentReceived/ClearingAllLinesAlert.tsx +++ b/packages/webapp/src/containers/Alerts/PaymentReceived/ClearingAllLinesAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { saveInvoke, compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx index 11ce47773..a27ccc5d2 100644 --- a/packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx @@ -10,9 +10,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useDeletePaymentReceive } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { handleDeleteErrors } from './_utils'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Receipts/ReceiptCloseAlert.tsx b/packages/webapp/src/containers/Alerts/Receipts/ReceiptCloseAlert.tsx index 9307c9447..a572c3b71 100644 --- a/packages/webapp/src/containers/Alerts/Receipts/ReceiptCloseAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Receipts/ReceiptCloseAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useCloseReceipt } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Receipts/ReceiptDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Receipts/ReceiptDeleteAlert.tsx index e5a3b42c4..71bcc19c4 100644 --- a/packages/webapp/src/containers/Alerts/Receipts/ReceiptDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Receipts/ReceiptDeleteAlert.tsx @@ -10,9 +10,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useDeleteReceipt } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/Roles/RoleDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Roles/RoleDeleteAlert.tsx index deaba6ba6..6548b641a 100644 --- a/packages/webapp/src/containers/Alerts/Roles/RoleDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Roles/RoleDeleteAlert.tsx @@ -11,8 +11,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useDeleteRole } from '@/hooks/query'; import { handleDeleteErrors } from '@/containers/Preferences/Users/Roles/utils'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/TransactionLocking/cancelUnlockingPartialAlert.tsx b/packages/webapp/src/containers/Alerts/TransactionLocking/cancelUnlockingPartialAlert.tsx index 92b88d2d1..75f3bbd44 100644 --- a/packages/webapp/src/containers/Alerts/TransactionLocking/cancelUnlockingPartialAlert.tsx +++ b/packages/webapp/src/containers/Alerts/TransactionLocking/cancelUnlockingPartialAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useCancelUnlockingPartialTransactions } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Users/UserActivateAlert.tsx b/packages/webapp/src/containers/Alerts/Users/UserActivateAlert.tsx index 0a6f1bb9e..5b3680a5f 100644 --- a/packages/webapp/src/containers/Alerts/Users/UserActivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Users/UserActivateAlert.tsx @@ -5,8 +5,8 @@ import { Alert, Intent } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; import { useActivateUser } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Users/UserDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Users/UserDeleteAlert.tsx index 84d651f80..4ebcc4bff 100644 --- a/packages/webapp/src/containers/Alerts/Users/UserDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Users/UserDeleteAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useDeleteUser } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Users/UserInactivateAlert.tsx b/packages/webapp/src/containers/Alerts/Users/UserInactivateAlert.tsx index f4b8bdaee..9582df391 100644 --- a/packages/webapp/src/containers/Alerts/Users/UserInactivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Users/UserInactivateAlert.tsx @@ -5,8 +5,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { Alert, Intent } from '@blueprintjs/core'; import { useInactivateUser } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/VendorCeditNotes/ReconcileVendorCreditDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/VendorCeditNotes/ReconcileVendorCreditDeleteAlert.tsx index 1c1f8849e..7db1d2715 100644 --- a/packages/webapp/src/containers/Alerts/VendorCeditNotes/ReconcileVendorCreditDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/VendorCeditNotes/ReconcileVendorCreditDeleteAlert.tsx @@ -8,9 +8,9 @@ import { FormattedHTMLMessage, } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteReconcileVendorCredit } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/VendorCeditNotes/RefundVendorCreditDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/VendorCeditNotes/RefundVendorCreditDeleteAlert.tsx index 1a3388ad5..503e66750 100644 --- a/packages/webapp/src/containers/Alerts/VendorCeditNotes/RefundVendorCreditDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/VendorCeditNotes/RefundVendorCreditDeleteAlert.tsx @@ -5,9 +5,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T, AppToaster } from '@/components'; import { useDeleteRefundVendorCredit } from '@/hooks/query'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditDeleteAlert.tsx index 35d2f76c6..a9de10bf2 100644 --- a/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditDeleteAlert.tsx @@ -8,9 +8,9 @@ import { FormattedHTMLMessage, } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { handleDeleteErrors } from '@/containers/Purchases/CreditNotes/CreditNotesLanding/utils'; import { useDeleteVendorCredit } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditOpenedAlert.tsx b/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditOpenedAlert.tsx index 269e72968..1e9c06178 100644 --- a/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditOpenedAlert.tsx +++ b/packages/webapp/src/containers/Alerts/VendorCeditNotes/VendorCreditOpenedAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useOpenVendorCredit } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Vendors/VendorActivateAlert.tsx b/packages/webapp/src/containers/Alerts/Vendors/VendorActivateAlert.tsx index 8191c81e9..44c4b638b 100644 --- a/packages/webapp/src/containers/Alerts/Vendors/VendorActivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Vendors/VendorActivateAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useActivateContact } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Vendors/VendorDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Vendors/VendorDeleteAlert.tsx index cfa1323d2..658ed7635 100644 --- a/packages/webapp/src/containers/Alerts/Vendors/VendorDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Vendors/VendorDeleteAlert.tsx @@ -11,9 +11,9 @@ import { import { transformErrors } from '@/containers/Vendors/utils'; import { useDeleteVendor } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/Vendors/VendorInactivateAlert.tsx b/packages/webapp/src/containers/Alerts/Vendors/VendorInactivateAlert.tsx index 0e4366035..92e417a09 100644 --- a/packages/webapp/src/containers/Alerts/Vendors/VendorInactivateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Vendors/VendorInactivateAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useInactivateContact } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/Warehouses/WarehouseDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/Warehouses/WarehouseDeleteAlert.tsx index 69199a33c..6d60047b4 100644 --- a/packages/webapp/src/containers/Alerts/Warehouses/WarehouseDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/Warehouses/WarehouseDeleteAlert.tsx @@ -11,8 +11,8 @@ import { import { useDeleteWarehouse } from '@/hooks/query'; import { handleDeleteErrors } from '@/containers/Preferences/Warehouses/utils'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/WarehousesTransfer/TransferredWarehouseTransferAlert.tsx b/packages/webapp/src/containers/Alerts/WarehousesTransfer/TransferredWarehouseTransferAlert.tsx index 78d6d18ce..093c4dafc 100644 --- a/packages/webapp/src/containers/Alerts/WarehousesTransfer/TransferredWarehouseTransferAlert.tsx +++ b/packages/webapp/src/containers/Alerts/WarehousesTransfer/TransferredWarehouseTransferAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useTransferredWarehouseTransfer } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseMarkPrimaryAlert.tsx b/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseMarkPrimaryAlert.tsx index 30f928de3..634763a2f 100644 --- a/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseMarkPrimaryAlert.tsx +++ b/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseMarkPrimaryAlert.tsx @@ -6,8 +6,8 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useMarkWarehouseAsPrimary } from '@/hooks/query'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferDeleteAlert.tsx index fbe2cad3d..43ebcaca4 100644 --- a/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferDeleteAlert.tsx @@ -9,9 +9,9 @@ import { } from '@/components'; import { useDeleteWarehouseTransfer } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferInitiateAlert.tsx b/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferInitiateAlert.tsx index fc78e4500..d790871aa 100644 --- a/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferInitiateAlert.tsx +++ b/packages/webapp/src/containers/Alerts/WarehousesTransfer/WarehouseTransferInitiateAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { useInitiateWarehouseTransfer } from '@/hooks/query'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/AlertsContainer/components.tsx b/packages/webapp/src/containers/AlertsContainer/components.tsx index 8ab5e926d..ed8cd13f5 100644 --- a/packages/webapp/src/containers/AlertsContainer/components.tsx +++ b/packages/webapp/src/containers/AlertsContainer/components.tsx @@ -6,8 +6,8 @@ import * as R from 'ramda'; import { Intent, Classes, ProgressBar } from '@blueprintjs/core'; import { debounce } from 'lodash'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { AppToaster } from '@/components'; diff --git a/packages/webapp/src/containers/Authentication/withAuthentication.tsx b/packages/webapp/src/containers/Authentication/withAuthentication.tsx index b473a9d4c..666148955 100644 --- a/packages/webapp/src/containers/Authentication/withAuthentication.tsx +++ b/packages/webapp/src/containers/Authentication/withAuthentication.tsx @@ -2,7 +2,7 @@ import { isAuthenticated } from '@/store/authentication/authentication.reducer'; import { connect } from 'react-redux'; -export default (mapState) => { +export const withAuthentication = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { isAuthorized: isAuthenticated(state), diff --git a/packages/webapp/src/containers/Authentication/withAuthenticationActions.tsx b/packages/webapp/src/containers/Authentication/withAuthenticationActions.tsx index a510e9ffe..6883932d4 100644 --- a/packages/webapp/src/containers/Authentication/withAuthenticationActions.tsx +++ b/packages/webapp/src/containers/Authentication/withAuthenticationActions.tsx @@ -11,4 +11,4 @@ const mapDispatchToProps = (dispatch) => ({ // requestInviteMetaByToken: (token) => dispatch(inviteMetaByToken({ token })), }); -export default connect(null, mapDispatchToProps); \ No newline at end of file +export const withAuthenticationActions = connect(null, mapDispatchToProps); \ No newline at end of file diff --git a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx index f3b172b7f..c75cf5e21 100644 --- a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx @@ -32,7 +32,7 @@ import { transformToForm, transfromToSnakeCase, } from '@/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; import { getAddMoneyInOptions, getAddMoneyOutOptions } from '@/constants'; diff --git a/packages/webapp/src/containers/Banking/Rules/RulesList/BankRulesLandingEmptyState.tsx b/packages/webapp/src/containers/Banking/Rules/RulesList/BankRulesLandingEmptyState.tsx index 737fdca6d..4a9676df6 100644 --- a/packages/webapp/src/containers/Banking/Rules/RulesList/BankRulesLandingEmptyState.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RulesList/BankRulesLandingEmptyState.tsx @@ -3,7 +3,7 @@ import * as R from 'ramda'; import { Button, Intent } from '@blueprintjs/core'; import { EmptyStatus, Can, FormattedMessage as T } from '@/components'; import { AbilitySubject, BankRuleAction } from '@/constants/abilityOption'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; import styles from './BankRulesLandingEmptyState.module.scss'; diff --git a/packages/webapp/src/containers/Banking/Rules/RulesList/RulesListActionsBar.tsx b/packages/webapp/src/containers/Banking/Rules/RulesList/RulesListActionsBar.tsx index 2516c1563..9cefbe1ac 100644 --- a/packages/webapp/src/containers/Banking/Rules/RulesList/RulesListActionsBar.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RulesList/RulesListActionsBar.tsx @@ -3,7 +3,7 @@ import { Button, Classes, NavbarGroup } from '@blueprintjs/core'; import * as R from 'ramda'; import { Can, DashboardActionsBar, Icon } from '@/components'; import { AbilitySubject, BankRuleAction } from '@/constants/abilityOption'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; function RulesListActionsBarRoot({ diff --git a/packages/webapp/src/containers/Banking/Rules/RulesList/RulesTable.tsx b/packages/webapp/src/containers/Banking/Rules/RulesList/RulesTable.tsx index 5228ad1c9..c26286c65 100644 --- a/packages/webapp/src/containers/Banking/Rules/RulesList/RulesTable.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RulesList/RulesTable.tsx @@ -7,8 +7,8 @@ import { TableSkeletonRows, } from '@/components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useBankRulesTableColumns } from './hooks'; import { BankRulesTableActionsMenu } from './_components'; @@ -21,7 +21,7 @@ import { DialogsName } from '@/constants/dialogs'; * @returns {React.ReactNode} */ function RulesTable({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDialogAction @@ -77,6 +77,6 @@ function RulesTable({ } export const BankRulesTable = R.compose( - withAlertsActions, + withAlertActions, withDialogActions, )(RulesTable); diff --git a/packages/webapp/src/containers/Banking/Rules/RulesList/alerts/DeleteBankRuleAlert.tsx b/packages/webapp/src/containers/Banking/Rules/RulesList/alerts/DeleteBankRuleAlert.tsx index 987e0670f..ec544339a 100644 --- a/packages/webapp/src/containers/Banking/Rules/RulesList/alerts/DeleteBankRuleAlert.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RulesList/alerts/DeleteBankRuleAlert.tsx @@ -4,9 +4,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { AppToaster } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useDeleteBankRule } from '@/hooks/query/bank-rules'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesActionsBar.tsx b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesActionsBar.tsx index ca9499de2..5a80a25e5 100644 --- a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesActionsBar.tsx +++ b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesActionsBar.tsx @@ -2,7 +2,7 @@ import React, { useMemo } from 'react'; import { Button, NavbarGroup, Intent } from '@blueprintjs/core'; import { DrawerActionsBar, Icon } from '@/components'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { getButtonLabelFromResource, getCustomizeDrawerNameFromResource, diff --git a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesContent.tsx b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesContent.tsx index 8b6f139cf..8a6da5d42 100644 --- a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesContent.tsx +++ b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesContent.tsx @@ -6,7 +6,7 @@ import { Box, Card, DrawerHeaderContent, Group } from '@/components'; import { DRAWERS } from '@/constants/drawers'; import { BrandingTemplatesTable } from './BrandingTemplatesTable'; import { BrandingTemplateActionsBar } from './BrandingTemplatesActionsBar'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; export default function BrandingTemplateContent() { return ( diff --git a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesDrawer.tsx b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesDrawer.tsx index 685e7cadb..eff26fa6c 100644 --- a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesDrawer.tsx +++ b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const BrandingTemplatesContent = React.lazy( () => import('./BrandingTemplatesContent'), diff --git a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesTable.tsx b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesTable.tsx index 0b2d57985..b6782931b 100644 --- a/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesTable.tsx +++ b/packages/webapp/src/containers/BrandingTemplates/BrandingTemplatesTable.tsx @@ -4,8 +4,8 @@ import { DataTable, TableSkeletonRows } from '@/components'; import { useBrandingTemplatesBoot } from './BrandingTemplatesBoot'; import { ActionsMenu } from './_components'; import { DRAWERS } from '@/constants/drawers'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { getCustomizeDrawerNameFromResource } from './_utils'; import { useBrandingTemplatesColumns } from './_hooks'; import styles from './BrandTemplates.module.scss'; diff --git a/packages/webapp/src/containers/BrandingTemplates/alerts/DeleteBrandingTemplateAlert.tsx b/packages/webapp/src/containers/BrandingTemplates/alerts/DeleteBrandingTemplateAlert.tsx index 58358b0de..6f6c5f60a 100644 --- a/packages/webapp/src/containers/BrandingTemplates/alerts/DeleteBrandingTemplateAlert.tsx +++ b/packages/webapp/src/containers/BrandingTemplates/alerts/DeleteBrandingTemplateAlert.tsx @@ -5,8 +5,8 @@ import { AppToaster } from '@/components'; import { Alert, Intent } from '@blueprintjs/core'; import { useDeletePdfTemplate } from '@/hooks/query/pdf-templates'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx b/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx index 8329c0f02..faae610c2 100644 --- a/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx +++ b/packages/webapp/src/containers/BrandingTemplates/alerts/MarkDefaultBrandingTemplateAlert.tsx @@ -5,8 +5,8 @@ import { AppToaster } from '@/components'; import { Alert, Intent } from '@blueprintjs/core'; import { useAssignPdfTemplateAsDefault } from '@/hooks/query/pdf-templates'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx index c4151505d..4e0189f6f 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx @@ -37,12 +37,12 @@ import { useAccountTransactionsContext } from './AccountTransactionsProvider'; import { useMediaQuery } from '@/hooks/useMediaQuery'; import { useAppShellContext } from '@/components/AppShell/AppContentShell/AppContentShellProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { withBankingActions } from '../withBankingActions'; import { withBanking } from '../withBanking'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useUpdateBankAccount, useExcludeUncategorizedTransactions, diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx index 1f88a82d3..39bcbf3ea 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx @@ -14,9 +14,9 @@ import { } from '@/components'; import { TABLES } from '@/constants/tables'; -import withSettings from '@/containers/Settings/withSettings'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { withBankingActions } from '../withBankingActions'; import { useMemorizedColumnsWidths } from '@/hooks'; @@ -36,7 +36,7 @@ function AccountTransactionsDataTable({ // #withSettings cashflowTansactionsTableSize, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -157,7 +157,7 @@ export default compose( withSettings(({ cashflowTransactionsSettings }) => ({ cashflowTansactionsTableSize: cashflowTransactionsSettings?.tableSize, })), - withAlertsActions, + withAlertActions, withDrawerActions, withBankingActions, )(AccountTransactionsDataTable); diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/PendingTransactions/PendingTransactionsTable.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/PendingTransactions/PendingTransactionsTable.tsx index 51180ecee..20b0d4c66 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/PendingTransactions/PendingTransactionsTable.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/PendingTransactions/PendingTransactionsTable.tsx @@ -6,7 +6,7 @@ import { TableSkeletonHeader, TableVirtualizedListRows, } from '@/components'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { withBankingActions } from '../../withBankingActions'; import { useAccountTransactionsContext } from '../AccountTransactionsProvider'; diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/AccountTransactionsUncategorizedTable.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/AccountTransactionsUncategorizedTable.tsx index 8abc098b5..88ee259a8 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/AccountTransactionsUncategorizedTable.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/AccountTransactionsUncategorizedTable.tsx @@ -13,7 +13,7 @@ import { TABLES } from '@/constants/tables'; import { ActionsMenu } from './components'; import { BankAccountDataTable } from '../components/BankAccountDataTable'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { withBankingActions } from '../../withBankingActions'; import { withBanking } from '../../withBanking'; diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/PauseFeedsBankAccount.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/PauseFeedsBankAccount.tsx index d86f875ec..b2db588e5 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/PauseFeedsBankAccount.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/PauseFeedsBankAccount.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { usePauseFeedsBankAccount } from '@/hooks/query/bank-accounts'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/ResumeFeedsBankAccount.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/ResumeFeedsBankAccount.tsx index 7d5211a84..7f8d3dfd8 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/ResumeFeedsBankAccount.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/ResumeFeedsBankAccount.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useResumeFeedsBankAccount } from '@/hooks/query/bank-accounts'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/UncategorizeBankTransactionsBulkAlert.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/UncategorizeBankTransactionsBulkAlert.tsx index 4b211f21a..7b5367b53 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/UncategorizeBankTransactionsBulkAlert.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/alerts/UncategorizeBankTransactionsBulkAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useUncategorizeTransactionsBulkAction } from '@/hooks/query/bank-transactions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/dialogs/DisconnectBankAccountDialog/DisconnectBankAccountDialogContent.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/dialogs/DisconnectBankAccountDialog/DisconnectBankAccountDialogContent.tsx index 0ec767dc2..1a49a05e3 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/dialogs/DisconnectBankAccountDialog/DisconnectBankAccountDialogContent.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/dialogs/DisconnectBankAccountDialog/DisconnectBankAccountDialogContent.tsx @@ -5,7 +5,7 @@ import * as R from 'ramda'; import { Form, Formik, FormikHelpers } from 'formik'; import { AppToaster, FFormGroup, FInputGroup } from '@/components'; import { useDisconnectBankAccount } from '@/hooks/query/bank-rules'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; interface DisconnectFormValues { diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccounts.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccounts.tsx index f9d2b8659..d3ddcfd22 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccounts.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccounts.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getCashflowAccountsTableStateFactory } from '@/store/CashflowAccounts/CashflowAccounts.selectors'; -export default (mapState) => { +export const withCashflowAccounts = (mapState) => { const getCashflowAccountsTableState = getCashflowAccountsTableStateFactory(); const mapStateToProps = (state, props) => { diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccountsTableActions.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccountsTableActions.tsx index f52f8d0e8..21efb4e71 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccountsTableActions.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/withCashflowAccountsTableActions.tsx @@ -13,4 +13,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(resetCashflowAccountsTableState()), }); -export default connect(null, mapActionsToProps); +export const withCashflowAccountsTableActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.tsx b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.tsx index d9acd3dd8..f923a16cc 100644 --- a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.tsx +++ b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.tsx @@ -18,8 +18,8 @@ import { useRefreshCashflowAccounts } from '@/hooks/query'; import { useOpenPlaidConnect } from '@/hooks/utils/useOpenPlaidConnect'; import { CashflowAction, AbilitySubject } from '@/constants/abilityOption'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withCashflowAccountsTableActions from '../AccountTransactions/withCashflowAccountsTableActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withCashflowAccountsTableActions } from '../AccountTransactions/withCashflowAccountsTableActions'; import { AccountDialogAction } from '@/containers/Dialogs/AccountDialog/utils'; diff --git a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsDataTable.tsx b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsDataTable.tsx index 64e9ac18e..01cf473d7 100644 --- a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsDataTable.tsx +++ b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsDataTable.tsx @@ -9,7 +9,7 @@ import { TableSkeletonHeader, } from '@/components'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useMemorizedColumnsWidths } from '@/hooks'; import { useCashFlowAccountsContext } from './CashFlowAccountsProvider'; diff --git a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsList.tsx b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsList.tsx index c3c88f431..91cd83f97 100644 --- a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsList.tsx +++ b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsList.tsx @@ -12,8 +12,8 @@ import CashFlowAccountsActionsBar from './CashFlowAccountsActionsBar'; import { CashflowAccountsPlaidLink } from './CashflowAccountsPlaidLink'; import { CashflowAccountsLoadingBar } from './CashFlowAccountsLoadingBar'; -import withCashflowAccounts from '@/containers/CashFlow/AccountTransactions/withCashflowAccounts'; -import withCashflowAccountsTableActions from '@/containers/CashFlow/AccountTransactions/withCashflowAccountsTableActions'; +import { withCashflowAccounts } from '@/containers/CashFlow/AccountTransactions/withCashflowAccounts'; +import { withCashflowAccountsTableActions } from '@/containers/CashFlow/AccountTransactions/withCashflowAccountsTableActions'; /** * Cashflow accounts list. diff --git a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashflowAccountsGrid.tsx b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashflowAccountsGrid.tsx index 8c8315e84..c1e05f8fe 100644 --- a/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashflowAccountsGrid.tsx +++ b/packages/webapp/src/containers/CashFlow/CashFlowAccounts/CashflowAccountsGrid.tsx @@ -22,9 +22,9 @@ import { import { BankAccountsList, BankAccount, If, Icon, T, Can } from '@/components'; import { useCashFlowAccountsContext } from './CashFlowAccountsProvider'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { AccountDialogAction } from '@/containers/Dialogs/AccountDialog/utils'; import { safeCallback } from '@/utils'; @@ -136,7 +136,7 @@ function CashflowBankAccount({ } const CashflowBankAccountEnhanced = compose( - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, )(CashflowBankAccount); diff --git a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer.tsx b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer.tsx index 388b6dfab..bd3996167 100644 --- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer.tsx +++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React, { lazy } from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx index 644aa9a7f..41f51862d 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInFloatingActions.tsx @@ -6,7 +6,7 @@ import { FormattedMessage as T } from '@/components'; import { useMoneyInDailogContext } from './MoneyInDialogProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx index 12f5dc7dd..626a04ef0 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInForm.tsx @@ -15,9 +15,9 @@ import { CreateMoneyInFormSchema } from './MoneyInForm.schema'; import { useMoneyInDailogContext } from './MoneyInDialogProvider'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose, transactionNumber } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx index 9f76aaaaf..f20239fce 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx @@ -19,7 +19,6 @@ import { Row, FeatureCan, BranchSelect, - BranchSelectButton, FInputGroup, FFormGroup, FTextArea, @@ -60,7 +59,6 @@ export default function OtherIncomeFormFields() { diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx index 8c6d29358..42c57f6a9 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.tsx @@ -11,7 +11,6 @@ import { Col, Row, BranchSelect, - BranchSelectButton, FeatureCan, FFormGroup, FMoneyInputGroup, @@ -56,7 +55,6 @@ export default function OwnerContributionFormFields() { diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx index 2a659a19a..f2341ec11 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.tsx @@ -11,7 +11,6 @@ import { Row, FeatureCan, BranchSelect, - BranchSelectButton, FMoneyInputGroup, FFormGroup, FTextArea, @@ -49,7 +48,6 @@ export default function TransferFromAccountFormFields() { diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx index a39c34409..170dd1d69 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutFloatingActions.tsx @@ -6,7 +6,7 @@ import { FormattedMessage as T } from '@/components'; import { useMoneyOutDialogContext } from './MoneyOutDialogProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx index ab21384aa..fca2d67e0 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutForm.tsx @@ -15,9 +15,9 @@ import { CreateMoneyOutSchema } from './MoneyOutForm.schema'; import { useMoneyOutDialogContext } from './MoneyOutDialogProvider'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose, transactionNumber } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx index 56d8d719b..84942e41a 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.tsx @@ -11,7 +11,6 @@ import { Row, FeatureCan, BranchSelect, - BranchSelectButton, FTextArea, FFormGroup, FInputGroup, @@ -47,7 +46,6 @@ export default function OtherExpnseFormFields() { diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx index 5c7a73c4d..c9ef8c3f7 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.tsx @@ -11,7 +11,6 @@ import { Row, FeatureCan, BranchSelect, - BranchSelectButton, FFormGroup, FTextArea, FInputGroup, @@ -49,7 +48,6 @@ export default function OwnerDrawingsFormFields() { diff --git a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx index 2856341f7..b965548b6 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.tsx @@ -12,7 +12,6 @@ import { Row, FeatureCan, BranchSelect, - BranchSelectButton, FFormGroup, FTextArea, FMoneyInputGroup, @@ -52,7 +51,6 @@ export default function TransferToAccountFormFields() { diff --git a/packages/webapp/src/containers/CashFlow/UncategorizeTransactionAlert/UncategorizeTransactionAlert.tsx b/packages/webapp/src/containers/CashFlow/UncategorizeTransactionAlert/UncategorizeTransactionAlert.tsx index 0ef15fabe..46e19a590 100644 --- a/packages/webapp/src/containers/CashFlow/UncategorizeTransactionAlert/UncategorizeTransactionAlert.tsx +++ b/packages/webapp/src/containers/CashFlow/UncategorizeTransactionAlert/UncategorizeTransactionAlert.tsx @@ -4,9 +4,9 @@ import { Intent, Alert } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { AppToaster } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useUncategorizeTransaction } from '@/hooks/query'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/CashFlow/_components.tsx b/packages/webapp/src/containers/CashFlow/_components.tsx index 26e08a1b9..7b3c8ba63 100644 --- a/packages/webapp/src/containers/CashFlow/_components.tsx +++ b/packages/webapp/src/containers/CashFlow/_components.tsx @@ -12,8 +12,8 @@ import { } from '@/components'; import { useUpdateEffect } from '@/hooks'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { transactionNumber } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Currencies/withCurrencies.tsx b/packages/webapp/src/containers/Currencies/withCurrencies.tsx index 1b1b741d9..31e8c7844 100644 --- a/packages/webapp/src/containers/Currencies/withCurrencies.tsx +++ b/packages/webapp/src/containers/Currencies/withCurrencies.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getCurrenciesList } from '@/store/currencies/currencies.selector'; -export default (mapState) => { +export const withCurrencies = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { currencies: state.currencies.data, diff --git a/packages/webapp/src/containers/Currencies/withCurrenciesActions.tsx b/packages/webapp/src/containers/Currencies/withCurrenciesActions.tsx index 5215b14d6..0415e64b9 100644 --- a/packages/webapp/src/containers/Currencies/withCurrenciesActions.tsx +++ b/packages/webapp/src/containers/Currencies/withCurrenciesActions.tsx @@ -15,4 +15,4 @@ export const mapDispatchToProps = (dispatch) => ({ requestDeleteCurrency: (currency_code) => dispatch(deleteCurrency({ currency_code })), }); -export default connect(null, mapDispatchToProps); +export const withCurrenciesActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Currencies/withCurrencyDetail.tsx b/packages/webapp/src/containers/Currencies/withCurrencyDetail.tsx index 7791f8c5d..124dc1b5f 100644 --- a/packages/webapp/src/containers/Currencies/withCurrencyDetail.tsx +++ b/packages/webapp/src/containers/Currencies/withCurrencyDetail.tsx @@ -6,4 +6,4 @@ const mapStateToProps = (state, props) => ({ currency: getCurrencyByCode(state, props), }); -export default connect(mapStateToProps); +export const withCurrencyDetail = connect(mapStateToProps); diff --git a/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormFormik.tsx b/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormFormik.tsx index 2ac41df3f..e8192963a 100644 --- a/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormFormik.tsx +++ b/packages/webapp/src/containers/Customers/CustomerForm/CustomerFormFormik.tsx @@ -18,7 +18,7 @@ import CustomerFormAfterPrimarySection from './CustomerFormAfterPrimarySection'; import CustomersTabs from './CustomersTabs'; import CustomerFloatingActions from './CustomerFloatingActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import '@/style/pages/Customers/Form.scss'; diff --git a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersActionsBar.tsx b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersActionsBar.tsx index 1a6c689ea..b32238f27 100644 --- a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersActionsBar.tsx +++ b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersActionsBar.tsx @@ -26,11 +26,11 @@ import { useCustomersListContext } from './CustomersListProvider'; import { useRefreshCustomers } from '@/hooks/query/customers'; import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; -import withCustomers from './withCustomers'; -import withCustomersActions from './withCustomersActions'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withCustomers } from './withCustomers'; +import { withCustomersActions } from './withCustomersActions'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { CustomerAction, AbilitySubject } from '@/constants/abilityOption'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersList.tsx b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersList.tsx index 6ef662cf1..cab03e110 100644 --- a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersList.tsx +++ b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersList.tsx @@ -9,8 +9,8 @@ import CustomersActionsBar from './CustomersActionsBar'; import CustomersTable from './CustomersTable'; import { CustomersListProvider } from './CustomersListProvider'; -import withCustomers from './withCustomers'; -import withCustomersActions from './withCustomersActions'; +import { withCustomers } from './withCustomers'; +import { withCustomersActions } from './withCustomersActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersTable.tsx b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersTable.tsx index c42d63df4..9c132050e 100644 --- a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersTable.tsx +++ b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersTable.tsx @@ -13,12 +13,12 @@ import { } from '@/components'; import { ActionsMenu, useCustomersTableColumns } from './components'; -import withCustomers from './withCustomers'; -import withCustomersActions from './withCustomersActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withCustomers } from './withCustomers'; +import { withCustomersActions } from './withCustomersActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useCustomersListContext } from './CustomersListProvider'; import { useMemorizedColumnsWidths } from '@/hooks'; @@ -174,7 +174,7 @@ function CustomersTable({ } export default compose( - withAlertsActions, + withAlertActions, withDialogActions, withCustomersActions, withDrawerActions, diff --git a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersViewsTabs.tsx b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersViewsTabs.tsx index 008ade60c..673a7b40b 100644 --- a/packages/webapp/src/containers/Customers/CustomersLanding/CustomersViewsTabs.tsx +++ b/packages/webapp/src/containers/Customers/CustomersLanding/CustomersViewsTabs.tsx @@ -6,9 +6,9 @@ import { DashboardViewsTabs } from '@/components'; import { useCustomersListContext } from './CustomersListProvider'; import { compose, transfromViewsToTabs } from '@/utils'; -import withCustomers from './withCustomers'; -import withCustomersActions from './withCustomersActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withCustomers } from './withCustomers'; +import { withCustomersActions } from './withCustomersActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; /** diff --git a/packages/webapp/src/containers/Customers/CustomersLanding/withCustomers.tsx b/packages/webapp/src/containers/Customers/CustomersLanding/withCustomers.tsx index 220f1d620..02322061a 100644 --- a/packages/webapp/src/containers/Customers/CustomersLanding/withCustomers.tsx +++ b/packages/webapp/src/containers/Customers/CustomersLanding/withCustomers.tsx @@ -6,7 +6,7 @@ import { } from '@/store/customers/customers.selectors'; -export default (mapState) => { +export const withCustomers = (mapState) => { const getCustomersTableState = getCustomersTableStateFactory(); const customersTableStateChanged = customersTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Customers/CustomersLanding/withCustomersActions.tsx b/packages/webapp/src/containers/Customers/CustomersLanding/withCustomersActions.tsx index d80cd1cf9..5df2bff6f 100644 --- a/packages/webapp/src/containers/Customers/CustomersLanding/withCustomersActions.tsx +++ b/packages/webapp/src/containers/Customers/CustomersLanding/withCustomersActions.tsx @@ -15,4 +15,4 @@ export const mapDispatchToProps = (dispatch) => ({ resetCustomersSelectedRows: () => dispatch(resetCustomersSelectedRows()), }); -export default connect(null, mapDispatchToProps); +export const withCustomersActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Customers/CustomersUniversalSearch.tsx b/packages/webapp/src/containers/Customers/CustomersUniversalSearch.tsx index 5c34a6628..4d1de6725 100644 --- a/packages/webapp/src/containers/Customers/CustomersUniversalSearch.tsx +++ b/packages/webapp/src/containers/Customers/CustomersUniversalSearch.tsx @@ -2,7 +2,7 @@ import intl from 'react-intl-universal'; import { AbilitySubject, CustomerAction } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Customers/withCustomerDetail.tsx b/packages/webapp/src/containers/Customers/withCustomerDetail.tsx index 23a30d93b..acfd10909 100644 --- a/packages/webapp/src/containers/Customers/withCustomerDetail.tsx +++ b/packages/webapp/src/containers/Customers/withCustomerDetail.tsx @@ -6,4 +6,4 @@ const mapStateToProps = (state, props) => ({ customer: getCustomerById(state, props.customerId), }); -export default connect(mapStateToProps); +export const withCustomerDetail = connect(mapStateToProps); diff --git a/packages/webapp/src/containers/Dashboard/Sidebar/SidebarContainer.tsx b/packages/webapp/src/containers/Dashboard/Sidebar/SidebarContainer.tsx index 3e518f259..26a2b6864 100644 --- a/packages/webapp/src/containers/Dashboard/Sidebar/SidebarContainer.tsx +++ b/packages/webapp/src/containers/Dashboard/Sidebar/SidebarContainer.tsx @@ -3,7 +3,7 @@ import React, { useEffect } from 'react'; import { Scrollbar } from 'react-scrollbars-custom'; import classNames from 'classnames'; -import withDashboard from '@/containers/Dashboard/withDashboard'; +import { withDashboard } from '@/containers/Dashboard/withDashboard'; import { useObserveSidebarExpendedBodyclass } from './hooks'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dashboard/Sidebar/SidebarHead.tsx b/packages/webapp/src/containers/Dashboard/Sidebar/SidebarHead.tsx index d51e04998..850a2ca83 100644 --- a/packages/webapp/src/containers/Dashboard/Sidebar/SidebarHead.tsx +++ b/packages/webapp/src/containers/Dashboard/Sidebar/SidebarHead.tsx @@ -3,7 +3,7 @@ import { Button, Popover, Menu, Position } from '@blueprintjs/core'; import { Icon } from '@/components'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { useAuthenticatedAccount } from '@/hooks/query'; import { compose, firstLettersArgs } from '@/utils'; diff --git a/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebar.tsx b/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebar.tsx index 67fe30bd4..553c97690 100644 --- a/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebar.tsx +++ b/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebar.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; -export default (mapState) => { +export const withDashboardSidebar = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { sidebarSubmenuOpen: state.dashboard.sidebarSubmenu.isOpen, diff --git a/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebarActions.tsx b/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebarActions.tsx index 5a8431d8d..1ff630274 100644 --- a/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebarActions.tsx +++ b/packages/webapp/src/containers/Dashboard/Sidebar/withDashboardSidebarActions.tsx @@ -14,4 +14,4 @@ const mapActionsToProps = (dispatch) => ({ closeDashboardSidebarSubmenu: () => dispatch(closeSidebarSubmenu()), }); -export default connect(null, mapActionsToProps); +export const withDashboardSidebarActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/Dashboard/SidebarOverlay/SidebarOverlayBinded.tsx b/packages/webapp/src/containers/Dashboard/SidebarOverlay/SidebarOverlayBinded.tsx index f687677e5..8f6ab4f10 100644 --- a/packages/webapp/src/containers/Dashboard/SidebarOverlay/SidebarOverlayBinded.tsx +++ b/packages/webapp/src/containers/Dashboard/SidebarOverlay/SidebarOverlayBinded.tsx @@ -3,8 +3,8 @@ import React from 'react'; import * as R from 'ramda'; import { SidebarOverlay } from './SidebarOverlay'; -import withDashboardSidebarActions from '@/containers/Dashboard/Sidebar/withDashboardSidebarActions'; -import withDashboardSidebar from '@/containers/Dashboard/Sidebar/withDashboardSidebar'; +import { withDashboardSidebarActions } from '@/containers/Dashboard/Sidebar/withDashboardSidebarActions'; +import { withDashboardSidebar } from '@/containers/Dashboard/Sidebar/withDashboardSidebar'; import { useSubSidebarMenu } from '../Sidebar/hooks'; diff --git a/packages/webapp/src/containers/Dashboard/withDashboard.tsx b/packages/webapp/src/containers/Dashboard/withDashboard.tsx index 599ea7d80..00ca3569e 100644 --- a/packages/webapp/src/containers/Dashboard/withDashboard.tsx +++ b/packages/webapp/src/containers/Dashboard/withDashboard.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; -export default (mapState) => { +export const withDashboard = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { pageTitle: state.dashboard.pageTitle, diff --git a/packages/webapp/src/containers/Dashboard/withDashboardActions.tsx b/packages/webapp/src/containers/Dashboard/withDashboardActions.tsx index f5b87ccbe..d7f539841 100644 --- a/packages/webapp/src/containers/Dashboard/withDashboardActions.tsx +++ b/packages/webapp/src/containers/Dashboard/withDashboardActions.tsx @@ -63,4 +63,4 @@ const mapActionsToProps = (dispatch) => ({ splashStopLoading: () => splashStopLoading(), }); -export default connect(null, mapActionsToProps); +export const withDashboardActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/Dialog/withDialogActions.tsx b/packages/webapp/src/containers/Dialog/withDialogActions.tsx index 89079309c..9b8fec702 100644 --- a/packages/webapp/src/containers/Dialog/withDialogActions.tsx +++ b/packages/webapp/src/containers/Dialog/withDialogActions.tsx @@ -28,4 +28,4 @@ function withDialogActions

( return Connected as unknown as ComponentType>; } -export default withDialogActions; +export { withDialogActions }; diff --git a/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogForm.tsx b/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogForm.tsx index d9028b840..c77c25895 100644 --- a/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogForm.tsx +++ b/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogForm.tsx @@ -7,7 +7,7 @@ import { AppToaster } from '@/components'; import AccountDialogFormContent from './AccountDialogFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { EditAccountFormSchema, CreateAccountFormSchema, diff --git a/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.tsx b/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.tsx index 31f36b364..06c484ccb 100644 --- a/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.tsx +++ b/packages/webapp/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.tsx @@ -15,7 +15,7 @@ import { FCheckbox, FTextArea, } from '@/components'; -import withAccounts from '@/containers/Accounts/withAccounts'; +import { withAccounts } from '@/containers/Accounts/withAccounts'; import { FOREIGN_CURRENCY_ACCOUNTS } from '@/constants/accountTypes'; diff --git a/packages/webapp/src/containers/Dialogs/Accounts/AccountBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Accounts/AccountBulkDeleteDialog.tsx index fd21bf09a..eef9a1b4a 100644 --- a/packages/webapp/src/containers/Dialogs/Accounts/AccountBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Accounts/AccountBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteAccounts } from '@/hooks/query/accounts'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAccountsTableActions from '@/containers/Accounts/withAccountsTableActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAccountsTableActions } from '@/containers/Accounts/withAccountsTableActions'; import { compose } from '@/utils'; import { handleDeleteErrors } from '@/containers/Accounts/utils'; diff --git a/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.tsx index a5203e383..3959da626 100644 --- a/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFloatingActions.tsx @@ -10,7 +10,7 @@ import { } from '@/components'; import { useAllocateLandedConstDialogContext } from './AllocateLandedCostDialogProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.tsx b/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.tsx index cd937f20a..cd07869fb 100644 --- a/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.tsx +++ b/packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostForm.tsx @@ -10,7 +10,7 @@ import { AppToaster } from '@/components'; import { AllocateLandedCostFormSchema } from './AllocateLandedCostForm.schema'; import { useAllocateLandedConstDialogContext } from './AllocateLandedCostDialogProvider'; import AllocateLandedCostFormContent from './AllocateLandedCostFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; import { defaultInitialValues } from './utils'; diff --git a/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateDialogContent.tsx b/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateDialogContent.tsx index c904f8264..f12d4895e 100644 --- a/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateDialogContent.tsx @@ -8,7 +8,7 @@ import { useGenerateApiKey } from '@/hooks/query'; import ApiKeysGenerateFormContent from './ApiKeysGenerateFormContent'; import ApiKeysGenerateFormSchema from './ApiKeysGenerateForm.schema'; import ApiKeyDisplayView from './ApiKeyDisplayView'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateFormContent.tsx b/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateFormContent.tsx index 9783c47db..944ca656d 100644 --- a/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateFormContent.tsx +++ b/packages/webapp/src/containers/Dialogs/ApiKeysGenerateDialog/ApiKeysGenerateFormContent.tsx @@ -14,7 +14,7 @@ import { import intl from 'react-intl-universal'; import { inputIntent } from '@/utils'; import { FFormGroup, FInputGroup, FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtForm.tsx b/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtForm.tsx index bd5211951..f9866c6d9 100644 --- a/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtForm.tsx +++ b/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtForm.tsx @@ -12,8 +12,8 @@ import { transformErrors } from './utils'; import BadDebtFormContent from './BadDebtFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { useBadDebtContext } from './BadDebtFormProvider'; diff --git a/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtFormFloatingActions.tsx index 0df21d278..4e5046b5d 100644 --- a/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/BadDebtDialog/BadDebtFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useBadDebtContext } from './BadDebtFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/BillNumberDialog/BillNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/BillNumberDialog/BillNumberDialogContent.tsx index 7c97cadeb..851a9586e 100644 --- a/packages/webapp/src/containers/Dialogs/BillNumberDialog/BillNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/BillNumberDialog/BillNumberDialogContent.tsx @@ -5,10 +5,10 @@ import { useQuery, queryCache } from 'react-query'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withBillActions from '@/containers/Purchases/Bills/BillsLanding/withBillsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withBillActions } from '@/containers/Purchases/Bills/BillsLanding/withBillsActions'; import { compose, optionsMapToArray } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/Bills/BillBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Bills/BillBulkDeleteDialog.tsx index 12d5d8770..2e95256c0 100644 --- a/packages/webapp/src/containers/Dialogs/Bills/BillBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Bills/BillBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteBills } from '@/hooks/query/bills'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withBillsActions from '@/containers/Purchases/Bills/BillsLanding/withBillsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withBillsActions } from '@/containers/Purchases/Bills/BillsLanding/withBillsActions'; import { compose } from '@/utils'; function BillBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.tsx b/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.tsx index 660528320..268da7b92 100644 --- a/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.tsx +++ b/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateForm.tsx @@ -9,7 +9,7 @@ import { AppToaster } from '@/components'; import { useBranchActivateContext } from './BranchActivateFormProvider'; import BranchActivateFormContent from './BranchActivateFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.tsx index 05232dac1..2581e506f 100644 --- a/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/BranchActivateDialog/BranchActivateFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useBranchActivateContext } from './BranchActivateFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchForm.tsx b/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchForm.tsx index 4674683cb..e7ae8d993 100644 --- a/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchForm.tsx +++ b/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchForm.tsx @@ -12,7 +12,7 @@ import { transformErrors } from './utils'; import BranchFormContent from './BranchFormContent'; import { useBranchFormContext } from './BranchFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchFormFloatingActions.tsx index a0f111ca9..759f7da8c 100644 --- a/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/BranchFormDialog/BranchFormFloatingActions.tsx @@ -6,7 +6,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useBranchFormContext } from './BranchFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/ContactDuplicateDialog/ContactDuplicateForm.tsx b/packages/webapp/src/containers/Dialogs/ContactDuplicateDialog/ContactDuplicateForm.tsx index 09fb43907..f6a4f5497 100644 --- a/packages/webapp/src/containers/Dialogs/ContactDuplicateDialog/ContactDuplicateForm.tsx +++ b/packages/webapp/src/containers/Dialogs/ContactDuplicateDialog/ContactDuplicateForm.tsx @@ -11,7 +11,7 @@ import { useContactDuplicateFromContext } from './ContactDuplicateProvider'; import Contacts from '@/constants/contactsOptions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function ContactDuplicateForm({ diff --git a/packages/webapp/src/containers/Dialogs/CreditNoteNumberDialog/CreditNoteNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/CreditNoteNumberDialog/CreditNoteNumberDialogContent.tsx index bdcb0b71d..93580767a 100644 --- a/packages/webapp/src/containers/Dialogs/CreditNoteNumberDialog/CreditNoteNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/CreditNoteNumberDialog/CreditNoteNumberDialogContent.tsx @@ -6,9 +6,9 @@ import { useSaveSettings } from '@/hooks/query'; import { CreditNoteNumberDialogProvider } from './CreditNoteNumberDialogProvider'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { compose } from '@/utils'; import { transformFormToSettings, diff --git a/packages/webapp/src/containers/Dialogs/CreditNotePdfPreviewDialog/CreditNotePdfPreviewDialogContent.tsx b/packages/webapp/src/containers/Dialogs/CreditNotePdfPreviewDialog/CreditNotePdfPreviewDialogContent.tsx index bb44f858b..9f6f49bc0 100644 --- a/packages/webapp/src/containers/Dialogs/CreditNotePdfPreviewDialog/CreditNotePdfPreviewDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/CreditNotePdfPreviewDialog/CreditNotePdfPreviewDialogContent.tsx @@ -5,7 +5,7 @@ import { AnchorButton } from '@blueprintjs/core'; import { DialogContent, PdfDocumentPreview, T } from '@/components'; import { usePdfCreditNote } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function CreditNotePdfPreviewDialogContent({ diff --git a/packages/webapp/src/containers/Dialogs/CreditNotes/CreditNoteBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/CreditNotes/CreditNoteBulkDeleteDialog.tsx index 819f9d258..46c4794ed 100644 --- a/packages/webapp/src/containers/Dialogs/CreditNotes/CreditNoteBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/CreditNotes/CreditNoteBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteCreditNotes } from '@/hooks/query/creditNote'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withCreditNotesActions from '@/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotesActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withCreditNotesActions } from '@/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotesActions'; import { compose } from '@/utils'; function CreditNoteBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyForm.tsx b/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyForm.tsx index ff2dbd898..b8a0232b4 100644 --- a/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyForm.tsx +++ b/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyForm.tsx @@ -11,7 +11,7 @@ import { CreateCurrencyFormSchema, EditCurrencyFormSchema, } from './CurrencyForm.schema'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormDialogContent.tsx b/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormDialogContent.tsx index 4092f3d31..1c63e1dbd 100644 --- a/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormDialogContent.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { CurrencyFormProvider } from './CurrencyFormProvider'; import CurrencyForm from './CurrencyForm'; -import withCurrencyDetail from '@/containers/Currencies/withCurrencyDetail'; +import { withCurrencyDetail } from '@/containers/Currencies/withCurrencyDetail'; import { compose } from '@/utils'; import '@/style/pages/Currency/CurrencyFormDialog.scss'; diff --git a/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFooter.tsx b/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFooter.tsx index 620817b78..17ac49d25 100644 --- a/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFooter.tsx +++ b/packages/webapp/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFooter.tsx @@ -6,7 +6,7 @@ import { useCurrencyFormContext } from './CurrencyFormProvider'; import { Button, Classes, Intent } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx index d057d35e0..8ba14f41c 100644 --- a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx +++ b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFields.tsx @@ -14,7 +14,6 @@ import { FormattedMessage as T, ExchangeRateMutedField, BranchSelect, - BranchSelectButton, FeatureCan, InputPrependText, } from '@/components'; @@ -23,7 +22,7 @@ import { FMoneyInputGroup, FFormGroup } from '@/components/Forms'; import { useCustomerOpeningBalanceContext } from './CustomerOpeningBalanceFormProvider'; import { useSetPrimaryBranchToForm } from './utils'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose } from '@/utils'; /** @@ -105,7 +104,6 @@ function CustomerOpeningBalanceFields({ diff --git a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceForm.tsx b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceForm.tsx index 0d7c90069..eaf71c372 100644 --- a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceForm.tsx +++ b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceForm.tsx @@ -11,7 +11,7 @@ import { CreateCustomerOpeningBalanceFormSchema } from './CustomerOpeningBalance import { useCustomerOpeningBalanceContext } from './CustomerOpeningBalanceFormProvider'; import CustomerOpeningBalanceFormContent from './CustomerOpeningBalanceFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFormFloatingActions.tsx index 6c07f7d79..fe23693dc 100644 --- a/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/CustomerOpeningBalanceDialog/CustomerOpeningBalanceFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useCustomerOpeningBalanceContext } from './CustomerOpeningBalanceFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/Customers/CustomerBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Customers/CustomerBulkDeleteDialog.tsx index dd978db40..01fe964cd 100644 --- a/packages/webapp/src/containers/Dialogs/Customers/CustomerBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Customers/CustomerBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteCustomers } from '@/hooks/query/customers'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withCustomersActions from '@/containers/Customers/CustomersLanding/withCustomersActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withCustomersActions } from '@/containers/Customers/CustomersLanding/withCustomersActions'; import { compose } from '@/utils'; function CustomerBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.tsx index d8debf7c0..e54733ae9 100644 --- a/packages/webapp/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.tsx @@ -6,8 +6,8 @@ import { DialogContent } from '@/components'; import { useSaveSettings, useSettingsEstimates } from '@/hooks/query'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose, saveInvoke } from '@/utils'; import { diff --git a/packages/webapp/src/containers/Dialogs/EstimatePdfPreviewDialog/EstimatePdfPreviewDialogContent.tsx b/packages/webapp/src/containers/Dialogs/EstimatePdfPreviewDialog/EstimatePdfPreviewDialogContent.tsx index 7d9546e57..a38da5874 100644 --- a/packages/webapp/src/containers/Dialogs/EstimatePdfPreviewDialog/EstimatePdfPreviewDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/EstimatePdfPreviewDialog/EstimatePdfPreviewDialogContent.tsx @@ -5,7 +5,7 @@ import { AnchorButton } from '@blueprintjs/core'; import { DialogContent, PdfDocumentPreview, T } from '@/components'; import { usePdfEstimate } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function EstimatePdfPreviewDialogContent({ diff --git a/packages/webapp/src/containers/Dialogs/Estimates/EstimateBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Estimates/EstimateBulkDeleteDialog.tsx index 1a85eccf7..7be017904 100644 --- a/packages/webapp/src/containers/Dialogs/Estimates/EstimateBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Estimates/EstimateBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteEstimates } from '@/hooks/query/estimates'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withEstimatesActions from '@/containers/Sales/Estimates/EstimatesLanding/withEstimatesActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withEstimatesActions } from '@/containers/Sales/Estimates/EstimatesLanding/withEstimatesActions'; import { compose } from '@/utils'; function EstimateBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/Expenses/ExpenseBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Expenses/ExpenseBulkDeleteDialog.tsx index f5673cb61..9b9fcf69f 100644 --- a/packages/webapp/src/containers/Dialogs/Expenses/ExpenseBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Expenses/ExpenseBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteExpenses } from '@/hooks/query/expenses'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withExpensesActions from '@/containers/Expenses/ExpensesLanding/withExpensesActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withExpensesActions } from '@/containers/Expenses/ExpensesLanding/withExpensesActions'; import { compose } from '@/utils'; function ExpenseBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogForm.tsx b/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogForm.tsx index bd919d0d5..1fb3e762a 100644 --- a/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogForm.tsx +++ b/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogForm.tsx @@ -9,7 +9,7 @@ import { useResourceExport } from '@/hooks/query/FinancialReports/use-export'; import { ExportFormInitialValues } from './type'; import { AppToaster } from '@/components'; import { Intent } from '@blueprintjs/core'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; // Default initial form values. diff --git a/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogFormContent.tsx b/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogFormContent.tsx index 06cd8bf7e..e0bda67c5 100644 --- a/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogFormContent.tsx +++ b/packages/webapp/src/containers/Dialogs/ExportDialog/ExportDialogFormContent.tsx @@ -5,7 +5,7 @@ import { Form, useFormikContext } from 'formik'; import { ExportResources } from './constants'; import styles from './ExportDialogContent.module.scss'; import { compose } from '@/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; function ExportDialogFormContentRoot({ diff --git a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx index 6c3c28299..a146504ca 100644 --- a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useInventoryAdjContext } from './InventoryAdjustmentFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentForm.tsx b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentForm.tsx index 37fa86e69..5ddf9733f 100644 --- a/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentForm.tsx +++ b/packages/webapp/src/containers/Dialogs/InventoryAdjustmentFormDialog/InventoryAdjustmentForm.tsx @@ -14,7 +14,7 @@ import { CreateInventoryAdjustmentFormSchema } from './InventoryAdjustmentForm.s import InventoryAdjustmentFormContent from './InventoryAdjustmentFormContent'; import { useInventoryAdjContext } from './InventoryAdjustmentFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserForm.tsx b/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserForm.tsx index 8deab1349..401a4e859 100644 --- a/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserForm.tsx +++ b/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserForm.tsx @@ -6,7 +6,7 @@ import { Intent } from '@blueprintjs/core'; import { pick, snakeCase } from 'lodash'; import { AppToaster } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { InviteUserFormSchema } from './InviteUserDialog.schema'; import InviteUserFormContent from './InviteUserFormContent'; diff --git a/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserFormContent.tsx b/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserFormContent.tsx index 3fc3f4178..5645e9572 100644 --- a/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserFormContent.tsx +++ b/packages/webapp/src/containers/Dialogs/InviteUserDialog/InviteUserFormContent.tsx @@ -13,7 +13,7 @@ import { CLASSES } from '@/constants/classes'; import { compose } from '@/utils'; import { useInviteUserFormContext } from './InviteUserFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; function InviteUserFormContent({ // #withDialogActions diff --git a/packages/webapp/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.tsx index 020dddad7..58856db4c 100644 --- a/packages/webapp/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.tsx @@ -6,9 +6,9 @@ import { useSaveSettings } from '@/hooks/query'; import { InvoiceNumberDialogProvider } from './InvoiceNumberDialogProvider'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { compose } from '@/utils'; import { transformFormToSettings, diff --git a/packages/webapp/src/containers/Dialogs/InvoicePdfPreviewDialog/InvoicePdfPreviewDialogContent.tsx b/packages/webapp/src/containers/Dialogs/InvoicePdfPreviewDialog/InvoicePdfPreviewDialogContent.tsx index 7a56e7fa0..452ea077f 100644 --- a/packages/webapp/src/containers/Dialogs/InvoicePdfPreviewDialog/InvoicePdfPreviewDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/InvoicePdfPreviewDialog/InvoicePdfPreviewDialogContent.tsx @@ -5,7 +5,7 @@ import { AnchorButton } from '@blueprintjs/core'; import { DialogContent, PdfDocumentPreview, T } from '@/components'; import { usePdfInvoice } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function InvoicePdfPreviewDialogContent({ diff --git a/packages/webapp/src/containers/Dialogs/Invoices/InvoiceBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Invoices/InvoiceBulkDeleteDialog.tsx index 8633c5367..e1a97bc08 100644 --- a/packages/webapp/src/containers/Dialogs/Invoices/InvoiceBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Invoices/InvoiceBulkDeleteDialog.tsx @@ -5,8 +5,8 @@ import intl from 'react-intl-universal'; import { Button, Classes, Dialog, Intent } from '@blueprintjs/core'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withInvoiceActions from '@/containers/Sales/Invoices/InvoicesLanding/withInvoiceActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withInvoiceActions } from '@/containers/Sales/Invoices/InvoicesLanding/withInvoiceActions'; import { useBulkDeleteInvoices } from '@/hooks/query/invoices'; import { AppToaster } from '@/components'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; diff --git a/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.tsx b/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.tsx index 17d6b0462..0f0c7040b 100644 --- a/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.tsx +++ b/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryForm.tsx @@ -12,7 +12,7 @@ import { EditItemCategoryFormSchema, } from './itemCategoryForm.schema'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import ItemCategoryFormContent from './ItemCategoryFormContent'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryFormFooter.tsx b/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryFormFooter.tsx index 6b1c4ca03..e0b0cf212 100644 --- a/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryFormFooter.tsx +++ b/packages/webapp/src/containers/Dialogs/ItemCategoryDialog/ItemCategoryFormFooter.tsx @@ -4,7 +4,7 @@ import { Classes, Button, Intent } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useFormikContext } from 'formik'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useItemCategoryContext } from './ItemCategoryProvider'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/Items/ItemBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Items/ItemBulkDeleteDialog.tsx index a3cb8ca9d..df485d39a 100644 --- a/packages/webapp/src/containers/Dialogs/Items/ItemBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Items/ItemBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteItems } from '@/hooks/query/items'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withItemsActions from '@/containers/Items/withItemsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withItemsActions } from '@/containers/Items/withItemsActions'; import { compose } from '@/utils'; function ItemBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/JournalNumberDialog/JournalNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/JournalNumberDialog/JournalNumberDialogContent.tsx index 8f3049626..58af31233 100644 --- a/packages/webapp/src/containers/Dialogs/JournalNumberDialog/JournalNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/JournalNumberDialog/JournalNumberDialogContent.tsx @@ -6,8 +6,8 @@ import { useSaveSettings, useSettingsManualJournals } from '@/hooks/query'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { saveInvoke, compose } from '@/utils'; import { transformFormToSettings, diff --git a/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.tsx b/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.tsx index 9ed9c15dd..735e87866 100644 --- a/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.tsx +++ b/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.tsx @@ -13,7 +13,7 @@ import { CreateLockingTransactionsFormSchema } from './LockingTransactionsForm.s import { useLockingTransactionsContext } from './LockingTransactionsFormProvider'; import LockingTransactionsFormContent from './LockingTransactionsFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFloatingActions.tsx index 207c645fc..9cf2a1841 100644 --- a/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useLockingTransactionsContext } from './LockingTransactionsFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/ManualJournals/ManualJournalBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/ManualJournals/ManualJournalBulkDeleteDialog.tsx index 1bab4a340..12744a863 100644 --- a/packages/webapp/src/containers/Dialogs/ManualJournals/ManualJournalBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/ManualJournals/ManualJournalBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteManualJournals } from '@/hooks/query/manualJournals'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withManualJournalsActions from '@/containers/Accounting/JournalsLanding/withManualJournalsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withManualJournalsActions } from '@/containers/Accounting/JournalsLanding/withManualJournalsActions'; import { compose } from '@/utils'; function ManualJournalBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.tsx b/packages/webapp/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.tsx index 8c1644055..b428ece43 100644 --- a/packages/webapp/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.tsx +++ b/packages/webapp/src/containers/Dialogs/NotifyEstimateViaSMSDialog/NotifyEstimateViaSMSForm.tsx @@ -9,7 +9,7 @@ import NotifyViaSMSForm from '@/containers/NotifyViaSMS/NotifyViaSMSForm'; import { useEstimateViaSMSContext } from './NotifyEstimateViaSMSFormProvider'; import { transformErrors } from '@/containers/NotifyViaSMS/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const notificationType = { diff --git a/packages/webapp/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.tsx b/packages/webapp/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.tsx index 702326c71..64d43b59a 100644 --- a/packages/webapp/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.tsx +++ b/packages/webapp/src/containers/Dialogs/NotifyInvoiceViaSMSDialog/NotifyInvoiceViaSMSForm.tsx @@ -9,7 +9,7 @@ import NotifyViaSMSForm from '@/containers/NotifyViaSMS/NotifyViaSMSForm'; import { useNotifyInvoiceViaSMSContext } from './NotifyInvoiceViaSMSFormProvider'; import { transformErrors } from '@/containers/NotifyViaSMS/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const transformFormValuesToRequest = (values) => { diff --git a/packages/webapp/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.tsx b/packages/webapp/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.tsx index c3a7a9a3d..b18af64fd 100644 --- a/packages/webapp/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.tsx +++ b/packages/webapp/src/containers/Dialogs/NotifyPaymentReceiveViaSMSDialog/NotifyPaymentReceiveViaSMSForm.tsx @@ -9,7 +9,7 @@ import NotifyViaSMSForm from '@/containers/NotifyViaSMS/NotifyViaSMSForm'; import { useNotifyPaymentReceiveViaSMSContext } from './NotifyPaymentReceiveViaFormProvider'; import { transformErrors } from '@/containers/NotifyViaSMS/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const notificationType = { diff --git a/packages/webapp/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.tsx b/packages/webapp/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.tsx index 1598a6f85..97bc96b4d 100644 --- a/packages/webapp/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.tsx +++ b/packages/webapp/src/containers/Dialogs/NotifyReceiptViaSMSDialog/NotifyReceiptViaSMSForm.tsx @@ -9,7 +9,7 @@ import NotifyViaSMSForm from '@/containers/NotifyViaSMS/NotifyViaSMSForm'; import { useNotifyReceiptViaSMSContext } from './NotifyReceiptViaSMSFormProvider'; import { transformErrors } from '@/containers/NotifyViaSMS/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const notificationType = { diff --git a/packages/webapp/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.tsx index 5b9cfc2e1..987eb27ba 100644 --- a/packages/webapp/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.tsx @@ -7,9 +7,9 @@ import { useSaveSettings, useSettingsPaymentReceives } from '@/hooks/query'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { saveInvoke, compose } from '@/utils'; import { diff --git a/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/PaymentReceivePdfPreviewContent.tsx b/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/PaymentReceivePdfPreviewContent.tsx index 21f5f7d4c..a82851c2b 100644 --- a/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/PaymentReceivePdfPreviewContent.tsx +++ b/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/PaymentReceivePdfPreviewContent.tsx @@ -5,7 +5,7 @@ import { AnchorButton } from '@blueprintjs/core'; import { DialogContent, PdfDocumentPreview, T } from '@/components'; import { usePdfPaymentReceive } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function PaymentReceivePdfPreviewDialogContent({ diff --git a/packages/webapp/src/containers/Dialogs/PaymentsReceived/PaymentReceivedBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/PaymentsReceived/PaymentReceivedBulkDeleteDialog.tsx index 63bcd88a6..9af1a8270 100644 --- a/packages/webapp/src/containers/Dialogs/PaymentsReceived/PaymentReceivedBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/PaymentsReceived/PaymentReceivedBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeletePaymentReceives } from '@/hooks/query/paymentReceives'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withPaymentsReceivedActions from '@/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceivedActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withPaymentsReceivedActions } from '@/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceivedActions'; import { compose } from '@/utils'; function PaymentReceivedBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFloatingActions.tsx index ae7ac6e6f..bbef8dbeb 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function QuickPaymentMadeFloatingActions({ diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx index 503544f04..c86a8d51f 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx @@ -9,7 +9,7 @@ import { CreateQuickPaymentMadeFormSchema } from './QuickPaymentMade.schema'; import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider'; import QuickPaymentMadeFormContent from './QuickPaymentMadeFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { defaultPaymentMade, transformBillToForm, transformErrors } from './utils'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx index e935a79c5..3f8f1a280 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx @@ -22,7 +22,6 @@ import { FeatureCan, ExchangeRateMutedField, BranchSelect, - BranchSelectButton, FFormGroup, FInputGroup, FDateInput, @@ -33,7 +32,7 @@ import { inputIntent, momentFormatter } from '@/utils'; import { useSetPrimaryBranchToForm } from './utils'; import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose } from '@/utils'; /** @@ -62,7 +61,6 @@ function QuickPaymentMadeFormFields({ diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFloatingActions.tsx index 72794092d..e8e4b6958 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useQuickPaymentReceiveContext } from './QuickPaymentReceiveFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function QuickPaymentReceiveFloatingActions({ diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx index 2b9d83115..5471d5325 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx @@ -10,8 +10,8 @@ import { useQuickPaymentReceiveContext } from './QuickPaymentReceiveFormProvider import { CreateQuickPaymentReceiveFormSchema } from './QuickPaymentReceive.schema'; import QuickPaymentReceiveFormContent from './QuickPaymentReceiveFormContent'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { defaultInitialValues, transformErrors, diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx index 0918c6d20..59bddb53a 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx @@ -21,7 +21,6 @@ import { FeatureCan, ExchangeRateMutedField, BranchSelect, - BranchSelectButton, FFormGroup, FInputGroup, FTextArea, @@ -31,8 +30,8 @@ import { import { momentFormatter, compose } from '@/utils'; import { useSetPrimaryBranchToForm } from './utils'; import { useQuickPaymentReceiveContext } from './QuickPaymentReceiveFormProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; -import withSettings from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; +import { withSettings } from '@/containers/Settings/withSettings'; /** * Quick payment receive form fields. @@ -62,7 +61,6 @@ function QuickPaymentReceiveFormFields({ diff --git a/packages/webapp/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.tsx index 584c6ade2..cb4bfd958 100644 --- a/packages/webapp/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.tsx @@ -7,8 +7,8 @@ import { DialogContent } from '@/components'; import { useSettingsReceipts, useSaveSettings } from '@/hooks/query'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose, saveInvoke } from '@/utils'; import { diff --git a/packages/webapp/src/containers/Dialogs/ReceiptPdfPreviewDialog/ReceiptPdfPreviewDialogContent.tsx b/packages/webapp/src/containers/Dialogs/ReceiptPdfPreviewDialog/ReceiptPdfPreviewDialogContent.tsx index 37bb75eff..00e2de19f 100644 --- a/packages/webapp/src/containers/Dialogs/ReceiptPdfPreviewDialog/ReceiptPdfPreviewDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/ReceiptPdfPreviewDialog/ReceiptPdfPreviewDialogContent.tsx @@ -5,7 +5,7 @@ import { AnchorButton } from '@blueprintjs/core'; import { DialogContent, PdfDocumentPreview, T } from '@/components'; import { usePdfReceipt } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function ReceiptPdfPreviewDialogContent({ diff --git a/packages/webapp/src/containers/Dialogs/Receipts/ReceiptBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Receipts/ReceiptBulkDeleteDialog.tsx index d942b4044..309a25b3d 100644 --- a/packages/webapp/src/containers/Dialogs/Receipts/ReceiptBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Receipts/ReceiptBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteReceipts } from '@/hooks/query/receipts'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withReceiptsActions from '@/containers/Sales/Receipts/ReceiptsLanding/withReceiptsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withReceiptsActions } from '@/containers/Sales/Receipts/ReceiptsLanding/withReceiptsActions'; import { compose } from '@/utils'; function ReceiptBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteForm.tsx b/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteForm.tsx index 1b9fb97a2..aa3084bc4 100644 --- a/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteForm.tsx +++ b/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteForm.tsx @@ -9,7 +9,7 @@ import { AppToaster } from '@/components'; import { CreateReconcileCreditNoteFormSchema } from './ReconcileCreditNoteForm.schema'; import { useReconcileCreditNoteContext } from './ReconcileCreditNoteFormProvider'; import ReconcileCreditNoteFormContent from './ReconcileCreditNoteFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; import { transformErrors } from './utils'; diff --git a/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.tsx index 68c2f729b..26b747775 100644 --- a/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/ReconcileCreditNoteDialog/ReconcileCreditNoteFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useReconcileCreditNoteContext } from './ReconcileCreditNoteFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.tsx index f0897a8b2..c869ed6f7 100644 --- a/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditFloatingActions.tsx @@ -5,7 +5,7 @@ import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useReconcileVendorCreditContext } from './ReconcileVendorCreditFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function ReconcileVendorCreditFloatingActions({ diff --git a/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditForm.tsx b/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditForm.tsx index 9c393725a..acad2870a 100644 --- a/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditForm.tsx +++ b/packages/webapp/src/containers/Dialogs/ReconcileVendorCreditDialog/ReconcileVendorCreditForm.tsx @@ -10,7 +10,7 @@ import { AppToaster } from '@/components'; import { CreateReconcileVendorCreditFormSchema } from './ReconcileVendorCreditForm.schema'; import { useReconcileVendorCreditContext } from './ReconcileVendorCreditFormProvider'; import ReconcileVendorCreditFormContent from './ReconcileVendorCreditFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; // Default form initial values. diff --git a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFloatingActions.tsx index cbbff27f7..0dba4a4bd 100644 --- a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useRefundCreditNoteContext } from './RefundCreditNoteFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteForm.tsx b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteForm.tsx index 82dee3890..a834e41bf 100644 --- a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteForm.tsx +++ b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteForm.tsx @@ -11,7 +11,7 @@ import { useRefundCreditNoteContext } from './RefundCreditNoteFormProvider'; import { CreateRefundCreditNoteFormSchema } from './RefundCreditNoteForm.schema'; import RefundCreditNoteFormContent from './RefundCreditNoteFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx index f0f0fdd42..840c895f7 100644 --- a/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx +++ b/packages/webapp/src/containers/Dialogs/RefundCreditNoteDialog/RefundCreditNoteFormFields.tsx @@ -44,7 +44,7 @@ import { ACCOUNT_TYPE } from '@/constants/accountTypes'; import { useSetPrimaryBranchToForm } from './utils'; import { useRefundCreditNoteContext } from './RefundCreditNoteFormProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Refund credit note form fields. diff --git a/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFloatingActions.tsx index c9b931d64..f4b6d3f3a 100644 --- a/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditForm.tsx b/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditForm.tsx index d7b2c9f5e..4e40208db 100644 --- a/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditForm.tsx +++ b/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditForm.tsx @@ -11,7 +11,7 @@ import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider'; import { CreateVendorRefundCreditFormSchema } from './RefundVendorCreditForm.schema'; import RefundVendorCreditFormContent from './RefundVendorCreditFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFormFields.tsx b/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFormFields.tsx index 59a032d2d..4158d99ab 100644 --- a/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFormFields.tsx +++ b/packages/webapp/src/containers/Dialogs/RefundVendorCreditDialog/RefundVendorCreditFormFields.tsx @@ -19,7 +19,6 @@ import { FormattedMessage as T, ExchangeRateMutedField, BranchSelect, - BranchSelectButton, FeatureCan, FFormGroup, FDateInput, @@ -31,7 +30,7 @@ import { useAutofocus } from '@/hooks'; import { Features, ACCOUNT_TYPE } from '@/constants'; import { useSetPrimaryBranchToForm } from './utils'; import { useRefundVendorCreditContext } from './RefundVendorCreditFormProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Refund Vendor credit form fields. @@ -57,7 +56,6 @@ function RefundVendorCreditFormFields({ diff --git a/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageForm.tsx b/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageForm.tsx index da20d25c9..c2559bc75 100644 --- a/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageForm.tsx +++ b/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageForm.tsx @@ -12,7 +12,7 @@ import { CreateSMSMessageFormSchema } from './SMSMessageForm.schema'; import { useSMSMessageDialogContext } from './SMSMessageDialogProvider'; import { transformErrors } from './utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageFormFloatingActions.tsx index b2b4e802d..f184f6248 100644 --- a/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/SMSMessageDialog/SMSMessageFormFloatingActions.tsx @@ -9,7 +9,7 @@ import { FormattedMessage as T, } from '@/components'; import { useSMSMessageDialogContext } from './SMSMessageDialogProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/TransactionNumberDialog/TransactionNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/TransactionNumberDialog/TransactionNumberDialogContent.tsx index ab6c4b341..89b14adc1 100644 --- a/packages/webapp/src/containers/Dialogs/TransactionNumberDialog/TransactionNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/TransactionNumberDialog/TransactionNumberDialogContent.tsx @@ -6,9 +6,9 @@ import { useSaveSettings } from '@/hooks/query'; import { TransactionNumberDialogProvider } from './TransactionNumberDialogProvider'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { transformFormToSettings, transformSettingsToForm, diff --git a/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.tsx b/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.tsx index 2efc02c50..c19918c02 100644 --- a/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.tsx +++ b/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.tsx @@ -13,7 +13,7 @@ import { CreateUnLockingPartialTransactionsFormSchema } from './UnlockingPartial import { useUnlockingPartialTransactionsContext } from './UnlockingPartialTransactionsFormProvider'; import UnlockingPartialTransactionsFormContent from './UnlockingPartialTransactionsFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFloatingActions.tsx index 1f0328a97..f7f708ced 100644 --- a/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useUnlockingPartialTransactionsContext } from './UnlockingPartialTransactionsFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.tsx b/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.tsx index 3bb733c10..a42460f4f 100644 --- a/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.tsx +++ b/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.tsx @@ -12,7 +12,7 @@ import { CreateUnlockingTransactionsFormSchema } from './UnlockingTransactionsFo import { useUnlockingTransactionsContext } from './UnlockingTransactionsFormProvider'; import UnlockingTransactionsFormContent from './UnlockingTransactionsFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFloatingActions.tsx index 560189e82..625dcc3de 100644 --- a/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useUnlockingTransactionsContext } from './UnlockingTransactionsFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/UserFormDialog/UserForm.tsx b/packages/webapp/src/containers/Dialogs/UserFormDialog/UserForm.tsx index 79ccc5d99..fcb7de86f 100644 --- a/packages/webapp/src/containers/Dialogs/UserFormDialog/UserForm.tsx +++ b/packages/webapp/src/containers/Dialogs/UserFormDialog/UserForm.tsx @@ -6,7 +6,7 @@ import { Intent } from '@blueprintjs/core'; import { pick, snakeCase } from 'lodash'; import { AppToaster } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { UserFormSchema } from './UserForm.schema'; import UserFormContent from './UserFormContent'; diff --git a/packages/webapp/src/containers/Dialogs/UserFormDialog/UserFormContent.tsx b/packages/webapp/src/containers/Dialogs/UserFormDialog/UserFormContent.tsx index b0039db8f..58c88b584 100644 --- a/packages/webapp/src/containers/Dialogs/UserFormDialog/UserFormContent.tsx +++ b/packages/webapp/src/containers/Dialogs/UserFormDialog/UserFormContent.tsx @@ -12,7 +12,7 @@ import { FFormGroup, FInputGroup, FSelect, FormattedMessage as T } from '@/compo import { CLASSES } from '@/constants/classes'; import { FieldRequiredHint } from '@/components'; import { useUserFormContext } from './UserFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; import { UserFormCalloutAlerts } from './components'; diff --git a/packages/webapp/src/containers/Dialogs/VendorCreditNumberDialog/VendorCreditNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/VendorCreditNumberDialog/VendorCreditNumberDialogContent.tsx index a83c139af..38113f980 100644 --- a/packages/webapp/src/containers/Dialogs/VendorCreditNumberDialog/VendorCreditNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/VendorCreditNumberDialog/VendorCreditNumberDialogContent.tsx @@ -6,9 +6,9 @@ import { useSaveSettings } from '@/hooks/query'; import { VendorCreditNumberDilaogProvider } from './VendorCreditNumberDilaogProvider'; import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { compose } from '@/utils'; import { transformFormToSettings, diff --git a/packages/webapp/src/containers/Dialogs/VendorCredits/VendorCreditBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/VendorCredits/VendorCreditBulkDeleteDialog.tsx index 253da9607..3886a84e9 100644 --- a/packages/webapp/src/containers/Dialogs/VendorCredits/VendorCreditBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/VendorCredits/VendorCreditBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteVendorCredits } from '@/hooks/query/vendorCredit'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withVendorsCreditNotesActions from '@/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotesActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withVendorsCreditNotesActions } from '@/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotesActions'; import { compose } from '@/utils'; function VendorCreditBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceForm.tsx b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceForm.tsx index da688a862..387028de5 100644 --- a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceForm.tsx +++ b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceForm.tsx @@ -11,7 +11,7 @@ import { CreateVendorOpeningBalanceFormSchema } from './VendorOpeningBalanceForm import { useVendorOpeningBalanceContext } from './VendorOpeningBalanceFormProvider'; import VendorOpeningBalanceFormContent from './VendorOpeningBalanceFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx index 68d6576ab..87f9a02c9 100644 --- a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx +++ b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFields.tsx @@ -14,7 +14,6 @@ import { FormattedMessage as T, ExchangeRateMutedField, BranchSelect, - BranchSelectButton, FeatureCan, InputPrependText, } from '@/components'; @@ -23,7 +22,7 @@ import { FMoneyInputGroup, FFormGroup } from '@/components/Forms'; import { useVendorOpeningBalanceContext } from './VendorOpeningBalanceFormProvider'; import { useSetPrimaryBranchToForm } from './utils'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose } from '@/utils'; /** @@ -103,7 +102,6 @@ function VendorOpeningBalanceFormFields({ diff --git a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFloatingActions.tsx index fe029a677..22d56f201 100644 --- a/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/VendorOpeningBalanceDialog/VendorOpeningBalanceFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useVendorOpeningBalanceContext } from './VendorOpeningBalanceFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/Vendors/VendorBulkDeleteDialog.tsx b/packages/webapp/src/containers/Dialogs/Vendors/VendorBulkDeleteDialog.tsx index bcfc13d78..2fbc0c64b 100644 --- a/packages/webapp/src/containers/Dialogs/Vendors/VendorBulkDeleteDialog.tsx +++ b/packages/webapp/src/containers/Dialogs/Vendors/VendorBulkDeleteDialog.tsx @@ -7,8 +7,8 @@ import intl from 'react-intl-universal'; import BulkDeleteDialogContent from '@/containers/Dialogs/components/BulkDeleteDialogContent'; import { useBulkDeleteVendors } from '@/hooks/query/vendors'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withVendorsActions from '@/containers/Vendors/VendorsLanding/withVendorsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withVendorsActions } from '@/containers/Vendors/VendorsLanding/withVendorsActions'; import { compose } from '@/utils'; function VendorBulkDeleteDialog({ diff --git a/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.tsx b/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.tsx index d6c794a91..11175bc4d 100644 --- a/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.tsx +++ b/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateForm.tsx @@ -9,7 +9,7 @@ import { AppToaster } from '@/components'; import { useWarehouseActivateContext } from './WarehouseActivateFormProvider'; import WarehouseActivateFormContent from './WarehouseActivateFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.tsx index e2ca8ea56..8a27680ad 100644 --- a/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/WarehouseActivateDialog/WarehouseActivateFormFloatingActions.tsx @@ -5,7 +5,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useWarehouseActivateContext } from './WarehouseActivateFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseForm.tsx b/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseForm.tsx index e8e4632d4..267425578 100644 --- a/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseForm.tsx +++ b/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseForm.tsx @@ -11,7 +11,7 @@ import { useWarehouseFormContext } from './WarehouseFormProvider'; import WarehouseFormContent from './WarehouseFormContent'; import { transformErrors } from './utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormFloatingActions.tsx b/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormFloatingActions.tsx index 38f3d78e8..90f36fb24 100644 --- a/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Dialogs/WarehouseFormDialog/WarehouseFormFloatingActions.tsx @@ -6,7 +6,7 @@ import { useFormikContext } from 'formik'; import { FormattedMessage as T } from '@/components'; import { useWarehouseFormContext } from './WarehouseFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.tsx b/packages/webapp/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.tsx index 5e8328d22..101c1cc38 100644 --- a/packages/webapp/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.tsx +++ b/packages/webapp/src/containers/Dialogs/WarehouseTransferNumberDialog/WarehouseTransferNumberDialogContent.tsx @@ -6,9 +6,9 @@ import ReferenceNumberForm from '@/containers/JournalNumber/ReferenceNumberForm' import { useSaveSettings } from '@/hooks/query'; import { WarehouseTransferNumberDialogProvider } from './WarehouseTransferNumberDialogProvider'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; import { transformFormToSettings, diff --git a/packages/webapp/src/containers/Dialogs/keyboardShortcutsDialog/KeyboardShortcutsFooter.tsx b/packages/webapp/src/containers/Dialogs/keyboardShortcutsDialog/KeyboardShortcutsFooter.tsx index a845c3645..ad1d0a0d0 100644 --- a/packages/webapp/src/containers/Dialogs/keyboardShortcutsDialog/KeyboardShortcutsFooter.tsx +++ b/packages/webapp/src/containers/Dialogs/keyboardShortcutsDialog/KeyboardShortcutsFooter.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { Button, Intent } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function KeyboardShortcutsFooter({ diff --git a/packages/webapp/src/containers/Drawer/withDrawerActions.tsx b/packages/webapp/src/containers/Drawer/withDrawerActions.tsx index 43c406454..feee66b03 100644 --- a/packages/webapp/src/containers/Drawer/withDrawerActions.tsx +++ b/packages/webapp/src/containers/Drawer/withDrawerActions.tsx @@ -13,4 +13,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch({ type: t.CLOSE_DRAWER, name, payload }), }); -export default connect(null, mapDispatchToProps); +export const withDrawerActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Drawer/withDrawers.tsx b/packages/webapp/src/containers/Drawer/withDrawers.tsx index c7198ec58..1f64657f7 100644 --- a/packages/webapp/src/containers/Drawer/withDrawers.tsx +++ b/packages/webapp/src/containers/Drawer/withDrawers.tsx @@ -5,7 +5,7 @@ import { getDrawerPayloadFactory, } from '@/store/dashboard/dashboard.selectors'; -export default (mapState) => { +export const withDrawers = (mapState) => { const isDrawerOpen = isDrawerOpenFactory(); const getDrawerPayload = getDrawerPayloadFactory(); diff --git a/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.tsx b/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.tsx index a4b356f42..ddb1fe095 100644 --- a/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.tsx +++ b/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerActionBar.tsx @@ -22,8 +22,8 @@ import { import { AccountAction, AbilitySubject } from '@/constants/abilityOption'; import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { AccountDialogAction } from '@/containers/Dialogs/AccountDialog/utils'; import { useAccountDrawerContext } from './AccountDrawerProvider'; @@ -142,5 +142,5 @@ function AccountDrawerActionBar({ } export default compose( withDialogActions, - withAlertsActions, + withAlertActions, )(AccountDrawerActionBar); diff --git a/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx b/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx index 1b08f102c..c6a4c88a3 100644 --- a/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx +++ b/packages/webapp/src/containers/Drawers/AccountDrawer/AccountDrawerTable.tsx @@ -13,7 +13,7 @@ import { useAccountReadEntriesColumns } from './utils'; import { useAppIntlContext } from '@/components/AppIntlProvider'; import { useAccountDrawerContext } from './AccountDrawerProvider'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/AccountDrawer/index.tsx b/packages/webapp/src/containers/Drawers/AccountDrawer/index.tsx index dc64d43c2..c31c42400 100644 --- a/packages/webapp/src/containers/Drawers/AccountDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/AccountDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React, { lazy } from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailActionsBar.tsx index 83b33906a..146a860e7 100644 --- a/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailActionsBar.tsx @@ -12,9 +12,9 @@ import { import { useBillDrawerContext } from './BillDrawerProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { Can, @@ -37,7 +37,7 @@ function BillDetailActionsBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -125,5 +125,5 @@ function BillDetailActionsBar({ export default compose( withDialogActions, withDrawerActions, - withAlertsActions, + withAlertActions, )(BillDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx index 8166031da..0be847640 100644 --- a/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx +++ b/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx @@ -8,8 +8,8 @@ import { useBillPaymentTransactionsColumns, ActionsMenu } from './components'; import { useBillDrawerContext } from '../BillDrawerProvider'; import { useBillPaymentTransactions } from '@/hooks/query'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -18,7 +18,7 @@ import { DRAWERS } from '@/constants/drawers'; * Bill payment transactions datatable. */ function BillPaymentTransactionTable({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -73,6 +73,6 @@ function BillPaymentTransactionTable({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(BillPaymentTransactionTable); diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.tsx index 07fcdbe3d..56e281b03 100644 --- a/packages/webapp/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.tsx +++ b/packages/webapp/src/containers/Drawers/BillDrawer/LocatedLandedCostTable.tsx @@ -10,8 +10,8 @@ import { import { useLocatedLandedCostColumns, ActionsMenu } from './components'; import { useBillDrawerContext } from './BillDrawerProvider'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { TableStyle } from '@/constants'; @@ -22,7 +22,7 @@ import { DRAWERS } from '@/constants/drawers'; * Located landed cost table. */ function LocatedLandedCostTable({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -77,6 +77,6 @@ function LocatedLandedCostTable({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(LocatedLandedCostTable); diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/index.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/index.tsx index e1f5a2aaa..c5817cc08 100644 --- a/packages/webapp/src/containers/Drawers/BillDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/BillDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.tsx index 2e0baa665..19aa729ea 100644 --- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.tsx +++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.tsx @@ -14,7 +14,7 @@ import { Icon, If, } from '@/components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider'; import { AbilitySubject, CashflowAction } from '@/constants/abilityOption'; import { compose } from '@/utils'; @@ -67,4 +67,4 @@ function CashflowTransactionDrawerActionBar({ ); } -export default compose(withAlertsActions)(CashflowTransactionDrawerActionBar); +export default compose(withAlertActions)(CashflowTransactionDrawerActionBar); diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/index.tsx index c190dfac2..5e2721829 100644 --- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/ContactDetailDrawer/ContactDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/ContactDetailDrawer/ContactDetailActionsBar.tsx index 1befa9888..27f767133 100644 --- a/packages/webapp/src/containers/Drawers/ContactDetailDrawer/ContactDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/ContactDetailDrawer/ContactDetailActionsBar.tsx @@ -12,15 +12,15 @@ import { import { useContactDetailDrawerContext } from './ContactDetailDrawerProvider'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DashboardActionsBar, Icon, FormattedMessage as T } from '@/components'; import { safeCallback, compose } from '@/utils'; function ContactDetailActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -69,5 +69,5 @@ function ContactDetailActionsBar({ export default compose( withDrawerActions, - withAlertsActions, + withAlertActions, )(ContactDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/ContactDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/ContactDetailDrawer/index.tsx index 54945ed42..933557ea6 100644 --- a/packages/webapp/src/containers/Drawers/ContactDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/ContactDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailActionsBar.tsx index 3489b57a0..c4f89a776 100644 --- a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailActionsBar.tsx @@ -11,9 +11,9 @@ import { import { useCreditNoteDetailDrawerContext } from './CreditNoteDetailDrawerProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DrawerActionsBar, @@ -35,7 +35,7 @@ function CreditNoteDetailActionsBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -126,6 +126,6 @@ function CreditNoteDetailActionsBar({ export default compose( withDialogActions, - withAlertsActions, + withAlertActions, withDrawerActions, )(CreditNoteDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/ReconcileCreditNoteTransactions/ReconcileCreditNoteTransactionsTable.tsx b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/ReconcileCreditNoteTransactions/ReconcileCreditNoteTransactionsTable.tsx index b9974c5db..1f0034a12 100644 --- a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/ReconcileCreditNoteTransactions/ReconcileCreditNoteTransactionsTable.tsx +++ b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/ReconcileCreditNoteTransactions/ReconcileCreditNoteTransactionsTable.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { DataTable, Card } from '@/components'; import { TableStyle } from '@/constants'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useCreditNoteDetailDrawerContext } from '../CreditNoteDetailDrawerProvider'; import { @@ -17,7 +17,7 @@ import { compose } from '@/utils'; * Reconcile credit transactions table. */ function RefundCreditNoteTransactionsTable({ - // #withAlertsActions + // #withAlertActions openAlert, }) { // Credit note drawer context. @@ -47,4 +47,4 @@ function RefundCreditNoteTransactionsTable({ ); } -export default compose(withAlertsActions)(RefundCreditNoteTransactionsTable); +export default compose(withAlertActions)(RefundCreditNoteTransactionsTable); diff --git a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/RefundCreditNoteTransactionsTable.tsx b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/RefundCreditNoteTransactionsTable.tsx index ed4b443fc..bcb2f5054 100644 --- a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/RefundCreditNoteTransactionsTable.tsx +++ b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/RefundCreditNoteTransactions/RefundCreditNoteTransactionsTable.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { DataTable, Card } from '@/components'; import { TableStyle } from '@/constants'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useCreditNoteDetailDrawerContext } from '../CreditNoteDetailDrawerProvider'; import { @@ -17,7 +17,7 @@ import { compose } from '@/utils'; * Refund credit note transactions table. */ function RefundCreditNoteTransactionsTable({ - // #withAlertsActions + // #withAlertActions openAlert, }) { const { refundCreditNote } = useCreditNoteDetailDrawerContext(); @@ -45,4 +45,4 @@ function RefundCreditNoteTransactionsTable({ ); } -export default compose(withAlertsActions)(RefundCreditNoteTransactionsTable); +export default compose(withAlertActions)(RefundCreditNoteTransactionsTable); diff --git a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/index.tsx index 0539a7ed6..1d2579935 100644 --- a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx b/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx index 4323be445..cc9487c79 100644 --- a/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx @@ -18,9 +18,9 @@ import { import { useCustomerDetailsDrawerContext } from './CustomerDetailsDrawerProvider'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DashboardActionsBar, @@ -48,7 +48,7 @@ function CustomerDetailsActionsBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -170,6 +170,6 @@ function CustomerDetailsActionsBar({ export default compose( withDrawerActions, - withAlertsActions, + withAlertActions, withDialogActions, )(CustomerDetailsActionsBar); diff --git a/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/index.tsx b/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/index.tsx index cb561108c..06dcdd4dd 100644 --- a/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailActionsBar.tsx index 2d156dffe..35f6d2d33 100644 --- a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailActionsBar.tsx @@ -11,9 +11,9 @@ import { import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { SaleEstimateAction, AbilitySubject, @@ -38,7 +38,7 @@ function EstimateDetailActionsBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -146,6 +146,6 @@ function EstimateDetailActionsBar({ export default compose( withDialogActions, - withAlertsActions, + withAlertActions, withDrawerActions, )(EstimateDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/components.tsx b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/components.tsx index c7eef4cf6..68968475b 100644 --- a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/components.tsx +++ b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/components.tsx @@ -15,7 +15,7 @@ import * as R from 'ramda'; import { Icon, T, Choose, Can } from '@/components'; import { AbilitySubject, SaleEstimateAction } from '@/constants/abilityOption'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider'; /** @@ -54,9 +54,9 @@ export function EstimateDetailsStatus({ estimate }) { ); } -export const EstimateMoreMenuItems = R.compose(withAlertsActions)( +export const EstimateMoreMenuItems = R.compose(withAlertActions)( ({ - // # withAlertsActions, + // # withAlertActions, openAlert, // # rest diff --git a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/index.tsx index 574b4b5f6..53f6a8586 100644 --- a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerActionBar.tsx b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerActionBar.tsx index 5fa136274..82c8602f0 100644 --- a/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerActionBar.tsx +++ b/packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerActionBar.tsx @@ -17,8 +17,8 @@ import { import { ExpenseAction, AbilitySubject } from '@/constants/abilityOption'; import { useExpenseDrawerContext } from './ExpenseDrawerProvider'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -76,6 +76,6 @@ function ExpenseDrawerActionBar({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(ExpenseDrawerActionBar); diff --git a/packages/webapp/src/containers/Drawers/ExpenseDrawer/index.tsx b/packages/webapp/src/containers/Drawers/ExpenseDrawer/index.tsx index 4bcaa6370..60b871596 100644 --- a/packages/webapp/src/containers/Drawers/ExpenseDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/ExpenseDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React, { lazy } from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/InventoryAdjustmentDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/InventoryAdjustmentDetailActionsBar.tsx index a07aaf105..61bdcac16 100644 --- a/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/InventoryAdjustmentDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/InventoryAdjustmentDetailActionsBar.tsx @@ -4,7 +4,7 @@ import { Button, NavbarGroup, Classes, Intent } from '@blueprintjs/core'; import { useInventoryAdjustmentDrawerContext } from './InventoryAdjustmentDrawerProvider'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { Icon, @@ -23,7 +23,7 @@ import { compose } from '@/utils'; * Inventory adjustment detail actions bar. */ function InventoryAdjustmentDetailActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, }) { const { inventoryId } = useInventoryAdjustmentDrawerContext(); @@ -53,4 +53,4 @@ function InventoryAdjustmentDetailActionsBar({ ); } -export default compose(withAlertsActions)(InventoryAdjustmentDetailActionsBar); +export default compose(withAlertActions)(InventoryAdjustmentDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.tsx index db281e128..cbca91829 100644 --- a/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/InventoryAdjustmentDetailDrawer/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.tsx index 147664ef5..1c3231ddd 100644 --- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.tsx @@ -13,9 +13,9 @@ import { import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { If, @@ -43,7 +43,7 @@ function InvoiceDetailActionsBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -191,5 +191,5 @@ function InvoiceDetailActionsBar({ export default compose( withDialogActions, withDrawerActions, - withAlertsActions, + withAlertActions, )(InvoiceDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx index 7f778c049..44be51783 100644 --- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx +++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx @@ -12,8 +12,8 @@ import { useInvoicePaymentTransactions } from '@/hooks/query'; import { TableStyle } from '@/constants'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -22,7 +22,7 @@ import { DRAWERS } from '@/constants/drawers'; * Invoice payment transactions datatable. */ function InvoicePaymentTransactionsTable({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -78,6 +78,6 @@ function InvoicePaymentTransactionsTable({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(InvoicePaymentTransactionsTable); diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/index.tsx index 30266868b..c8e4fb4bb 100644 --- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsBar.tsx index 73f870ca6..053474301 100644 --- a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsBar.tsx @@ -12,8 +12,8 @@ import { import { useItemDetailDrawerContext } from './ItemDetailDrawerProvider'; import { ItemAction, AbilitySubject } from '@/constants/abilityOption'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { Icon, @@ -30,7 +30,7 @@ import { DRAWERS } from '@/constants/drawers'; * Item action-bar of readonly details drawer. */ function ItemDetailActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -81,5 +81,5 @@ function ItemDetailActionsBar({ export default compose( withDrawerActions, - withAlertsActions, + withAlertActions, )(ItemDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsMoreBtn.tsx b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsMoreBtn.tsx index 23ce3aa3b..0f2d4f09f 100644 --- a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsMoreBtn.tsx +++ b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemDetailActionsMoreBtn.tsx @@ -15,7 +15,7 @@ import { InventoryAdjustmentAction, } from '@/constants/abilityOption'; import { useItemDetailDrawerContext } from './ItemDetailDrawerProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Invoice details more actions menu. diff --git a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactions/index.tsx b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactions/index.tsx index cbdfefa5f..4a49ba301 100644 --- a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactions/index.tsx +++ b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/BillPaymentTransactions/index.tsx @@ -8,8 +8,8 @@ import { TableStyle } from '@/constants'; import { useItemDetailDrawerContext } from '../../ItemDetailDrawerProvider'; import { useItemAssociatedBillTransactions } from '@/hooks/query'; import { useBillTransactionsColumns, ActionsMenu } from './components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -18,7 +18,7 @@ import { DRAWERS } from '@/constants/drawers'; * Bill payment transactions data table. */ function BillPaymentTransactions({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -70,6 +70,6 @@ function BillPaymentTransactions({ ); } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(BillPaymentTransactions); diff --git a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactions/index.tsx b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactions/index.tsx index 4355a46d9..2946eef69 100644 --- a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactions/index.tsx +++ b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/EstimatePaymentTransactions/index.tsx @@ -9,8 +9,8 @@ import { useItemDetailDrawerContext } from '../../ItemDetailDrawerProvider'; import { useItemAssociatedEstimateTransactions } from '@/hooks/query'; import { useEstimateTransactionsColumns, ActionsMenu } from './components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -19,7 +19,7 @@ import { DRAWERS } from '@/constants/drawers'; * Esimtate payment transactions. */ function EstimatePaymentTransactions({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -73,6 +73,6 @@ function EstimatePaymentTransactions({ ); } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(EstimatePaymentTransactions); diff --git a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactions/index.tsx b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactions/index.tsx index 70e14a724..1aaa9cf61 100644 --- a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactions/index.tsx +++ b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/InvoicePaymentTransactions/index.tsx @@ -12,8 +12,8 @@ import { } from './components'; import { TableStyle } from '@/constants'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -22,7 +22,7 @@ import { DRAWERS } from '@/constants/drawers'; * Invoice payment transactions. */ function InvoicePaymentTransactions({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -75,6 +75,6 @@ function InvoicePaymentTransactions({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(InvoicePaymentTransactions); diff --git a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactions/index.tsx b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactions/index.tsx index ddb0462e5..a0815d825 100644 --- a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactions/index.tsx +++ b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/ItemPaymentTransactions/ReceiptPaymentTransactions/index.tsx @@ -8,8 +8,8 @@ import { useItemDetailDrawerContext } from '../../ItemDetailDrawerProvider'; import { useItemAssociatedReceiptTransactions } from '@/hooks/query'; import { useReceiptTransactionsColumns, ActionsMenu } from './components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -18,7 +18,7 @@ import { DRAWERS } from '@/constants/drawers'; * Receipt payment transactions. */ function ReceiptPaymentTransactions({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -72,6 +72,6 @@ function ReceiptPaymentTransactions({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(ReceiptPaymentTransactions); diff --git a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/index.tsx index 6a0b82d94..4c686f303 100644 --- a/packages/webapp/src/containers/Drawers/ItemDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/ItemDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.tsx b/packages/webapp/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.tsx index 90cb60879..147d61a59 100644 --- a/packages/webapp/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.tsx +++ b/packages/webapp/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.tsx @@ -15,8 +15,8 @@ import { FormattedMessage as T, } from '@/components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { useManualJournalDrawerContext } from './ManualJournalDrawerProvider'; import { ManualJournalAction, AbilitySubject } from '@/constants/abilityOption'; @@ -75,6 +75,6 @@ function ManualJournalDrawerActionBar({ } export default compose( - withAlertsActions, + withAlertActions, withDrawerActions, )(ManualJournalDrawerActionBar); diff --git a/packages/webapp/src/containers/Drawers/ManualJournalDrawer/index.tsx b/packages/webapp/src/containers/Drawers/ManualJournalDrawer/index.tsx index 3c44b1498..9e01925cc 100644 --- a/packages/webapp/src/containers/Drawers/ManualJournalDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/ManualJournalDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React, { lazy } from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx index 9607b73db..7a299bcb2 100644 --- a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx @@ -12,9 +12,9 @@ import { import { usePaymentMadeDetailContext } from './PaymentMadeDetailProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { Can, @@ -30,7 +30,7 @@ import { DRAWERS } from '@/constants/drawers'; * Payment made - Details panel - actions bar. */ function PaymentMadeDetailActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -81,5 +81,5 @@ function PaymentMadeDetailActionsBar({ export default compose( withDialogActions, withDrawerActions, - withAlertsActions, + withAlertActions, )(PaymentMadeDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/index.tsx index d99dbf1c1..e1ef1c74b 100644 --- a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx index 8f54f6098..689a21afb 100644 --- a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx @@ -11,9 +11,9 @@ import { import { usePaymentReceiveDetailContext } from './PaymentReceiveDetailProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { PaymentReceiveMoreMenuItems } from './utils'; import { Can, @@ -33,7 +33,7 @@ import { DRAWERS } from '@/constants/drawers'; * Payment receive actions bar. */ function PaymentsReceivedActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -131,5 +131,5 @@ function PaymentsReceivedActionsBar({ export default compose( withDialogActions, withDrawerActions, - withAlertsActions, + withAlertActions, )(PaymentsReceivedActionsBar); diff --git a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/index.tsx index cb6400043..9467baa3e 100644 --- a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/QuickCustomerFormDrawer.tsx b/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/QuickCustomerFormDrawer.tsx index 856ae9df3..be033fa2c 100644 --- a/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/QuickCustomerFormDrawer.tsx +++ b/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/QuickCustomerFormDrawer.tsx @@ -12,7 +12,7 @@ import CustomerFormFormik, { CustomerFormHeaderPrimary, } from '@/containers/Customers/CustomerForm/CustomerFormFormik'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; import { useAddAutofillRef } from '@/hooks/state/autofill'; diff --git a/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/index.tsx b/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/index.tsx index 1e851023e..e535d62fb 100644 --- a/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/QuickCreateCustomerDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; const QuickCreateCustomerDrawerContent = React.lazy( diff --git a/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/QuickCreateItemDrawerForm.tsx b/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/QuickCreateItemDrawerForm.tsx index 29b7ec4a0..3d4a2e5ea 100644 --- a/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/QuickCreateItemDrawerForm.tsx +++ b/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/QuickCreateItemDrawerForm.tsx @@ -11,8 +11,8 @@ import { useItemFormContext, } from '../../Items/ItemFormProvider'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { useDrawerContext } from '@/components/Drawer/DrawerProvider'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/index.tsx b/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/index.tsx index f01793ea2..073a73e76 100644 --- a/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/QuickCreateItemDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/QuickVendorFormDrawer.tsx b/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/QuickVendorFormDrawer.tsx index de91183db..56e09c17b 100644 --- a/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/QuickVendorFormDrawer.tsx +++ b/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/QuickVendorFormDrawer.tsx @@ -12,8 +12,8 @@ import VendorFormFormik, { VendorFormHeaderPrimary, } from '@/containers/Vendors/VendorForm/VendorFormFormik'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { useDrawerContext } from '@/components/Drawer/DrawerProvider'; import { useAddAutofillRef } from '@/hooks/state/autofill'; diff --git a/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/index.tsx b/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/index.tsx index 9ebd19b3d..1ce869ada 100644 --- a/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/QuickWriteVendorDrawer/index.tsx @@ -3,7 +3,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const QuickWriteVendorDrawerContent = React.lazy(() => import('./QuickWriteVendorDrawerContent'), diff --git a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.tsx b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.tsx index 85336c469..88adb0851 100644 --- a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.tsx +++ b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailActionBar.tsx @@ -10,9 +10,9 @@ import { Intent, } from '@blueprintjs/core'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { Can, Icon, @@ -33,7 +33,7 @@ function ReceiptDetailActionBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -117,5 +117,5 @@ function ReceiptDetailActionBar({ export default compose( withDialogActions, withDrawerActions, - withAlertsActions, + withAlertActions, )(ReceiptDetailActionBar); diff --git a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/index.tsx index fd4d604de..268f81cea 100644 --- a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/RefundCreditNoteDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/RefundCreditNoteDetailActionsBar.tsx index 8197bfb67..f21786392 100644 --- a/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/RefundCreditNoteDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/RefundCreditNoteDetailActionsBar.tsx @@ -4,7 +4,7 @@ import { Button, NavbarGroup, Classes, Intent } from '@blueprintjs/core'; import { useRefundCreditNoteDrawerContext } from './RefundCreditNoteDrawerProvider'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { Icon, DrawerActionsBar, @@ -19,7 +19,7 @@ import { compose } from '@/utils'; * Refund credit note actions bar. */ function RefundCreditNoteDetailActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, }) { const { refundTransactionId } = useRefundCreditNoteDrawerContext(); @@ -46,4 +46,4 @@ function RefundCreditNoteDetailActionsBar({ ); } -export default compose(withAlertsActions)(RefundCreditNoteDetailActionsBar); +export default compose(withAlertActions)(RefundCreditNoteDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/index.tsx index c9b28a907..8e8ae152b 100644 --- a/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/RefundCreditNoteDetailDrawer/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/RefundVendorCreditDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/RefundVendorCreditDetailActionsBar.tsx index 5ee1190ab..52225cece 100644 --- a/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/RefundVendorCreditDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/RefundVendorCreditDetailActionsBar.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Button, NavbarGroup, Classes, Intent } from '@blueprintjs/core'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useRefundVendorCreditNoteDrawerContext } from './RefundVendorCreditDrawerProvider'; import { Icon, @@ -18,7 +18,7 @@ import { compose } from '@/utils'; * Refund vendor credit actions bar. */ function RefundVendorCreditDetailActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, }) { const { refundTransactionId } = useRefundVendorCreditNoteDrawerContext(); @@ -45,4 +45,4 @@ function RefundVendorCreditDetailActionsBar({ ); } -export default compose(withAlertsActions)(RefundVendorCreditDetailActionsBar); +export default compose(withAlertActions)(RefundVendorCreditDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/index.tsx index 0f6031535..d6da06f65 100644 --- a/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/RefundVendorCreditDetailDrawer/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.tsx index ae26e7f51..99142a784 100644 --- a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.tsx +++ b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/ReconcileVendorCreditTransactions/ReconcileVendorCreditTransactionsTable.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { DataTable, Card } from '@/components'; import { TableStyle } from '@/constants'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useVendorCreditDetailDrawerContext } from '../VendorCreditDetailDrawerProvider'; import { @@ -16,7 +16,7 @@ import { compose } from '@/utils'; * Reconcile vendor credit transactions table. */ function ReconcileVendorCreditTransactionsTable({ - // #withAlertsActions + // #withAlertActions openAlert, }) { const columns = useReconcileVendorCreditTransactionsTableColumns(); @@ -43,6 +43,6 @@ function ReconcileVendorCreditTransactionsTable({ ); } -export default compose(withAlertsActions)( +export default compose(withAlertActions)( ReconcileVendorCreditTransactionsTable, ); diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.tsx index bfd8ee533..80a8bab6a 100644 --- a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.tsx +++ b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/RefundVendorCreditTransactions/RefundVendorCreditTransactionsTable.tsx @@ -4,7 +4,7 @@ import { DataTable, Card } from '@/components'; import { TableStyle } from '@/constants'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useVendorCreditDetailDrawerContext } from '../VendorCreditDetailDrawerProvider'; import { useRefundCreditTransactionsTableColumns, @@ -17,7 +17,7 @@ import { compose } from '@/utils'; * Refund vendor transactions table. */ function RefundVendorCreditTransactionsTable({ - // #withAlertsActions + // #withAlertActions openAlert, }) { const { refundVendorCredit } = useVendorCreditDetailDrawerContext(); @@ -44,4 +44,4 @@ function RefundVendorCreditTransactionsTable({ ); } -export default compose(withAlertsActions)(RefundVendorCreditTransactionsTable); +export default compose(withAlertActions)(RefundVendorCreditTransactionsTable); diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailActionsBar.tsx index 30b76d260..c6c312b6c 100644 --- a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailActionsBar.tsx @@ -12,9 +12,9 @@ import { import { useVendorCreditDetailDrawerContext } from './VendorCreditDetailDrawerProvider'; import { VendorCreditMenuItem } from './utils'; import { VendorCreditAction, AbilitySubject } from '@/constants/abilityOption'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { If, @@ -34,7 +34,7 @@ function VendorCreditDetailActionsBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -111,6 +111,6 @@ function VendorCreditDetailActionsBar({ export default compose( withDialogActions, - withAlertsActions, + withAlertActions, withDrawerActions, )(VendorCreditDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/index.tsx index 142afe413..5ead86e80 100644 --- a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx b/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx index 581df1d29..65c233e7e 100644 --- a/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx @@ -17,9 +17,9 @@ import clsx from 'classnames'; import { useVendorDetailsDrawerContext } from './VendorDetailsDrawerProvider'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { Can, @@ -44,7 +44,7 @@ function VendorDetailsActionsBar({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -141,6 +141,6 @@ function VendorDetailsActionsBar({ export default compose( withDrawerActions, - withAlertsActions, + withAlertActions, withDialogActions, )(VendorDetailsActionsBar); diff --git a/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/index.tsx b/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/index.tsx index 335a8426a..e5da0ac69 100644 --- a/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.tsx index dbc35f8b7..066c8d73a 100644 --- a/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/WarehouseTransferDetailActionsBar.tsx @@ -12,9 +12,9 @@ import { import { useWarehouseDetailDrawerContext } from './WarehouseTransferDetailDrawerProvider'; import { DrawerActionsBar, Icon, FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; import { compose } from '@/utils'; @@ -23,7 +23,7 @@ import { compose } from '@/utils'; * Warehouse transfer detail actions bar. */ function WarehouseTransferDetailActionsBar({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -68,6 +68,6 @@ function WarehouseTransferDetailActionsBar({ export default compose( withDialogActions, - withAlertsActions, + withAlertActions, withDrawerActions, )(WarehouseTransferDetailActionsBar); diff --git a/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/index.tsx b/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/index.tsx index 8eb85d54f..a36418317 100644 --- a/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/index.tsx +++ b/packages/webapp/src/containers/Drawers/WarehouseTransferDetailDrawer/index.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import React from 'react'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/ElementCustomize/ElementCustomizeFields.tsx b/packages/webapp/src/containers/ElementCustomize/ElementCustomizeFields.tsx index 76abd88c1..02da9dd4b 100644 --- a/packages/webapp/src/containers/ElementCustomize/ElementCustomizeFields.tsx +++ b/packages/webapp/src/containers/ElementCustomize/ElementCustomizeFields.tsx @@ -9,7 +9,7 @@ import { ElementCustomizeTabs } from './ElementCustomizeTabs'; import { useElementCustomizeTabsController } from './ElementCustomizeTabsController'; import { useDrawerContext } from '@/components/Drawer/DrawerProvider'; import { useElementCustomizeContext } from './ElementCustomizeProvider'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import styles from './ElementCustomize.module.scss'; export function ElementCustomizeFields() { diff --git a/packages/webapp/src/containers/ElementCustomize/ElementCustomizePreview.tsx b/packages/webapp/src/containers/ElementCustomize/ElementCustomizePreview.tsx index 8abe06730..5d775db34 100644 --- a/packages/webapp/src/containers/ElementCustomize/ElementCustomizePreview.tsx +++ b/packages/webapp/src/containers/ElementCustomize/ElementCustomizePreview.tsx @@ -4,7 +4,7 @@ import { Stack } from '@/components'; import { ElementCustomizeHeader } from './ElementCustomizeHeader'; import { ElementCustomizePreviewContent } from './ElementCustomizePreviewContent'; import { useDrawerContext } from '@/components/Drawer/DrawerProvider'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; function ElementCustomizePreviewRoot({ closeDrawer }) { const { name } = useDrawerContext(); diff --git a/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseForm.tsx b/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseForm.tsx index acec29eb8..433172d8d 100644 --- a/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseForm.tsx +++ b/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseForm.tsx @@ -15,9 +15,9 @@ import ExpenseFormTopBar from './ExpenseFormTopBar'; import { useExpenseFormContext } from './ExpenseFormPageProvider'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { AppToaster, Box } from '@/components'; import { PageForm } from '@/components/PageForm'; diff --git a/packages/webapp/src/containers/Expenses/ExpenseUniversalSearch.tsx b/packages/webapp/src/containers/Expenses/ExpenseUniversalSearch.tsx index fd9eb85f9..3cec76ff4 100644 --- a/packages/webapp/src/containers/Expenses/ExpenseUniversalSearch.tsx +++ b/packages/webapp/src/containers/Expenses/ExpenseUniversalSearch.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import { DRAWERS } from '@/constants/drawers'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; /** * Universal search bill item select action. diff --git a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseActionsBar.tsx b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseActionsBar.tsx index 3aaa86217..82f11b836 100644 --- a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseActionsBar.tsx +++ b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseActionsBar.tsx @@ -29,11 +29,11 @@ import { useRefreshExpenses } from '@/hooks/query/expenses'; import { useExpensesListContext } from './ExpensesListProvider'; import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; -import withExpenses from './withExpenses'; -import withExpensesActions from './withExpensesActions'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withExpenses } from './withExpenses'; +import { withExpensesActions } from './withExpensesActions'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose } from '@/utils'; import { isEmpty } from 'lodash'; diff --git a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseDataTable.tsx b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseDataTable.tsx index 40dd030ce..a1f193110 100644 --- a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseDataTable.tsx +++ b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseDataTable.tsx @@ -15,12 +15,12 @@ import { TABLES } from '@/constants/tables'; import ExpensesEmptyStatus from './ExpensesEmptyStatus'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withExpensesActions from './withExpensesActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withExpenses from './withExpenses'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withExpensesActions } from './withExpensesActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withExpenses } from './withExpenses'; import { ActionsMenu, useExpensesTableColumns } from './components'; import { DRAWERS } from '@/constants/drawers'; @@ -36,7 +36,7 @@ function ExpensesDataTable({ // #withDrawerActions openDrawer, - // #withAlertsActions + // #withAlertActions openAlert, // #withSettings @@ -154,7 +154,7 @@ function ExpensesDataTable({ export default compose( withDashboardActions, - withAlertsActions, + withAlertActions, withDrawerActions, withExpensesActions, withSettings(({ expenseSettings }) => ({ diff --git a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseViewTabs.tsx b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseViewTabs.tsx index 8a80e3915..e1a254bae 100644 --- a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseViewTabs.tsx +++ b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpenseViewTabs.tsx @@ -5,8 +5,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; import { useExpensesListContext } from './ExpensesListProvider'; -import withExpenses from './withExpenses'; -import withExpensesActions from './withExpensesActions'; +import { withExpenses } from './withExpenses'; +import { withExpensesActions } from './withExpensesActions'; import { compose, transfromViewsToTabs } from '@/utils'; diff --git a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpensesList.tsx b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpensesList.tsx index c92ca6cdb..2e1c393aa 100644 --- a/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpensesList.tsx +++ b/packages/webapp/src/containers/Expenses/ExpensesLanding/ExpensesList.tsx @@ -8,8 +8,8 @@ import { DashboardPageContent } from '@/components'; import ExpenseActionsBar from './ExpenseActionsBar'; import ExpenseDataTable from './ExpenseDataTable'; -import withExpenses from './withExpenses'; -import withExpensesActions from './withExpensesActions'; +import { withExpenses } from './withExpenses'; +import { withExpensesActions } from './withExpensesActions'; import { compose, transformTableStateToQuery } from '@/utils'; import { ExpensesListProvider } from './ExpensesListProvider'; diff --git a/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpenses.tsx b/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpenses.tsx index 00b92ea83..1eae43f0f 100644 --- a/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpenses.tsx +++ b/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpenses.tsx @@ -6,7 +6,7 @@ import { getExpensesTableStateFactory, } from '@/store/expenses/expenses.selectors'; -export default (mapState) => { +export const withExpenses = (mapState) => { const getExpensesTableState = getExpensesTableStateFactory(); const expensesTableStateChanged = expensesTableStateChangedFactory(); const getSelectedRows = getExpensesSelectedRowsFactory(); diff --git a/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpensesActions.tsx b/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpensesActions.tsx index 8a45ac099..91a29debc 100644 --- a/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpensesActions.tsx +++ b/packages/webapp/src/containers/Expenses/ExpensesLanding/withExpensesActions.tsx @@ -13,4 +13,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setExpensesSelectedRows(selectedRows)), }); -export default connect(null, mapDispatchToProps); +export const withExpensesActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Expenses/withExpenseDetail.tsx b/packages/webapp/src/containers/Expenses/withExpenseDetail.tsx index 2fe594a1d..604032ab9 100644 --- a/packages/webapp/src/containers/Expenses/withExpenseDetail.tsx +++ b/packages/webapp/src/containers/Expenses/withExpenseDetail.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getExpenseByIdFactory } from '@/store/expenses/expenses.selectors'; -export default () => { +export const withExpenseDetail = () => { const getExpenseById = getExpenseByIdFactory(); const mapStateToProps = (state, props) => ({ diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummary.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummary.tsx index f3df7ef86..c2e76413d 100644 --- a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummary.tsx @@ -12,7 +12,7 @@ import { APAgingSummaryBody } from './APAgingSummaryBody'; import { APAgingSummaryProvider } from './APAgingSummaryProvider'; import { APAgingSummarySheetLoadingBar } from './components'; -import withAPAgingSummaryActions from './withAPAgingSummaryActions'; +import { withAPAgingSummaryActions } from './withAPAgingSummaryActions'; import { compose } from '@/utils'; import { APAgingSummaryPdfDialog } from './dialogs/APAgingSummaryPdfDialog'; diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryActionsBar.tsx index 4b4144ce6..c80957442 100644 --- a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryActionsBar.tsx @@ -17,12 +17,12 @@ import { useAPAgingSummaryContext } from './APAgingSummaryProvider'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { APAgingSummaryExportMenu } from './components'; -import withAPAgingSummary from './withAPAgingSummary'; -import withAPAgingSummaryActions from './withAPAgingSummaryActions'; +import { withAPAgingSummary } from './withAPAgingSummary'; +import { withAPAgingSummaryActions } from './withAPAgingSummaryActions'; import { saveInvoke, compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * AP Aging summary sheet - Actions bar. diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryBody.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryBody.tsx index 366404561..c6c6ddbb2 100644 --- a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryBody.tsx @@ -7,7 +7,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { useAPAgingSummaryContext } from './APAgingSummaryProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryHeader.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryHeader.tsx index a16565498..35d719124 100644 --- a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/APAgingSummaryHeader.tsx @@ -9,8 +9,8 @@ import FinancialStatementHeader from '@/containers/FinancialStatements/Financial import APAgingSummaryHeaderGeneral from './APAgingSummaryHeaderGeneral'; import APAgingSummaryHeaderDimensions from './APAgingSummaryHeaderDimensions'; -import withAPAgingSummary from './withAPAgingSummary'; -import withAPAgingSummaryActions from './withAPAgingSummaryActions'; +import { withAPAgingSummary } from './withAPAgingSummary'; +import { withAPAgingSummaryActions } from './withAPAgingSummaryActions'; import { transformToForm, compose } from '@/utils'; import { useFeatureCan } from '@/hooks/state'; diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummary.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummary.tsx index 1a6d9696e..9928346cd 100644 --- a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummary.tsx @@ -4,7 +4,7 @@ import { APAgingSummaryFilterDrawerSelector, } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withAPAgingSummary = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { APAgingSummaryFilterDrawer: APAgingSummaryFilterDrawerSelector( diff --git a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummaryActions.tsx b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummaryActions.tsx index de8086197..a375b827c 100644 --- a/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummaryActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/APAgingSummary/withAPAgingSummaryActions.tsx @@ -7,4 +7,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(toggleAPAgingSummaryFilterDrawer(toggle)), }); -export default connect(null, mapActionsToProps); +export const withAPAgingSummaryActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummary.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummary.tsx index f56ba5a00..3925784c2 100644 --- a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummary.tsx @@ -10,7 +10,7 @@ import { ARAgingSummaryProvider } from './ARAgingSummaryProvider'; import { ARAgingSummarySheetLoadingBar } from './components'; import { ARAgingSummaryBody } from './ARAgingSummaryBody'; -import withARAgingSummaryActions from './withARAgingSummaryActions'; +import { withARAgingSummaryActions } from './withARAgingSummaryActions'; import { useARAgingSummaryQuery } from './common'; import { ARAgingSummaryPdfDialog } from './dialogs/ARAgingSummaryPdfDialog'; diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryActionsBar.tsx index 9e972165c..d3bb86ab6 100644 --- a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryActionsBar.tsx @@ -15,9 +15,9 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { useARAgingSummaryContext } from './ARAgingSummaryProvider'; -import withARAgingSummaryActions from './withARAgingSummaryActions'; -import withARAgingSummary from './withARAgingSummary'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withARAgingSummaryActions } from './withARAgingSummaryActions'; +import { withARAgingSummary } from './withARAgingSummary'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, safeInvoke } from '@/utils'; import { ARAgingSummaryExportMenu } from './components'; diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryBody.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryBody.tsx index 4d51ee6e7..4888b8468 100644 --- a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryBody.tsx @@ -7,7 +7,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components'; import { useARAgingSummaryContext } from './ARAgingSummaryProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * A/R Aging summary body. diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeader.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeader.tsx index 3865f9519..e87992941 100644 --- a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/ARAgingSummaryHeader.tsx @@ -10,8 +10,8 @@ import FinancialStatementHeader from '@/containers/FinancialStatements/Financial import ARAgingSummaryHeaderGeneral from './ARAgingSummaryHeaderGeneral'; import ARAgingSummaryHeaderDimensions from './ARAgingSummaryHeaderDimensions'; -import withARAgingSummary from './withARAgingSummary'; -import withARAgingSummaryActions from './withARAgingSummaryActions'; +import { withARAgingSummary } from './withARAgingSummary'; +import { withARAgingSummaryActions } from './withARAgingSummaryActions'; import { compose, transformToForm } from '@/utils'; import { useFeatureCan } from '@/hooks/state'; diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummary.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummary.tsx index 6427434c9..ef102dfa1 100644 --- a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummary.tsx @@ -4,7 +4,7 @@ import { getARAgingSummaryFilterDrawer, } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withARAgingSummary = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { ARAgingSummaryFilterDrawer: getARAgingSummaryFilterDrawer(state, props), diff --git a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummaryActions.tsx b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummaryActions.tsx index ef7273456..13e2edade 100644 --- a/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummaryActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ARAgingSummary/withARAgingSummaryActions.tsx @@ -7,4 +7,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(toggleARAgingSummaryFilterDrawer(toggle)), }); -export default connect(null, mapActionsToProps); +export const withARAgingSummaryActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.tsx index 11928622f..0971a5904 100644 --- a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.tsx +++ b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheet.tsx @@ -12,7 +12,7 @@ import { BalanceSheetBody } from './BalanceSheetBody'; import { useBalanceSheetQuery } from './utils'; import { compose } from '@/utils'; -import withBalanceSheetActions from './withBalanceSheetActions'; +import { withBalanceSheetActions } from './withBalanceSheetActions'; import { BalanceSheetDialogs } from './BalanceSheetDialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.tsx index f9ba192af..e99046a18 100644 --- a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.tsx @@ -15,9 +15,9 @@ import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { BalanceSheetExportMenu } from './components'; import { useBalanceSheetContext } from './BalanceSheetProvider'; -import withBalanceSheet from './withBalanceSheet'; -import withBalanceSheetActions from './withBalanceSheetActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withBalanceSheet } from './withBalanceSheet'; +import { withBalanceSheetActions } from './withBalanceSheetActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, saveInvoke } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.tsx index 7b75627ae..14040fb85 100644 --- a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetBody.tsx @@ -2,7 +2,7 @@ import React from 'react'; import BalanceSheetTable from './BalanceSheetTable'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { FinancialReportBody } from '../FinancialReportPage'; import { useBalanceSheetContext } from './BalanceSheetProvider'; diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.tsx index d44d24fc5..394af4e7b 100644 --- a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.tsx @@ -9,8 +9,8 @@ import { FormattedMessage as T } from '@/components'; import { useFeatureCan } from '@/hooks/state'; import { Features } from '@/constants'; -import withBalanceSheet from './withBalanceSheet'; -import withBalanceSheetActions from './withBalanceSheetActions'; +import { withBalanceSheet } from './withBalanceSheet'; +import { withBalanceSheetActions } from './withBalanceSheetActions'; import BalanceSheetHeaderGeneralPanal from './BalanceSheetHeaderGeneralPanal'; import BalanceSheetHeaderComparisonPanal from './BalanceSheetHeaderComparisonPanal'; diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheet.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheet.tsx index 71f6de337..07bcef801 100644 --- a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheet.tsx +++ b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheet.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getBalanceSheetFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withBalanceSheet = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { balanceSheetDrawerFilter: getBalanceSheetFilterDrawer(state), diff --git a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheetActions.tsx b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheetActions.tsx index bb8671140..4dcf19b1b 100644 --- a/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheetActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/BalanceSheet/withBalanceSheetActions.tsx @@ -9,4 +9,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(toggleBalanceSheetFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withBalanceSheetActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.tsx index df36fc12b..7cfd476eb 100644 --- a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatement.tsx @@ -9,7 +9,7 @@ import { CashFlowStatementProvider } from './CashFlowStatementProvider'; import CashFlowStatementHeader from './CashFlowStatementHeader'; import CashFlowStatementActionsBar from './CashFlowStatementActionsBar'; -import withCashFlowStatementActions from './withCashFlowStatementActions'; +import { withCashFlowStatementActions } from './withCashFlowStatementActions'; import { CashFlowStatementLoadingBar, CashFlowStatementAlerts, diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementActionsBar.tsx index 75f459057..9bc118732 100644 --- a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementActionsBar.tsx @@ -15,12 +15,12 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { useCashFlowStatementContext } from './CashFlowStatementProvider'; -import withCashFlowStatement from './withCashFlowStatement'; -import withCashFlowStatementActions from './withCashFlowStatementActions'; +import { withCashFlowStatement } from './withCashFlowStatement'; +import { withCashFlowStatementActions } from './withCashFlowStatementActions'; import { compose, saveInvoke } from '@/utils'; import { CashflowSheetExportMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementBody.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementBody.tsx index c62e4807c..8f1f38d00 100644 --- a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementBody.tsx @@ -7,7 +7,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { useCashFlowStatementContext } from './CashFlowStatementProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Cashflow stement body. diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementHeader.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementHeader.tsx index 24ad29c21..1b4d62f23 100644 --- a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/CashFlowStatementHeader.tsx @@ -11,8 +11,8 @@ import FinancialStatementHeader from '../FinancialStatementHeader'; import CashFlowStatementGeneralPanel from './CashFlowStatementGeneralPanel'; import CashFlowStatementDimensionsPanel from './CashFlowStatementDimensionsPanel'; -import withCashFlowStatement from './withCashFlowStatement'; -import withCashFlowStatementActions from './withCashFlowStatementActions'; +import { withCashFlowStatement } from './withCashFlowStatement'; +import { withCashFlowStatementActions } from './withCashFlowStatementActions'; import { getDefaultCashFlowSheetQuery } from './utils'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatement.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatement.tsx index 08d979741..f82c0b721 100644 --- a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatement.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatement.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getCashFlowStatementFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withCashFlowStatement = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { cashFlowStatementDrawerFilter: getCashFlowStatementFilterDrawer(state), diff --git a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatementActions.tsx b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatementActions.tsx index 3e90d9db5..211ee7022 100644 --- a/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatementActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CashFlowStatement/withCashFlowStatementActions.tsx @@ -7,4 +7,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(toggleCashFlowStatementFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withCashFlowStatementActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.tsx index 5a5646c58..59267e6b8 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomerBalanceSummaryBody.tsx @@ -6,7 +6,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider'; import CustomersBalanceSummaryTable from './CustomersBalanceSummaryTable'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Customer balance summary body. diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.tsx index d94c3d064..cb25656cb 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummary.tsx @@ -12,7 +12,7 @@ import { CustomerBalanceSummaryBody } from './CustomerBalanceSummaryBody'; import { CustomersBalanceSummaryProvider } from './CustomersBalanceSummaryProvider'; import { useCustomerBalanceSummaryQuery } from './utils'; import { CustomersBalanceLoadingBar } from './components'; -import withCustomersBalanceSummaryActions from './withCustomersBalanceSummaryActions'; +import { withCustomersBalanceSummaryActions } from './withCustomersBalanceSummaryActions'; import { CustomerBalanceSummaryPdfDialog } from './CustomerBalancePdfDialog'; import { DialogsName } from '@/constants/dialogs'; diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryActionsBar.tsx index 775952d3b..84f7bf591 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryActionsBar.tsx @@ -13,12 +13,12 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withCustomersBalanceSummary from './withCustomersBalanceSummary'; -import withCustomersBalanceSummaryActions from './withCustomersBalanceSummaryActions'; +import { withCustomersBalanceSummary } from './withCustomersBalanceSummary'; +import { withCustomersBalanceSummaryActions } from './withCustomersBalanceSummaryActions'; import { useCustomersBalanceSummaryContext } from './CustomersBalanceSummaryProvider'; import { compose, saveInvoke } from '@/utils'; import { CustomerBalanceSummaryExportMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.tsx index a2a32adad..433a022de 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/CustomersBalanceSummaryHeader.tsx @@ -8,8 +8,8 @@ import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import FinancialStatementHeader from '../FinancialStatementHeader'; -import withCustomersBalanceSummary from './withCustomersBalanceSummary'; -import withCustomersBalanceSummaryActions from './withCustomersBalanceSummaryActions'; +import { withCustomersBalanceSummary } from './withCustomersBalanceSummary'; +import { withCustomersBalanceSummaryActions } from './withCustomersBalanceSummaryActions'; import CustomersBalanceSummaryGeneralPanel from './CustomersBalanceSummaryGeneralPanel'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummary.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummary.tsx index 6583a1090..46c08719d 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummary.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getCustomersBalanceSummaryFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withCustomersBalanceSummary = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { customersBalanceDrawerFilter: getCustomersBalanceSummaryFilterDrawer( diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummaryActions.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummaryActions.tsx index 81e6d7cdf..d7404b99f 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummaryActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersBalanceSummary/withCustomersBalanceSummaryActions.tsx @@ -7,4 +7,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(toggleCustomersBalanceSummaryFilterDrawer(toggle)), }); -export default connect(null, mapActionsToProps); +export const withCustomersBalanceSummaryActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.tsx index 454c2f2fe..00f1e4ddf 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactions.tsx @@ -7,7 +7,7 @@ import { FinancialStatement, DashboardPageContent } from '@/components'; import CustomersTransactionsHeader from './CustomersTransactionsHeader'; import CustomersTransactionsActionsBar from './CustomersTransactionsActionsBar'; -import withCustomersTransactionsActions from './withCustomersTransactionsActions'; +import { withCustomersTransactionsActions } from './withCustomersTransactionsActions'; import { CustomersTransactionsLoadingBar } from './components'; import { CustomersTransactionsBody } from './CustomersTransactionsBody'; import { CustomersTransactionsProvider } from './CustomersTransactionsProvider'; diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsActionsBar.tsx index 0511f633d..55e3b00f3 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsActionsBar.tsx @@ -16,11 +16,11 @@ import { CustomersTransactionsExportMenu } from './components'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { useCustomersTransactionsContext } from './CustomersTransactionsProvider'; -import withCustomersTransactions from './withCustomersTransactions'; -import withCustomersTransactionsActions from './withCustomersTransactionsActions'; +import { withCustomersTransactions } from './withCustomersTransactions'; +import { withCustomersTransactionsActions } from './withCustomersTransactionsActions'; import { compose, saveInvoke } from '@/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.tsx index 1c04b3504..44e261ad7 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsBody.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import CustomersTransactionsTable from './CustomersTransactionsTable'; import { FinancialReportBody } from '../FinancialReportPage'; diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsHeader.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsHeader.tsx index 3df138303..e09c20e29 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/CustomersTransactionsHeader.tsx @@ -9,8 +9,8 @@ import { Formik, Form } from 'formik'; import FinancialStatementHeader from '../FinancialStatementHeader'; import CustomersTransactionsHeaderGeneralPanel from './CustomersTransactionsHeaderGeneralPanel'; -import withCustomersTransactions from './withCustomersTransactions'; -import withCustomersTransactionsActions from './withCustomersTransactionsActions'; +import { withCustomersTransactions } from './withCustomersTransactions'; +import { withCustomersTransactionsActions } from './withCustomersTransactionsActions'; import { compose, transformToForm } from '@/utils'; import { diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactions.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactions.tsx index 7a074cb35..dee3d2dc9 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactions.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getCustomersTransactionsFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withCustomersTransactions = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { customersTransactionsDrawerFilter: getCustomersTransactionsFilterDrawer( diff --git a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactionsActions.tsx b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactionsActions.tsx index f3cf0fc5f..97f67dde0 100644 --- a/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactionsActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/CustomersTransactions/withCustomersTransactionsActions.tsx @@ -8,4 +8,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(toggleCustomersTransactionsFilterDrawer(toggle)), }); -export default connect(null, mapActionsToProps); +export const withCustomersTransactionsActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.tsx b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.tsx index 0da741bdb..6a8adc1a6 100644 --- a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.tsx +++ b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedger.tsx @@ -14,7 +14,7 @@ import { GeneralLedgerSheetLoadingBar, } from './components'; -import withGeneralLedgerActions from './withGeneralLedgerActions'; +import { withGeneralLedgerActions } from './withGeneralLedgerActions'; import { compose } from '@/utils'; import { GeneralLedgerPdfDialog } from './dialogs/GeneralLedgerPdfDialog'; import { DialogsName } from '@/constants/dialogs'; diff --git a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.tsx index 7f04253b3..79d14daa3 100644 --- a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.tsx @@ -16,9 +16,9 @@ import { GeneralLedgerSheetExportMenu } from './components'; import { useGeneralLedgerContext } from './GeneralLedgerProvider'; import { compose } from '@/utils'; -import withGeneralLedger from './withGeneralLedger'; -import withGeneralLedgerActions from './withGeneralLedgerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withGeneralLedger } from './withGeneralLedger'; +import { withGeneralLedgerActions } from './withGeneralLedgerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerBody.tsx b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerBody.tsx index a9fd39433..9c40973a6 100644 --- a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerBody.tsx @@ -8,7 +8,7 @@ import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { FinancialReportBody } from '../FinancialReportPage'; import { useGeneralLedgerContext } from './GeneralLedgerProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeader.tsx b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeader.tsx index f34ad4e75..f1697748e 100644 --- a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerHeader.tsx @@ -16,8 +16,8 @@ import FinancialStatementHeader from '../FinancialStatementHeader'; import GeneralLedgerHeaderGeneralPane from './GeneralLedgerHeaderGeneralPane'; import GeneralLedgerHeaderDimensionsPanel from './GeneralLedgerHeaderDimensionsPanel'; -import withGeneralLedger from './withGeneralLedger'; -import withGeneralLedgerActions from './withGeneralLedgerActions'; +import { withGeneralLedger } from './withGeneralLedger'; +import { withGeneralLedgerActions } from './withGeneralLedgerActions'; import { useFeatureCan } from '@/hooks/state'; import { Features } from '@/constants'; diff --git a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedger.tsx b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedger.tsx index e0f4d7719..2d77e16b5 100644 --- a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedger.tsx +++ b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedger.tsx @@ -4,7 +4,7 @@ import { getGeneralLedgerFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withGeneralLedger = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { generalLedgerFilterDrawer: getGeneralLedgerFilterDrawer(state, props), diff --git a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedgerActions.tsx b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedgerActions.tsx index 6a3d9bbc7..98d4a8e13 100644 --- a/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedgerActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/GeneralLedger/withGeneralLedgerActions.tsx @@ -9,4 +9,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(toggleGeneralLedgerFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withGeneralLedgerActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetails.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetails.tsx index 94ba337d3..263745355 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetails.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetails.tsx @@ -7,7 +7,7 @@ import { FinancialStatement, DashboardPageContent } from '@/components'; import InventoryItemDetailsActionsBar from './InventoryItemDetailsActionsBar'; import InventoryItemDetailsHeader from './InventoryItemDetailsHeader'; -import withInventoryItemDetailsActions from './withInventoryItemDetailsActions'; +import { withInventoryItemDetailsActions } from './withInventoryItemDetailsActions'; import { InventoryItemDetailsProvider } from './InventoryItemDetailsProvider'; import { InventoryItemDetailsLoadingBar, diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsActionsBar.tsx index 1bb63210a..4b0aea729 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsActionsBar.tsx @@ -16,12 +16,12 @@ import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { InventoryItemDetailsExportMenu } from './components'; import { useInventoryItemDetailsContext } from './InventoryItemDetailsProvider'; -import withInventoryItemDetails from './withInventoryItemDetails'; -import withInventoryItemDetailsActions from './withInventoryItemDetailsActions'; +import { withInventoryItemDetails } from './withInventoryItemDetails'; +import { withInventoryItemDetailsActions } from './withInventoryItemDetailsActions'; import { compose, saveInvoke } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Inventory item details actions bar. diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsBody.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsBody.tsx index 06e1978fc..102bf3e32 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsBody.tsx @@ -7,7 +7,7 @@ import { InventoryItemDetailsTable } from './InventoryItemDetailsTable'; import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Inventory item details body. diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeader.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeader.tsx index 42dca6892..18fb004cf 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/InventoryItemDetailsHeader.tsx @@ -12,8 +12,8 @@ import FinancialStatementHeader from '../FinancialStatementHeader'; import InventoryItemDetailsHeaderGeneralPanel from './InventoryItemDetailsHeaderGeneralPanel'; import InventoryItemDetailsHeaderDimensionsPanel from './InventoryItemDetailsHeaderDimensionsPanel'; -import withInventoryItemDetails from './withInventoryItemDetails'; -import withInventoryItemDetailsActions from './withInventoryItemDetailsActions'; +import { withInventoryItemDetails } from './withInventoryItemDetails'; +import { withInventoryItemDetailsActions } from './withInventoryItemDetailsActions'; import { getInventoryItemDetailsDefaultQuery, diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetails.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetails.tsx index cbc33953a..d64506df5 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetails.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetails.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getInventoryItemDetailsFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withInventoryItemDetails = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { inventoryItemDetailDrawerFilter: getInventoryItemDetailsFilterDrawer( diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetailsActions.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetailsActions.tsx index 458b9ac88..5fe9af6ff 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetailsActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryItemDetails/withInventoryItemDetailsActions.tsx @@ -7,4 +7,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(toggleInventoryItemDetailsFilterDrawer(toggle)), }); -export default connect(null, mapActionsToProps); +export const withInventoryItemDetailsActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuation.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuation.tsx index acb402166..a103199ba 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuation.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuation.tsx @@ -12,8 +12,8 @@ import { InventoryValuationLoadingBar } from './components'; import { useInventoryValuationQuery } from './utils'; import { compose } from '@/utils'; -import withInventoryValuationActions from './withInventoryValuationActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withInventoryValuationActions } from './withInventoryValuationActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { InventoryValuationDialogs } from './InventoryValuationDialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.tsx index e30ba51c2..9ed734508 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationActionsBar.tsx @@ -14,9 +14,9 @@ import { DashboardActionsBar, Icon, FormattedMessage as T } from '@/components'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withInventoryValuation from './withInventoryValuation'; -import withInventoryValuationActions from './withInventoryValuationActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withInventoryValuation } from './withInventoryValuation'; +import { withInventoryValuationActions } from './withInventoryValuationActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useInventoryValuationContext } from './InventoryValuationProvider'; import { compose, saveInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.tsx index fa7dc0e90..690b236e9 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationBody.tsx @@ -7,7 +7,7 @@ import { useInventoryValuationContext } from './InventoryValuationProvider'; import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Inventory valuation body. diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeader.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeader.tsx index 1d33315fc..7c951fb5e 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/InventoryValuationHeader.tsx @@ -10,8 +10,8 @@ import { FormattedMessage as T } from '@/components'; import FinancialStatementHeader from '@/containers/FinancialStatements/FinancialStatementHeader'; import InventoryValuationHeaderGeneralPanel from './InventoryValuationHeaderGeneralPanel'; import InventoryValuationHeaderDimensionsPanel from './InventoryValuationHeaderDimensionsPanel'; -import withInventoryValuation from './withInventoryValuation'; -import withInventoryValuationActions from './withInventoryValuationActions'; +import { withInventoryValuation } from './withInventoryValuation'; +import { withInventoryValuationActions } from './withInventoryValuationActions'; import { compose, transformToForm } from '@/utils'; import { useFeatureCan } from '@/hooks/state'; diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuation.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuation.tsx index db2094598..30bad62a7 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuation.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuation.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getInventoryValuationFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withInventoryValuation = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { inventoryValuationDrawerFilter: getInventoryValuationFilterDrawer(state), diff --git a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuationActions.tsx b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuationActions.tsx index 781c832cc..c9a7c56bd 100644 --- a/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuationActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/InventoryValuation/withInventoryValuationActions.tsx @@ -7,4 +7,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(toggleInventoryValuationFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withInventoryValuationActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/Journal/Journal.tsx b/packages/webapp/src/containers/FinancialStatements/Journal/Journal.tsx index 1a9ce6aef..94b2236b3 100644 --- a/packages/webapp/src/containers/FinancialStatements/Journal/Journal.tsx +++ b/packages/webapp/src/containers/FinancialStatements/Journal/Journal.tsx @@ -10,8 +10,8 @@ import { JournalBody } from './JournalBody'; import { JournalSheetProvider } from './JournalProvider'; import { JournalSheetLoadingBar, JournalSheetAlerts } from './components'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withJournalActions from './withJournalActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withJournalActions } from './withJournalActions'; import { useJournalQuery } from './utils'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/Journal/JournalActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/Journal/JournalActionsBar.tsx index cb2b9db86..2fb00447e 100644 --- a/packages/webapp/src/containers/FinancialStatements/Journal/JournalActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/Journal/JournalActionsBar.tsx @@ -13,13 +13,13 @@ import classNames from 'classnames'; import { DashboardActionsBar, FormattedMessage as T, Icon } from '@/components'; -import withJournalActions from './withJournalActions'; -import withJournal from './withJournal'; +import { withJournalActions } from './withJournalActions'; +import { withJournal } from './withJournal'; import { compose } from '@/utils'; import { useJournalSheetContext } from './JournalProvider'; import { JournalSheetExportMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/Journal/JournalBody.tsx b/packages/webapp/src/containers/FinancialStatements/Journal/JournalBody.tsx index 524be05a3..c76d80160 100644 --- a/packages/webapp/src/containers/FinancialStatements/Journal/JournalBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/Journal/JournalBody.tsx @@ -7,7 +7,7 @@ import { FinancialSheetSkeleton } from '@/components'; import { JournalTable } from './JournalTable'; import { useJournalSheetContext } from './JournalProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Journal report body. diff --git a/packages/webapp/src/containers/FinancialStatements/Journal/JournalHeader.tsx b/packages/webapp/src/containers/FinancialStatements/Journal/JournalHeader.tsx index 1274a7573..09d1c28d5 100644 --- a/packages/webapp/src/containers/FinancialStatements/Journal/JournalHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/Journal/JournalHeader.tsx @@ -11,8 +11,8 @@ import { FormattedMessage as T } from '@/components'; import JournalSheetHeaderGeneral from './JournalSheetHeaderGeneral'; import FinancialStatementHeader from '@/containers/FinancialStatements/FinancialStatementHeader'; -import withJournal from './withJournal'; -import withJournalActions from './withJournalActions'; +import { withJournal } from './withJournal'; +import { withJournalActions } from './withJournalActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/Journal/withJournal.tsx b/packages/webapp/src/containers/FinancialStatements/Journal/withJournal.tsx index c388058b0..568121a1c 100644 --- a/packages/webapp/src/containers/FinancialStatements/Journal/withJournal.tsx +++ b/packages/webapp/src/containers/FinancialStatements/Journal/withJournal.tsx @@ -4,7 +4,7 @@ import { getJournalFilterDrawer, } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withJournal = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { journalSheetDrawerFilter: getJournalFilterDrawer(state, props), diff --git a/packages/webapp/src/containers/FinancialStatements/Journal/withJournalActions.tsx b/packages/webapp/src/containers/FinancialStatements/Journal/withJournalActions.tsx index 74e791fa2..0a1a745fe 100644 --- a/packages/webapp/src/containers/FinancialStatements/Journal/withJournalActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/Journal/withJournalActions.tsx @@ -7,4 +7,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(toggleJournalSheeetFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withJournalActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.tsx index 9c0ed1095..141e24bed 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.tsx @@ -14,13 +14,13 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withProfitLossActions from './withProfitLossActions'; -import withProfitLoss from './withProfitLoss'; +import { withProfitLossActions } from './withProfitLossActions'; +import { withProfitLoss } from './withProfitLoss'; import { compose, saveInvoke } from '@/utils'; import { useProfitLossSheetContext } from './ProfitLossProvider'; import { ProfitLossSheetExportMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.tsx index 525f12bcf..05ba7663d 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossBody.tsx @@ -6,7 +6,7 @@ import { FinancialSheetSkeleton } from '@/components'; import { FinancialReportBody } from '../FinancialReportPage'; import { useProfitLossSheetContext } from './ProfitLossProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.tsx index d8dcb20a0..1fe0fd6e7 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheet.tsx @@ -8,8 +8,8 @@ import ProfitLossActionsBar from './ProfitLossActionsBar'; import { DashboardPageContent } from '@/components'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withProfitLossActions from './withProfitLossActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withProfitLossActions } from './withProfitLossActions'; import { useProfitLossSheetQuery } from './utils'; import { ProfitLossSheetProvider } from './ProfitLossProvider'; diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.tsx index bfda8f7cc..381a62b4d 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossSheetHeader.tsx @@ -12,8 +12,8 @@ import ProfitLossSheetHeaderGeneralPane from './ProfitLossSheetHeaderGeneralPane import ProfitLossSheetHeaderComparisonPanel from './ProfitLossSheetHeaderComparisonPanel'; import ProfitLossSheetHeaderDimensionsPanel from './ProfitLossSheetHeaderDimensionsPanel'; -import withProfitLoss from './withProfitLoss'; -import withProfitLossActions from './withProfitLossActions'; +import { withProfitLoss } from './withProfitLoss'; +import { withProfitLossActions } from './withProfitLossActions'; import { useProfitLossHeaderValidationSchema } from './utils'; import { useFeatureCan } from '@/hooks/state'; diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLoss.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLoss.tsx index e3cdadad8..e746bb84f 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLoss.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLoss.tsx @@ -4,7 +4,7 @@ import { getProfitLossFilterDrawer, } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withProfitLoss = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { profitLossDrawerFilter: getProfitLossFilterDrawer(state, props), diff --git a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLossActions.tsx b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLossActions.tsx index 16f3107de..fd0e5684e 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLossActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProfitLossSheet/withProfitLossActions.tsx @@ -7,4 +7,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(toggleProfitLossFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withProfitLossActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummary.tsx b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummary.tsx index b4a175335..644dcf1b7 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummary.tsx @@ -13,7 +13,7 @@ import ProjectProfitabilitySummaryActionsBar from './ProjectProfitabilitySummary import { ProjectProfitabilitySummaryBody } from './ProjectProfitabilitySummaryBody'; import { ProjectProfitabilitySummaryProvider } from './ProjectProfitabilitySummaryProvider'; import { useProjectProfitabilitySummaryQuery } from './utils'; -import withProjectProfitabilitySummaryActions from './withProjectProfitabilitySummaryActions'; +import { withProjectProfitabilitySummaryActions } from './withProjectProfitabilitySummaryActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryActionsBar.tsx index e88ce2f21..c66b3c18d 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryActionsBar.tsx @@ -16,8 +16,8 @@ import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { compose, saveInvoke } from '@/utils'; import { useProjectProfitabilitySummaryContext } from './ProjectProfitabilitySummaryProvider'; -import withProjectProfitabilitySummary from './withProjectProfitabilitySummary'; -import withProjectProfitabilitySummaryActions from './withProjectProfitabilitySummaryActions'; +import { withProjectProfitabilitySummary } from './withProjectProfitabilitySummary'; +import { withProjectProfitabilitySummaryActions } from './withProjectProfitabilitySummaryActions'; /** * Project profitability summary actions bar. diff --git a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryBody.tsx b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryBody.tsx index 7ca917daf..d441ca9f3 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryBody.tsx @@ -6,7 +6,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { useProjectProfitabilitySummaryContext } from './ProjectProfitabilitySummaryProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryHeader.tsx b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryHeader.tsx index 179b3d12d..8d22e8fe6 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/ProjectProfitabilitySummaryHeader.tsx @@ -6,8 +6,8 @@ import { Formik, Form } from 'formik'; import { Tabs, Tab, Button, Intent } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; -import withProjectProfitabilitySummary from './withProjectProfitabilitySummary'; -import withProjectProfitabilitySummaryActions from './withProjectProfitabilitySummaryActions'; +import { withProjectProfitabilitySummary } from './withProjectProfitabilitySummary'; +import { withProjectProfitabilitySummaryActions } from './withProjectProfitabilitySummaryActions'; import ProjectProfitabilitySummaryHeaderGeneralPanal from './ProjectProfitabilitySummaryHeaderGeneralPanal'; import FinancialStatementHeader from '../FinancialStatementHeader'; diff --git a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummary.tsx b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummary.tsx index 89902b0e0..0bcb7584b 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummary.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getProjectProfitabilitySummaryFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withProjectProfitabilitySummary = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { projectProfitabilitySummaryDrawerFilter: diff --git a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummaryActions.tsx b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummaryActions.tsx index 5c1dd2519..4d147a62a 100644 --- a/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummaryActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/ProjectProfitabilitySummary/withProjectProfitabilitySummaryActions.tsx @@ -7,4 +7,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(toggleProjectProfitabilitySummaryFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withProjectProfitabilitySummaryActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItems.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItems.tsx index f26a6c7ae..f095744a4 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItems.tsx +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItems.tsx @@ -12,7 +12,7 @@ import { PurchasesByItemsBody } from './PurchasesByItemsBody'; import { usePurchasesByItemsQuery } from './utils'; import { compose } from '@/utils'; -import withPurchasesByItemsActions from './withPurchasesByItemsActions'; +import { withPurchasesByItemsActions } from './withPurchasesByItemsActions'; import { PurchasesByItemsDialogs } from './PurchasesByItemsDialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx index 190fc32cd..917ddaa9b 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsActionsBar.tsx @@ -14,9 +14,9 @@ import { DashboardActionsBar, FormattedMessage as T, Icon } from '@/components'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withPurchasesByItems from './withPurchasesByItems'; -import withPurchasesByItemsActions from './withPurchasesByItemsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withPurchasesByItems } from './withPurchasesByItems'; +import { withPurchasesByItemsActions } from './withPurchasesByItemsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, saveInvoke } from '@/utils'; import { usePurchaseByItemsContext } from './PurchasesByItemsProvider'; import { PurchasesByItemsExportMenu } from './components'; diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsBody.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsBody.tsx index 95b317cc8..72a61c4c5 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsBody.tsx @@ -7,7 +7,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import { FinancialSheetSkeleton } from '@/components'; import { usePurchaseByItemsContext } from './PurchasesByItemsProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Purchases by items. diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsHeader.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsHeader.tsx index 66f37717b..b2a3201a1 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/PurchasesByItemsHeader.tsx @@ -9,8 +9,8 @@ import { FormattedMessage as T } from '@/components'; import FinancialStatementHeader from '@/containers/FinancialStatements/FinancialStatementHeader'; import PurchasesByItemsGeneralPanel from './PurchasesByItemsGeneralPanel'; -import withPurchasesByItems from './withPurchasesByItems'; -import withPurchasesByItemsActions from './withPurchasesByItemsActions'; +import { withPurchasesByItems } from './withPurchasesByItems'; +import { withPurchasesByItemsActions } from './withPurchasesByItemsActions'; import { compose, transformToForm } from '@/utils'; import { diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItems.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItems.tsx index c779000b9..94faa0aac 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItems.tsx +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItems.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getPurchasesByItemsFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withPurchasesByItems = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { purchasesByItemsDrawerFilter: getPurchasesByItemsFilterDrawer(state), diff --git a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItemsActions.tsx b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItemsActions.tsx index 60312c9ad..e94b6757b 100644 --- a/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItemsActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/PurchasesByItems/withPurchasesByItemsActions.tsx @@ -7,4 +7,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(togglePurchasesByItemsFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withPurchasesByItemsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.tsx b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.tsx index 6e4c3a3b7..81cdc7a23 100644 --- a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.tsx +++ b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLoss.tsx @@ -8,8 +8,8 @@ import RealizedGainOrLossActionsBar from './RealizedGainOrLossActionsBar'; import { RealizedGainOrLossLoadingBar } from './components'; import { RealizedGainOrLossProvider } from './RealizedGainOrLossProvider'; -import withCurrentOrganization from '../../Organization/withCurrentOrganization'; -import withRealizedGainOrLossActions from './withRealizedGainOrLossActions'; +import { withCurrentOrganization } from '../../Organization/withCurrentOrganization'; +import { withRealizedGainOrLossActions } from './withRealizedGainOrLossActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.tsx index 501049f5d..cf4b1eccd 100644 --- a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossActionsBar.tsx @@ -14,8 +14,8 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withRealizedGainOrLoss from './withRealizedGainOrLoss'; -import withRealizedGainOrLossActions from './withRealizedGainOrLossActions'; +import { withRealizedGainOrLoss } from './withRealizedGainOrLoss'; +import { withRealizedGainOrLossActions } from './withRealizedGainOrLossActions'; import { compose, saveInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.tsx b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.tsx index bc882dad5..e9dfbc193 100644 --- a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/RealizedGainOrLossHeader.tsx @@ -10,8 +10,8 @@ import { FormattedMessage as T } from '@/components'; import FinancialStatementHeader from '../FinancialStatementHeader'; import RealizedGainOrLossGeneralPanel from './RealizedGainOrLossGeneralPanel'; -import withRealizedGainOrLoss from './withRealizedGainOrLoss'; -import withRealizedGainOrLossActions from './withRealizedGainOrLossActions'; +import { withRealizedGainOrLoss } from './withRealizedGainOrLoss'; +import { withRealizedGainOrLossActions } from './withRealizedGainOrLossActions'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.tsx b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.tsx index d96f8711f..2f07d15ab 100644 --- a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.tsx +++ b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLoss.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getRealizedGainOrLossFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withRealizedGainOrLoss = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { realizedGainOrLossDrawerFilter: getRealizedGainOrLossFilterDrawer(state), diff --git a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.tsx b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.tsx index fc1fb637e..8d7a68132 100644 --- a/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/RealizedGainOrLoss/withRealizedGainOrLossActions.tsx @@ -7,4 +7,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(toggleRealizedGainOrLossFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withRealizedGainOrLossActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItems.tsx b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItems.tsx index 56fe27028..0dd98278f 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItems.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItems.tsx @@ -9,7 +9,7 @@ import { FinancialStatement, DashboardPageContent } from '@/components'; import SalesByItemsActionsBar from './SalesByItemsActionsBar'; import SalesByItemsHeader from './SalesByItemsHeader'; -import withSalesByItemsActions from './withSalesByItemsActions'; +import { withSalesByItemsActions } from './withSalesByItemsActions'; import { useSalesByItemsQuery } from './utils'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsActionsBar.tsx index 86231fd54..337a827d2 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsActionsBar.tsx @@ -14,13 +14,13 @@ import { DashboardActionsBar, Icon, FormattedMessage as T } from '@/components'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withSalesByItems from './withSalesByItems'; -import withSalesByItemsActions from './withSalesByItemsActions'; +import { withSalesByItems } from './withSalesByItems'; +import { withSalesByItemsActions } from './withSalesByItemsActions'; import { compose, saveInvoke } from '@/utils'; import { useSalesByItemsContext } from './SalesByItemProvider'; import { SalesByItemsSheetExportMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; function SalesByItemsActionsBar({ diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsBody.tsx b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsBody.tsx index ef71d65a7..03fcd948e 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsBody.tsx @@ -7,7 +7,7 @@ import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { useSalesByItemsContext } from './SalesByItemProvider'; import SalesByItemsTable from './SalesByItemsTable'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.tsx b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.tsx index acdb67ee6..6b5e62f13 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesByItems/SalesByItemsHeader.tsx @@ -9,8 +9,8 @@ import { FormattedMessage as T } from '@/components'; import FinancialStatementHeader from '../FinancialStatementHeader'; import SalesByItemsHeaderGeneralPanel from './SalesByItemsHeaderGeneralPanel'; -import withSalesByItems from './withSalesByItems'; -import withSalesByItemsActions from './withSalesByItemsActions'; +import { withSalesByItems } from './withSalesByItems'; +import { withSalesByItemsActions } from './withSalesByItemsActions'; import { compose, transformToForm } from '@/utils'; import { diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItems.tsx b/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItems.tsx index adf12536f..bc76bfaaa 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItems.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItems.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getSalesByItemsFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withSalesByItems = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { salesByItemsDrawerFilter: getSalesByItemsFilterDrawer(state), diff --git a/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItemsActions.tsx b/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItemsActions.tsx index 6a7ac89a4..13c8140bb 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItemsActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesByItems/withSalesByItemsActions.tsx @@ -7,4 +7,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(toggleSalesByItemsFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withSalesByItemsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.tsx index ed4773cb4..0dc56fcf3 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.tsx @@ -11,7 +11,7 @@ import { SalesTaxLiabilitySummaryBoot } from './SalesTaxLiabilitySummaryBoot'; import { SalesTaxLiabilitySummaryBody } from './SalesTaxLiabilitySummaryBody'; import { useSalesTaxLiabilitySummaryQuery } from './utils'; import { SalesTaxLiabiltiyPdfDialog } from './SalesTaxLiabilityPdfDialog'; -import withSalesTaxLiabilitySummaryActions from './withSalesTaxLiabilitySummaryActions'; +import { withSalesTaxLiabilitySummaryActions } from './withSalesTaxLiabilitySummaryActions'; import { compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx index 1db166ebb..f3f04188b 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryActionsBar.tsx @@ -16,11 +16,11 @@ import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { compose, saveInvoke } from '@/utils'; import { useSalesTaxLiabilitySummaryContext } from './SalesTaxLiabilitySummaryBoot'; -import withSalesTaxLiabilitySummary from './withSalesTaxLiabilitySummary'; -import withSalesTaxLiabilitySummaryActions from './withSalesTaxLiabilitySummaryActions'; +import { withSalesTaxLiabilitySummary } from './withSalesTaxLiabilitySummary'; +import { withSalesTaxLiabilitySummaryActions } from './withSalesTaxLiabilitySummaryActions'; import { SalesTaxLiabilityExportMenu } from './components'; import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Sales tax liability summary - actions bar. diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx index 8e13e5e5e..bab258d40 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryHeader.tsx @@ -14,8 +14,8 @@ import { getDefaultSalesTaxLiablitySummaryQuery, getSalesTaxLiabilitySummaryQueryValidation, } from './utils'; -import withSalesTaxLiabilitySummary from './withSalesTaxLiabilitySummary'; -import withSalesTaxLiabilitySummaryActions from './withSalesTaxLiabilitySummaryActions'; +import { withSalesTaxLiabilitySummary } from './withSalesTaxLiabilitySummary'; +import { withSalesTaxLiabilitySummaryActions } from './withSalesTaxLiabilitySummaryActions'; import { SalesTaxLiabilitySummaryHeaderGeneral } from './SalesTaxLiabilitySummaryHeaderGeneralPanel'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx index a78ee4a8c..c58566239 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx +++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryTable.tsx @@ -7,7 +7,7 @@ import { TableStyle } from '@/constants'; import { ReportDataTable, FinancialSheet } from '@/components'; import { defaultExpanderReducer, tableRowTypesToClassnames } from '@/utils'; import { useSalesTaxLiabilitySummaryContext } from './SalesTaxLiabilitySummaryBoot'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { useSalesTaxLiabilitySummaryColumns } from './utils'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummary.ts b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummary.ts index 32a5d1552..b3ce7eb24 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummary.ts +++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummary.ts @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getSalesTaxLiabilitySummaryFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withSalesTaxLiabilitySummary = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { salesTaxLiabilitySummaryFilter: diff --git a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummaryActions.ts b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummaryActions.ts index 5453b2aa4..0bc3eb571 100644 --- a/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummaryActions.ts +++ b/packages/webapp/src/containers/FinancialStatements/SalesTaxLiabilitySummary/withSalesTaxLiabilitySummaryActions.ts @@ -7,4 +7,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(toggleSalesTaxLiabilitySummaryFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withSalesTaxLiabilitySummaryActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.tsx index 08fc339da..d02a698f3 100644 --- a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.tsx @@ -14,9 +14,9 @@ import { DashboardActionsBar, FormattedMessage as T, Icon } from '@/components'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withTrialBalance from './withTrialBalance'; -import withTrialBalanceActions from './withTrialBalanceActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withTrialBalance } from './withTrialBalance'; +import { withTrialBalanceActions } from './withTrialBalanceActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, saveInvoke } from '@/utils'; import { useTrialBalanceSheetContext } from './TrialBalanceProvider'; import { TrialBalanceSheetExportMenu } from './components'; diff --git a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.tsx b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.tsx index ada9e5d73..d3514992a 100644 --- a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.tsx +++ b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheet.tsx @@ -14,7 +14,7 @@ import { TrialBalanceSheetLoadingBar, } from './components'; -import withTrialBalanceActions from './withTrialBalanceActions'; +import { withTrialBalanceActions } from './withTrialBalanceActions'; import { compose } from '@/utils'; import { TrialBalanceSheetDialogs } from './TrialBalanceSheetDialogs'; diff --git a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetBody.tsx b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetBody.tsx index b27ac6647..de857dc30 100644 --- a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetBody.tsx @@ -7,7 +7,7 @@ import { FinancialReportBody } from '../FinancialReportPage'; import { useTrialBalanceSheetContext } from './TrialBalanceProvider'; import TrialBalanceSheetTable from './TrialBalanceSheetTable'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Trial balance sheet body. diff --git a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.tsx b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.tsx index 5fd7e61db..55b60f3de 100644 --- a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetHeader.tsx @@ -13,8 +13,8 @@ import FinancialStatementHeader from '../FinancialStatementHeader'; import TrialBalanceSheetHeaderGeneralPanel from './TrialBalanceSheetHeaderGeneralPanel'; import TrialBalanceSheetHeaderDimensionsPanel from './TrialBalanceSheetHeaderDimensionsPanel'; -import withTrialBalance from './withTrialBalance'; -import withTrialBalanceActions from './withTrialBalanceActions'; +import { withTrialBalance } from './withTrialBalance'; +import { withTrialBalanceActions } from './withTrialBalanceActions'; import { compose, transformToForm } from '@/utils'; import { useFeatureCan } from '@/hooks/state'; diff --git a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalance.tsx b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalance.tsx index bfa47d3d0..89fca5d20 100644 --- a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalance.tsx +++ b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalance.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getTrialBalanceSheetFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withTrialBalance = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { trialBalanceDrawerFilter: getTrialBalanceSheetFilterDrawer(state), diff --git a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalanceActions.tsx b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalanceActions.tsx index eb2259b5a..b759ff8db 100644 --- a/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalanceActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/TrialBalanceSheet/withTrialBalanceActions.tsx @@ -7,4 +7,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(toggleTrialBalanceSheetFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withTrialBalanceActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.tsx b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.tsx index 2797a5f94..85eed958c 100644 --- a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.tsx +++ b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLoss.tsx @@ -8,8 +8,8 @@ import { UnrealizedGainOrLossLoadingBar } from './components'; import UnrealizedGainOrLossHeader from './UnrealizedGainOrLossHeader'; import UnrealizedGainOrLossActionsBar from './UnrealizedGainOrLossActionsBar'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; -import withUnrealizedGainOrLossActions from './withUnrealizedGainOrLossActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; +import { withUnrealizedGainOrLossActions } from './withUnrealizedGainOrLossActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.tsx index 9eab1e8c6..6b767ce65 100644 --- a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossActionsBar.tsx @@ -15,8 +15,8 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { useUnrealizedGainOrLossContext } from './UnrealizedGainOrLossProvider'; -import withUnrealizedGainOrLoss from './withUnrealizedGainOrLoss'; -import withUnrealizedGainOrLossActions from './withUnrealizedGainOrLossActions'; +import { withUnrealizedGainOrLoss } from './withUnrealizedGainOrLoss'; +import { withUnrealizedGainOrLossActions } from './withUnrealizedGainOrLossActions'; import { compose, saveInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.tsx b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.tsx index 7235b0fe1..ff0ec5fa4 100644 --- a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/UnrealizedGainOrLossHeader.tsx @@ -10,8 +10,8 @@ import { FormattedMessage as T } from '@/components'; import FinancialStatementHeader from '../FinancialStatementHeader'; import UnrealizedGainOrLossGeneralPanel from './UnrealizedGainOrLossGeneralPanel'; -import withUnrealizedGainOrLoss from './withUnrealizedGainOrLoss'; -import withUnrealizedGainOrLossActions from './withUnrealizedGainOrLossActions'; +import { withUnrealizedGainOrLoss } from './withUnrealizedGainOrLoss'; +import { withUnrealizedGainOrLossActions } from './withUnrealizedGainOrLossActions'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.tsx b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.tsx index b20584c5b..fefec7c9b 100644 --- a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.tsx +++ b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLoss.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getUnrealizedGainOrLossFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withUnrealizedGainOrLoss = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { unrealizedGainOrLossDrawerFilter: diff --git a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.tsx b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.tsx index 7516e6b6c..0e47adbfa 100644 --- a/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/UnrealizedGainOrLoss/withUnrealizedGainOrLossActions.tsx @@ -7,4 +7,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(toggleUnrealizedGainOrLossFilterDrawer(toggle)), }); -export default connect(null, mapDispatchToProps); +export const withUnrealizedGainOrLossActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.tsx index b23eb2503..2398eec6f 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummary.tsx @@ -11,7 +11,7 @@ import { VendorsBalanceSummaryProvider } from './VendorsBalanceSummaryProvider'; import { VendorsSummarySheetLoadingBar } from './components'; import { VendorBalanceSummaryBody } from './VendorsBalanceSummaryBody'; -import withVendorsBalanceSummaryActions from './withVendorsBalanceSummaryActions'; +import { withVendorsBalanceSummaryActions } from './withVendorsBalanceSummaryActions'; import { useVendorsBalanceSummaryQuery } from './utils'; import { VendorBalanceDialogs } from './VendorBalanceDialogs'; diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryActionsBar.tsx index cb950e183..26322b052 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryActionsBar.tsx @@ -14,13 +14,13 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; -import withVendorsBalanceSummary from './withVendorsBalanceSummary'; -import withVendorsBalanceSummaryActions from './withVendorsBalanceSummaryActions'; +import { withVendorsBalanceSummary } from './withVendorsBalanceSummary'; +import { withVendorsBalanceSummaryActions } from './withVendorsBalanceSummaryActions'; import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider'; import { saveInvoke, compose } from '@/utils'; import { VendorSummarySheetExportMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.tsx index 10d2fd86c..ebb8fd821 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryBody.tsx @@ -7,7 +7,7 @@ import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { FinancialReportBody } from '../FinancialReportPage'; import { useVendorsBalanceSummaryContext } from './VendorsBalanceSummaryProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Vendor balance summary body. diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeader.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeader.tsx index 038af2152..67def7b7b 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/VendorsBalanceSummaryHeader.tsx @@ -11,8 +11,8 @@ import { compose, transformToForm } from '@/utils'; import FinancialStatementHeader from '../FinancialStatementHeader'; import VendorsBalanceSummaryHeaderGeneral from './VendorsBalanceSummaryHeaderGeneral'; -import withVendorsBalanceSummary from './withVendorsBalanceSummary'; -import withVendorsBalanceSummaryActions from './withVendorsBalanceSummaryActions'; +import { withVendorsBalanceSummary } from './withVendorsBalanceSummary'; +import { withVendorsBalanceSummaryActions } from './withVendorsBalanceSummaryActions'; import { getVendorsBalanceQuerySchema } from './utils'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummary.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummary.tsx index 5c9c3f045..8ab99a6b3 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummary.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummary.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getVendorsBalanceSummaryFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withVendorsBalanceSummary = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { VendorsSummaryFilterDrawer: getVendorsBalanceSummaryFilterDrawer( diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummaryActions.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummaryActions.tsx index 7f5d9ddaa..13ddcf611 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummaryActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsBalanceSummary/withVendorsBalanceSummaryActions.tsx @@ -7,4 +7,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(toggleVendorsBalanceSummaryFilterDrawer(toggle)), }); -export default connect(null, mapActionsToProps); +export const withVendorsBalanceSummaryActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.tsx index 0f3178d00..0813517d6 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactions.tsx @@ -10,7 +10,7 @@ import { VendorsTransactionsLoadingBar } from './components'; import VendorsTransactionsHeader from './VendorsTransactionsHeader'; import VendorsTransactionsActionsBar from './VendorsTransactionsActionsBar'; -import withVendorsTransactionsActions from './withVendorsTransactionsActions'; +import { withVendorsTransactionsActions } from './withVendorsTransactionsActions'; import { compose } from '@/utils'; import { useVendorsTransactionsQuery } from './_utils'; diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsActionsBar.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsActionsBar.tsx index 52a2b7198..0ff7cc086 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsActionsBar.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsActionsBar.tsx @@ -15,12 +15,12 @@ import classNames from 'classnames'; import NumberFormatDropdown from '@/components/NumberFormatDropdown'; import { useVendorsTransactionsContext } from './VendorsTransactionsProvider'; -import withVendorsTransaction from './withVendorsTransaction'; -import withVendorsTransactionsActions from './withVendorsTransactionsActions'; +import { withVendorsTransaction } from './withVendorsTransaction'; +import { withVendorsTransactionsActions } from './withVendorsTransactionsActions'; import { compose, saveInvoke } from '@/utils'; import { VendorTransactionsExportMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.tsx index 020aa8abb..351909342 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsBody.tsx @@ -7,7 +7,7 @@ import { FinancialSheetSkeleton } from '@/components/FinancialSheet'; import { useVendorsTransactionsContext } from './VendorsTransactionsProvider'; import VendorsTransactionsTable from './VendorsTransactionsTable'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Vendors transactions body. diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeader.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeader.tsx index df32211c0..152ef3b7a 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeader.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/VendorsTransactionsHeader.tsx @@ -9,8 +9,8 @@ import { FormattedMessage as T } from '@/components'; import FinancialStatementHeader from '../FinancialStatementHeader'; import VendorsTransactionsHeaderGeneralPanel from './VendorsTransactionsHeaderGeneralPanel'; -import withVendorsTransaction from './withVendorsTransaction'; -import withVendorsTransactionsActions from './withVendorsTransactionsActions'; +import { withVendorsTransaction } from './withVendorsTransaction'; +import { withVendorsTransactionsActions } from './withVendorsTransactionsActions'; import { compose, transformToForm } from '@/utils'; import { diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransaction.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransaction.tsx index 2c74189f1..c9cc5688b 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransaction.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransaction.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getVendorsTransactionsFilterDrawer } from '@/store/financialStatement/financialStatements.selectors'; -export default (mapState) => { +export const withVendorsTransaction = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { vendorsTransactionsDrawerFilter: getVendorsTransactionsFilterDrawer( diff --git a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransactionsActions.tsx b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransactionsActions.tsx index 5b68d1c66..c9fa3f36e 100644 --- a/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransactionsActions.tsx +++ b/packages/webapp/src/containers/FinancialStatements/VendorsTransactions/withVendorsTransactionsActions.tsx @@ -7,4 +7,4 @@ const mapActionsToProps = (dispatch) => ({ dispatch(toggleVendorsTransactionsFilterDrawer(toggle)), }); -export default connect(null, mapActionsToProps); +export const withVendorsTransactionsActions = connect(null, mapActionsToProps); diff --git a/packages/webapp/src/containers/GlobalErrors/GlobalErrors.tsx b/packages/webapp/src/containers/GlobalErrors/GlobalErrors.tsx index 820cda84d..70e895801 100644 --- a/packages/webapp/src/containers/GlobalErrors/GlobalErrors.tsx +++ b/packages/webapp/src/containers/GlobalErrors/GlobalErrors.tsx @@ -3,8 +3,8 @@ import { Intent } from '@blueprintjs/core'; import intl from 'react-intl-universal'; import { AppToaster } from '@/components'; -import withGlobalErrors from './withGlobalErrors'; -import withGlobalErrorsActions from './withGlobalErrorsActions'; +import { withGlobalErrors } from './withGlobalErrors'; +import { withGlobalErrorsActions } from './withGlobalErrorsActions'; import { compose } from '@/utils'; let toastKeySessionExpired; diff --git a/packages/webapp/src/containers/GlobalErrors/withGlobalErrors.tsx b/packages/webapp/src/containers/GlobalErrors/withGlobalErrors.tsx index 49039d72f..02c26fa59 100644 --- a/packages/webapp/src/containers/GlobalErrors/withGlobalErrors.tsx +++ b/packages/webapp/src/containers/GlobalErrors/withGlobalErrors.tsx @@ -8,4 +8,4 @@ const mapStateToProps = (state) => { }; }; -export default connect(mapStateToProps); \ No newline at end of file +export const withGlobalErrors = connect(mapStateToProps); \ No newline at end of file diff --git a/packages/webapp/src/containers/GlobalErrors/withGlobalErrorsActions.tsx b/packages/webapp/src/containers/GlobalErrors/withGlobalErrorsActions.tsx index fbaa887a1..7712a987a 100644 --- a/packages/webapp/src/containers/GlobalErrors/withGlobalErrorsActions.tsx +++ b/packages/webapp/src/containers/GlobalErrors/withGlobalErrorsActions.tsx @@ -6,4 +6,4 @@ export const mapDispatchToProps = (dispatch) => ({ globalErrorsSet: (errors) => dispatch(setGlobalErrors(errors)), }); -export default connect(null, mapDispatchToProps); +export const withGlobalErrorsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Homepage/Homepage.tsx b/packages/webapp/src/containers/Homepage/Homepage.tsx index 7b8a0eb34..4f1678a08 100644 --- a/packages/webapp/src/containers/Homepage/Homepage.tsx +++ b/packages/webapp/src/containers/Homepage/Homepage.tsx @@ -4,8 +4,8 @@ import { DashboardInsider } from '@/components/Dashboard'; import HomepageContent from './HomepageContent'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentList.tsx b/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentList.tsx index 6790874d6..200a3d906 100644 --- a/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentList.tsx +++ b/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentList.tsx @@ -8,7 +8,7 @@ import { DashboardContentTable, DashboardPageContent } from '@/components'; import { InventoryAdjustmentsProvider } from './InventoryAdjustmentsProvider'; import InventoryAdjustmentTable from './InventoryAdjustmentTable'; -import withInventoryAdjustments from './withInventoryAdjustments'; +import { withInventoryAdjustments } from './withInventoryAdjustments'; import { compose, transformTableStateToQuery } from '@/utils'; diff --git a/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentTable.tsx b/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentTable.tsx index 190c939d7..f2ee04987 100644 --- a/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentTable.tsx +++ b/packages/webapp/src/containers/InventoryAdjustments/InventoryAdjustmentTable.tsx @@ -8,10 +8,10 @@ import { useMemorizedColumnsWidths } from '@/hooks'; import { useInventoryAdjustmentsColumns, ActionsMenu } from './components'; import { useInventoryAdjustmentsContext } from './InventoryAdjustmentsProvider'; -import withInventoryAdjustments from './withInventoryAdjustments'; -import withInventoryAdjustmentActions from './withInventoryAdjustmentActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withInventoryAdjustments } from './withInventoryAdjustments'; +import { withInventoryAdjustmentActions } from './withInventoryAdjustmentActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -26,7 +26,7 @@ function InventoryAdjustmentDataTable({ // #withInventoryAdjustments inventoryAdjustmentTableState, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -112,7 +112,7 @@ function InventoryAdjustmentDataTable({ } export default compose( - withAlertsActions, + withAlertActions, withInventoryAdjustmentActions, withDrawerActions, withInventoryAdjustments(({ inventoryAdjustmentTableState }) => ({ diff --git a/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustmentActions.tsx b/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustmentActions.tsx index c926ddaab..e87070e34 100644 --- a/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustmentActions.tsx +++ b/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustmentActions.tsx @@ -7,4 +7,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setInventoryAdjustmentsTableState(queries)), }); -export default connect(null, mapDispatchToProps); +export const withInventoryAdjustmentActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustments.tsx b/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustments.tsx index 41a80c49e..fa858ecdc 100644 --- a/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustments.tsx +++ b/packages/webapp/src/containers/InventoryAdjustments/withInventoryAdjustments.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getInventroyAdjsTableStateFactory } from '@/store/inventoryAdjustments/inventoryAdjustment.selector'; -export default (mapState) => { +export const withInventoryAdjustments = (mapState) => { const getInventoryAdjustmentTableState = getInventroyAdjsTableStateFactory(); const mapStateToProps = (state, props) => { diff --git a/packages/webapp/src/containers/Items/ItemFormBody.tsx b/packages/webapp/src/containers/Items/ItemFormBody.tsx index adbc19663..87ab384e2 100644 --- a/packages/webapp/src/containers/Items/ItemFormBody.tsx +++ b/packages/webapp/src/containers/Items/ItemFormBody.tsx @@ -16,7 +16,7 @@ import { import { FormattedMessage as T } from '@/components'; import { useItemFormContext } from './ItemFormProvider'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { ACCOUNT_PARENT_TYPE } from '@/constants/accountTypes'; import { sellDescriptionFieldShouldUpdate, diff --git a/packages/webapp/src/containers/Items/ItemFormInventorySection.tsx b/packages/webapp/src/containers/Items/ItemFormInventorySection.tsx index ce6874daf..d5763a4cb 100644 --- a/packages/webapp/src/containers/Items/ItemFormInventorySection.tsx +++ b/packages/webapp/src/containers/Items/ItemFormInventorySection.tsx @@ -8,7 +8,7 @@ import { Row, } from '@/components'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { accountsFieldShouldUpdate } from './utils'; import { ACCOUNT_TYPE } from '@/constants/accountTypes'; import { useItemFormContext } from './ItemFormProvider'; diff --git a/packages/webapp/src/containers/Items/ItemsActionsBar.tsx b/packages/webapp/src/containers/Items/ItemsActionsBar.tsx index 3c97aa3bb..1a4713ac0 100644 --- a/packages/webapp/src/containers/Items/ItemsActionsBar.tsx +++ b/packages/webapp/src/containers/Items/ItemsActionsBar.tsx @@ -29,11 +29,11 @@ import { useItemsListContext } from './ItemsListProvider'; import { useRefreshItems } from '@/hooks/query/items'; import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; -import withItems from './withItems'; -import withItemsActions from './withItemsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '../Dialog/withDialogActions'; +import { withItems } from './withItems'; +import { withItemsActions } from './withItemsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '../Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Items/ItemsDataTable.tsx b/packages/webapp/src/containers/Items/ItemsDataTable.tsx index d6416b89f..a3b59b45f 100644 --- a/packages/webapp/src/containers/Items/ItemsDataTable.tsx +++ b/packages/webapp/src/containers/Items/ItemsDataTable.tsx @@ -12,12 +12,12 @@ import { import ItemsEmptyStatus from './ItemsEmptyStatus'; -import withItemsActions from './withItemsActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withItems from './withItems'; +import { withItemsActions } from './withItemsActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withItems } from './withItems'; import { useItemsListContext } from './ItemsListProvider'; import { useItemsTableColumns, ItemsActionMenuList } from './components'; @@ -36,7 +36,7 @@ function ItemsDataTable({ // #withDialogAction openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -185,7 +185,7 @@ function ItemsDataTable({ export default compose( withItemsActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withSettings(({ itemsSettings }) => ({ diff --git a/packages/webapp/src/containers/Items/ItemsList.tsx b/packages/webapp/src/containers/Items/ItemsList.tsx index de6c10ea1..afa56b9c0 100644 --- a/packages/webapp/src/containers/Items/ItemsList.tsx +++ b/packages/webapp/src/containers/Items/ItemsList.tsx @@ -10,8 +10,8 @@ import { ItemsListProvider } from './ItemsListProvider'; import ItemsActionsBar from './ItemsActionsBar'; import ItemsDataTable from './ItemsDataTable'; -import withItems from './withItems'; -import withItemsActions from './withItemsActions'; +import { withItems } from './withItems'; +import { withItemsActions } from './withItemsActions'; /** * Items list. diff --git a/packages/webapp/src/containers/Items/ItemsUniversalSearch.tsx b/packages/webapp/src/containers/Items/ItemsUniversalSearch.tsx index 6da6498f3..62fc84cbf 100644 --- a/packages/webapp/src/containers/Items/ItemsUniversalSearch.tsx +++ b/packages/webapp/src/containers/Items/ItemsUniversalSearch.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import intl from 'react-intl-universal'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Items/ItemsViewsTabs.tsx b/packages/webapp/src/containers/Items/ItemsViewsTabs.tsx index 14d4739bf..0916ad944 100644 --- a/packages/webapp/src/containers/Items/ItemsViewsTabs.tsx +++ b/packages/webapp/src/containers/Items/ItemsViewsTabs.tsx @@ -4,8 +4,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; import { withRouter } from 'react-router-dom'; -import withItems from './withItems'; -import withItemsActions from './withItemsActions'; +import { withItems } from './withItems'; +import { withItemsActions } from './withItemsActions'; import { useItemsListContext } from './ItemsListProvider'; import { compose, transfromViewsToTabs } from '@/utils'; diff --git a/packages/webapp/src/containers/Items/withItem.tsx b/packages/webapp/src/containers/Items/withItem.tsx index e13d93b7d..83d13d982 100644 --- a/packages/webapp/src/containers/Items/withItem.tsx +++ b/packages/webapp/src/containers/Items/withItem.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getItemById } from '@/store/items/items.reducer'; -export default (mapState) => { +export const withItem = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { item: getItemById(state, props.itemId), diff --git a/packages/webapp/src/containers/Items/withItems.tsx b/packages/webapp/src/containers/Items/withItems.tsx index 26c720cdd..74635e72d 100644 --- a/packages/webapp/src/containers/Items/withItems.tsx +++ b/packages/webapp/src/containers/Items/withItems.tsx @@ -5,7 +5,7 @@ import { isItemsTableStateChangedFactory, } from '@/store/items/items.selectors'; -export default (mapState) => { +export const withItems = (mapState) => { const getItemsTableState = getItemsTableStateFactory(); const isItemsTableStateChanged = isItemsTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Items/withItemsActions.tsx b/packages/webapp/src/containers/Items/withItemsActions.tsx index dc5c82d6e..db82778f7 100644 --- a/packages/webapp/src/containers/Items/withItemsActions.tsx +++ b/packages/webapp/src/containers/Items/withItemsActions.tsx @@ -12,4 +12,4 @@ export const mapDispatchToProps = (dispatch) => ({ setItemsSelectedRows: (selectedRows) => dispatch(setItemsSelectedRows(selectedRows)), }); -export default connect(null, mapDispatchToProps); +export const withItemsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/ItemsCategories/ItemCategoriesList.tsx b/packages/webapp/src/containers/ItemsCategories/ItemCategoriesList.tsx index ae5289365..3750345ce 100644 --- a/packages/webapp/src/containers/ItemsCategories/ItemCategoriesList.tsx +++ b/packages/webapp/src/containers/ItemsCategories/ItemCategoriesList.tsx @@ -9,7 +9,7 @@ import { ItemsCategoriesProvider } from './ItemsCategoriesProvider'; import ItemCategoriesTable from './ItemCategoriesTable'; import ItemsCategoryActionsBar from './ItemsCategoryActionsBar'; -import withItemsCategories from './withItemCategories'; +import { withItemsCategories } from './withItemCategories'; /** * Item categories list. diff --git a/packages/webapp/src/containers/ItemsCategories/ItemCategoriesTable.tsx b/packages/webapp/src/containers/ItemsCategories/ItemCategoriesTable.tsx index 3972d46e4..26a81da05 100644 --- a/packages/webapp/src/containers/ItemsCategories/ItemCategoriesTable.tsx +++ b/packages/webapp/src/containers/ItemsCategories/ItemCategoriesTable.tsx @@ -7,8 +7,8 @@ import { DataTable, TableSkeletonRows } from '@/components'; import { useItemsCategoriesContext } from './ItemsCategoriesProvider'; import { useItemsCategoriesTableColumns, ActionMenuList } from './components'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/ItemsCategories/ItemsCategoryActionsBar.tsx b/packages/webapp/src/containers/ItemsCategories/ItemsCategoryActionsBar.tsx index cdbee605b..f07ca7d2d 100644 --- a/packages/webapp/src/containers/ItemsCategories/ItemsCategoryActionsBar.tsx +++ b/packages/webapp/src/containers/ItemsCategories/ItemsCategoryActionsBar.tsx @@ -15,10 +15,10 @@ import { DashboardActionsBar, } from '@/components'; -import withItemCategories from './withItemCategories'; -import withItemCategoriesActions from './withItemCategoriesActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withItemCategories } from './withItemCategories'; +import { withItemCategoriesActions } from './withItemCategoriesActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; import { useItemsCategoriesContext } from './ItemsCategoriesProvider'; diff --git a/packages/webapp/src/containers/ItemsCategories/withItemCategories.tsx b/packages/webapp/src/containers/ItemsCategories/withItemCategories.tsx index b2dd6a9f6..af80fbeb9 100644 --- a/packages/webapp/src/containers/ItemsCategories/withItemCategories.tsx +++ b/packages/webapp/src/containers/ItemsCategories/withItemCategories.tsx @@ -4,7 +4,7 @@ import { getItemsCategoriesTableStateFactory, } from '@/store/itemCategories/ItemsCategories.selectors'; -export default (mapState) => { +export const withItemCategories = (mapState) => { const getItemsCategoriesTableState = getItemsCategoriesTableStateFactory(); const mapStateToProps = (state, props) => { @@ -15,3 +15,5 @@ export default (mapState) => { }; return connect(mapStateToProps); }; + +export const withItemsCategories = withItemCategories; diff --git a/packages/webapp/src/containers/ItemsCategories/withItemCategoriesActions.tsx b/packages/webapp/src/containers/ItemsCategories/withItemCategoriesActions.tsx index 751e5bf0f..59453d4ef 100644 --- a/packages/webapp/src/containers/ItemsCategories/withItemCategoriesActions.tsx +++ b/packages/webapp/src/containers/ItemsCategories/withItemCategoriesActions.tsx @@ -7,4 +7,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(setItemsCategoriesTableState(state)), }); -export default connect(null, mapDispatchToProps); +export const withItemCategoriesActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/ItemsCategories/withItemCategoryDetail.tsx b/packages/webapp/src/containers/ItemsCategories/withItemCategoryDetail.tsx index 36ccc7de7..03b896bdb 100644 --- a/packages/webapp/src/containers/ItemsCategories/withItemCategoryDetail.tsx +++ b/packages/webapp/src/containers/ItemsCategories/withItemCategoryDetail.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getItemCategoryByIdFactory } from '@/store/itemCategories/ItemsCategories.selectors'; -export default () => { +export const withItemCategoryDetail = () => { const getCategoryId = getItemCategoryByIdFactory(); const mapStateToProps = (state, props) => { diff --git a/packages/webapp/src/containers/JournalEntriesTable/JournalEntriesTable.tsx b/packages/webapp/src/containers/JournalEntriesTable/JournalEntriesTable.tsx index 436ccd3c4..0175bba56 100644 --- a/packages/webapp/src/containers/JournalEntriesTable/JournalEntriesTable.tsx +++ b/packages/webapp/src/containers/JournalEntriesTable/JournalEntriesTable.tsx @@ -7,7 +7,7 @@ import * as R from 'ramda'; import { DataTable, CurrencyTag, TableSkeletonRows } from '@/components'; import { TableStyle } from '@/constants'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { useGLEntriesTableColumns } from './utils'; /** diff --git a/packages/webapp/src/containers/Media/withMediaActions.tsx b/packages/webapp/src/containers/Media/withMediaActions.tsx index b89847038..d81c29906 100644 --- a/packages/webapp/src/containers/Media/withMediaActions.tsx +++ b/packages/webapp/src/containers/Media/withMediaActions.tsx @@ -10,4 +10,4 @@ export const mapDispatchToProps = (dispatch) => ({ requestDeleteMedia: (ids) => dispatch(deleteMedia({ ids })), }); -export default connect(null, mapDispatchToProps); \ No newline at end of file +export const withMediaActions = connect(null, mapDispatchToProps); \ No newline at end of file diff --git a/packages/webapp/src/containers/Organization/withCurrentOrganization.tsx b/packages/webapp/src/containers/Organization/withCurrentOrganization.tsx index 9322b48d5..c86f164c3 100644 --- a/packages/webapp/src/containers/Organization/withCurrentOrganization.tsx +++ b/packages/webapp/src/containers/Organization/withCurrentOrganization.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getCurrentOrganizationFactory } from '@/store/authentication/authentication.selectors'; -export default (mapState) => { +export const withCurrentOrganization = (mapState) => { const getCurrentOrganization = getCurrentOrganizationFactory(); const mapStateToProps = (state, props) => { diff --git a/packages/webapp/src/containers/Organization/withOrganization.tsx b/packages/webapp/src/containers/Organization/withOrganization.tsx index a432410aa..6fca8bba6 100644 --- a/packages/webapp/src/containers/Organization/withOrganization.tsx +++ b/packages/webapp/src/containers/Organization/withOrganization.tsx @@ -9,7 +9,7 @@ import { isOrganizationBuildRunningFactory } from '@/store/organizations/organizations.selectors'; -export default (mapState) => { +export const withOrganization = (mapState) => { const getOrganizationById = getOrganizationByIdFactory(); const isOrganizationReady = isOrganizationReadyFactory(); const isOrganizationBuilt = isOrganizationBuiltFactory(); diff --git a/packages/webapp/src/containers/Organization/withOrganizationActions.tsx b/packages/webapp/src/containers/Organization/withOrganizationActions.tsx index ecf30297b..1e981ed83 100644 --- a/packages/webapp/src/containers/Organization/withOrganizationActions.tsx +++ b/packages/webapp/src/containers/Organization/withOrganizationActions.tsx @@ -9,4 +9,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setOrganizationSetupCompleted(congrats)), }); -export default connect(null, mapDispatchToProps); +export const withOrganizationActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/PaymentPortal/drawers/PaymentInvoicePreviewDrawer/PaymentInvoicePreviewDrawer.tsx b/packages/webapp/src/containers/PaymentPortal/drawers/PaymentInvoicePreviewDrawer/PaymentInvoicePreviewDrawer.tsx index 346dc5468..c6b51a34c 100644 --- a/packages/webapp/src/containers/PaymentPortal/drawers/PaymentInvoicePreviewDrawer/PaymentInvoicePreviewDrawer.tsx +++ b/packages/webapp/src/containers/PaymentPortal/drawers/PaymentInvoicePreviewDrawer/PaymentInvoicePreviewDrawer.tsx @@ -3,7 +3,7 @@ import React from 'react'; import * as R from 'ramda'; import { Position } from '@blueprintjs/core'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { PaymentInvoicePreviewContent } from './PaymentInvoicePreviewContent'; /** diff --git a/packages/webapp/src/containers/Preferences/Accountant/AccountantFormPage.tsx b/packages/webapp/src/containers/Preferences/Accountant/AccountantFormPage.tsx index 7b83add3c..00fc995ad 100644 --- a/packages/webapp/src/containers/Preferences/Accountant/AccountantFormPage.tsx +++ b/packages/webapp/src/containers/Preferences/Accountant/AccountantFormPage.tsx @@ -7,8 +7,8 @@ import { Intent } from '@blueprintjs/core'; import { flatten, unflatten } from 'flat'; import { AppToaster } from '@/components'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import AccountantForm from './AccountantForm'; import { AccountantSchema } from './Accountant.schema'; diff --git a/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeys.tsx b/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeys.tsx index cf408e0c9..6758c12ef 100644 --- a/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeys.tsx +++ b/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeys.tsx @@ -6,7 +6,7 @@ import styled from 'styled-components'; import { Card } from '@/components'; import { CLASSES } from '@/constants/classes'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import ApiKeysDataTable from './ApiKeysDataTable'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysActions.tsx b/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysActions.tsx index 5916cdd2b..e79fa4fb2 100644 --- a/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysActions.tsx +++ b/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysActions.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { Button, Intent } from '@blueprintjs/core'; import { Icon, FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function ApiKeysActions({ openDialog, closeDialog }) { diff --git a/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysDataTable.tsx b/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysDataTable.tsx index 0c3ff5958..9c9468440 100644 --- a/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysDataTable.tsx +++ b/packages/webapp/src/containers/Preferences/ApiKeys/ApiKeysDataTable.tsx @@ -3,8 +3,8 @@ import React, { useCallback } from 'react'; import { compose } from '@/utils'; import { DataTable, TableSkeletonRows, AppToaster } from '@/components'; import { useApiKeys, useRevokeApiKey } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { ActionsMenu, useApiKeysTableColumns } from './components'; import { Intent } from '@blueprintjs/core'; import intl from 'react-intl-universal'; diff --git a/packages/webapp/src/containers/Preferences/Branches/Branches.tsx b/packages/webapp/src/containers/Preferences/Branches/Branches.tsx index 99543405f..6d507f839 100644 --- a/packages/webapp/src/containers/Preferences/Branches/Branches.tsx +++ b/packages/webapp/src/containers/Preferences/Branches/Branches.tsx @@ -5,7 +5,7 @@ import intl from 'react-intl-universal'; import BranchesDataTable from './BranchesDataTable'; import BranchesEmptyStatus from './BranchesEmptyStatus'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { useBranchesContext } from './BranchesProvider'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/Branches/BranchesActions.tsx b/packages/webapp/src/containers/Preferences/Branches/BranchesActions.tsx index e9bcd9b77..73b003dc2 100644 --- a/packages/webapp/src/containers/Preferences/Branches/BranchesActions.tsx +++ b/packages/webapp/src/containers/Preferences/Branches/BranchesActions.tsx @@ -4,7 +4,7 @@ import { Button, Intent } from '@blueprintjs/core'; import { Features } from '@/constants'; import { FeatureCan, FormattedMessage as T, Icon } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function BranchesActions({ diff --git a/packages/webapp/src/containers/Preferences/Branches/BranchesDataTable.tsx b/packages/webapp/src/containers/Preferences/Branches/BranchesDataTable.tsx index efb077055..10adbde4e 100644 --- a/packages/webapp/src/containers/Preferences/Branches/BranchesDataTable.tsx +++ b/packages/webapp/src/containers/Preferences/Branches/BranchesDataTable.tsx @@ -11,8 +11,8 @@ import { useBranchesTableColumns, ActionsMenu } from './components'; import { useBranchesContext } from './BranchesProvider'; import { useMarkBranchAsPrimary } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/Branches/BranchesEmptyStatus.tsx b/packages/webapp/src/containers/Preferences/Branches/BranchesEmptyStatus.tsx index c57570f86..451f85d27 100644 --- a/packages/webapp/src/containers/Preferences/Branches/BranchesEmptyStatus.tsx +++ b/packages/webapp/src/containers/Preferences/Branches/BranchesEmptyStatus.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Button, Intent } from '@blueprintjs/core'; import { FormattedMessage as T, EmptyStatus } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/Branding/PreferencesBrandingPage.tsx b/packages/webapp/src/containers/Preferences/Branding/PreferencesBrandingPage.tsx index 295f4a66e..5a35d5ae9 100644 --- a/packages/webapp/src/containers/Preferences/Branding/PreferencesBrandingPage.tsx +++ b/packages/webapp/src/containers/Preferences/Branding/PreferencesBrandingPage.tsx @@ -8,7 +8,7 @@ import { PreferencesBrandingFormContent, PreferencesBrandingFormFooter, } from './PreferencesBrandingFormContent'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; function PreferencesBrandingPageRoot({ changePreferencesPageTitle }) { useEffect(() => { diff --git a/packages/webapp/src/containers/Preferences/CreditNotes/PreferencesCreditNotesFormPage.tsx b/packages/webapp/src/containers/Preferences/CreditNotes/PreferencesCreditNotesFormPage.tsx index 4fc3956c8..5c917cb92 100644 --- a/packages/webapp/src/containers/Preferences/CreditNotes/PreferencesCreditNotesFormPage.tsx +++ b/packages/webapp/src/containers/Preferences/CreditNotes/PreferencesCreditNotesFormPage.tsx @@ -8,10 +8,10 @@ import { Intent } from '@blueprintjs/core'; import { AppToaster } from '@/components'; import { PreferencesCreditNotesFormSchema } from './PreferencesCreditNotesForm.schema'; import { PreferencesCreditNotesForm } from './PreferencesCreditNotesForm'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose, transformToForm, transfromToSnakeCase } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { transferObjectOptionsToArray } from '../Accountant/utils'; import { useSaveSettings } from '@/hooks/query'; diff --git a/packages/webapp/src/containers/Preferences/Currencies/CurrenciesActions.tsx b/packages/webapp/src/containers/Preferences/Currencies/CurrenciesActions.tsx index 4340f504d..5292fc956 100644 --- a/packages/webapp/src/containers/Preferences/Currencies/CurrenciesActions.tsx +++ b/packages/webapp/src/containers/Preferences/Currencies/CurrenciesActions.tsx @@ -3,7 +3,7 @@ import React, { useCallback } from 'react'; import { Button, Intent } from '@blueprintjs/core'; import { compose } from '@/utils'; import { Icon, FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; function CurrenciesActions({ openDialog }) { const handleClickNewCurrency = useCallback(() => { diff --git a/packages/webapp/src/containers/Preferences/Currencies/CurrenciesDataTable.tsx b/packages/webapp/src/containers/Preferences/Currencies/CurrenciesDataTable.tsx index 2777f8656..919ab4d58 100644 --- a/packages/webapp/src/containers/Preferences/Currencies/CurrenciesDataTable.tsx +++ b/packages/webapp/src/containers/Preferences/Currencies/CurrenciesDataTable.tsx @@ -8,8 +8,8 @@ import { useCurrenciesContext } from './CurrenciesProvider'; import { ActionMenuList, useCurrenciesTableColumns } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import styled from 'styled-components'; /** diff --git a/packages/webapp/src/containers/Preferences/Currencies/CurrenciesList.tsx b/packages/webapp/src/containers/Preferences/Currencies/CurrenciesList.tsx index 600a65094..30efc934d 100644 --- a/packages/webapp/src/containers/Preferences/Currencies/CurrenciesList.tsx +++ b/packages/webapp/src/containers/Preferences/Currencies/CurrenciesList.tsx @@ -5,7 +5,7 @@ import intl from 'react-intl-universal'; import { CurrenciesProvider } from './CurrenciesProvider'; import CurrenciesDataTable from './CurrenciesDataTable'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/Estimates/PreferencesEstimatesFormPage.tsx b/packages/webapp/src/containers/Preferences/Estimates/PreferencesEstimatesFormPage.tsx index 39d849ed3..fd47cd3f9 100644 --- a/packages/webapp/src/containers/Preferences/Estimates/PreferencesEstimatesFormPage.tsx +++ b/packages/webapp/src/containers/Preferences/Estimates/PreferencesEstimatesFormPage.tsx @@ -8,8 +8,8 @@ import * as R from 'ramda'; import { AppToaster } from '@/components'; import { PreferencesEstimatesFormSchema } from './PreferencesEstimatesForm.schema'; import { PreferencesEstimatesForm } from './PreferencesEstimatesForm'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { transferObjectOptionsToArray } from '../Accountant/utils'; import { compose, transformToForm, transfromToSnakeCase } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/General/GeneralFormPage.tsx b/packages/webapp/src/containers/Preferences/General/GeneralFormPage.tsx index 556c23791..131145af5 100644 --- a/packages/webapp/src/containers/Preferences/General/GeneralFormPage.tsx +++ b/packages/webapp/src/containers/Preferences/General/GeneralFormPage.tsx @@ -10,7 +10,7 @@ import { AppToaster } from '@/components'; import GeneralForm from './GeneralForm'; import { PreferencesGeneralSchema } from './General.schema'; import { useGeneralFormContext } from './GeneralFormProvider'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/Invoices/PreferencesInvoiceFormPage.tsx b/packages/webapp/src/containers/Preferences/Invoices/PreferencesInvoiceFormPage.tsx index 097b8f996..5f7ee8eae 100644 --- a/packages/webapp/src/containers/Preferences/Invoices/PreferencesInvoiceFormPage.tsx +++ b/packages/webapp/src/containers/Preferences/Invoices/PreferencesInvoiceFormPage.tsx @@ -8,10 +8,10 @@ import * as R from 'ramda'; import { AppToaster } from '@/components'; import { PreferencesInvoiceFormSchema } from './PreferencesInvoiceForm.schema'; import { PreferencesInvoicesForm } from './PreferencesInvoicesForm'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose, transformToForm, transfromToSnakeCase } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { transferObjectOptionsToArray } from '../Accountant/utils'; import { useSaveSettings } from '@/hooks/query'; diff --git a/packages/webapp/src/containers/Preferences/Item/ItemPreferencesFormPage.tsx b/packages/webapp/src/containers/Preferences/Item/ItemPreferencesFormPage.tsx index 6cc999a67..4af832cab 100644 --- a/packages/webapp/src/containers/Preferences/Item/ItemPreferencesFormPage.tsx +++ b/packages/webapp/src/containers/Preferences/Item/ItemPreferencesFormPage.tsx @@ -9,8 +9,8 @@ import { ItemPreferencesSchema } from './ItemPreferences.schema'; import ItemPreferencesForm from './ItemPreferencesForm'; import { useItemPreferencesFormContext } from './ItemPreferencesFormProvider'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose, optionsMapToArray, diff --git a/packages/webapp/src/containers/Preferences/PaymentMethods/alerts/DeleteStripeConnectionAlert.tsx b/packages/webapp/src/containers/Preferences/PaymentMethods/alerts/DeleteStripeConnectionAlert.tsx index 180b2e44c..dcc6b8a00 100644 --- a/packages/webapp/src/containers/Preferences/PaymentMethods/alerts/DeleteStripeConnectionAlert.tsx +++ b/packages/webapp/src/containers/Preferences/PaymentMethods/alerts/DeleteStripeConnectionAlert.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useDeletePaymentMethod } from '@/hooks/query/payment-services'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/PaymentMethods/drawers/StripeIntegrationEditDrawer.tsx b/packages/webapp/src/containers/Preferences/PaymentMethods/drawers/StripeIntegrationEditDrawer.tsx index 6a31e4e65..e70f96edc 100644 --- a/packages/webapp/src/containers/Preferences/PaymentMethods/drawers/StripeIntegrationEditDrawer.tsx +++ b/packages/webapp/src/containers/Preferences/PaymentMethods/drawers/StripeIntegrationEditDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const StripeIntegrationEditContent = React.lazy(() => import('./StripeIntegrationEditContent').then((module) => ({ diff --git a/packages/webapp/src/containers/Preferences/Receipts/PreferencesReceiptsFormPage.tsx b/packages/webapp/src/containers/Preferences/Receipts/PreferencesReceiptsFormPage.tsx index f5da0d06a..7d1ad827b 100644 --- a/packages/webapp/src/containers/Preferences/Receipts/PreferencesReceiptsFormPage.tsx +++ b/packages/webapp/src/containers/Preferences/Receipts/PreferencesReceiptsFormPage.tsx @@ -8,10 +8,10 @@ import * as R from 'ramda'; import { AppToaster } from '@/components'; import { PreferencesReceiptsFormSchema } from './PreferencesReceiptsForm.schema'; import { PreferencesReceiptsForm } from './PreferencesReceiptsForm'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose, transformToForm, transfromToSnakeCase } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useSaveSettings } from '@/hooks/query'; import { transferObjectOptionsToArray } from '../Accountant/utils'; diff --git a/packages/webapp/src/containers/Preferences/SMSIntegration/SMSIntegrationTabs.tsx b/packages/webapp/src/containers/Preferences/SMSIntegration/SMSIntegrationTabs.tsx index 1b8e4400f..9416ad712 100644 --- a/packages/webapp/src/containers/Preferences/SMSIntegration/SMSIntegrationTabs.tsx +++ b/packages/webapp/src/containers/Preferences/SMSIntegration/SMSIntegrationTabs.tsx @@ -11,7 +11,7 @@ import { Card } from '@/components'; import '@/style/pages/Preferences/SMSIntegration.scss'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/SMSIntegration/SMSMessagesDataTable.tsx b/packages/webapp/src/containers/Preferences/SMSIntegration/SMSMessagesDataTable.tsx index f2926f19e..cfcde5e20 100644 --- a/packages/webapp/src/containers/Preferences/SMSIntegration/SMSMessagesDataTable.tsx +++ b/packages/webapp/src/containers/Preferences/SMSIntegration/SMSMessagesDataTable.tsx @@ -10,7 +10,7 @@ import { useSMSIntegrationTableColumns, ActionsMenu } from './components'; import { useSMSIntegrationContext } from './SMSIntegrationProvider'; import { useSettingEditSMSNotification } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Preferences/Users/Roles/RolesForm/RolesForm.tsx b/packages/webapp/src/containers/Preferences/Users/Roles/RolesForm/RolesForm.tsx index c6565b961..f51539cbd 100644 --- a/packages/webapp/src/containers/Preferences/Users/Roles/RolesForm/RolesForm.tsx +++ b/packages/webapp/src/containers/Preferences/Users/Roles/RolesForm/RolesForm.tsx @@ -11,7 +11,7 @@ import '@/style/pages/Preferences/Roles/Form.scss'; import { AppToaster, FormattedMessage as T } from '@/components'; import { CreateRolesFormSchema, EditRolesFormSchema } from './RolesForm.schema'; import { useRolesFormContext } from './RolesFormProvider'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import RolesFormContent from './RolesFormContent'; import { getNewRoleInitialValues, diff --git a/packages/webapp/src/containers/Preferences/Users/Roles/RolesLanding/RolesDataTable.tsx b/packages/webapp/src/containers/Preferences/Users/Roles/RolesLanding/RolesDataTable.tsx index c31ffb71c..c11d0e494 100644 --- a/packages/webapp/src/containers/Preferences/Users/Roles/RolesLanding/RolesDataTable.tsx +++ b/packages/webapp/src/containers/Preferences/Users/Roles/RolesLanding/RolesDataTable.tsx @@ -8,7 +8,7 @@ import { useHistory } from 'react-router-dom'; import { DataTable, AppToaster, TableSkeletonRows } from '@/components'; import { useRolesTableColumns, ActionsMenu } from './components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useRolesContext } from './RolesListProvider'; import { compose } from '@/utils'; @@ -17,7 +17,7 @@ import { compose } from '@/utils'; * Roles data table. */ function RolesDataTable({ - // #withAlertsActions + // #withAlertActions openAlert, }) { // History context. @@ -75,4 +75,4 @@ const RolesTable = styled(DataTable)` } `; -export default compose(withAlertsActions)(RolesDataTable); +export default compose(withAlertActions)(RolesDataTable); diff --git a/packages/webapp/src/containers/Preferences/Users/Users.tsx b/packages/webapp/src/containers/Preferences/Users/Users.tsx index a4c6901b6..d32a838e9 100644 --- a/packages/webapp/src/containers/Preferences/Users/Users.tsx +++ b/packages/webapp/src/containers/Preferences/Users/Users.tsx @@ -11,7 +11,7 @@ import { Card } from '@/components'; import { CLASSES } from '@/constants/classes'; import PreferencesSubContent from '@/components/Preferences/PreferencesSubContent'; -import withUserPreferences from '@/containers/Preferences/Users/withUserPreferences'; +import { withUserPreferences } from '@/containers/Preferences/Users/withUserPreferences'; /** * Preferences page - Users page. diff --git a/packages/webapp/src/containers/Preferences/Users/UsersActions.tsx b/packages/webapp/src/containers/Preferences/Users/UsersActions.tsx index 97d957693..bc8cb3e28 100644 --- a/packages/webapp/src/containers/Preferences/Users/UsersActions.tsx +++ b/packages/webapp/src/containers/Preferences/Users/UsersActions.tsx @@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'; import { Button, Intent } from '@blueprintjs/core'; import { Icon, FormattedMessage as T } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function UsersActions({ openDialog, closeDialog }) { diff --git a/packages/webapp/src/containers/Preferences/Users/UsersDataTable.tsx b/packages/webapp/src/containers/Preferences/Users/UsersDataTable.tsx index 1c023888b..058c822e5 100644 --- a/packages/webapp/src/containers/Preferences/Users/UsersDataTable.tsx +++ b/packages/webapp/src/containers/Preferences/Users/UsersDataTable.tsx @@ -5,8 +5,8 @@ import { compose } from '@/utils'; import { DataTable, TableSkeletonRows, AppToaster } from '@/components'; import { useResendInvitation } from '@/hooks/query'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { ActionsMenu, useUsersListColumns } from './components'; import { useUsersListContext } from './UsersProvider'; diff --git a/packages/webapp/src/containers/Preferences/Users/UsersList.tsx b/packages/webapp/src/containers/Preferences/Users/UsersList.tsx index fdd9282d0..322dafee5 100644 --- a/packages/webapp/src/containers/Preferences/Users/UsersList.tsx +++ b/packages/webapp/src/containers/Preferences/Users/UsersList.tsx @@ -3,7 +3,7 @@ import React, { useEffect } from 'react'; import intl from 'react-intl-universal'; import { UsersListProvider } from './UsersProvider'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import UsersDataTable from './UsersDataTable'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/Users/withUserPreferences.tsx b/packages/webapp/src/containers/Preferences/Users/withUserPreferences.tsx index d6454abd3..5c20dcda7 100644 --- a/packages/webapp/src/containers/Preferences/Users/withUserPreferences.tsx +++ b/packages/webapp/src/containers/Preferences/Users/withUserPreferences.tsx @@ -11,4 +11,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch({ type: t.CLOSE_DIALOG, name, payload }), }); -export default connect(null, mapDispatchToProps); +export const withUserPreferences = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Preferences/Warehouses/Warehouses.tsx b/packages/webapp/src/containers/Preferences/Warehouses/Warehouses.tsx index a631a4466..8f7be8a5c 100644 --- a/packages/webapp/src/containers/Preferences/Warehouses/Warehouses.tsx +++ b/packages/webapp/src/containers/Preferences/Warehouses/Warehouses.tsx @@ -5,7 +5,7 @@ import intl from 'react-intl-universal'; import '@/style/pages/Preferences/warehousesList.scss'; import WarehousesGrid from './WarehousesGrid'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Preferences/Warehouses/WarehousesActions.tsx b/packages/webapp/src/containers/Preferences/Warehouses/WarehousesActions.tsx index 02916147e..8dbdb3c06 100644 --- a/packages/webapp/src/containers/Preferences/Warehouses/WarehousesActions.tsx +++ b/packages/webapp/src/containers/Preferences/Warehouses/WarehousesActions.tsx @@ -4,7 +4,7 @@ import { Button, Intent } from '@blueprintjs/core'; import { Features } from '@/constants'; import { FeatureCan, FormattedMessage as T, Icon } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.tsx b/packages/webapp/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.tsx index 7cb8e6ae8..0abaab5ca 100644 --- a/packages/webapp/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.tsx +++ b/packages/webapp/src/containers/Preferences/Warehouses/WarehousesEmptyStatus.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { Button, Intent } from '@blueprintjs/core'; import { FormattedMessage as T, EmptyStatus } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Preferences/Warehouses/WarehousesGridItems.tsx b/packages/webapp/src/containers/Preferences/Warehouses/WarehousesGridItems.tsx index 06bf2b5c8..6a711d67f 100644 --- a/packages/webapp/src/containers/Preferences/Warehouses/WarehousesGridItems.tsx +++ b/packages/webapp/src/containers/Preferences/Warehouses/WarehousesGridItems.tsx @@ -8,15 +8,15 @@ import { AppToaster } from '@/components'; import { WarehouseContextMenu, WarehousesGridItemBox } from './components'; import { useMarkWarehouseAsPrimary } from '@/hooks/query'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** * warehouse grid item. */ function WarehouseGridItem({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDialogActions @@ -70,7 +70,7 @@ function WarehouseGridItem({ } const WarehousesGridItem = compose( - withAlertsActions, + withAlertActions, withDialogActions, )(WarehouseGridItem); diff --git a/packages/webapp/src/containers/Projects/components/ProjectBillableEntriesLink.tsx b/packages/webapp/src/containers/Projects/components/ProjectBillableEntriesLink.tsx index bf58e96d8..10777cefa 100644 --- a/packages/webapp/src/containers/Projects/components/ProjectBillableEntriesLink.tsx +++ b/packages/webapp/src/containers/Projects/components/ProjectBillableEntriesLink.tsx @@ -4,7 +4,7 @@ import styled from 'styled-components'; import * as R from 'ramda'; import { ButtonLink } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; function ProjectBillableEntriesLinkComponent({ // #ownProps diff --git a/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseForm.tsx b/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseForm.tsx index bb195cbbf..ce48567c2 100644 --- a/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseForm.tsx +++ b/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseForm.tsx @@ -4,7 +4,7 @@ import { Formik } from 'formik'; import { AppToaster } from '@/components'; import { CreateEstimatedExpenseFormSchema } from './EstimatedExpense.schema'; import EstimatedExpenseFormConent from './EstimatedExpenseFormConent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; const defaultInitialValues = { diff --git a/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseFormFloatingActions.tsx b/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseFormFloatingActions.tsx index 14b8faf30..8c55e976c 100644 --- a/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/EstimatedExpenseFormDialog/EstimatedExpenseFormFloatingActions.tsx @@ -4,7 +4,7 @@ import { useFormikContext } from 'formik'; import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useEstimatedExpenseFormContext } from './EstimatedExpenseFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectDeleteAlert.tsx b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectDeleteAlert.tsx index 21d3d4ab4..86e6cf59a 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectDeleteAlert.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectDeleteAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster } from '@/components'; import { useDeleteProject } from '../../hooks'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectStatusAlert.tsx b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectStatusAlert.tsx index 88bb0c33b..575f117f4 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectStatusAlert.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectStatusAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster } from '@/components'; import { useProjectStatus } from '../../hooks'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTaskDeleteAlert.tsx b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTaskDeleteAlert.tsx index caa34df0a..7847c8836 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTaskDeleteAlert.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTaskDeleteAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster } from '@/components'; import { useDeleteProjectTask } from '../../hooks'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTimesheetDeleteAlert.tsx b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTimesheetDeleteAlert.tsx index ab9c08399..54533a04e 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTimesheetDeleteAlert.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectAlerts/ProjectTimesheetDeleteAlert.tsx @@ -6,8 +6,8 @@ import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster } from '@/components'; import { useDeleteProjectTimeEntry } from '../../hooks'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx b/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx index e10b46d3a..e8f86bf19 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesForm.tsx @@ -6,7 +6,7 @@ import { Formik } from 'formik'; import { AppToaster } from '@/components'; import { ProjectBillableEntriesFormSchema } from './ProjectBillableEntriesForm.schema'; import ProjectBillableEntriesFormContent from './ProjectBillableEntriesFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx b/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx index 93fa70837..596ed294d 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectBillableEntriesFormDialog/ProjectBillableEntriesFormFloatingActions.tsx @@ -6,7 +6,7 @@ import { useFormikContext } from 'formik'; import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useProjectBillableEntriesFormContext } from './ProjectBillableEntriesFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx index 74041c71d..0f030a094 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx @@ -15,9 +15,9 @@ import { DashboardActionsBar, } from '@/components'; import { ProjectTransactionsSelect } from './components'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { projectTranslations } from './common'; import { useProjectDetailContext } from './ProjectDetailProvider'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectPurchasesTable/ProjectPurchasesTable.tsx b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectPurchasesTable/ProjectPurchasesTable.tsx index 058989e19..0c87c544c 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectPurchasesTable/ProjectPurchasesTable.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectPurchasesTable/ProjectPurchasesTable.tsx @@ -10,7 +10,7 @@ import { TABLES } from '@/constants/tables'; import { useMemorizedColumnsWidths } from '@/hooks'; import { ActionMenu } from './components'; import { useProjectPurchasesColumns } from './hooks'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectSalesTable/ProjectSalesTable.tsx b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectSalesTable/ProjectSalesTable.tsx index cd3909dac..cae5c4363 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectSalesTable/ProjectSalesTable.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectSalesTable/ProjectSalesTable.tsx @@ -9,7 +9,7 @@ import { TABLES } from '@/constants/tables'; import { useMemorizedColumnsWidths } from '@/hooks'; import { ActionMenu } from './components'; import { useProjectSalesColumns } from './hooks'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTasks/ProjectTasksTable.tsx b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTasks/ProjectTasksTable.tsx index 70376c0c5..6476822b7 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTasks/ProjectTasksTable.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTasks/ProjectTasksTable.tsx @@ -11,9 +11,9 @@ import { ActionsMenu } from './components'; import { useProjectTaskColumns } from './hooks'; import { useMemorizedColumnsWidths } from '@/hooks'; import { useProjectTaskContext } from './ProjectTaskProvider'; -import withSettings from '@/containers/Settings/withSettings'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; @@ -23,7 +23,7 @@ function ProjectTaskTableRoot({ // #withDialog openDialog, - // #withAlertsActions + // #withAlertActions openAlert, }) { const { projectTasks } = useProjectTaskContext(); @@ -70,7 +70,7 @@ function ProjectTaskTableRoot({ } export const ProjectTasksTable = compose( - withAlertsActions, + withAlertActions, withDialogActions, withSettings(({ projectTasksSettings }) => ({ projectTasksTableSize: projectTasksSettings?.tableSize, diff --git a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx index 765b3da00..d3ba29460 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectDetails/ProjectTimeSheets/ProjectTimesheetsTable.tsx @@ -11,9 +11,9 @@ import { TABLES } from '@/constants/tables'; import { useProjectTimesheetColumns } from './hooks'; import { useMemorizedColumnsWidths } from '@/hooks'; import { useProjectTimesheetContext } from './ProjectTimesheetsProvider'; -import withSettings from '@/containers/Settings/withSettings'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; @@ -28,7 +28,7 @@ function ProjectTimesheetsTableRoot({ // #withDialog openDialog, - // #withAlertsActions + // #withAlertActions openAlert, }) { const { projectTimeEntries } = useProjectTimesheetContext(); @@ -70,7 +70,7 @@ function ProjectTimesheetsTableRoot({ ); } export const ProjectTimesheetsTable = compose( - withAlertsActions, + withAlertActions, withDialogActions, withSettings(({ timesheetsSettings }) => ({ timesheetsTableSize: timesheetsSettings?.tableSize, diff --git a/packages/webapp/src/containers/Projects/containers/ProjectDetails/index.tsx b/packages/webapp/src/containers/Projects/containers/ProjectDetails/index.tsx index 4f43717ea..19d434d1f 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectDetails/index.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectDetails/index.tsx @@ -5,7 +5,7 @@ import ProjectDetailActionsBar from './ProjectDetailActionsBar'; import ProjectDetailTabs from './ProjectDetailTabs'; import { DashboardPageContent } from '@/components'; import { ProjectDetailProvider } from './ProjectDetailProvider'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpenseForm.tsx b/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpenseForm.tsx index 219f2b559..800225a79 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpenseForm.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpenseForm.tsx @@ -7,7 +7,7 @@ import { AppToaster } from '@/components'; import { CreateProjectExpenseFormSchema } from './ProjectExpenseForm.schema'; import ProjectExpenseFormContent from './ProjectExpenseFormContent'; import { useProjectExpenseFormContext } from './ProjectExpenseFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpneseFormFloatingActions.tsx b/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpneseFormFloatingActions.tsx index 3d3348fe6..35cd4ffb8 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpneseFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectExpenseForm/ProjectExpneseFormFloatingActions.tsx @@ -4,7 +4,7 @@ import { useFormikContext } from 'formik'; import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useProjectExpenseFormContext } from './ProjectExpenseFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; function ProjectExpneseFormFloatingActions({ diff --git a/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectForm.tsx b/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectForm.tsx index 306c4d01d..345a5baf0 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectForm.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectForm.tsx @@ -8,7 +8,7 @@ import { AppToaster } from '@/components'; import ProjectFormContent from './ProjectFormContent'; import { CreateProjectFormSchema } from './ProjectForm.schema'; import { useProjectFormContext } from './ProjectFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectFormFloatingActions.tsx b/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectFormFloatingActions.tsx index 51577b2e3..c4080631c 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectFormDialog/ProjectFormFloatingActions.tsx @@ -4,7 +4,7 @@ import { useFormikContext } from 'formik'; import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useProjectFormContext } from './ProjectFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingForm.tsx b/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingForm.tsx index 7b7921479..665992928 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingForm.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingForm.tsx @@ -8,7 +8,7 @@ import { AppToaster } from '@/components'; import ProjectInvoicingFormContent from './ProjectInvoicingFormContent'; import { CreateProjectInvoicingFormSchema } from './ProjectInvoicingForm.schema'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingFormFloatingActions.tsx b/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingFormFloatingActions.tsx index a1450c5aa..68174692d 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectInvoicingFormDialog/ProjectInvoicingFormFloatingActions.tsx @@ -4,7 +4,7 @@ import { useFormikContext } from 'formik'; import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useProjectInvoicingFormContext } from './ProjectInvoicingFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx b/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx index 75cc6661e..65ce874a1 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx @@ -8,7 +8,7 @@ import { CreateProjectTaskFormSchema } from './ProjectTaskForm.schema'; import { useProjectTaskFormContext } from './ProjectTaskFormProvider'; import { compose, transformToForm } from '@/utils'; import ProjectTaskFormContent from './ProjectTaskFormContent'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; const defaultInitialValues = { name: '', diff --git a/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx b/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx index 55d51878e..d7055fb56 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx @@ -11,7 +11,7 @@ import { InputPrependText, } from '@/components'; import { EstimateAmount } from './utils'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFloatingActions.tsx b/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFloatingActions.tsx index f6037ac65..8b4954bd9 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFloatingActions.tsx @@ -4,7 +4,7 @@ import { useFormikContext } from 'formik'; import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useProjectTaskFormContext } from './ProjectTaskFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx b/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx index f373c5e70..b217dc5b8 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx @@ -9,7 +9,7 @@ import { AppToaster } from '@/components'; import ProjectTimeEntryFormContent from './ProjectTimeEntryFormContent'; import { CreateProjectTimeEntryFormSchema } from './ProjectTimeEntryForm.schema'; import { useProjectTimeEntryFormContext } from './ProjectTimeEntryFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose, transformToForm } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryFormFloatingActions.tsx b/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryFormFloatingActions.tsx index 6aca6347f..6c369e998 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryFormFloatingActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryFormFloatingActions.tsx @@ -4,7 +4,7 @@ import { useFormikContext } from 'formik'; import { Intent, Button, Classes } from '@blueprintjs/core'; import { FormattedMessage as T } from '@/components'; import { useProjectTimeEntryFormContext } from './ProjectTimeEntryFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsActionsBar.tsx b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsActionsBar.tsx index 4b44f2b4b..773ad9a89 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsActionsBar.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsActionsBar.tsx @@ -17,11 +17,11 @@ import { } from '@/components'; import { ProjectAction, AbilitySubject } from '@/constants/abilityOption'; -import withProjects from './withProjects'; -import withProjectsActions from './withProjectsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withProjects } from './withProjects'; +import { withProjectsActions } from './withProjectsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx index 33b40d1c1..b886c5401 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx @@ -12,10 +12,10 @@ import ProjectsEmptyStatus from './ProjectsEmptyStatus'; import { useProjectsListContext } from './ProjectsListProvider'; import { useMemorizedColumnsWidths } from '@/hooks'; import { useProjectsListColumns, ActionsMenu } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withProjectsActions from './withProjectsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withProjectsActions } from './withProjectsActions'; import { compose } from '@/utils'; @@ -27,7 +27,7 @@ function ProjectsDataTable({ // #withDial openDialog, - // #withAlertsActions + // #withAlertActions openAlert, // #withSettings @@ -121,7 +121,7 @@ function ProjectsDataTable({ export default compose( withDialogActions, - withAlertsActions, + withAlertActions, withProjectsActions, withSettings(({ projectSettings }) => ({ projectsTableSize: projectSettings?.tableSize, diff --git a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsEmptyStatus.tsx b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsEmptyStatus.tsx index de035df13..5ca80fa69 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsEmptyStatus.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsEmptyStatus.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { Button, Intent } from '@blueprintjs/core'; import { EmptyStatus, Can, FormattedMessage as T } from '@/components'; import { ProjectAction, AbilitySubject } from '@/constants/abilityOption'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsList.tsx b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsList.tsx index 140725be0..cac9de955 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsList.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsList.tsx @@ -6,8 +6,8 @@ import ProjectsActionsBar from './ProjectsActionsBar'; import ProjectsViewTabs from './ProjectsViewTabs'; import ProjectsDataTable from './ProjectsDataTable'; -import withProjects from './withProjects'; -import withProjectsActions from './withProjectsActions'; +import { withProjects } from './withProjects'; +import { withProjectsActions } from './withProjectsActions'; import { ProjectsListProvider } from './ProjectsListProvider'; import { compose, transformTableStateToQuery } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsViewTabs.tsx b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsViewTabs.tsx index 89498ce43..ae06c1a93 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsViewTabs.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/ProjectsViewTabs.tsx @@ -4,8 +4,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; -import withProjects from './withProjects'; -import withProjectsActions from './withProjectsActions'; +import { withProjects } from './withProjects'; +import { withProjectsActions } from './withProjectsActions'; import { useProjectsListContext } from './ProjectsListProvider'; import { compose, transfromViewsToTabs } from '@/utils'; diff --git a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjects.tsx b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjects.tsx index a74ed533b..44d8daf3a 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjects.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjects.tsx @@ -5,7 +5,7 @@ import { isProjectsTableStateChangedFactory, } from '@/store/Project/projects.selectors'; -export default (mapState) => { +export const withProjects = (mapState) => { const getProjectsTableState = getProjectsTableStateFactory(); const isProjectsTableStateChanged = isProjectsTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjectsActions.tsx b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjectsActions.tsx index af6f95106..9a38e79dd 100644 --- a/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjectsActions.tsx +++ b/packages/webapp/src/containers/Projects/containers/ProjectsLanding/withProjectsActions.tsx @@ -11,4 +11,4 @@ const mapDispatchToProps = (dispatch) => ({ resetProjectsTableState: () => dispatch(resetProjectsTableState()), }); -export default connect(null, mapDispatchToProps); +export const withProjectsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillForm.tsx b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillForm.tsx index 79db1314f..a1f81783d 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillForm.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillForm.tsx @@ -27,7 +27,7 @@ import { transformFormValuesToRequest, handleErrors, } from './utils'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { BillFormEntriesActions } from './BillFormEntriesActions'; /** diff --git a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormHeaderFields.tsx b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormHeaderFields.tsx index 0b90e6146..3924de301 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormHeaderFields.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormHeaderFields.tsx @@ -25,7 +25,7 @@ import { BillProjectSelectButton, } from './components'; import { ProjectsSelect } from '@/containers/Projects/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { momentFormatter, compose, diff --git a/packages/webapp/src/containers/Purchases/Bills/BillUniversalSearch.tsx b/packages/webapp/src/containers/Purchases/Bills/BillUniversalSearch.tsx index b76a7f688..b54ced67d 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillUniversalSearch.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillUniversalSearch.tsx @@ -8,7 +8,7 @@ import { T, Icon, Choose, If } from '@/components'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { AbilitySubject, BillAction } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; /** diff --git a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsActionsBar.tsx b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsActionsBar.tsx index 3e7e39193..f5b2a27f8 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsActionsBar.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsActionsBar.tsx @@ -24,11 +24,11 @@ import { } from '@/components'; import { BillAction, AbilitySubject } from '@/constants/abilityOption'; -import withBills from './withBills'; -import withBillsActions from './withBillsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withBills } from './withBills'; +import { withBillsActions } from './withBillsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useBillsListContext } from './BillsListProvider'; import { diff --git a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsList.tsx b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsList.tsx index 5afd9ffa3..c7002b025 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsList.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsList.tsx @@ -9,8 +9,8 @@ import { BillsListProvider } from './BillsListProvider'; import BillsActionsBar from './BillsActionsBar'; import BillsTable from './BillsTable'; -import withBills from './withBills'; -import withBillsActions from './withBillsActions'; +import { withBills } from './withBills'; +import { withBillsActions } from './withBillsActions'; import { transformTableStateToQuery, compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsTable.tsx b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsTable.tsx index fe57446c9..b65722022 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsTable.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsTable.tsx @@ -12,12 +12,12 @@ import { import BillsEmptyStatus from './BillsEmptyStatus'; -import withBills from './withBills'; -import withBillActions from './withBillsActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withBills } from './withBills'; +import { withBillActions } from './withBillsActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useBillsTableColumns, ActionsMenu } from './components'; import { useBillsListContext } from './BillsListProvider'; @@ -164,7 +164,7 @@ function BillsDataTable({ export default compose( withBills(({ billsTableState }) => ({ billsTableState })), withBillActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withSettings(({ billsettings }) => ({ diff --git a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsViewsTabs.tsx b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsViewsTabs.tsx index f79c53037..264b02e0a 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsViewsTabs.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/BillsViewsTabs.tsx @@ -5,8 +5,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; import { useBillsListContext } from './BillsListProvider'; -import withBills from './withBills'; -import withBillActions from './withBillsActions'; +import { withBills } from './withBills'; +import { withBillActions } from './withBillsActions'; import { compose, transfromViewsToTabs } from '@/utils'; diff --git a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBills.tsx b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBills.tsx index f915fa33c..370e9233d 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBills.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBills.tsx @@ -6,7 +6,7 @@ import { getBillsSelectedRowsFactory, } from '@/store/Bills/bills.selectors'; -export default (mapState) => { +export const withBills = (mapState) => { const getBillsTableState = getBillsTableStateFactory(); const billsTableStateChanged = billsTableStateChangedFactory(); const getBillsSelectedRows = getBillsSelectedRowsFactory(); diff --git a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBillsActions.tsx b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBillsActions.tsx index fef4fed5a..8f655ed4c 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBillsActions.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillsLanding/withBillsActions.tsx @@ -13,4 +13,5 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setBillsSelectedRows(selectedRows)), }); -export default connect(null, mapDispatchToProps); +export const withBillsActions = connect(null, mapDispatchToProps); +export const withBillActions = withBillsActions; diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.tsx index b651cbe5f..4114e463c 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteForm.tsx @@ -32,8 +32,8 @@ import { transformFormValuesToRequest, } from './utils'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; /** * Vendor Credit note form. diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.tsx index 038ec6299..1054fcf75 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.tsx @@ -40,8 +40,8 @@ import { handleDateChange, } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; const getFieldsStyle = (theme: Theme) => css` .${theme.bpPrefix}-form-group { diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteActionsBar.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteActionsBar.tsx index 9978092cd..9f3636999 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteActionsBar.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteActionsBar.tsx @@ -30,17 +30,17 @@ import { useVendorsCreditNoteListContext } from './VendorsCreditNoteListProvider import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; import { VendorCreditAction, AbilitySubject } from '@/constants/abilityOption'; -import withVendorsCreditNotesActions from './withVendorsCreditNotesActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withVendorActions from './withVendorActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withVendorsCreditNotesActions } from './withVendorsCreditNotesActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withVendorActions } from './withVendorActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; import { DRAWERS } from '@/constants/drawers'; -import withVendorsCreditNotes from './withVendorsCreditNotes'; +import { withVendorsCreditNotes } from './withVendorsCreditNotes'; import { useBulkDeleteVendorCreditsDialog } from './hooks/use-bulk-delete-vendor-credits-dialog'; /** diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteDataTable.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteDataTable.tsx index 8d631d26a..5f1d9f71f 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteDataTable.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteDataTable.tsx @@ -12,13 +12,13 @@ import { import { TABLES } from '@/constants/tables'; import { useMemorizedColumnsWidths } from '@/hooks'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withVendorsCreditNotesActions from './withVendorsCreditNotesActions'; -import withVendorsCreditNotes from './withVendorsCreditNotes'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withVendorsCreditNotesActions } from './withVendorsCreditNotesActions'; +import { withVendorsCreditNotes } from './withVendorsCreditNotes'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useVendorsCreditNoteTableColumns, ActionsMenu } from './components'; import { useVendorsCreditNoteListContext } from './VendorsCreditNoteListProvider'; @@ -37,7 +37,7 @@ function VendorsCreditNoteDataTable({ // #withVendorCredits vendorsCreditNoteTableState, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -165,7 +165,7 @@ function VendorsCreditNoteDataTable({ export default compose( withDashboardActions, withVendorsCreditNotesActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withSettings(({ vendorsCreditNoteSetting }) => ({ diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteViewTabs.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteViewTabs.tsx index 782976c37..84fbf791f 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteViewTabs.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNoteViewTabs.tsx @@ -4,8 +4,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; -import withVendorsCreditNotes from './withVendorsCreditNotes'; -import withVendorsCreditNotesActions from './withVendorsCreditNotesActions'; +import { withVendorsCreditNotes } from './withVendorsCreditNotes'; +import { withVendorsCreditNotesActions } from './withVendorsCreditNotesActions'; import { compose, transfromViewsToTabs } from '@/utils'; import { useVendorsCreditNoteListContext } from './VendorsCreditNoteListProvider'; diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNotesList.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNotesList.tsx index 0ac4158fe..7fe4be5cb 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNotesList.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/VendorsCreditNotesList.tsx @@ -7,8 +7,8 @@ import { DashboardPageContent } from '@/components'; import VendorsCreditNoteActionsBar from './VendorsCreditNoteActionsBar'; import VendorsCreditNoteDataTable from './VendorsCreditNoteDataTable'; -import withVendorsCreditNotes from './withVendorsCreditNotes'; -import withVendorsCreditNotesActions from './withVendorsCreditNotesActions'; +import { withVendorsCreditNotes } from './withVendorsCreditNotes'; +import { withVendorsCreditNotesActions } from './withVendorsCreditNotesActions'; import { VendorsCreditNoteListProvider } from './VendorsCreditNoteListProvider'; import { transformTableStateToQuery, compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorActions.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorActions.tsx index a5ad624ff..fa870993e 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorActions.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorActions.tsx @@ -11,4 +11,4 @@ const mapDipatchToProps = (dispatch) => ({ resetVendorCreditsTableState: () => dispatch(resetVendorCreditTableState()), }); -export default connect(null, mapDipatchToProps); +export const withVendorActions = connect(null, mapDipatchToProps); diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotes.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotes.tsx index cd1130630..73629e6f7 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotes.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotes.tsx @@ -6,7 +6,7 @@ import { getVendorsCreditNoteSelectedRowsFactory, } from '@/store/VendorCredit/vendorCredit.selector'; -export default (mapState) => { +export const withVendorsCreditNotes = (mapState) => { const getVendorsCreditNoteTableState = getVendorCreditTableStateFactory(); const isVendorsCreditNoteTableChanged = isVendorCreditTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotesActions.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotesActions.tsx index cb90ff6c8..60e88ec0c 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotesActions.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNotesLanding/withVendorsCreditNotesActions.tsx @@ -15,4 +15,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setVendorCreditsSelectedRows(selectedRows)), }); -export default connect(null, mapDispatchToProps); +export const withVendorsCreditNotesActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx index a360ab617..77a33ae30 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx @@ -7,7 +7,7 @@ import { TextStatus, Icon, Choose, T } from '@/components'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { AbilitySubject, VendorCreditAction } from '@/constants/abilityOption'; import { DRAWERS } from '@/constants/drawers'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; /** * Vendor credit universal search item select action. diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.tsx index a0fb4663c..2e282b095 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.tsx @@ -21,9 +21,9 @@ import { PaymentMadeInnerProvider } from './PaymentMadeInnerProvider'; import { usePaymentMadeFormContext } from './PaymentMadeFormProvider'; import { compose, orderingLinesIndexes } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { PageForm } from '@/components/PageForm'; import { diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeaderFields.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeaderFields.tsx index a888bcdc0..3a2f7bf31 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeaderFields.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeaderFields.tsx @@ -36,7 +36,7 @@ import { Icon, VendorDrawerLink, } from '@/components'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { usePaymentMadeFormContext } from './PaymentMadeFormProvider'; import { ACCOUNT_TYPE } from '@/constants/accountTypes'; import { PaymentMadeExchangeRateInputField } from './components'; diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx index c57f67131..f6da21107 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx @@ -5,7 +5,7 @@ import { Button, Classes, Intent } from '@blueprintjs/core'; import { Form, Formik, FormikHelpers, useFormikContext } from 'formik'; import { FormatNumber } from '@/components'; import { usePaymentMadeFormContext } from '../../PaymentMadeFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { usePaymentMadeExcessAmount } from '../../utils'; interface ExcessPaymentValues {} diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeActionsBar.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeActionsBar.tsx index 3d2618618..869eb0156 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeActionsBar.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeActionsBar.tsx @@ -23,11 +23,11 @@ import { } from '@/components'; import { PaymentMadeAction, AbilitySubject } from '@/constants/abilityOption'; -import withPaymentMade from './withPaymentMade'; -import withPaymentMadeActions from './withPaymentMadeActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withPaymentMade } from './withPaymentMade'; +import { withPaymentMadeActions } from './withPaymentMadeActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { usePaymentMadesListContext } from './PaymentMadesListProvider'; import { useRefreshPaymentMades } from '@/hooks/query/paymentMades'; diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeList.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeList.tsx index 45427c1cc..1ad453937 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeList.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeList.tsx @@ -8,8 +8,8 @@ import { PaymentMadesListProvider } from './PaymentMadesListProvider'; import PaymentMadeActionsBar from './PaymentMadeActionsBar'; import PaymentMadesTable from './PaymentMadesTable'; -import withPaymentMades from './withPaymentMade'; -import withPaymentMadeActions from './withPaymentMadeActions'; +import { withPaymentMades } from './withPaymentMade'; +import { withPaymentMadeActions } from './withPaymentMadeActions'; import { compose, transformTableStateToQuery } from '@/utils'; diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeViewTabs.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeViewTabs.tsx index a4103394a..af55bb85e 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeViewTabs.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeViewTabs.tsx @@ -8,8 +8,8 @@ import { compose } from '@/utils'; import { usePaymentMadesListContext } from './PaymentMadesListProvider'; import { transformPaymentViewsToTabs } from './utils'; -import withPaymentMade from './withPaymentMade'; -import withPaymentMadeActions from './withPaymentMadeActions'; +import { withPaymentMade } from './withPaymentMade'; +import { withPaymentMadeActions } from './withPaymentMadeActions'; /** * Payment made views tabs. diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesTable.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesTable.tsx index 2d181be6d..c6e8f5fa0 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesTable.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesTable.tsx @@ -13,12 +13,12 @@ import { import PaymentMadesEmptyStatus from './PaymentMadesEmptyStatus'; -import withPaymentMade from './withPaymentMade'; -import withPaymentMadeActions from './withPaymentMadeActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withPaymentMade } from './withPaymentMade'; +import { withPaymentMadeActions } from './withPaymentMadeActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { usePaymentMadesTableColumns, ActionsMenu } from './components'; import { usePaymentMadesListContext } from './PaymentMadesListProvider'; @@ -136,7 +136,7 @@ function PaymentMadesTable({ export default compose( withPaymentMadeActions, withPaymentMade(({ paymentMadesTableState }) => ({ paymentMadesTableState })), - withAlertsActions, + withAlertActions, withDrawerActions, withCurrentOrganization(), withSettings(({ billPaymentSettings }) => ({ diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesView.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesView.tsx index 78c82589e..9d1ce06a1 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesView.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesView.tsx @@ -4,8 +4,8 @@ import { Switch, Route } from 'react-router-dom'; import PaymentMadeViewTabs from './PaymentMadeViewTabs'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; @@ -22,7 +22,7 @@ function PaymentMadesViewPage({ exact={true} path={['/payments-made/:custom_view_id/custom_view', '/payments-made']} > - + {/* { +export const withPaymentMade = (mapState) => { const getPaymentMadesTableState = getPaymentMadesTableStateFactory(); const paymentsTableStateChanged = paymentsTableStateChangedFactory(); @@ -18,3 +18,5 @@ export default (mapState) => { }; return connect(mapStateToProps); }; + +export const withPaymentMades = withPaymentMade; diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeActions.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeActions.tsx index ddc08df03..c84bf49eb 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeActions.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeActions.tsx @@ -11,4 +11,4 @@ const mapDispatchToProps = (dispatch) => ({ resetPaymentMadesTableState: () => dispatch(resetPaymentMadesTableState()), }); -export default connect(null, mapDispatchToProps); +export const withPaymentMadeActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeDetail.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeDetail.tsx index c5d6abab2..f9eb1b7f3 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeDetail.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/withPaymentMadeDetail.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getPaymentMadeByIdFactory } from '@/store/PaymentMades/paymentMade.selector'; -export default () => { +export const withPaymentMadeDetail = () => { const getPaymentMadeById = getPaymentMadeByIdFactory(); const mapStateToProps = (state, props) => ({ diff --git a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsMadeUniversalSearch.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsMadeUniversalSearch.tsx index ccb24a864..3481f4a8f 100644 --- a/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsMadeUniversalSearch.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsMadeUniversalSearch.tsx @@ -8,7 +8,7 @@ import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { highlightText } from '@/utils'; import { AbilitySubject, PaymentMadeAction } from '@/constants/abilityOption'; import { DRAWERS } from '@/constants/drawers'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; /** * Universal search bill item select action. diff --git a/packages/webapp/src/containers/Resources/withResourceDetails.tsx b/packages/webapp/src/containers/Resources/withResourceDetails.tsx index b2ab47a97..563cc551b 100644 --- a/packages/webapp/src/containers/Resources/withResourceDetails.tsx +++ b/packages/webapp/src/containers/Resources/withResourceDetails.tsx @@ -7,7 +7,7 @@ import { getResourceDataFactory, } from '@/store/resources/resources.selectors'; -export default (mapState) => { +export const withResourceDetails = (mapState) => { const getResourceFields = getResourceFieldsFactory(); const getResourceData = getResourceDataFactory(); diff --git a/packages/webapp/src/containers/Resources/withResourcesActions.tsx b/packages/webapp/src/containers/Resources/withResourcesActions.tsx index 3e28ad682..5ea41e304 100644 --- a/packages/webapp/src/containers/Resources/withResourcesActions.tsx +++ b/packages/webapp/src/containers/Resources/withResourcesActions.tsx @@ -12,4 +12,4 @@ export const mapDispatchToProps = (dispatch) => ({ requestResourceData: (resourceSlug) => dispatch(fetchResourceData({ resourceSlug })), }); -export default connect(null, mapDispatchToProps); \ No newline at end of file +export const withResourcesActions = connect(null, mapDispatchToProps); \ No newline at end of file diff --git a/packages/webapp/src/containers/Router/withRoute.tsx b/packages/webapp/src/containers/Router/withRoute.tsx index 3e7b7cd59..fe5869d1a 100644 --- a/packages/webapp/src/containers/Router/withRoute.tsx +++ b/packages/webapp/src/containers/Router/withRoute.tsx @@ -2,6 +2,6 @@ import { connect } from "react-redux"; import { withRouter } from "react-router-dom" -export default (mapState) => { +export const withRoute = (mapState) => { return () => withRouter ; }; \ No newline at end of file diff --git a/packages/webapp/src/containers/Router/withRouteActions.tsx b/packages/webapp/src/containers/Router/withRouteActions.tsx index 66fd97e67..54413a986 100644 --- a/packages/webapp/src/containers/Router/withRouteActions.tsx +++ b/packages/webapp/src/containers/Router/withRouteActions.tsx @@ -29,4 +29,4 @@ const mapDispatchToProps = (dispatch, props) => { } } -export default connect(null, mapDispatchToProps) \ No newline at end of file +export const withRouteActions = connect(null, mapDispatchToProps) \ No newline at end of file diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNoteCustomizeDrawer.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNoteCustomizeDrawer.tsx index 863c8c4ef..0fe521c49 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNoteCustomizeDrawer.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/CreditNoteCustomizeDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const CreditNoteCustomizeDrawerBody = React.lazy( () => import('./CreditNoteCustomizeDrawerBody'), diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.tsx index e56d8e5f4..5779ecd09 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteForm.tsx @@ -36,8 +36,8 @@ import { safeSumBy, } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { CreditNoteExchangeRateSync, CreditNoteSyncIncrementSettingsToForm, diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteTransactionNoField.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteTransactionNoField.tsx index ffccc308c..6dda0545a 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteTransactionNoField.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteTransactionNoField.tsx @@ -11,8 +11,8 @@ import { FFormGroup, FInputGroup, } from '@/components'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Credit note transaction number field. diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/components.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/components.tsx index ed1aafe3d..20a6b9d04 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/components.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/components.tsx @@ -5,14 +5,14 @@ import * as R from 'ramda'; import { ExchangeRateInputGroup } from '@/components'; import { useCurrentOrganization } from '@/hooks/state'; import { useCreditNoteIsForeignCustomer, useCreditNoteSubtotal } from './utils'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { transactionNumber } from '@/utils'; import { useSyncExRateToForm, withExchangeRateFetchingLoading, withExchangeRateItemEntriesPriceRecalc, } from '@/containers/Entries/withExRateItemEntriesPriceRecalc'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx index 8407a4f39..7cc13dc29 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx @@ -6,7 +6,7 @@ import { MenuItem, Intent } from '@blueprintjs/core'; import { Icon, Choose, T, TextStatus } from '@/components'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { AbilitySubject, CreditNoteAction } from '@/constants/abilityOption'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesActionsBar.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesActionsBar.tsx index f78751b31..d52f9d012 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesActionsBar.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesActionsBar.tsx @@ -30,12 +30,12 @@ import { useCreditNoteListContext } from './CreditNotesListProvider'; import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; import { CreditNoteAction, AbilitySubject } from '@/constants/abilityOption'; -import withCreditNotes from './withCreditNotes'; -import withCreditNotesActions from './withCreditNotesActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withCreditNotes } from './withCreditNotes'; +import { withCreditNotesActions } from './withCreditNotesActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DialogsName } from '@/constants/dialogs'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesDataTable.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesDataTable.tsx index 943582af9..8e4b70817 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesDataTable.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesDataTable.tsx @@ -13,13 +13,13 @@ import { useMemorizedColumnsWidths } from '@/hooks'; import CreditNoteEmptyStatus from './CreditNotesEmptyStatus'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withCreditNotesActions from './withCreditNotesActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withCreditNotes from './withCreditNotes'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withCreditNotesActions } from './withCreditNotesActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCreditNotes } from './withCreditNotes'; import { useCreditNoteTableColumns, ActionsMenu } from './components'; import { useCreditNoteListContext } from './CreditNotesListProvider'; @@ -35,7 +35,7 @@ function CreditNotesDataTable({ setCreditNotesTableState, setCreditNotesSelectedRows, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -171,7 +171,7 @@ export default compose( withDashboardActions, withCreditNotesActions, withDrawerActions, - withAlertsActions, + withAlertActions, withDialogActions, withSettings(({ creditNoteSettings }) => ({ creditNoteTableSize: creditNoteSettings?.tableSize, diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesList.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesList.tsx index 360c5a6a0..300842cda 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesList.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesList.tsx @@ -7,8 +7,8 @@ import { DashboardPageContent } from '@/components'; import CreditNotesActionsBar from './CreditNotesActionsBar'; import CreditNotesDataTable from './CreditNotesDataTable'; -import withCreditNotes from './withCreditNotes'; -import withCreditNotesActions from './withCreditNotesActions'; +import { withCreditNotes } from './withCreditNotes'; +import { withCreditNotesActions } from './withCreditNotesActions'; import { CreditNotesListProvider } from './CreditNotesListProvider'; import { transformTableStateToQuery, compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesViewTabs.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesViewTabs.tsx index 3c7cab396..460d79400 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesViewTabs.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/CreditNotesViewTabs.tsx @@ -6,8 +6,8 @@ import { DashboardViewsTabs } from '@/components'; import { compose, transfromViewsToTabs } from '@/utils'; import { useCreditNoteListContext } from './CreditNotesListProvider'; -import withCreditNotes from './withCreditNotes'; -import withCreditNotesActions from './withCreditNotesActions'; +import { withCreditNotes } from './withCreditNotes'; +import { withCreditNotesActions } from './withCreditNotesActions'; /** * Credit Note views tabs. diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotes.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotes.tsx index 64be107ff..1985c5cfc 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotes.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotes.tsx @@ -5,7 +5,7 @@ import { isCreditNotesTableStateChangedFactory, } from '@/store/CreditNote/creditNote.selector'; -export default (mapState) => { +export const withCreditNotes = (mapState) => { const getCreditNoteTableState = getCreditNotesTableStateFactory(); const isCreditNoteTableChanged = isCreditNotesTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotesActions.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotesActions.tsx index 660775a18..93fbe0c92 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotesActions.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNotesLanding/withCreditNotesActions.tsx @@ -13,4 +13,4 @@ const mapDipatchToProps = (dispatch) => ({ setCreditNotesSelectedRows: (selectedRows) => dispatch(setCreditNotesSelectedRows(selectedRows)), }); -export default connect(null, mapDipatchToProps); +export const withCreditNotesActions = connect(null, mapDipatchToProps); diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeDrawer.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeDrawer.tsx index 66d0db268..90ae7fee8 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeDrawer.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/EstimateCustomizeDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const EstimateCustomizeDrawerBody = React.lazy( () => import('./EstimateCustomizeDrawerBody'), diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx index 6652ce3ae..aaf5128f7 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateForm.tsx @@ -22,8 +22,8 @@ import { EstimateSyncAutoExRateToForm, } from './components'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { AppToaster } from '@/components'; import { compose, transactionNumber, orderingLinesIndexes } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormEstimateNumberField.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormEstimateNumberField.tsx index b4c9c7495..b342873f3 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormEstimateNumberField.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormEstimateNumberField.tsx @@ -10,8 +10,8 @@ import { Icon, InputPrependButton, } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; /** * Estimate number field of estimate form. diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/components.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/components.tsx index 9cae3ae5d..0a5aa7b9c 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/components.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/components.tsx @@ -9,13 +9,13 @@ import { useCurrentOrganization } from '@/hooks/state'; import { useEstimateIsForeignCustomer, useEstimateSubtotal } from './utils'; import { transactionNumber } from '@/utils'; import { useUpdateEffect } from '@/hooks'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useSyncExRateToForm, withExchangeRateFetchingLoading, withExchangeRateItemEntriesPriceRecalc, } from '@/containers/Entries/withExRateItemEntriesPriceRecalc'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateSendMailDrawer/EstimateSendMailDrawer.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateSendMailDrawer/EstimateSendMailDrawer.tsx index be9b17b81..85c6d8c9c 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateSendMailDrawer/EstimateSendMailDrawer.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateSendMailDrawer/EstimateSendMailDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const EstimateSendMailContent = React.lazy(() => import('./EstimateSendMailContent').then((module) => ({ diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimateUniversalSearch.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimateUniversalSearch.tsx index 073f33631..fbdda4f4a 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimateUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimateUniversalSearch.tsx @@ -7,7 +7,7 @@ import { Choose, T, Icon } from '@/components'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { AbilitySubject, SaleEstimateAction } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; /** diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.tsx index 568759a9e..c379b75ec 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.tsx @@ -28,11 +28,11 @@ import { FSelect, } from '@/components'; -import withEstimates from './withEstimates'; -import withEstimatesActions from './withEstimatesActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withEstimates } from './withEstimates'; +import { withEstimatesActions } from './withEstimatesActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useEstimatesListContext } from './EstimatesListProvider'; import { @@ -44,7 +44,7 @@ import { useBulkDeleteEstimatesDialog } from './hooks/use-bulk-delete-estimates- import { SaleEstimateAction, AbilitySubject } from '@/constants/abilityOption'; import { compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; import { isEmpty } from 'lodash'; import { diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.tsx index e73d203ab..3964a2d2d 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.tsx @@ -4,12 +4,12 @@ import { useHistory } from 'react-router-dom'; import EstimatesEmptyStatus from './EstimatesEmptyStatus'; -import withEstimatesActions from './withEstimatesActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withEstimates from './withEstimates'; +import { withEstimatesActions } from './withEstimatesActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withEstimates } from './withEstimates'; import { TABLES } from '@/constants/tables'; import { @@ -33,7 +33,7 @@ function EstimatesDataTable({ setEstimatesTableState, setEstimatesSelectedRows, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -185,7 +185,7 @@ function EstimatesDataTable({ export default compose( withEstimatesActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withSettings(({ estimatesSettings }) => ({ diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.tsx index 866871f4b..be6616c56 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesList.tsx @@ -7,8 +7,8 @@ import '@/style/pages/SaleEstimate/List.scss'; import EstimatesActionsBar from './EstimatesActionsBar'; import EstimatesDataTable from './EstimatesDataTable'; -import withEstimates from './withEstimates'; -import withEstimatesActions from './withEstimatesActions'; +import { withEstimates } from './withEstimates'; +import { withEstimatesActions } from './withEstimatesActions'; import { EstimatesListProvider } from './EstimatesListProvider'; import { compose, transformTableStateToQuery } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesViewTabs.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesViewTabs.tsx index 286756bd7..2ed65ca8b 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesViewTabs.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/EstimatesViewTabs.tsx @@ -4,8 +4,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; -import withEstimatesActions from './withEstimatesActions'; -import withEstimates from './withEstimates'; +import { withEstimatesActions } from './withEstimatesActions'; +import { withEstimates } from './withEstimates'; import { useEstimatesListContext } from './EstimatesListProvider'; import { compose, transfromViewsToTabs } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimates.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimates.tsx index eac5f6479..384fada96 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimates.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimates.tsx @@ -6,7 +6,7 @@ import { getEstimatesSelectedRowsFactory, } from '@/store/Estimate/estimates.selectors'; -export default (mapState) => { +export const withEstimates = (mapState) => { const getEstimatesTableState = getEstimatesTableStateFactory(); const getSelectedRows = getEstimatesSelectedRowsFactory(); const isEstimatesTableStateChanged = isEstimatesTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimatesActions.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimatesActions.tsx index d0f66b0bc..6a1634b55 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimatesActions.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimatesLanding/withEstimatesActions.tsx @@ -12,4 +12,4 @@ const mapDispatchToProps = (dispatch) => ({ setEstimatesSelectedRows: (selectedRows) => dispatch(setEstimatesSelectedRows(selectedRows)), }); -export default connect(null, mapDispatchToProps); +export const withEstimatesActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Sales/Estimates/withEstimateDetail.tsx b/packages/webapp/src/containers/Sales/Estimates/withEstimateDetail.tsx index 06c27e5cb..86a6c6c4e 100644 --- a/packages/webapp/src/containers/Sales/Estimates/withEstimateDetail.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/withEstimateDetail.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getEstimateByIdFactory } from '@/store/Estimate/estimates.selectors'; -export default () => { +export const withEstimateDetail = () => { const getEstimateById = getEstimateByIdFactory(); const mapStateToProps = (state, props) => ({ diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeDrawer.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeDrawer.tsx index 8ecf93b5a..a22cc163d 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeDrawer.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/InvoiceCustomizeDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const InvoiceCustomize = React.lazy(() => import('./InvoiceCustomize')); diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/Dialogs/InvoiceExchangeRateChangeDialog.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/Dialogs/InvoiceExchangeRateChangeDialog.tsx index 2880ac383..59a31089d 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/Dialogs/InvoiceExchangeRateChangeDialog.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/Dialogs/InvoiceExchangeRateChangeDialog.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import { Dialog, DialogSuspense, FormattedMessage as T } from '@/components'; import withDialogRedux from '@/components/DialogReduxConnect'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; import { Button, Classes, Intent } from '@blueprintjs/core'; diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx index 8359be8d9..a4e8b02d6 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.tsx @@ -18,9 +18,9 @@ import InvoiceFormFooter from './InvoiceFormFooter'; import InvoiceFormDialogs from './InvoiceFormDialogs'; import InvoiceFormTopBar from './InvoiceFormTopBar'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { AppToaster, Box } from '@/components'; import { compose, orderingLinesIndexes, transactionNumber } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormInvoiceNumberField.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormInvoiceNumberField.tsx index 8fc086777..1a78c9728 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormInvoiceNumberField.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormInvoiceNumberField.tsx @@ -12,8 +12,8 @@ import { FInputGroup, } from '@/components'; import { DialogsName } from '@/constants/dialogs'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Invoice number field of invoice form. diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/components.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/components.tsx index d977ed2a9..7fdf5cccb 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/components.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/components.tsx @@ -17,8 +17,8 @@ import { import { useUpdateEffect } from '@/hooks'; import { transactionNumber } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useSyncExRateToForm, withExchangeRateFetchingLoading, diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceSendMailDrawer/InvoiceSendMailDrawer.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceSendMailDrawer/InvoiceSendMailDrawer.tsx index 2df27d89f..635835d6b 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceSendMailDrawer/InvoiceSendMailDrawer.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceSendMailDrawer/InvoiceSendMailDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const InvoiceSendMailContent = React.lazy(() => import('./InvoiceSendMailContent').then((module) => ({ diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx index a86141612..aa76f2481 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx @@ -8,7 +8,7 @@ import { highlightText } from '@/utils'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { AbilitySubject, SaleInvoiceAction } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; /** diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoiceViewTabs.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoiceViewTabs.tsx index 2d70160db..4c4b27389 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoiceViewTabs.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoiceViewTabs.tsx @@ -7,8 +7,8 @@ import { DashboardViewsTabs } from '@/components'; import { compose, transfromViewsToTabs } from '@/utils'; import { useInvoicesListContext } from './InvoicesListProvider'; -import withInvoices from './withInvoices'; -import withInvoiceActions from './withInvoiceActions'; +import { withInvoices } from './withInvoices'; +import { withInvoiceActions } from './withInvoiceActions'; /** * Invoices views tabs. diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.tsx index 7de18ebf4..a69a835fd 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.tsx @@ -31,14 +31,14 @@ import { useInvoicesListContext } from './InvoicesListProvider'; import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf'; import { useBulkDeleteInvoicesDialog } from '../hooks/use-bulk-delete-accounts-dialog'; -import withInvoices from './withInvoices'; -import withInvoiceActions from './withInvoiceActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withInvoices } from './withInvoices'; +import { withInvoiceActions } from './withInvoiceActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { compose } from '@/utils'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; import { isEmpty } from 'lodash'; diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.tsx index 5d5ad79ea..ff5c652a2 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.tsx @@ -12,13 +12,13 @@ import { TableSkeletonRows, } from '@/components'; -import withInvoices from './withInvoices'; -import withInvoiceActions from './withInvoiceActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withInvoices } from './withInvoices'; +import { withInvoiceActions } from './withInvoiceActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useMemorizedColumnsWidths } from '@/hooks'; import { useInvoicesTableColumns, ActionsMenu } from './components'; @@ -39,7 +39,7 @@ function InvoicesDataTable({ // #withInvoices invoicesTableState, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -186,7 +186,7 @@ function InvoicesDataTable({ export default compose( withDashboardActions, withInvoiceActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withInvoices(({ invoicesTableState }) => ({ invoicesTableState })), diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesList.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesList.tsx index e846dc86a..020a2e746 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesList.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/InvoicesList.tsx @@ -9,9 +9,9 @@ import { InvoicesListProvider } from './InvoicesListProvider'; import InvoicesDataTable from './InvoicesDataTable'; import InvoicesActionsBar from './InvoicesActionsBar'; -import withInvoices from './withInvoices'; -import withInvoiceActions from './withInvoiceActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withInvoices } from './withInvoices'; +import { withInvoiceActions } from './withInvoiceActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { transformTableStateToQuery, compose } from '@/utils'; @@ -54,5 +54,5 @@ export default compose( invoicesTableStateChanged, })), withInvoiceActions, - withAlertsActions, + withAlertActions, )(InvoicesList); diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoiceActions.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoiceActions.tsx index 3b10bcf25..d8365b2ea 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoiceActions.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoiceActions.tsx @@ -14,4 +14,4 @@ const mapDipatchToProps = (dispatch) => ({ resetInvoicesSelectedRows: () => dispatch(resetInvoicesSelectedRows()), }); -export default connect(null, mapDipatchToProps); +export const withInvoiceActions = connect(null, mapDipatchToProps); diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoices.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoices.tsx index 7db839cfd..99066af87 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoices.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoicesLanding/withInvoices.tsx @@ -6,7 +6,7 @@ import { getInvoicesSelectedRowsFactory, } from '@/store/Invoice/invoices.selector'; -export default (mapState) => { +export const withInvoices = (mapState) => { const getInvoicesTableState = getInvoicesTableStateFactory(); const isInvoicesTableStateChanged = isInvoicesTableStateChangedFactory(); const getSelectedRows = getInvoicesSelectedRowsFactory(); diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveForm.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveForm.tsx index 2ca3abb8b..6040623d5 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveForm.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveForm.tsx @@ -16,9 +16,9 @@ import PaymentReceiveFormDialogs from './PaymentReceiveFormDialogs'; import PaymentReceiveFormTopBar from './PaymentReceiveFormTopBar'; import { PaymentReceiveInnerProvider } from './PaymentReceiveInnerProvider'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { EditPaymentReceiveFormSchema, diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceivePaymentNoField.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceivePaymentNoField.tsx index d6f058f75..467bbf566 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceivePaymentNoField.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceivePaymentNoField.tsx @@ -12,8 +12,8 @@ import { InputPrependButton, } from '@/components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; /** * Payment receive number field. diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/components.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/components.tsx index 160072afc..7eb79fdc2 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/components.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/components.tsx @@ -11,7 +11,7 @@ import { Money, ExchangeRateInputGroup, MoneyFieldCell } from '@/components'; import { useCurrentOrganization } from '@/hooks/state'; import { useEstimateIsForeignCustomer } from './utils'; import { transactionNumber } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; /** * Invoice date cell. diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/dialogs/ExcessPaymentDialog/ExcessPaymentDialogContent.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/dialogs/ExcessPaymentDialog/ExcessPaymentDialogContent.tsx index 868a75bdf..1350a0e29 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/dialogs/ExcessPaymentDialog/ExcessPaymentDialogContent.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/dialogs/ExcessPaymentDialog/ExcessPaymentDialogContent.tsx @@ -5,7 +5,7 @@ import { Button, Classes, Intent } from '@blueprintjs/core'; import { Form, Formik, FormikHelpers, useFormikContext } from 'formik'; import { FormatNumber } from '@/components'; import { usePaymentReceiveFormContext } from '../../PaymentReceiveFormProvider'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { usePaymentReceivedTotalExceededAmount } from '../../utils'; interface ExcessPaymentValues {} diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveUniversalSearch.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveUniversalSearch.tsx index b7e81c17f..3f2276799 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveUniversalSearch.tsx @@ -8,7 +8,7 @@ import { AbilitySubject, PaymentReceiveAction, } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { highlightText } from '@/utils'; import { Icon } from '@/components'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedCustomizeDrawer.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedCustomizeDrawer.tsx index ccf830905..c5692e812 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedCustomizeDrawer.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/PaymentReceivedCustomizeDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const PaymentReceivedCustomize = React.lazy( () => import('./PaymentReceivedCustomize'), diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedMailDrawer/PaymentReceivedMailDrawer.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedMailDrawer/PaymentReceivedMailDrawer.tsx index 04d35e121..1a4fa2eb7 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedMailDrawer/PaymentReceivedMailDrawer.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedMailDrawer/PaymentReceivedMailDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const PaymentReceivedMailContent = React.lazy(() => import('./PaymentReceivedMailContent').then((module) => ({ diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedActionsBar.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedActionsBar.tsx index cc8a9fb9e..771e891e1 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedActionsBar.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedActionsBar.tsx @@ -27,11 +27,11 @@ import { DashboardActionsBar, } from '@/components'; -import withPaymentsReceived from './withPaymentsReceived'; -import withPaymentsReceivedActions from './withPaymentsReceivedActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withPaymentsReceived } from './withPaymentsReceived'; +import { withPaymentsReceivedActions } from './withPaymentsReceivedActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { PaymentReceiveAction, AbilitySubject, @@ -43,7 +43,7 @@ import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export- import { compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; import { useBulkDeletePaymentReceivesDialog } from './hooks/use-bulk-delete-payment-receives-dialog'; diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedList.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedList.tsx index 3913a7e3d..d1fe4390a 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedList.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedList.tsx @@ -8,8 +8,8 @@ import { PaymentsReceivedListProvider } from './PaymentsReceivedListProvider'; import PaymentReceivesTable from './PaymentsReceivedTable'; import PaymentsReceivedActionsBar from './PaymentsReceivedActionsBar'; -import withPaymentsReceived from './withPaymentsReceived'; -import withPaymentsReceivedActions from './withPaymentsReceivedActions'; +import { withPaymentsReceived } from './withPaymentsReceived'; +import { withPaymentsReceivedActions } from './withPaymentsReceivedActions'; import { compose, transformTableStateToQuery } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedTable.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedTable.tsx index 1f6ef3f7f..54476fd43 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedTable.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedTable.tsx @@ -13,12 +13,12 @@ import { import PaymentReceivesEmptyStatus from './PaymentsReceivedEmptyStatus'; -import withPaymentsReceived from './withPaymentsReceived'; -import withPaymentsReceivedActions from './withPaymentsReceivedActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withPaymentsReceived } from './withPaymentsReceived'; +import { withPaymentsReceivedActions } from './withPaymentsReceivedActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { usePaymentReceivesColumns, ActionsMenu } from './components'; import { usePaymentsReceivedListContext } from './PaymentsReceivedListProvider'; @@ -37,7 +37,7 @@ function PaymentsReceivedDataTable({ // #withPaymentsReceived paymentReceivesTableState, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -157,7 +157,7 @@ function PaymentsReceivedDataTable({ export default compose( withPaymentsReceivedActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withPaymentsReceived(({ paymentReceivesTableState }) => ({ diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedViewTabs.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedViewTabs.tsx index 8a753cb63..15df6e2ee 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedViewTabs.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedViewTabs.tsx @@ -5,8 +5,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { FormattedMessage as T, DashboardViewsTabs } from '@/components'; import { pick } from 'lodash'; -import withPaymentsReceived from './withPaymentsReceived'; -import withPaymentsReceivedActions from './withPaymentsReceivedActions'; +import { withPaymentsReceived } from './withPaymentsReceived'; +import { withPaymentsReceivedActions } from './withPaymentsReceivedActions'; import { usePaymentsReceivedListContext } from './PaymentsReceivedListProvider'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentReceiveDetail.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentReceiveDetail.tsx index 780ffe902..41098ed22 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentReceiveDetail.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentReceiveDetail.tsx @@ -5,7 +5,7 @@ import { getPaymentReceiveEntriesFactory, } from '@/store/PaymentReceives/paymentReceives.selector'; -export default () => { +export const withPaymentReceiveDetail = () => { const getPaymentReceiveById = getPaymentReceiveByIdFactory(); const getPaymentReceiveEntries = getPaymentReceiveEntriesFactory(); diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceived.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceived.tsx index bab83a8b3..bd0e2c674 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceived.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceived.tsx @@ -6,7 +6,7 @@ import { getPaymentReceivesSelectedRowsFactory } from '@/store/PaymentReceives/paymentReceives.selector'; -export default (mapState) => { +export const withPaymentsReceived = (mapState) => { const getPaymentReceiveTableState = getPaymentReceiveTableStateFactory(); const paymentsTableStateChanged = paymentsTableStateChangedFactory(); const getSelectedRows = getPaymentReceivesSelectedRowsFactory(); diff --git a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceivedActions.tsx b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceivedActions.tsx index b66c73341..56a19ac6a 100644 --- a/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceivedActions.tsx +++ b/packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/withPaymentsReceivedActions.tsx @@ -17,4 +17,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setPaymentReceivesSelectedRows(selectedRows)), }); -export default connect(null, mapDispatchToProps); +export const withPaymentsReceivedActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptCustomizeDrawer.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptCustomizeDrawer.tsx index c4e8ed82d..9fa70e6c2 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptCustomizeDrawer.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/ReceiptCustomizeDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const ReceiptCustomizeDrawerBody = React.lazy( () => import('./ReceiptCustomizeDrawerBody'), diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/Dialogs/ReceiptFormMailDeliverDialogContent.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/Dialogs/ReceiptFormMailDeliverDialogContent.tsx index 4b5d31e40..aabc1b32c 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/Dialogs/ReceiptFormMailDeliverDialogContent.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/Dialogs/ReceiptFormMailDeliverDialogContent.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import * as R from 'ramda'; import { useHistory } from 'react-router-dom'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import ReceiptMailDialogContent from '../../ReceiptMailDialog/ReceiptMailDialogContent'; import { DialogsName } from '@/constants/dialogs'; diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx index 24ea92cae..b83f0a813 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.tsx @@ -20,9 +20,9 @@ import { ReceiptFormFooter } from './ReceiptFormFooter'; import ReceiptFormDialogs from './ReceiptFormDialogs'; import ReceiptFormTopBar from './ReceiptFormTopbar'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { AppToaster } from '@/components'; import { compose, orderingLinesIndexes, transactionNumber } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormReceiptNumberField.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormReceiptNumberField.tsx index 7846cf898..79c9cdd0c 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormReceiptNumberField.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormReceiptNumberField.tsx @@ -12,8 +12,8 @@ import { FInputGroup, } from '@/components'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Receipt number field of receipt form. diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/components.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/components.tsx index 21e7dbb72..9537a0e60 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/components.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/components.tsx @@ -10,13 +10,13 @@ import { useCurrentOrganization } from '@/hooks/state'; import { useReceiptIsForeignCustomer, useReceiptTotal } from './utils'; import { useUpdateEffect } from '@/hooks'; import { transactionNumber } from '@/utils'; -import withSettings from '@/containers/Settings/withSettings'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useSyncExRateToForm, withExchangeRateFetchingLoading, withExchangeRateItemEntriesPriceRecalc, } from '@/containers/Entries/withExRateItemEntriesPriceRecalc'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; /** diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptSendMailDrawer/ReceiptSendMailDrawer.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptSendMailDrawer/ReceiptSendMailDrawer.tsx index f8e7255d1..4a4d1d210 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptSendMailDrawer/ReceiptSendMailDrawer.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptSendMailDrawer/ReceiptSendMailDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; const ReceiptSendMailContent = React.lazy(() => import('./ReceiptSendMailContent').then((module) => ({ diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx index abaea4004..7b7c645d8 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx @@ -6,7 +6,7 @@ import { MenuItem } from '@blueprintjs/core'; import { Icon, Choose, T } from '@/components'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { AbilitySubject, SaleReceiptAction } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; /** diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.tsx index ce8476135..13ff2af9a 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.tsx @@ -30,11 +30,11 @@ import { DashboardActionViewsList, } from '@/components'; -import withReceipts from './withReceipts'; -import withReceiptsActions from './withReceiptsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withReceipts } from './withReceipts'; +import { withReceiptsActions } from './withReceiptsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useReceiptsListContext } from './ReceiptsListProvider'; import { @@ -46,7 +46,7 @@ import { useBulkDeleteReceiptsDialog } from './hooks/use-bulk-delete-receipts-di import { DialogsName } from '@/constants/dialogs'; import { compose } from '@/utils'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; import { isEmpty } from 'lodash'; diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptViewTabs.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptViewTabs.tsx index a44f4315f..3052d410b 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptViewTabs.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptViewTabs.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; -import withReceiptActions from './withReceiptsActions'; -import withReceipts from './withReceipts'; +import { withReceiptActions } from './withReceiptsActions'; +import { withReceipts } from './withReceipts'; import { compose, transfromViewsToTabs } from '@/utils'; import { useReceiptsListContext } from './ReceiptsListProvider'; diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsList.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsList.tsx index e1de6c656..eb710bbdc 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsList.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsList.tsx @@ -7,8 +7,8 @@ import '@/style/pages/SaleReceipt/List.scss'; import ReceiptActionsBar from './ReceiptActionsBar'; import ReceiptsTable from './ReceiptsTable'; -import withReceipts from './withReceipts'; -import withReceiptsActions from './withReceiptsActions'; +import { withReceipts } from './withReceipts'; +import { withReceiptsActions } from './withReceiptsActions'; import { ReceiptsListProvider } from './ReceiptsListProvider'; import { transformTableStateToQuery, compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.tsx index e428393bc..74785d35e 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.tsx @@ -13,12 +13,12 @@ import { TABLES } from '@/constants/tables'; import ReceiptsEmptyStatus from './ReceiptsEmptyStatus'; -import withReceipts from './withReceipts'; -import withReceiptsActions from './withReceiptsActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withReceipts } from './withReceipts'; +import { withReceiptsActions } from './withReceiptsActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useReceiptsListContext } from './ReceiptsListProvider'; import { useReceiptsTableColumns, ActionsMenu } from './components'; @@ -37,7 +37,7 @@ function ReceiptsDataTable({ // #withReceipts receiptTableState, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -163,7 +163,7 @@ function ReceiptsDataTable({ } export default compose( - withAlertsActions, + withAlertActions, withReceiptsActions, withDrawerActions, withDialogActions, diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceipts.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceipts.tsx index 09dbc9bab..a69b987f5 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceipts.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceipts.tsx @@ -6,7 +6,7 @@ import { receiptsTableStateChangedFactory, } from '@/store/receipts/receipts.selector'; -export default (mapState) => { +export const withReceipts = (mapState) => { const getReceiptsTableState = getReceiptsTableStateFactory(); const receiptsTableStateChanged = receiptsTableStateChangedFactory(); const getSelectedRows = getReceiptsSelectedRowsFactory(); diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceiptsActions.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceiptsActions.tsx index c358cadee..a09d56a4e 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceiptsActions.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptsLanding/withReceiptsActions.tsx @@ -13,4 +13,4 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(setReceiptsSelectedRows(selectedRows)), }); -export default connect(null, mapDispatchToProps); +export const withReceiptsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Settings/withSettings.tsx b/packages/webapp/src/containers/Settings/withSettings.tsx index 87a5ad861..a97f7d4e1 100644 --- a/packages/webapp/src/containers/Settings/withSettings.tsx +++ b/packages/webapp/src/containers/Settings/withSettings.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import { connect } from 'react-redux'; -export default (mapState) => { +export const withSettings = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { allSettings: state.settings.data, diff --git a/packages/webapp/src/containers/Settings/withSettingsActions.tsx b/packages/webapp/src/containers/Settings/withSettingsActions.tsx index a2cc7e107..4d0e49b9c 100644 --- a/packages/webapp/src/containers/Settings/withSettingsActions.tsx +++ b/packages/webapp/src/containers/Settings/withSettingsActions.tsx @@ -12,4 +12,4 @@ export const mapDispatchToProps = (dispatch) => ({ addSetting: (group, key, value) => dispatch(addSettings(group, key, value)), }); -export default connect(null, mapDispatchToProps); +export const withSettingsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Setup/SetupCongratsPage.tsx b/packages/webapp/src/containers/Setup/SetupCongratsPage.tsx index 1a80ec2c2..5b6e44c93 100644 --- a/packages/webapp/src/containers/Setup/SetupCongratsPage.tsx +++ b/packages/webapp/src/containers/Setup/SetupCongratsPage.tsx @@ -8,7 +8,7 @@ import { useIsDarkMode } from '@/hooks/useDarkMode'; import WorkflowIcon from './WorkflowIcon'; import { FormattedMessage as T } from '@/components'; -import withOrganizationActions from '@/containers/Organization/withOrganizationActions'; +import { withOrganizationActions } from '@/containers/Organization/withOrganizationActions'; import { compose } from '@/utils'; /** diff --git a/packages/webapp/src/containers/Setup/SetupInitializingForm.tsx b/packages/webapp/src/containers/Setup/SetupInitializingForm.tsx index bc4526fc6..43a4367a0 100644 --- a/packages/webapp/src/containers/Setup/SetupInitializingForm.tsx +++ b/packages/webapp/src/containers/Setup/SetupInitializingForm.tsx @@ -9,9 +9,9 @@ import { useIsDarkMode } from '@/hooks/useDarkMode'; import { useJob, useCurrentOrganization } from '@/hooks/query'; import { FormattedMessage as T } from '@/components'; -import withOrganizationActions from '@/containers/Organization/withOrganizationActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; -import withOrganization from '../Organization/withOrganization'; +import { withOrganizationActions } from '@/containers/Organization/withOrganizationActions'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; +import { withOrganization } from '../Organization/withOrganization'; /** * Setup initializing step form. diff --git a/packages/webapp/src/containers/Setup/SetupOrganizationPage.tsx b/packages/webapp/src/containers/Setup/SetupOrganizationPage.tsx index 01bce7cfa..c3940f368 100644 --- a/packages/webapp/src/containers/Setup/SetupOrganizationPage.tsx +++ b/packages/webapp/src/containers/Setup/SetupOrganizationPage.tsx @@ -7,7 +7,7 @@ import { x } from '@xstyled/emotion'; import SetupOrganizationForm from './SetupOrganizationForm'; import { useOrganizationSetup } from '@/hooks/query'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; import { getSetupOrganizationValidation } from './SetupOrganization.schema'; import { setCookie, compose, transfromToSnakeCase } from '@/utils'; diff --git a/packages/webapp/src/containers/Setup/SetupRightSection.tsx b/packages/webapp/src/containers/Setup/SetupRightSection.tsx index bec693c33..18a4f546e 100644 --- a/packages/webapp/src/containers/Setup/SetupRightSection.tsx +++ b/packages/webapp/src/containers/Setup/SetupRightSection.tsx @@ -4,10 +4,10 @@ import { x } from '@xstyled/emotion'; import SetupWizardContent from './SetupWizardContent'; -import withOrganization from '@/containers/Organization/withOrganization'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; -import withSetupWizard from '@/store/organizations/withSetupWizard'; -import withSubscriptions from '../Subscriptions/withSubscriptions'; +import { withOrganization } from '@/containers/Organization/withOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; +import { withSetupWizard } from '@/store/organizations/withSetupWizard'; +import { withSubscriptions } from '../Subscriptions/withSubscriptions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Setup/SetupSubscription/SetupSubscription.tsx b/packages/webapp/src/containers/Setup/SetupSubscription/SetupSubscription.tsx index 2ff52f26d..adb4c64c4 100644 --- a/packages/webapp/src/containers/Setup/SetupSubscription/SetupSubscription.tsx +++ b/packages/webapp/src/containers/Setup/SetupSubscription/SetupSubscription.tsx @@ -4,7 +4,7 @@ import * as R from 'ramda'; import { Box } from '@/components'; import { SubscriptionPlansSection } from './SubscriptionPlansSection'; -import withSubscriptionPlansActions from '../../Subscriptions/withSubscriptionPlansActions'; +import { withSubscriptionPlansActions } from '../../Subscriptions/withSubscriptionPlansActions'; import styles from './SetupSubscription.module.scss'; /** diff --git a/packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansPeriodSwitcher.tsx b/packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansPeriodSwitcher.tsx index d8dded741..0ad38a992 100644 --- a/packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansPeriodSwitcher.tsx +++ b/packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansPeriodSwitcher.tsx @@ -2,7 +2,8 @@ import { ChangeEvent } from 'react'; import * as R from 'ramda'; import { Intent, Switch, Tag, Text } from '@blueprintjs/core'; import { Group } from '@/components'; -import withSubscriptionPlansActions, { +import { + withSubscriptionPlansActions, WithSubscriptionPlansActionsProps, } from '@/containers/Subscriptions/withSubscriptionPlansActions'; import { SubscriptionPlansPeriod } from '@/store/plans/plans.reducer'; diff --git a/packages/webapp/src/containers/Subscriptions/BillingPage.tsx b/packages/webapp/src/containers/Subscriptions/BillingPage.tsx index f48685d1f..e98b441d1 100644 --- a/packages/webapp/src/containers/Subscriptions/BillingPage.tsx +++ b/packages/webapp/src/containers/Subscriptions/BillingPage.tsx @@ -5,8 +5,8 @@ import { Redirect } from 'react-router-dom'; import { BillingPageBoot } from './BillingPageBoot'; import { BillingPageContent } from './BillingPageContent'; import { useDashboardMeta } from '@/hooks/query'; -import withAlertActions from '../Alert/withAlertActions'; -import withDashboardActions from '../Dashboard/withDashboardActions'; +import { withAlertActions } from '../Alert/withAlertActions'; +import { withDashboardActions } from '../Dashboard/withDashboardActions'; function BillingPageRoot({ openAlert, diff --git a/packages/webapp/src/containers/Subscriptions/BillingSubscription.tsx b/packages/webapp/src/containers/Subscriptions/BillingSubscription.tsx index c39093095..0218b07e3 100644 --- a/packages/webapp/src/containers/Subscriptions/BillingSubscription.tsx +++ b/packages/webapp/src/containers/Subscriptions/BillingSubscription.tsx @@ -4,9 +4,9 @@ import clsx from 'classnames'; import { includes } from 'lodash'; import { Box, Group, Stack } from '@/components'; import { Button, Card, Classes, Intent, Text } from '@blueprintjs/core'; -import withAlertActions from '../Alert/withAlertActions'; +import { withAlertActions } from '../Alert/withAlertActions'; import styles from './BillingSubscription.module.scss'; -import withDrawerActions from '../Drawer/withDrawerActions'; +import { withDrawerActions } from '../Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; import { useBillingPageBoot } from './BillingPageBoot'; import { getSubscriptionStatusText } from './_utils'; diff --git a/packages/webapp/src/containers/Subscriptions/alerts/CancelMainSubscriptionAlert.tsx b/packages/webapp/src/containers/Subscriptions/alerts/CancelMainSubscriptionAlert.tsx index ca0c6a905..aaec7c5d3 100644 --- a/packages/webapp/src/containers/Subscriptions/alerts/CancelMainSubscriptionAlert.tsx +++ b/packages/webapp/src/containers/Subscriptions/alerts/CancelMainSubscriptionAlert.tsx @@ -4,8 +4,8 @@ import * as R from 'ramda'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useCancelMainSubscription } from '@/hooks/query/subscription'; diff --git a/packages/webapp/src/containers/Subscriptions/alerts/ResumeMainSubscriptionAlert.tsx b/packages/webapp/src/containers/Subscriptions/alerts/ResumeMainSubscriptionAlert.tsx index c8d8d0734..fa9f2a967 100644 --- a/packages/webapp/src/containers/Subscriptions/alerts/ResumeMainSubscriptionAlert.tsx +++ b/packages/webapp/src/containers/Subscriptions/alerts/ResumeMainSubscriptionAlert.tsx @@ -4,8 +4,8 @@ import * as R from 'ramda'; import { Intent, Alert } from '@blueprintjs/core'; import { AppToaster, FormattedMessage as T } from '@/components'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useResumeMainSubscription } from '@/hooks/query/subscription'; /** diff --git a/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlanDrawer.tsx b/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlanDrawer.tsx index a8aaf60ad..4cb2bd599 100644 --- a/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlanDrawer.tsx +++ b/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlanDrawer.tsx @@ -2,7 +2,7 @@ import React, { lazy } from 'react'; import * as R from 'ramda'; import { Drawer, DrawerHeaderContent, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { Position } from '@blueprintjs/core'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlans.tsx b/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlans.tsx index 1edc6d7cf..8963185db 100644 --- a/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlans.tsx +++ b/packages/webapp/src/containers/Subscriptions/drawers/ChangeSubscriptionPlanDrawer/ChangeSubscriptionPlans.tsx @@ -8,7 +8,7 @@ import { useSubscriptionPlans } from '@/hooks/constants/useSubscriptionPlans'; import { useChangeSubscriptionPlan } from '@/hooks/query/subscription'; import { withSubscriptionPlanMapper } from '../../component/withSubscriptionPlanMapper'; import { withPlans } from '../../withPlans'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; export function ChangeSubscriptionPlans() { diff --git a/packages/webapp/src/containers/Subscriptions/withBillingActions.tsx b/packages/webapp/src/containers/Subscriptions/withBillingActions.tsx index 0a41d2007..6ff776d83 100644 --- a/packages/webapp/src/containers/Subscriptions/withBillingActions.tsx +++ b/packages/webapp/src/containers/Subscriptions/withBillingActions.tsx @@ -6,4 +6,4 @@ export const mapDispatchToProps = (dispatch) => ({ requestSubmitBilling: (form) => dispatch(submitBilling({ form })), }); -export default connect(null, mapDispatchToProps); +export const withBillingActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Subscriptions/withPlan.tsx b/packages/webapp/src/containers/Subscriptions/withPlan.tsx index 71b82c049..f7b27ff3c 100644 --- a/packages/webapp/src/containers/Subscriptions/withPlan.tsx +++ b/packages/webapp/src/containers/Subscriptions/withPlan.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getPlanSelector } from '@/store/plans/plans.selectors'; -export default (mapState) => { +export const withPlan = (mapState) => { const mapStateToProps = (state, props) => { const getPlan = getPlanSelector(); diff --git a/packages/webapp/src/containers/Subscriptions/withSubscriptionPlansActions.tsx b/packages/webapp/src/containers/Subscriptions/withSubscriptionPlansActions.tsx index 67f6868f9..ae8edb91f 100644 --- a/packages/webapp/src/containers/Subscriptions/withSubscriptionPlansActions.tsx +++ b/packages/webapp/src/containers/Subscriptions/withSubscriptionPlansActions.tsx @@ -19,4 +19,4 @@ export const mapDispatchToProps: MapDispatchToProps< dispatch(changePlansPeriod({ period })), }); -export default connect(null, mapDispatchToProps); +export const withSubscriptionPlansActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Subscriptions/withSubscriptions.tsx b/packages/webapp/src/containers/Subscriptions/withSubscriptions.tsx index 6cb9bf5c0..588ee7517 100644 --- a/packages/webapp/src/containers/Subscriptions/withSubscriptions.tsx +++ b/packages/webapp/src/containers/Subscriptions/withSubscriptions.tsx @@ -6,7 +6,7 @@ import { isSubscriptionActiveFactory, } from '@/store/subscription/subscription.selectors'; -export default (mapState, slug) => { +export const withSubscriptions = (mapState, slug) => { const isSubscriptionOnTrial = isSubscriptionOnTrialFactory(slug); const isSubscriptionInactive = isSubscriptionInactiveFactory(slug); const isSubscriptionActive = isSubscriptionActiveFactory(slug); diff --git a/packages/webapp/src/containers/Subscriptions/withSubscriptionsActions.tsx b/packages/webapp/src/containers/Subscriptions/withSubscriptionsActions.tsx index 1166832b7..25ceedd7a 100644 --- a/packages/webapp/src/containers/Subscriptions/withSubscriptionsActions.tsx +++ b/packages/webapp/src/containers/Subscriptions/withSubscriptionsActions.tsx @@ -6,4 +6,4 @@ const mapDispatchToProps = (dispatch) => ({ requestFetchSubscriptions: () => dispatch(fetchSubscriptions()), }); -export default connect(null, mapDispatchToProps); +export const withSubscriptionsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Subscriptions/withSubscriptionss.tsx b/packages/webapp/src/containers/Subscriptions/withSubscriptionss.tsx index 3c9e03f90..880227188 100644 --- a/packages/webapp/src/containers/Subscriptions/withSubscriptionss.tsx +++ b/packages/webapp/src/containers/Subscriptions/withSubscriptionss.tsx @@ -5,7 +5,7 @@ import { isSubscriptionsActiveFactory, } from '@/store/subscription/subscription.selectors'; -export default (mapState) => { +export const withSubscriptionss = (mapState) => { const isSubscriptionsInactive = isSubscriptionsInactiveFactory(); const isSubscriptionsActive = isSubscriptionsActiveFactory(); diff --git a/packages/webapp/src/containers/TaxRates/alerts/TaxRateDeleteAlert.tsx b/packages/webapp/src/containers/TaxRates/alerts/TaxRateDeleteAlert.tsx index 32e6af28b..4084bf534 100644 --- a/packages/webapp/src/containers/TaxRates/alerts/TaxRateDeleteAlert.tsx +++ b/packages/webapp/src/containers/TaxRates/alerts/TaxRateDeleteAlert.tsx @@ -5,9 +5,9 @@ import { AppToaster, FormattedMessage as T } from '@/components'; import { useDeleteTaxRate } from '@/hooks/query/taxRates'; -import withAlertStoreConnect from '@/containers/Alert/withAlertStoreConnect'; -import withAlertActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; +import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; diff --git a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx index 1cd369ed3..c4eca2a61 100644 --- a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx +++ b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingActionsBar.tsx @@ -9,7 +9,7 @@ import { } from '@/components'; import { AbilitySubject, TaxRateAction } from '@/constants/abilityOption'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx index 26352e35b..7fdf7f362 100644 --- a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx +++ b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingEmptyState.tsx @@ -4,7 +4,7 @@ import { Button, Intent } from '@blueprintjs/core'; import * as R from 'ramda'; import { EmptyStatus, Can, FormattedMessage as T } from '@/components'; import { SaleInvoiceAction, AbilitySubject } from '@/constants/abilityOption'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DialogsName } from '@/constants/dialogs'; function TaxRatesLandingEmptyStateRoot({ diff --git a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingTable.tsx b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingTable.tsx index 6af00de39..afe2c6b21 100644 --- a/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingTable.tsx +++ b/packages/webapp/src/containers/TaxRates/containers/TaxRatesLandingTable.tsx @@ -9,11 +9,11 @@ import { AppToaster, } from '@/components'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { useTaxRatesTableColumns } from './_utils'; import { useTaxRatesLandingContext } from './TaxRatesLandingProvider'; @@ -32,7 +32,7 @@ import { * Invoices datatable. */ function TaxRatesDataTable({ - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -139,7 +139,7 @@ function TaxRatesDataTable({ export default compose( withDashboardActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withSettings(({ invoiceSettings }) => ({ diff --git a/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogForm.tsx b/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogForm.tsx index 15a3a5ec0..34c32360b 100644 --- a/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogForm.tsx +++ b/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogForm.tsx @@ -20,8 +20,8 @@ import { useCreateTaxRate, useEditTaxRate } from '@/hooks/query/taxRates'; import { useTaxRateFormDialogContext } from './TaxRateFormDialogBoot'; import { TaxRateFormDialogFormFooter } from './TaxRateFormDialogFormFooter'; import { TaxRateFormDialogFormErrors } from './TaxRateFormDialogFormErrors'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { DRAWERS } from '@/constants/drawers'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogFormFooter.tsx b/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogFormFooter.tsx index 3cf7f9ec3..91a87e3e3 100644 --- a/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogFormFooter.tsx +++ b/packages/webapp/src/containers/TaxRates/dialogs/TaxRateFormDialog/TaxRateFormDialogFormFooter.tsx @@ -4,7 +4,7 @@ import * as R from 'ramda'; import { useFormikContext } from 'formik'; import { Button, Classes, Intent } from '@blueprintjs/core'; import { DialogsName } from '@/constants/dialogs'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; function TaxRateFormDialogFormFooterRoot({ closeDialog }) { const { isSubmitting } = useFormikContext(); diff --git a/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsContentActionsBar.tsx b/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsContentActionsBar.tsx index 758372bc2..1fcf96aa6 100644 --- a/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsContentActionsBar.tsx +++ b/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsContentActionsBar.tsx @@ -15,9 +15,9 @@ import { import * as R from 'ramda'; import { AppToaster, Can, DashboardActionsBar, Icon } from '@/components'; import { AbilitySubject, TaxRateAction } from '@/constants/abilityOption'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { useTaxRateDetailsContext } from './TaxRateDetailsContentBoot'; import { DialogsName } from '@/constants/dialogs'; import { @@ -33,7 +33,7 @@ function TaxRateDetailsContentActionsBar({ // #withDrawerActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, }) { const { taxRateId, taxRate } = useTaxRateDetailsContext(); @@ -144,5 +144,5 @@ function TaxRateDetailsContentActionsBar({ export default R.compose( withDrawerActions, withDialogActions, - withAlertsActions, + withAlertActions, )(TaxRateDetailsContentActionsBar); diff --git a/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer.tsx b/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer.tsx index 1c9257d49..d4b8b1b9d 100644 --- a/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer.tsx +++ b/packages/webapp/src/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as R from 'ramda'; import { Drawer, DrawerHeaderContent, DrawerSuspense } from '@/components'; -import withDrawers from '@/containers/Drawer/withDrawers'; +import { withDrawers } from '@/containers/Drawer/withDrawers'; import { DRAWERS } from '@/constants/drawers'; const TaxRateDetailsDrawerContent = React.lazy( diff --git a/packages/webapp/src/containers/TransactionsLocking/TransactionsLockingBody.tsx b/packages/webapp/src/containers/TransactionsLocking/TransactionsLockingBody.tsx index ba39adbfd..df19b730f 100644 --- a/packages/webapp/src/containers/TransactionsLocking/TransactionsLockingBody.tsx +++ b/packages/webapp/src/containers/TransactionsLocking/TransactionsLockingBody.tsx @@ -7,8 +7,8 @@ import { TransactionLockingSkeletonList, } from './components'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; import { useTransactionsLockingContext } from './TransactionsLockingProvider'; @@ -20,14 +20,14 @@ function TransactionsLockingBodyJsx({ // #withDialogActions openDialog, - // #withAlertsActions + // #withAlertActions openAlert, }) { const { isTransactionLockingLoading, transactionLockingType } = useTransactionsLockingContext(); // Handle locking transactions. - const handleLockingTransactions = (module, {}, isEnabled) => { + const handleLockingTransactions = (module, { }, isEnabled) => { openDialog('locking-transactions', { isEnabled: isEnabled, module: module, @@ -69,6 +69,6 @@ function TransactionsLockingBodyJsx({ } export const TransactionsLockingBody = R.compose( - withAlertsActions, + withAlertActions, withDialogActions, )(TransactionsLockingBodyJsx); diff --git a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx index 38cc6a4be..be7cbca98 100644 --- a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx +++ b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearch.tsx @@ -8,8 +8,8 @@ import { UniversalSearch } from '@/components'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { compose } from '@/utils'; -import withUniversalSearchActions from './withUniversalSearchActions'; -import withUniversalSearch from './withUniversalSearch'; +import { withUniversalSearchActions } from './withUniversalSearchActions'; +import { withUniversalSearch } from './withUniversalSearch'; import { useGetUniversalSearchTypeOptions } from './utils'; import DashboardUniversalSearchItemActions from './DashboardUniversalSearchItemActions'; diff --git a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchHotkeys.tsx b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchHotkeys.tsx index c0442f8d3..12e0b0d4c 100644 --- a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchHotkeys.tsx +++ b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchHotkeys.tsx @@ -2,7 +2,7 @@ import * as R from 'ramda'; import { useHotkeys } from 'react-hotkeys-hook'; -import withUniversalSearchActions from './withUniversalSearchActions'; +import { withUniversalSearchActions } from './withUniversalSearchActions'; /** * Universal search hotkey. diff --git a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchItemActions.tsx b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchItemActions.tsx index 5b03939ce..2cc37f021 100644 --- a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchItemActions.tsx +++ b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchItemActions.tsx @@ -2,10 +2,10 @@ import React from 'react'; import * as R from 'ramda'; -import withUniversalSearch from './withUniversalSearch'; +import { withUniversalSearch } from './withUniversalSearch'; import { getUniversalSearchItemsActions } from './utils'; -import withUniversalSearchActions from './withUniversalSearchActions'; +import { withUniversalSearchActions } from './withUniversalSearchActions'; /** * Universal search selected item action based on each resource type. diff --git a/packages/webapp/src/containers/UniversalSearch/withUniversalSearch.tsx b/packages/webapp/src/containers/UniversalSearch/withUniversalSearch.tsx index 0ada4cde7..769bbde68 100644 --- a/packages/webapp/src/containers/UniversalSearch/withUniversalSearch.tsx +++ b/packages/webapp/src/containers/UniversalSearch/withUniversalSearch.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import { connect } from 'react-redux'; -export default (mapState) => { +export const withUniversalSearch = (mapState) => { const mapStateToProps = (state, props) => { const { globalSearch } = state; diff --git a/packages/webapp/src/containers/UniversalSearch/withUniversalSearchActions.tsx b/packages/webapp/src/containers/UniversalSearch/withUniversalSearchActions.tsx index 7eb8283fe..7a1129537 100644 --- a/packages/webapp/src/containers/UniversalSearch/withUniversalSearchActions.tsx +++ b/packages/webapp/src/containers/UniversalSearch/withUniversalSearchActions.tsx @@ -25,4 +25,4 @@ export const mapDispatchToProps = (dispatch) => ({ dispatch(universalSearchResetSelectedItem()), }); -export default connect(null, mapDispatchToProps); +export const withUniversalSearchActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Users/withUsers.tsx b/packages/webapp/src/containers/Users/withUsers.tsx index 92f114381..3c25d2fae 100644 --- a/packages/webapp/src/containers/Users/withUsers.tsx +++ b/packages/webapp/src/containers/Users/withUsers.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getExpensesCurrentPageFactory } from '@/store/users/users.selectors'; -export default (mapState) => { +export const withUsers = (mapState) => { const mapStateToProps = (state, props) => { const mapped = { usersList: getExpensesCurrentPageFactory(state, props), diff --git a/packages/webapp/src/containers/Users/withUsersActions.tsx b/packages/webapp/src/containers/Users/withUsersActions.tsx index 3da74e03f..c8027ca4b 100644 --- a/packages/webapp/src/containers/Users/withUsersActions.tsx +++ b/packages/webapp/src/containers/Users/withUsersActions.tsx @@ -19,4 +19,4 @@ export const mapDispatchToProps = (dispatch) => ({ }); -export default connect(null, mapDispatchToProps); +export const withUsersActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Vendors/VendorForm/VendorFormFormik.tsx b/packages/webapp/src/containers/Vendors/VendorForm/VendorFormFormik.tsx index 99f4523e5..51cfa1eff 100644 --- a/packages/webapp/src/containers/Vendors/VendorForm/VendorFormFormik.tsx +++ b/packages/webapp/src/containers/Vendors/VendorForm/VendorFormFormik.tsx @@ -18,7 +18,7 @@ import VendorFormPrimarySection from './VendorFormPrimarySection'; import VendorFormAfterPrimarySection from './VendorFormAfterPrimarySection'; import VendorFloatingActions from './VendorFloatingActions'; -import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization'; +import { withCurrentOrganization } from '@/containers/Organization/withCurrentOrganization'; import { useVendorFormContext } from './VendorFormProvider'; import { compose, transformToForm, safeInvoke } from '@/utils'; diff --git a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorActionsBar.tsx b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorActionsBar.tsx index 825842270..a8ce18fed 100644 --- a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorActionsBar.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorActionsBar.tsx @@ -30,11 +30,11 @@ import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export- import { useBulkDeleteVendorsDialog } from './hooks/use-bulk-delete-vendors-dialog'; import { isEmpty } from 'lodash'; -import withVendors from './withVendors'; -import withVendorsActions from './withVendorsActions'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withVendors } from './withVendors'; +import { withVendorsActions } from './withVendorsActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; import { compose } from '@/utils'; import { DialogsName } from '@/constants/dialogs'; diff --git a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorViewsTabs.tsx b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorViewsTabs.tsx index d6c1838ab..955267738 100644 --- a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorViewsTabs.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorViewsTabs.tsx @@ -4,8 +4,8 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { useVendorsListContext } from './VendorsListProvider'; import { DashboardViewsTabs } from '@/components'; -import withVendorsActions from './withVendorsActions'; -import withVendors from './withVendors'; +import { withVendorsActions } from './withVendorsActions'; +import { withVendors } from './withVendors'; import { transfromViewsToTabs, compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsList.tsx b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsList.tsx index e39ac1ffe..6779babd1 100644 --- a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsList.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsList.tsx @@ -9,8 +9,8 @@ import { VendorsListProvider } from './VendorsListProvider'; import VendorActionsBar from './VendorActionsBar'; import VendorsTable from './VendorsTable'; -import withVendors from './withVendors'; -import withVendorsActions from './withVendorsActions'; +import { withVendors } from './withVendors'; +import { withVendorsActions } from './withVendorsActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsTable.tsx b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsTable.tsx index fa47060be..e191e5927 100644 --- a/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsTable.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsLanding/VendorsTable.tsx @@ -15,12 +15,12 @@ import { useVendorsListContext } from './VendorsListProvider'; import { useMemorizedColumnsWidths } from '@/hooks'; import { ActionsMenu, useVendorsTableColumns } from './components'; -import withVendors from './withVendors'; -import withVendorsActions from './withVendorsActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withVendors } from './withVendors'; +import { withVendorsActions } from './withVendorsActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -36,7 +36,7 @@ function VendorsTable({ // #withVendors vendorsTableState, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -175,7 +175,7 @@ function VendorsTable({ export default compose( withVendorsActions, - withAlertsActions, + withAlertActions, withDialogActions, withDrawerActions, diff --git a/packages/webapp/src/containers/Vendors/VendorsLanding/withVendors.tsx b/packages/webapp/src/containers/Vendors/VendorsLanding/withVendors.tsx index b41a3e548..93bb43655 100644 --- a/packages/webapp/src/containers/Vendors/VendorsLanding/withVendors.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsLanding/withVendors.tsx @@ -5,7 +5,7 @@ import { vendorsTableStateChangedFactory, } from '@/store/vendors/vendors.selectors'; -export default (mapState) => { +export const withVendors = (mapState) => { const getVendorsTableState = getVendorsTableStateFactory(); const vendorsTableStateChanged = vendorsTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/Vendors/VendorsLanding/withVendorsActions.tsx b/packages/webapp/src/containers/Vendors/VendorsLanding/withVendorsActions.tsx index 13332badb..070ac8986 100644 --- a/packages/webapp/src/containers/Vendors/VendorsLanding/withVendorsActions.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsLanding/withVendorsActions.tsx @@ -15,4 +15,4 @@ const mapDispatchToProps = (dispatch) => ({ resetVendorsSelectedRows: () => dispatch(resetVendorsSelectedRows()), }); -export default connect(null, mapDispatchToProps); +export const withVendorsActions = connect(null, mapDispatchToProps); diff --git a/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx b/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx index 8134cc25c..81c6e1061 100644 --- a/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx @@ -3,7 +3,7 @@ import intl from 'react-intl-universal'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { AbilitySubject, VendorAction } from '@/constants/abilityOption'; -import withDrawerActions from '../Drawer/withDrawerActions'; +import { withDrawerActions } from '../Drawer/withDrawerActions'; import { DRAWERS } from '@/constants/drawers'; /** diff --git a/packages/webapp/src/containers/Vendors/withVendorDetail.tsx b/packages/webapp/src/containers/Vendors/withVendorDetail.tsx index 8ed944492..575090a6b 100644 --- a/packages/webapp/src/containers/Vendors/withVendorDetail.tsx +++ b/packages/webapp/src/containers/Vendors/withVendorDetail.tsx @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import { getVendorByIdFactory } from '@/store/vendors/vendors.selectors'; -export default () => { +export const withVendorDetail = () => { const getVendorById = getVendorByIdFactory(); const mapStateToProps = (state, props) => ({ vendor: getVendorById(state, props), diff --git a/packages/webapp/src/containers/Views/ViewForm.container.tsx b/packages/webapp/src/containers/Views/ViewForm.container.tsx index cde9e91fd..8bb8659d0 100644 --- a/packages/webapp/src/containers/Views/ViewForm.container.tsx +++ b/packages/webapp/src/containers/Views/ViewForm.container.tsx @@ -2,10 +2,10 @@ import {connect} from 'react-redux'; import {compose} from '@/utils'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withResourceDetail from '@/containers/Resources/withResourceDetails'; -import withViewsActions from '@/containers/Views/withViewsActions'; -import withViewsDetails from '@/containers/Views/withViewDetails'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withResourceDetail } from '@/containers/Resources/withResourceDetails'; +import { withViewsActions } from '@/containers/Views/withViewsActions'; +import { withViewsDetails } from '@/containers/Views/withViewDetails'; const mapStateToProps = (state, ownProps) => { return { diff --git a/packages/webapp/src/containers/Views/ViewFormPage.tsx b/packages/webapp/src/containers/Views/ViewFormPage.tsx index 1d2769850..63aab333b 100644 --- a/packages/webapp/src/containers/Views/ViewFormPage.tsx +++ b/packages/webapp/src/containers/Views/ViewFormPage.tsx @@ -16,9 +16,9 @@ import ViewForm from '@/containers/Views/ViewForm'; import { compose } from '@/utils'; -import withResourcesActions from '@/containers/Resources/withResourcesActions'; -import withViewsActions from '@/containers/Views/withViewsActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; +import { withResourcesActions } from '@/containers/Resources/withResourcesActions'; +import { withViewsActions } from '@/containers/Views/withViewsActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; // @flow function ViewFormPage({ diff --git a/packages/webapp/src/containers/Views/withCurrentView.tsx b/packages/webapp/src/containers/Views/withCurrentView.tsx index 19a6bb62e..cbef2184b 100644 --- a/packages/webapp/src/containers/Views/withCurrentView.tsx +++ b/packages/webapp/src/containers/Views/withCurrentView.tsx @@ -5,4 +5,4 @@ const mapStateToProps = (state, props) => ({ currentViewId: props.match.params.custom_view_id, }); -export default connect(mapStateToProps); +export const withCurrentView = connect(mapStateToProps); diff --git a/packages/webapp/src/containers/Views/withViewDetails.tsx b/packages/webapp/src/containers/Views/withViewDetails.tsx index 3b1435e52..594bc4e5b 100644 --- a/packages/webapp/src/containers/Views/withViewDetails.tsx +++ b/packages/webapp/src/containers/Views/withViewDetails.tsx @@ -5,7 +5,7 @@ import { getViewMetaFactory, } from '@/store/customViews/customViews.selectors'; -export default () => { +export const withViewDetails = () => { const getViewItem = getViewItemFactory(); const getViewMeta = getViewMetaFactory(); diff --git a/packages/webapp/src/containers/Views/withViewsActions.tsx b/packages/webapp/src/containers/Views/withViewsActions.tsx index 4ca548405..efe42b97c 100644 --- a/packages/webapp/src/containers/Views/withViewsActions.tsx +++ b/packages/webapp/src/containers/Views/withViewsActions.tsx @@ -20,4 +20,4 @@ export const mapDispatchToProps = (dispatch) => ({ requestFetchViewResource: (id) => dispatch(fetchViewResource({ id })), }); -export default connect(null, mapDispatchToProps); \ No newline at end of file +export const withViewsActions = connect(null, mapDispatchToProps); \ No newline at end of file diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.tsx index 27ef70808..efd4dca80 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.tsx @@ -18,8 +18,8 @@ import WarehouseTransferEditorField from './WarehouseTransferEditorField'; import WarehouseTransferFormFooter from './WarehouseTransferFormFooter'; import WarehouseTransferFloatingActions from './WarehouseTransferFloatingActions'; import WarehouseTransferFormDialog from './WarehouseTransferFormDialog'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { AppToaster } from '@/components'; import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider'; diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.tsx index e1c674b13..6f10b194c 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormHeaderFields.tsx @@ -16,8 +16,8 @@ import { CLASSES } from '@/constants/classes'; import { FieldRequiredHint, Icon, InputPrependButton } from '@/components'; import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider'; import { useObserveTransferNoSettings } from './utils'; -import withSettings from '@/containers/Settings/withSettings'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; /** * Warehouse transfer form header fields. diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.tsx index 3032334c0..aa8031d63 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersActionsBar.tsx @@ -19,10 +19,10 @@ import { } from '@/components'; import { useWarehouseTranfersListContext } from './WarehouseTransfersListProvider'; -import withSettings from '@/containers/Settings/withSettings'; -import withSettingsActions from '@/containers/Settings/withSettingsActions'; -import withWarehouseTransfers from './withWarehouseTransfers'; -import withWarehouseTransfersActions from './withWarehouseTransfersActions'; +import { withSettings } from '@/containers/Settings/withSettings'; +import { withSettingsActions } from '@/containers/Settings/withSettingsActions'; +import { withWarehouseTransfers } from './withWarehouseTransfers'; +import { withWarehouseTransfersActions } from './withWarehouseTransfersActions'; import { compose } from '@/utils'; diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.tsx index 99b3736a7..0f4ef1018 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersDataTable.tsx @@ -13,12 +13,12 @@ import { useWarehouseTransfersTableColumns, ActionsMenu } from './components'; import { useWarehouseTranfersListContext } from './WarehouseTransfersListProvider'; import WarehouseTransfersEmptyStatus from './WarehouseTransfersEmptyStatus'; -import withWarehouseTransfersActions from './withWarehouseTransfersActions'; -import withDrawerActions from '@/containers/Drawer/withDrawerActions'; -import withDialogActions from '@/containers/Dialog/withDialogActions'; -import withDashboardActions from '@/containers/Dashboard/withDashboardActions'; -import withAlertsActions from '@/containers/Alert/withAlertActions'; -import withSettings from '@/containers/Settings/withSettings'; +import { withWarehouseTransfersActions } from './withWarehouseTransfersActions'; +import { withDrawerActions } from '@/containers/Drawer/withDrawerActions'; +import { withDialogActions } from '@/containers/Dialog/withDialogActions'; +import { withDashboardActions } from '@/containers/Dashboard/withDashboardActions'; +import { withAlertActions } from '@/containers/Alert/withAlertActions'; +import { withSettings } from '@/containers/Settings/withSettings'; import { compose } from '@/utils'; import { DRAWERS } from '@/constants/drawers'; @@ -30,7 +30,7 @@ function WarehouseTransfersDataTable({ // #withWarehouseTransfersActions setWarehouseTransferTableState, - // #withAlertsActions + // #withAlertActions openAlert, // #withDrawerActions @@ -147,7 +147,7 @@ function WarehouseTransfersDataTable({ export default compose( withDashboardActions, withWarehouseTransfersActions, - withAlertsActions, + withAlertActions, withDrawerActions, withDialogActions, withSettings(({ warehouseTransferSettings }) => ({ diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersList.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersList.tsx index c57fa2762..013decf56 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersList.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersList.tsx @@ -4,8 +4,8 @@ import React from 'react'; import { DashboardPageContent } from '@/components'; import WarehouseTransfersActionsBar from './WarehouseTransfersActionsBar'; import WarehouseTransfersDataTable from './WarehouseTransfersDataTable'; -import withWarehouseTransfers from './withWarehouseTransfers'; -import withWarehouseTransfersActions from './withWarehouseTransfersActions'; +import { withWarehouseTransfers } from './withWarehouseTransfers'; +import { withWarehouseTransfersActions } from './withWarehouseTransfersActions'; import { WarehouseTransfersListProvider } from './WarehouseTransfersListProvider'; import { transformTableStateToQuery, compose } from '@/utils'; diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.tsx index 11a8ff2ed..6d4fe052f 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/WarehouseTransfersViewTabs.tsx @@ -3,8 +3,8 @@ import React from 'react'; import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core'; import { DashboardViewsTabs } from '@/components'; -import withWarehouseTransfers from './withWarehouseTransfers'; -import withWarehouseTransfersActions from './withWarehouseTransfersActions'; +import { withWarehouseTransfers } from './withWarehouseTransfers'; +import { withWarehouseTransfersActions } from './withWarehouseTransfersActions'; import { useWarehouseTranfersListContext } from './WarehouseTransfersListProvider'; import { compose, transfromViewsToTabs } from '@/utils'; diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.tsx index da0b16e28..60d6ee09f 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfers.tsx @@ -5,7 +5,7 @@ import { isWarehouseTransferTableStateChangedFactory, } from '@/store/WarehouseTransfer/warehouseTransfer.selector'; -export default (mapState) => { +export const withWarehouseTransfers = (mapState) => { const getWarehouseTransferTableState = getWarehouseTransfersTableStateFactory(); const isWarehouseTransferTableChanged = isWarehouseTransferTableStateChangedFactory(); diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.tsx index 457a3d547..d74d2b8eb 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransfersLanding/withWarehouseTransfersActions.tsx @@ -11,4 +11,4 @@ const mapDipatchToProps = (dispatch) => ({ resetWarehouseTransferTableState: () => dispatch(resetWarehouseTransferTableState()), }); -export default connect(null, mapDipatchToProps); \ No newline at end of file +export const withWarehouseTransfersActions = connect(null, mapDipatchToProps); \ No newline at end of file diff --git a/packages/webapp/src/store/organizations/withSetupWizard.tsx b/packages/webapp/src/store/organizations/withSetupWizard.tsx index 298a11c14..b6eda400f 100644 --- a/packages/webapp/src/store/organizations/withSetupWizard.tsx +++ b/packages/webapp/src/store/organizations/withSetupWizard.tsx @@ -1,7 +1,7 @@ // @ts-nocheck import { connect } from 'react-redux'; -export default (mapState) => { +export const withSetupWizard = (mapState) => { const mapStateToProps = (state, props) => { const { isOrganizationSetupCompleted,