diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index d2168d1..3cc5290 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -41,6 +41,8 @@ const DocumentListPage = ({ perPage }) => { const { group } = appState; const [page, setPage] = useState(1); const [order, setOrder] = useState("parentCaseName"); + const [lowerOrder, setLowerOrder] = useState("parentCaseName"); + const [upperOrder, setUpperOrder] = useState("parentCaseName"); const appUserId = group ? group.appUserId : null; const [isBusy, setIsBusy] = useState(false); const [selectedDocumentType, setSelectedDocumentType] = useState(); @@ -78,19 +80,7 @@ const DocumentListPage = ({ perPage }) => { ...doc.data(), documentId: doc.id, })); - if (order === "parentCaseName") { - data.sort((a, b) => { - return a.parentCaseName.toLowerCase() > b.parentCaseName.toLowerCase() - ? 1 - : -1; - }); - } else if (order === "parentCaseName2") { - data.sort((a, b) => { - return a.parentCaseName.toLowerCase() < b.parentCaseName.toLowerCase() - ? 1 - : -1; - }); - } + const pages = Math.ceil(data.length / perPage); if (page > pages) { setPage(pages); @@ -215,7 +205,7 @@ const DocumentListPage = ({ perPage }) => { @@ -256,7 +246,7 @@ const DocumentListPage = ({ perPage }) => {