From 3c398f8cfcdb5329402560abdb52ea9aa322a7d5 Mon Sep 17 00:00:00 2001 From: Botho <1258870+elbotho@users.noreply.github.com> Date: Fri, 14 Feb 2025 16:23:10 +0100 Subject: [PATCH] fix(web): don't wrap exercise in array --- apps/web/src/fetcher/create-exercises.ts | 4 +-- apps/web/src/fetcher/revision/request.ts | 40 +++++++++++------------- 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/apps/web/src/fetcher/create-exercises.ts b/apps/web/src/fetcher/create-exercises.ts index 215fe6a966..30c6b85a7e 100644 --- a/apps/web/src/fetcher/create-exercises.ts +++ b/apps/web/src/fetcher/create-exercises.ts @@ -16,7 +16,7 @@ export function createExercise( ): EditorExerciseDocument | undefined { if (!uuid.currentRevision?.content) return undefined - const exercise = { + return { ...(parseDocumentString( uuid.currentRevision.content ) as EditorExerciseDocument), @@ -29,8 +29,6 @@ export function createExercise( licenseId: uuid.licenseId, }, } - - return exercise } export function createExerciseGroup( diff --git a/apps/web/src/fetcher/revision/request.ts b/apps/web/src/fetcher/revision/request.ts index e810d4c9d4..d8b2f85c56 100644 --- a/apps/web/src/fetcher/revision/request.ts +++ b/apps/web/src/fetcher/revision/request.ts @@ -49,32 +49,28 @@ export async function requestRevision( const title = createTitle(uuid, instance) const thisExercise = isExercise - ? [ - createExercise({ - ...uuid, - licenseId: uuid.repository.licenseId, - currentRevision: { - title: uuid.title, - alias: uuid.alias, - content: uuid.content, - id: uuid.id, - date: uuid.date, - }, - revisions: { totalCount: 0, nodes: [] }, - }), - ] + ? createExercise({ + ...uuid, + licenseId: uuid.repository.licenseId, + currentRevision: { + title: uuid.title, + alias: uuid.alias, + content: uuid.content, + id: uuid.id, + date: uuid.date, + }, + revisions: { totalCount: 0, nodes: [] }, + }) : undefined const currentExercise = isExercise && uuid.repository.currentRevision - ? [ - createExercise({ - ...uuid, - licenseId: uuid.repository.licenseId, - currentRevision: uuid.repository.currentRevision, - revisions: { totalCount: 0, nodes: [] }, - }), - ] + ? createExercise({ + ...uuid, + licenseId: uuid.repository.licenseId, + currentRevision: uuid.repository.currentRevision, + revisions: { totalCount: 0, nodes: [] }, + }) : null // likely the previously accepted revision