Reintroduce book info in Favorites and Deleted pages

karlosos · Nov 21, 2023 · 1fbb6ab · 1fbb6ab
1 parent 9fa16a0
commit 1fbb6ab
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/app/__tests__/App.test.jsx b/src/app/__tests__/App.test.jsx
@@ -1,7 +1,4 @@
-import {
-    screen,
-    waitFor,
-} from '@testing-library/react';
+import { screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
@@ -40,7 +37,10 @@ test('Clear all data', async () => {
         expect(screen.queryByText('Mitologia')).not.toBeInTheDocument();
     });
     // go back to dashboard page
-    await userEvent.click(screen.getByText(/dashboard/i), leftClick);
+    await userEvent.click(
+        within(screen.getByRole('menu')).getByText(/books/i),
+        leftClick,
+    );
     expect(screen.queryByText(/Chłopi/i)).not.toBeInTheDocument();
     expect(screen.queryByText('Mitologia')).not.toBeInTheDocument();
 });

diff --git a/src/app/features/clippings/highlights/HighlightsList.jsx b/src/app/features/clippings/highlights/HighlightsList.jsx
@@ -4,7 +4,7 @@ import { Pagination } from 'semantic-ui-react';
 import HighlightItem from './HighlightItem';
 import { Content, Footer, MainHeader, Title, Wrapper } from './HighlightsList.style';
 
-const HighlightsList = ({ title, highlights, isBookView }) => {
+const HighlightsList = ({ title, highlights, bookInfoVisible }) => {
     const [activePage, setActivePage] = useState(1);
     const wrapperRef = useRef();
 
@@ -33,7 +33,7 @@ const HighlightsList = ({ title, highlights, isBookView }) => {
                     <HighlightItem
                         key={highlightInfo.id}
                         highlightInfo={highlightInfo}
-                        isBookInfoVisible={isBookView}
+                        isBookInfoVisible={bookInfoVisible}
                     />
                 ))}
             </Content>

diff --git a/src/app/features/clippings/highlights/deleted/DeletedPage.jsx b/src/app/features/clippings/highlights/deleted/DeletedPage.jsx
@@ -20,7 +20,7 @@ const DeletedPage = () => {
         deleted: q[1].deleted,
     }));
 
-    return <HighlightsList title="Deleted" highlights={highlights} />;
+    return <HighlightsList title="Deleted" highlights={highlights} bookInfoVisible />;
 };
 
 export default DeletedPage;
diff --git a/src/app/features/clippings/highlights/favourites/FavouritesPage.jsx b/src/app/features/clippings/highlights/favourites/FavouritesPage.jsx
@@ -20,7 +20,7 @@ const FavouritesPage = () => {
         deleted: q[1].deleted,
     }));
 
-    return <HighlightsList title="Favourites" highlights={highlights} />;
+    return <HighlightsList title="Favourites" highlights={highlights} bookInfoVisible />;
 };
 
 export default FavouritesPage;
diff --git a/src/app/features/clippings/highlights/highlights/HighlightsPage.jsx b/src/app/features/clippings/highlights/highlights/HighlightsPage.jsx
@@ -36,7 +36,7 @@ const HighlightsPage = () => {
         <HighlightsList
             title={bookTitle ?? 'All highlights'}
             highlights={highlights}
-            isBookView={!bookTitle}
+            bookInfoVisible={!bookTitle}
         />
     );
 };

diff --git a/src/app/layout/sidebar/Sidebar.jsx b/src/app/layout/sidebar/Sidebar.jsx
@@ -28,7 +28,7 @@ const Sidebar = () => {
         dispatch(setActiveSidebarItem(name));
 
     return (
-        <MenuStyled vertical>
+        <MenuStyled vertical role='menu'>
             <Menu.Item>
                 <Menu.Menu>
                     <Link to="/">