Skip to content

MM2-1443 Fix: remove NaN for requests pages #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: testing
Choose a base branch
from
Open

MM2-1443 Fix: remove NaN for requests pages #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
283b738
fix: remove nan for requests sections
sylwia-werner Nov 5, 2025
cd900e8
refactor: simplify count default value
sylwia-werner Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/routes/requests/request-product-category-list/request-product-category-list.tsx
View file
Open in desktop
Copy link
Collaborator

@mikolvj mikolvj Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about just adding default value to count? like
const {
requests,
isLoading,
refetch,
count = 0,
} = ...

Copy link
Collaborator Author

@sylwia-werner sylwia-werner Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, refactored

Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const RequestProductCategoryList = () => {

const [currentFilter, setCurrentFilter] = useState<FilterState>("");

const { requests, isLoading, refetch, count } = useVendorRequests({
const { requests, isLoading, refetch, count = 0 } = useVendorRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
type: "product_category",
Expand Down Expand Up @@ -104,16 +104,16 @@ export const RequestProductCategoryList = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/requests/request-product-collection-list/request-product-collection-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const RequestProductCollectionList = () => {

const [currentFilter, setCurrentFilter] = useState<FilterState>("");

const { requests, isLoading, refetch, count } = useVendorRequests({
const { requests, isLoading, refetch, count = 0 } = useVendorRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
type: "product_collection",
Expand Down Expand Up @@ -105,16 +105,16 @@ export const RequestProductCollectionList = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/requests/request-product-list/request-product-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const RequestProductList = () => {
setDetailOpen(true);
};

const { requests, isLoading, count } = useVendorRequests({
const { requests, isLoading, count = 0 } = useVendorRequests({
limit: PAGE_SIZE,
offset: currentPage * PAGE_SIZE,
type: "product",
Expand Down Expand Up @@ -87,16 +87,16 @@ export const RequestProductList = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/requests/request-product-tag-list/request-product-tag-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const RequestProductTagList = () => {

const [currentFilter, setCurrentFilter] = useState<FilterState>("");

const { requests, isLoading, refetch, count } = useVendorRequests({
const { requests, isLoading, refetch, count = 0 } = useVendorRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
type: "product_tag",
Expand Down Expand Up @@ -102,16 +102,16 @@ export const RequestProductTagList = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/requests/request-product-type-list/request-product-type-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const RequestProductTypeList = () => {

const [currentFilter, setCurrentFilter] = useState<FilterState>("");

const { requests, isLoading, refetch, count } = useVendorRequests({
const { requests, isLoading, refetch, count = 0 } = useVendorRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
type: "product_type",
Expand Down Expand Up @@ -103,16 +103,16 @@ export const RequestProductTypeList = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/requests/request-product-update-list/request-product-update-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const RequestProductUpdateList = () => {

const [currentFilter, setCurrentFilter] = useState<FilterState>("");

const { requests, isLoading, count } = useVendorRequests({
const { requests, isLoading, count = 0 } = useVendorRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
type: "product_update",
Expand Down Expand Up @@ -92,16 +92,16 @@ export const RequestProductUpdateList = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
10 changes: 5 additions & 5 deletions src/routes/requests/request-return-list/request-return-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ export const OrderReturnRequestsPage = () => {
order_return_request: requests,
isLoading,
refetch,
count,
count = 0,
} = useReturnRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
status: currentFilter !== "" ? currentFilter : undefined,
});

return (
<Container>
<div className="flex items-center justify-between px-6 py-4">
Expand Down Expand Up @@ -109,16 +109,16 @@ export const OrderReturnRequestsPage = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/requests/request-review-remove-list/request-review-remove-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const RequestReviewRemoveList = () => {

const [currentFilter, setCurrentFilter] = useState<FilterState>("");

const { requests, isLoading, refetch, count } = useVendorRequests({
const { requests, isLoading, refetch, count = 0 } = useVendorRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
type: "review_remove",
Expand Down Expand Up @@ -102,16 +102,16 @@ export const RequestReviewRemoveList = () => {
</Table.Body>
</Table>
<Table.Pagination
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down
8 changes: 4 additions & 4 deletions src/routes/requests/request-seller-list/request-seller-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const RequestSellerList = () => {

const [currentFilter, setCurrentFilter] = useState<FilterState>("");

const { requests, isLoading, refetch, count } = useVendorRequests({
const { requests, isLoading, refetch, count = 0 } = useVendorRequests({
offset: currentPage * PAGE_SIZE,
limit: PAGE_SIZE,
type: "seller",
Expand Down Expand Up @@ -110,16 +110,16 @@ export const RequestSellerList = () => {
</Table>
<Table.Pagination
className="w-full"
canNextPage={PAGE_SIZE * (currentPage + 1) < count!}
canNextPage={PAGE_SIZE * (currentPage + 1) < count}
canPreviousPage={currentPage > 0}
previousPage={() => {
setCurrentPage(currentPage - 1);
}}
nextPage={() => {
setCurrentPage(currentPage + 1);
}}
count={count!}
pageCount={Math.ceil(count! / PAGE_SIZE)}
count={count ?? 0}
pageCount={Math.ceil(count / PAGE_SIZE)}
pageIndex={currentPage}
pageSize={PAGE_SIZE}
/>
Expand Down