diff --git a/frontend/src/ts/components/pages/test/TestConfig.tsx b/frontend/src/ts/components/pages/test/TestConfig.tsx
index bdf42cbd9012..7ceea91a53cf 100644
--- a/frontend/src/ts/components/pages/test/TestConfig.tsx
+++ b/frontend/src/ts/components/pages/test/TestConfig.tsx
@@ -1,3 +1,4 @@
+import { quoteDescToGroup, QuoteLength } from "@monkeytype/schemas/quotes";
import { ComponentProps, For, JSXElement, Show } from "solid-js";
import { configMetadata } from "../../../config/metadata";
@@ -303,13 +304,6 @@ function Mode2Words(props: ComponentProps<"div">): JSXElement {
}
function Mode2Quote(props: ComponentProps<"div">): JSXElement {
- const quoteLengths = [
- { text: "short", length: 0 },
- { text: "medium", length: 1 },
- { text: "long", length: 2 },
- { text: "thicc", length: 3 },
- ] as const;
-
return (
): JSXElement {
restartTestEvent.dispatch();
}}
/>
-
- {({ text, length }) => (
+
+ {(desc) => (
{
- setConfig("quoteLength", [length]);
+ setConfig("quoteLength", [quoteDescToGroup[desc as QuoteLength]]);
restartTestEvent.dispatch();
}}
/>
diff --git a/frontend/src/ts/controllers/quotes-controller.ts b/frontend/src/ts/controllers/quotes-controller.ts
index 4a443a425ed6..ece079f68596 100644
--- a/frontend/src/ts/controllers/quotes-controller.ts
+++ b/frontend/src/ts/controllers/quotes-controller.ts
@@ -6,7 +6,11 @@ import * as DB from "../db";
import Ape from "../ape";
import { tryCatch } from "@monkeytype/util/trycatch";
import { Language } from "@monkeytype/schemas/languages";
-import { QuoteData } from "@monkeytype/schemas/quotes";
+import {
+ QuoteData,
+ QuoteLength,
+ quoteGroupToDesc,
+} from "@monkeytype/schemas/quotes";
import {
Quote as QuoteType,
QuoteWithTextSplit as QuoteWithTextSplitType,
@@ -28,6 +32,10 @@ const defaultQuoteCollection: QuoteCollection = {
groups: [],
};
+function getLengthDesc(quote: Quote): QuoteLength | "-" {
+ return quoteGroupToDesc[quote.group] ?? "-";
+}
+
class QuotesController {
private quoteCollection: QuoteCollection = defaultQuoteCollection;
@@ -77,6 +85,7 @@ class QuotesController {
id: quote.id,
language: data.language,
group: 0,
+ groupDescription: "-",
};
this.quoteCollection.quotes.push(monkeyTypeQuote);
@@ -90,6 +99,7 @@ class QuotesController {
this.quoteCollection.quotes.filter((quote) => {
if (quote.length >= lower && quote.length <= upper) {
quote.group = groupIndex;
+ quote.groupDescription = getLengthDesc(quote);
return true;
}
return false;
diff --git a/frontend/src/ts/test/result.ts b/frontend/src/ts/test/result.ts
index 8eee8ed25745..bbd69317de3e 100644
--- a/frontend/src/ts/test/result.ts
+++ b/frontend/src/ts/test/result.ts
@@ -784,7 +784,7 @@ function updateTestType(randomQuote: Quote | null): void {
testType += ` ${Config.words}`;
} else if (Config.mode === "quote") {
if (randomQuote?.group !== undefined) {
- testType += ` ${["short", "medium", "long", "thicc"][randomQuote.group]}`;
+ testType += ` ${randomQuote.groupDescription}`;
}
}
const ignoresLanguage = isFunboxActiveWithProperty("ignoresLanguage");
diff --git a/frontend/src/ts/types/quotes.ts b/frontend/src/ts/types/quotes.ts
index a7d95b6a0b2e..5abb26e2693e 100644
--- a/frontend/src/ts/types/quotes.ts
+++ b/frontend/src/ts/types/quotes.ts
@@ -1,9 +1,10 @@
import { Language } from "@monkeytype/schemas/languages";
-import { QuoteDataQuote } from "@monkeytype/schemas/quotes";
+import { QuoteDataQuote, QuoteLength } from "@monkeytype/schemas/quotes";
import { RequiredProperties } from "../utils/misc";
export type Quote = QuoteDataQuote & {
group: number;
+ groupDescription: QuoteLength | "-";
language: Language;
textSplit?: string[];
};
diff --git a/packages/schemas/src/quotes.ts b/packages/schemas/src/quotes.ts
index 2925e56a5019..046581d5078a 100644
--- a/packages/schemas/src/quotes.ts
+++ b/packages/schemas/src/quotes.ts
@@ -9,6 +9,23 @@ export const QuoteIdSchema = z
.or(z.string().regex(/^\d+$/).transform(Number));
export type QuoteId = z.infer;
+export const quoteDescToGroup = {
+ short: 0,
+ medium: 1,
+ long: 2,
+ thicc: 3,
+} as const;
+
+export const QuoteLengthSchema = z.enum(
+ Object.keys(quoteDescToGroup) as [keyof typeof quoteDescToGroup],
+);
+
+export type QuoteLength = z.infer;
+
+export const quoteGroupToDesc = Object.fromEntries(
+ Object.entries(quoteDescToGroup).map(([desc, group]) => [group, desc]),
+) as unknown as Record;
+
export const ApproveQuoteSchema = z.object({
id: QuoteIdSchema,
text: z.string(),
diff --git a/packages/schemas/src/shared.ts b/packages/schemas/src/shared.ts
index 7a1f5b570d07..b4ed155a37fb 100644
--- a/packages/schemas/src/shared.ts
+++ b/packages/schemas/src/shared.ts
@@ -51,13 +51,6 @@ export const DefaultTimeModeSchema = z.union([
z.literal("120"),
]);
-export const QuoteLengthSchema = z.union([
- z.literal("short"),
- z.literal("medium"),
- z.literal("long"),
- z.literal("thicc"),
-]);
-
// // Step 1: Define the schema for specific string values "10" and "25"
// const SpecificKeySchema = z.union([z.literal("10"), z.literal("25")]);
diff --git a/packages/schemas/src/users.ts b/packages/schemas/src/users.ts
index e81e577fa9db..5f2421e8589c 100644
--- a/packages/schemas/src/users.ts
+++ b/packages/schemas/src/users.ts
@@ -7,10 +7,10 @@ import {
PersonalBestsSchema,
DefaultWordsModeSchema,
DefaultTimeModeSchema,
- QuoteLengthSchema,
DifficultySchema,
PersonalBestSchema,
} from "./shared";
+import { QuoteLengthSchema } from "./quotes";
import { CustomThemeColorsSchema, FunboxNameSchema } from "./configs";
import { doesNotContainDisallowedWords } from "./validation/validation";
import { ConnectionSchema } from "./connections";