Merge pull request #595 from France-ioi/fix-collapsed

[Fix] Set blocks collapsed by default

Author: SebastienTainon

frontend/task/index.ts

@@ -784,9 +784,9 @@ export function* onEditSource(origin?: string) {
     }
 
     if ('test' !== origin) {
-        const blocksPanelWasOpen = state.task.blocksPanelWasOpen;
-        if (state.task.blocksPanelCollapsed === blocksPanelWasOpen) {
-            yield* put(taskSetBlocksPanelCollapsed({collapsed: !blocksPanelWasOpen}));
+        const blocksPanelWasCollapsed = state.task.blocksPanelWasCollapsed;
+        if (state.task.blocksPanelCollapsed !== blocksPanelWasCollapsed) {
+            yield* put(taskSetBlocksPanelCollapsed({collapsed: blocksPanelWasCollapsed}));
         }
         if (false !== state.submission.submissionsPaneOpen) {
             yield* put(submissionChangePaneOpen(false));

frontend/task/layout/layout.tsx

@@ -833,8 +833,8 @@ function* layoutSaga({replayApi}: App) {
         if (action.payload) {
             yield* put(taskSetBlocksPanelCollapsed({collapsed: true}));
         } else {
-            const blocksPanelWasOpen = yield* appSelect(state => state.task.blocksPanelWasOpen);
-            yield* put(taskSetBlocksPanelCollapsed({collapsed: !blocksPanelWasOpen}));
+            const blocksPanelWasCollapsed = yield* appSelect(state => state.task.blocksPanelWasCollapsed);
+            yield* put(taskSetBlocksPanelCollapsed({collapsed: blocksPanelWasCollapsed}));
         }
     });
 

frontend/task/libs/quickalgo_library_factory.ts

@@ -192,7 +192,7 @@ export function* createQuickalgoLibrary(platformAlreadyChanged: boolean = false)
         yield* put(taskSetContextIncludeBlocks(JSON.parse(JSON.stringify(context.infos.includeBlocks))));
     }
     if (context.infos && context.infos.panelCollapsed) {
-        yield* put(taskSetBlocksPanelCollapsed({collapsed: true}));
+        yield* put(taskSetBlocksPanelCollapsed({collapsed: true, manual: true}));
     }
 
     yield* call(quickAlgoLibraryResetAndReloadStateSaga);

frontend/task/task_slice.ts

@@ -62,7 +62,7 @@ export const taskInitialState = {
     contextStrings: {},
     contextIncludeBlocks: {},
     blocksPanelCollapsed: false,
-    blocksPanelWasOpen: true,
+    blocksPanelWasCollapsed: false,
     blocksUsage: null,
     soundEnabled: !isLocalStorageEnabled() || !window.localStorage.getItem('soundDisabled'),
     menuHelpsOpen: false,
@@ -194,7 +194,7 @@ export const taskSlice = createSlice({
         taskSetBlocksPanelCollapsed(state: TaskState, action: PayloadAction<{collapsed: boolean, manual?: boolean}>) {
             state.blocksPanelCollapsed = action.payload.collapsed;
             if (action.payload.manual) {
-                state.blocksPanelWasOpen = !state.blocksPanelCollapsed;
+                state.blocksPanelWasCollapsed = action.payload.collapsed;
             }
         },
         taskSetBlocksUsage(state: TaskState, action: PayloadAction<BlocksUsage>) {

frontend/task/task_types.ts

@@ -30,7 +30,7 @@ export interface TaskState {
     contextIncludeBlocks: QuickalgoTaskIncludeBlocks,
     availablePlatforms: string[],
     blocksPanelCollapsed?: boolean,
-    blocksPanelWasOpen?: boolean,
+    blocksPanelWasCollapsed?: boolean,
     blocksUsage?: BlocksUsage,
     soundEnabled?: boolean,
     menuHelpsOpen?: boolean,