Merge pull request #4906 from sttatusx/fix-remove-useless-fragments

Remove useless fragments

.eslintrc.js

@@ -90,6 +90,7 @@ module.exports = {
 
         'react/jsx-filename-extension': ['error', { 'extensions': ['.jsx', '.tsx'] }],
         'react/jsx-no-bind': ['error'],
+        'react/jsx-no-useless-fragment': ['error'],
         'react/jsx-no-constructed-context-values': ['error'],
         'react/no-array-index-key': ['error'],
 

src/apps/experimental/components/library/GenresItemsContainer.tsx

@@ -18,24 +18,24 @@ const GenresItemsContainer: FC<GenresItemsContainerProps> = ({
     collectionType,
     itemType
 }) => {
-    const { isLoading, data: genresResult } = useGetGenres(
+    const { isLoading, data: genresResult } = useGetGenres(itemType, parentId);
-        itemType,
-        parentId
-    );
 
     if (isLoading) {
         return <Loading />;
     }
 
+    if (!genresResult?.Items?.length) {
         return (
-        <>
-            {!genresResult?.Items?.length ? (
             <div className='noItemsMessage centerMessage'>
                 <h1>{globalize.translate('MessageNothingHere')}</h1>
                 <p>{globalize.translate('MessageNoGenresAvailable')}</p>
             </div>
-            ) : (
+        );
-                genresResult?.Items?.map((genre) => (
+    }
+
+    return (
+        <>
+            {genresResult.Items.map((genre) => (
                 <GenresSectionContainer
                     key={genre.Id}
                     collectionType={collectionType}
@@ -43,8 +43,7 @@ const GenresItemsContainer: FC<GenresItemsContainerProps> = ({
                     itemType={itemType}
                     genre={genre}
                 />
-                ))
+            ))}
-            )}
         </>
     );
 };

src/apps/experimental/components/library/filter/FilterButton.tsx

@@ -209,7 +209,6 @@ const FilterButton: FC<FilterButtonProps> = ({
                     </AccordionDetails>
                 </Accordion>
                 {isFiltersSeriesStatusEnabled() && (
-                    <>
                     <Accordion
                         expanded={expanded === 'filtersSeriesStatus'}
                         onChange={handleChange('filtersSeriesStatus')}
@@ -231,10 +230,8 @@ const FilterButton: FC<FilterButtonProps> = ({
                             />
                         </AccordionDetails>
                     </Accordion>
-                    </>
                 )}
                 {isFiltersEpisodesStatusEnabled() && (
-                    <>
                     <Accordion
                         expanded={expanded === 'filtersEpisodesStatus'}
                         onChange={handleChange('filtersEpisodesStatus')}
@@ -258,10 +255,8 @@ const FilterButton: FC<FilterButtonProps> = ({
                             />
                         </AccordionDetails>
                     </Accordion>
-                    </>
                 )}
                 {isFiltersFeaturesEnabled() && (
-                    <>
                     <Accordion
                         expanded={expanded === 'filtersFeatures'}
                         onChange={handleChange('filtersFeatures')}
@@ -283,11 +278,9 @@ const FilterButton: FC<FilterButtonProps> = ({
                             />
                         </AccordionDetails>
                     </Accordion>
-                    </>
                 )}
 
                 {isFiltersVideoTypesEnabled() && (
-                    <>
                     <Accordion
                         expanded={expanded === 'filtersVideoTypes'}
                         onChange={handleChange('filtersVideoTypes')}
@@ -309,7 +302,6 @@ const FilterButton: FC<FilterButtonProps> = ({
                             />
                         </AccordionDetails>
                     </Accordion>
-                    </>
                 )}
 
                 {isFiltersLegacyEnabled() && (
@@ -431,7 +423,6 @@ const FilterButton: FC<FilterButtonProps> = ({
                     </>
                 )}
                 {isFiltersStudiosEnabled() && (
-                    <>
                     <Accordion
                         expanded={expanded === 'filtersStudios'}
                         onChange={handleChange('filtersStudios')}
@@ -454,7 +445,6 @@ const FilterButton: FC<FilterButtonProps> = ({
                             />
                         </AccordionDetails>
                     </Accordion>
-                    </>
                 )}
             </Popover>
         </Box>

src/components/ServerContentPage.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react';
+import { FunctionComponent, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import ServerConnections from './ServerConnections';
@@ -56,7 +56,7 @@ const ServerContentPage: FunctionComponent<ServerContentPageProps> = ({ view })
         location.search
     ]);
 
-    return <></>;
+    return null;
 };
 
 export default ServerContentPage;

src/components/loading/LoadingComponent.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react';
+import { FunctionComponent, useEffect } from 'react';
 
 import loading from './loading';
 
@@ -11,7 +11,7 @@ const Loading: FunctionComponent = () => {
         };
     }, []);
 
-    return <></>;
+    return null;
 };
 
 export default Loading;

src/components/viewManager/ViewManagerPage.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect } from 'react';
+import { FunctionComponent, useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
 
 import globalize from '../../scripts/globalize';
@@ -79,7 +79,7 @@ const ViewManagerPage: FunctionComponent<ViewManagerPageProps> = ({
         location.search
     ]);
 
-    return <></>;
+    return null;
 };
 
 export default ViewManagerPage;