From 961b7ecccbc80d4500dd5a20486b8da42983c0ee Mon Sep 17 00:00:00 2001 From: Hoan Luu Huu <110280845+xquanluu@users.noreply.github.com> Date: Mon, 3 Jul 2023 21:06:09 +0700 Subject: [PATCH] recent call filter (#282) * recent call filter * fix review comment * fix eslint --- .../internal/views/least-cost-routing/card.tsx | 1 + .../internal/views/recent-calls/index.tsx | 18 +++++------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/containers/internal/views/least-cost-routing/card.tsx b/src/containers/internal/views/least-cost-routing/card.tsx index 0bbacbc..b2edffc 100644 --- a/src/containers/internal/views/least-cost-routing/card.tsx +++ b/src/containers/internal/views/least-cost-routing/card.tsx @@ -122,6 +122,7 @@ export const Card = ({ className={`lcr lcr--route lcr-card lcr-card-${ isDragging ? "disappear" : "appear" }`} + // eslint-disable-next-line react/no-unknown-property handler-id={handlerId} >
diff --git a/src/containers/internal/views/recent-calls/index.tsx b/src/containers/internal/views/recent-calls/index.tsx index 79fc777..1000a7a 100644 --- a/src/containers/internal/views/recent-calls/index.tsx +++ b/src/containers/internal/views/recent-calls/index.tsx @@ -48,8 +48,7 @@ export const RecentCalls = () => { const [dateFilter, setDateFilter] = useState("today"); const [directionFilter, setDirectionFilter] = useState("io"); const [statusFilter, setStatusFilter] = useState("all"); - const [fromFilter, setFromFilter] = useState(""); - const [toFilter, setToFilter] = useState(""); + const [filter, setFilter] = useState(""); const [pageNumber, setPageNumber] = useState(1); const [perPageFilter, setPerPageFilter] = useState("25"); @@ -67,8 +66,7 @@ export const RecentCalls = () => { : { days: Number(dateFilter) }), ...(statusFilter !== "all" && { answered: statusFilter }), ...(directionFilter !== "io" && { direction: directionFilter }), - ...(fromFilter && { from: fromFilter }), - ...(toFilter && { to: toFilter }), + ...(filter && { filter }), }; getRecentCalls(accountSid, payload) @@ -105,8 +103,7 @@ export const RecentCalls = () => { dateFilter, directionFilter, statusFilter, - fromFilter, - toFilter, + filter, ]); /** Reset page number when filters change */ @@ -150,13 +147,8 @@ export const RecentCalls = () => { options={statusSelection} /> -