refactor: move testRestarting state to TestState

Author: Miodec

frontend/src/ts/controllers/challenge-controller.ts

@@ -5,7 +5,6 @@ import * as ManualRestart from "../test/manual-restart-tracker";
 import * as CustomText from "../test/custom-text";
 import * as Funbox from "../test/funbox/funbox";
 import Config, * as UpdateConfig from "../config";
-import * as TestUI from "../test/test-ui";
 import * as ConfigEvent from "../observables/config-event";
 import * as TestState from "../test/test-state";
 import * as Loader from "../elements/loader";
@@ -28,7 +27,7 @@ export function clearActive(): void {
   if (
     TestState.activeChallenge &&
     !challengeLoading &&
-    !TestUI.testRestarting
+    !TestState.testRestarting
   ) {
     Notifications.add("Challenge cleared", 0);
     TestState.setActiveChallenge(null);

frontend/src/ts/controllers/input-controller.ts

@@ -1013,7 +1013,7 @@ $(document).on("keydown", async (event) => {
 
   if (!allowTyping) return;
 
-  if (!event.originalEvent?.isTrusted || TestUI.testRestarting) {
+  if (!event.originalEvent?.isTrusted || TestState.testRestarting) {
     event.preventDefault();
     return;
   }
@@ -1249,7 +1249,7 @@ $("#wordsInput").on("keyup", (event) => {
 });
 
 $("#wordsInput").on("keyup", (event) => {
-  if (!event.originalEvent?.isTrusted || TestUI.testRestarting) {
+  if (!event.originalEvent?.isTrusted || TestState.testRestarting) {
     event.preventDefault();
     return;
   }
@@ -1269,7 +1269,7 @@ $("#wordsInput").on("beforeinput", (event) => {
 });
 
 $("#wordsInput").on("input", async (event) => {
-  if (!event.originalEvent?.isTrusted || TestUI.testRestarting) {
+  if (!event.originalEvent?.isTrusted || TestState.testRestarting) {
     (event.target as HTMLInputElement).value = " ";
     return;
   }

frontend/src/ts/controllers/route-controller.ts

@@ -154,11 +154,13 @@ export async function navigate(
 ): Promise<void> {
   if (
     !options.force &&
-    (TestUI.testRestarting || TestUI.resultCalculating || PageTransition.get())
+    (TestState.testRestarting ||
+      TestUI.resultCalculating ||
+      PageTransition.get())
   ) {
     console.debug(
       `navigate: ${url} ignored, page is busy (testRestarting: ${
-        TestUI.testRestarting
+        TestState.testRestarting
       }, resultCalculating: ${
         TestUI.resultCalculating
       }, pageTransition: ${PageTransition.get()})`

frontend/src/ts/test/test-logic.ts

@@ -176,7 +176,7 @@ export function restart(options = {} as RestartOptions): void {
     return;
   }
 
-  if (TestUI.testRestarting || TestUI.resultCalculating) {
+  if (TestState.testRestarting || TestUI.resultCalculating) {
     options.event?.preventDefault();
     return;
   }
@@ -314,7 +314,7 @@ export function restart(options = {} as RestartOptions): void {
     el = $("#typingTest");
   }
   TestUI.setResultVisible(false);
-  TestUI.setTestRestarting(true);
+  TestState.setTestRestarting(true);
   el.stop(true, true).animate(
     {
       opacity: 0,
@@ -358,7 +358,7 @@ export function restart(options = {} as RestartOptions): void {
       const initResult = await init();
 
       if (!initResult) {
-        TestUI.setTestRestarting(false);
+        TestState.setTestRestarting(false);
         return;
       }
 
@@ -396,7 +396,7 @@ export function restart(options = {} as RestartOptions): void {
             LiveBurst.reset();
             TestUI.updatePremid();
             ManualRestart.reset();
-            TestUI.setTestRestarting(false);
+            TestState.setTestRestarting(false);
           }
         );
     }
@@ -420,7 +420,7 @@ async function init(): Promise<boolean> {
       );
     }
     TestInitFailed.show();
-    TestUI.setTestRestarting(false);
+    TestState.setTestRestarting(false);
     TestState.setTestInitSuccess(false);
     Focus.set(false);
     // Notifications.add(
@@ -1442,7 +1442,7 @@ $(".pageTest").on("click", "#restartTestButtonWithSameWordset", () => {
 });
 
 $(".pageTest").on("click", "#testConfig .mode .textButton", (e) => {
-  if (TestUI.testRestarting) return;
+  if (TestState.testRestarting) return;
   if ($(e.currentTarget).hasClass("active")) return;
   const mode = ($(e.currentTarget).attr("mode") ?? "time") as Mode;
   if (mode === undefined) return;
@@ -1453,7 +1453,7 @@ $(".pageTest").on("click", "#testConfig .mode .textButton", (e) => {
 });
 
 $(".pageTest").on("click", "#testConfig .wordCount .textButton", (e) => {
-  if (TestUI.testRestarting) return;
+  if (TestState.testRestarting) return;
   const wrd = $(e.currentTarget).attr("wordCount") ?? "15";
   if (wrd !== "custom") {
     if (UpdateConfig.setWordCount(parseInt(wrd))) {
@@ -1464,7 +1464,7 @@ $(".pageTest").on("click", "#testConfig .wordCount .textButton", (e) => {
 });
 
 $(".pageTest").on("click", "#testConfig .time .textButton", (e) => {
-  if (TestUI.testRestarting) return;
+  if (TestState.testRestarting) return;
   const mode = $(e.currentTarget).attr("timeConfig") ?? "10";
   if (mode !== "custom") {
     if (UpdateConfig.setTimeConfig(parseInt(mode))) {
@@ -1475,7 +1475,7 @@ $(".pageTest").on("click", "#testConfig .time .textButton", (e) => {
 });
 
 $(".pageTest").on("click", "#testConfig .quoteLength .textButton", (e) => {
-  if (TestUI.testRestarting) return;
+  if (TestState.testRestarting) return;
   const lenAttr = $(e.currentTarget).attr("quoteLength");
   if (lenAttr === "all") {
     if (UpdateConfig.setQuoteLengthAll()) {
@@ -1503,15 +1503,15 @@ $(".pageTest").on("click", "#testConfig .quoteLength .textButton", (e) => {
 });
 
 $(".pageTest").on("click", "#testConfig .punctuationMode.textButton", () => {
-  if (TestUI.testRestarting) return;
+  if (TestState.testRestarting) return;
   if (UpdateConfig.setPunctuation(!Config.punctuation)) {
     ManualRestart.set();
     restart();
   }
 });
 
 $(".pageTest").on("click", "#testConfig .numbersMode.textButton", () => {
-  if (TestUI.testRestarting) return;
+  if (TestState.testRestarting) return;
   if (UpdateConfig.setNumbers(!Config.numbers)) {
     ManualRestart.set();
     restart();

frontend/src/ts/test/test-state.ts

@@ -1,4 +1,5 @@
 import { Challenge } from "@monkeytype/schemas/challenges";
+import { promiseWithResolvers } from "../utils/misc";
 
 export let isRepeated = false;
 export let isPaceRepeat = false;
@@ -12,6 +13,7 @@ export let testInitSuccess = true;
 export let lineScrollDistance = 0;
 export let isLanguageRightToLeft = false;
 export let isDirectionReversed = false;
+export let testRestarting = false;
 
 export function setRepeated(tf: boolean): void {
   isRepeated = tf;
@@ -68,3 +70,18 @@ export function setIsLanguageRightToLeft(rtl: boolean): void {
 export function setIsDirectionReversed(val: boolean): void {
   isDirectionReversed = val;
 }
+
+let { promise: testRestartingPromise, resolve: restartingResolve } =
+  promiseWithResolvers();
+
+export { testRestartingPromise };
+
+export function setTestRestarting(val: boolean): void {
+  testRestarting = val;
+  if (val) {
+    ({ promise: testRestartingPromise, resolve: restartingResolve } =
+      promiseWithResolvers());
+  } else {
+    restartingResolve();
+  }
+}

frontend/src/ts/test/test-ui.ts

@@ -118,7 +118,6 @@ ConfigEvent.subscribe((eventKey, eventValue, nosave) => {
 
 export let resultVisible = false;
 export let activeWordTop = 0;
-export let testRestarting = false;
 export let lineTransition = false;
 export let currentTestLine = 0;
 export let resultCalculating = false;
@@ -131,21 +130,6 @@ export function setActiveWordTop(val: number): void {
   activeWordTop = val;
 }
 
-let { promise: testRestartingPromise, resolve: restartingResolve } =
-  Misc.promiseWithResolvers();
-
-export { testRestartingPromise };
-
-export function setTestRestarting(val: boolean): void {
-  testRestarting = val;
-  if (val) {
-    ({ promise: testRestartingPromise, resolve: restartingResolve } =
-      Misc.promiseWithResolvers());
-  } else {
-    restartingResolve();
-  }
-}
-
 export function setResultCalculating(val: boolean): void {
   resultCalculating = val;
 }