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

Refactor queries to use non-null assert

Browse source
This commit is contained in:
viown 2025-02-25 17:18:50 +03:00
parent 3df39d659c
commit 2ce9e9f1e0
28 changed files with 47 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/apps/dashboard/features/activity/api/useLogEntries.ts
View file

@ -7,15 +7,10 @@ import { useQuery } from '@tanstack/react-query';
import { useApi } from 'hooks/useApi';
const fetchLogEntries = async (
api?: Api,
api: Api,
requestParams?: ActivityLogApiGetLogEntriesRequest,
options?: AxiosRequestConfig
) => {
if (!api) {
console.warn('[fetchLogEntries] No API instance available');
return;
}
const response = await getActivityLogApi(api).getLogEntries(requestParams, {
signal: options?.signal
});
@ -30,7 +25,7 @@ export const useLogEntries = (
return useQuery({
queryKey: ['ActivityLogEntries', requestParams],
queryFn: ({ signal }) =>
fetchLogEntries(api, requestParams, { signal }),
fetchLogEntries(api!, requestParams, { signal }),
enabled: !!api
});
};

9
src/apps/dashboard/features/branding/api/useBrandingOptions.ts
View file

@ -8,14 +8,9 @@ import { useApi } from 'hooks/useApi';
export const QUERY_KEY = 'BrandingOptions';
const fetchBrandingOptions = async (
api?: Api,
api: Api,
options?: AxiosRequestConfig
) => {
if (!api) {
console.error('[fetchBrandingOptions] no Api instance provided');
throw new Error('No Api instance provided to fetchBrandingOptions');
}
return getBrandingApi(api)
.getBrandingOptions(options)
.then(({ data }) => data);
@ -25,7 +20,7 @@ export const getBrandingOptionsQuery = (
api?: Api
) => queryOptions({
queryKey: [ QUERY_KEY ],
queryFn: ({ signal }) => fetchBrandingOptions(api, { signal }),
queryFn: ({ signal }) => fetchBrandingOptions(api!, { signal }),
enabled: !!api
});

1
src/apps/dashboard/features/devices/api/useDeleteDevice.ts
View file

@ -11,7 +11,6 @@ export const useDeleteDevice = () => {
return useMutation({
mutationFn: (params: DevicesApiDeleteDeviceRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getDevicesApi(api!)
.deleteDevice(params)
),

9
src/apps/dashboard/features/devices/api/useDevices.ts
View file

@ -9,15 +9,10 @@ import { useApi } from 'hooks/useApi';
export const QUERY_KEY = 'Devices';
const fetchDevices = async (
api?: Api,
api: Api,
requestParams?: DevicesApiGetDevicesRequest,
options?: AxiosRequestConfig
) => {
if (!api) {
console.warn('[fetchDevices] No API instance available');
return;
}
const response = await getDevicesApi(api).getDevices(requestParams, {
signal: options?.signal
});
@ -32,7 +27,7 @@ export const useDevices = (
return useQuery({
queryKey: [QUERY_KEY, requestParams],
queryFn: ({ signal }) =>
fetchDevices(api, requestParams, { signal }),
fetchDevices(api!, requestParams, { signal }),
enabled: !!api
});
};

1
src/apps/dashboard/features/devices/api/useUpdateDevice.ts
View file

@ -11,7 +11,6 @@ export const useUpdateDevice = () => {
return useMutation({
mutationFn: (params: DevicesApiUpdateDeviceOptionsRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getDevicesApi(api!)
.updateDeviceOptions(params)
),

12
src/apps/dashboard/features/keys/api/useApiKeys.ts
View file

@ -1,17 +1,13 @@
import { Api } from '@jellyfin/sdk';
import { getApiKeyApi } from '@jellyfin/sdk/lib/utils/api/api-key-api';
import { useQuery } from '@tanstack/react-query';
import { AxiosRequestConfig } from 'axios';
import { useApi } from 'hooks/useApi';
export const QUERY_KEY = 'ApiKeys';
const fetchApiKeys = async (api?: Api) => {
if (!api) {
console.error('[useApiKeys] Failed to create Api instance');
return;
}
const response = await getApiKeyApi(api).getKeys();
const fetchApiKeys = async (api: Api, options?: AxiosRequestConfig) => {
const response = await getApiKeyApi(api).getKeys(options);
return response.data;
};
@ -21,7 +17,7 @@ export const useApiKeys = () => {
return useQuery({
queryKey: [ QUERY_KEY ],
queryFn: () => fetchApiKeys(api),
queryFn: ({ signal }) => fetchApiKeys(api!, { signal }),
enabled: !!api
});
};

1
src/apps/dashboard/features/keys/api/useCreateKey.ts
View file

@ -10,7 +10,6 @@ export const useCreateKey = () => {
return useMutation({
mutationFn: (params: ApiKeyApiCreateKeyRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getApiKeyApi(api!)
.createKey(params)
),

1
src/apps/dashboard/features/keys/api/useRevokeKey.ts
View file

@ -10,7 +10,6 @@ export const useRevokeKey = () => {
return useMutation({
mutationFn: (params: ApiKeyApiRevokeKeyRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getApiKeyApi(api!)
.revokeKey(params)
),

11
src/apps/dashboard/features/logs/api/useServerLogs.ts
View file

@ -4,13 +4,8 @@ import { useQuery } from '@tanstack/react-query';
import { useApi } from 'hooks/useApi';
import type { AxiosRequestConfig } from 'axios';
const fetchServerLogs = async (api?: Api, options?: AxiosRequestConfig) => {
if (!api) {
console.error('[useServerLogs] No API instance available');
return;
}
const response = await getSystemApi(api).getServerLogs(options);
const fetchServerLogs = async (api: Api, options?: AxiosRequestConfig) => {
const response = await getSystemApi(api!).getServerLogs(options);
return response.data;
};
@ -20,7 +15,7 @@ export const useServerLogs = () => {
return useQuery({
queryKey: [ 'ServerLogs' ],
queryFn: ({ signal }) => fetchServerLogs(api, { signal }),
queryFn: ({ signal }) => fetchServerLogs(api!, { signal }),
enabled: !!api
});
};

9
src/apps/dashboard/features/plugins/api/useConfigurationPages.ts
View file

@ -9,15 +9,10 @@ import { useApi } from 'hooks/useApi';
import { QueryKey } from './queryKey';
const fetchConfigurationPages = async (
api?: Api,
api: Api,
params?: DashboardApiGetConfigurationPagesRequest,
options?: AxiosRequestConfig
) => {
if (!api) {
console.warn('[fetchConfigurationPages] No API instance available');
return [];
}
const response = await getDashboardApi(api)
.getConfigurationPages(params, options);
return response.data;
@ -28,7 +23,7 @@ const getConfigurationPagesQuery = (
params?: DashboardApiGetConfigurationPagesRequest
) => queryOptions({
queryKey: [ QueryKey.ConfigurationPages, params?.enableInMainMenu ],
queryFn: ({ signal }) => fetchConfigurationPages(api, params, { signal }),
queryFn: ({ signal }) => fetchConfigurationPages(api!, params, { signal }),
enabled: !!api
});

1
src/apps/dashboard/features/plugins/api/useDisablePlugin.ts
View file

@ -11,7 +11,6 @@ export const useDisablePlugin = () => {
const { api } = useApi();
return useMutation({
mutationFn: (params: PluginsApiDisablePluginRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getPluginsApi(api!)
.disablePlugin(params)
),

1
src/apps/dashboard/features/plugins/api/useEnablePlugin.ts
View file

@ -11,7 +11,6 @@ export const useEnablePlugin = () => {
const { api } = useApi();
return useMutation({
mutationFn: (params: PluginsApiEnablePluginRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getPluginsApi(api!)
.enablePlugin(params)
),

1
src/apps/dashboard/features/plugins/api/useInstallPackage.ts
View file

@ -11,7 +11,6 @@ export const useInstallPackage = () => {
const { api } = useApi();
return useMutation({
mutationFn: (params: PackageApiInstallPackageRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getPackageApi(api!)
.installPackage(params)
),

20
src/apps/dashboard/features/plugins/api/usePackageInfo.ts
View file

@ -9,34 +9,24 @@ import { useApi } from 'hooks/useApi';
import { QueryKey } from './queryKey';
const fetchPackageInfo = async (
api?: Api,
params?: PackageApiGetPackageInfoRequest,
api: Api,
params: PackageApiGetPackageInfoRequest,
options?: AxiosRequestConfig
) => {
if (!api) {
console.warn('[fetchPackageInfo] No API instance available');
return;
}
if (!params) {
console.warn('[fetchPackageInfo] Missing request params');
return;
}
const response = await getPackageApi(api)
.getPackageInfo(params, options);
return response.data;
};
const getPackageInfoQuery = (
api?: Api,
api: Api | undefined,
params?: PackageApiGetPackageInfoRequest
) => queryOptions({
// Don't retry since requests for plugins not available in repos fail
retry: false,
queryKey: [ QueryKey.PackageInfo, params?.name, params?.assemblyGuid ],
queryFn: ({ signal }) => fetchPackageInfo(api, params, { signal }),
enabled: !!api && !!params?.name
queryFn: ({ signal }) => fetchPackageInfo(api!, params!, { signal }),
enabled: !!params && !!api && !!params.name
});
export const usePackageInfo = (

9
src/apps/dashboard/features/plugins/api/usePlugins.ts
View file

@ -8,14 +8,9 @@ import { useApi } from 'hooks/useApi';
import { QueryKey } from './queryKey';
const fetchPlugins = async (
api?: Api,
api: Api,
options?: AxiosRequestConfig
) => {
if (!api) {
console.warn('[fetchPlugins] No API instance available');
return [];
}
const response = await getPluginsApi(api)
.getPlugins(options);
return response.data;
@ -25,7 +20,7 @@ const getPluginsQuery = (
api?: Api
) => queryOptions({
queryKey: [ QueryKey.Plugins ],
queryFn: ({ signal }) => fetchPlugins(api, { signal }),
queryFn: ({ signal }) => fetchPlugins(api!, { signal }),
enabled: !!api
});

1
src/apps/dashboard/features/plugins/api/useUninstallPlugin.ts
View file

@ -11,7 +11,6 @@ export const useUninstallPlugin = () => {
const { api } = useApi();
return useMutation({
mutationFn: (params: PluginsApiUninstallPluginByVersionRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getPluginsApi(api!)
.uninstallPluginByVersion(params)
),

1
src/apps/dashboard/features/scheduledtasks/api/useStartTask.ts
View file

@ -10,7 +10,6 @@ export const useStartTask = () => {
return useMutation({
mutationFn: (params: ScheduledTasksApiStartTaskRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getScheduledTasksApi(api!)
.startTask(params)
),

1
src/apps/dashboard/features/scheduledtasks/api/useStopTask.ts
View file

@ -10,7 +10,6 @@ export const useStopTask = () => {
return useMutation({
mutationFn: (params: ScheduledTasksApiStartTaskRequest) => (
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
getScheduledTasksApi(api!)
.stopTask(params)
),

9
src/apps/dashboard/features/scheduledtasks/api/useTasks.ts
View file

@ -9,15 +9,10 @@ import { useApi } from 'hooks/useApi';
export const QUERY_KEY = 'Tasks';
const fetchTasks = async (
api?: Api,
api: Api,
params?: ScheduledTasksApiGetTasksRequest,
options?: AxiosRequestConfig
) => {
if (!api) {
console.warn('[fetchTasks] No API instance available');
return;
}
const response = await getScheduledTasksApi(api).getTasks(params, options);
return response.data;
@ -29,7 +24,7 @@ export const useTasks = (params?: ScheduledTasksApiGetTasksRequest) => {
return useQuery({
queryKey: [QUERY_KEY],
queryFn: ({ signal }) =>
fetchTasks(api, params, { signal }),
fetchTasks(api!, params, { signal }),
enabled: !!api
});
};