mirrors/jellyseerr
1
0
Fork 0
mirror of https://github.com/fallenbagel/jellyseerr.git synced 2026-01-08 07:38:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(frontend): Update AdvancedRequester to reflect new /user API response (#970)

Browse Source
This commit is contained in:
TheCatLady
2021-02-19 02:48:06 -05:00
committed by GitHub
parent e70a4ecae6
commit b4bac6a915
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/RequestModal/AdvancedRequester/index.tsx
View File

@@ -10,6 +10,7 @@ import { defineMessages, useIntl } from 'react-intl';
import { formatBytes } from '../../../utils/numberHelpers'; import { formatBytes } from '../../../utils/numberHelpers';
import { Listbox, Transition } from '@headlessui/react'; import { Listbox, Transition } from '@headlessui/react';
import { Permission, User, useUser } from '../../../hooks/useUser'; import { Permission, User, useUser } from '../../../hooks/useUser';
import type { UserResultsResponse } from '../../../../server/interfaces/api/userInterfaces';
const messages = defineMessages({ const messages = defineMessages({
advancedoptions: 'Advanced Options', advancedoptions: 'Advanced Options',
@@ -97,17 +98,17 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
requestUser ?? null requestUser ?? null
); );
const { data: userData } = useSWR<User[]>( const { data: userData } = useSWR<UserResultsResponse>(
hasPermission([Permission.MANAGE_REQUESTS, Permission.MANAGE_USERS]) hasPermission([Permission.MANAGE_REQUESTS, Permission.MANAGE_USERS])
? '/api/v1/user' ? '/api/v1/user?take=1000'
: null : null
); );
useEffect(() => { useEffect(() => {
if (userData && !requestUser) { if (userData?.results && !requestUser) {
setSelectedUser(userData.find((u) => u.id === user?.id) ?? null); setSelectedUser(userData.results.find((u) => u.id === user?.id) ?? null);
} }
}, [userData]); }, [userData?.results]);
useEffect(() => { useEffect(() => {
let defaultServer = data?.find( let defaultServer = data?.find(
@@ -471,7 +472,7 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
static static
className="py-1 overflow-auto text-base leading-6 rounded-md shadow-xs max-h-60 focus:outline-none sm:text-sm sm:leading-5" className="py-1 overflow-auto text-base leading-6 rounded-md shadow-xs max-h-60 focus:outline-none sm:text-sm sm:leading-5"
> >
{userData?.map((user) => ( {userData?.results.map((user) => (
<Listbox.Option key={user.id} value={user}> <Listbox.Option key={user.id} value={user}>
{({ selected, active }) => ( {({ selected, active }) => (
<div <div