fix: editor state, self-match key-binding

Author: bhoopesh369

src/components/BattleTV/BattleTV.tsx

@@ -103,7 +103,6 @@ function PaginatedItems({ battleTvType }: { battleTvType: BattleType }) {
   const dispatch = useAppDispatch();
 
   if (!currentBattles.hasbeenFetched) {
-    console.log('fetching battles');
     dispatch(
       fetchBattlesAction({ battleTvType: battleTvType, page: pageCount }),
     );

src/components/Editor/Editor.tsx

@@ -27,6 +27,7 @@ import {
 } from '../../store/EditorSettings/settings';
 
 import {
+  GameType,
   updateUserCode,
   UpdateUserCodeRequestObject,
   UserCode,
@@ -172,50 +173,36 @@ export default function CodeEditor(props: Editor.Props): JSX.Element {
     });
 
     //Keybinding for save -> CTRL+S
-
     editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyS, function () {
       props.SaveRef.current?.click();
     });
 
     //Keybinding for Simulate -> CTRL+ALT+N
-
-    if (props.page == 'Dashboard') {
-      editor.addCommand(
-        monaco.KeyMod.CtrlCmd | monaco.KeyMod.Alt | monaco.KeyCode.KeyN,
-        function () {
+    editor.addCommand(
+      monaco.KeyMod.CtrlCmd | monaco.KeyMod.Alt | monaco.KeyCode.KeyN,
+      function () {
+        if (GameType.NORMAL) {
           dispatch(isSelfMatchModalOpened(true));
           dispatch(codeCommitNameChanged('Current Code'));
           dispatch(codeCommitIDChanged(null));
           dispatch(mapCommitNameChanged('Current Map'));
           dispatch(mapCommitIDChanged(null));
-        },
-      );
-
-      //Keybinding for Commit -> CTRL+K
-
-      editor.addCommand(
-        monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyK,
-        function () {
-          dispatch(isCommitModalOpened(true));
-        },
-      );
-    }
-
-    if (props.page == 'PvP') {
-      editor.addCommand(
-        monaco.KeyMod.CtrlCmd | monaco.KeyMod.Alt | monaco.KeyCode.KeyN,
-        function () {
+        } else if (GameType.PVP) {
           dispatch(isPvPSelfMatchModalOpened(true));
-          dispatch(code1CommitNameChanged('Current Player 1 Code'));
+          dispatch(code1CommitNameChanged('Current Code'));
           dispatch(code1CommitIDChanged(null));
-          dispatch(code2CommitNameChanged('Current Player 2 Code'));
+          dispatch(code2CommitNameChanged('Current Code'));
           dispatch(code2CommitIDChanged(null));
-        },
-      );
-    }
+        }
+      },
+    );
 
-    //Keybinding for Submit -> CTRL+SHIFT+S
+    //Keybinding for Commit -> CTRL+K
+    editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyK, function () {
+      dispatch(isCommitModalOpened(true));
+    });
 
