diff --git a/src/entities/common/model/types.ts b/src/entities/common/model/types.ts index 9212d85..d7a7cca 100644 --- a/src/entities/common/model/types.ts +++ b/src/entities/common/model/types.ts @@ -78,6 +78,15 @@ export enum FooterItemActiveKey { Settlement = 'Settlement', Account = 'Account', }; +export enum SortByKeys { + New = 'New', + Amount = 'Amount', +}; +export interface SortOptionsBoxProps { + sortBy: SortByKeys; + onClickToSort: (sortBy: SortByKeys) => void; +}; + export interface CodesSelectParams { codeCl?: string; colNm?: string; diff --git a/src/entities/settlement/ui/sort-options-box.tsx b/src/entities/common/ui/sort-options-box.tsx similarity index 100% rename from src/entities/settlement/ui/sort-options-box.tsx rename to src/entities/common/ui/sort-options-box.tsx diff --git a/src/entities/settlement/model/types.ts b/src/entities/settlement/model/types.ts index 5a5c04c..4a87ab2 100644 --- a/src/entities/settlement/model/types.ts +++ b/src/entities/settlement/model/types.ts @@ -1,13 +1,5 @@ import { DefaulResponsePagination, DefaultRequestPagination } from '@/entities/common/model/types'; -export enum SortByKeys { - New = 'New', - Amount = 'Amount', -}; -export interface SortOptionsBoxProps { - sortBy: SortByKeys; - onClickToSort: (sortBy: SortByKeys) => void; -}; export enum SettlementTabKeys { Calendar = 'calendar', List = 'list' diff --git a/src/entities/settlement/ui/list-wrap.tsx b/src/entities/settlement/ui/list-wrap.tsx index ab0710a..b296f7c 100644 --- a/src/entities/settlement/ui/list-wrap.tsx +++ b/src/entities/settlement/ui/list-wrap.tsx @@ -6,7 +6,7 @@ import { ListDateGroup } from './list-date-group'; import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; -import { SortOptionsBox } from '@/entities/settlement/ui/sort-options-box'; +import { SortOptionsBox } from '@/entities/common/ui/sort-options-box'; import { useSettlementsHistoryMutation } from '../api/use-settlements-history-mutation'; import { useSettlementsHistorySummaryMutation } from '../api/use-settlements-history-summary-mutation'; import { useSettlementsTransactionSummaryMutation } from '../api/use-settlements-transaction-summary-mutation'; @@ -18,13 +18,13 @@ import 'react-slidedown/lib/slidedown.css'; import { ListFilter } from './filter/list-filter'; import { useDownloadExcelMutation } from '@/entities/transaction/api/use-download-excel-mutation'; import { - SortByKeys, SettlementPeriodType, SettlementPaymentMethod, SettlementsHistoryContent, ListDateGroupProps, SettlementsTransactionListContent -} from '@/entities/settlement/model/types'; +} from '../model/types'; +import { SortByKeys } from '@/entities/common/model/types'; export interface ListWrapProps { startDateFromCalendar?: string; diff --git a/src/entities/tax/model/types.ts b/src/entities/tax/model/types.ts index d3270c2..9391853 100644 --- a/src/entities/tax/model/types.ts +++ b/src/entities/tax/model/types.ts @@ -9,23 +9,14 @@ export interface InvoiceFilterProps { filterOn: boolean; setFilterOn: (filterOn: boolean) => void; }; -export enum SortByKeys { - New = 'New', - Amount = 'Amount', -}; -export interface SortOptionsBoxProps { - sortBy: SortByKeys; - onCliCkToSort: (sortBy: SortByKeys) => void; -}; + export enum DetailInfoSectionKeys { Amount = 'Amount', Publish = 'Publish', Receiver = 'Receiver', Supplier = 'Supplier', }; -export interface InvoiceArrowProps { - show?: boolean; -}; + export interface InvoiceListParams { }; @@ -77,7 +68,7 @@ export interface DetailResponse { }; export interface DetailInfoSectionProps extends DetailResponse { - show?: boolean; + isOpen?: boolean; tid?: string; onClickToShowInfo?: (info: DetailInfoSectionKeys) => void; }; \ No newline at end of file diff --git a/src/entities/tax/ui/detail-amount-info-section.tsx b/src/entities/tax/ui/detail-amount-info-section.tsx index d43ee4b..e9f12a2 100644 --- a/src/entities/tax/ui/detail-amount-info-section.tsx +++ b/src/entities/tax/ui/detail-amount-info-section.tsx @@ -1,9 +1,9 @@ import { DetailInfoSectionProps } from '../model/types'; -import { InvoiceArrow } from './invoice-arrow'; +import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow'; export const DetailAmountInfoSection = ({ amountInfo, - show, + isOpen, onClickToShowInfo }: DetailInfoSectionProps) => { @@ -16,7 +16,7 @@ export const DetailAmountInfoSection = ({ className="chip-btn" type="button" > - 금액상세 + 금액상세
diff --git a/src/entities/tax/ui/detail-publish-info-section.tsx b/src/entities/tax/ui/detail-publish-info-section.tsx index 2aa57e2..5d99b27 100644 --- a/src/entities/tax/ui/detail-publish-info-section.tsx +++ b/src/entities/tax/ui/detail-publish-info-section.tsx @@ -2,7 +2,7 @@ import { DetailInfoSectionProps } from '../model/types'; export const DetailPublishInfoSection = ({ publishInfo, - show, + isOpen, onClickToShowInfo }: DetailInfoSectionProps) => { diff --git a/src/entities/tax/ui/detail-receiver-info-section.tsx b/src/entities/tax/ui/detail-receiver-info-section.tsx index c92d2b1..4cab110 100644 --- a/src/entities/tax/ui/detail-receiver-info-section.tsx +++ b/src/entities/tax/ui/detail-receiver-info-section.tsx @@ -2,7 +2,7 @@ import { DetailInfoSectionProps } from '../model/types'; export const DetailReceiverInfoSection = ({ receiverInfo, - show, + isOpen, onClickToShowInfo }: DetailInfoSectionProps) => { diff --git a/src/entities/tax/ui/detail-supplier-info-section.tsx b/src/entities/tax/ui/detail-supplier-info-section.tsx index a4ed5ac..e1c0304 100644 --- a/src/entities/tax/ui/detail-supplier-info-section.tsx +++ b/src/entities/tax/ui/detail-supplier-info-section.tsx @@ -2,7 +2,7 @@ import { DetailInfoSectionProps } from '../model/types'; export const DetailSupplierInfoSection = ({ supplierInfo, - show, + isOpen, onClickToShowInfo }: DetailInfoSectionProps) => { diff --git a/src/entities/tax/ui/invoice-arrow.tsx b/src/entities/tax/ui/invoice-arrow.tsx deleted file mode 100644 index bb93730..0000000 --- a/src/entities/tax/ui/invoice-arrow.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { useEffect, useState } from 'react'; -import { IMAGE_ROOT } from '@/shared/constants/common'; -import { AltMsgKeys } from '@/entities/common/model/types'; -import { InvoiceArrowProps } from '../model/types'; - -export const InvoiceArrow = ({ show }: InvoiceArrowProps) => { - const [altMsg, setAltMsg] = useState(AltMsgKeys.Fold); - const [className, setClassName] = useState('ic20 rot-180'); - - useEffect(() => { - setAltMsg((show)? AltMsgKeys.Fold: AltMsgKeys.UnFold); - setClassName(`ic20 ${(show)? 'rot-180': ''}`); - }, [show]); - - return ( - <> - { - - ); -}; \ No newline at end of file diff --git a/src/entities/tax/ui/invoice-list-wrap.tsx b/src/entities/tax/ui/invoice-list-wrap.tsx index 6cedba6..b30c473 100644 --- a/src/entities/tax/ui/invoice-list-wrap.tsx +++ b/src/entities/tax/ui/invoice-list-wrap.tsx @@ -1,8 +1,8 @@ import { useEffect, useState } from 'react'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { InvoiceFilter } from './invoice-filter'; -import { SortOptionsBox } from './sort-options-box'; -import { SortByKeys } from '../model/types'; +import { SortOptionsBox } from '@/entities/common/ui/sort-options-box'; +import { SortByKeys } from '@/entities/common/model/types'; import { InvoiceList } from './invoice-list'; export const InvoiceListWrap = () => { @@ -21,7 +21,7 @@ export const InvoiceListWrap = () => { const onClickToOpenFIlter = () => { setFilterOn(true); }; - const onCliCkToSort = (sort: SortByKeys) => { + const onClickToSort = (sort: SortByKeys) => { setSortBy(sort); }; @@ -60,7 +60,7 @@ export const InvoiceListWrap = () => {
{ - - return ( - <> -
- - | - -
- - ); -}; \ No newline at end of file diff --git a/src/entities/transaction/model/types.ts b/src/entities/transaction/model/types.ts index 3f7df5e..142ef29 100644 --- a/src/entities/transaction/model/types.ts +++ b/src/entities/transaction/model/types.ts @@ -4,10 +4,6 @@ export enum CancelTabKeys { All = 'All', Part = 'Part' }; -export enum SortByKeys { - New = 'New', - Amount = 'Amount', -}; export enum TransactionCategory { AllTransaction = 'AllTransaction', CashReceipt = 'CashReceipt', @@ -130,10 +126,6 @@ export enum BillingPaymentMethod { MOBILE_PAYMENT = 'MOBILE_PAYMENT' }; -export interface SortOptionsBoxProps { - sortBy: SortByKeys; - onCliCkToSort: (sortBy: SortByKeys) => void; -}; export interface ListItemProps extends AllTransactionListItem, CashReceiptListItem, EscrowListItem, BillingListItem { transactionCategory?: TransactionCategory; }; diff --git a/src/entities/transaction/ui/sort-options-box.tsx b/src/entities/transaction/ui/sort-options-box.tsx deleted file mode 100644 index e04140d..0000000 --- a/src/entities/transaction/ui/sort-options-box.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import { - SortByKeys, - SortOptionsBoxProps -} from '../model/types'; -export const SortOptionsBox = ({ - sortBy, - onCliCkToSort -}: SortOptionsBoxProps) => { - - return ( - <> -
- - | - -
- - ); -}; \ No newline at end of file diff --git a/src/pages/tax/invoice/detail-page.tsx b/src/pages/tax/invoice/detail-page.tsx index 42b22b2..b109db3 100644 --- a/src/pages/tax/invoice/detail-page.tsx +++ b/src/pages/tax/invoice/detail-page.tsx @@ -91,7 +91,7 @@ export const InvoiceDetailPage = () => { onClickToShowInfo(info) } > @@ -100,7 +100,7 @@ export const InvoiceDetailPage = () => { onClickToShowInfo(info) } > @@ -109,7 +109,7 @@ export const InvoiceDetailPage = () => { onClickToShowInfo(info) } > @@ -118,7 +118,7 @@ export const InvoiceDetailPage = () => { onClickToShowInfo(info) } > diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index c9d473c..ed5bb9c 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -5,15 +5,15 @@ import { IMAGE_ROOT } from '@/shared/constants/common'; import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { AllTransactionList } from '@/entities/transaction/ui/all-transaction-list'; -import { AllTransactionListItem, TransactionCategory, SortByKeys, AllTransactionStateCode, AllTransactionServiceCode, AllTransactionSearchCl } from '@/entities/transaction/model/types'; +import { AllTransactionListItem, TransactionCategory, AllTransactionStateCode, AllTransactionServiceCode, AllTransactionSearchCl } from '@/entities/transaction/model/types'; import { useAllTransactionListMutation } from '@/entities/transaction/api/use-all-transaction-list-mutation'; import { useAllTransactionListSummaryMutation } from '@/entities/transaction/api/use-all-transaction-list-summary-mutation'; import { useDownloadExcelMutation } from '@/entities/transaction/api/use-download-excel-mutation'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; import { AllTransactionFilter } from '@/entities/transaction/ui/filter/all-transaction-filter'; -import { SortOptionsBox } from '@/entities/transaction/ui/sort-options-box'; +import { SortOptionsBox } from '@/entities/common/ui/sort-options-box'; import { FooterItemActiveKey } from '@/entities/common/model/types'; -import { HeaderType } from '@/entities/common/model/types'; +import { SortByKeys, HeaderType } from '@/entities/common/model/types'; import { useSetOnBack, useSetHeaderTitle, @@ -128,7 +128,7 @@ export const AllTransactionListPage = () => { }); }; - const onCliCkToSort = (sort: SortByKeys) => { + const onClickToSort = (sort: SortByKeys) => { setSortBy(sort); callList({sortBy: sort}); }; @@ -227,7 +227,7 @@ export const AllTransactionListPage = () => {