Remove eslint rule deactivations (#290)

Suwayomi · May 11, 2023 · bd91510 · bd91510
1 parent d92dc83
commit bd91510
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 77 deletions.
diff --git a/src/components/MangaCard.tsx b/src/components/MangaCard.tsx
@@ -77,15 +77,7 @@ const MangaCard = React.forwardRef<HTMLDivElement, IProps>((props: IProps, ref)
     const { t } = useTranslation();
 
     const {
-        manga: {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            id,
-            title,
-            thumbnailUrl,
-            downloadCount,
-            unreadCount: unread,
-            inLibrary,
-        },
+        manga: { id, title, thumbnailUrl, downloadCount, unreadCount: unread, inLibrary },
         gridLayout,
         dimensions,
         inLibraryIndicator,

diff --git a/src/components/library/LibraryMangaGrid.tsx b/src/components/library/LibraryMangaGrid.tsx
@@ -64,9 +64,7 @@ const filterManga = (
         return matchesSearch && matchesFilters;
     });
 
-const sortByUnread = (a: IMangaCard, b: IMangaCard): number =>
-    // eslint-disable-next-line implicit-arrow-linebreak
-    (a.unreadCount ?? 0) - (b.unreadCount ?? 0);
+const sortByUnread = (a: IMangaCard, b: IMangaCard): number => (a.unreadCount ?? 0) - (b.unreadCount ?? 0);
 
 const sortByTitle = (a: IMangaCard, b: IMangaCard): number => a.title.localeCompare(b.title);
 

diff --git a/src/components/manga/util.tsx b/src/components/manga/util.tsx
@@ -29,11 +29,9 @@ const defaultChapterOptions: ChapterListOptions = {
 function chapterOptionsReducer(state: ChapterListOptions, actions: ChapterOptionsReducerAction): ChapterListOptions {
     switch (actions.type) {
         case 'filter':
-            // eslint-disable-next-line no-case-declarations
-            const active = state.unread !== false && state.downloaded !== false && state.bookmarked !== false;
             return {
                 ...state,
-                active,
+                active: state.unread !== false && state.downloaded !== false && state.bookmarked !== false,
                 [actions.filterType!]: actions.filterValue,
             };
         case 'sortBy':

diff --git a/src/components/molecules/DownloadStateIndicator.tsx b/src/components/molecules/DownloadStateIndicator.tsx
@@ -17,7 +17,6 @@ interface DownloadStateIndicatorProps {
     download: IDownloadChapter;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const DOWNLOAD_STATE_TO_TRANSLATION_KEY_MAP: { [state in IDownloadChapter['state']]: TranslationKey } = {
     Downloading: 'download.state.label.downloading',
     Error: 'download.state.label.error',

diff --git a/src/components/navbar/ReaderNavBar.tsx b/src/components/navbar/ReaderNavBar.tsx
@@ -333,8 +333,6 @@ export default function ReaderNavBar(props: IProps) {
                                     {Array(Math.max(0, chapter.chapterCount))
                                         .fill(1)
                                         .map((ignoreValue, index) => (
-                                            // eslint-disable-next-line  max-len
-                                            // eslint-disable-next-line  react/no-array-index-key
                                             <MenuItem key={`Chapter#${index + 1}`} value={index + 1}>{`${t(
                                                 'chapter.title',
                                             )} ${index + 1}`}</MenuItem>

diff --git a/src/components/navbar/navigation/DesktopSideBar.tsx b/src/components/navbar/navigation/DesktopSideBar.tsx
@@ -44,20 +44,17 @@ export default function DesktopSideBar({ navBarItems }: IProps) {
 
     return (
         <SideNavBarContainer>
-            {
-                // eslint-disable-next-line react/destructuring-assignment
-                navBarItems.map(({ path, title, IconComponent, SelectedIconComponent }: NavbarItem) => (
-                    <Link to={path} style={{ color: 'inherit', textDecoration: 'none' }} key={path}>
-                        <ListItem disableRipple button key={title}>
-                            <ListItemIcon sx={{ minWidth: '0' }}>
-                                <Tooltip placement="right" title={t(title)}>
-                                    {iconFor(path, IconComponent, SelectedIconComponent)}
-                                </Tooltip>
-                            </ListItemIcon>
-                        </ListItem>
-                    </Link>
-                ))
-            }
+            {navBarItems.map(({ path, title, IconComponent, SelectedIconComponent }: NavbarItem) => (
+                <Link to={path} style={{ color: 'inherit', textDecoration: 'none' }} key={path}>
+                    <ListItem disableRipple button key={title}>
+                        <ListItemIcon sx={{ minWidth: '0' }}>
+                            <Tooltip placement="right" title={t(title)}>
+                                {iconFor(path, IconComponent, SelectedIconComponent)}
+                            </Tooltip>
+                        </ListItemIcon>
+                    </ListItem>
+                </Link>
+            ))}
         </SideNavBarContainer>
     );
 }
diff --git a/src/screens/DownloadQueue.tsx b/src/screens/DownloadQueue.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable react/destructuring-assignment */
 /*
  * Copyright (C) Contributors to the Suwayomi project
  *
@@ -16,7 +14,7 @@ import IconButton from '@mui/material/IconButton';
 import NavbarContext from 'components/context/NavbarContext';
 import EmptyView from 'components/util/EmptyView';
 import React, { useContext, useEffect } from 'react';
-import { DragDropContext, Draggable, Droppable, DropResult } from 'react-beautiful-dnd';
+import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 import client from 'util/client';
 
 import Typography from '@mui/material/Typography';
@@ -55,8 +53,7 @@ const DownloadQueue: React.FC = () => {
         setAction(null);
     }, [t]);
 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const onDragEnd = (result: DropResult) => {};
+    const onDragEnd = () => {};
 
     if (queue.length === 0) {
         return <EmptyView message={t('download.queue.label.no_downloads')} />;
@@ -84,19 +81,19 @@ const DownloadQueue: React.FC = () => {
             </NavbarToolbar>
             <DragDropContext onDragEnd={onDragEnd}>
                 <Droppable droppableId="droppable">
-                    {(provided) => (
-                        <Box ref={provided.innerRef} sx={{ pt: 1 }}>
+                    {(droppableProvided) => (
+                        <Box ref={droppableProvided.innerRef} sx={{ pt: 1 }}>
                             {queue.map((item, index) => (
                                 <Draggable
                                     key={`${item.mangaId}-${item.chapterIndex}`}
                                     draggableId={`${item.mangaId}-${item.chapterIndex}`}
                                     index={index}
                                 >
-                                    {(provided, snapshot) => (
+                                    {(draggableProvided, snapshot) => (
                                         <Box
-                                            {...provided.draggableProps}
-                                            {...provided.dragHandleProps}
-                                            ref={provided.innerRef}
+                                            {...draggableProvided.draggableProps}
+                                            {...draggableProvided.dragHandleProps}
+                                            ref={draggableProvided.innerRef}
                                             sx={{ p: 1, pb: 2 }}
                                         >
                                             <Card
@@ -142,7 +139,7 @@ const DownloadQueue: React.FC = () => {
                                     )}
                                 </Draggable>
                             ))}
-                            {provided.placeholder}
+                            {droppableProvided.placeholder}
                         </Box>
                     )}
                 </Droppable>

diff --git a/src/screens/SearchAll.tsx b/src/screens/SearchAll.tsx
@@ -109,7 +109,6 @@ const SearchAll: React.FC = () => {
         }
         setFetched({});
         setMangas({});
-        // eslint-disable-next-line max-len
         doIT(
             sources
                 .filter(({ lang }) => shownLangs.indexOf(lang) !== -1)
@@ -167,7 +166,6 @@ const SearchAll: React.FC = () => {
     if (query) {
         return (
             <>
-                {/* eslint-disable-next-line max-len */}
                 {sources
                     .filter(({ lang }) => shownLangs.indexOf(lang) !== -1)
                     .filter((source) => showNsfw || !source.isNsfw)

diff --git a/src/screens/Sources.tsx b/src/screens/Sources.tsx
@@ -97,7 +97,6 @@ export default function Sources() {
 
     return (
         <>
-            {/* eslint-disable-next-line max-len */}
             {Object.entries(groupByLang(sources ?? []))
                 .sort((a, b) => langSortCmp(a[0], b[0]))
                 .map(

diff --git a/src/screens/settings/Categories.tsx b/src/screens/settings/Categories.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable react/destructuring-assignment */
 /*
  * Copyright (C) Contributors to the Suwayomi project
  *
@@ -140,21 +138,21 @@ export default function Categories() {
         <>
             <DragDropContext onDragEnd={onDragEnd}>
                 <Droppable droppableId="droppable">
-                    {(provided) => (
-                        <List ref={provided.innerRef}>
+                    {(droppableProvided) => (
+                        <List ref={droppableProvided.innerRef}>
                             {categories.map((item, index) => (
                                 <Draggable key={item.id} draggableId={item.id.toString()} index={index}>
-                                    {(provided, snapshot) => (
+                                    {(draggableProvided, snapshot) => (
                                         <ListItem
-                                            ContainerProps={{ ref: provided.innerRef } as any}
-                                            {...provided.draggableProps}
-                                            {...provided.dragHandleProps}
+                                            ContainerProps={{ ref: draggableProvided.innerRef } as any}
+                                            {...draggableProvided.draggableProps}
+                                            {...draggableProvided.dragHandleProps}
                                             style={getItemStyle(
                                                 snapshot.isDragging,
-                                                provided.draggableProps.style,
+                                                draggableProvided.draggableProps.style,
                                                 theme.palette,
                                             )}
-                                            ref={provided.innerRef}
+                                            ref={draggableProvided.innerRef}
                                         >
                                             <ListItemIcon>
                                                 <DragHandleIcon />
@@ -180,7 +178,7 @@ export default function Categories() {
                                     )}
                                 </Draggable>
                             ))}
-                            {provided.placeholder}
+                            {droppableProvided.placeholder}
                         </List>
                     )}
                 </Droppable>

diff --git a/src/screens/settings/DefaultReaderSettings.tsx b/src/screens/settings/DefaultReaderSettings.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable react/destructuring-assignment */
 /*
  * Copyright (C) Contributors to the Suwayomi project
  *

diff --git a/src/util/localStorage.tsx b/src/util/localStorage.tsx
@@ -6,28 +6,18 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 function getItem<T>(key: string, defaultValue: T): T {
-    try {
-        const item = window.localStorage.getItem(key);
+    const item = window.localStorage.getItem(key);
 
-        if (item !== null) {
-            return JSON.parse(item);
-        }
-
-        window.localStorage.setItem(key, JSON.stringify(defaultValue));
-
-        /* eslint-disable no-empty */
-    } finally {
+    if (item !== null) {
+        return JSON.parse(item);
     }
+
+    window.localStorage.setItem(key, JSON.stringify(defaultValue));
     return defaultValue;
 }
 
 function setItem<T>(key: string, value: T): void {
-    try {
-        window.localStorage.setItem(key, JSON.stringify(value));
-
-        // eslint-disable-next-line no-empty
-    } finally {
-    }
+    window.localStorage.setItem(key, JSON.stringify(value));
 }
 
 export default { getItem, setItem };
diff --git a/src/util/useLocalStorage.tsx b/src/util/useLocalStorage.tsx
@@ -8,7 +8,6 @@
 import React, { useState, Dispatch, SetStateAction, useReducer, Reducer, useCallback } from 'react';
 import storage from 'util/localStorage';
 
-// eslint-disable-next-line max-len
 export default function useLocalStorage<T>(key: string, defaultValue: T | (() => T)): [T, Dispatch<SetStateAction<T>>] {
     const initialState = defaultValue instanceof Function ? defaultValue() : defaultValue;
     const [storedValue, setStoredValue] = useState<T>(storage.getItem(key, initialState));