feat: new design fixes

SocialGouv · Oct 26, 2023 · 6ecaddb · 6ecaddb
1 parent 0d41278
commit 6ecaddb
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/...components/DataSheets/Sections/SharedComponents/EstablishmentTable/EstablishmentTable.jsx b/...components/DataSheets/Sections/SharedComponents/EstablishmentTable/EstablishmentTable.jsx
@@ -138,6 +138,7 @@ const EstablishmentTable = ({ etablissements, entreprise }) => {
             currentPage={currentPage}
             totalPages={totalPages}
             handlePageClick={handlePageClick}
+            displayButtons
           />
         </div>
       )}{" "}

diff --git a/...t/src/components/DataSheets/Sections/SharedComponents/PaginationTable/PaginationTable.jsx b/...t/src/components/DataSheets/Sections/SharedComponents/PaginationTable/PaginationTable.jsx
@@ -4,7 +4,12 @@ import React from "react";
 import LeftArrow from "../../../../shared/Icons/LeftArrow.jsx";
 import RightArrow from "../../../../shared/Icons/RightArrow.jsx";
 
-const PaginationTable = ({ currentPage, totalPages, handlePageClick }) => {
+const PaginationTable = ({
+  currentPage,
+  displayButtons = false,
+  totalPages,
+  handlePageClick,
+}) => {
   const renderPaginationButtons = () => {
     const buttons = [];
     const firstPage = 1;
@@ -59,28 +64,33 @@ const PaginationTable = ({ currentPage, totalPages, handlePageClick }) => {
   };
   return (
     <div className="table-pagination">
-      <button
-        className="prev-btn"
-        disabled={currentPage === 1}
-        onClick={() => handlePageClick(currentPage - 1)}
-      >
-        <LeftArrow />
-        Précédent
-      </button>
+      {displayButtons && (
+        <button
+          className="prev-btn"
+          disabled={currentPage === 1}
+          onClick={() => handlePageClick(currentPage - 1)}
+        >
+          <LeftArrow />
+          Précédent
+        </button>
+      )}
       {renderPaginationButtons()}
-      <button
-        className="prev-btn"
-        disabled={currentPage === totalPages}
-        onClick={() => handlePageClick(currentPage + 1)}
-      >
-        Suivant
-        <RightArrow />
-      </button>
+      {displayButtons && (
+        <button
+          className="prev-btn"
+          disabled={currentPage === totalPages}
+          onClick={() => handlePageClick(currentPage + 1)}
+        >
+          Suivant
+          <RightArrow />
+        </button>
+      )}
     </div>
   );
 };
 PaginationTable.propTypes = {
   currentPage: PropTypes.number.isRequired,
+  displayButtons: PropTypes.bool,
   handlePageClick: PropTypes.func.isRequired,
   totalPages: PropTypes.string.isRequired,
 };

diff --git a/src/client/src/components/SearchAwesomeTable/SearchAwesomeTable.js b/src/client/src/components/SearchAwesomeTable/SearchAwesomeTable.js
@@ -5,10 +5,10 @@ import PropTypes from "prop-types";
 import React from "react";
 import { withRouter } from "react-router";
 
+import PaginationTable from "../DataSheets/Sections/SharedComponents/PaginationTable/PaginationTable.jsx";
 import LeftArrow from "../shared/Icons/LeftArrow.jsx";
 import RightArrow from "../shared/Icons/RightArrow.jsx";
 import LoadSpinner from "../shared/LoadSpinner";
-import Pager from "./Pager";
 
 const SearchAwesomeTable = ({
   showPagination = false,
@@ -83,10 +83,10 @@ const SearchAwesomeTable = ({
                 <LeftArrow />
                 {prevText}
               </button>
-              <Pager
-                handlePageChange={pagination.handlePageChange}
+              <PaginationTable
+                handlePageClick={pagination.handlePageChange}
                 currentPage={pagination.current}
-                max={pagination.pages}
+                totalPages={pagination.pages}
               />
 
               <button