1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Fix code smells and dependency issue

This commit is contained in:
Bill Thornton 2021-06-07 11:55:01 -04:00
parent de54dc636a
commit 35f6944310
5 changed files with 18 additions and 17 deletions

View file

@ -21,10 +21,6 @@ const AlphaPickerComponent = ({ onAlphaPicked = () => {} }) => {
}; };
}, []); }, []);
useEffect(() => {
}, [ alphaPicker ]);
return ( return (
<div <div
ref={element} ref={element}

View file

@ -18,8 +18,10 @@ const CARD_OPTIONS = {
showChannelName: true showChannelName: true
}; };
/*
* React component to display search result rows for live tv library search
*/
const LiveTVSearchResults = ({ serverId, parentId, collectionType, query }) => { const LiveTVSearchResults = ({ serverId, parentId, collectionType, query }) => {
const [ apiClient, setApiClient ] = useState();
const [ movies, setMovies ] = useState([]); const [ movies, setMovies ] = useState([]);
const [ episodes, setEpisodes ] = useState([]); const [ episodes, setEpisodes ] = useState([]);
const [ sports, setSports ] = useState([]); const [ sports, setSports ] = useState([]);
@ -55,10 +57,6 @@ const LiveTVSearchResults = ({ serverId, parentId, collectionType, query }) => {
const isLiveTV = () => collectionType === 'livetv'; const isLiveTV = () => collectionType === 'livetv';
useEffect(() => {
if (serverId) setApiClient(ServerConnections.getApiClient(serverId));
}, [ serverId ]);
useEffect(() => { useEffect(() => {
// Reset state // Reset state
setMovies([]); setMovies([]);
@ -70,6 +68,8 @@ const LiveTVSearchResults = ({ serverId, parentId, collectionType, query }) => {
setVideos([]); setVideos([]);
if (query && isLiveTV()) { if (query && isLiveTV()) {
const apiClient = ServerConnections.getApiClient(serverId);
// Movies row // Movies row
fetchItems(apiClient, { fetchItems(apiClient, {
IncludeItemTypes: 'LiveTvProgram', IncludeItemTypes: 'LiveTvProgram',

View file

@ -6,8 +6,10 @@ import globalize from '../../scripts/globalize';
import ServerConnections from '../ServerConnections'; import ServerConnections from '../ServerConnections';
import SearchResultsRow from './SearchResultsRow'; import SearchResultsRow from './SearchResultsRow';
const SearchResultsComponent = ({ serverId, parentId, collectionType, query }) => { /*
const [ apiClient, setApiClient ] = useState(); * React component to display search result rows for global search and non-live tv library search
*/
const SearchResults = ({ serverId, parentId, collectionType, query }) => {
const [ movies, setMovies ] = useState([]); const [ movies, setMovies ] = useState([]);
const [ shows, setShows ] = useState([]); const [ shows, setShows ] = useState([]);
const [ episodes, setEpisodes ] = useState([]); const [ episodes, setEpisodes ] = useState([]);
@ -71,10 +73,6 @@ const SearchResultsComponent = ({ serverId, parentId, collectionType, query }) =
const isTVShows = () => collectionType === 'tvshows' || collectionType === 'tv'; const isTVShows = () => collectionType === 'tvshows' || collectionType === 'tv';
useEffect(() => {
if (serverId) setApiClient(ServerConnections.getApiClient(serverId));
}, [ serverId ]);
useEffect(() => { useEffect(() => {
// Reset state // Reset state
setMovies([]); setMovies([]);
@ -93,6 +91,8 @@ const SearchResultsComponent = ({ serverId, parentId, collectionType, query }) =
setPeople([]); setPeople([]);
if (query) { if (query) {
const apiClient = ServerConnections.getApiClient(serverId);
// Movie libraries // Movie libraries
if (!collectionType || isMovies()) { if (!collectionType || isMovies()) {
// Movies row // Movies row
@ -248,11 +248,11 @@ const SearchResultsComponent = ({ serverId, parentId, collectionType, query }) =
); );
}; };
SearchResultsComponent.propTypes = { SearchResults.propTypes = {
serverId: PropTypes.string, serverId: PropTypes.string,
parentId: PropTypes.string, parentId: PropTypes.string,
collectionType: PropTypes.string, collectionType: PropTypes.string,
query: PropTypes.string query: PropTypes.string
}; };
export default SearchResultsComponent; export default SearchResults;

View file

@ -3,6 +3,9 @@ import React, { useEffect, useRef } from 'react';
import cardBuilder from '../cardbuilder/cardBuilder'; import cardBuilder from '../cardbuilder/cardBuilder';
import '../../elements/emby-scroller/emby-scroller';
import '../../elements/emby-itemscontainer/emby-itemscontainer';
// There seems to be some compatibility issues here between // There seems to be some compatibility issues here between
// React and our legacy web components, so we need to inject // React and our legacy web components, so we need to inject
// them as an html string for now =/ // them as an html string for now =/

View file

@ -5,6 +5,8 @@ import { appRouter } from '../appRouter';
import globalize from '../../scripts/globalize'; import globalize from '../../scripts/globalize';
import ServerConnections from '../ServerConnections'; import ServerConnections from '../ServerConnections';
import '../../elements/emby-button/emby-button';
// There seems to be some compatibility issues here between // There seems to be some compatibility issues here between
// React and our legacy web components, so we need to inject // React and our legacy web components, so we need to inject
// them as an html string for now =/ // them as an html string for now =/