From 4215310adf800c1cd6c884839e2014a71b7f57ea Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Wed, 12 Apr 2023 12:40:37 +0300 Subject: [PATCH] project: organize ui modules exports --- .../Form/Insurance/FinGAPTable/index.jsx | 5 ++- .../Form/Insurance/InsuranceTable/config.tsx | 4 +-- .../Form/Insurance/InsuranceTable/index.jsx | 5 ++- .../Calculation/Form/Insurance/index.jsx | 2 +- .../Form/Payments/PaymentsParams.jsx | 2 +- .../Form/Payments/PaymentsTable/config.tsx | 2 +- .../Form/Payments/PaymentsTable/index.jsx | 3 +- .../web/Components/Calculation/Form/index.jsx | 2 +- .../config/elements-render/override.tsx | 3 +- .../Calculation/lib/render-rows.tsx | 3 +- apps/web/Components/Common/Error.jsx | 3 +- apps/web/Components/Layout/Auth.jsx | 2 +- apps/web/Components/Layout/Element.tsx | 2 +- apps/web/Components/Layout/Header.jsx | 2 +- apps/web/Components/Layout/Logo.jsx | 3 +- apps/web/Components/Layout/index.jsx | 2 +- .../Components/Output/PaymentsTable/index.jsx | 2 +- apps/web/Components/Output/Results/index.jsx | 2 +- apps/web/Components/Output/Validation.jsx | 2 +- apps/web/Components/Output/index.jsx | 2 +- apps/web/pages/404.jsx | 3 +- apps/web/process/calculate/action.ts | 2 +- apps/web/process/create-kp/action.ts | 2 +- .../leasing-without-kasko/reactions.ts | 2 +- apps/web/process/load-kp/reactions.ts | 2 +- apps/web/stores/validation/index.ts | 2 +- packages/ui/elements/Alert.js | 1 - packages/ui/elements/Result.js | 1 - packages/ui/elements/Table.js | 1 - packages/ui/elements/Tooltip.js | 1 - packages/ui/elements/badge.js | 1 - packages/ui/elements/index.ts | 31 ++++++++++++++----- packages/ui/elements/layout/Divider.js | 1 - packages/ui/elements/layout/Tabs.js | 1 - packages/ui/elements/layout/index.ts | 2 -- packages/ui/elements/message.js | 9 ------ packages/ui/elements/notification.ts | 8 ----- packages/ui/elements/tag.js | 1 - packages/ui/index.ts | 2 -- 39 files changed, 54 insertions(+), 72 deletions(-) delete mode 100644 packages/ui/elements/Alert.js delete mode 100644 packages/ui/elements/Result.js delete mode 100644 packages/ui/elements/Table.js delete mode 100644 packages/ui/elements/Tooltip.js delete mode 100644 packages/ui/elements/badge.js delete mode 100644 packages/ui/elements/layout/Divider.js delete mode 100644 packages/ui/elements/layout/Tabs.js delete mode 100644 packages/ui/elements/layout/index.ts delete mode 100644 packages/ui/elements/message.js delete mode 100644 packages/ui/elements/notification.ts delete mode 100644 packages/ui/elements/tag.js delete mode 100644 packages/ui/index.ts diff --git a/apps/web/Components/Calculation/Form/Insurance/FinGAPTable/index.jsx b/apps/web/Components/Calculation/Form/Insurance/FinGAPTable/index.jsx index 459bcb6..a22f6b0 100644 --- a/apps/web/Components/Calculation/Form/Insurance/FinGAPTable/index.jsx +++ b/apps/web/Components/Calculation/Form/Insurance/FinGAPTable/index.jsx @@ -3,9 +3,8 @@ import { useStore } from '@/stores/hooks'; import { toJS } from 'mobx'; import { observer } from 'mobx-react-lite'; import styled from 'styled-components'; -import { Flex } from 'ui'; -import Alert from 'ui/elements/Alert'; -import Table from 'ui/elements/Table'; +import { Alert, Table } from 'ui/elements'; +import { Flex } from 'ui/grid'; const Grid = styled(Flex)` flex-direction: column; diff --git a/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx b/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx index 5b6ca90..4262bf4 100644 --- a/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx +++ b/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/config.tsx @@ -4,8 +4,8 @@ import type * as Insurance from './types'; import { MAX_INSURANCE } from '@/constants/values'; import type { ColumnsType } from 'antd/lib/table'; import { parser } from 'tools/number'; -import InputNumber, { createFormatter } from 'ui/elements/InputNumber'; -import Select from 'ui/elements/Select'; +import { InputNumber, Select } from 'ui/elements'; +import { createFormatter } from 'ui/elements/InputNumber'; export const columns: ColumnsType = [ { diff --git a/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/index.jsx b/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/index.jsx index 1a362ea..6f3eab2 100644 --- a/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/index.jsx +++ b/apps/web/Components/Calculation/Form/Insurance/InsuranceTable/index.jsx @@ -2,9 +2,8 @@ import { columns } from './config'; import { useStore } from '@/stores/hooks'; import { observer } from 'mobx-react-lite'; import styled from 'styled-components'; -import { Flex } from 'ui'; -import Alert from 'ui/elements/Alert'; -import Table from 'ui/elements/Table'; +import { Alert, Table } from 'ui/elements'; +import { Flex } from 'ui/grid'; const Grid = styled(Flex)` flex-direction: column; diff --git a/apps/web/Components/Calculation/Form/Insurance/index.jsx b/apps/web/Components/Calculation/Form/Insurance/index.jsx index eab56cb..3a0025b 100644 --- a/apps/web/Components/Calculation/Form/Insurance/index.jsx +++ b/apps/web/Components/Calculation/Form/Insurance/index.jsx @@ -2,7 +2,7 @@ import renderFormRows from '../../lib/render-rows'; import { id, rows, title } from './config'; import FinGAPTable from './FinGAPTable'; import InsuranceTable from './InsuranceTable'; -import { Flex } from 'ui'; +import { Flex } from 'ui/elements'; function Insurance() { const renderedRows = renderFormRows(rows); diff --git a/apps/web/Components/Calculation/Form/Payments/PaymentsParams.jsx b/apps/web/Components/Calculation/Form/Payments/PaymentsParams.jsx index 2b362f0..4c30b1e 100644 --- a/apps/web/Components/Calculation/Form/Payments/PaymentsParams.jsx +++ b/apps/web/Components/Calculation/Form/Payments/PaymentsParams.jsx @@ -2,7 +2,7 @@ import elementsRender from '../../config/elements-render'; import { elements } from './config'; import { useStore } from '@/stores/hooks'; import { observer } from 'mobx-react-lite'; -import { Flex } from 'ui'; +import { Flex } from 'ui/elements'; function PaymentsParams() { const renderedElements = elements.map((elementName) => { diff --git a/apps/web/Components/Calculation/Form/Payments/PaymentsTable/config.tsx b/apps/web/Components/Calculation/Form/Payments/PaymentsTable/config.tsx index ba50492..9664aa3 100644 --- a/apps/web/Components/Calculation/Form/Payments/PaymentsTable/config.tsx +++ b/apps/web/Components/Calculation/Form/Payments/PaymentsTable/config.tsx @@ -1,7 +1,7 @@ /* eslint-disable canonical/sort-keys */ import { buildValueComponent } from './builders'; import type { ColumnsType } from 'antd/lib/table'; -import InputNumber from 'ui/elements/InputNumber'; +import { InputNumber } from 'ui/elements'; type Payment = { key: number; diff --git a/apps/web/Components/Calculation/Form/Payments/PaymentsTable/index.jsx b/apps/web/Components/Calculation/Form/Payments/PaymentsTable/index.jsx index 7659990..863f52e 100644 --- a/apps/web/Components/Calculation/Form/Payments/PaymentsTable/index.jsx +++ b/apps/web/Components/Calculation/Form/Payments/PaymentsTable/index.jsx @@ -4,8 +4,7 @@ import { min } from '@/styles/mq'; import { computed } from 'mobx'; import { observer } from 'mobx-react-lite'; import styled from 'styled-components'; -import Alert from 'ui/elements/Alert'; -import Table from 'ui/elements/Table'; +import { Alert, Table } from 'ui/elements'; import { Box, Flex } from 'ui/grid'; const Grid = styled(Flex)` diff --git a/apps/web/Components/Calculation/Form/index.jsx b/apps/web/Components/Calculation/Form/index.jsx index 7ba84b9..3b1c3e0 100644 --- a/apps/web/Components/Calculation/Form/index.jsx +++ b/apps/web/Components/Calculation/Form/index.jsx @@ -9,7 +9,7 @@ import Unlimited from './Unlimited'; import Background from '@/Components/Layout/Background'; import { min } from '@/styles/mq'; import styled from 'styled-components'; -import Tabs from 'ui/elements/layout/Tabs'; +import { Tabs } from 'ui/elements'; const formTabs = [ Leasing, diff --git a/apps/web/Components/Calculation/config/elements-render/override.tsx b/apps/web/Components/Calculation/config/elements-render/override.tsx index ad30059..fbfad70 100644 --- a/apps/web/Components/Calculation/config/elements-render/override.tsx +++ b/apps/web/Components/Calculation/config/elements-render/override.tsx @@ -10,9 +10,8 @@ import { useStore } from '@/stores/hooks'; import { useIsFetching } from '@tanstack/react-query'; import { observer } from 'mobx-react-lite'; import type { ComponentProps } from 'react'; +import { Link, Tooltip } from 'ui/elements'; import { LoadingOutlined } from 'ui/elements/icons'; -import Link from 'ui/elements/Link'; -import Tooltip from 'ui/elements/Tooltip'; const defaultLinkProps: ComponentProps = { text: 'Открыть в CRM', diff --git a/apps/web/Components/Calculation/lib/render-rows.tsx b/apps/web/Components/Calculation/lib/render-rows.tsx index 35d0476..2a879f6 100644 --- a/apps/web/Components/Calculation/lib/render-rows.tsx +++ b/apps/web/Components/Calculation/lib/render-rows.tsx @@ -1,9 +1,8 @@ /* eslint-disable react/no-array-index-key */ - import elementsRender from '../config/elements-render'; import type { Elements as ActionElements } from '../config/map/actions'; import type { Elements as ValuesElements } from '../config/map/values'; -import Divider from 'ui/elements/layout/Divider'; +import { Divider } from 'ui/elements'; import type { BoxProps } from 'ui/grid'; import { Box } from 'ui/grid'; diff --git a/apps/web/Components/Common/Error.jsx b/apps/web/Components/Common/Error.jsx index 5a16ff4..a33386b 100644 --- a/apps/web/Components/Common/Error.jsx +++ b/apps/web/Components/Common/Error.jsx @@ -1,6 +1,5 @@ /* eslint-disable sonarjs/no-small-switch */ -import Button from 'ui/elements/Button'; -import Result from 'ui/elements/Result'; +import { Button, Result } from 'ui/elements'; function handleRetry() { window.location.reload(); diff --git a/apps/web/Components/Layout/Auth.jsx b/apps/web/Components/Layout/Auth.jsx index 1d54b08..af98214 100644 --- a/apps/web/Components/Layout/Auth.jsx +++ b/apps/web/Components/Layout/Auth.jsx @@ -3,7 +3,7 @@ import { STALE_TIME } from '@/constants/request'; import { min } from '@/styles/mq'; import { useQuery } from '@tanstack/react-query'; import styled from 'styled-components'; -import { Flex } from 'ui'; +import { Flex } from 'ui/grid'; const UserText = styled.span` margin: 0; diff --git a/apps/web/Components/Layout/Element.tsx b/apps/web/Components/Layout/Element.tsx index d62ad16..4cec38a 100644 --- a/apps/web/Components/Layout/Element.tsx +++ b/apps/web/Components/Layout/Element.tsx @@ -2,7 +2,7 @@ import { min } from '@/styles/mq'; import type { ReactNode } from 'react'; import styled from 'styled-components'; -import { Flex } from 'ui'; +import { Flex } from 'ui/grid'; const ElementTitle = styled.label` color: rgba(0, 0, 0, 0.75); diff --git a/apps/web/Components/Layout/Header.jsx b/apps/web/Components/Layout/Header.jsx index bf920f0..b4ec8ce 100644 --- a/apps/web/Components/Layout/Header.jsx +++ b/apps/web/Components/Layout/Header.jsx @@ -2,7 +2,7 @@ import Auth from './Auth'; import Logo from './Logo'; import { min } from '@/styles/mq'; import styled from 'styled-components'; -import { Flex } from 'ui'; +import { Flex } from 'ui/grid'; const HeaderContent = styled(Flex)` flex-direction: row; diff --git a/apps/web/Components/Layout/Logo.jsx b/apps/web/Components/Layout/Logo.jsx index 7edee39..9488349 100644 --- a/apps/web/Components/Layout/Logo.jsx +++ b/apps/web/Components/Layout/Logo.jsx @@ -7,7 +7,8 @@ import { observer } from 'mobx-react-lite'; import Image from 'next/image'; import logo from 'public/assets/images/logo-primary.svg'; import styled from 'styled-components'; -import { Flex, Tag } from 'ui'; +import { Tag } from 'ui/elements'; +import { Flex } from 'ui/grid'; const ImageWrapper = styled.div` width: 100px; diff --git a/apps/web/Components/Layout/index.jsx b/apps/web/Components/Layout/index.jsx index 54abe53..f433777 100644 --- a/apps/web/Components/Layout/index.jsx +++ b/apps/web/Components/Layout/index.jsx @@ -1,5 +1,5 @@ import Header from './Header'; -import { Flex } from 'ui'; +import { Flex } from 'ui/grid'; export default function Layout({ children }) { return ( diff --git a/apps/web/Components/Output/PaymentsTable/index.jsx b/apps/web/Components/Output/PaymentsTable/index.jsx index 2728fd9..afba73c 100644 --- a/apps/web/Components/Output/PaymentsTable/index.jsx +++ b/apps/web/Components/Output/PaymentsTable/index.jsx @@ -3,7 +3,7 @@ import { MAX_LEASING_PERIOD } from '@/constants/values'; import { useStore } from '@/stores/hooks'; import { toJS } from 'mobx'; import { observer } from 'mobx-react-lite'; -import Table from 'ui/elements/Table'; +import { Table } from 'ui/elements'; const PaymentsTable = observer(() => { const { $results } = useStore(); diff --git a/apps/web/Components/Output/Results/index.jsx b/apps/web/Components/Output/Results/index.jsx index a577f30..b421a1e 100644 --- a/apps/web/Components/Output/Results/index.jsx +++ b/apps/web/Components/Output/Results/index.jsx @@ -5,7 +5,7 @@ import { min } from '@/styles/mq'; import { toJS } from 'mobx'; import { observer } from 'mobx-react-lite'; import styled from 'styled-components'; -import Text from 'ui/elements/Text'; +import { Text } from 'ui/elements'; import { Box } from 'ui/grid'; const Grid = styled(Box)` diff --git a/apps/web/Components/Output/Validation.jsx b/apps/web/Components/Output/Validation.jsx index e5397a4..f5f3547 100644 --- a/apps/web/Components/Output/Validation.jsx +++ b/apps/web/Components/Output/Validation.jsx @@ -2,7 +2,7 @@ import { useStore } from '@/stores/hooks'; import { observer } from 'mobx-react-lite'; import styled from 'styled-components'; -import Alert from 'ui/elements/Alert'; +import { Alert } from 'ui/elements'; import { Box, Flex } from 'ui/grid'; const Bold = styled.span` diff --git a/apps/web/Components/Output/index.jsx b/apps/web/Components/Output/index.jsx index 055e5ce..4493a1e 100644 --- a/apps/web/Components/Output/index.jsx +++ b/apps/web/Components/Output/index.jsx @@ -6,7 +6,7 @@ import { useStore } from '@/stores/hooks'; import { min } from '@/styles/mq'; import { observer } from 'mobx-react-lite'; import styled from 'styled-components'; -import { Badge, Tabs } from 'ui'; +import { Badge, Tabs } from 'ui/elements'; const outputTabs = [PaymentsTable, Results, Validation]; const items = outputTabs.map(({ Component, id, title }) => { diff --git a/apps/web/pages/404.jsx b/apps/web/pages/404.jsx index f6201ee..dc1870d 100644 --- a/apps/web/pages/404.jsx +++ b/apps/web/pages/404.jsx @@ -1,4 +1,5 @@ -import Result from 'ui/elements/Result'; +/* eslint-disable canonical/filename-match-regex */ +import { Result } from 'ui/elements'; export default function NotFound() { return ; diff --git a/apps/web/process/calculate/action.ts b/apps/web/process/calculate/action.ts index 5948d2d..cb198b3 100644 --- a/apps/web/process/calculate/action.ts +++ b/apps/web/process/calculate/action.ts @@ -1,6 +1,6 @@ import type { ProcessContext } from '../types'; import { toJS } from 'mobx'; -import notification from 'ui/elements/notification'; +import { notification } from 'ui/elements'; const key = 'ACTION_CALCULATE'; const errorMessage = 'Ошибка во время расчета графика!'; diff --git a/apps/web/process/create-kp/action.ts b/apps/web/process/create-kp/action.ts index 2b2881c..47f0ce1 100644 --- a/apps/web/process/create-kp/action.ts +++ b/apps/web/process/create-kp/action.ts @@ -1,7 +1,7 @@ import { updateSelectQuote } from '../lead-opportunity/reactions/common'; import type { ProcessContext } from '../types'; import { toJS } from 'mobx'; -import notification from 'ui/elements/notification'; +import { notification } from 'ui/elements'; const key = 'ACTION_CREATEKP'; const errorMessage = 'Ошибка во время создания КП!'; diff --git a/apps/web/process/leasing-without-kasko/reactions.ts b/apps/web/process/leasing-without-kasko/reactions.ts index fbe7912..185c23b 100644 --- a/apps/web/process/leasing-without-kasko/reactions.ts +++ b/apps/web/process/leasing-without-kasko/reactions.ts @@ -7,7 +7,7 @@ import utc from 'dayjs/plugin/utc'; import { reaction } from 'mobx'; import { uid } from 'radash'; import { normalizeOptions } from 'tools'; -import notification from 'ui/elements/notification'; +import { notification } from 'ui/elements'; dayjs.extend(utc); diff --git a/apps/web/process/load-kp/reactions.ts b/apps/web/process/load-kp/reactions.ts index f1100f3..8592abb 100644 --- a/apps/web/process/load-kp/reactions.ts +++ b/apps/web/process/load-kp/reactions.ts @@ -1,7 +1,7 @@ import type { ProcessContext } from '@/process/types'; import { reaction } from 'mobx'; import { omit } from 'radash'; -import message from 'ui/elements/message'; +import { message } from 'ui/elements'; const key = 'KP_LOADING_INFO'; diff --git a/apps/web/stores/validation/index.ts b/apps/web/stores/validation/index.ts index 0154033..afb8e27 100644 --- a/apps/web/stores/validation/index.ts +++ b/apps/web/stores/validation/index.ts @@ -1,7 +1,7 @@ import type RootStore from '../root'; import type { RemoveError, ValidationConfig, ValidationError, ValidationParams } from './types'; import { makeAutoObservable } from 'mobx'; -import notification from 'ui/elements/notification'; +import { notification } from 'ui/elements'; export default class Validation { private root: RootStore; diff --git a/packages/ui/elements/Alert.js b/packages/ui/elements/Alert.js deleted file mode 100644 index 4ad8e33..0000000 --- a/packages/ui/elements/Alert.js +++ /dev/null @@ -1 +0,0 @@ -export { Alert as default } from 'antd'; diff --git a/packages/ui/elements/Result.js b/packages/ui/elements/Result.js deleted file mode 100644 index 031b1ee..0000000 --- a/packages/ui/elements/Result.js +++ /dev/null @@ -1 +0,0 @@ -export { Result as default } from 'antd'; diff --git a/packages/ui/elements/Table.js b/packages/ui/elements/Table.js deleted file mode 100644 index 0d0f490..0000000 --- a/packages/ui/elements/Table.js +++ /dev/null @@ -1 +0,0 @@ -export { Table as default } from 'antd'; diff --git a/packages/ui/elements/Tooltip.js b/packages/ui/elements/Tooltip.js deleted file mode 100644 index 2f579c2..0000000 --- a/packages/ui/elements/Tooltip.js +++ /dev/null @@ -1 +0,0 @@ -export { Tooltip as default } from 'antd'; diff --git a/packages/ui/elements/badge.js b/packages/ui/elements/badge.js deleted file mode 100644 index d4ecff9..0000000 --- a/packages/ui/elements/badge.js +++ /dev/null @@ -1 +0,0 @@ -export { Badge } from 'antd'; diff --git a/packages/ui/elements/index.ts b/packages/ui/elements/index.ts index 7ba3afd..4db5d13 100644 --- a/packages/ui/elements/index.ts +++ b/packages/ui/elements/index.ts @@ -1,19 +1,34 @@ -export * from './badge'; +import { message, notification } from 'antd'; + +message.config({ + maxCount: 3, + top: 70, +}); + +notification.config({ + placement: 'bottomRight', +}); + export { default as Button } from './Button'; export { default as Checkbox } from './Checkbox'; export { default as AntdConfig } from './Config'; export { default as Input } from './Input'; export { default as InputNumber } from './InputNumber'; -export * from './layout'; export { default as Link } from './Link'; -export { default as message } from './message'; -export { default as notification } from './notification'; export { default as Radio } from './Radio'; -export { default as Result } from './Result'; export { default as Segmented } from './Segmented'; export { default as Select } from './Select'; export { default as Switch } from './Switch'; -export { default as Table } from './Table'; -export * from './tag'; export { default as Text } from './Text'; -export { default as Tooltip } from './Tooltip'; +export { + Alert, + Badge, + Divider, + message, + notification, + Result, + Table, + Tabs, + Tag, + Tooltip, +} from 'antd'; diff --git a/packages/ui/elements/layout/Divider.js b/packages/ui/elements/layout/Divider.js deleted file mode 100644 index 343bf7f..0000000 --- a/packages/ui/elements/layout/Divider.js +++ /dev/null @@ -1 +0,0 @@ -export { Divider as default } from 'antd'; diff --git a/packages/ui/elements/layout/Tabs.js b/packages/ui/elements/layout/Tabs.js deleted file mode 100644 index d011b65..0000000 --- a/packages/ui/elements/layout/Tabs.js +++ /dev/null @@ -1 +0,0 @@ -export { Tabs as default } from 'antd'; diff --git a/packages/ui/elements/layout/index.ts b/packages/ui/elements/layout/index.ts deleted file mode 100644 index 1c74c46..0000000 --- a/packages/ui/elements/layout/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { default as Divider } from './Divider'; -export { default as Tabs } from './Tabs'; diff --git a/packages/ui/elements/message.js b/packages/ui/elements/message.js deleted file mode 100644 index 2e6876d..0000000 --- a/packages/ui/elements/message.js +++ /dev/null @@ -1,9 +0,0 @@ -/* eslint-disable unicorn/prefer-export-from */ -import { message } from 'antd'; - -message.config({ - maxCount: 3, - top: 70, -}); - -export default message; diff --git a/packages/ui/elements/notification.ts b/packages/ui/elements/notification.ts deleted file mode 100644 index 0e8946f..0000000 --- a/packages/ui/elements/notification.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* eslint-disable unicorn/prefer-export-from */ -import { notification } from 'antd'; - -notification.config({ - placement: 'bottomRight', -}); - -export default notification; diff --git a/packages/ui/elements/tag.js b/packages/ui/elements/tag.js deleted file mode 100644 index 2bfffd1..0000000 --- a/packages/ui/elements/tag.js +++ /dev/null @@ -1 +0,0 @@ -export { Tag } from 'antd'; diff --git a/packages/ui/index.ts b/packages/ui/index.ts deleted file mode 100644 index cf4175b..0000000 --- a/packages/ui/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './elements'; -export * from './grid';