fix: tutorial number bug

delta · Jan 21, 2024 · 72294a7 · 72294a7
1 parent ecd7458
commit 72294a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 27 deletions.
diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsx
@@ -66,11 +66,8 @@ import {
   changeTutorialLanguage,
   tutorialCode,
   tutorialCodeLanguage,
-  changeCompletionState,
-  tutorialCompletion,
   tutorialId,
-  changeTutorialIdPlus,
-  changeTutorialIdMinus,
+  changeTutorialId,
 } from '../../store/Tutorials/tutorials';
 import Tour from '../../components/TourProvider/TourProvider';
 import { EditorSteps } from '../../components/TourProvider/EditorSteps';
@@ -132,7 +129,6 @@ export default function Dashboard(): JSX.Element {
   const pageState = useAppSelector(dailyChallengePageState);
   const dailyChallengeSimulationState = useAppSelector(dcSimulation);
   const tutorialsCode = useAppSelector(tutorialCode);
-  const tutorialCompletionState = useAppSelector(tutorialCompletion);
   const userLanguage =
     pageState == 'Dashboard'
       ? useAppSelector(UserLanguage)
@@ -179,13 +175,10 @@ export default function Dashboard(): JSX.Element {
       .getCodeTutorialByNumber(codeTutorialNumber)
       .then(response => {
         dispatch(initializeTutorialState(response));
-        if (codeTutorialNumber != 1) {
-          dispatch(changeCompletionState(true));
-        }
       })
       .catch(err => {
         if (err.message == 'Complete the current tutorial first') {
-          dispatch(changeCompletionState(false));
+          dispatch(changeTutorialId(0));
         }
         if (err instanceof ApiError) Toast.error(err.message);
       });
@@ -356,14 +349,10 @@ export default function Dashboard(): JSX.Element {
     }
   };
   const handleNextTutorial = () => {
-    if (tutorialCompletionState) {
-      dispatch(changeTutorialIdPlus());
-    } else {
-      Toast.error('Complete the current tutorial first');
-    }
+    dispatch(changeTutorialId(1));
   };
   const handlePrevTutorial = () => {
-    dispatch(changeTutorialIdMinus());
+    dispatch(changeTutorialId(0));
   };
   const currentUserApi = new CurrentUserApi(apiConfig);
 

diff --git a/src/store/Tutorials/tutorials.ts b/src/store/Tutorials/tutorials.ts
@@ -1,5 +1,4 @@
 import { ChallengeType, TutorialsGetRequest } from '@codecharacter-2024/client';
-// import { Code } from '@codecharacter-2024/client';
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { RootState } from '../store';
 import { CodeAndLanguage, languagesAvailable } from '../editor/code';
@@ -8,7 +7,6 @@ import defaultPythonCode from '../../assets/codes/python/run.py?raw';
 import defaultJavaCode from '../../assets/codes/java/Run.java?raw';
 
 export interface TutorialStateType {
-  // eslint-disable-next-line prettier/prettier
   tutorials: TutorialsGetRequest;
   tutorialCode: string | undefined;
   tutorialAllLanguagesCode: string[];
@@ -51,7 +49,6 @@ export const tutorialsSlice = createSlice({
       action: PayloadAction<TutorialsGetRequest>,
     ) => {
       state.tutorials.tutorialName = action.payload.tutorialName;
-      // state.tutorials.tutorialId = action.payload.tutorialId;
       (state.tutorials.description = action.payload.description
         ? action.payload.description
         : ''),
@@ -61,7 +58,6 @@ export const tutorialsSlice = createSlice({
       state.tutorialAllLanguagesCode[1] = action.payload.tutorialCodes.python;
       state.tutorialAllLanguagesCode[2] = action.payload.tutorialCodes.java;
       state.isCompleted = false;
-      // state.tutorialAllLanguagesCode = action.payload.tutorialCodes;
     },
     changeTutorialCode: (state, action: PayloadAction<CodeAndLanguage>) => {
       const tempCurrentUserLanguage = action.payload.currentUserLanguage;
@@ -83,11 +79,12 @@ export const tutorialsSlice = createSlice({
     changeTutorialMap: (state, action: PayloadAction<Array<Array<number>>>) => {
       state.tutorialMap = action.payload;
     },
-    changeTutorialIdPlus: state => {
-      state.tutorialId = state.tutorialId + 1;
-    },
-    changeTutorialIdMinus: state => {
-      state.tutorialId = state.tutorialId - 1;
+    changeTutorialId: (state, action: PayloadAction<number>) => {
+      if (action.payload == 1) {
+        state.tutorialId = state.tutorialId + 1;
+      } else {
+        state.tutorialId = state.tutorialId - 1;
+      }
     },
     changeCompletionState: (state, action: PayloadAction<boolean>) => {
       state.isCompleted = action.payload;
@@ -101,16 +98,15 @@ export const {
   changeTutorialLanguage,
   changeTutorialMap,
   changeCompletionState,
-  changeTutorialIdPlus,
-  changeTutorialIdMinus,
+  changeTutorialId,
 } = tutorialsSlice.actions;
 export const tutorialState = (state: RootState): TutorialsGetRequest =>
   state.tutorials.tutorials;
 export const tutorialCode = (state: RootState): string =>
   state.tutorials.tutorialCode;
 export const tutorialDescription = (state: RootState): string | undefined =>
   state.tutorials.tutorials.description;
-export const tutorialId = (state: RootState): number | undefined =>
+export const tutorialId = (state: RootState): number =>
   state.tutorials.tutorialId;
 export const tutorialCodeLanguage = (state: RootState): string =>
   state.tutorials.tutorialLanguage;