+    //Keybinding for Submit -> CTRL+SHIFT+S
     editor.addCommand(
       monaco.KeyMod.CtrlCmd | monaco.KeyMod.Shift | monaco.KeyCode.KeyS,
       function () {

src/components/Leaderboard/Leaderboard.tsx

@@ -129,7 +129,6 @@ function PaginatedItems(props: LeaderboardType.Props) {
     leaderboardAPI
       .getPvPLeaderboard(pageNum, itemsPerPage)
       .then(response => {
-        console.log(response);
         setPvpItems(response);
         setIsPvPLoaded(true);
       })

src/components/Websocket/Websocket.tsx

@@ -19,7 +19,6 @@ export const Websocket: React.FunctionComponent = () => {
   const currentUserapi = new CurrentUserApi(apiConfig);
   const dispatch = useAppDispatch();
   const gameType = useAppSelector(CurrentGameType);
-  console.log(gameType.toString());
   const [user, setUser] = useState<CurrentUserProfile>();
 
   useEffect(() => {
@@ -37,7 +36,6 @@ export const Websocket: React.FunctionComponent = () => {
             break;
           case GameStatus.Executed:
             Toast.success('Executed successfully!');
-            console.log(gameType);
             // TODO: find non-hacky way to do this
             dispatch(changeSimulationState(true));
             dispatch(

src/pages/Dashboard/Dashboard.tsx

@@ -3,6 +3,7 @@ import {
   Language,
   DailyChallengesApi,
   CurrentUserApi,
+  CodeType,
 } from '@codecharacter-2024/client';
 import { RendererComponent } from '@codecharacter-2024/renderer';
 import Toast from 'react-hot-toast';
@@ -177,7 +178,7 @@ export default function Dashboard(): JSX.Element {
         .finally(() => localStorage.setItem('firstTime', 'false'));
 
       codeAPI
-        .getLatestCode('PVP')
+        .getLatestCode(CodeType.Pvp)
         .then(response => {
           dispatch(initializePvPEditorStates(response));
         })
@@ -196,11 +197,8 @@ export default function Dashboard(): JSX.Element {
   );
 
   const handleLanguageChange = (language: string) => {
-    console.log(language);
     switch (language) {
       case 'C++':
-        console.log('changed to cpp');
-        console.log(pageState);
         switch (pageState) {
           case 'Dashboard':
             dispatch(changeLanguage('c_cpp'));

src/store/BattleTV/BattleTvSlice.ts

@@ -58,7 +58,6 @@ export const fetchBattlesAction = createAsyncThunk(
     reqobj: { battleTvType: BattleType; page: number },
     { rejectWithValue },
   ) => {
-    console.log('called');
     try {
       switch (reqobj.battleTvType) {
         case BattleType.NORMAL:

src/store/EditorSettings/settings.ts

@@ -22,7 +22,7 @@ const initialState: settingsStateType = {
   enableSnippets: true,
   isInfoOpen: false,
   isCommitModalOpen: false,
-  autocomplete: true,
+  autocomplete: false,
 };
 
 export interface CodeAndLanguage {

src/store/editor/code.ts

@@ -65,13 +65,15 @@ export const editorSlice = createSlice({
     },
 
     initializePvPEditorStates: (state, action: PayloadAction<Code>) => {
+      state.userCode = action.payload.code;
       if (action.payload.language === 'C' || action.payload.language === 'CPP')
         state.language = 'c_cpp';
       else if (action.payload.language === 'PYTHON') state.language = 'python';
       else if (action.payload.language === 'JAVA') state.language = 'java';
       state.lastSavedAt = action.payload.lastSavedAt;
       const desiredIndex = languagesAvailable.indexOf(state.language);
       state.allLanguagesPvPCode[desiredIndex] = action.payload.code;
+      state.gameType = GameType.PVP;
     },
 
     updateUserCode: (
@@ -89,7 +91,7 @@ export const editorSlice = createSlice({
       if (gameType === GameType.NORMAL) {
         state.allLanguagesNormalCode[desiredIndex] =
           newCodeAndLanguage.currentUserCode;
-      } else {
+      } else if (gameType === GameType.PVP) {
         state.allLanguagesPvPCode[desiredIndex] =
           newCodeAndLanguage.currentUserCode;
       }
@@ -101,7 +103,6 @@ export const editorSlice = createSlice({
       action: PayloadAction<GameTypeAndLanguage>,
     ) => {
       state.gameType = action.payload.gameType;
-      console.log(action);
       if (action.payload.gameType === GameType.NORMAL) {
         state.userCode =
           state.allLanguagesNormalCode[

src/store/rendererLogs/logAPI.ts

@@ -6,12 +6,10 @@ export const getLogs = (id: string, gametype: GameType): Promise<string> => {
   return new Promise((resolve, reject) => {
     const gameAPI = new GameApi(apiConfig);
     const pvpGameApi = new PvpGameApi(apiConfig);
-    console.log(gametype.toString());
     if (gametype === GameType.NORMAL) {
       gameAPI
         .getGameLogsByGameId(id)
         .then(logs => {
-          console.log(`fetched ${logs}`);
           resolve(logs);
         })
         .catch(error => {
@@ -23,7 +21,6 @@ export const getLogs = (id: string, gametype: GameType): Promise<string> => {
       pvpGameApi
         .getPvpGameLogsByGameId(id)
         .then(logs => {
-          console.log(`fetched ${logs}`);
           resolve(logs);
         })
         .catch(error => {