Fix password validation to allow slash character

services/app/apps/codebattle/assets/js/widgets/formik/index.js

@@ -49,41 +49,41 @@ const schemas = {
     password: Yup.string().required('Password required'),
   },
   signUp: {
-      name: Yup
-        .string()
-        .test(
-          'start-or-end-with-empty-symbols',
-          'Can\'t start or end with empty symbols',
-          value => {
-            if (!value) {
-              return true;
-            }
-            const invalidSymbolIndex = invalidSymbols.findIndex(invalidSymbol => (
-              value.startsWith(invalidSymbol) || value.endsWith(invalidSymbol)
-            ));
+    name: Yup
+      .string()
+      .test(
+        'start-or-end-with-empty-symbols',
+        'Can\'t start or end with empty symbols',
+        value => {
+          if (!value) {
+            return true;
+          }
+          const invalidSymbolIndex = invalidSymbols.findIndex(invalidSymbol => (
+            value.startsWith(invalidSymbol) || value.endsWith(invalidSymbol)
+          ));
 
-            return invalidSymbolIndex === -1;
-          },
-        )
-        .min(3, 'Should be from 3 to 16 characters')
-        .max(16, 'Should be from 3 to 16 characters')
-        .matches(
-          /^[a-zA-Z]+[a-zA-Z0-9_-\s{1}][a-zA-Z0-9_]+$/i,
-          'Must consist of Latin letters, numbers and underscores. Only begin with latin letter',
-        )
-        .required('Nickname required'),
-      email: emailSchema,
-      password: Yup
-        .string()
-        .matches(/^\S*$/, 'Can\'t contain empty symbols')
-        .min(6, 'Should be from 6 to 16 characters')
-        .max(16, 'Should be from 6 to 16 characters')
-        .matches(/[!@#$%^&*(),.?":{}|<>]/, 'Should contain at least one special character')
-        .required('Password required'),
-      passwordConfirmation: Yup
-        .string()
-        .required('Confirmation required')
-        .oneOf([Yup.ref('password')], 'Passwords must match'),
+          return invalidSymbolIndex === -1;
+        },
+      )
+      .min(3, 'Should be from 3 to 16 characters')
+      .max(16, 'Should be from 3 to 16 characters')
+      .matches(
+        /^[a-zA-Z]+[a-zA-Z0-9_-\s{1}][a-zA-Z0-9_]+$/i,
+        'Must consist of Latin letters, numbers and underscores. Only begin with latin letter',
+      )
+      .required('Nickname required'),
+    email: emailSchema,
+    password: Yup
+      .string()
+      .matches(/^\S*$/, 'Can\'t contain empty symbols')
+      .min(6, 'Should be from 6 to 16 characters')
+      .max(16, 'Should be from 6 to 16 characters')
+      .matches(/[!@#$%^&*(),.?":{}|<>/\\]/, 'Should contain at least one special character')
+      .required('Password required'),
+    passwordConfirmation: Yup
+      .string()
+      .required('Confirmation required')
+      .oneOf([Yup.ref('password')], 'Passwords must match'),
   },
 };
 

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

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
-import { useSelector } from 'react-redux';
 
 import i18next from 'i18next';
+import { useSelector } from 'react-redux';
 
 import RoomContext from '../../components/RoomContext';
 import {
@@ -10,12 +10,12 @@ import {
 import * as selectors from '../../selectors';
 import useMachineStateSelector from '../../utils/useMachineStateSelector';
 
-import TournamentCurrentPlayerRankingPanel from './TournamentCurrentPlayerRankingPanel';
 import ChatWidget from './ChatWidget';
 import Output from './Output';
 import OutputTab from './OutputTab';
 import TaskAssignment from './TaskAssignment';
 import TimerContainer from './TimerContainer';
+import TournamentCurrentPlayerRankingPanel from './TournamentCurrentPlayerRankingPanel';
 
 const InfoPanel = ({
   idOutput = 'leftOutput',

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

@@ -1,23 +1,21 @@
 import React, { memo } from 'react';
 
-import TournamentRankingTable from './TournamentRankingTable';
 import Notifications from './Notifications';
+import TournamentRankingTable from './TournamentRankingTable';
 
-const TournamentCurrentPlayerRankingPanel = () => {
-  return (
-    <div
-      className="d-flex flex-wrap flex-sm-nowrap shadow-sm h-100 rounded-lg bg-white"
-    >
-      <TournamentRankingTable />
-      <div className="flex-shrink-1 p-0 border-left rounded-right cb-game-control-container">
-        <div className="d-flex flex-column justify-content-start overflow-auto h-100">
-          <div className="px-3 py-3 w-100 d-flex flex-column">
-            <Notifications />
-          </div>
+const TournamentCurrentPlayerRankingPanel = () => (
+  <div
+    className="d-flex flex-wrap flex-sm-nowrap shadow-sm h-100 rounded-lg bg-white"
+  >
+    <TournamentRankingTable />
+    <div className="flex-shrink-1 p-0 border-left rounded-right cb-game-control-container">
+      <div className="d-flex flex-column justify-content-start overflow-auto h-100">
+        <div className="px-3 py-3 w-100 d-flex flex-column">
+          <Notifications />
         </div>
       </div>
     </div>
+  </div>
   );
-};
 
 export default memo(TournamentCurrentPlayerRankingPanel);

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

@@ -29,7 +29,7 @@ const tableDataCellClassName = cn(
 const TournamentRankingTable = () => {
   const currentUserClanId = useSelector(currentUserClanIdSelector);
   const { ranking } = useSelector(tournamentSelector);
-  console.log(ranking)
+  console.log(ranking);
 
   return (
     <div
@@ -79,7 +79,9 @@ const TournamentRankingTable = () => {
                     <div
                       title={item?.name}
                       className="cb-custom-event-name"
-                      style={{ textOverflow: 'ellipsis', overflow: 'hidden', whiteSpace: 'nowrap', maxWidth: '13ch' }}
+                      style={{
+ textOverflow: 'ellipsis', overflow: 'hidden', whiteSpace: 'nowrap', maxWidth: '13ch',
+}}
                     >
                       {item?.name.slice(0, 11) + (item?.name.length > 11 ? '...' : '')}
                     </div>
@@ -88,7 +90,9 @@ const TournamentRankingTable = () => {
                     <div
                       title={console.log(item) || item?.clan}
                       className="cb-custom-event-name"
-                      style={{ textOverflow: 'ellipsis', overflow: 'hidden', whiteSpace: 'nowrap', maxWidth: '15ch' }}
+                      style={{
+ textOverflow: 'ellipsis', overflow: 'hidden', whiteSpace: 'nowrap', maxWidth: '15ch',
+}}
                     >
                       {item?.clan?.slice(0, 11) + (item?.clan?.length > 11 ? '...' : '')}
                     </div>

services/app/apps/codebattle/assets/js/widgets/selectors/index.js

@@ -23,7 +23,7 @@ export const currentUserIdSelector = state => state.user.currentUserId;
 export const currentUserClanIdSelector = state => state.user.users[state.user.currentUserId].clanId;
 
 export const currentUserIsAdminSelector = state => !!state.user.users[state.user.currentUserId].isAdmin;
-export const currentUserIsPremiumSelector = state => state.user.users[state.user.currentUserId].subscriptionType === SubscriptionTypeCodes.premium
+export const currentUserIsPremiumSelector = state => state.user.users[state.user.currentUserId].subscriptionType === SubscriptionTypeCodes.premium;
 
 export const currentUserIsGuestSelector = state => !!state.user.users[state.user.currentUserId].isGuest;