From 712a3e51555e9103ac691014b1db3b0a5dff52e4 Mon Sep 17 00:00:00 2001 From: Adam Teichert Date: Wed, 17 Dec 2025 16:49:52 -0700 Subject: [PATCH] remove nesting options within options --- .../local/globalSettings/globalSettingsModels.ts | 2 +- .../globalSettings/globalSettingsUtils.test.ts | 16 ++++++---------- .../local/globalSettings/globalSettingsUtils.ts | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/features/local/globalSettings/globalSettingsModels.ts b/src/features/local/globalSettings/globalSettingsModels.ts index c636a43..90df7a8 100644 --- a/src/features/local/globalSettings/globalSettingsModels.ts +++ b/src/features/local/globalSettings/globalSettingsModels.ts @@ -7,7 +7,7 @@ export const zodGlobalSettingsCourse = z.object({ export const zodGlobalSettings = z.object({ courses: z.array(zodGlobalSettingsCourse), - options: z.record(z.any()).optional(), + feedbackDelims: z.record(z.string()).optional(), }); diff --git a/src/features/local/globalSettings/globalSettingsUtils.test.ts b/src/features/local/globalSettings/globalSettingsUtils.test.ts index 03c804f..350a96b 100644 --- a/src/features/local/globalSettings/globalSettingsUtils.test.ts +++ b/src/features/local/globalSettings/globalSettingsUtils.test.ts @@ -36,12 +36,10 @@ describe("getFeedbackDelimitersFromSettings", () => { it("returns custom delimiters if options are present", () => { const settings: GlobalSettings = { courses: [], - options: { - feedbackDelims: { - neutral: ":|", - correct: ":)", - incorrect: ":(", - }, + feedbackDelims: { + neutral: ":|", + correct: ":)", + incorrect: ":(", }, }; const expected = { @@ -55,10 +53,8 @@ describe("getFeedbackDelimitersFromSettings", () => { it("returns mixed delimiters if some options are missing", () => { const settings: GlobalSettings = { courses: [], - options: { - feedbackDelims: { - correct: ":)", - }, + feedbackDelims: { + correct: ":)", }, }; const expected = { diff --git a/src/features/local/globalSettings/globalSettingsUtils.ts b/src/features/local/globalSettings/globalSettingsUtils.ts index 1075b50..6a401a8 100644 --- a/src/features/local/globalSettings/globalSettingsUtils.ts +++ b/src/features/local/globalSettings/globalSettingsUtils.ts @@ -33,7 +33,7 @@ export const getFeedbackDelimitersFromSettings = ( ): FeedbackDelimiters => { return overriddenDefaults( defaultFeedbackDelimiters, - settings.options?.feedbackDelims ?? {} as Record + settings.feedbackDelims ?? ({} as Record) ); };