Skip to content

Commit

Permalink
Misc fixes (#1083)
Browse files Browse the repository at this point in the history
* Remove dummy search from logs page

* Fix loading issue in tmdb episode select

* Show backdrop as thumbnail for movies
  • Loading branch information
harshithmohan authored Sep 21, 2024
1 parent 36158f5 commit 63976fc
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/components/Collection/Tmdb/EpisodeSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const EpisodeSelect = React.memo((props: Props) => {
const [tmdbEpisode, setTmdbEpisode] = useState(initialTmdbEpisode);

useEffect(() => {
if (override) {
if (override && override !== initialTmdbEpisode?.ID) {
const episodeOverride = episodes.find(episode => episode.ID === override);
if (episodeOverride) {
setTmdbEpisode(episodeOverride);
Expand Down
11 changes: 9 additions & 2 deletions src/hooks/useEpisodeThumbnail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,17 @@ function useEpisodeThumbnail(
): ImageType | null {
const { useThumbnailFallback } = useSettingsQuery().data.WebUI_Settings.collection.image;
return useMemo(() => {
if (episode.Images.Thumbnails.length) return episode.Images.Thumbnails[0];
if (episode.Images.Thumbnails.length) {
return episode.Images.Thumbnails.find(image => image.Preferred) ?? episode.Images.Thumbnails[0];
}

if (episode.Images.Backdrops.length) {
return episode.Images.Backdrops.find(image => image.Preferred) ?? episode.Images.Backdrops[0];
}

if (useThumbnailFallback && backdrop) return backdrop;
return null;
}, [episode.Images.Thumbnails, backdrop, useThumbnailFallback]);
}, [episode, useThumbnailFallback, backdrop]);
}

export default useEpisodeThumbnail;
24 changes: 11 additions & 13 deletions src/pages/logs/LogsPage.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
import React, { useEffect, useRef, useState } from 'react';
import { mdiArrowVerticalLock, mdiLoading, mdiMagnify } from '@mdi/js';
import { mdiArrowVerticalLock, mdiLoading } from '@mdi/js';
import { Icon } from '@mdi/react';
import { useVirtualizer } from '@tanstack/react-virtual';
import cx from 'classnames';
import { throttle } from 'lodash';

import IconButton from '@/components/Input/IconButton';
import Input from '@/components/Input/Input';
import { useLogsQuery } from '@/core/react-query/logs/queries';

const LogsPage = () => {
const logLines = useLogsQuery().data;
const [scrollToBottom, setScrollToBottom] = useState(true);
const [search, setSearch] = useState('');

const parentRef = React.useRef<HTMLDivElement>(null);
const rowVirtualizer = useVirtualizer({
Expand Down Expand Up @@ -56,17 +54,17 @@ const LogsPage = () => {
<div className="flex items-center justify-between rounded-lg border border-panel-border bg-panel-background p-6">
<div className="text-xl font-semibold">Logs</div>
<div className="flex gap-x-2">
<Input
id="search"
onChange={event => setSearch(event.target.value)}
type="text"
value={search}
placeholder="Search Logs..."
startIcon={mdiMagnify}
className="w-80"
disabled
/>
{/* TODO: Disabled until functionality is implemented */}
{/* <Input */}
{/* id="search" */}
{/* onChange={event => setSearch(event.target.value)} */}
{/* type="text" */}
{/* value={search} */}
{/* placeholder="Search Logs..." */}
{/* startIcon={mdiMagnify} */}
{/* className="w-80" */}
{/* disabled */}
{/* /> */}
{/* <IconButton icon={mdiFilterOutline} buttonType="secondary" buttonSize="normal" tooltip="Filter"/> */}
{/* <IconButton icon={mdiCogOutline} buttonType="secondary" buttonSize="normal" tooltip="Settings"/> */}
<IconButton
Expand Down

0 comments on commit 63976fc

Please sign in to comment.