From ffa9600302d32201b261ad8c0ece98c2f4f25982 Mon Sep 17 00:00:00 2001
From: Olivier Gagnon <oli.gagnon4418@gmail.com>
Date: Tue, 21 Sep 2021 11:50:48 -0400
Subject: [PATCH] active scritp production typo and add new page size

---
 src/ui/ActiveScripts/ScriptProduction.tsx       | 10 +++-------
 src/ui/ActiveScripts/ServerAccordionContent.tsx | 13 +++----------
 src/ui/ActiveScripts/ServerAccordions.tsx       |  9 +--------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/ui/ActiveScripts/ScriptProduction.tsx b/src/ui/ActiveScripts/ScriptProduction.tsx
index 78ee774f7..35f2ca130 100644
--- a/src/ui/ActiveScripts/ScriptProduction.tsx
+++ b/src/ui/ActiveScripts/ScriptProduction.tsx
@@ -4,6 +4,7 @@
  */
 import * as React from "react";
 
+import { Money } from "../React/Money";
 import { MoneyRate } from "../React/MoneyRate";
 import { use } from "../Context";
 
@@ -40,18 +41,13 @@ export function ScriptProduction(): React.ReactElement {
       <TableBody>
         <TableRow>
           <TableCell component="th" scope="row" classes={{ root: classes.cell }}>
-            <Typography variant="body2">Total online production of Active scripts:</Typography>
+            <Typography variant="body2">Total production:</Typography>
           </TableCell>
           <TableCell align="left" classes={{ root: classes.cell }}>
             <Typography variant="body2">
-              <MoneyRate money={player.scriptProdSinceLastAug} />
+              <Money money={player.scriptProdSinceLastAug} />
             </Typography>
           </TableCell>
-        </TableRow>
-        <TableRow style={{ width: "1px" }}>
-          <TableCell component="th" scope="row" classes={{ root: classes.cell }}>
-            <Typography variant="body2">Total online production since last Aug installation:</Typography>
-          </TableCell>
           <TableCell align="left" classes={{ root: classes.cell }}>
             <Typography variant="body2">
               (<MoneyRate money={prodRateSinceLastAug} />)
diff --git a/src/ui/ActiveScripts/ServerAccordionContent.tsx b/src/ui/ActiveScripts/ServerAccordionContent.tsx
index e8aef48c1..00ac07b07 100644
--- a/src/ui/ActiveScripts/ServerAccordionContent.tsx
+++ b/src/ui/ActiveScripts/ServerAccordionContent.tsx
@@ -21,26 +21,19 @@ export function ServerAccordionContent(props: IProps): React.ReactElement {
     setPage(0);
   };
 
-  let safePage = page;
-  while (safePage * rowsPerPage + 1 > props.workerScripts.length) {
-    safePage--;
-  }
-
-  if (safePage != page) setPage(safePage);
-
   return (
     <>
       <List dense disablePadding>
-        {props.workerScripts.slice(safePage * rowsPerPage, safePage * rowsPerPage + rowsPerPage).map((ws) => (
+        {props.workerScripts.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage).map((ws) => (
           <WorkerScriptAccordion key={`${ws.name}_${ws.args}`} workerScript={ws} />
         ))}
       </List>
       <TablePagination
-        rowsPerPageOptions={[10, 15, 20]}
+        rowsPerPageOptions={[10, 15, 20, 100]}
         component="div"
         count={props.workerScripts.length}
         rowsPerPage={rowsPerPage}
-        page={safePage}
+        page={page}
         onPageChange={handleChangePage}
         onRowsPerPageChange={handleChangeRowsPerPage}
         ActionsComponent={TablePaginationActionsAll}
diff --git a/src/ui/ActiveScripts/ServerAccordions.tsx b/src/ui/ActiveScripts/ServerAccordions.tsx
index 917266a88..8928801e3 100644
--- a/src/ui/ActiveScripts/ServerAccordions.tsx
+++ b/src/ui/ActiveScripts/ServerAccordions.tsx
@@ -74,13 +74,6 @@ export function ServerAccordions(props: IProps): React.ReactElement {
 
   function rerender(): void {
     setRerender((old) => !old);
-
-    let safePage = page;
-    while (safePage * rowsPerPage + 1 >= filtered.length) {
-      safePage--;
-    }
-
-    if (safePage != page) setPage(safePage);
   }
 
   useEffect(() => WorkerScriptStartStopEventEmitter.subscribe(rerender));
@@ -108,7 +101,7 @@ export function ServerAccordions(props: IProps): React.ReactElement {
         })}
       </List>
       <TablePagination
-        rowsPerPageOptions={[10, 15, 20]}
+        rowsPerPageOptions={[10, 15, 20, 100]}
         component="div"
         count={filtered.length}
         rowsPerPage={rowsPerPage}