diff --git a/src/apps/dashboard/features/logs/components/LogItemList.tsx b/src/apps/dashboard/features/logs/components/LogItemList.tsx index 3b72120faa..a7f2aa69f6 100644 --- a/src/apps/dashboard/features/logs/components/LogItemList.tsx +++ b/src/apps/dashboard/features/logs/components/LogItemList.tsx @@ -15,16 +15,13 @@ type LogItemProps = { const LogItemList: FunctionComponent = ({ logs }: LogItemProps) => { const { api } = useApi(); - // TODO: Use getUri from TS SDK once available. const getLogFileUrl = (logFile: LogFile) => { if (!api) return ''; - let url = api.basePath + '/System/Logs/Log'; - - url += '?name=' + encodeURIComponent(String(logFile.Name)); - url += '&api_key=' + encodeURIComponent(api.accessToken); - - return url; + return api.getUri('/System/Logs/Log', { + name: logFile.Name, + api_key: api.accessToken + }); }; const getDate = (logFile: LogFile) => { diff --git a/src/apps/dashboard/routes/plugins/plugin.tsx b/src/apps/dashboard/routes/plugins/plugin.tsx index 663cbf279a..1e455ac5b5 100644 --- a/src/apps/dashboard/routes/plugins/plugin.tsx +++ b/src/apps/dashboard/routes/plugins/plugin.tsx @@ -35,7 +35,6 @@ import Page from 'components/Page'; import { useApi } from 'hooks/useApi'; import globalize from 'lib/globalize'; import { getPluginUrl } from 'utils/dashboard'; -import { getUri } from 'utils/api'; interface AlertMessage { severity?: 'success' | 'info' | 'warning' | 'error' @@ -104,7 +103,7 @@ const PluginPage: FC = () => { let imageUrl; if (pluginInfo?.HasImage) { - imageUrl = getUri(`/Plugins/${pluginInfo.Id}/${pluginInfo.Version}/Image`, api); + imageUrl = api?.getUri(`/Plugins/${pluginInfo.Id}/${pluginInfo.Version}/Image`); } return { diff --git a/src/utils/api.ts b/src/utils/api.ts deleted file mode 100644 index eca45aec7f..0000000000 --- a/src/utils/api.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { Api } from '@jellyfin/sdk'; - -/** - * Gets a full URI for a relative URL to the Jellyfin server for a given SDK Api instance. - * TODO: Add to SDK - * @param api - The Jellyfin SDK Api instance. - * @param url - The relative URL. - * @returns The complete URI with protocol, host, and base URL (if any). - */ -export const getUri = (url: string, api?: Api) => { - if (!api) return; - - return api.axiosInstance.getUri({ - baseURL: api.basePath, - url - }); -};