milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Remove useless fragments
This commit is contained in:
Bill Thornton 2023-11-09 01:00:10 -05:00 • committed by GitHub
commit 9670234290
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 129 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.eslintrc.js
View file

@ -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'],

39
src/apps/experimental/components/library/GenresItemsContainer.tsx
View file

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

216
src/apps/experimental/components/library/filter/FilterButton.tsx
View file

@ -209,107 +209,99 @@ const FilterButton: FC<FilterButtonProps> = ({
</AccordionDetails>
</Accordion>
{isFiltersSeriesStatusEnabled() && (
<>
<Accordion
expanded={expanded === 'filtersSeriesStatus'}
onChange={handleChange('filtersSeriesStatus')}
<Accordion
expanded={expanded === 'filtersSeriesStatus'}
onChange={handleChange('filtersSeriesStatus')}
>
<AccordionSummary
aria-controls='filtersSeriesStatus-content'
id='filtersSeriesStatus-header'
>
<AccordionSummary
aria-controls='filtersSeriesStatus-content'
id='filtersSeriesStatus-header'
>
<Typography>
{globalize.translate('HeaderSeriesStatus')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersSeriesStatus
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
</>
<Typography>
{globalize.translate('HeaderSeriesStatus')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersSeriesStatus
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
)}
{isFiltersEpisodesStatusEnabled() && (
<>
<Accordion
expanded={expanded === 'filtersEpisodesStatus'}
onChange={handleChange('filtersEpisodesStatus')}
<Accordion
expanded={expanded === 'filtersEpisodesStatus'}
onChange={handleChange('filtersEpisodesStatus')}
>
<AccordionSummary
aria-controls='filtersEpisodesStatus-content'
id='filtersEpisodesStatus-header'
>
<AccordionSummary
aria-controls='filtersEpisodesStatus-content'
id='filtersEpisodesStatus-header'
>
<Typography>
{globalize.translate(
'HeaderEpisodesStatus'
)}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersEpisodesStatus
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
</>
<Typography>
{globalize.translate(
'HeaderEpisodesStatus'
)}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersEpisodesStatus
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
)}
{isFiltersFeaturesEnabled() && (
<>
<Accordion
expanded={expanded === 'filtersFeatures'}
onChange={handleChange('filtersFeatures')}
<Accordion
expanded={expanded === 'filtersFeatures'}
onChange={handleChange('filtersFeatures')}
>
<AccordionSummary
aria-controls='filtersFeatures-content'
id='filtersFeatures-header'
>
<AccordionSummary
aria-controls='filtersFeatures-content'
id='filtersFeatures-header'
>
<Typography>
{globalize.translate('Features')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersFeatures
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
</>
<Typography>
{globalize.translate('Features')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersFeatures
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
)}
{isFiltersVideoTypesEnabled() && (
<>
<Accordion
expanded={expanded === 'filtersVideoTypes'}
onChange={handleChange('filtersVideoTypes')}
<Accordion
expanded={expanded === 'filtersVideoTypes'}
onChange={handleChange('filtersVideoTypes')}
>
<AccordionSummary
aria-controls='filtersVideoTypes-content'
id='filtersVideoTypes-header'
>
<AccordionSummary
aria-controls='filtersVideoTypes-content'
id='filtersVideoTypes-header'
>
<Typography>
{globalize.translate('HeaderVideoType')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersVideoTypes
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
</>
<Typography>
{globalize.translate('HeaderVideoType')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersVideoTypes
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
)}
{isFiltersLegacyEnabled() && (
@ -431,30 +423,28 @@ const FilterButton: FC<FilterButtonProps> = ({
</>
)}
{isFiltersStudiosEnabled() && (
<>
<Accordion
expanded={expanded === 'filtersStudios'}
onChange={handleChange('filtersStudios')}
<Accordion
expanded={expanded === 'filtersStudios'}
onChange={handleChange('filtersStudios')}
>
<AccordionSummary
aria-controls='filtersStudios-content'
id='filtersStudios-header'
>
<AccordionSummary
aria-controls='filtersStudios-content'
id='filtersStudios-header'
>
<Typography>
{globalize.translate('Studios')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersStudios
filters={studios}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
</>
<Typography>
{globalize.translate('Studios')}
</Typography>
</AccordionSummary>
<AccordionDetails>
<FiltersStudios
filters={studios}
libraryViewSettings={libraryViewSettings}
setLibraryViewSettings={
setLibraryViewSettings
}
/>
</AccordionDetails>
</Accordion>
)}
</Popover>
</Box>

4
src/components/ServerContentPage.tsx
View file

@ -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;

4
src/components/loading/LoadingComponent.tsx
View file

@ -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;

4
src/components/viewManager/ViewManagerPage.tsx
View file

@ -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;