fix(verify): resolve tagging issues (#231)

Greenstand · Dec 13, 2021 · c6d1baf · c6d1baf
1 parent b124a97
commit c6d1baf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 206 deletions.
diff --git a/src/components/Verify.js b/src/components/Verify.js
@@ -167,16 +167,6 @@ const Verify = (props) => {
   const refContainer = useRef();
   const numFilters = verifyContext.filter.countAppliedFilters();
 
-  // log.debug(
-  //   'render: verify',
-  //   'captures:',
-  //   verifyContext.captureImages.length,
-  //   'species:',
-  //   speciesContext.speciesList.length,
-  //   'tags:',
-  //   tagsContext.tagList.length,
-  // );
-
   /*
    * effect to load page when mounted
    */
@@ -192,14 +182,6 @@ const Verify = (props) => {
     setComplete(verifyContext.approveAllComplete);
   }, [verifyContext.approveAllComplete]);
 
-  /* load more captures when the page or page size changes */
-  useEffect(() => {
-    // console.log('-- load images', verifyContext.filter);
-    const abortController = new AbortController();
-    verifyContext.loadCaptureImages({ signal: abortController.signal });
-    return () => abortController.abort();
-  }, [verifyContext.filter, verifyContext.pageSize, verifyContext.currentPage]);
-
   function handleCaptureClick(e, captureId) {
     e.stopPropagation();
     e.preventDefault();
@@ -256,7 +238,6 @@ const Verify = (props) => {
     } else if (!approveAction.rememberSelection) {
       resetApprovalFields();
     }
-    verifyContext.loadCaptureImages();
   }
 
   async function handleShowGrowerDetail(e, capture) {
@@ -292,6 +273,7 @@ const Verify = (props) => {
   }
 
   function handleChangePageSize(event) {
+    verifyContext.setCurrentPage(0);
     verifyContext.setPageSize(event.target.value);
   }
 
@@ -303,15 +285,10 @@ const Verify = (props) => {
     return verifyContext.captureImagesSelected.indexOf(id) >= 0;
   }
 
-  const captureImages = verifyContext.captureImages.filter((capture, index) => {
-    return (
-      index >= verifyContext.currentPage * verifyContext.pageSize &&
-      index < (verifyContext.currentPage + 1) * verifyContext.pageSize
-    );
-  });
+  const captureImages = verifyContext.captureImages;
 
   const placeholderImages = verifyContext.isLoading
-    ? Array(verifyContext.pageSize - captureImages.length)
+    ? Array(Math.max(verifyContext.pageSize - captureImages.length, 0))
         .fill()
         .map((_, index) => {
           return {
@@ -406,7 +383,7 @@ const Verify = (props) => {
 
   let imagePagination = (
     <TablePagination
-      rowsPerPageOptions={[12, 24, 48, 96, 192]}
+      rowsPerPageOptions={[24, 96, 192, 384]}
       component="div"
       count={verifyContext.captureCount || 0}
       rowsPerPage={verifyContext.pageSize}