fix minors and info panel

Author: ReDBrother

services/app/apps/codebattle/assets/js/widgets/pages/tournament/CustomTournamentInfoPanel.jsx

@@ -1,5 +1,5 @@
 import React, {
-  memo, useState, useCallback, useRef,
+  memo, useState, useEffect, useCallback, useRef,
 } from 'react';
 
 import { useSelector } from 'react-redux';
@@ -48,6 +48,16 @@ function CustomTournamentInfoPanel({
         : { panel: PanelModeCodes.ratingMode },
   );
 
+  useEffect(() => {
+    if (players[currentUserId]) {
+      setPanelMode({
+        panel: PanelModeCodes.playerMode,
+      });
+    }
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, players[currentUserId]?.id);
+
   const allPlayers = useSelector(tournamentPlayersSelector);
 
   const handleUserSelectClick = useCallback(
@@ -136,7 +146,7 @@ function CustomTournamentInfoPanel({
             pageNumber={pageNumber}
             pageSize={pageSize}
             hideBots={hideBots}
-            hideResults={hideResults && !canModerate}
+            hideResults={(hideResults && !canModerate) || (!players[currentUserId] && !canModerate)}
           />
         )}
         {panelMode.panel === PanelModeCodes.topUserByClansMode && (

services/app/apps/codebattle/assets/js/widgets/pages/tournament/RatingPanel.jsx

@@ -10,6 +10,7 @@ import range from 'lodash/range';
 import reverse from 'lodash/reverse';
 import { useDispatch } from 'react-redux';
 
+import i18n from '../../../i18n';
 import mapStagesToTitle from '../../config/mapStagesToTitle';
 import { uploadPlayersMatches } from '../../middlewares/Tournament';
 import { actions } from '../../slices';
@@ -26,15 +27,15 @@ const navPlayerTabsClassName = cn(
 );
 
 const tabLinkClassName = (active, isCurrent = false) => cn(
-    'nav-item nav-link text-uppercase text-nowrap rounded-0 font-weight-bold p-3 border-0 w-100', {
-      active,
-      'text-primary': isCurrent,
-    },
-  );
+  'nav-item nav-link text-uppercase text-nowrap rounded-0 font-weight-bold p-3 border-0 w-100', {
+  active,
+  'text-primary': isCurrent,
+},
+);
 
 const tabContentClassName = active => cn('tab-pane fade', {
-    'd-flex flex-column show active': active,
-  });
+  'd-flex flex-column show active': active,
+});
 
 const PlayersList = memo(
   ({
@@ -44,27 +45,27 @@ const PlayersList = memo(
     searchedUserId,
     hideBots,
   }) => players.map(player => {
-      if (player.id === searchedUserId) {
-        return <></>;
-      }
+    if (player.id === searchedUserId) {
+      return <></>;
+    }
 
-      const userMatches = matchList.filter(match => match.playerIds.includes(player.id));
+    const userMatches = matchList.filter(match => match.playerIds.includes(player.id));
 
-      return (
-        <TournamentUserPanel
-          key={`user-panel-${player.id}`}
-          matches={userMatches}
-          currentUserId={currentUserId}
-          userId={player.id}
-          name={player.name}
-          score={player.score}
-          place={player.place}
-          isBanned={player.isBanned}
-          searchedUserId={searchedUserId}
-          hideBots={hideBots}
-        />
-      );
-    }),
+    return (
+      <TournamentUserPanel
+        key={`user-panel-${player.id}`}
+        matches={userMatches}
+        currentUserId={currentUserId}
+        userId={player.id}
+        name={player.name}
+        score={player.score}
+        place={player.place}
+        isBanned={player.isBanned}
+        searchedUserId={searchedUserId}
+        hideBots={hideBots}
+      />
+    );
+  }),
 );
 
 const SearchedUserPanel = memo(({
@@ -111,20 +112,20 @@ function RatingPanel({
 
   const playersList = useMemo(
     () => Object.values(players)
-        .sort((a, b) => b.score - a.score)
-        .slice(0 + pageSize * (pageNumber - 1), pageSize * pageNumber)
-        .reduce((acc, player) => {
-          if (player.isBot && hideBots) {
-            return acc;
-          }
+      .sort((a, b) => b.score - a.score)
+      .slice(0 + pageSize * (pageNumber - 1), pageSize * pageNumber)
+      .reduce((acc, player) => {
+        if (player.isBot && hideBots) {
+          return acc;
+        }
 
-          if (player.id === currentUserId) {
-            return [player, ...acc];
-          }
+        if (player.id === currentUserId) {
+          return [player, ...acc];
+        }
 
-          acc.push(player);
-          return acc;
-        }, []),
+        acc.push(player);
+        return acc;
+      }, []),
     [players, currentUserId, pageSize, pageNumber, hideBots],
   );
   const topPlayersList = useMemo(
@@ -178,7 +179,7 @@ function RatingPanel({
           'text-uppercase font-weight-bold pt-2',
         )}
       >
-        Wait reviling results
+        {i18n.t('Wait reviling results')}
       </div>
     );
   }

services/app/apps/codebattle/priv/gettext/ru/LC_MESSAGES/default.po

@@ -1022,3 +1022,5 @@ msgstr "Рейтинг"
 msgid "Sended"
 msgstr "Отправлено"
 
+msgid "Wait reviling results"
+msgstr "Ожидайте результатов соревнования"