added pace caret: last closes #3113

backend/src/api/schemas/config-schema.ts

@@ -76,7 +76,7 @@ const CONFIG_SCHEMA = joi.object({
   startGraphsAtZero: joi.boolean(),
   swapEscAndTab: joi.boolean(),
   showOutOfFocusWarning: joi.boolean(),
-  paceCaret: joi.string().valid("off", "average", "pb", "custom"),
+  paceCaret: joi.string().valid("off", "average", "pb", "last", "custom"),
   paceCaretCustomSpeed: joi.number().min(0),
   repeatedPace: joi.boolean(),
   pageWidth: joi.string().valid("100", "125", "150", "200", "max"),

frontend/src/ts/config.ts

@@ -355,7 +355,9 @@ export function setPaceCaret(
   nosave?: boolean
 ): boolean {
   if (
-    !isConfigValueValid("pace caret", val, [["custom", "off", "average", "pb"]])
+    !isConfigValueValid("pace caret", val, [
+      ["custom", "off", "average", "pb", "last"],
+    ])
   ) {
     return false;
   }

frontend/src/ts/elements/commandline-lists.ts

@@ -1492,6 +1492,15 @@ const commandsPaceCaret: MonkeyTypes.CommandsGroup = {
         TestLogic.restart();
       },
     },
+    {
+      id: "setPaceCaretLast",
+      display: "last",
+      configValue: "last",
+      exec: (): void => {
+        UpdateConfig.setPaceCaret("last");
+        TestLogic.restart();
+      },
+    },
     {
       id: "setPaceCaretAverage",
       display: "average",

frontend/src/ts/elements/modes-notice.ts

@@ -100,6 +100,8 @@ export async function update(): Promise<void> {
           ? "average"
           : Config.paceCaret === "pb"
           ? "pb"
+          : Config.paceCaret === "last"
+          ? "last"
           : "custom"
       } pace${speed}</div>`
     );

frontend/src/ts/test/pace-caret.ts

@@ -77,7 +77,7 @@ export async function init(): Promise<void> {
     wpm = Math.round(wpm);
   } else if (Config.paceCaret === "custom") {
     wpm = Config.paceCaretCustomSpeed;
-  } else if (TestState.isPaceRepeat == true) {
+  } else if (Config.paceCaret === "last" || TestState.isPaceRepeat == true) {
     wpm = TestStats.lastTestWpm;
   }
   if (wpm === undefined || wpm < 1 || Number.isNaN(wpm)) {

frontend/src/ts/types/types.d.ts

@@ -92,7 +92,7 @@ declare namespace MonkeyTypes {
 
   type SoundVolume = "0.1" | "0.5" | "1.0";
 
-  type PaceCaret = "off" | "average" | "pb" | "custom";
+  type PaceCaret = "off" | "average" | "pb" | "last" | "custom";
 
   type PageWidth = "100" | "125" | "150" | "200" | "max";
 

frontend/static/html/pages/settings.html

@@ -1022,7 +1022,7 @@
             tabindex="0"
             onclick="this.blur();"
           >
-            average
+            avg
           </div>
           <div
             class="button"
@@ -1032,6 +1032,14 @@
           >
             pb
           </div>
+          <div
+            class="button"
+            paceCaret="last"
+            tabindex="0"
+            onclick="this.blur();"
+          >
+            last
+          </div>
           <div
             class="button"
             paceCaret="custom"