Fix

Author: vtm9

services/app/apps/codebattle/assets/js/widgets/pages/game/Notifications.jsx

@@ -1,67 +1,85 @@
-import React, { useContext } from 'react';
+import React, { useContext } from "react";
 
-import hasIn from 'lodash/hasIn';
-import { useSelector } from 'react-redux';
+import hasIn from "lodash/hasIn";
+import { useSelector } from "react-redux";
 
-import RoomContext from '../../components/RoomContext';
-import { roomMachineStates, replayerMachineStates } from '../../machines/game';
-import { roomStateSelector } from '../../machines/selectors';
-import * as selectors from '../../selectors';
-import useMachineStateSelector from '../../utils/useMachineStateSelector';
-import BackToTaskBuilderButton from '../builder/BackToTaskBuilderButton';
+import RoomContext from "../../components/RoomContext";
+import { roomMachineStates, replayerMachineStates } from "../../machines/game";
+import { roomStateSelector } from "../../machines/selectors";
+import * as selectors from "../../selectors";
+import useMachineStateSelector from "../../utils/useMachineStateSelector";
+import BackToTaskBuilderButton from "../builder/BackToTaskBuilderButton";
 
-import ActionsAfterGame from './ActionsAfterGame';
-import ApprovePlaybookButtons from './ApprovePlaybookButtons';
-import BackToEventButton from './BackToEventButton';
-import BackToHomeButton from './BackToHomeButton';
-import BackToTournamentButton from './BackToTournamentButton';
-import GameResult from './GameResult';
-import GoToNextGame from './GoToNextGame';
-import ReplayerControlButton from './ReplayerControlButton';
-import VideoConferenceButton from './VideoConferenceButton';
+import ActionsAfterGame from "./ActionsAfterGame";
+import ApprovePlaybookButtons from "./ApprovePlaybookButtons";
+import BackToEventButton from "./BackToEventButton";
+import BackToHomeButton from "./BackToHomeButton";
+import BackToTournamentButton from "./BackToTournamentButton";
+import GameResult from "./GameResult";
+import GoToNextGame from "./GoToNextGame";
+import ReplayerControlButton from "./ReplayerControlButton";
+import VideoConferenceButton from "./VideoConferenceButton";
 
 function Notifications() {
   const { mainService } = useContext(RoomContext);
-  const roomMachineState = useMachineStateSelector(mainService, roomStateSelector);
+  const roomMachineState = useMachineStateSelector(
+    mainService,
+    roomStateSelector,
+  );
 
   const { tournamentId } = useSelector(selectors.gameStatusSelector);
   const currentUserId = useSelector(selectors.currentUserIdSelector);
   const players = useSelector(selectors.gamePlayersSelector);
-  const playbookSolutionType = useSelector(state => state.playbook.solutionType);
-  const tournamentsInfo = useSelector(state => state.game.tournamentsInfo);
+  const playbookSolutionType = useSelector(
+    (state) => state.playbook.solutionType,
+  );
+  const tournamentsInfo = useSelector((state) => state.game.tournamentsInfo);
   const tournament = useSelector(selectors.tournamentSelector);
   const isAdmin = useSelector(selectors.currentUserIsAdminSelector);
   const isCurrentUserPlayer = hasIn(players, currentUserId);
   const isTournamentGame = !!tournamentId;
   const isEventTournament = !!tournament?.eventId;
-  const isActiveTournament = !!tournamentsInfo && tournamentsInfo.state === 'active';
+  const isActiveTournament =
+    !!tournamentsInfo && tournamentsInfo.state === "active";
 
   return (
     <>
-      {roomMachineState.matches({ room: roomMachineStates.testing }) && <BackToTaskBuilderButton />}
-      {(isAdmin
-        && !roomMachineState.matches({ replayer: replayerMachineStates.off })
-        && !roomMachineState.matches({ room: roomMachineStates.testing })
-      ) && <VideoConferenceButton />}
+      {roomMachineState.matches({ room: roomMachineStates.testing }) && (
+        <BackToTaskBuilderButton />
+      )}
+      {isAdmin &&
+        !roomMachineState.matches({ replayer: replayerMachineStates.off }) &&
+        !roomMachineState.matches({ room: roomMachineStates.testing })}
       <ReplayerControlButton />
-      {(isCurrentUserPlayer && roomMachineState.matches({ room: roomMachineStates.gameOver }))
-        && (
+      {isCurrentUserPlayer &&
+        roomMachineState.matches({ room: roomMachineStates.gameOver }) && (
           <>
             <GameResult />
             <ActionsAfterGame />
           </>
         )}
-      {(isAdmin && !roomMachineState.matches({ replayer: replayerMachineStates.off })) && (
-        <>
-          <ApprovePlaybookButtons playbookSolutionType={playbookSolutionType} />
-        </>
+      {isAdmin &&
+        !roomMachineState.matches({ replayer: replayerMachineStates.off }) && (
+          <>
+            <ApprovePlaybookButtons
+              playbookSolutionType={playbookSolutionType}
+            />
+          </>
+        )}
+      {isTournamentGame && isActiveTournament && (
+        <GoToNextGame
+          tournamentsInfo={tournamentsInfo}
+          currentUserId={currentUserId}
+        />
       )}
-      {isTournamentGame && isActiveTournament
-        && <GoToNextGame tournamentsInfo={tournamentsInfo} currentUserId={currentUserId} />}
       {isTournamentGame && !isEventTournament && <BackToTournamentButton />}
-      {isTournamentGame && isEventTournament && <BackToEventButton eventId={tournament?.eventId} />}
-      {!isTournamentGame && !roomMachineState.matches({ room: roomMachineStates.testing })
-        && <BackToHomeButton />}
+      {isTournamentGame && isEventTournament && (
+        <BackToEventButton eventId={tournament?.eventId} />
+      )}
+      {!isTournamentGame &&
+        !roomMachineState.matches({ room: roomMachineStates.testing }) && (
+          <BackToHomeButton />
+        )}
     </>
   );
 }

services/app/apps/codebattle/lib/codebattle/tournament/strategy/top200.ex

@@ -13,8 +13,8 @@ defmodule Codebattle.Tournament.Top200 do
     #   |> Codebattle.Repo.all()
     #   |> Enum.filter(&(&1.is_bot == false and &1.subscription_type != :admin))
     #   |> Enum.take(199)
-
     # add_players(tournament, %{users: users})
+
     tournament
   end