Add socket route for code submission

Author: kumaran-14

src/app/actions/code/Submission.ts

@@ -29,6 +29,7 @@ export namespace SubmissionActions {
     UPDATE_COMMIT_HASH = 'UPDATE_COMMIT_HASH',
     UPDATE_PLAYER_ID2 = 'UPDATE_PLAYER_ID2',
     RESET_SUBMISSION_STATE = 'RESET_SUBMISSION_STATE',
+    TOGGLE_LOCK_CODE = 'TOGGLE_LOCK_CODE',
   }
 
   export const changeState = (state: SubmissionInterfaces.RequestState) =>
@@ -107,4 +108,6 @@ export namespace SubmissionActions {
   export const updatePlayerId2 = (playerId2: number) => {
     return action(Type.UPDATE_PLAYER_ID2, { playerId2 });
   };
+
+  export const toggleLockCode = () => action(Type.TOGGLE_LOCK_CODE);
 }

src/app/components/SocketHandler.tsx

@@ -109,6 +109,12 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
     );
   }
 
+  public lockCode(): void {
+    // @ts-ignore
+    this.stompClient.send('/socket/request/code/submit');
+    this.props.toggleLockCode();
+  }
+
   public componentDidUpdate() {
     const {
       request,
@@ -118,6 +124,7 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
       currentAiId,
       updateRequest,
       userId,
+      isCodeLocked,
     } = this.props;
     switch (request) {
       case SubmissionInterfaces.Request.PREVIOUS_COMMIT_MATCH: {
@@ -170,6 +177,10 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
         updateRequest(SubmissionInterfaces.Request.NONE);
       }
     }
+
+    if (isCodeLocked) {
+      this.lockCode();
+    }
   }
 
   public componentWillUnmount(): void {

src/app/components/SubmitBar/RunOptions.tsx

@@ -1,4 +1,4 @@
-import { faBrain, faRobot } from '@fortawesome/free-solid-svg-icons';
+import { faBrain } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { SubmissionActions } from 'app/actions';
 import * as styles from 'app/styles/RunOptions.module.css';
@@ -49,9 +49,10 @@ export class RunOptions extends React.Component<
 
     const maps = this.props.maps || hardCodedMap;
 
-    const hardCodedAiIds: number[] = [1];
+    // const hardCodedAiIds: number[] = [1];
 
-    const aiIds = hardCodedAiIds;
+    // @ts-ignore
+    // const aiIds = hardCodedAiIds;
 
     const matchOptions = [
       {
@@ -62,16 +63,16 @@ export class RunOptions extends React.Component<
       },
     ];
 
-    if (aiIds) {
-      aiIds.map((aiId) => {
-        matchOptions.push({
-          aiId,
-          icon: <FontAwesomeIcon icon={faRobot} />,
-          name: `AI ${aiId} Match`,
-          type: SubmissionActions.Type.AI_MATCH,
-        });
-      });
-    }
+    // if (aiIds) {
+    //   aiIds.map((aiId) => {
+    //     matchOptions.push({
+    //       aiId,
+    //       icon: <FontAwesomeIcon icon={faRobot} />,
+    //       name: `AI ${aiId} Match`,
+    //       type: SubmissionActions.Type.AI_MATCH,
+    //     });
+    //   });
+    // }
 
     const mapOptions = (
       <div className={classnames(styles['dropdown-submenu'])}>

src/app/containers/SocketHandler.ts

@@ -6,7 +6,22 @@ import { connect } from 'react-redux';
 import { Dispatch } from 'redux';
 
 const mapStateToProps = (rootState: RootState) => {
-  return {};
+  return {
+    announcements: rootState.notification.announcements,
+    commitHash: rootState.submission.commitHash,
+    currentAiId: rootState.submission.currentAiId,
+    isCodeLocked: rootState.submission.isCodeLocked,
+    isNotificationPresent: rootState.user.isNotificationPresent,
+    isSocketPresent: rootState.user.isSocketPresent,
+    loading: rootState.notification.loading,
+    mapId: rootState.submission.mapId,
+    notifications: rootState.notification.notifications,
+    playerId1: rootState.submission.playerId1,
+    playerId2: rootState.submission.playerId2,
+    request: rootState.submission.request,
+    socketMessage: rootState.user.socketMessage,
+    userId: rootState.user.userId,
+  };
 };
 
 const mapDispatchToProps = (dispatch: Dispatch) => {
@@ -24,6 +39,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => {
     sendInfo: (message: string) => dispatch(NotificationActions.info(message)),
     sendSuccess: (message: string) => dispatch(NotificationActions.success(message)),
     success: (message: string) => dispatch(NotificationActions.success(message)),
+    toggleLockCode: () => dispatch(SubmissionActions.toggleLockCode()),
     updateDisplayDebugLog: (log: string) => dispatch(GameLogActions.updateDisplayDebugLog(log)),
     updateGameLog: (player1DebugLog: string, player2DebugLog: string, gameLog: string) =>
       dispatch(GameLogActions.updateGameLog(player1DebugLog, player2DebugLog, gameLog)),

src/app/reducers/code/Submission.ts

@@ -7,6 +7,7 @@ const submissionStoreState: SubmissionInterfaces.SubmissionStoreState = {
   debugRunCode: '',
   debugRunCommitHash: 'latest',
   debugRunRequest: SubmissionInterfaces.Request.NONE,
+  isCodeLocked: false,
   mapId: 1,
   maps: [],
   request: SubmissionInterfaces.Request.NONE,
@@ -88,6 +89,11 @@ export const submissionReducer = (
       return {
         ...submissionStoreState,
       };
+    case SubmissionActions.Type.TOGGLE_LOCK_CODE:
+      return {
+        ...submissionStoreState,
+        isCodeLocked: !state.isCodeLocked,
+      };
     default:
       return state;
   }

src/app/sagas/Submission.ts

@@ -1,5 +1,5 @@
 /* tslint:disable:no-console*/
-import { CodeActions, GameLogActions, NotificationActions, SubmissionActions } from 'app/actions';
+import { CodeActions, GameLogActions, SubmissionActions } from 'app/actions';
 import * as SubmissionFetch from 'app/apiFetch/Submission';
 import { RootState } from 'app/reducers';
 import { checkAccountActivated, checkAuthentication } from 'app/sagas/utils';
@@ -14,8 +14,9 @@ export function* lockCode(action: ActionType<typeof SubmissionActions.lockCode>)
   try {
     yield put(CodeActions.save());
     // @ts-ignore
-    const res = yield call(SubmissionFetch.lockCode);
-    yield put(NotificationActions.success('Code Locked'));
+    // const res = yield call(SubmissionFetch.lockCode);
+    // yield put(NotificationActions.success('Code Locked'));
+    yield put(SubmissionActions.toggleLockCode());
     yield put(GameLogActions.clearAllLogs());
   } catch (err) {
     console.error(err);

src/app/types/SocketHandler.ts

@@ -9,6 +9,7 @@ export interface DispatchProps {
   sendInfo: (message: string) => void;
   sendSuccess: (message: string) => void;
   success: (message: string) => void;
+  toggleLockCode: () => void;
   updateDisplayDebugLog: (log: string) => void;
   updateGameLog: (player1DebugLog: string, player2DebugLog: string, gameLog: string) => void;
   updateMatchPlayerId: (matchPlayerId: number) => void;
@@ -39,6 +40,7 @@ export interface StateProps {
   playerId2: number;
   request: SubmissionInterfaces.Request;
   userId: number;
+  isCodeLocked: boolean;
 }
 
 export type Props = DispatchProps;

src/app/types/code/Submission.ts

@@ -6,6 +6,7 @@ const actions = {
   changeState: SubmissionActions.changeState,
   resetSubmissionState: SubmissionActions.resetSubmissionState,
   saveMaps: SubmissionActions.saveMaps,
+  toggleLockCode: SubmissionActions.toggleLockCode,
   updateAiIds: SubmissionActions.updateAiIds,
   updateCommitHash: SubmissionActions.updateCommitHash,
   updateCurrentAiId: SubmissionActions.updateCurrentAiId,
@@ -46,6 +47,10 @@ export interface SubmissionStoreState {
   debugRunCommitHash: string;
   mapId: number;
   maps: Map[];
+  commitHash: string;
+  playerId1: number;
+  playerId2: number;
+  isCodeLocked: boolean;
 }
 
 export interface Map {