Develop to release

src/components/Editor/CustomModules/UrlInputModal/UrlInputModal.tsx

@@ -120,10 +120,10 @@ export const UrlInputModal: React.FC<IUrlInputModalProps> = ({
             />
 
             <DialogActions>
-              <Button onClick={handleClose} color="primary">
+              <Button variant="contained" onClick={handleClose}>
                 {t(langTokens.common.cancel)}
               </Button>
-              <Button color="primary" type="submit">
+              <Button variant="contained" type="submit" disabled={!url}>
                 {t(langTokens.common.add)}
               </Button>
             </DialogActions>

src/components/Form/Buttons/__tests__/BasicButton.test.tsx

@@ -0,0 +1,42 @@
+import userEvent, { TargetElement } from '@testing-library/user-event';
+import React from 'react';
+import { render } from '@testing-library/react';
+import { BasicButton } from '../BasicButton';
+
+describe('Test for BasicButton component.', () => {
+  it('Should renders a BasicButton with accept type.', () => {
+    const { container } = render(<BasicButton type="accept" />);
+
+    expect(container).toMatchSnapshot();
+    expect(container.firstChild).toHaveClass('BasicInput-basicAcceptButton-1');
+  });
+
+  it('Should renders a BasicButton with sign type.', () => {
+    const { container } = render(<BasicButton type="sign" />);
+
+    expect(container.firstChild).toHaveClass('BasicInput-basicSignButton-4');
+  });
+
+  it('Should handle onClick', () => {
+    const handleClick = jest.fn();
+    const { container } = render(
+      <BasicButton type="accept" onClick={handleClick} />,
+    );
+    userEvent.click(container.firstChild as TargetElement);
+    expect(handleClick).toBeCalled();
+  });
+
+  it('Should not be active when disabled.', () => {
+    const { container } = render(<BasicButton type="accept" disabled />);
+
+    const button = container.firstChild as TargetElement;
+    expect(button).toBeDisabled();
+  });
+
+  it('Should be label in the button', () => {
+    const label = 'text';
+    const { container } = render(<BasicButton type="accept" label={label} />);
+    const button = container.firstChild as TargetElement;
+    expect(button).toHaveTextContent(label);
+  });
+});

src/components/Form/Buttons/__tests__/__snapshots__/BasicButton.test.tsx.snap

@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Test for BasicButton component. Should renders a BasicButton with accept type. 1`] = `
+<div>
+  <button
+    class="MuiButtonBase-root MuiButton-root MuiButton-contained BasicInput-basicAcceptButton-1 MuiButton-fullWidth"
+    tabindex="0"
+    type="submit"
+  >
+    <span
+      class="MuiButton-label"
+    />
+    <span
+      class="MuiTouchRipple-root"
+    />
+  </button>
+</div>
+`;

src/components/Header/AccountMenu.tsx

@@ -5,8 +5,15 @@ import { Avatar, Button, Typography } from '@material-ui/core';
 import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
 import { useTranslation } from 'react-i18next';
 import { useStyles } from './AccountMenu.styles';
-import { StyledMenu, StyledMenuItem } from '../../old/lib/components/Menu/StyledMenu';
-import { getUserAsyncAction, selectCurrentUser, signOutAction } from '../../models/user';
+import {
+  StyledMenu,
+  StyledMenuItem,
+} from '../../old/lib/components/Menu/StyledMenu';
+import {
+  getUserAsyncAction,
+  selectCurrentUser,
+  signOutAction,
+} from '../../models/user';
 import { useActions } from '../../shared/hooks';
 import { AuthContext } from '../../old/provider/AuthProvider/AuthContext';
 import { AccountIcon } from '../../old/lib/components/icons/AccountIcon';
@@ -88,13 +95,6 @@ export const AccountMenu: React.FC = () => {
             </Typography>
           </StyledMenuItem>
         </Link>
-        <Link to="/">
-          <StyledMenuItem onClick={onLogoutHandler}>
-            <Typography variant="button" color="inherit">
-              {t(langTokens.common.exit)}
-            </Typography>
-          </StyledMenuItem>
-        </Link>
         {authorities ? (
           <Link to="/admin">
             <StyledMenuItem onClick={handleClose}>
@@ -104,6 +104,13 @@ export const AccountMenu: React.FC = () => {
             </StyledMenuItem>
           </Link>
         ) : null}
+        <Link to="/">
+          <StyledMenuItem onClick={onLogoutHandler}>
+            <Typography variant="button" color="inherit">
+              {t(langTokens.common.exit)}
+            </Typography>
+          </StyledMenuItem>
+        </Link>
       </StyledMenu>
     </>
   );

src/components/Header/__test__/AccountMenu.test.tsx

@@ -100,7 +100,7 @@ describe('should render AccountMenu component', () => {
 
   it("should log out from current user profile by clicking on the button 'Вийти'", () => {
     openAccounMenu();
-    menuLinkClick(1);
+    menuLinkClick(2);
     expect(AuthContextMock.removeAuthorization).toHaveBeenCalled();
   });
 

src/components/Posts/Cards/VideoPostPreviewCard/VideoPostPreviewCard.tsx

@@ -29,6 +29,7 @@ export const VideoPostPreviewCard: React.FC<IPostPreviewCardProps> = ({
           <Box className={classes.play} data-testid="videoIcon" />
         )}
         <iframe
+          style={{ pointerEvents: post.videoUrl ? 'inherit' : 'none' }}
           src={url}
           width="100%"
           height="100%"

src/components/Posts/PostInfo/PostInfo.tsx

@@ -14,12 +14,12 @@ export interface IPostInfo {
     origins: IOrigin[];
     type: IPostType;
     publishedAt: string;
-    realViews?: number;
+    displayViews?: number;
   };
 }
 
 export default function PostInfo({ info }: IPostInfo): JSX.Element {
-  const { directions, origins, type, publishedAt, realViews } = info;
+  const { directions, origins, type, publishedAt, displayViews } = info;
   const classes = useStyles();
   const history = useHistory();
 
@@ -71,10 +71,10 @@ export default function PostInfo({ info }: IPostInfo): JSX.Element {
             <VisibilityIcon fontSize="small" />
           </li>
           <li className={classes.counter} data-testid="counter">
-            {realViews === undefined ? (
+            {displayViews === undefined ? (
               <Skeleton width={40} height={20} data-testid="skeleton" />
             ) : (
-              realViews
+              displayViews
             )}
           </li>
         </>

src/components/Posts/PostInfo/__tests__/PostInfo.test.tsx

@@ -54,7 +54,7 @@ describe('PostInfo tests', () => {
           name: 'Стаття',
         },
         publishedAt: '05.10.2021',
-        realViews: 9,
+        displayViews: 9,
       },
     };
   });
@@ -122,7 +122,7 @@ describe('PostInfo tests', () => {
   });
 
   it('should Skeleton be visible', () => {
-    delete mocks.info.realViews;
+    delete mocks.info.displayViews;
 
     const { asFragment } = render(<PostInfo info={mocks.info} />);
 

src/locales/uk/parts/admin.ts

@@ -55,6 +55,8 @@ export const admin = {
   imagesTablet: 'Зображення для планшета',
   review: 'Переглянути',
   sendForReview: 'Відправити на модерацію',
+  sendForReviewTitle: 'Відправити публікацію на модерацію?',
+  sendForReviewSuccess: 'Ваша стаття була успішно відправлена на модерацію',
   close: 'Закрити',
   selectedImportantMaterials: 'Зараз використовуються:',
   selectOption: `Оберіть об'єкт налаштування у меню`,

src/locales/uk/parts/editor.ts

@@ -12,6 +12,7 @@ export const editor = {
   preview: 'Попередній перегляд',
   publish: 'Опублікувати',
   save: 'Зберегти',
+  sendToReview: 'Відправити на модерацію',
   creation: 'Створення',
   updation: 'Редагування',
   videoTitle: 'Заголовок відео',

src/models/experts/asyncActions.ts

@@ -23,8 +23,9 @@ export const fetchExperts = createAsyncThunk(
         params: {
           page,
           size: LOAD_EXPERTS_LIMIT,
-          regions: regions.some(region => region === 0) ? [] : regions,
-          directions: directions.some(dir => dir === 0) ? [] : directions,
+          regions: regions.some((region) => region === 0) ? [] : regions,
+          directions: directions.some((dir) => dir === 0) ? [] : directions,
+          sort: 'lastName',
         },
       });
 

src/old/lib/components/Users/AdminPage/styles/AdminPageWrapper.styles.ts

@@ -5,6 +5,9 @@ export const useStyles = makeStyles(
     container: {
       overflowX: 'auto',
       paddingTop: '10px',
+      display: 'grid',
+      gridTemplateColumns: '200px 1fr',
+      margin: '0 -50px',
     },
   }),
   { name: 'AdminPageWrapper' },

src/old/lib/components/Users/AdminPage/styles/OperationView.styles.ts

@@ -6,7 +6,6 @@ export const useStyles = makeStyles(
       fontFamily: 'Raleway',
       position: 'relative',
       minHeight: '455px',
-      paddingLeft: '110px',
       '& .adminInitialView': {
         position: 'absolute',
         top: '30%',

src/old/lib/components/Users/AdminPage/styles/PostPreviewWrapper.styles.ts

@@ -55,6 +55,7 @@ export const useStyles = makeStyles(
       },
       '& input': {
         padding: '3px 0 7px',
+        MozAppearance: 'textfield',
       },
     }),
     previwTitle: {

src/old/lib/components/Users/AdminPage/styles/Sidemenu.styles.ts

@@ -15,7 +15,7 @@ export const useStyles = makeStyles(
       height: '100%',
       paddingTop: theme.spacing(2),
       backgroundColor: '#e5e5e5',
-      position: 'absolute',
+      position: 'static',
       border: 'none',
     },
     menuCategory: {

src/old/lib/utilities/API/api.ts

@@ -50,6 +50,8 @@ instance.interceptors.request.use(
 );
 
 instance.interceptors.response.use(undefined, (error: AxiosError) => {
+  const jwtToken = getToken();
+
   if (error.message === 'Network Error' && !error.response) {
     toast.error("The server isn't responding...");
   }
@@ -58,6 +60,12 @@ instance.interceptors.response.use(undefined, (error: AxiosError) => {
     throw error;
   }
 
+  if (error.response.status === 401 && jwtToken) {
+    localStorage.removeItem('ACCESS_TOKEN');
+    localStorage.removeItem('PERMISSIONS');
+    document.location.href = '/opendoctorgate';
+  }
+
   if (error.response.status === 500) {
     toast.error('A server error occurred...');
   }

src/old/modules/materials/components/MaterialsView.tsx

@@ -132,7 +132,7 @@ const MaterialsView: React.FC = () => {
       const translations = {
         '1': `${t(langTokens.common.article_1, defaultPlural)}`,
         '2': `${t(langTokens.common.video)}`,
-        '3': `${t(langTokens.common.note, defaultPlural)}`,
+        '3': `${t(langTokens.common.post_1, defaultPlural)}`,
       };
       const translatedPostType = { ...postType };
       translatedPostType.name = translations[postType.id] || postType.name;

src/old/modules/materials/styles/MaterialsView.styles.ts

@@ -28,7 +28,9 @@ export const useStyles = makeStyles<Theme, IStyleProps>(
       lineHeight: '28px',
       fontWeight: 'bold',
       backgroundColor: theme.palette.primary.light,
+      zIndex: 'auto',
     },
+
     selectedFilters: {
       margin: '0px 15px 15px 0px',
       fontFamily: 'Raleway',
@@ -67,6 +69,8 @@ export const useStyles = makeStyles<Theme, IStyleProps>(
     scrollabelContainer: {
       position: 'sticky',
       top: 80 + top,
+      backgroundColor: theme.palette.primary.light,
+      zIndex: 1,
       overflowY: 'hidden',
       maxHeight: ({ pageYOffset }) =>
         `calc(100vh + ${

src/old/modules/posts/components/PostView.tsx

@@ -45,7 +45,7 @@ const PostView: React.FC<IPostViewProps> = ({ isPreview, post, onDelete }) => {
     origins: post.origins,
     type: post.type,
     publishedAt: post.publishedAt,
-    realViews: post.realViews,
+    displayViews: post.views,
     videoUrl: post.videoUrl,
   };
 

src/views/Profile/AdminTable/ActionButtons.tsx

@@ -95,6 +95,15 @@ const ActionButtons: React.FC<IActionButtons> = ({
     closeModal();
   };
 
+  const handleSendToReviewConfirm = () => {
+    boundedSetPostStatus({
+      id,
+      postStatus: StatusesForActions.MODERATION_SECOND_SIGN,
+    });
+    toast.success(t(langTokens.admin.sendForReviewSuccess));
+    closeModal();
+  };
+
   const handleReturnConfirm = () => {
     boundedSetPostStatus({
       id,
@@ -159,6 +168,17 @@ const ActionButtons: React.FC<IActionButtons> = ({
         onConfirmButtonClick: handlePublishConfirm,
       },
       adminUseStatuses: [MODERATION_SECOND_SIGN, ARCHIVED, PLANNED],
+      authorUseStatuses: [],
+    },
+    {
+      id: 'sentToModerationBtn',
+      label: t(langTokens.admin.sendForReview),
+      handler: (btnId) => openModal(btnId),
+      modal: {
+        title: t(langTokens.admin.sendForReviewTitle),
+        onConfirmButtonClick: handleSendToReviewConfirm,
+      },
+      adminUseStatuses: [],
       authorUseStatuses: [DRAFT, NEEDS_EDITING],
     },
     {

src/views/Profile/AdminTable/AdminDatePicker.tsx

@@ -41,7 +41,7 @@ export const AdminDatePicker: React.FC<IMaterialsDate> = ({
 
   return (
     <div>
-      <FormControl>
+      <FormControl data-testid="select">
         <Select
           multiple
           value={[]}

src/views/Profile/AdminTable/AdminTextField.tsx

@@ -3,7 +3,6 @@ import FormControl from '@material-ui/core/FormControl';
 import TextField from '@material-ui/core/TextField';
 import { FieldEnum, IField } from '../../../models/adminLab/types';
 
-
 interface IMaterialsTextField {
   field: FieldEnum;
   setChanges: (payload: IField) => void;
@@ -29,6 +28,7 @@ export const AdminTextField: React.FC<IMaterialsTextField> = ({
   return (
     <FormControl>
       <TextField
+        data-testid="admin-text-filter"
         type="text"
         value={inputValue}
         placeholder={placeholder}

src/views/Profile/AdminTable/Modals/ChangeViewsCountModal.tsx

@@ -24,7 +24,7 @@ const ChangeViewsCountModal: React.FC<IChangeViewsCountModal> = ({ id }) => {
   }, []);
 
   const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const viewsCount = event.target.value.replace(/\D/g, '');
+    const viewsCount = event.target.valueAsNumber;
     boundSetFakeViewsInput({ fakeViews: viewsCount });
   };
 
@@ -35,6 +35,7 @@ const ChangeViewsCountModal: React.FC<IChangeViewsCountModal> = ({ id }) => {
         variant="outlined"
         value={fakeViews}
         onChange={handleInputChange}
+        InputProps={{ inputProps: { min: 0 } }}
       />
     </Box>
   );