Enable React Tour after first time login

- Update new map assets
- Fix matchview win/loss logic

Author: kumaran-14

src/app/components/MatchView/MatchElement.tsx

@@ -11,13 +11,7 @@ export class MatchElement extends React.Component<
   MatchInterfaces.ElementProps,
   MatchInterfaces.ElementState
 > {
-  public MAP_THUMBNAIL = [
-    'islesofcodechar',
-    'timeturner',
-    'treacherousmangroves',
-    'mysterymap',
-    'mysterymap',
-  ];
+  public MAP_THUMBNAIL = ['sands_of_time', 'sector', 'revival', 'mysterymap', 'mysterymap'];
 
   public MAP_NAME = [
     'Isles of Codecharacter',

src/app/components/SocketHandler.tsx

@@ -14,8 +14,7 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
       {},
       // @ts-ignore
       (frame) => {
-        const { userId, success } = this.props;
-        success('Connected to Server.');
+        const { userId } = this.props;
         // @ts-ignore
         this.stompClient.subscribe(
           `/socket/response/alert/${userId}`,
@@ -30,7 +29,11 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
           (message: { body: string }) => {
             if (message.body[0] === 'E') {
               this.props.error('Match not executed successfully');
-              this.props.updateGameLog(message.body, message.body, '');
+              // @ts-ignore
+              this.props.clearAllLogs();
+              this.props.clearDisplayDebugLog();
+              this.props.updateDisplayDebugLog(message.body);
+              // this.props.updateGameLog(Buffer.from(message.body), '', '');
               return;
             }
 

src/app/containers/SocketHandler.ts

@@ -23,6 +23,18 @@ const mapDispatchToProps = (dispatch: Dispatch) => {
     sendExecuteSuccess: (logs: string) => dispatch(SubmissionActions.handleExecuteSuccess(logs)),
     sendInfo: (message: string) => dispatch(NotificationActions.info(message)),
     sendSuccess: (message: string) => dispatch(NotificationActions.success(message)),
+    success: (message: string) => dispatch(NotificationActions.success(message)),
+    updateDisplayDebugLog: (log: string) => dispatch(GameLogActions.updateDisplayDebugLog(log)),
+    updateGameLog: (player1DebugLog: string, player2DebugLog: string, gameLog: string) =>
+      dispatch(GameLogActions.updateGameLog(player1DebugLog, player2DebugLog, gameLog)),
+    updateGlobalAnnouncements: (announcements: NotificationInterfaces.Announcement[]) =>
+      dispatch(NotificationActions.updateGlobalAnnouncements(announcements)),
+    updateGlobalNotifications: (notifications: NotificationInterfaces.Notification[]) =>
+      dispatch(NotificationActions.updateGlobalNotifications(notifications)),
+    updateMatchPlayerId: (matchPlayerId: number) =>
+      dispatch(GameLogActions.updateMatchPlayerId(matchPlayerId)),
+    updateRequest: (request: SubmissionInterfaces.Request) =>
+      dispatch(SubmissionActions.changeCurrentRequest(request)),
   };
 };
 

src/app/reducers/Dashboard.ts

@@ -12,7 +12,8 @@ export enum SidePanelTab {
 }
 
 const dashboardStoreIntialState: DashboardInterfaces.DashboardStoreState = {
-  isWelcomeModalOpen: false,
+  isReactTourActive: true,
+  isWelcomeModalOpen: true,
   sidePanelTab: SidePanelTab.NONE,
 };
 

src/app/sagas/MatchView.ts

@@ -17,7 +17,8 @@ export function* getMatches(action: ActionType<typeof MatchActions.getMatches>)
     if (isAuthenticated === false) return;
 
     if (isArray(res)) {
-      const matchData = mapMatchResponse(res);
+      const username = yield select((state: RootState) => state.user.username);
+      const matchData = mapMatchResponse(res, username);
       yield put(MatchActions.updateMatches(matchData));
     } else yield put(NotificationActions.error(res.message));
   } catch (err) {
@@ -39,8 +40,8 @@ export function* getTopMatches(action: ActionType<typeof MatchActions.getTopMatc
     if (isAuthenticated === false) return;
 
     if (isArray(res)) {
-      const matchData = mapMatchResponse(res);
-
+      const username = yield select((state: RootState) => state.user.username);
+      const matchData = mapMatchResponse(res, username);
       yield put(MatchActions.updateTopMatches(matchData));
     } else yield put(NotificationActions.error(res.message));
   } catch (err) {

src/app/sagas/utils/index.ts

@@ -36,6 +36,7 @@ export function* checkAccountActivated(result: ResponseStructure) {
 
 export const mapMatchResponse = (
   res: MatchVewInterfaces.RecievedMatch[],
+  username: string,
 ): MatchVewInterfaces.Match[] => {
   return res.map((match: MatchVewInterfaces.RecievedMatch) => {
     return {
@@ -45,7 +46,7 @@ export const mapMatchResponse = (
         return {
           id: game.id,
           mapId: game.mapId,
-          verdict: getVerdict(game.verdict),
+          verdict: getVerdict(game.verdict, username, match.username1, match.username2),
           winType: 'string',
         };
       }),
@@ -55,7 +56,7 @@ export const mapMatchResponse = (
       score2: match.score2,
       username1: match.username1,
       username2: match.username2,
-      verdict: getVerdict(match.verdict),
+      verdict: getVerdict(match.verdict, username, match.username1, match.username2),
     };
   });
 };
@@ -68,16 +69,27 @@ export enum VERDICT {
 
 export enum MAP_VERDICT_TO_STRING {
   TIE = '0',
-  PLAYER1 = '1',
-  PLAYER2 = '2',
+  WIN = '1',
+  LOSE = '2',
 }
 
-const getVerdict = (verdict: string) => {
+const getVerdict = (
+  verdict: string,
+  loggedInUsername: string,
+  player1: string,
+  player2: string,
+) => {
   switch (verdict) {
     case VERDICT.PLAYER1:
-      return MAP_VERDICT_TO_STRING.PLAYER1;
+      if (loggedInUsername === player1) {
+        return MAP_VERDICT_TO_STRING.WIN;
+      }
+      return MAP_VERDICT_TO_STRING.LOSE;
     case VERDICT.PLAYER2:
-      return MAP_VERDICT_TO_STRING.PLAYER2;
+      if (loggedInUsername === player2) {
+        return MAP_VERDICT_TO_STRING.WIN;
+      }
+      return MAP_VERDICT_TO_STRING.LOSE;
     case VERDICT.TIE:
       return MAP_VERDICT_TO_STRING.TIE;
     default:

src/app/types/SocketHandler.ts

@@ -8,7 +8,8 @@ export interface DispatchProps {
   sendError: (message: string) => void;
   sendInfo: (message: string) => void;
   sendSuccess: (message: string) => void;
-  updateRequest: (request: SubmissionInterfaces.Request) => void;
+  success: (message: string) => void;
+  updateDisplayDebugLog: (log: string) => void;
   updateGameLog: (player1DebugLog: string, player2DebugLog: string, gameLog: string) => void;
   updateMatchPlayerId: (matchPlayerId: number) => void;
   clearDisplayDebugLog: () => void;