Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
morpheus65535 2021-12-18 11:39:40 -05:00
commit 46a8bd2909
3 changed files with 10 additions and 1 deletions

View File

@ -37,4 +37,5 @@ class Searches(Resource):
movies = list(movies)
search_list += movies
return jsonify(search_list)

View File

@ -5,6 +5,7 @@ import {
faUser,
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { uniqueId } from "lodash";
import React, { FunctionComponent, useMemo } from "react";
import {
Button,
@ -35,16 +36,22 @@ async function SearchItem(text: string) {
return results.map<SearchResult>((v) => {
let link: string;
let id: string;
if (v.sonarrSeriesId) {
link = `/series/${v.sonarrSeriesId}`;
id = `series-${v.sonarrSeriesId}`;
} else if (v.radarrId) {
link = `/movies/${v.radarrId}`;
id = `movie-${v.radarrId}`;
} else {
link = "";
id = uniqueId("unknown");
}
return {
name: `${v.title} (${v.year})`,
link,
id,
};
});
}

View File

@ -10,6 +10,7 @@ import { useHistory } from "react-router";
import { useThrottle } from "rooks";
export interface SearchResult {
id: string;
name: string;
link?: string;
}
@ -58,7 +59,7 @@ export const SearchBar: FunctionComponent<Props> = ({
const items = useMemo(() => {
const its = results.map((v) => (
<Dropdown.Item
key={v.name}
key={v.id}
eventKey={v.link}
disabled={v.link === undefined}
>