From 2a5991da1f5458a3725ce5ce9d42fee77cf21088 Mon Sep 17 00:00:00 2001 From: Mikola Date: Tue, 19 Mar 2024 16:39:36 +0300 Subject: [PATCH] error boundary and table pagination --- .../ProfileCalendar/ProfileCalendarComponent.jsx | 8 ++++---- src/hoc/ErrorBoundary.jsx | 1 + src/hoc/Fallback.jsx | 7 +++---- src/index.js | 2 +- src/pages/PartnerСategories/PartnerСategories.jsx | 11 +++++++---- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx index ed947e10..0ccc2649 100644 --- a/src/components/ProfileCalendar/ProfileCalendarComponent.jsx +++ b/src/components/ProfileCalendar/ProfileCalendarComponent.jsx @@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo( ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : activePeriod - ? "Выберите диапазон на календаре" - : "Выбрать диапазон"} + ? "Выберите диапазон на календаре" + : "Выбрать диапазон"} {totalRangeHours ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` : endDate - ? "0 часов" - : ""} + ? "0 часов" + : ""} {endDate && ( { - return (
logo

Произошла непредвиденная ошибка

- + Вернуться назад arrow diff --git a/src/index.js b/src/index.js index f7ad3428..ee6aaa8c 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,9 @@ import React from "react"; import ReactDOM from "react-dom/client"; import { Provider } from "react-redux"; -import ErrorBoundary from "./hoc/ErrorBoundary"; import App from "./App"; +import ErrorBoundary from "./hoc/ErrorBoundary"; import "./index.css"; import { store } from "./store/store"; diff --git a/src/pages/PartnerСategories/PartnerСategories.jsx b/src/pages/PartnerСategories/PartnerСategories.jsx index 9ab29312..8799a793 100644 --- a/src/pages/PartnerСategories/PartnerСategories.jsx +++ b/src/pages/PartnerСategories/PartnerСategories.jsx @@ -1,5 +1,6 @@ import { getTheme } from "@table-library/react-table-library/baseline"; import { CompactTable } from "@table-library/react-table-library/compact"; +import { usePagination } from "@table-library/react-table-library/pagination"; import { useSort } from "@table-library/react-table-library/sort"; import { useTheme } from "@table-library/react-table-library/theme"; import React, { useEffect, useState } from "react"; @@ -14,7 +15,6 @@ import { Loader } from "@components/Common/Loader/Loader"; import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -import { usePagination } from "@table-library/react-table-library/pagination"; import rightArrow from "assets/icons/arrows/arrowRight.svg"; @@ -105,7 +105,7 @@ export const PartnerCategories = () => { const pagination = usePagination(data, { state: { page: 0, - size: 5, + size: 5 } }); @@ -270,7 +270,9 @@ export const PartnerCategories = () => { pagination={pagination} />
- Total Pages: {pagination.state.getTotalPages(data.nodes)} + + Total Pages: {pagination.state.getTotalPages(data.nodes)} + Page:{" "} @@ -279,7 +281,8 @@ export const PartnerCategories = () => { key={index} type="button" style={{ - fontWeight: pagination.state.page === index ? "bold" : "normal", + fontWeight: + pagination.state.page === index ? "bold" : "normal" }} onClick={() => pagination.fns.onSetPage(index)} >