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

Remove connections prop

Browse source
This commit is contained in:
Bill Thornton 2022-11-30 14:18:49 -05:00
parent 9bf0a6bf4d
commit 516bd2aab8
3 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/App.tsx
View file

@ -2,13 +2,12 @@ import { History } from '@remix-run/router';
import React from 'react'; import React from 'react';
import { HistoryRouter } from './components/HistoryRouter'; import { HistoryRouter } from './components/HistoryRouter';
import ServerConnections from './components/ServerConnections';
import { ApiProvider } from './hooks/useApi'; import { ApiProvider } from './hooks/useApi';
import AppRoutes from './routes/index'; import AppRoutes from './routes/index';
const App = ({ history, connections }: { history: History, connections: typeof ServerConnections }) => { const App = ({ history }: { history: History }) => {
return ( return (
<ApiProvider connections={connections}> <ApiProvider>
<HistoryRouter history={history}> <HistoryRouter history={history}>
<AppRoutes /> <AppRoutes />
</HistoryRouter> </HistoryRouter>

22
src/hooks/useApi.tsx
View file

@ -3,14 +3,10 @@ import type { UserDto } from '@jellyfin/sdk/lib/generated-client';
import type { ApiClient, Event } from 'jellyfin-apiclient'; import type { ApiClient, Event } from 'jellyfin-apiclient';
import React, { createContext, FC, useContext, useEffect, useState } from 'react'; import React, { createContext, FC, useContext, useEffect, useState } from 'react';
import type ServerConnections from '../components/ServerConnections'; import ServerConnections from '../components/ServerConnections';
import events from '../utils/events'; import events from '../utils/events';
import { toApi } from '../utils/jellyfin-apiclient/compat'; import { toApi } from '../utils/jellyfin-apiclient/compat';
interface ApiProviderProps {
connections: typeof ServerConnections
}
interface JellyfinApiContext { interface JellyfinApiContext {
__legacyApiClient__?: ApiClient __legacyApiClient__?: ApiClient
api?: Api api?: Api
@ -20,13 +16,13 @@ interface JellyfinApiContext {
export const ApiContext = createContext<JellyfinApiContext>({}); export const ApiContext = createContext<JellyfinApiContext>({});
export const useApi = () => useContext(ApiContext); export const useApi = () => useContext(ApiContext);
export const ApiProvider: FC<ApiProviderProps> = ({ connections, children }) => { export const ApiProvider: FC = ({ children }) => {
const [ legacyApiClient, setLegacyApiClient ] = useState<ApiClient>(); const [ legacyApiClient, setLegacyApiClient ] = useState<ApiClient>();
const [ api, setApi ] = useState<Api>(); const [ api, setApi ] = useState<Api>();
const [ user, setUser ] = useState<UserDto>(); const [ user, setUser ] = useState<UserDto>();
useEffect(() => { useEffect(() => {
connections.currentApiClient() ServerConnections.currentApiClient()
.getCurrentUser() .getCurrentUser()
.then(newUser => updateApiUser(undefined, newUser)) .then(newUser => updateApiUser(undefined, newUser))
.catch(err => { .catch(err => {
@ -37,7 +33,7 @@ export const ApiProvider: FC<ApiProviderProps> = ({ connections, children }) =>
setUser(newUser); setUser(newUser);
if (newUser.ServerId) { if (newUser.ServerId) {
setLegacyApiClient(connections.getApiClient(newUser.ServerId)); setLegacyApiClient(ServerConnections.getApiClient(newUser.ServerId));
} }
}; };
@ -46,14 +42,14 @@ export const ApiProvider: FC<ApiProviderProps> = ({ connections, children }) =>
setUser(undefined); setUser(undefined);
}; };
events.on(connections, 'localusersignedin', updateApiUser); events.on(ServerConnections, 'localusersignedin', updateApiUser);
events.on(connections, 'localusersignedout', resetApiUser); events.on(ServerConnections, 'localusersignedout', resetApiUser);
return () => { return () => {
events.off(connections, 'localusersignedin', updateApiUser); events.off(ServerConnections, 'localusersignedin', updateApiUser);
events.off(connections, 'localusersignedout', resetApiUser); events.off(ServerConnections, 'localusersignedout', resetApiUser);
}; };
}, [ connections, setLegacyApiClient, setUser ]); }, [ setLegacyApiClient, setUser ]);
useEffect(() => { useEffect(() => {
setApi(legacyApiClient ? toApi(legacyApiClient) : undefined); setApi(legacyApiClient ? toApi(legacyApiClient) : undefined);

2
src/index.jsx
View file

@ -145,7 +145,7 @@ async function onAppReady() {
ReactDOM.render( ReactDOM.render(
<StrictMode> <StrictMode>
<App connections={ServerConnections} history={history} /> <App history={history} />
</StrictMode>, </StrictMode>,
document.getElementById('reactRoot') document.getElementById('reactRoot')
); );