From faccd7bd91bc4a756628efc525747c0161ebc9d2 Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Wed, 15 Oct 2025 17:12:57 +0900 Subject: [PATCH] =?UTF-8?q?sort=20=EA=B4=80=EB=A0=A8=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../additional-service/model/types.ts | 10 --- .../ui/fund-account/result-list-wrap.tsx | 22 +++---- .../ui/fund-account/transfer-list-wrap.tsx | 26 ++++---- .../link-payment-history-wrap.tsx | 27 ++++---- .../link-payment-wait-send-wrap.tsx | 23 +++---- .../ui/sort-options-box.tsx | 25 -------- .../api/use-app-alarm-consent-mutation.ts | 29 +++++++++ .../alarm/api/use-app-alarm-find-mutation.ts | 29 +++++++++ .../alarm/api/use-app-alarm-list-mutation.ts | 29 +++++++++ .../alarm/api/use-app-alarm-mark-mutation.ts | 29 +++++++++ src/entities/alarm/model/types.ts | 63 +++++++++++++++++-- src/entities/common/model/constant.ts | 7 +-- src/entities/common/model/types.ts | 20 +++--- src/entities/common/ui/sort-options-box.tsx | 22 ------- src/entities/common/ui/sort-type-box.tsx | 22 +++++++ src/entities/settlement/ui/list-wrap.tsx | 32 +++++----- src/entities/vat-return/ui/list-wrap.tsx | 16 ++--- .../account-holder-auth-page.tsx | 30 ++++----- .../account-holder-search-page.tsx | 27 ++++---- .../additional-service/alimtalk/list-page.tsx | 8 +-- .../additional-service/ars/list-page.tsx | 28 +++++---- .../key-in-payment/key-in-payment-page.tsx | 27 ++++---- .../additional-service/payout/list-page.tsx | 22 +++---- .../sms-payment/sms-payment-page.tsx | 8 +-- .../transaction/all-transaction/list-page.tsx | 24 +++---- src/pages/transaction/billing/list-page.tsx | 22 +++---- .../transaction/cash-receipt/list-page.tsx | 22 +++---- src/pages/transaction/escrow/list-page.tsx | 22 +++---- src/shared/api/api-url-alarm.ts | 24 +++++++ src/shared/api/api-url-home.ts | 2 +- 30 files changed, 439 insertions(+), 258 deletions(-) delete mode 100644 src/entities/additional-service/ui/sort-options-box.tsx create mode 100644 src/entities/alarm/api/use-app-alarm-consent-mutation.ts create mode 100644 src/entities/alarm/api/use-app-alarm-find-mutation.ts create mode 100644 src/entities/alarm/api/use-app-alarm-list-mutation.ts create mode 100644 src/entities/alarm/api/use-app-alarm-mark-mutation.ts delete mode 100644 src/entities/common/ui/sort-options-box.tsx create mode 100644 src/entities/common/ui/sort-type-box.tsx create mode 100644 src/shared/api/api-url-alarm.ts diff --git a/src/entities/additional-service/model/types.ts b/src/entities/additional-service/model/types.ts index 29015ac..f954569 100644 --- a/src/entities/additional-service/model/types.ts +++ b/src/entities/additional-service/model/types.ts @@ -10,22 +10,12 @@ import type { ExtensionSmsDetailResponse } from './sms-payment/types'; // 공통 Enums 및 타입들 // ======================================== -export enum SortByKeys { - New = 'New', - Amount = 'Amount', -} - export enum ProcessResult { ALL = 'ALL', SUCCESS = 'SUCCESS', FAIL = 'FAIL' } -export interface SortOptionsBoxProps { - sortBy: SortByKeys; - onClickToSort: (sortBy: SortByKeys) => void; -} - // 부가서비스 카테고리 enum export enum AdditionalServiceCategory { KeyInPayment = 'KeyInPayment', diff --git a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx index f011c9c..1dd4bcf 100644 --- a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx +++ b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx @@ -1,5 +1,5 @@ import moment from 'moment'; -import { SortByKeys } from '@/entities/common/model/types'; +import { SortTypeKeys } from '@/entities/common/model/types'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { useEffect, useState } from 'react'; @@ -12,7 +12,7 @@ import { useExtensionFundAccountResultExcelMutation } from '../../api/fund-accou import { useExtensionFundAccountResultListMutation } from '../../api/fund-account/use-extension-fund-account-result-list-mutation'; import { PATHS } from '@/shared/constants/paths'; import { NumericFormat } from 'react-number-format'; -import { SortOptionsBox } from '@/entities/common/ui/sort-options-box'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; import { FundAccountStatusBtnGroup } from '../../model/fund-account/constant'; import { FundAccountResultFilter } from '../filter/fund-account-result-filter'; import { useStore } from '@/shared/model/store'; @@ -21,7 +21,7 @@ export const FundAccountResultListWrap = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState>>({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -48,11 +48,11 @@ export const FundAccountResultListWrap = () => { const { mutateAsync: extensionFundAccountResultSummary } = useExtensionFundAccountResultSummaryMutation(); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let params: ExtensionFundAccountResultListParams = { @@ -124,10 +124,10 @@ export const FundAccountResultListWrap = () => { setFilterOn(!filterOn); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); callList({ - sortBy: sort + sortType: sort }); }; const onClickToStatus = (val: FundAccountStatus) => { @@ -268,10 +268,10 @@ export const FundAccountResultListWrap = () => {
- + >
{ diff --git a/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx b/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx index 52f5405..9539c18 100644 --- a/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx +++ b/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx @@ -1,4 +1,4 @@ -import { SortByKeys } from '@/entities/common/model/types'; +import { SortTypeKeys } from '@/entities/common/model/types'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { useEffect, useState } from 'react'; @@ -18,7 +18,7 @@ import moment from 'moment'; import { useExtensionFundAccountTransferListMutation } from '../../api/fund-account/use-extension-fund-account-transfer-list-mutation'; import { ListDateGroup } from '../list-date-group'; import { AdditionalServiceCategory } from '../../model/types'; -import { SortOptionsBox } from '@/entities/common/ui/sort-options-box'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; import { useExtensionFundAccountTransferExcelMutation } from '../../api/fund-account/use-extension-fund-account-transfer-excel-mutation'; import { FundAccountStatusBtnGroup } from '../../model/fund-account/constant'; import { useExtensionFundAccountBalanceMutation } from '../../api/fund-account/use-extension-fund-account-balance-mutation'; @@ -31,7 +31,7 @@ export const FundAccountTransferListWrap = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState>>({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -50,11 +50,11 @@ export const FundAccountTransferListWrap = () => { const { mutateAsync: extensionFundAccountBalance } = useExtensionFundAccountBalanceMutation(); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let params: ExtensionFundAccountTransferListParams = { @@ -119,13 +119,15 @@ export const FundAccountTransferListWrap = () => { setFilterOn(!filterOn); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callList({sortBy: sort}); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callList({sortType: sort}); }; const onClickToStatus = (val: FundAccountStatus) => { setStatus(val); - callList({val: val}); + callList({ + val: val + }); }; const getListDateGroup = () => { @@ -208,10 +210,10 @@ export const FundAccountTransferListWrap = () => {
- + >
{ diff --git a/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx b/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx index 465e8bb..d52975c 100644 --- a/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx +++ b/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx @@ -5,8 +5,9 @@ import { LinkPaymentHistoryFilter } from "./filter/link-payment-history-filter"; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { PATHS } from "@/shared/constants/paths"; import { LinkPaymentHistoryList } from "./link-payment-history-list"; -import { SortOptionsBox } from "../sort-options-box"; -import { AdditionalServiceCategory, LinkPaymentSendMethod, LinkPaymentHistoryListItem, LinkPaymentTransactionStatus, ProcessResult, SortByKeys } from "../../model/types"; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; +import { SortTypeKeys } from '@/entities/common/model/types'; +import { AdditionalServiceCategory, LinkPaymentSendMethod, LinkPaymentHistoryListItem, LinkPaymentTransactionStatus, ProcessResult } from "../../model/types"; import { LinkPaymentSearchType, } from "../../model/types"; import { useExtensionLinkPayHistoryListMutation } from '../../api/link-payment/use-extension-link-pay-history-list-mutation'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; @@ -24,7 +25,7 @@ export const LinkPaymentHistoryWrap = () => { const userMid = useStore.getState().UserStore.mid; const [filterOn, setFilterOn] = useState(false); - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState({}); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [mid, setMid] = useState(userMid); @@ -44,10 +45,10 @@ export const LinkPaymentHistoryWrap = () => { }; const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy; + pageParam.sortType = (option?.sortType) ? option.sortType : sortType; setPageParam(pageParam); let listParams = { @@ -106,9 +107,11 @@ export const LinkPaymentHistoryWrap = () => { setProcessResult(val); } - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callList({ sortBy: sort }); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callList({ + sortType: sort + }); }; const onClickToOpenFilter = () => { @@ -153,11 +156,11 @@ export const LinkPaymentHistoryWrap = () => {
- - +
{ diff --git a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx index f66557c..4286a7c 100644 --- a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx +++ b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx @@ -5,8 +5,9 @@ import { LinkPaymentWaitSendFilter } from "./filter/link-payment-pending-send-fi import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { PATHS } from "@/shared/constants/paths"; import { LinkPaymentWaitList } from "./link-payment-wait-list"; -import { AdditionalServiceCategory, LinkPaymentWaitListItem, LinkPaymentSearchType, LinkPaymentSendingStatus, LinkPaymentSendMethod, SortByKeys } from "../../model/types"; -import { SortOptionsBox } from '../sort-options-box'; +import { AdditionalServiceCategory, LinkPaymentWaitListItem, LinkPaymentSearchType, LinkPaymentSendingStatus, LinkPaymentSendMethod } from "../../model/types"; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; +import { SortTypeKeys } from '@/entities/common/model/types'; import { useExtensionLinkPayWaitListMutation } from '../../api/link-payment/use-extension-link-pay-wait-list-mutation'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; import { useExtensionLinkPayWaitDownloadExcelMutation } from '../../api/link-payment/use-extension-link-pay-wait-download-excel-mutation'; @@ -22,7 +23,7 @@ export const LinkPaymentWaitSendWrap = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [filterOn, setFilterOn] = useState(false); const [mid, setMid] = useState(userMid); const [searchType, setSearchType] = useState(LinkPaymentSearchType.ALL) @@ -45,10 +46,10 @@ export const LinkPaymentWaitSendWrap = () => { } const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy; + pageParam.sortType = (option?.sortType) ? option.sortType : sortType; setPageParam(pageParam); let listParams = { @@ -101,8 +102,8 @@ export const LinkPaymentWaitSendWrap = () => { }); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); }; const onClickSendingStatus = (val: LinkPaymentSendingStatus) => { @@ -147,10 +148,10 @@ export const LinkPaymentWaitSendWrap = () => {
- +
{ diff --git a/src/entities/additional-service/ui/sort-options-box.tsx b/src/entities/additional-service/ui/sort-options-box.tsx deleted file mode 100644 index 7e78674..0000000 --- a/src/entities/additional-service/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/entities/alarm/api/use-app-alarm-consent-mutation.ts b/src/entities/alarm/api/use-app-alarm-consent-mutation.ts new file mode 100644 index 0000000..0b25dfc --- /dev/null +++ b/src/entities/alarm/api/use-app-alarm-consent-mutation.ts @@ -0,0 +1,29 @@ +import axios from 'axios'; +import { API_URL_ALARM } from '@/shared/api/api-url-alarm'; +import { resultify } from '@/shared/lib/resultify'; +import { CBDCAxiosError } from '@/shared/@types/error'; +import { + AppAlarmConsentParams, + AppAlarmConsentResponse +} from '../model/types'; +import { + useMutation, + UseMutationOptions +} from '@tanstack/react-query'; + +export const appAlarmConsent = (params: AppAlarmConsentParams) => { + return resultify( + axios.post(API_URL_ALARM.appAlarmConsent(), params), + ); +}; + +export const useAppAlarmConsentMutation = (options?: UseMutationOptions) => { + const mutation = useMutation({ + ...options, + mutationFn: (params: AppAlarmConsentParams) => appAlarmConsent(params), + }); + + return { + ...mutation, + }; +}; diff --git a/src/entities/alarm/api/use-app-alarm-find-mutation.ts b/src/entities/alarm/api/use-app-alarm-find-mutation.ts new file mode 100644 index 0000000..00132c3 --- /dev/null +++ b/src/entities/alarm/api/use-app-alarm-find-mutation.ts @@ -0,0 +1,29 @@ +import axios from 'axios'; +import { API_URL_ALARM } from '@/shared/api/api-url-alarm'; +import { resultify } from '@/shared/lib/resultify'; +import { CBDCAxiosError } from '@/shared/@types/error'; +import { + AppAlarmFindParams, + AppAlarmFindResponse +} from '../model/types'; +import { + useMutation, + UseMutationOptions +} from '@tanstack/react-query'; + +export const appAlarmFind = (params: AppAlarmFindParams) => { + return resultify( + axios.post(API_URL_ALARM.appAlarmFind(), params), + ); +}; + +export const useAppAlarmFindMutation = (options?: UseMutationOptions) => { + const mutation = useMutation({ + ...options, + mutationFn: (params: AppAlarmFindParams) => appAlarmFind(params), + }); + + return { + ...mutation, + }; +}; diff --git a/src/entities/alarm/api/use-app-alarm-list-mutation.ts b/src/entities/alarm/api/use-app-alarm-list-mutation.ts new file mode 100644 index 0000000..274fdce --- /dev/null +++ b/src/entities/alarm/api/use-app-alarm-list-mutation.ts @@ -0,0 +1,29 @@ +import axios from 'axios'; +import { API_URL_ALARM } from '@/shared/api/api-url-alarm'; +import { resultify } from '@/shared/lib/resultify'; +import { CBDCAxiosError } from '@/shared/@types/error'; +import { + AppAlarmListParams, + AppAlarmListResponse +} from '../model/types'; +import { + useMutation, + UseMutationOptions +} from '@tanstack/react-query'; + +export const appAlarmList = (params: AppAlarmListParams) => { + return resultify( + axios.post(API_URL_ALARM.appAlarmList(), params), + ); +}; + +export const useAppAlarmListMutation = (options?: UseMutationOptions) => { + const mutation = useMutation({ + ...options, + mutationFn: (params: AppAlarmListParams) => appAlarmList(params), + }); + + return { + ...mutation, + }; +}; diff --git a/src/entities/alarm/api/use-app-alarm-mark-mutation.ts b/src/entities/alarm/api/use-app-alarm-mark-mutation.ts new file mode 100644 index 0000000..514768d --- /dev/null +++ b/src/entities/alarm/api/use-app-alarm-mark-mutation.ts @@ -0,0 +1,29 @@ +import axios from 'axios'; +import { API_URL_ALARM } from '@/shared/api/api-url-alarm'; +import { resultify } from '@/shared/lib/resultify'; +import { CBDCAxiosError } from '@/shared/@types/error'; +import { + AppAlarmMarkParams, + AppAlarmMarkResponse +} from '../model/types'; +import { + useMutation, + UseMutationOptions +} from '@tanstack/react-query'; + +export const appAlarmMark = (params: AppAlarmMarkParams) => { + return resultify( + axios.post(API_URL_ALARM.appAlarmMark(), params), + ); +}; + +export const useAppAlarmMarkMutation = (options?: UseMutationOptions) => { + const mutation = useMutation({ + ...options, + mutationFn: (params: AppAlarmMarkParams) => appAlarmMark(params), + }); + + return { + ...mutation, + }; +}; diff --git a/src/entities/alarm/model/types.ts b/src/entities/alarm/model/types.ts index afe7b79..a12f8f4 100644 --- a/src/entities/alarm/model/types.ts +++ b/src/entities/alarm/model/types.ts @@ -1,6 +1,61 @@ +import { DefaulResponsePagination, DefaultRequestPagination } from '@/entities/common/model/types'; + export interface AlarmItemProps { - title?: string, - name?: string, - category?: string, - date?: string + title?: string; + name?: string; + category?: string; + date?: string; +}; + +export interface AppAlarmMarkParams { + appNotificationSequence: number; + usrid: string; +}; + +export interface AppAlarmMarkResponse { + +}; +export enum MERCHANT_ADMIN_APP { + MERCHANT_ADMIN_APP = 'MERCHANT_ADMIN_APP', +}; +export interface AppAlarmListParams { + usrid: string; + appCl: MERCHANT_ADMIN_APP; + appNotificationCategory: string; + page: DefaultRequestPagination; +}; +export interface AppAlarmListResponse extends DefaulResponsePagination { + content: Array; +}; +export interface AlarmListContent { + appNotificationSequence: number; + usrid: string; + appCl: MERCHANT_ADMIN_APP; + appNotificationCategory: string; + notificationReceivedDate: string; + appNotificationTitle: string; + appNotificationContent: string; + appNotificationLink: string; +}; + +export interface AppAlarmFindParams { + usrid: string; + appCl: MERCHANT_ADMIN_APP; +}; + +export interface AlarmAgree { + appNotificationSubCategory: string; + appNotificationAllowed: boolean; +}; +export interface AppAlarmFindResponse { + alarmAgree: Array; +}; +export interface AppAlarmConsentParams { + appCl: MERCHANT_ADMIN_APP; + usrid: string; + appNotificationSubCategory: string; + appNotificationAllowed: boolean; +}; +export interface AppAlarmConsentResponse { + }; \ No newline at end of file diff --git a/src/entities/common/model/constant.ts b/src/entities/common/model/constant.ts index d72871d..e24348c 100644 --- a/src/entities/common/model/constant.ts +++ b/src/entities/common/model/constant.ts @@ -1,11 +1,10 @@ import { PATHS } from "@/shared/constants/paths"; +import { SortTypeKeys } from "./types"; export const DEFAULT_PAGE_PARAM = { - cursor: 'string', + cursor: null, size: 0, - sortBy: 'string', - sortOrder: 'ASC', - orderBy: 'string', + sortType: SortTypeKeys.LATEST, limit: 0 }; diff --git a/src/entities/common/model/types.ts b/src/entities/common/model/types.ts index 9ac9e6e..9dfadd2 100644 --- a/src/entities/common/model/types.ts +++ b/src/entities/common/model/types.ts @@ -20,11 +20,9 @@ export enum CalendarType { Single = 'Single' }; export interface DefaultRequestPagination { - cursor: string; + cursor: string | null; size: number; - sortBy: string; - sortOrder: string; - orderBy: string; + sortType: SortTypeKeys; limit: number; }; export interface DefaulResponsePagination { @@ -84,13 +82,15 @@ export enum FooterItemActiveKey { Settlement = 'Settlement', Account = 'Account', }; -export enum SortByKeys { - New = 'New', - Amount = 'Amount', +export enum SortTypeKeys { + LATEST = 'LATEST', + OLDEST = 'OLDEST', + HIGH_AMOUNT = 'HIGH_AMOUNT', + LOW_AMOUNT = 'LOW_AMOUNT' }; -export interface SortOptionsBoxProps { - sortBy: SortByKeys; - onClickToSort: (sortBy: SortByKeys) => void; +export interface SortTypeBoxProps { + sortType: SortTypeKeys; + onClickToSort: (sortType: SortTypeKeys) => void; }; export interface CodesSelectParams { diff --git a/src/entities/common/ui/sort-options-box.tsx b/src/entities/common/ui/sort-options-box.tsx deleted file mode 100644 index bd41e47..0000000 --- a/src/entities/common/ui/sort-options-box.tsx +++ /dev/null @@ -1,22 +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/entities/common/ui/sort-type-box.tsx b/src/entities/common/ui/sort-type-box.tsx new file mode 100644 index 0000000..5c894a8 --- /dev/null +++ b/src/entities/common/ui/sort-type-box.tsx @@ -0,0 +1,22 @@ +import { SortTypeKeys, SortTypeBoxProps } from '../model/types'; +export const SortTypeBox = ({ + sortType, + onClickToSort +}: SortTypeBoxProps) => { + + return ( + <> +
+ + | + +
+ + ); +}; \ No newline at end of file diff --git a/src/entities/settlement/ui/list-wrap.tsx b/src/entities/settlement/ui/list-wrap.tsx index 78bc68f..cc569c2 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/common/ui/sort-options-box'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-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'; @@ -24,7 +24,7 @@ import { ListDateGroupProps, SettlementsTransactionListContent } from '../model/types'; -import { SortByKeys } from '@/entities/common/model/types'; +import { SortTypeKeys } from '@/entities/common/model/types'; import { useStore } from '@/shared/model/store'; export interface ListWrapProps { @@ -39,7 +39,7 @@ export const ListWrap = ({ const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [settlementDateListItems, setSettlementDateListItems] = useState>>({}); const [transactionDatelistItems, setTransactionDateListItems] = useState>>({}); const [filterOn, setFilterOn] = useState(false); @@ -80,7 +80,7 @@ export const ListWrap = ({ }; const callSettlementList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { let listSummaryParams = { @@ -90,7 +90,7 @@ export const ListWrap = ({ endDate: endDate, paymentMethod: paymentMethod, }; - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let listParams = { @@ -110,10 +110,10 @@ export const ListWrap = ({ }); }; const callTransactionList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let params = { mid: mid, @@ -161,13 +161,17 @@ export const ListWrap = ({ } return data; }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); if(periodType === SettlementPeriodType.SETTLEMENT_DATE){ - callSettlementList({sortBy: sort}); + callSettlementList({ + sortType: sort + }); } else if(periodType === SettlementPeriodType.TRANSACTION_DATE){ - callTransactionList({sortBy: sort}); + callTransactionList({ + sortType: sort + }); } }; const changePeriodType = (val: SettlementPeriodType) => { @@ -309,10 +313,10 @@ export const ListWrap = ({
- + >
{ const userMid = useStore.getState().UserStore.mid; const [filterOn, setFilterOn] = useState(false); - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState>>({}); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [mid, setMid] = useState(userMid); @@ -55,8 +55,8 @@ export const ListWrap = () => { const onClickToOpenFIlter = () => { setFilterOn(true); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); }; useEffect(() => { @@ -124,10 +124,10 @@ export const ListWrap = () => {
- + >
{ getListDateGroup() } diff --git a/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx b/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx index 3c8b829..1fc14a1 100644 --- a/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx +++ b/src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx @@ -3,11 +3,11 @@ import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { HeaderType } from '@/entities/common/model/types'; import { IMAGE_ROOT } from '@/shared/constants/common'; -import { SortByKeys, AuthAndTransferStatus, AccountHolderAuthListItem } from '@/entities/additional-service/model/types'; +import { AuthAndTransferStatus, AccountHolderAuthListItem } from '@/entities/additional-service/model/types'; import { useEffect, useState } from 'react'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; -import { SortOptionsBox } from '@/entities/additional-service/ui/sort-options-box'; - +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; +import { SortTypeKeys } from '@/entities/common/model/types'; import { useSetHeaderTitle, useSetHeaderType, @@ -25,7 +25,7 @@ export const AccountHolderAuthPage = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -44,10 +44,10 @@ export const AccountHolderAuthPage = () => { const { mutateAsync: accountHolderAuthList } = useExtensionAccountHolderAuthListMutation(); const { mutateAsync: downloadExcel } = useExtensionAccountHolderAuthDownloadExcelMutation(); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let listParams = { mid: mid, @@ -55,7 +55,7 @@ export const AccountHolderAuthPage = () => { toDate: toDate, authStatus: authStatus, page: pageParam - } + }; accountHolderAuthList(listParams).then((rs) => { setListItems(assembleData(rs.content)); @@ -96,9 +96,11 @@ export const AccountHolderAuthPage = () => { setFilterOn(!filterOn); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callList({ sortBy: sort }) + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callList({ + sortType: sort + }) }; @@ -149,10 +151,10 @@ export const AccountHolderAuthPage = () => {
- +
{ diff --git a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx index 2250114..8589383 100644 --- a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx +++ b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx @@ -5,7 +5,7 @@ import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { HeaderType } from '@/entities/common/model/types'; import { AccountHolderSearchFilter } from '@/entities/additional-service/ui/account-holder-search/filter/account-holder-search-filter'; -import { ProcessResult, AccountHolderSearchType, SortByKeys, AccountHolderSearchListItem } from '@/entities/additional-service/model/types'; +import { ProcessResult, AccountHolderSearchType, AccountHolderSearchListItem } from '@/entities/additional-service/model/types'; import { useSetHeaderTitle, useSetHeaderType, @@ -15,7 +15,8 @@ import { import { useExtensionAccountHolderSearchListMutation } from '@/entities/additional-service/api/account-holder-search/use-extension-account-holder-search-list-mutation'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; import { useExtensionAccountHolderSearchDownloadExcelMutation } from '@/entities/additional-service/api/account-holder-search/use-extension-account-holder-search-download-excel-mutation'; -import { SortOptionsBox } from '@/entities/additional-service/ui/sort-options-box'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; +import { SortTypeKeys } from '@/entities/common/model/types'; import { AccountHolderSearchList } from '@/entities/additional-service/ui/account-holder-search/account-holder-search-list'; import { useStore } from '@/shared/model/store'; @@ -29,7 +30,7 @@ export const AccountHolderSearchPage = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState({}); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [filterOn, setFilterOn] = useState(false); @@ -52,10 +53,10 @@ export const AccountHolderSearchPage = () => { const { mutateAsync: downloadExcel } = useExtensionAccountHolderSearchDownloadExcelMutation(); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy; + pageParam.sortType = (option?.sortType) ? option.sortType : sortType; setPageParam(pageParam); let listParams = { mid: mid, @@ -110,9 +111,11 @@ export const AccountHolderSearchPage = () => { }); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callList({ sortBy: sort }) + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callList({ + sortType: sort + }); }; const onClickToTransactionStatus = (val: ProcessResult) => { @@ -164,10 +167,10 @@ export const AccountHolderSearchPage = () => {
- +
{ diff --git a/src/pages/additional-service/alimtalk/list-page.tsx b/src/pages/additional-service/alimtalk/list-page.tsx index 4273298..5461e64 100644 --- a/src/pages/additional-service/alimtalk/list-page.tsx +++ b/src/pages/additional-service/alimtalk/list-page.tsx @@ -1,6 +1,6 @@ import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; -import { HeaderType, SortByKeys } from '@/entities/common/model/types'; +import { HeaderType, SortTypeKeys } from '@/entities/common/model/types'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { useSetHeaderTitle, @@ -32,7 +32,7 @@ export const AlimtalkListPage = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState>>({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -57,10 +57,10 @@ export const AlimtalkListPage = () => { }); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let params: ExtensionAlimtalkListParams = { diff --git a/src/pages/additional-service/ars/list-page.tsx b/src/pages/additional-service/ars/list-page.tsx index 7feda20..f61f003 100644 --- a/src/pages/additional-service/ars/list-page.tsx +++ b/src/pages/additional-service/ars/list-page.tsx @@ -1,7 +1,7 @@ import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { IMAGE_ROOT } from '@/shared/constants/common'; -import { HeaderType, SortByKeys } from '@/entities/common/model/types'; +import { HeaderType, SortTypeKeys } from '@/entities/common/model/types'; import { useSetHeaderTitle, useSetHeaderType, @@ -16,7 +16,7 @@ import moment from 'moment'; import { useExtensionArsDownloadExcelMutation } from '@/entities/additional-service/api/ars/use-extension-ars-download-excel-mutation'; import { ListDateGroup } from '@/entities/additional-service/ui/list-date-group'; import { AdditionalServiceCategory } from '@/entities/additional-service/model/types'; -import { SortOptionsBox } from '@/entities/common/ui/sort-options-box'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; import { ArsPaymentStatusBtnGroup } from '@/entities/additional-service/model/ars/constant'; import { ArsFilter } from '@/entities/additional-service/ui/filter/ars-filter'; import { useStore } from '@/shared/model/store'; @@ -25,7 +25,7 @@ export const ArsListPage = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState>>({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -49,10 +49,10 @@ export const ArsListPage = () => { }); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let params: ExtensionArsListParams = { @@ -114,13 +114,17 @@ export const ArsListPage = () => { const onClickToOpenFilter = () => { setFilterOn(!filterOn); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callList({sortBy: sort}); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callList({ + sortType: sort + }); }; const onClickToPaymentStatus = (val: PaymentStatus) => { setPaymentStatus(val); - callList({val: val}); + callList({ + val: val + }); }; useEffect(() => { @@ -184,10 +188,10 @@ export const ArsListPage = () => {
- + >
{ diff --git a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx index 88030b7..7bc3409 100644 --- a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx +++ b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx @@ -12,8 +12,9 @@ import { import { PATHS } from '@/shared/constants/paths'; import { useExtensionKeyinDownloadExcelMutation } from '@/entities/additional-service/api/use-extension-keyin-download-excel-mutation'; import { KeyInPaymentFilter } from '@/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter'; -import { AdditionalServiceCategory, KeyInPaymentListItem, KeyInPaymentTransactionStatus, SortByKeys } from '@/entities/additional-service/model/types'; -import { SortOptionsBox } from '@/entities/additional-service/ui/sort-options-box'; +import { AdditionalServiceCategory, KeyInPaymentListItem, KeyInPaymentTransactionStatus } from '@/entities/additional-service/model/types'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; +import { SortTypeKeys } from '@/entities/common/model/types'; import { useExtensionKeyinListMutation } from '@/entities/additional-service/api/use-extension-keyin-list-mutation'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; import { KeyInPaymentList } from '@/entities/additional-service/ui/key-in-payment/key-in-payment-list'; @@ -31,7 +32,7 @@ export const KeyInPaymentPage = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -54,10 +55,10 @@ export const KeyInPaymentPage = () => { const { mutateAsync: downloadExcel } = useExtensionKeyinDownloadExcelMutation(); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy; + pageParam.sortType = (option?.sortType) ? option.sortType : sortType; setPageParam(pageParam); let newMinAmount = minAmount; if(!!minAmount && typeof (minAmount) === 'string'){ @@ -129,9 +130,11 @@ export const KeyInPaymentPage = () => { }); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callList({ sortBy: sort }) + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callList({ + sortType: sort + }); }; const onClickToTransactionStatus = (val: KeyInPaymentTransactionStatus) => { @@ -185,10 +188,10 @@ export const KeyInPaymentPage = () => {
- +
{ diff --git a/src/pages/additional-service/payout/list-page.tsx b/src/pages/additional-service/payout/list-page.tsx index 7a25b6b..696389a 100644 --- a/src/pages/additional-service/payout/list-page.tsx +++ b/src/pages/additional-service/payout/list-page.tsx @@ -1,6 +1,6 @@ import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; -import { HeaderType, SortByKeys } from '@/entities/common/model/types'; +import { HeaderType, SortTypeKeys } from '@/entities/common/model/types'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { useExtensionPayoutListMutation } from '@/entities/additional-service/api/payout/use-extension-payout-list-mutation'; import { @@ -21,7 +21,7 @@ import { useSetOnBack } from '@/widgets/sub-layout/use-sub-layout'; import moment from 'moment'; -import { SortOptionsBox } from '@/entities/common/ui/sort-options-box'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; import { useExtensionPayoutExcelMutation } from '@/entities/additional-service/api/payout/use-extension-payout-excel-mutation'; import { PayoutFilter } from '@/entities/additional-service/ui/filter/payout-filter'; import { PayoutDisbursementStatusBtnGroup } from '@/entities/additional-service/model/payout/constant'; @@ -33,7 +33,7 @@ export const PayoutListPage = () => { const { navigate } = useNavigate(); const userMid = useStore.getState().UserStore.mid; - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState>>({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -69,10 +69,10 @@ export const PayoutListPage = () => { }; const callExtensionPayoutList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let newMinAmount = minAmount; if(!!minAmount && typeof(minAmount) === 'string'){ @@ -141,9 +141,9 @@ export const PayoutListPage = () => { const onClickToOpenFilter = () => { setFilterOn(!filterOn); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callExtensionPayoutList({sortBy: sort}); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callExtensionPayoutList({sortType: sort}); }; const onClickToDisbursementStatus = (val: PayoutDisbursementStatus) => { setDisbursementStatus(val); @@ -224,10 +224,10 @@ export const PayoutListPage = () => {
- + >
{ diff --git a/src/pages/additional-service/sms-payment/sms-payment-page.tsx b/src/pages/additional-service/sms-payment/sms-payment-page.tsx index fe3b75e..dbfa78f 100644 --- a/src/pages/additional-service/sms-payment/sms-payment-page.tsx +++ b/src/pages/additional-service/sms-payment/sms-payment-page.tsx @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { SmsPaymentDetailResend } from '@/entities/additional-service/ui/sms-payment/sms-payment-detail-resend'; -import { HeaderType, SortByKeys } from '@/entities/common/model/types'; +import { HeaderType, SortTypeKeys } from '@/entities/common/model/types'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; import { useSetHeaderTitle, @@ -25,7 +25,7 @@ export const SmsPaymentPage = () => { const [bottomSmsPaymentDetailResendOn, setBottomSmsPaymentDetailResendOn] = useState(false) - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState({}); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [filterOn, setFilterOn] = useState(false); @@ -48,10 +48,10 @@ export const SmsPaymentPage = () => { useSetFooterMode(false); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let listParams = { diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index 71dbb47..c4118d3 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -11,9 +11,8 @@ import { useAllTransactionListSummaryMutation } from '@/entities/transaction/api 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/common/ui/sort-options-box'; -import { FooterItemActiveKey } from '@/entities/common/model/types'; -import { SortByKeys, HeaderType } from '@/entities/common/model/types'; +import { SortTypeBox } from '@/entities/common/ui/sort-type-box'; +import { SortTypeKeys, HeaderType } from '@/entities/common/model/types'; import { useSetOnBack, useSetHeaderTitle, @@ -29,7 +28,7 @@ export const AllTransactionListPage = () => { const [serviceCodeOptions, setServiceCodeOptions] = useState>>(); const [selectedServiceCode, setSelectedServiceCode] = useState('st'); - const [sortBy, setSortBy] = useState(SortByKeys.New); + const [sortType, setSortType] = useState(SortTypeKeys.LATEST); const [listItems, setListItems] = useState({}); const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); @@ -64,7 +63,7 @@ export const AllTransactionListPage = () => { const { mutateAsync: downloadExcel } = useDownloadExcelMutation(); const callList = (option?: { - sortBy?: string, + sortType?: SortTypeKeys, val?: string }) => { let listSummaryParams = { @@ -82,8 +81,9 @@ export const AllTransactionListPage = () => { bankCode: bankCode, searchCl: searchCl, searchValue: searchValue, + sortType: sortType }; - pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy; + pageParam.sortType = (option?.sortType)? option.sortType: sortType; setPageParam(pageParam); let listParams = { @@ -127,9 +127,9 @@ export const AllTransactionListPage = () => { }); }; - const onClickToSort = (sort: SortByKeys) => { - setSortBy(sort); - callList({sortBy: sort}); + const onClickToSort = (sort: SortTypeKeys) => { + setSortType(sort); + callList({sortType: sort}); }; const callServiceCodeOptions = () => { let options = [ @@ -226,10 +226,10 @@ export const AllTransactionListPage = () => {
- + >