Reverted Level to only utas placement test exercises, Speaking, bug fixes, placeholder

src/stores/examEditor/defaults.ts

@@ -32,7 +32,7 @@ const defaultSettings = (module: Module) => {
         case 'speaking':
             return {
                 ...baseSettings,
-                isGenerateAudio: false
+                isGenerateAudioOpen: false
             }
         default:
             return baseSettings;

src/stores/examEditor/reducers/index.ts

@@ -1,20 +1,26 @@
+import defaultModuleSettings from "../defaults";
 import ExamEditorStore from "../types";
 import { MODULE_ACTIONS, ModuleActions, moduleReducer } from "./moduleReducer";
 import { SECTION_ACTIONS, SectionActions, sectionReducer } from "./sectionReducer";
 
+type UpdateRoot = {
+    type: 'UPDATE_ROOT';
+    payload: {
+        updates: Partial<ExamEditorStore>
+    }
+};
+type FullReset = { type: 'FULL_RESET' };
 
-export type Action = ModuleActions | SectionActions | { type: 'UPDATE_ROOT'; payload: { updates: Partial<ExamEditorStore> } };
+export type Action = ModuleActions | SectionActions | UpdateRoot | FullReset;
 
 export const rootReducer = (
     state: ExamEditorStore,
     action: Action
 ): Partial<ExamEditorStore> => {
-    console.log(action.type);
-
     if (MODULE_ACTIONS.includes(action.type as any)) {
         if (action.type === "REORDER_EXERCISES") {
             const updatedState = sectionReducer(state, action as SectionActions);
-            if (!updatedState.modules) return state; 
+            if (!updatedState.modules) return state;
 
             return moduleReducer({
                 ...state,
@@ -45,6 +51,19 @@ export const rootReducer = (
                 ...state,
                 ...updates
             };
+        case 'FULL_RESET':
+            return {
+                title: "",
+                currentModule: "reading",
+                speakingAvatars: [],
+                modules: {
+                    reading: defaultModuleSettings("reading", 60),
+                    writing: defaultModuleSettings("writing", 60),
+                    speaking: defaultModuleSettings("speaking", 14),
+                    listening: defaultModuleSettings("listening", 30),
+                    level: defaultModuleSettings("level", 60)
+                },
+            }
         default:
             return {};
     }

src/stores/examEditor/reorder/global.ts

@@ -3,13 +3,6 @@ import { ModuleState } from "../types";
 import ReorderResult from "./types";
 
 const reorderFillBlanks = (exercise: FillBlanksExercise, startId: number): ReorderResult<FillBlanksExercise> => {
-    let newSolutions = exercise.solutions
-        .sort((a, b) => parseInt(a.id) - parseInt(b.id))
-        .map((solution, index) => ({
-            ...solution,
-            id: (startId + index).toString()
-        }));
-
     let idMapping = exercise.solutions
         .sort((a, b) => parseInt(a.id) - parseInt(b.id))
         .reduce((acc, solution, index) => {
@@ -17,20 +10,29 @@ const reorderFillBlanks = (exercise: FillBlanksExercise, startId: number): Reord
             return acc;
         }, {} as Record<string, string>);
 
+    let newSolutions = exercise.solutions
+        .sort((a, b) => parseInt(a.id) - parseInt(b.id))
+        .map((solution, index) => ({
+            ...solution,
+            id: (startId + index).toString()
+        }));
+
     let newText = exercise.text;
     Object.entries(idMapping).forEach(([oldId, newId]) => {
         const regex = new RegExp(`\\{\\{${oldId}\\}\\}`, 'g');
         newText = newText.replace(regex, `{{${newId}}}`);
     });
 
-
     let newWords = exercise.words.map(word => {
         if (typeof word === 'string') {
             return word;
         } else if ('letter' in word && 'word' in word) {
             return word;
-        } else if ('options' in word) {
-            return word;
+        } else if ('options' in word && 'id' in word) {
+            return {
+                ...word,
+                id: idMapping[word.id] || word.id
+            };
         }
         return word;
     });
@@ -50,7 +52,6 @@ const reorderFillBlanks = (exercise: FillBlanksExercise, startId: number): Reord
         },
         lastId: startId + newSolutions.length
     };
-
 };
 
 const reorderWriteBlanks = (exercise: WriteBlanksExercise, startId: number): ReorderResult<WriteBlanksExercise> => {

src/stores/examEditor/types.ts

@@ -22,7 +22,7 @@ export interface SectionSettings {
 
 export interface SpeakingSectionSettings extends SectionSettings {
     secondTopic?: string;
-    isGenerateAudio: boolean;
+    isGenerateAudioOpen: boolean;
 }
 
 export interface ReadingSectionSettings extends SectionSettings {
@@ -34,6 +34,13 @@ export interface ListeningSectionSettings extends SectionSettings {
     isAudioGenerationOpen: boolean;
 }
 
+export interface LevelSectionSettings extends SectionSettings {
+    readingDropdownOpen: boolean;
+    writingDropdownOpen: boolean;
+    speakingDropdownOpen: boolean;
+    listeningDropdownOpen: boolean;
+}
+
 export type Generating = "context" | "exercises" | "media" | undefined;
 export type Section = LevelPart | ReadingPart | ListeningPart | WritingExercise | SpeakingExercise | InteractiveSpeakingExercise;
 export type ExamPart = ListeningPart | ReadingPart | LevelPart;