Bump vite from 6.3.5 to 7.1.11

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.3.5 to 7.1.11.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v7.1.11/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 7.1.11
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/CODEOWNERS

@@ -1,5 +1 @@
 *               @jellyfin/web
-# Joshua must review all changes to bump_version
-bump_version    @joshuaboniface
-# Core must approve all changes within the repo config
-.github/        @jellyfin/core

.github/workflows/__codeql.yml

@@ -20,21 +20,21 @@ jobs:
 
     steps:
       - name: Checkout repository ⬇️
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           ref: ${{ inputs.commit }}
           show-progress: false
 
       - name: Initialize CodeQL 🛠️
-        uses: github/codeql-action/init@c3d42c5d08633d8b33635fbd94b000a0e2585b3c # v3.31.4
+        uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
         with:
           queries: security-and-quality
           languages: ${{ matrix.language }}
 
       - name: Autobuild 📦
-        uses: github/codeql-action/autobuild@c3d42c5d08633d8b33635fbd94b000a0e2585b3c # v3.31.4
+        uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
 
       - name: Perform CodeQL Analysis 🧪
-        uses: github/codeql-action/analyze@c3d42c5d08633d8b33635fbd94b000a0e2585b3c # v3.31.4
+        uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.11
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/__package.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           ref: ${{ inputs.commit || github.sha }}
 

.github/workflows/__quality_checks.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           ref: ${{ inputs.commit }}
           show-progress: false
 
       - name: Scan
-        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
+        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
         with:
           ## Workaround from https://github.com/actions/dependency-review-action/issues/456
           ## TODO: Remove when necessary
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Checkout ⬇️
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           ref: ${{ inputs.commit }}
           show-progress: false

.github/workflows/pull_request.yml

@@ -80,7 +80,7 @@ jobs:
     
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           ref: ${{ github.event.pull_request.head.sha }}
     
@@ -95,6 +95,6 @@ jobs:
         run: npm ci --no-audit
     
       - name: Run eslint
-        uses: CatChen/eslint-suggestion-action@4ee415529307a8ca0260b4a3775484802523e5af # v4.1.19
+        uses: CatChen/eslint-suggestion-action@4dda35decf912ab18ea3e071acec2c6c2eda00b6 # v4.1.18
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -66,7 +66,6 @@
     "ts-loader": "9.5.2",
     "typescript": "5.8.3",
     "typescript-eslint": "8.35.1",
-    "vite-tsconfig-paths": "5.1.4",
     "vitest": "3.2.4",
     "webpack": "5.99.9",
     "webpack-bundle-analyzer": "4.10.2",
@@ -85,7 +84,7 @@
     "@fontsource/noto-sans-sc": "5.2.6",
     "@fontsource/noto-sans-tc": "5.2.6",
     "@jellyfin/libass-wasm": "4.2.3",
-    "@jellyfin/sdk": "0.0.0-unstable.202512091852",
+    "@jellyfin/sdk": "0.0.0-unstable.202510201847",
     "@jellyfin/ux-web": "1.0.0",
     "@mui/icons-material": "6.4.12",
     "@mui/material": "6.4.12",
@@ -162,7 +161,7 @@
     "build:check": "tsc --noEmit",
     "build:es-check": "npm run build:production && npm run escheck",
     "escheck": "es-check",
-    "lint": "eslint",
+    "lint": "eslint \"./\"",
     "test": "vitest --watch=false --config vite.config.ts",
     "test:watch": "vitest --config vite.config.ts",
     "stylelint": "stylelint \"src/**/*.{css,scss}\""

src/RootAppRouter.tsx

@@ -13,16 +13,13 @@ import { STABLE_APP_ROUTES } from 'apps/stable/routes/routes';
 import { WIZARD_APP_ROUTES } from 'apps/wizard/routes/routes';
 import AppHeader from 'components/AppHeader';
 import Backdrop from 'components/Backdrop';
-import { SETTING_KEY as LAYOUT_SETTING_KEY } from 'components/layoutManager';
 import BangRedirect from 'components/router/BangRedirect';
 import { createRouterHistory } from 'components/router/routerHistory';
-import { LayoutMode } from 'constants/layoutMode';
-import browser from 'scripts/browser';
-import appTheme from 'themes';
+import appTheme from 'themes/themes';
 import { ThemeStorageManager } from 'themes/themeStorageManager';
 
-const layoutMode = browser.tv ? LayoutMode.Tv : localStorage.getItem(LAYOUT_SETTING_KEY);
-const isExperimentalLayout = !layoutMode || layoutMode === LayoutMode.Experimental;
+const layoutMode = localStorage.getItem('layout');
+const isExperimentalLayout = layoutMode === 'experimental';
 
 const router = createHashRouter([
     {

src/apiclient.d.ts

@@ -136,7 +136,6 @@ declare module 'jellyfin-apiclient' {
         getInstantMixFromItem(itemId: string, options?: any): Promise<BaseItemDtoQueryResult>;
         getIntros(itemId: string): Promise<BaseItemDtoQueryResult>;
         getItemCounts(userId?: string): Promise<ItemCounts>;
-        /** @deprecated This function returns a URL with a legacy auth parameter.*/
         getItemDownloadUrl(itemId: string): string;
         getItemImageInfos(itemId: string): Promise<ImageInfo[]>;
         getItems(userId: string, options?: any): Promise<BaseItemDtoQueryResult>;

src/apps/dashboard/components/BaseCard.tsx

@@ -94,13 +94,7 @@ const BaseCard = ({
                             {title}
                         </Typography>
                         {text && (
-                            <Typography
-                                variant='body2'
-                                color='text.secondary'
-                                sx={{
-                                    lineBreak: 'anywhere'
-                                }}
-                            >
+                            <Typography variant='body2' color='text.secondary'>
                                 {text}
                             </Typography>
                         )}

src/apps/dashboard/components/widgets/ItemCountsWidget.tsx

@@ -5,14 +5,13 @@ import MusicNote from '@mui/icons-material/MusicNote';
 import MusicVideo from '@mui/icons-material/MusicVideo';
 import Tv from '@mui/icons-material/Tv';
 import VideoLibrary from '@mui/icons-material/VideoLibrary';
-import Grid from '@mui/material/Grid';
+import Grid from '@mui/material/Grid2';
 import SvgIcon from '@mui/material/SvgIcon';
 import React, { useMemo } from 'react';
 
 import { useItemCounts } from 'apps/dashboard/features/metrics/api/useItemCounts';
 import MetricCard, { type MetricCardProps } from 'apps/dashboard/features/metrics/components/MetricCard';
 import globalize from 'lib/globalize';
-import Box from '@mui/material/Box';
 
 interface MetricDefinition {
     key: keyof ItemCounts
@@ -76,27 +75,23 @@ const ItemCountsWidget = () => {
     }, [ counts, isPending ]);
 
     return (
-        <Box>
-            <Grid
-                container
-                spacing={2}
-                sx={{
-                    alignItems: 'stretch'
-                }}
-            >
-                {cards.map(card => (
-                    <Grid
-                        key={card.metrics.map(metric => metric.label).join('-')}
-                        item
-                        xs={12}
-                        sm={6}
-                        lg={4}
-                    >
-                        <MetricCard {...card} />
-                    </Grid>
-                ))}
-            </Grid>
-        </Box>
+        <Grid
+            container
+            spacing={2}
+            sx={{
+                alignItems: 'stretch',
+                marginTop: 2
+            }}
+        >
+            {cards.map(card => (
+                <Grid
+                    key={card.metrics.map(metric => metric.label).join('-')}
+                    size={{ xs: 12, sm: 6, lg: 4 }}
+                >
+                    <MetricCard {...card} />
+                </Grid>
+            ))}
+        </Grid>
     );
 };
 

src/apps/dashboard/components/widgets/ServerInfoWidget.tsx

@@ -15,15 +15,9 @@ type ServerInfoWidgetProps = {
     onScanLibrariesClick?: () => void;
     onRestartClick?: () => void;
     onShutdownClick?: () => void;
-    isScanning?: boolean;
 };
 
-const ServerInfoWidget = ({
-    onScanLibrariesClick,
-    onRestartClick,
-    onShutdownClick,
-    isScanning
-}: ServerInfoWidgetProps) => {
+const ServerInfoWidget = ({ onScanLibrariesClick, onRestartClick, onShutdownClick }: ServerInfoWidgetProps) => {
     const { data: systemInfo, isPending } = useSystemInfo();
 
     return (
@@ -69,7 +63,6 @@ const ServerInfoWidget = ({
                         sx={{
                             fontWeight: 'bold'
                         }}
-                        disabled={isScanning}
                     >
                         {globalize.translate('ButtonScanAllLibraries')}
                     </Button>

src/apps/dashboard/constants/helpLinks.ts

@@ -47,8 +47,5 @@ export const HelpLinks = [
             '/dashboard/users/profile'
         ],
         url: 'https://jellyfin.org/docs/general/server/users/'
-    }, {
-        paths: ['/dashboard/backups'],
-        url: 'https://jellyfin.org/docs/general/administration/backup-and-restore/'
     }
 ];

src/apps/dashboard/features/livetv/components/TunerDeviceCard.tsx

@@ -78,6 +78,7 @@ const TunerDeviceCard = ({ tunerHost }: TunerDeviceCardProps) => {
                 title={tunerHost.FriendlyName || getTunerName(tunerHost.Type) || ''}
                 text={tunerHost.Url || ''}
                 icon={<DvrIcon sx={{ fontSize: 70 }} />}
+                width={340}
                 action={true}
                 actionRef={actionRef}
                 onActionClick={onActionClick}

src/apps/dashboard/features/logs/api/useServerLog.ts

@@ -12,13 +12,7 @@ const fetchServerLog = async (
     const response = await getSystemApi(api).getLogFile({ name }, options);
 
     // FIXME: TypeScript SDK thinks it is returning a File but in reality it is a string
-    const data = response.data as never as string | object;
-
-    if (typeof data === 'object') {
-        return JSON.stringify(data, null, 2);
-    } else {
-        return data;
-    }
+    return response.data as never as string;
 };
 export const useServerLog = (name: string) => {
     const { api } = useApi();

src/apps/dashboard/features/users/api/useAuthProviders.ts

@@ -1,21 +0,0 @@
-import { Api } from '@jellyfin/sdk';
-import { useQuery } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import { getSessionApi } from '@jellyfin/sdk/lib/utils/api/session-api';
-import type { AxiosRequestConfig } from 'axios';
-
-const fetchAuthProviders = async (api: Api, options?: AxiosRequestConfig) => {
-    const response = await getSessionApi(api).getAuthProviders(options);
-
-    return response.data;
-};
-
-export const useAuthProviders = () => {
-    const { api } = useApi();
-
-    return useQuery({
-        queryKey: [ 'AuthProviders' ],
-        queryFn: ({ signal }) => fetchAuthProviders(api!, { signal }),
-        enabled: !!api
-    });
-};

src/apps/dashboard/features/users/api/useChannels.ts

@@ -1,22 +0,0 @@
-import { Api } from '@jellyfin/sdk';
-import { useQuery } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import { getChannelsApi } from '@jellyfin/sdk/lib/utils/api/channels-api';
-import { ChannelsApiGetChannelsRequest } from '@jellyfin/sdk/lib/generated-client/api/channels-api';
-import type { AxiosRequestConfig } from 'axios';
-
-const fetchChannels = async (api: Api, params?: ChannelsApiGetChannelsRequest, options?: AxiosRequestConfig) => {
-    const response = await getChannelsApi(api).getChannels(params, options);
-
-    return response.data;
-};
-
-export const useChannels = (params?: ChannelsApiGetChannelsRequest) => {
-    const { api } = useApi();
-
-    return useQuery({
-        queryKey: [ 'Channels' ],
-        queryFn: ({ signal }) => fetchChannels(api!, params, { signal }),
-        enabled: !!api
-    });
-};

src/apps/dashboard/features/users/api/useCreateUser.ts

@@ -1,15 +0,0 @@
-import { UserApiCreateUserByNameRequest } from '@jellyfin/sdk/lib/generated-client/api/user-api';
-import { getUserApi } from '@jellyfin/sdk/lib/utils/api/user-api';
-import { useMutation } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-
-export const useCreateUser = () => {
-    const { api } = useApi();
-
-    return useMutation({
-        mutationFn: (params: UserApiCreateUserByNameRequest) => (
-            getUserApi(api!)
-                .createUserByName(params)
-        )
-    });
-};

src/apps/dashboard/features/users/api/useDeleteUser.ts

@@ -1,22 +0,0 @@
-import { UserApiDeleteUserRequest } from '@jellyfin/sdk/lib/generated-client/api/user-api';
-import { getUserApi } from '@jellyfin/sdk/lib/utils/api/user-api';
-import { useMutation } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import { QUERY_KEY } from 'hooks/useUsers';
-import { queryClient } from 'utils/query/queryClient';
-
-export const useDeleteUser = () => {
-    const { api } = useApi();
-
-    return useMutation({
-        mutationFn: (params: UserApiDeleteUserRequest) => (
-            getUserApi(api!)
-                .deleteUser(params)
-        ),
-        onSuccess: () => {
-            void queryClient.invalidateQueries({
-                queryKey: [ QUERY_KEY ]
-            });
-        }
-    });
-};

src/apps/dashboard/features/users/api/useLibraryMediaFolders.ts

@@ -1,22 +0,0 @@
-import { Api } from '@jellyfin/sdk';
-import { LibraryApiGetMediaFoldersRequest } from '@jellyfin/sdk/lib/generated-client/api/library-api';
-import { getLibraryApi } from '@jellyfin/sdk/lib/utils/api/library-api';
-import { useQuery } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import type { AxiosRequestConfig } from 'axios';
-
-const fetchLibraryMediaFolders = async (api: Api, params?: LibraryApiGetMediaFoldersRequest, options?: AxiosRequestConfig) => {
-    const response = await getLibraryApi(api).getMediaFolders(params, options);
-
-    return response.data;
-};
-
-export const useLibraryMediaFolders = (params?: LibraryApiGetMediaFoldersRequest) => {
-    const { api } = useApi();
-
-    return useQuery({
-        queryKey: ['LibraryMediaFolders'],
-        queryFn: ({ signal }) => fetchLibraryMediaFolders(api!, params, { signal }),
-        enabled: !!api
-    });
-};

src/apps/dashboard/features/users/api/useNetworkConfig.ts

@@ -1,22 +0,0 @@
-import { Api } from '@jellyfin/sdk';
-import { useQuery } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import { getConfigurationApi } from '@jellyfin/sdk/lib/utils/api/configuration-api';
-import type { AxiosRequestConfig } from 'axios';
-import type { NetworkConfiguration } from '@jellyfin/sdk/lib/generated-client/models/network-configuration';
-
-const fetchNetworkConfig = async (api: Api, options?: AxiosRequestConfig) => {
-    const response = await getConfigurationApi(api).getNamedConfiguration({ key: 'network' }, options);
-
-    return response.data as NetworkConfiguration;
-};
-
-export const useNetworkConfig = () => {
-    const { api } = useApi();
-
-    return useQuery({
-        queryKey: [ 'NetConfig' ],
-        queryFn: ({ signal }) => fetchNetworkConfig(api!, { signal }),
-        enabled: !!api
-    });
-};

src/apps/dashboard/features/users/api/useParentalRatings.ts

@@ -1,21 +0,0 @@
-import { Api } from '@jellyfin/sdk';
-import { getLocalizationApi } from '@jellyfin/sdk/lib/utils/api/localization-api';
-import { useQuery } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import type { AxiosRequestConfig } from 'axios';
-
-const fetchParentalRatings = async (api: Api, options?: AxiosRequestConfig) => {
-    const response = await getLocalizationApi(api).getParentalRatings(options);
-
-    return response.data;
-};
-
-export const useParentalRatings = () => {
-    const { api } = useApi();
-
-    return useQuery({
-        queryKey: ['ParentalRatings'],
-        queryFn: ({ signal }) => fetchParentalRatings(api!, { signal }),
-        enabled: !!api
-    });
-};

src/apps/dashboard/features/users/api/usePasswordResetProviders.ts

@@ -1,21 +0,0 @@
-import { Api } from '@jellyfin/sdk';
-import { useQuery } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import { getSessionApi } from '@jellyfin/sdk/lib/utils/api/session-api';
-import type { AxiosRequestConfig } from 'axios';
-
-const fetchPasswordResetProviders = async (api: Api, options?: AxiosRequestConfig) => {
-    const response = await getSessionApi(api).getPasswordResetProviders(options);
-
-    return response.data;
-};
-
-export const usePasswordResetProviders = () => {
-    const { api } = useApi();
-
-    return useQuery({
-        queryKey: [ 'PasswordResetProviders' ],
-        queryFn: ({ signal }) => fetchPasswordResetProviders(api!, { signal }),
-        enabled: !!api
-    });
-};

src/apps/dashboard/features/users/api/useUpdateUser.ts

@@ -1,22 +0,0 @@
-import { UserApiUpdateUserRequest } from '@jellyfin/sdk/lib/generated-client/api/user-api';
-import { getUserApi } from '@jellyfin/sdk/lib/utils/api/user-api';
-import { useMutation } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import { queryClient } from 'utils/query/queryClient';
-import { QUERY_KEY } from './useUser';
-
-export const useUpdateUser = () => {
-    const { api } = useApi();
-
-    return useMutation({
-        mutationFn: (params: UserApiUpdateUserRequest) => (
-            getUserApi(api!)
-                .updateUser(params)
-        ),
-        onSuccess: (_, params) => {
-            void queryClient.invalidateQueries({
-                queryKey: [QUERY_KEY, params.userId]
-            });
-        }
-    });
-};

src/apps/dashboard/features/users/api/useUpdateUserPolicy.ts

@@ -1,23 +0,0 @@
-import { UserApiUpdateUserPolicyRequest } from '@jellyfin/sdk/lib/generated-client/api/user-api';
-import { getUserApi } from '@jellyfin/sdk/lib/utils/api/user-api';
-import { useMutation } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import { queryClient } from 'utils/query/queryClient';
-import { QUERY_KEY } from './useUser';
-
-export const useUpdateUserPolicy = () => {
-    const { api } = useApi();
-
-    return useMutation({
-        mutationFn: (params: UserApiUpdateUserPolicyRequest) => (
-
-            getUserApi(api!)
-                .updateUserPolicy(params)
-        ),
-        onSuccess: (_, params) => {
-            void queryClient.invalidateQueries({
-                queryKey: [QUERY_KEY, params.userId]
-            });
-        }
-    });
-};

src/apps/dashboard/features/users/api/useUser.ts

@@ -1,24 +0,0 @@
-import { Api } from '@jellyfin/sdk';
-import { UserApiGetUserByIdRequest } from '@jellyfin/sdk/lib/generated-client/api/user-api';
-import { getUserApi } from '@jellyfin/sdk/lib/utils/api/user-api';
-import { useQuery } from '@tanstack/react-query';
-import { useApi } from 'hooks/useApi';
-import type { AxiosRequestConfig } from 'axios';
-
-export const QUERY_KEY = 'User';
-
-const fetchUser = async (api: Api, params: UserApiGetUserByIdRequest, options?: AxiosRequestConfig) => {
-    const response = await getUserApi(api).getUserById(params, options);
-
-    return response.data;
-};
-
-export const useUser = (params?: UserApiGetUserByIdRequest) => {
-    const { api } = useApi();
-
-    return useQuery({
-        queryKey: [ QUERY_KEY, params?.userId ],
-        queryFn: ({ signal }) => fetchUser(api!, params!, { signal }),
-        enabled: !!api && !!params
-    });
-};

src/apps/dashboard/routes/backups/index.tsx

@@ -102,7 +102,7 @@ export const Component = () => {
                     }).catch(() => {
                         // Server is still down
                     });
-            }, 45000);
+            }, 5000);
 
             return () => {
                 clearInterval(serverCheckInterval);

src/apps/dashboard/routes/index.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import Page from 'components/Page';
 import globalize from 'lib/globalize';
 import Box from '@mui/material/Box';
@@ -16,7 +16,6 @@ import RunningTasksWidget from '../components/widgets/RunningTasksWidget';
 import DevicesWidget from '../components/widgets/DevicesWidget';
 import { useStartTask } from '../features/tasks/api/useStartTask';
 import ItemCountsWidget from '../components/widgets/ItemCountsWidget';
-import { TaskState } from '@jellyfin/sdk/lib/generated-client/models/task-state';
 
 export const Component = () => {
     const [ isRestartConfirmDialogOpen, setIsRestartConfirmDialogOpen ] = useState(false);
@@ -27,10 +26,6 @@ export const Component = () => {
 
     const { data: tasks } = useLiveTasks({ isHidden: false });
 
-    const librariesTask = useMemo(() => (
-        tasks?.find((value) => value.Key === 'RefreshLibrary')
-    ), [ tasks ]);
-
     const promptRestart = useCallback(() => {
         setIsRestartConfirmDialogOpen(true);
     }, []);
@@ -99,7 +94,6 @@ export const Component = () => {
                                 onScanLibrariesClick={onScanLibraries}
                                 onRestartClick={promptRestart}
                                 onShutdownClick={promptShutdown}
-                                isScanning={librariesTask?.State !== TaskState.Idle}
                             />
                             <ItemCountsWidget />
                             <RunningTasksWidget tasks={tasks} />

src/apps/dashboard/routes/libraries/index.tsx

@@ -29,8 +29,7 @@ export const Component = () => {
 
     const showMediaLibraryCreator = useCallback(() => {
         const mediaLibraryCreator = new MediaLibraryCreator({
-            collectionTypeOptions: getCollectionTypeOptions(),
-            refresh: true
+            collectionTypeOptions: getCollectionTypeOptions()
         }) as Promise<boolean>;
 
         void mediaLibraryCreator.then((hasChanges: boolean) => {
@@ -70,7 +69,7 @@ export const Component = () => {
                         <Button
                             onClick={onScanLibraries}
                             startIcon={<RefreshIcon />}
-                            loading={librariesTask && librariesTask.State !== TaskState.Idle}
+                            loading={librariesTask && librariesTask.State === TaskState.Running}
                             loadingPosition='start'
                             variant='outlined'
                         >

src/apps/dashboard/routes/livetv/index.tsx

@@ -12,7 +12,7 @@ import useLiveTasks from 'apps/dashboard/features/tasks/hooks/useLiveTasks';
 import Button from '@mui/material/Button';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import AddIcon from '@mui/icons-material/Add';
-import { Link, useNavigate } from 'react-router-dom';
+import { Form, Link, useNavigate } from 'react-router-dom';
 import { useStartTask } from 'apps/dashboard/features/tasks/api/useStartTask';
 import { TaskState } from '@jellyfin/sdk/lib/generated-client/models/task-state';
 import TaskProgress from 'apps/dashboard/features/tasks/components/TaskProgress';
@@ -22,7 +22,6 @@ import ListItemText from '@mui/material/ListItemText';
 import Alert from '@mui/material/Alert';
 import List from '@mui/material/List';
 import Provider from 'apps/dashboard/features/livetv/components/Provider';
-import Grid from '@mui/material/Grid';
 
 const CONFIG_KEY = 'livetv';
 
@@ -82,44 +81,33 @@ export const Component = () => {
             className='mainAnimatedPage type-interior'
         >
             <Box className='content-primary'>
-                {(isConfigError || isTasksError) ? (
-                    <Alert severity='error'>{globalize.translate('HeaderError')}</Alert>
-                ) : (
-                    <Stack spacing={3}>
-                        <Typography variant='h2'>{globalize.translate('HeaderTunerDevices')}</Typography>
+                <Form>
+                    {(isConfigError || isTasksError) ? (
+                        <Alert severity='error'>{globalize.translate('HeaderError')}</Alert>
+                    ) : (
+                        <Stack spacing={3}>
+                            <Typography variant='h2'>{globalize.translate('HeaderTunerDevices')}</Typography>
 
-                        <Button
-                            sx={{ alignSelf: 'flex-start' }}
-                            startIcon={<AddIcon />}
-                            component={Link}
-                            to='/dashboard/livetv/tuner'
-                        >
-                            {globalize.translate('ButtonAddTunerDevice')}
-                        </Button>
+                            <Button
+                                sx={{ alignSelf: 'flex-start' }}
+                                startIcon={<AddIcon />}
+                                component={Link}
+                                to='/dashboard/livetv/tuner'
+                            >
+                                {globalize.translate('ButtonAddTunerDevice')}
+                            </Button>
 
-                        <Box>
-                            <Grid container spacing={2}>
-                                {config.TunerHosts?.map(tunerHost => (
-                                    <Grid
+                            <Stack direction='row' spacing={2}>
+                                { config.TunerHosts?.map(tunerHost => (
+                                    <TunerDeviceCard
                                         key={tunerHost.Id}
-                                        item
-                                        xs={12}
-                                        sm={6}
-                                        md={3}
-                                        lg={2.4}
-                                    >
-                                        <TunerDeviceCard
-                                            key={tunerHost.Id}
-                                            tunerHost={tunerHost}
-                                        />
-                                    </Grid>
-                                ))}
-                            </Grid>
-                        </Box>
+                                        tunerHost={tunerHost}
+                                    />
+                                )) }
+                            </Stack>
 
-                        <Typography variant='h2'>{globalize.translate('HeaderGuideProviders')}</Typography>
+                            <Typography variant='h2'>{globalize.translate('HeaderGuideProviders')}</Typography>
 
-                        <Stack sx={{ alignSelf: 'flex-start' }} spacing={2}>
                             <Stack direction='row' spacing={1.5}>
                                 <Button
                                     sx={{ alignSelf: 'flex-start' }}
@@ -144,33 +132,32 @@ export const Component = () => {
                             {(refreshGuideTask && refreshGuideTask.State === TaskState.Running) && (
                                 <TaskProgress task={refreshGuideTask} />
                             )}
+                            <Menu
+                                anchorEl={anchorEl}
+                                open={isMenuOpen}
+                                onClose={onMenuClose}
+                            >
+                                <MenuItem onClick={navigateToSchedulesDirect}>
+                                    <ListItemText>Schedules Direct</ListItemText>
+                                </MenuItem>
+                                <MenuItem onClick={navigateToXMLTV}>
+                                    <ListItemText>XMLTV</ListItemText>
+                                </MenuItem>
+                            </Menu>
+
+                            {(config.ListingProviders && config.ListingProviders?.length > 0) && (
+                                <List sx={{ backgroundColor: 'background.paper' }}>
+                                    {config.ListingProviders?.map(provider => (
+                                        <Provider
+                                            key={provider.Id}
+                                            provider={provider}
+                                        />
+                                    ))}
+                                </List>
+                            )}
                         </Stack>
-
-                        <Menu
-                            anchorEl={anchorEl}
-                            open={isMenuOpen}
-                            onClose={onMenuClose}
-                        >
-                            <MenuItem onClick={navigateToSchedulesDirect}>
-                                <ListItemText>Schedules Direct</ListItemText>
-                            </MenuItem>
-                            <MenuItem onClick={navigateToXMLTV}>
-                                <ListItemText>XMLTV</ListItemText>
-                            </MenuItem>
-                        </Menu>
-
-                        {(config.ListingProviders && config.ListingProviders?.length > 0) && (
-                            <List sx={{ backgroundColor: 'background.paper' }}>
-                                {config.ListingProviders?.map(provider => (
-                                    <Provider
-                                        key={provider.Id}
-                                        provider={provider}
-                                    />
-                                ))}
-                            </List>
-                        )}
-                    </Stack>
-                )}
+                    )}
+                </Form>
             </Box>
         </Page>
     );

src/apps/dashboard/routes/logs/file.tsx

@@ -62,7 +62,7 @@ export const Component = () => {
                 onClose={handleToastClose}
                 message={globalize.translate('CopyLogSuccess')}
             />
-            <Container className='content-primary' maxWidth={false}>
+            <Container className='content-primary'>
                 <Box>
                     <Typography variant='h1'>{fileName}</Typography>
 
@@ -106,14 +106,7 @@ export const Component = () => {
 
                             <Paper sx={{ mt: 2 }}>
                                 <code>
-                                    <pre style={{
-                                        overflow:'auto',
-                                        margin: 0,
-                                        padding: '16px',
-                                        whiteSpace: 'pre-wrap'
-                                    }}>
-                                        {log}
-                                    </pre>
+                                    <pre style={{ overflow:'auto', margin: 0, padding: '16px' }}>{log}</pre>
                                 </code>
                             </Paper>
                         </>

src/apps/dashboard/routes/users/add.tsx

@@ -1,6 +1,7 @@
-import type { BaseItemDto, CreateUserByName } from '@jellyfin/sdk/lib/generated-client';
+import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client';
 import React, { useCallback, useEffect, useState, useRef } from 'react';
 
+import Dashboard from '../../../../utils/dashboard';
 import globalize from '../../../../lib/globalize';
 import loading from '../../../../components/loading/loading';
 import SectionTitleContainer from '../../../../elements/SectionTitleContainer';
@@ -11,11 +12,10 @@ import CheckBoxElement from '../../../../elements/CheckBoxElement';
 import Page from '../../../../components/Page';
 import Toast from 'apps/dashboard/components/Toast';
 
-import { useLibraryMediaFolders } from 'apps/dashboard/features/users/api/useLibraryMediaFolders';
-import { useChannels } from 'apps/dashboard/features/users/api/useChannels';
-import { useUpdateUserPolicy } from 'apps/dashboard/features/users/api/useUpdateUserPolicy';
-import { useCreateUser } from 'apps/dashboard/features/users/api/useCreateUser';
-import { useNavigate } from 'react-router-dom';
+type UserInput = {
+    Name?: string;
+    Password?: string;
+};
 
 type ItemsArr = {
     Name?: string | null;
@@ -23,7 +23,6 @@ type ItemsArr = {
 };
 
 const UserNew = () => {
-    const navigate = useNavigate();
     const [ channelsItems, setChannelsItems ] = useState<ItemsArr[]>([]);
     const [ mediaFoldersItems, setMediaFoldersItems ] = useState<ItemsArr[]>([]);
     const [ isErrorToastOpen, setIsErrorToastOpen ] = useState(false);
@@ -32,11 +31,6 @@ const UserNew = () => {
     const handleToastClose = useCallback(() => {
         setIsErrorToastOpen(false);
     }, []);
-    const { data: mediaFolders, isSuccess: isMediaFoldersSuccess } = useLibraryMediaFolders();
-    const { data: channels, isSuccess: isChannelsSuccess } = useChannels();
-
-    const createUser = useCreateUser();
-    const updateUserPolicy = useUpdateUserPolicy();
 
     const getItemsResult = (items: BaseItemDto[]) => {
         return items.map(item =>
@@ -55,7 +49,9 @@ const UserNew = () => {
             return;
         }
 
-        setMediaFoldersItems(getItemsResult(result));
+        const mediaFolders = getItemsResult(result);
+
+        setMediaFoldersItems(mediaFolders);
 
         const folderAccess = page.querySelector('.folderAccess') as HTMLDivElement;
         folderAccess.dispatchEvent(new CustomEvent('create'));
@@ -71,15 +67,15 @@ const UserNew = () => {
             return;
         }
 
-        const channelItems = getItemsResult(result);
+        const channels = getItemsResult(result);
 
-        setChannelsItems(channelItems);
+        setChannelsItems(channels);
 
         const channelAccess = page.querySelector('.channelAccess') as HTMLDivElement;
         channelAccess.dispatchEvent(new CustomEvent('create'));
 
         const channelAccessContainer = page.querySelector('.channelAccessContainer') as HTMLDivElement;
-        channelItems.length ? channelAccessContainer.classList.remove('hide') : channelAccessContainer.classList.add('hide');
+        channels.length ? channelAccessContainer.classList.remove('hide') : channelAccessContainer.classList.add('hide');
 
         (page.querySelector('.chkEnableAllChannels') as HTMLInputElement).checked = false;
     }, []);
@@ -91,26 +87,22 @@ const UserNew = () => {
             console.error('Unexpected null reference');
             return;
         }
-        if (!mediaFolders?.Items) {
-            console.error('[add] mediaFolders not available');
-            return;
-        }
-        if (!channels?.Items) {
-            console.error('[add] channels not available');
-            return;
-        }
 
-        loadMediaFolders(mediaFolders?.Items);
-        loadChannels(channels?.Items);
-        loading.hide();
-    }, [loadChannels, loadMediaFolders, mediaFolders, channels]);
-
-    useEffect(() => {
+        (page.querySelector('#txtUsername') as HTMLInputElement).value = '';
+        (page.querySelector('#txtPassword') as HTMLInputElement).value = '';
         loading.show();
-        if (isMediaFoldersSuccess && isChannelsSuccess) {
-            loadUser();
-        }
-    }, [loadUser, isMediaFoldersSuccess, isChannelsSuccess]);
+        const promiseFolders = window.ApiClient.getJSON(window.ApiClient.getUrl('Library/MediaFolders', {
+            IsHidden: false
+        }));
+        const promiseChannels = window.ApiClient.getJSON(window.ApiClient.getUrl('Channels'));
+        Promise.all([promiseFolders, promiseChannels]).then(function (responses) {
+            loadMediaFolders(responses[0].Items);
+            loadChannels(responses[1].Items);
+            loading.hide();
+        }).catch(err => {
+            console.error('[usernew] failed to load data', err);
+        });
+    }, [loadChannels, loadMediaFolders]);
 
     useEffect(() => {
         const page = element.current;
@@ -120,54 +112,51 @@ const UserNew = () => {
             return;
         }
 
+        loadUser();
+
         const saveUser = () => {
-            const userInput: CreateUserByName = {
-                Name: (page.querySelector('#txtUsername') as HTMLInputElement).value,
-                Password: (page.querySelector('#txtPassword') as HTMLInputElement).value
-            };
-            createUser.mutate({ createUserByName: userInput }, {
-                onSuccess: (response) => {
-                    const user = response.data;
+            const userInput: UserInput = {};
+            userInput.Name = (page.querySelector('#txtUsername') as HTMLInputElement).value.trim();
+            userInput.Password = (page.querySelector('#txtPassword') as HTMLInputElement).value;
 
-                    if (!user.Id || !user.Policy) {
-                        throw new Error('Unexpected null user id or policy');
-                    }
+            window.ApiClient.createUser(userInput).then(function (user) {
+                if (!user.Id || !user.Policy) {
+                    throw new Error('Unexpected null user id or policy');
+                }
 
-                    user.Policy.EnableAllFolders = (page.querySelector('.chkEnableAllFolders') as HTMLInputElement).checked;
-                    user.Policy.EnabledFolders = [];
+                user.Policy.EnableAllFolders = (page.querySelector('.chkEnableAllFolders') as HTMLInputElement).checked;
+                user.Policy.EnabledFolders = [];
 
-                    if (!user.Policy.EnableAllFolders) {
-                        user.Policy.EnabledFolders = Array.prototype.filter.call(page.querySelectorAll('.chkFolder'), function (i) {
-                            return i.checked;
-                        }).map(function (i) {
-                            return i.getAttribute('data-id');
-                        });
-                    }
-
-                    user.Policy.EnableAllChannels = (page.querySelector('.chkEnableAllChannels') as HTMLInputElement).checked;
-                    user.Policy.EnabledChannels = [];
-
-                    if (!user.Policy.EnableAllChannels) {
-                        user.Policy.EnabledChannels = Array.prototype.filter.call(page.querySelectorAll('.chkChannel'), function (i) {
-                            return i.checked;
-                        }).map(function (i) {
-                            return i.getAttribute('data-id');
-                        });
-                    }
-
-                    updateUserPolicy.mutate({
-                        userId: user.Id,
-                        userPolicy: user.Policy
-                    }, {
-                        onSuccess: () => {
-                            navigate(`/dashboard/users/profile?userId=${user.Id}`);
-                        },
-                        onError: () => {
-                            console.error('[usernew] failed to update user policy');
-                            setIsErrorToastOpen(true);
-                        }
+                if (!user.Policy.EnableAllFolders) {
+                    user.Policy.EnabledFolders = Array.prototype.filter.call(page.querySelectorAll('.chkFolder'), function (i) {
+                        return i.checked;
+                    }).map(function (i) {
+                        return i.getAttribute('data-id');
                     });
                 }
+
+                user.Policy.EnableAllChannels = (page.querySelector('.chkEnableAllChannels') as HTMLInputElement).checked;
+                user.Policy.EnabledChannels = [];
+
+                if (!user.Policy.EnableAllChannels) {
+                    user.Policy.EnabledChannels = Array.prototype.filter.call(page.querySelectorAll('.chkChannel'), function (i) {
+                        return i.checked;
+                    }).map(function (i) {
+                        return i.getAttribute('data-id');
+                    });
+                }
+
+                window.ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
+                    Dashboard.navigate('/dashboard/users/profile?userId=' + user.Id)
+                        .catch(err => {
+                            console.error('[usernew] failed to navigate to edit user page', err);
+                        });
+                }).catch(err => {
+                    console.error('[usernew] failed to update user policy', err);
+                });
+            }, function () {
+                setIsErrorToastOpen(true);
+                loading.hide();
             });
         };
 
@@ -179,32 +168,22 @@ const UserNew = () => {
             return false;
         };
 
-        const enableAllChannelsChange = function (this: HTMLInputElement) {
+        (page.querySelector('.chkEnableAllChannels') as HTMLInputElement).addEventListener('change', function (this: HTMLInputElement) {
             const channelAccessListContainer = page.querySelector('.channelAccessListContainer') as HTMLDivElement;
             this.checked ? channelAccessListContainer.classList.add('hide') : channelAccessListContainer.classList.remove('hide');
-        };
+        });
 
-        const enableAllFoldersChange = function (this: HTMLInputElement) {
+        (page.querySelector('.chkEnableAllFolders') as HTMLInputElement).addEventListener('change', function (this: HTMLInputElement) {
             const folderAccessListContainer = page.querySelector('.folderAccessListContainer') as HTMLDivElement;
             this.checked ? folderAccessListContainer.classList.add('hide') : folderAccessListContainer.classList.remove('hide');
-        };
+        });
 
-        const onCancelClick = () => {
-            window.history.back();
-        };
-
-        (page.querySelector('.chkEnableAllChannels') as HTMLInputElement).addEventListener('change', enableAllChannelsChange);
-        (page.querySelector('.chkEnableAllFolders') as HTMLInputElement).addEventListener('change', enableAllFoldersChange);
         (page.querySelector('.newUserProfileForm') as HTMLFormElement).addEventListener('submit', onSubmit);
-        (page.querySelector('#btnCancel') as HTMLButtonElement).addEventListener('click', onCancelClick);
 
-        return () => {
-            (page.querySelector('.chkEnableAllChannels') as HTMLInputElement).removeEventListener('change', enableAllChannelsChange);
-            (page.querySelector('.chkEnableAllFolders') as HTMLInputElement).removeEventListener('change', enableAllFoldersChange);
-            (page.querySelector('.newUserProfileForm') as HTMLFormElement).removeEventListener('submit', onSubmit);
-            (page.querySelector('#btnCancel') as HTMLButtonElement).removeEventListener('click', onCancelClick);
-        };
-    }, [loadUser, createUser, updateUserPolicy, navigate]);
+        (page.querySelector('#btnCancel') as HTMLButtonElement).addEventListener('click', function() {
+            window.history.back();
+        });
+    }, [loadUser]);
 
     return (
         <Page

src/apps/dashboard/routes/users/index.tsx

@@ -1,5 +1,10 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import type { UserDto } from '@jellyfin/sdk/lib/generated-client';
+import React, { useEffect, useState, useRef, useCallback } from 'react';
+
+import Dashboard from '../../../../utils/dashboard';
 import globalize from '../../../../lib/globalize';
+import loading from '../../../../components/loading/loading';
+import dom from '../../../../utils/dom';
 import confirm from '../../../../components/confirm/confirm';
 import UserCardBox from '../../../../components/dashboard/users/UserCardBox';
 import SectionTitleContainer from '../../../../elements/SectionTitleContainer';
@@ -9,12 +14,8 @@ import '../../../../components/cardbuilder/card.scss';
 import '../../../../components/indicators/indicators.scss';
 import '../../../../styles/flexstyles.scss';
 import Page from '../../../../components/Page';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import Toast from 'apps/dashboard/components/Toast';
-import { useUsers } from 'hooks/useUsers';
-import Loading from 'components/loading/LoadingComponent';
-import { useDeleteUser } from 'apps/dashboard/features/users/api/useDeleteUser';
-import dom from 'utils/dom';
 
 type MenuEntry = {
     name?: string;
@@ -25,15 +26,24 @@ type MenuEntry = {
 const UserProfiles = () => {
     const location = useLocation();
     const [ isSettingsSavedToastOpen, setIsSettingsSavedToastOpen ] = useState(false);
+    const [ users, setUsers ] = useState<UserDto[]>([]);
+
     const element = useRef<HTMLDivElement>(null);
-    const navigate = useNavigate();
-    const { data: users, isPending } = useUsers();
-    const deleteUser = useDeleteUser();
 
     const handleToastClose = useCallback(() => {
         setIsSettingsSavedToastOpen(false);
     }, []);
 
+    const loadData = () => {
+        loading.show();
+        window.ApiClient.getUsers().then(function (result) {
+            setUsers(result);
+            loading.hide();
+        }).catch(err => {
+            console.error('[userprofiles] failed to fetch users', err);
+        });
+    };
+
     useEffect(() => {
         const page = element.current;
 
@@ -47,6 +57,8 @@ const UserProfiles = () => {
             return;
         }
 
+        loadData();
+
         const showUserMenu = (elem: HTMLElement) => {
             const card = dom.parentWithClass(elem, 'card');
             const userId = card?.getAttribute('data-userid');
@@ -87,19 +99,28 @@ const UserProfiles = () => {
                     callback: function (id: string) {
                         switch (id) {
                             case 'open':
-                                navigate(`/dashboard/users/profile?userId=${userId}`);
+                                Dashboard.navigate('/dashboard/users/profile?userId=' + userId)
+                                    .catch(err => {
+                                        console.error('[userprofiles] failed to navigate to user edit page', err);
+                                    });
                                 break;
 
                             case 'access':
-                                navigate(`/dashboard/users/access?userId=${userId}`);
+                                Dashboard.navigate('/dashboard/users/access?userId=' + userId)
+                                    .catch(err => {
+                                        console.error('[userprofiles] failed to navigate to user library page', err);
+                                    });
                                 break;
 
                             case 'parentalcontrol':
-                                navigate(`/dashboard/users/parentalcontrol?userId=${userId}`);
+                                Dashboard.navigate('/dashboard/users/parentalcontrol?userId=' + userId)
+                                    .catch(err => {
+                                        console.error('[userprofiles] failed to navigate to parental control page', err);
+                                    });
                                 break;
 
                             case 'delete':
-                                confirmDeleteUser(userId, username);
+                                deleteUser(userId, username);
                         }
                     }
                 }).catch(() => {
@@ -110,7 +131,7 @@ const UserProfiles = () => {
             });
         };
 
-        const confirmDeleteUser = (id: string, username?: string | null) => {
+        const deleteUser = (id: string, username?: string | null) => {
             const title = username ? globalize.translate('DeleteName', username) : globalize.translate('DeleteUser');
             const text = globalize.translate('DeleteUserConfirmation');
 
@@ -120,38 +141,32 @@ const UserProfiles = () => {
                 confirmText: globalize.translate('Delete'),
                 primary: 'delete'
             }).then(function () {
-                deleteUser.mutate({
-                    userId: id
+                loading.show();
+                window.ApiClient.deleteUser(id).then(function () {
+                    loadData();
+                }).catch(err => {
+                    console.error('[userprofiles] failed to delete user', err);
                 });
             }).catch(() => {
                 // confirm dialog closed
             });
         };
 
-        const onPageClick = function (e: MouseEvent) {
+        page.addEventListener('click', function (e) {
             const btnUserMenu = dom.parentWithClass(e.target as HTMLElement, 'btnUserMenu');
 
             if (btnUserMenu) {
                 showUserMenu(btnUserMenu);
             }
-        };
+        });
 
-        const onAddUserClick = function() {
-            navigate('/dashboard/users/add');
-        };
-
-        page.addEventListener('click', onPageClick);
-        (page.querySelector('#btnAddUser') as HTMLButtonElement).addEventListener('click', onAddUserClick);
-
-        return () => {
-            page.removeEventListener('click', onPageClick);
-            (page.querySelector('#btnAddUser') as HTMLButtonElement).removeEventListener('click', onAddUserClick);
-        };
-    }, [navigate, deleteUser, location.state?.openSavedToast]);
-
-    if (isPending) {
-        return <Loading />;
-    }
+        (page.querySelector('#btnAddUser') as HTMLButtonElement).addEventListener('click', function() {
+            Dashboard.navigate('/dashboard/users/add')
+                .catch(err => {
+                    console.error('[userprofiles] failed to navigate to new user page', err);
+                });
+        });
+    }, []);
 
     return (
         <Page
@@ -177,7 +192,7 @@ const UserProfiles = () => {
                 </div>
 
                 <div className='localUsers itemsContainer vertical-wrap'>
-                    {users?.map(user => {
+                    {users.map(user => {
                         return <UserCardBox key={user.Id} user={user} />;
                     })}
                 </div>

src/apps/dashboard/routes/users/password.tsx

@@ -1,21 +1,37 @@
-import React from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 import SectionTabs from '../../../../components/dashboard/users/SectionTabs';
 import UserPasswordForm from '../../../../components/dashboard/users/UserPasswordForm';
 import SectionTitleContainer from '../../../../elements/SectionTitleContainer';
 import Page from '../../../../components/Page';
-import { useUser } from 'apps/dashboard/features/users/api/useUser';
-import Loading from 'components/loading/LoadingComponent';
+import loading from '../../../../components/loading/loading';
 
 const UserPassword = () => {
     const [ searchParams ] = useSearchParams();
     const userId = searchParams.get('userId');
-    const { data: user, isPending } = useUser(userId ? { userId: userId } : undefined);
+    const [ userName, setUserName ] = useState('');
 
-    if (isPending || !user) {
-        return <Loading />;
-    }
+    const loadUser = useCallback(() => {
+        if (!userId) {
+            console.error('[userpassword] missing user id');
+            return;
+        }
+
+        loading.show();
+        window.ApiClient.getUser(userId).then(function (user) {
+            if (!user.Name) {
+                throw new Error('Unexpected null user.Name');
+            }
+            setUserName(user.Name);
+            loading.hide();
+        }).catch(err => {
+            console.error('[userpassword] failed to fetch user', err);
+        });
+    }, [userId]);
+    useEffect(() => {
+        loadUser();
+    }, [loadUser]);
 
     return (
         <Page
@@ -25,13 +41,13 @@ const UserPassword = () => {
             <div className='content-primary'>
                 <div className='verticalSection'>
                     <SectionTitleContainer
-                        title={user?.Name || undefined}
+                        title={userName}
                     />
                 </div>
                 <SectionTabs activeTab='userpassword'/>
                 <div className='readOnlyContent'>
                     <UserPasswordForm
-                        user={user}
+                        userId={userId}
                     />
                 </div>
             </div>

src/apps/dashboard/routes/users/profile.tsx

@@ -13,14 +13,6 @@ import SectionTabs from '../../../../components/dashboard/users/SectionTabs';
 import loading from '../../../../components/loading/loading';
 import SelectElement from '../../../../elements/SelectElement';
 import Page from '../../../../components/Page';
-import { useUser } from 'apps/dashboard/features/users/api/useUser';
-import { useAuthProviders } from 'apps/dashboard/features/users/api/useAuthProviders';
-import { usePasswordResetProviders } from 'apps/dashboard/features/users/api/usePasswordResetProviders';
-import { useLibraryMediaFolders } from 'apps/dashboard/features/users/api/useLibraryMediaFolders';
-import { useChannels } from 'apps/dashboard/features/users/api/useChannels';
-import { useUpdateUser } from 'apps/dashboard/features/users/api/useUpdateUser';
-import { useUpdateUserPolicy } from 'apps/dashboard/features/users/api/useUpdateUserPolicy';
-import { useNetworkConfig } from 'apps/dashboard/features/users/api/useNetworkConfig';
 
 type ResetProvider = BaseItemDto & {
     checkedAttribute: string
@@ -35,22 +27,15 @@ const UserEdit = () => {
     const navigate = useNavigate();
     const [ searchParams ] = useSearchParams();
     const userId = searchParams.get('userId');
+    const [ userDto, setUserDto ] = useState<UserDto>();
     const [ deleteFoldersAccess, setDeleteFoldersAccess ] = useState<ResetProvider[]>([]);
+    const [ authProviders, setAuthProviders ] = useState<NameIdPair[]>([]);
+    const [ passwordResetProviders, setPasswordResetProviders ] = useState<NameIdPair[]>([]);
     const libraryMenu = useMemo(async () => ((await import('../../../../scripts/libraryMenu')).default), []);
 
     const [ authenticationProviderId, setAuthenticationProviderId ] = useState('');
     const [ passwordResetProviderId, setPasswordResetProviderId ] = useState('');
 
-    const { data: userDto, isSuccess: isUserSuccess } = useUser(userId ? { userId: userId } : undefined);
-    const { data: authProviders, isSuccess: isAuthProvidersSuccess } = useAuthProviders();
-    const { data: passwordResetProviders, isSuccess: isPasswordResetProvidersSuccess } = usePasswordResetProviders();
-    const { data: mediaFolders, isSuccess: isMediaFoldersSuccess } = useLibraryMediaFolders({ isHidden: false });
-    const { data: channels, isSuccess: isChannelsSuccess } = useChannels({ supportsMediaDeletion: true });
-    const { data: netConfig, isSuccess: isNetConfigSuccess } = useNetworkConfig();
-
-    const updateUser = useUpdateUser();
-    const updateUserPolicy = useUpdateUserPolicy();
-
     const element = useRef<HTMLDivElement>(null);
 
     const triggerChange = (select: HTMLInputElement) => {
@@ -58,10 +43,17 @@ const UserEdit = () => {
         select.dispatchEvent(evt);
     };
 
+    const getUser = () => {
+        if (!userId) throw new Error('missing user id');
+        return window.ApiClient.getUser(userId);
+    };
+
     const loadAuthProviders = useCallback((page: HTMLDivElement, user: UserDto, providers: NameIdPair[]) => {
         const fldSelectLoginProvider = page.querySelector('.fldSelectLoginProvider') as HTMLDivElement;
         fldSelectLoginProvider.classList.toggle('hide', providers.length <= 1);
 
+        setAuthProviders(providers);
+
         const currentProviderId = user.Policy?.AuthenticationProviderId || '';
         setAuthenticationProviderId(currentProviderId);
     }, []);
@@ -70,26 +62,30 @@ const UserEdit = () => {
         const fldSelectPasswordResetProvider = page.querySelector('.fldSelectPasswordResetProvider') as HTMLDivElement;
         fldSelectPasswordResetProvider.classList.toggle('hide', providers.length <= 1);
 
+        setPasswordResetProviders(providers);
+
         const currentProviderId = user.Policy?.PasswordResetProviderId || '';
         setPasswordResetProviderId(currentProviderId);
     }, []);
 
-    const loadDeleteFolders = useCallback((page: HTMLDivElement, user: UserDto, folders: BaseItemDto[]) => {
-        let isChecked;
-        let checkedAttribute;
-        const itemsArr: ResetProvider[] = [];
+    const loadDeleteFolders = useCallback((page: HTMLDivElement, user: UserDto, mediaFolders: BaseItemDto[]) => {
+        window.ApiClient.getJSON(window.ApiClient.getUrl('Channels', {
+            SupportsMediaDeletion: true
+        })).then(function (channelsResult) {
+            let isChecked;
+            let checkedAttribute;
+            const itemsArr: ResetProvider[] = [];
 
-        for (const mediaFolder of folders) {
-            isChecked = user.Policy?.EnableContentDeletion || user.Policy?.EnableContentDeletionFromFolders?.indexOf(mediaFolder.Id || '') != -1;
-            checkedAttribute = isChecked ? ' checked="checked"' : '';
-            itemsArr.push({
-                ...mediaFolder,
-                checkedAttribute: checkedAttribute
-            });
-        }
+            for (const mediaFolder of mediaFolders) {
+                isChecked = user.Policy?.EnableContentDeletion || user.Policy?.EnableContentDeletionFromFolders?.indexOf(mediaFolder.Id || '') != -1;
+                checkedAttribute = isChecked ? ' checked="checked"' : '';
+                itemsArr.push({
+                    ...mediaFolder,
+                    checkedAttribute: checkedAttribute
+                });
+            }
 
-        if (channels?.Items) {
-            for (const channel of channels.Items) {
+            for (const channel of channelsResult.Items) {
                 isChecked = user.Policy?.EnableContentDeletion || user.Policy?.EnableContentDeletionFromFolders?.indexOf(channel.Id || '') != -1;
                 checkedAttribute = isChecked ? ' checked="checked"' : '';
                 itemsArr.push({
@@ -97,66 +93,16 @@ const UserEdit = () => {
                     checkedAttribute: checkedAttribute
                 });
             }
-        }
 
-        setDeleteFoldersAccess(itemsArr);
+            setDeleteFoldersAccess(itemsArr);
 
-        const chkEnableDeleteAllFolders = page.querySelector('.chkEnableDeleteAllFolders') as HTMLInputElement;
-        chkEnableDeleteAllFolders.checked = user.Policy?.EnableContentDeletion || false;
-        triggerChange(chkEnableDeleteAllFolders);
-    }, [channels]);
-
-    useEffect(() => {
-        const page = element.current;
-
-        if (!page) {
-            console.error('[useredit] Unexpected null page reference');
-            return;
-        }
-
-        if (userDto && isAuthProvidersSuccess && authProviders != null) {
-            loadAuthProviders(page, userDto, authProviders);
-        }
-    }, [authProviders, isAuthProvidersSuccess, userDto, loadAuthProviders]);
-
-    useEffect(() => {
-        const page = element.current;
-
-        if (!page) {
-            console.error('[useredit] Unexpected null page reference');
-            return;
-        }
-
-        if (userDto && isPasswordResetProvidersSuccess && passwordResetProviders != null) {
-            loadPasswordResetProviders(page, userDto, passwordResetProviders);
-        }
-    }, [passwordResetProviders, isPasswordResetProvidersSuccess, userDto, loadPasswordResetProviders]);
-
-    useEffect(() => {
-        const page = element.current;
-
-        if (!page) {
-            console.error('[useredit] Unexpected null page reference');
-            return;
-        }
-
-        if (userDto && isMediaFoldersSuccess && isChannelsSuccess && mediaFolders?.Items != null) {
-            loadDeleteFolders(page, userDto, mediaFolders.Items);
-        }
-    }, [userDto, mediaFolders, isMediaFoldersSuccess, isChannelsSuccess, channels, loadDeleteFolders]);
-
-    useEffect(() => {
-        const page = element.current;
-
-        if (!page) {
-            console.error('[useredit] Unexpected null page reference');
-            return;
-        }
-
-        if (netConfig && isNetConfigSuccess) {
-            (page.querySelector('.fldRemoteAccess') as HTMLDivElement).classList.toggle('hide', !netConfig.EnableRemoteAccess);
-        }
-    }, [netConfig, isNetConfigSuccess]);
+            const chkEnableDeleteAllFolders = page.querySelector('.chkEnableDeleteAllFolders') as HTMLInputElement;
+            chkEnableDeleteAllFolders.checked = user.Policy?.EnableContentDeletion || false;
+            triggerChange(chkEnableDeleteAllFolders);
+        }).catch(err => {
+            console.error('[useredit] failed to fetch channels', err);
+        });
+    }, []);
 
     const loadUser = useCallback((user: UserDto) => {
         const page = element.current;
@@ -166,6 +112,24 @@ const UserEdit = () => {
             return;
         }
 
+        window.ApiClient.getJSON(window.ApiClient.getUrl('Auth/Providers')).then(function (providers) {
+            loadAuthProviders(page, user, providers);
+        }).catch(err => {
+            console.error('[useredit] failed to fetch auth providers', err);
+        });
+        window.ApiClient.getJSON(window.ApiClient.getUrl('Auth/PasswordResetProviders')).then(function (providers) {
+            loadPasswordResetProviders(page, user, providers);
+        }).catch(err => {
+            console.error('[useredit] failed to fetch password reset providers', err);
+        });
+        window.ApiClient.getJSON(window.ApiClient.getUrl('Library/MediaFolders', {
+            IsHidden: false
+        })).then(function (folders) {
+            loadDeleteFolders(page, user, folders.Items);
+        }).catch(err => {
+            console.error('[useredit] failed to fetch media folders', err);
+        });
+
         const disabledUserBanner = page.querySelector('.disabledUserBanner') as HTMLDivElement;
         disabledUserBanner.classList.toggle('hide', !user.Policy?.IsDisabled);
 
@@ -175,6 +139,7 @@ const UserEdit = () => {
 
         void libraryMenu.then(menu => menu.setTitle(user.Name));
 
+        setUserDto(user);
         (page.querySelector('#txtUserName') as HTMLInputElement).value = user.Name || '';
         (page.querySelector('.chkIsAdmin') as HTMLInputElement).checked = !!user.Policy?.IsAdministrator;
         (page.querySelector('.chkDisabled') as HTMLInputElement).checked = !!user.Policy?.IsDisabled;
@@ -198,22 +163,16 @@ const UserEdit = () => {
         (page.querySelector('#txtMaxActiveSessions') as HTMLInputElement).value = String(user.Policy?.MaxActiveSessions) || '0';
         (page.querySelector('#selectSyncPlayAccess') as HTMLSelectElement).value = String(user.Policy?.SyncPlayAccess);
         loading.hide();
-    }, [ libraryMenu ]);
+    }, [loadAuthProviders, loadPasswordResetProviders, loadDeleteFolders ]);
 
     const loadData = useCallback(() => {
-        if (!userDto) {
-            console.error('[profile] No user available');
-            return;
-        }
         loading.show();
-        loadUser(userDto);
-    }, [userDto, loadUser]);
-
-    useEffect(() => {
-        if (isUserSuccess) {
-            loadData();
-        }
-    }, [loadData, isUserSuccess]);
+        getUser().then(function (user) {
+            loadUser(user);
+        }).catch(err => {
+            console.error('[useredit] failed to load data', err);
+        });
+    }, [loadUser]);
 
     useEffect(() => {
         const page = element.current;
@@ -223,6 +182,8 @@ const UserEdit = () => {
             return;
         }
 
+        loadData();
+
         const saveUser = (user: UserDto) => {
             if (!user.Id || !user.Policy) {
                 throw new Error('Unexpected null user id or policy');
@@ -254,58 +215,53 @@ const UserEdit = () => {
             user.Policy.EnableContentDeletionFromFolders = user.Policy.EnableContentDeletion ? [] : getCheckedElementDataIds(page.querySelectorAll('.chkFolder'));
             user.Policy.SyncPlayAccess = (page.querySelector('#selectSyncPlayAccess') as HTMLSelectElement).value as SyncPlayUserAccessType;
 
-            updateUser.mutate({ userId: user.Id, userDto: user }, {
-                onSuccess: () => {
-                    if (user.Id) {
-                        updateUserPolicy.mutate({
-                            userId: user.Id,
-                            userPolicy: user.Policy || { PasswordResetProviderId: '', AuthenticationProviderId: '' }
-                        }, {
-                            onSuccess: () => {
-                                loading.hide();
-                                navigate('/dashboard/users', {
-                                    state: { openSavedToast: true }
-                                });
-                            }
-                        });
-                    }
-                }
+            window.ApiClient.updateUser(user).then(() => (
+                window.ApiClient.updateUserPolicy(user.Id || '', user.Policy || { PasswordResetProviderId: '', AuthenticationProviderId: '' })
+            )).then(() => {
+                navigate('/dashboard/users', {
+                    state: { openSavedToast: true }
+                });
+                loading.hide();
+            }).catch(err => {
+                console.error('[useredit] failed to update user', err);
             });
         };
 
         const onSubmit = (e: Event) => {
             loading.show();
-            if (userDto) {
-                saveUser(userDto);
-            }
+            getUser().then(function (result) {
+                saveUser(result);
+            }).catch(err => {
+                console.error('[useredit] failed to fetch user', err);
+            });
             e.preventDefault();
             e.stopPropagation();
             return false;
         };
 
-        const onBtnCancelClick = () => {
-            window.history.back();
-        };
-
         (page.querySelector('.chkEnableDeleteAllFolders') as HTMLInputElement).addEventListener('change', function (this: HTMLInputElement) {
             (page.querySelector('.deleteAccess') as HTMLDivElement).classList.toggle('hide', this.checked);
         });
 
+        window.ApiClient.getNamedConfiguration('network').then(function (config) {
+            (page.querySelector('.fldRemoteAccess') as HTMLDivElement).classList.toggle('hide', !config.EnableRemoteAccess);
+        }).catch(err => {
+            console.error('[useredit] failed to load network config', err);
+        });
+
         (page.querySelector('.editUserProfileForm') as HTMLFormElement).addEventListener('submit', onSubmit);
-        (page.querySelector('#btnCancel') as HTMLButtonElement).addEventListener('click', onBtnCancelClick);
 
-        return () => {
-            (page.querySelector('.editUserProfileForm') as HTMLFormElement).removeEventListener('submit', onSubmit);
-            (page.querySelector('#btnCancel') as HTMLButtonElement).removeEventListener('click', onBtnCancelClick);
-        };
-    }, [loadData, updateUser, userDto, updateUserPolicy, navigate]);
+        (page.querySelector('#btnCancel') as HTMLButtonElement).addEventListener('click', function() {
+            window.history.back();
+        });
+    }, [loadData]);
 
-    const optionLoginProvider = authProviders?.map((provider) => {
+    const optionLoginProvider = authProviders.map((provider) => {
         const selected = provider.Id === authenticationProviderId || authProviders.length < 2 ? ' selected' : '';
         return `<option value="${provider.Id}"${selected}>${escapeHTML(provider.Name)}</option>`;
     });
 
-    const optionPasswordResetProvider = passwordResetProviders?.map((provider) => {
+    const optionPasswordResetProvider = passwordResetProviders.map((provider) => {
         const selected = provider.Id === passwordResetProviderId || passwordResetProviders.length < 2 ? ' selected' : '';
         return `<option value="${provider.Id}"${selected}>${escapeHTML(provider.Name)}</option>`;
     });

src/apps/experimental/components/AppToolbar/userViews/UserViewNav.tsx

@@ -3,7 +3,6 @@ import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collec
 import ArrowDropDown from '@mui/icons-material/ArrowDropDown';
 import Favorite from '@mui/icons-material/Favorite';
 import Button from '@mui/material/Button/Button';
-import Icon from '@mui/material/Icon';
 import { Theme } from '@mui/material/styles';
 import useMediaQuery from '@mui/material/useMediaQuery';
 import React, { useCallback, useMemo, useState } from 'react';
@@ -16,7 +15,6 @@ import { appRouter } from 'components/router/appRouter';
 import { useApi } from 'hooks/useApi';
 import useCurrentTab from 'hooks/useCurrentTab';
 import { useUserViews } from 'hooks/useUserViews';
-import { useWebConfig } from 'hooks/useWebConfig';
 import globalize from 'lib/globalize';
 
 import UserViewsMenu from './UserViewsMenu';
@@ -58,19 +56,14 @@ const UserViewNav = () => {
     const libraryId = searchParams.get('topParentId') || searchParams.get('parentId');
     const collectionType = searchParams.get('collectionType');
     const { activeTab } = useCurrentTab();
-    const webConfig = useWebConfig();
 
     const isExtraLargeScreen = useMediaQuery((t: Theme) => t.breakpoints.up('xl'));
     const isLargeScreen = useMediaQuery((t: Theme) => t.breakpoints.up('lg'));
     const maxViews = useMemo(() => {
-        let _maxViews = MAX_USER_VIEWS_MD;
-        if (isExtraLargeScreen) _maxViews = MAX_USER_VIEWS_XL;
-        else if (isLargeScreen) _maxViews = MAX_USER_VIEWS_LG;
-
-        const customLinks = (webConfig.menuLinks || []).length;
-
-        return _maxViews - customLinks;
-    }, [ isExtraLargeScreen, isLargeScreen, webConfig.menuLinks ]);
+        if (isExtraLargeScreen) return MAX_USER_VIEWS_XL;
+        if (isLargeScreen) return MAX_USER_VIEWS_LG;
+        return MAX_USER_VIEWS_MD;
+    }, [ isExtraLargeScreen, isLargeScreen ]);
 
     const { user } = useApi();
     const {
@@ -115,21 +108,6 @@ const UserViewNav = () => {
                 {globalize.translate(MetaView.Favorites.Name)}
             </Button>
 
-            {webConfig.menuLinks?.map(link => (
-                <Button
-                    key={link.name}
-                    variant='text'
-                    color='inherit'
-                    startIcon={<Icon>{link.icon || 'link'}</Icon>}
-                    component='a'
-                    href={link.url}
-                    target='_blank'
-                    rel='noopener noreferrer'
-                >
-                    {link.name}
-                </Button>
-            ))}
-
             {primaryViews?.map(view => (
                 <Button
                     key={view.Id}

src/apps/experimental/components/library/ItemsView.tsx

@@ -9,7 +9,6 @@ import useMediaQuery from '@mui/material/useMediaQuery';
 import classNames from 'classnames';
 import React, { type FC, useCallback } from 'react';
 
-import { ItemAction } from 'constants/itemAction';
 import { useApi } from 'hooks/useApi';
 import { useLocalStorage } from 'hooks/useLocalStorage';
 import { useGetItemsViewByType } from 'hooks/useFetchItems';
@@ -100,7 +99,7 @@ const ItemsView: FC<ItemsViewProps> = ({
 
         if (viewType === LibraryTab.Songs) {
             listOptions.showParentTitle = true;
-            listOptions.action = ItemAction.PlayAllFromHere;
+            listOptions.action = 'playallfromhere';
             listOptions.smallIcon = true;
             listOptions.showArtist = true;
             listOptions.addToListButton = true;

src/apps/experimental/components/library/ProgramsSectionView.tsx

@@ -1,16 +1,14 @@
 import React, { type FC } from 'react';
-
-import NoItemsMessage from 'components/common/NoItemsMessage';
-import SectionContainer from 'components/common/SectionContainer';
-import Loading from 'components/loading/LoadingComponent';
-import { appRouter } from 'components/router/appRouter';
-import { ItemAction } from 'constants/itemAction';
 import { useApi } from 'hooks/useApi';
 import { useGetProgramsSectionsWithItems, useGetTimers } from 'hooks/useFetchItems';
+import { appRouter } from 'components/router/appRouter';
 import globalize from 'lib/globalize';
+import Loading from 'components/loading/LoadingComponent';
+import NoItemsMessage from 'components/common/NoItemsMessage';
+import SectionContainer from 'components/common/SectionContainer';
+import { CardShape } from 'utils/card';
 import type { ParentId } from 'types/library';
 import type { Section, SectionType } from 'types/sections';
-import { CardShape } from 'utils/card';
 
 interface ProgramsSectionViewProps {
     parentId: ParentId;
@@ -94,7 +92,7 @@ const ProgramsSectionView: FC<ProgramsSectionViewProps> = ({
                         showChannelName: false,
                         cardLayout: true,
                         centerText: false,
-                        action: ItemAction.Edit,
+                        action: 'edit',
                         cardFooterAside: 'none',
                         preferThumb: true,
                         coverImage: true,

src/apps/experimental/features/details/components/buttons/PlayOrResumeButton.tsx

@@ -4,7 +4,6 @@ import PlayArrowIcon from '@mui/icons-material/PlayArrow';
 import ReplayIcon from '@mui/icons-material/Replay';
 import { useQueryClient } from '@tanstack/react-query';
 
-import { ItemAction } from 'constants/itemAction';
 import { useApi } from 'hooks/useApi';
 import { getChannelQuery } from 'hooks/api/liveTvHooks/useGetChannel';
 import globalize from 'lib/globalize';
@@ -77,7 +76,7 @@ const PlayOrResumeButton: FC<PlayOrResumeButtonProps> = ({
     return (
         <IconButton
             className='button-flat btnPlayOrResume'
-            data-action={isResumable ? ItemAction.Resume : ItemAction.Play}
+            data-action={isResumable ? 'resume' : 'play'}
             title={
                 isResumable ?
                     globalize.translate('ButtonResume') :

src/apps/experimental/features/preferences/components/DisplayPreferences.tsx

@@ -12,7 +12,6 @@ import React, { Fragment } from 'react';
 
 import { appHost } from 'components/apphost';
 import { AppFeature } from 'constants/appFeature';
-import { LayoutMode } from 'constants/layoutMode';
 import { useApi } from 'hooks/useApi';
 import { useThemes } from 'hooks/useThemes';
 import globalize from 'lib/globalize';
@@ -46,10 +45,11 @@ export function DisplayPreferences({ onChange, values }: Readonly<DisplayPrefere
                         onChange={onChange}
                         value={values.layout}
                     >
-                        <MenuItem value={LayoutMode.Auto}>{globalize.translate('Auto')}</MenuItem>
-                        <MenuItem value={LayoutMode.Desktop}>{globalize.translate('Desktop')}</MenuItem>
-                        <MenuItem value={LayoutMode.Mobile}>{globalize.translate('Mobile')}</MenuItem>
-                        <MenuItem value={LayoutMode.Tv}>{globalize.translate('TV')}</MenuItem>
+                        <MenuItem value='auto'>{globalize.translate('Auto')}</MenuItem>
+                        <MenuItem value='desktop'>{globalize.translate('Desktop')}</MenuItem>
+                        <MenuItem value='mobile'>{globalize.translate('Mobile')}</MenuItem>
+                        <MenuItem value='tv'>{globalize.translate('TV')}</MenuItem>
+                        <MenuItem value='experimental'>{globalize.translate('Experimental')}</MenuItem>
                     </Select>
                     <FormHelperText component={Stack} id='display-settings-layout-description'>
                         <span>{globalize.translate('DisplayModeHelp')}</span>
@@ -169,30 +169,6 @@ export function DisplayPreferences({ onChange, values }: Readonly<DisplayPrefere
                 </Fragment>
             ) }
 
-            <FormControl fullWidth>
-                <TextField
-                    aria-describedby='display-settings-slideshow-interval-description'
-                    value={values.slideshowInterval}
-                    label={globalize.translate('LabelSlideshowInterval')}
-                    name='slideshowInterval'
-                    onChange={onChange}
-                    slotProps={{
-                        htmlInput: {
-                            inputMode: 'numeric',
-                            max: '3600',
-                            min: '1',
-                            pattern: '[0-9]',
-                            required: true,
-                            step: '1',
-                            type: 'number'
-                        }
-                    }}
-                />
-                <FormHelperText id='display-settings-slideshow-interval-description'>
-                    {globalize.translate('LabelSlideshowIntervalHelp')}
-                </FormHelperText>
-            </FormControl>
-
             <FormControl fullWidth>
                 <FormControlLabel
                     aria-describedby='display-settings-faster-animations-description'

src/apps/experimental/features/preferences/hooks/useDisplaySettings.ts

@@ -10,9 +10,6 @@ import themeManager from 'scripts/themeManager';
 import { currentSettings, UserSettings } from 'scripts/settings/userSettings';
 
 import type { DisplaySettingsValues } from '../types/displaySettingsValues';
-import { useThemes } from 'hooks/useThemes';
-import { Theme } from 'types/webConfig';
-import { FALLBACK_THEME_ID } from 'hooks/useUserTheme';
 
 interface UseDisplaySettingsParams {
     userId?: string | null;
@@ -23,7 +20,6 @@ export function useDisplaySettings({ userId }: UseDisplaySettingsParams) {
     const [userSettings, setUserSettings] = useState<UserSettings>();
     const [displaySettings, setDisplaySettings] = useState<DisplaySettingsValues>();
     const { __legacyApiClient__, user: currentUser } = useApi();
-    const { defaultTheme } = useThemes();
 
     useEffect(() => {
         if (!userId || !currentUser || !__legacyApiClient__) {
@@ -33,7 +29,7 @@ export function useDisplaySettings({ userId }: UseDisplaySettingsParams) {
         setLoading(true);
 
         void (async () => {
-            const loadedSettings = await loadDisplaySettings({ api: __legacyApiClient__, currentUser, userId, defaultTheme });
+            const loadedSettings = await loadDisplaySettings({ api: __legacyApiClient__, currentUser, userId });
 
             setDisplaySettings(loadedSettings.displaySettings);
             setUserSettings(loadedSettings.userSettings);
@@ -66,17 +62,15 @@ export function useDisplaySettings({ userId }: UseDisplaySettingsParams) {
 }
 
 interface LoadDisplaySettingsParams {
-    currentUser: UserDto
-    userId?: string
-    api: ApiClient
-    defaultTheme?: Theme
+    currentUser: UserDto;
+    userId?: string;
+    api: ApiClient;
 }
 
 async function loadDisplaySettings({
     currentUser,
     userId,
-    api,
-    defaultTheme
+    api
 }: LoadDisplaySettingsParams) {
     const settings = (!userId || userId === currentUser?.Id) ? currentSettings : new UserSettings();
     const user = (!userId || userId === currentUser?.Id) ? currentUser : await api.getUser(userId);
@@ -84,8 +78,8 @@ async function loadDisplaySettings({
     await settings.setUserInfo(userId, api);
 
     const displaySettings = {
-        customCss: settings.customCss() || '',
-        dashboardTheme: settings.dashboardTheme() || defaultTheme?.id || FALLBACK_THEME_ID,
+        customCss: settings.customCss(),
+        dashboardTheme: settings.dashboardTheme() || 'auto',
         dateTimeLocale: settings.dateTimeLocale() || 'auto',
         disableCustomCss: Boolean(settings.disableCustomCss()),
         displayMissingEpisodes: user?.Configuration?.DisplayMissingEpisodes ?? false,
@@ -103,8 +97,7 @@ async function loadDisplaySettings({
         maxDaysForNextUp: settings.maxDaysForNextUp(),
         screensaver: settings.screensaver() || 'none',
         screensaverInterval: settings.backdropScreensaverInterval(),
-        slideshowInterval: settings.slideshowInterval(),
-        theme: settings.theme() || defaultTheme?.id || FALLBACK_THEME_ID
+        theme: settings.theme()
     };
 
     return {
@@ -132,7 +125,7 @@ async function saveDisplaySettings({
         userSettings.language(normalizeValue(newDisplaySettings.language));
     }
     userSettings.customCss(normalizeValue(newDisplaySettings.customCss));
-    userSettings.dashboardTheme(newDisplaySettings.dashboardTheme);
+    userSettings.dashboardTheme(normalizeValue(newDisplaySettings.dashboardTheme));
     userSettings.dateTimeLocale(normalizeValue(newDisplaySettings.dateTimeLocale));
     userSettings.disableCustomCss(newDisplaySettings.disableCustomCss);
     userSettings.enableBlurhash(newDisplaySettings.enableBlurHash);

src/apps/experimental/features/preferences/types/displaySettingsValues.ts

@@ -18,6 +18,5 @@ export interface DisplaySettingsValues {
     maxDaysForNextUp: number;
     screensaver: string;
     screensaverInterval: number;
-    slideshowInterval: number;
     theme: string;
 }

src/apps/stable/features/playback/utils/mediaSessionSubscriber.ts

@@ -51,20 +51,19 @@ class MediaSessionSubscriber extends PlaybackSubscriber {
     }
 
     private bindNavigatorSession() {
-        const actions: MediaSessionAction[] = ['pause', 'play', 'previoustrack', 'nexttrack', 'stop', 'seekto'];
-
+        /* eslint-disable compat/compat */
+        navigator.mediaSession.setActionHandler('pause', this.onMediaSessionAction.bind(this));
+        navigator.mediaSession.setActionHandler('play', this.onMediaSessionAction.bind(this));
+        navigator.mediaSession.setActionHandler('stop', this.onMediaSessionAction.bind(this));
+        navigator.mediaSession.setActionHandler('previoustrack', this.onMediaSessionAction.bind(this));
+        navigator.mediaSession.setActionHandler('nexttrack', this.onMediaSessionAction.bind(this));
+        navigator.mediaSession.setActionHandler('seekto', this.onMediaSessionAction.bind(this));
         // iOS will only show next/prev track controls or seek controls
-        if (!browser.iOS) actions.push('seekbackward', 'seekforward');
-
-        for (const action of actions) {
-            try {
-                /* eslint-disable-next-line compat/compat */
-                navigator.mediaSession.setActionHandler(action, this.onMediaSessionAction.bind(this));
-            } catch (err) {
-                // NOTE: Some legacy (TV) browsers lack support for the stop and seekto actions
-                console.warn(`[MediaSessionSubscriber] Failed to add "${action}" action handler`, err);
-            }
+        if (!browser.iOS) {
+            navigator.mediaSession.setActionHandler('seekbackward', this.onMediaSessionAction.bind(this));
+            navigator.mediaSession.setActionHandler('seekforward', this.onMediaSessionAction.bind(this));
         }
+        /* eslint-enable compat/compat */
     }
 
     private onMediaSessionAction(details: MediaSessionActionDetails) {

src/apps/stable/features/playback/utils/playbackSubscriber.ts

@@ -78,14 +78,12 @@ export abstract class PlaybackSubscriber {
     constructor(
         protected readonly playbackManager: PlaybackManager
     ) {
-        // Bind player events before invoking any player change handlers
-        Events.on(playbackManager, PlaybackManagerEvent.PlayerChange, this.bindPlayerEvents.bind(this));
-
         Object.entries(this.playbackManagerEvents).forEach(([event, handler]) => {
             if (handler) Events.on(playbackManager, event, handler);
         });
 
         this.bindPlayerEvents();
+        Events.on(playbackManager, PlaybackManagerEvent.PlayerChange, this.bindPlayerEvents.bind(this));
     }
 
     private bindPlayerEvents() {

src/apps/stable/routes/user/userprofile.tsx

@@ -1,25 +1,23 @@
 import type { UserDto } from '@jellyfin/sdk/lib/generated-client';
 import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
-import React, { FunctionComponent, useEffect, useRef, useCallback, useMemo } from 'react';
+import React, { FunctionComponent, useEffect, useState, useRef, useCallback, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 import Dashboard from '../../../../utils/dashboard';
 import globalize from '../../../../lib/globalize';
 import { appHost } from '../../../../components/apphost';
 import confirm from '../../../../components/confirm/confirm';
+import Button from '../../../../elements/emby-button/Button';
+import UserPasswordForm from '../../../../components/dashboard/users/UserPasswordForm';
+import loading from '../../../../components/loading/loading';
 import toast from '../../../../components/toast/toast';
-import { useUser } from 'apps/dashboard/features/users/api/useUser';
-import loading from 'components/loading/loading';
-import { queryClient } from 'utils/query/queryClient';
-import UserPasswordForm from 'components/dashboard/users/UserPasswordForm';
-import Page from 'components/Page';
-import Loading from 'components/loading/LoadingComponent';
-import Button from 'elements/emby-button/Button';
+import Page from '../../../../components/Page';
+import { AppFeature } from 'constants/appFeature';
 
 const UserProfile: FunctionComponent = () => {
     const [ searchParams ] = useSearchParams();
     const userId = searchParams.get('userId');
-    const { data: user, isPending: isUserPending } = useUser(userId ? { userId: userId } : undefined);
+    const [ userName, setUserName ] = useState('');
     const libraryMenu = useMemo(async () => ((await import('../../../../scripts/libraryMenu')).default), []);
 
     const element = useRef<HTMLDivElement>(null);
@@ -32,38 +30,50 @@ const UserProfile: FunctionComponent = () => {
             return;
         }
 
-        if (!user?.Name || !user?.Id) {
-            throw new Error('Unexpected null user name or id');
+        if (!userId) {
+            console.error('[userprofile] missing user id');
+            return;
         }
 
-        void libraryMenu.then(menu => menu.setTitle(user.Name));
-
-        let imageUrl = 'assets/img/avatar.png';
-        if (user.PrimaryImageTag) {
-            imageUrl = window.ApiClient.getUserImageUrl(user.Id, {
-                tag: user.PrimaryImageTag,
-                type: 'Primary'
-            });
-        }
-        const userImage = (page.querySelector('#image') as HTMLDivElement);
-        userImage.style.backgroundImage = 'url(' + imageUrl + ')';
-
-        Dashboard.getCurrentUser().then(function (loggedInUser: UserDto) {
-            if (!user.Policy) {
-                throw new Error('Unexpected null user.Policy');
+        loading.show();
+        window.ApiClient.getUser(userId).then(function (user) {
+            if (!user.Name || !user.Id) {
+                throw new Error('Unexpected null user name or id');
             }
 
+            setUserName(user.Name);
+            void libraryMenu.then(menu => menu.setTitle(user.Name));
+
+            let imageUrl = 'assets/img/avatar.png';
             if (user.PrimaryImageTag) {
-                (page.querySelector('#btnAddImage') as HTMLButtonElement).classList.add('hide');
-                (page.querySelector('#btnDeleteImage') as HTMLButtonElement).classList.remove('hide');
-            } else if (appHost.supports('fileinput') && (loggedInUser?.Policy?.IsAdministrator || user.Policy.EnableUserPreferenceAccess)) {
-                (page.querySelector('#btnDeleteImage') as HTMLButtonElement).classList.add('hide');
-                (page.querySelector('#btnAddImage') as HTMLButtonElement).classList.remove('hide');
+                imageUrl = window.ApiClient.getUserImageUrl(user.Id, {
+                    tag: user.PrimaryImageTag,
+                    type: 'Primary'
+                });
             }
+            const userImage = (page.querySelector('#image') as HTMLDivElement);
+            userImage.style.backgroundImage = 'url(' + imageUrl + ')';
+
+            Dashboard.getCurrentUser().then(function (loggedInUser: UserDto) {
+                if (!user.Policy) {
+                    throw new Error('Unexpected null user.Policy');
+                }
+
+                if (user.PrimaryImageTag) {
+                    (page.querySelector('#btnAddImage') as HTMLButtonElement).classList.add('hide');
+                    (page.querySelector('#btnDeleteImage') as HTMLButtonElement).classList.remove('hide');
+                } else if (appHost.supports(AppFeature.FileInput) && (loggedInUser?.Policy?.IsAdministrator || user.Policy.EnableUserPreferenceAccess)) {
+                    (page.querySelector('#btnDeleteImage') as HTMLButtonElement).classList.add('hide');
+                    (page.querySelector('#btnAddImage') as HTMLButtonElement).classList.remove('hide');
+                }
+            }).catch(err => {
+                console.error('[userprofile] failed to get current user', err);
+            });
+            loading.hide();
         }).catch(err => {
-            console.error('[userprofile] failed to get current user', err);
+            console.error('[userprofile] failed to load data', err);
         });
-    }, [user, libraryMenu]);
+    }, [userId]);
 
     useEffect(() => {
         const page = element.current;
@@ -115,9 +125,7 @@ const UserProfile: FunctionComponent = () => {
                 userImage.style.backgroundImage = 'url(' + reader.result + ')';
                 window.ApiClient.uploadUserImage(userId, ImageType.Primary, file).then(function () {
                     loading.hide();
-                    void queryClient.invalidateQueries({
-                        queryKey: ['User']
-                    });
+                    reloadUser();
                 }).catch(err => {
                     console.error('[userprofile] failed to upload image', err);
                 });
@@ -126,7 +134,7 @@ const UserProfile: FunctionComponent = () => {
             reader.readAsDataURL(file);
         };
 
-        const onDeleteImageClick = function () {
+        (page.querySelector('#btnDeleteImage') as HTMLButtonElement).addEventListener('click', function () {
             if (!userId) {
                 console.error('[userprofile] missing user id');
                 return;
@@ -139,41 +147,25 @@ const UserProfile: FunctionComponent = () => {
                 loading.show();
                 window.ApiClient.deleteUserImage(userId, ImageType.Primary).then(function () {
                     loading.hide();
-                    void queryClient.invalidateQueries({
-                        queryKey: ['User']
-                    });
+                    reloadUser();
                 }).catch(err => {
                     console.error('[userprofile] failed to delete image', err);
                 });
             }).catch(() => {
                 // confirm dialog closed
             });
-        };
+        });
 
-        const addImageClick = function () {
+        (page.querySelector('#btnAddImage') as HTMLButtonElement).addEventListener('click', function () {
             const uploadImage = page.querySelector('#uploadImage') as HTMLInputElement;
             uploadImage.value = '';
             uploadImage.click();
-        };
+        });
 
-        const onUploadImage = (e: Event) => {
-            setFiles(e);
-        };
-
-        (page.querySelector('#btnDeleteImage') as HTMLButtonElement).addEventListener('click', onDeleteImageClick);
-        (page.querySelector('#btnAddImage') as HTMLButtonElement).addEventListener('click', addImageClick);
-        (page.querySelector('#uploadImage') as HTMLInputElement).addEventListener('change', onUploadImage);
-
-        return () => {
-            (page.querySelector('#btnDeleteImage') as HTMLButtonElement).removeEventListener('click', onDeleteImageClick);
-            (page.querySelector('#btnAddImage') as HTMLButtonElement).removeEventListener('click', addImageClick);
-            (page.querySelector('#uploadImage') as HTMLInputElement).removeEventListener('change', onUploadImage);
-        };
-    }, [reloadUser, user, userId]);
-
-    if (isUserPending || !user) {
-        return <Loading />;
-    }
+        (page.querySelector('#uploadImage') as HTMLInputElement).addEventListener('change', function (evt: Event) {
+            setFiles(evt);
+        });
+    }, [reloadUser, userId]);
 
     return (
         <Page
@@ -203,7 +195,7 @@ const UserProfile: FunctionComponent = () => {
                     </div>
                     <div style={{ verticalAlign: 'top', margin: '1em 2em', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
                         <h2 className='username' style={{ margin: 0, fontSize: 'xx-large' }}>
-                            {user?.Name}
+                            {userName}
                         </h2>
                         <br />
                         <Button
@@ -221,7 +213,7 @@ const UserProfile: FunctionComponent = () => {
                     </div>
                 </div>
                 <UserPasswordForm
-                    user={user}
+                    userId={userId}
                 />
             </div>
         </Page>

src/assets/img/devices/titanos.svg

@@ -1,12 +0,0 @@
-<svg width="35" height="33" viewBox="0 0 35 33" fill="none" xmlns="http://www.w3.org/2000/svg">
-	<script xmlns="" />
-	<path
-		d="M0.0146346 0.593029L0.764804 3.57722C0.809995 3.75303 0.945568 3.88826 1.12633 3.92432L14.765 6.91753C15.1897 7.01219 15.5106 7.37733 15.5377 7.81459L16.6585 23.9031C16.6675 24.0158 16.7127 24.1195 16.7895 24.2006L17.133 24.5567C17.2233 24.6514 17.3454 24.7055 17.4764 24.7055C17.6075 24.7055 17.7295 24.6514 17.8199 24.5567L18.1633 24.2006C18.2401 24.1195 18.2853 24.0158 18.2944 23.9031L19.4151 7.81459C19.4467 7.38184 19.7631 7.01219 20.1879 6.91753L33.8265 3.92432C34.0027 3.88375 34.1428 3.75303 34.188 3.57722L34.9382 0.593029C34.9789 0.430747 34.9382 0.268465 34.8162 0.146753C34.6987 0.0250412 34.536 -0.0245451 34.3733 0.0115177L17.6843 3.66738C17.5442 3.69893 17.3996 3.69893 17.2595 3.66738L0.579521 0.0160255C0.543368 0.00250199 0.511735 0.00250199 0.475582 0.00250199C0.349047 0.00250199 0.227032 0.0520882 0.13665 0.146753C0.0191537 0.268465 -0.0260373 0.430747 0.0146346 0.593029Z"
-		fill="#fff" />
-	<path
-		d="M23.0349 32.301L23.8257 32.0936C23.9658 32.0576 24.0743 31.9494 24.0969 31.8096L27.7528 14.0397C27.8116 13.7062 28.0692 13.4357 28.4036 13.3545L31.7567 12.5476C31.8878 12.5161 31.9872 12.4169 32.0188 12.2862L32.8142 9.11267C32.8458 8.99095 32.8142 8.86474 32.7193 8.77458C32.6515 8.70696 32.5611 8.6709 32.4708 8.6709C32.4436 8.6709 32.412 8.6709 32.3849 8.67991L24.3319 10.6228C24.1782 10.6589 24.0698 10.7896 24.0607 10.9429L22.5965 31.9268C22.5875 32.0395 22.6327 32.1477 22.7231 32.2244C22.8089 32.2965 22.9264 32.3235 23.0394 32.2965L23.0349 32.301Z"
-		fill="#fff" />
-	<path
-		d="M10.996 10.6274L2.94297 8.68455C2.91586 8.67554 2.88422 8.67554 2.85711 8.67554C2.76221 8.67554 2.67635 8.7116 2.60856 8.77922C2.51818 8.86937 2.48654 8.99109 2.51366 9.11731L3.30902 12.2908C3.34065 12.4216 3.44007 12.5207 3.57113 12.5523L6.92429 13.3592C7.25871 13.4403 7.51629 13.7108 7.57504 14.0489L11.231 31.8053C11.2581 31.9495 11.362 32.0622 11.4976 32.0938L12.2975 32.3011C12.406 32.3282 12.5189 32.3011 12.6048 32.2245C12.6907 32.1524 12.7404 32.0442 12.7313 31.927L11.2671 10.943C11.2581 10.7852 11.1451 10.659 10.996 10.6229V10.6274Z"
-		fill="#fff" />
-</svg>

src/components/alert.js

@@ -1,12 +1,27 @@
 import { appRouter } from './router/appRouter';
+import browser from '../scripts/browser';
 import dialog from './dialog/dialog';
 import globalize from '../lib/globalize';
 
 export default async function (text, title) {
+    // Modals seem to be blocked on Web OS and Tizen 2.x
+    const canUseNativeAlert = !!(
+        !browser.web0s
+        && !(browser.tizenVersion && (browser.tizenVersion < 3 || browser.tizenVersion >= 8))
+        && browser.tv
+        && window.alert
+    );
+
     const options = typeof text === 'string' ? { title, text } : text;
 
     await appRouter.ready();
 
+    if (canUseNativeAlert) {
+        alert((options.text || '').replaceAll('<br/>', '\n'));
+
+        return Promise.resolve();
+    }
+
     options.buttons = [
         {
             name: globalize.translate('ButtonGotIt'),

src/components/apphost.js

@@ -6,14 +6,12 @@ import * as webSettings from '../scripts/settings/webSettings';
 import globalize from '../lib/globalize';
 import profileBuilder from '../scripts/browserDeviceProfile';
 import { AppFeature } from 'constants/appFeature';
-import { LayoutMode } from 'constants/layoutMode';
 
 const appName = 'Jellyfin Web';
 
 const BrowserName = {
     tizen: 'Samsung Smart TV',
     web0s: 'LG Smart TV',
-    titanos: 'Titan OS',
     operaTv: 'Opera TV',
     xboxOne: 'Xbox One',
     ps4: 'Sony PS4',
@@ -182,7 +180,7 @@ function supportsFullscreen() {
 }
 
 function getDefaultLayout() {
-    return LayoutMode.Experimental;
+    return 'desktop';
 }
 
 function supportsHtmlMediaAutoplay() {
@@ -372,7 +370,7 @@ export const appHost = {
 
         return getDefaultLayout();
     },
-    getDeviceProfile,
+    getDeviceProfile: getDeviceProfile,
     init: function () {
         if (window.NativeShell) {
             return window.NativeShell.AppHost.init();

src/components/backdrop/backdrop.js

@@ -12,7 +12,9 @@ function enableAnimation() {
 }
 
 function enableRotation() {
-    return !browser.tv;
+    return !browser.tv
+            // Causes high cpu usage
+            && !browser.firefox;
 }
 
 class Backdrop {
@@ -234,7 +236,7 @@ export function setBackdropImages(images) {
     currentRotationIndex = -1;
 
     if (images.length > 1 && enableRotation()) {
-        rotationInterval = setInterval(onRotationInterval, 10000);
+        rotationInterval = setInterval(onRotationInterval, 24000);
     }
 
     onRotationInterval();

src/components/cardbuilder/Card/CardBox.tsx

@@ -1,18 +1,17 @@
 import React, { type FC } from 'react';
-
 import layoutManager from 'components/layoutManager';
-import { ItemAction } from 'constants/itemAction';
-import { CardShape } from 'utils/card';
-import type { ItemDto } from 'types/base/models/item-dto';
-import type { CardOptions } from 'types/cardOptions';
 
 import CardOverlayButtons from './CardOverlayButtons';
 import CardHoverMenu from './CardHoverMenu';
 import CardOuterFooter from './CardOuterFooter';
 import CardContent from './CardContent';
+import { CardShape } from 'utils/card';
+
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
 
 interface CardBoxProps {
-    action: ItemAction;
+    action: string;
     item: ItemDto;
     cardOptions: CardOptions;
     className: string;

src/components/cardbuilder/Card/CardHoverMenu.tsx

@@ -2,14 +2,12 @@ import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
 import ButtonGroup from '@mui/material/ButtonGroup';
 import classNames from 'classnames';
-
 import { appRouter } from 'components/router/appRouter';
 import itemHelper from 'components/itemHelper';
 import { playbackManager } from 'components/playback/playbackmanager';
-import { ItemAction } from 'constants/itemAction';
+
 import PlayedButton from 'elements/emby-playstatebutton/PlayedButton';
 import FavoriteButton from 'elements/emby-ratingbutton/FavoriteButton';
-
 import PlayArrowIconButton from '../../common/PlayArrowIconButton';
 import MoreVertIconButton from '../../common/MoreVertIconButton';
 
@@ -17,7 +15,7 @@ import type { ItemDto } from 'types/base/models/item-dto';
 import type { CardOptions } from 'types/cardOptions';
 
 interface CardHoverMenuProps {
-    action: ItemAction,
+    action: string,
     item: ItemDto;
     cardOptions: CardOptions;
 }
@@ -31,7 +29,7 @@ const CardHoverMenu: FC<CardHoverMenuProps> = ({
         parentId: cardOptions.parentId
     });
     const btnCssClass =
-        'paper-icon-button-light cardOverlayButton cardOverlayButton-hover itemAction';
+		'paper-icon-button-light cardOverlayButton cardOverlayButton-hover itemAction';
 
     const centerPlayButtonClass = classNames(
         btnCssClass,
@@ -53,7 +51,7 @@ const CardHoverMenu: FC<CardHoverMenuProps> = ({
             {playbackManager.canPlay(item) && (
                 <PlayArrowIconButton
                     className={centerPlayButtonClass}
-                    action={ItemAction.Play}
+                    action='play'
                     title='Play'
                 />
             )}

src/components/cardbuilder/Card/CardOverlayButtons.tsx

@@ -2,17 +2,15 @@ import { LocationType } from '@jellyfin/sdk/lib/generated-client/models/location
 import React, { type FC } from 'react';
 import ButtonGroup from '@mui/material/ButtonGroup';
 import classNames from 'classnames';
-
 import { appRouter } from 'components/router/appRouter';
-import { ItemAction } from 'constants/itemAction';
+import PlayArrowIconButton from '../../common/PlayArrowIconButton';
+import MoreVertIconButton from '../../common/MoreVertIconButton';
+
 import { ItemKind } from 'types/base/models/item-kind';
 import { ItemMediaKind } from 'types/base/models/item-media-kind';
 import type { ItemDto } from 'types/base/models/item-dto';
 import type { CardOptions } from 'types/cardOptions';
 
-import PlayArrowIconButton from '../../common/PlayArrowIconButton';
-import MoreVertIconButton from '../../common/MoreVertIconButton';
-
 const sholudShowOverlayPlayButton = (
     overlayPlayButton: boolean | undefined,
     item: ItemDto
@@ -80,7 +78,7 @@ const CardOverlayButtons: FC<CardOverlayButtonsProps> = ({
             {cardOptions.centerPlayButton && (
                 <PlayArrowIconButton
                     className={centerPlayButtonClass}
-                    action={ItemAction.Play}
+                    action='play'
                     title='Play'
                 />
             )}
@@ -89,7 +87,7 @@ const CardOverlayButtons: FC<CardOverlayButtonsProps> = ({
                 {sholudShowOverlayPlayButton(overlayPlayButton, item) && (
                     <PlayArrowIconButton
                         className={btnCssClass}
-                        action={ItemAction.Play}
+                        action='play'
                         title='Play'
                     />
                 )}

src/components/cardbuilder/Card/CardText.tsx

@@ -1,8 +1,5 @@
 import React, { type FC } from 'react';
 import Box from '@mui/material/Box';
-
-import { ensureArray } from 'utils/array';
-
 import type { TextLine } from './cardHelper';
 
 interface CardTextProps {
@@ -10,33 +7,27 @@ interface CardTextProps {
     textLine: TextLine;
 }
 
-const SEPARATOR = ' / ';
-
 const CardText: FC<CardTextProps> = ({ className, textLine }) => {
     const { title, titleAction } = textLine;
+    // eslint-disable-next-line sonarjs/function-return-type
+    const renderCardText = () => {
+        if (titleAction) {
+            return (
+                <a
+                    className='itemAction textActionButton'
+                    href={titleAction.url}
+                    title={titleAction.title}
+                    {...titleAction.dataAttributes}
+                >
+                    {titleAction.title}
+                </a>
+            );
+        } else {
+            return title;
+        }
+    };
 
-    return (
-        <Box className={className}>
-            {titleAction ? (
-                ensureArray(titleAction).map((action, i, arr) => (
-                    <>
-                        <a
-                            className='itemAction textActionButton'
-                            href={action.url}
-                            title={action.title}
-                            {...action.dataAttributes}
-                        >
-                            {action.title}
-                        </a>
-                        {/* If there are more items, add the separator */}
-                        {(i < arr.length - 1) && SEPARATOR}
-                    </>
-                ))
-            ) : (
-                ensureArray(title).join(SEPARATOR)
-            )}
-        </Box>
-    );
+    return <Box className={className}>{renderCardText()}</Box>;
 };
 
 export default CardText;

src/components/cardbuilder/Card/cardHelper.ts

@@ -1,5 +1,4 @@
 import { Api } from '@jellyfin/sdk';
-import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import type { BaseItemPerson } from '@jellyfin/sdk/lib/generated-client/models/base-item-person';
 import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
 import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
@@ -7,14 +6,12 @@ import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
 import { appRouter } from 'components/router/appRouter';
 import layoutManager from 'components/layoutManager';
 import itemHelper from 'components/itemHelper';
-import { ItemAction } from 'constants/itemAction';
 import globalize from 'lib/globalize';
 import datetime from 'scripts/datetime';
 import { isUsingLiveTvNaming } from '../cardBuilderUtils';
 import { getDataAttributes } from 'utils/items';
 import { ItemKind } from 'types/base/models/item-kind';
 import { ItemMediaKind } from 'types/base/models/item-media-kind';
-import { ensureArray } from 'utils/array';
 
 import type { NullableNumber, NullableString } from 'types/base/common/shared/types';
 import type { ItemDto } from 'types/base/models/item-dto';
@@ -68,8 +65,8 @@ interface TextAction {
 }
 
 export interface TextLine {
-    title?: NullableString | string[];
-    titleAction?: TextAction | TextAction[];
+    title?: NullableString;
+    titleAction?: TextAction;
 }
 
 export function getTextActionButton(
@@ -89,7 +86,7 @@ export function getTextActionButton(
 
     const dataAttributes = getDataAttributes(
         {
-            action: ItemAction.Link,
+            action: 'link',
             itemServerId: serverId ?? item.ServerId,
             itemId: item.Id,
             itemChannelId: item.ChannelId,
@@ -213,25 +210,9 @@ function getParentTitle(
     item: ItemDto
 ) {
     if (isOuterFooter && item.AlbumArtists?.length) {
-        return item.AlbumArtists
-            .map(artist => {
-                const artistItem: ItemDto = {
-                    ...artist,
-                    Type: BaseItemKind.MusicArtist,
-                    IsFolder: true
-                };
-                return getTextActionButton(artistItem, null, serverId);
-            })
-            .reduce((acc, line) => ({
-                title: [
-                    ...ensureArray(acc.title),
-                    ...ensureArray(line.title)
-                ],
-                titleAction: [
-                    ...ensureArray(acc.titleAction),
-                    ...ensureArray(line.titleAction)
-                ]
-            }), {});
+        (item.AlbumArtists[0] as ItemDto).Type = ItemKind.MusicArtist;
+        (item.AlbumArtists[0] as ItemDto).IsFolder = true;
+        return getTextActionButton(item.AlbumArtists[0], null, serverId);
     } else {
         return {
             title: isUsingLiveTvNaming(item.Type) ?

src/components/cardbuilder/Card/useCard.ts

@@ -1,19 +1,17 @@
 import classNames from 'classnames';
-
-import layoutManager from 'components/layoutManager';
-import { ItemAction } from 'constants/itemAction';
-import { ItemKind } from 'types/base/models/item-kind';
-import { ItemMediaKind } from 'types/base/models/item-media-kind';
-import type { ItemDto } from 'types/base/models/item-dto';
-import type { CardOptions } from 'types/cardOptions';
-import { CardShape } from 'utils/card';
-import { getDataAttributes } from 'utils/items';
-
 import useCardImageUrl from './useCardImageUrl';
 import {
     resolveAction,
     resolveMixedShapeByAspectRatio
 } from '../cardBuilderUtils';
+import { getDataAttributes } from 'utils/items';
+import { CardShape } from 'utils/card';
+import layoutManager from 'components/layoutManager';
+
+import { ItemKind } from 'types/base/models/item-kind';
+import { ItemMediaKind } from 'types/base/models/item-media-kind';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { CardOptions } from 'types/cardOptions';
 
 interface UseCardProps {
     item: ItemDto;
@@ -22,7 +20,7 @@ interface UseCardProps {
 
 function useCard({ item, cardOptions }: UseCardProps) {
     const action = resolveAction({
-        defaultAction: cardOptions.action ?? ItemAction.Link,
+        defaultAction: cardOptions.action ?? 'link',
         isFolder: item.IsFolder ?? false,
         isPhoto: item.MediaType === ItemMediaKind.Photo
     });

src/components/cardbuilder/cardBuilder.js

@@ -8,7 +8,6 @@ import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-ite
 import { PersonKind } from '@jellyfin/sdk/lib/generated-client/models/person-kind';
 import escapeHtml from 'escape-html';
 
-import { ItemAction } from 'constants/itemAction';
 import browser from 'scripts/browser';
 import datetime from 'scripts/datetime';
 import dom from 'utils/dom';
@@ -515,7 +514,7 @@ function getCardFooterText(item, apiClient, options, footerClass, progressHtml,
     const showOtherText = flags.isOuterFooter ? !flags.overlayText : flags.overlayText;
 
     if (flags.isOuterFooter && options.cardLayout && layoutManager.mobile && options.cardFooterAside !== 'none') {
-        html += `<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="${ItemAction.Menu}" title="${globalize.translate('ButtonMore')}"><span class="material-icons more_vert" aria-hidden="true"></span></button>`;
+        html += `<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu" title="${globalize.translate('ButtonMore')}"><span class="material-icons more_vert" aria-hidden="true"></span></button>`;
     }
 
     const cssClass = options.centerText ? 'cardText cardTextCentered' : 'cardText';
@@ -576,14 +575,9 @@ function getCardFooterText(item, apiClient, options, footerClass, progressHtml,
     if (showOtherText) {
         if (options.showParentTitle && parentTitleUnderneath) {
             if (flags.isOuterFooter && item.AlbumArtists?.length) {
-                const artistText = item.AlbumArtists
-                    .map(artist => {
-                        artist.Type = BaseItemKind.MusicArtist;
-                        artist.IsFolder = true;
-                        return getTextActionButton(artist, null, serverId);
-                    })
-                    .join(' / ');
-                lines.push(artistText);
+                item.AlbumArtists[0].Type = 'MusicArtist';
+                item.AlbumArtists[0].IsFolder = true;
+                lines.push(getTextActionButton(item.AlbumArtists, null, serverId));
             } else {
                 lines.push(escapeHtml(isUsingLiveTvNaming(item.Type) ? item.Name : (item.SeriesName || item.Series || item.Album || item.AlbumArtist || '')));
             }
@@ -777,7 +771,7 @@ function getTextActionButton(item, text, serverId) {
     }
 
     const url = appRouter.getRouteUrl(item);
-    let html = '<a href="' + url + '" ' + itemShortcuts.getShortcutAttributesHtml(item, serverId) + ' class="itemAction textActionButton" title="' + text + `" data-action="${ItemAction.Link}">`;
+    let html = '<a href="' + url + '" ' + itemShortcuts.getShortcutAttributesHtml(item, serverId) + ' class="itemAction textActionButton" title="' + text + '" data-action="link">';
     html += text;
     html += '</a>';
 
@@ -886,7 +880,7 @@ function importRefreshIndicator() {
  */
 function buildCard(index, item, apiClient, options) {
     const action = resolveAction({
-        defaultAction: options.action || ItemAction.Link,
+        defaultAction: options.action || 'link',
         isFolder: item.IsFolder,
         isPhoto: item.MediaType === 'Photo'
     });
@@ -986,15 +980,15 @@ function buildCard(index, item, apiClient, options) {
         const btnCssClass = 'cardOverlayButton cardOverlayButton-br itemAction';
 
         if (options.centerPlayButton) {
-            overlayButtons += `<button is="paper-icon-button-light" class="${btnCssClass} cardOverlayButton-centered" data-action="${ItemAction.Play}" title="${globalize.translate('Play')}"><span class="material-icons cardOverlayButtonIcon play_arrow" aria-hidden="true"></span></button>`;
+            overlayButtons += `<button is="paper-icon-button-light" class="${btnCssClass} cardOverlayButton-centered" data-action="play" title="${globalize.translate('Play')}"><span class="material-icons cardOverlayButtonIcon play_arrow" aria-hidden="true"></span></button>`;
         }
 
         if (overlayPlayButton && !item.IsPlaceHolder && (item.LocationType !== 'Virtual' || !item.MediaType || item.Type === 'Program') && item.Type !== 'Person') {
-            overlayButtons += `<button is="paper-icon-button-light" class="${btnCssClass}" data-action="${ItemAction.Play}" title="${globalize.translate('Play')}"><span class="material-icons cardOverlayButtonIcon play_arrow" aria-hidden="true"></span></button>`;
+            overlayButtons += `<button is="paper-icon-button-light" class="${btnCssClass}" data-action="play" title="${globalize.translate('Play')}"><span class="material-icons cardOverlayButtonIcon play_arrow" aria-hidden="true"></span></button>`;
         }
 
         if (options.overlayMoreButton) {
-            overlayButtons += `<button is="paper-icon-button-light" class="${btnCssClass}" data-action="${ItemAction.Menu}" title="${globalize.translate('ButtonMore')}"><span class="material-icons cardOverlayButtonIcon more_vert" aria-hidden="true"></span></button>`;
+            overlayButtons += `<button is="paper-icon-button-light" class="${btnCssClass}" data-action="menu" title="${globalize.translate('ButtonMore')}"><span class="material-icons cardOverlayButtonIcon more_vert" aria-hidden="true"></span></button>`;
         }
     }
 
@@ -1157,7 +1151,7 @@ function getHoverMenuHtml(item, action) {
     const btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction paper-icon-button-light';
 
     if (playbackManager.canPlay(item)) {
-        html += `<button is="paper-icon-button-light" class="${btnCssClass} cardOverlayFab-primary" data-action="${ItemAction.Resume}"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover play_arrow" aria-hidden="true"></span></button>`;
+        html += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayFab-primary" data-action="resume"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover play_arrow" aria-hidden="true"></span></button>';
     }
 
     html += '<div class="cardOverlayButton-br flex">';
@@ -1166,17 +1160,17 @@ function getHoverMenuHtml(item, action) {
 
     if (itemHelper.canMarkPlayed(item)) {
         import('../../elements/emby-playstatebutton/emby-playstatebutton');
-        html += `<button is="emby-playstatebutton" type="button" data-action="${ItemAction.None}" class="${btnCssClass}" data-id="${item.Id}" data-serverid="${item.ServerId}" data-itemtype="${item.Type}" data-played="${userData.Played}"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check" aria-hidden="true"></span></button>`;
+        html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check" aria-hidden="true"></span></button>';
     }
 
     if (itemHelper.canRate(item)) {
         const likes = userData.Likes == null ? '' : userData.Likes;
 
         import('../../elements/emby-ratingbutton/emby-ratingbutton');
-        html += `<button is="emby-ratingbutton" type="button" data-action="${ItemAction.None}" class="${btnCssClass}" data-id="${item.Id}" data-serverid="${item.ServerId}" data-itemtype="${item.Type}" data-likes="${likes}" data-isfavorite="${userData.IsFavorite}"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite" aria-hidden="true"></span></button>`;
+        html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite" aria-hidden="true"></span></button>';
     }
 
-    html += `<button is="paper-icon-button-light" class="${btnCssClass}" data-action="${ItemAction.Menu}" title="${globalize.translate('ButtonMore')}"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover more_vert" aria-hidden="true"></span></button>`;
+    html += `<button is="paper-icon-button-light" class="${btnCssClass}" data-action="menu" title="${globalize.translate('ButtonMore')}"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover more_vert" aria-hidden="true"></span></button>`;
     html += '</div>';
     html += '</div>';
 

src/components/cardbuilder/cardBuilderUtils.test.ts

@@ -11,7 +11,6 @@ import {
     resolveCardImageContainerCssClasses,
     resolveMixedShapeByAspectRatio
 } from './cardBuilderUtils';
-import { ItemAction } from 'constants/itemAction';
 
 describe('getDesiredAspect', () => {
     test('"portrait" (case insensitive)', () => {
@@ -442,11 +441,11 @@ describe('isResizable', () => {
 });
 
 describe('resolveAction', () => {
-    test('default action', () => expect(resolveAction({ defaultAction: ItemAction.Link, isFolder: false, isPhoto: false })).toEqual(ItemAction.Link));
+    test('default action', () => expect(resolveAction({ defaultAction: 'link', isFolder: false, isPhoto: false })).toEqual('link'));
 
-    test('photo', () => expect(resolveAction({ defaultAction: ItemAction.Link, isFolder: false, isPhoto: true })).toEqual(ItemAction.Play));
+    test('photo', () => expect(resolveAction({ defaultAction: 'link', isFolder: false, isPhoto: true })).toEqual('play'));
 
-    test('default action is "play" and is folder', () => expect(resolveAction({ defaultAction: ItemAction.Play, isFolder: true, isPhoto: true })).toEqual(ItemAction.Link));
+    test('default action is "play" and is folder', () => expect(resolveAction({ defaultAction: 'play', isFolder: true, isPhoto: true })).toEqual('link'));
 });
 
 describe('resolveMixedShapeByAspectRatio', () => {

src/components/cardbuilder/cardBuilderUtils.ts

@@ -1,9 +1,7 @@
+import { CardShape } from '../../utils/card';
+import { randomInt } from '../../utils/number';
 import classNames from 'classnames';
 
-import { ItemAction } from 'constants/itemAction';
-import { CardShape } from 'utils/card';
-import { randomInt } from 'utils/number';
-
 const ASPECT_RATIOS = {
     portrait: (2 / 3),
     backdrop: (16 / 9),
@@ -22,12 +20,12 @@ export const isUsingLiveTvNaming = (itemType: string | null | undefined): boolea
  * Resolves Card action to display
  * @param opts options to determine the action to return
  */
-export const resolveAction = (opts: { defaultAction: ItemAction, isFolder: boolean, isPhoto: boolean }): ItemAction => {
-    if (opts.defaultAction === ItemAction.Play && opts.isFolder) {
+export const resolveAction = (opts: { defaultAction: string, isFolder: boolean, isPhoto: boolean }): string => {
+    if (opts.defaultAction === 'play' && opts.isFolder) {
         // If this hard-coding is ever removed make sure to test nested photo albums
-        return ItemAction.Link;
+        return 'link';
     } else if (opts.isPhoto) {
-        return ItemAction.Play;
+        return 'play';
     } else {
         return opts.defaultAction;
     }

src/components/common/InfoIconButton.tsx

@@ -1,8 +1,6 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import InfoIcon from '@mui/icons-material/Info';
-
-import { ItemAction } from 'constants/itemAction';
 import globalize from 'lib/globalize';
 
 interface InfoIconButtonProps {
@@ -13,7 +11,7 @@ const InfoIconButton: FC<InfoIconButtonProps> = ({ className }) => {
     return (
         <IconButton
             className={className}
-            data-action={ItemAction.Link}
+            data-action='link'
             title={globalize.translate('ButtonInfo')}
         >
             <InfoIcon />

src/components/common/MoreVertIconButton.tsx

@@ -1,8 +1,6 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
-
-import { ItemAction } from 'constants/itemAction';
 import globalize from 'lib/globalize';
 
 interface MoreVertIconButtonProps {
@@ -14,7 +12,7 @@ const MoreVertIconButton: FC<MoreVertIconButtonProps> = ({ className, iconClassN
     return (
         <IconButton
             className={className}
-            data-action={ItemAction.Menu}
+            data-action='menu'
             title={globalize.translate('ButtonMore')}
         >
             <MoreVertIcon className={iconClassName} />

src/components/common/PlayArrowIconButton.tsx

@@ -1,13 +1,11 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import PlayArrowIcon from '@mui/icons-material/PlayArrow';
-
-import { ItemAction } from 'constants/itemAction';
 import globalize from 'lib/globalize';
 
 interface PlayArrowIconButtonProps {
     className: string;
-    action: ItemAction;
+    action: string;
     title: string;
     iconClassName?: string;
 }

src/components/common/PlaylistAddIconButton.tsx

@@ -1,8 +1,6 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 import PlaylistAddIcon from '@mui/icons-material/PlaylistAdd';
-
-import { ItemAction } from 'constants/itemAction';
 import globalize from 'lib/globalize';
 
 interface PlaylistAddIconButtonProps {
@@ -13,7 +11,7 @@ const PlaylistAddIconButton: FC<PlaylistAddIconButtonProps> = ({ className }) =>
     return (
         <IconButton
             className={className}
-            data-action={ItemAction.AddToPlaylist}
+            data-action='addtoplaylist'
             title={globalize.translate('AddToPlaylist')}
         >
             <PlaylistAddIcon />

src/components/common/RightIconButtons.tsx

@@ -1,8 +1,6 @@
 import React, { type FC } from 'react';
 import IconButton from '@mui/material/IconButton';
 
-import { ItemAction } from 'constants/itemAction';
-
 interface RightIconButtonsProps {
     className?: string;
     id: string;
@@ -14,7 +12,7 @@ const RightIconButtons: FC<RightIconButtonsProps> = ({ className, id, title, ico
     return (
         <IconButton
             className={className}
-            data-action={ItemAction.Custom}
+            data-action='custom'
             data-customaction={id}
             title={title}
         >

src/components/confirm/confirm.ts

@@ -1,6 +1,7 @@
 import dialog from 'components/dialog/dialog';
 import { appRouter } from 'components/router/appRouter';
 import globalize from 'lib/globalize';
+import browser from 'scripts/browser';
 
 interface OptionItem {
     id: string,
@@ -17,7 +18,34 @@ interface ConfirmOptions {
     buttons?: OptionItem[]
 }
 
-async function confirm(options: string | ConfirmOptions, title: string = '') {
+function shouldUseNativeConfirm() {
+    // webOS seems to block modals
+    // Tizen 2.x seems to block modals
+    return !browser.web0s
+        && !(browser.tizenVersion && (browser.tizenVersion < 3 || browser.tizenVersion >= 8))
+        && browser.tv
+        && !!window.confirm;
+}
+
+async function nativeConfirm(options: string | ConfirmOptions) {
+    if (typeof options === 'string') {
+        options = {
+            text: options
+        } as ConfirmOptions;
+    }
+
+    const text = (options.text || '').replace(/<br\/>/g, '\n');
+    await appRouter.ready();
+    const result = window.confirm(text);
+
+    if (result) {
+        return Promise.resolve();
+    } else {
+        return Promise.reject(new Error('Confirm dialog rejected'));
+    }
+}
+
+async function customConfirm(options: string | ConfirmOptions, title: string = '') {
     if (typeof options === 'string') {
         options = {
             title,
@@ -52,4 +80,6 @@ async function confirm(options: string | ConfirmOptions, title: string = '') {
     });
 }
 
+const confirm = shouldUseNativeConfirm() ? nativeConfirm : customConfirm;
+
 export default confirm;

src/components/dashboard/users/UserPasswordForm.tsx

@@ -9,11 +9,12 @@ import Button from '../../../elements/emby-button/Button';
 import Input from '../../../elements/emby-input/Input';
 
 type IProps = {
-    user: UserDto
+    userId: string | null;
 };
 
-const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
+const UserPasswordForm: FunctionComponent<IProps> = ({ userId }: IProps) => {
     const element = useRef<HTMLDivElement>(null);
+    const user = useRef<UserDto>();
     const libraryMenu = useMemo(async () => ((await import('../../../scripts/libraryMenu')).default), []);
 
     const loadUser = useCallback(async () => {
@@ -24,16 +25,22 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
             return;
         }
 
+        if (!userId) {
+            console.error('[UserPasswordForm] missing user id');
+            return;
+        }
+
+        user.current = await window.ApiClient.getUser(userId);
         const loggedInUser = await Dashboard.getCurrentUser();
 
-        if (!user.Policy || !user.Configuration) {
+        if (!user.current.Policy || !user.current.Configuration) {
             throw new Error('Unexpected null user policy or configuration');
         }
 
-        (await libraryMenu).setTitle(user.Name);
+        (await libraryMenu).setTitle(user.current.Name);
 
-        if (user.HasConfiguredPassword) {
-            if (!user.Policy?.IsAdministrator) {
+        if (user.current.HasConfiguredPassword) {
+            if (!user.current.Policy?.IsAdministrator) {
                 (page.querySelector('#btnResetPassword') as HTMLDivElement).classList.remove('hide');
             }
             (page.querySelector('#fldCurrentPassword') as HTMLDivElement).classList.remove('hide');
@@ -42,7 +49,7 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
             (page.querySelector('#fldCurrentPassword') as HTMLDivElement).classList.add('hide');
         }
 
-        const canChangePassword = loggedInUser?.Policy?.IsAdministrator || user.Policy.EnableUserPreferenceAccess;
+        const canChangePassword = loggedInUser?.Policy?.IsAdministrator || user.current.Policy.EnableUserPreferenceAccess;
         (page.querySelector('.passwordSection') as HTMLDivElement).classList.toggle('hide', !canChangePassword);
 
         import('../../autoFocuser').then(({ default: autoFocuser }) => {
@@ -54,7 +61,7 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
         (page.querySelector('#txtCurrentPassword') as HTMLInputElement).value = '';
         (page.querySelector('#txtNewPassword') as HTMLInputElement).value = '';
         (page.querySelector('#txtNewPasswordConfirm') as HTMLInputElement).value = '';
-    }, [user, libraryMenu]);
+    }, [userId]);
 
     useEffect(() => {
         const page = element.current;
@@ -71,7 +78,7 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
         const onSubmit = (e: Event) => {
             if ((page.querySelector('#txtNewPassword') as HTMLInputElement).value != (page.querySelector('#txtNewPasswordConfirm') as HTMLInputElement).value) {
                 toast(globalize.translate('PasswordMatchError'));
-            } else if ((page.querySelector('#txtNewPassword') as HTMLInputElement).value == '' && user?.Policy?.IsAdministrator) {
+            } else if ((page.querySelector('#txtNewPassword') as HTMLInputElement).value == '' && user.current?.Policy?.IsAdministrator) {
                 toast(globalize.translate('PasswordMissingSaveError'));
             } else {
                 loading.show();
@@ -83,7 +90,7 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
         };
 
         const savePassword = () => {
-            if (!user.Id) {
+            if (!userId) {
                 console.error('[UserPasswordForm.savePassword] missing user id');
                 return;
             }
@@ -97,7 +104,7 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
                 currentPassword = '';
             }
 
-            window.ApiClient.updateUserPassword(user.Id, currentPassword, newPassword).then(function () {
+            window.ApiClient.updateUserPassword(userId, currentPassword, newPassword).then(function () {
                 loading.hide();
                 toast(globalize.translate('PasswordSaved'));
 
@@ -114,23 +121,26 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
         };
 
         const resetPassword = () => {
+            if (!userId) {
+                console.error('[UserPasswordForm.resetPassword] missing user id');
+                return;
+            }
+
             const msg = globalize.translate('PasswordResetConfirmation');
             confirm(msg, globalize.translate('ResetPassword')).then(function () {
                 loading.show();
-                if (user.Id) {
-                    window.ApiClient.resetUserPassword(user.Id).then(function () {
-                        loading.hide();
-                        Dashboard.alert({
-                            message: globalize.translate('PasswordResetComplete'),
-                            title: globalize.translate('ResetPassword')
-                        });
-                        loadUser().catch(err => {
-                            console.error('[UserPasswordForm] failed to load user', err);
-                        });
-                    }).catch(err => {
-                        console.error('[UserPasswordForm] failed to reset user password', err);
+                window.ApiClient.resetUserPassword(userId).then(function () {
+                    loading.hide();
+                    Dashboard.alert({
+                        message: globalize.translate('PasswordResetComplete'),
+                        title: globalize.translate('ResetPassword')
                     });
-                }
+                    loadUser().catch(err => {
+                        console.error('[UserPasswordForm] failed to load user', err);
+                    });
+                }).catch(err => {
+                    console.error('[UserPasswordForm] failed to reset user password', err);
+                });
             }).catch(() => {
                 // confirm dialog was closed
             });
@@ -138,12 +148,7 @@ const UserPasswordForm: FunctionComponent<IProps> = ({ user }: IProps) => {
 
         (page.querySelector('.updatePasswordForm') as HTMLFormElement).addEventListener('submit', onSubmit);
         (page.querySelector('#btnResetPassword') as HTMLButtonElement).addEventListener('click', resetPassword);
-
-        return () => {
-            (page.querySelector('.updatePasswordForm') as HTMLFormElement).removeEventListener('submit', onSubmit);
-            (page.querySelector('#btnResetPassword') as HTMLButtonElement).removeEventListener('click', resetPassword);
-        };
-    }, [loadUser, user]);
+    }, [loadUser, userId]);
 
     return (
         <div ref={element}>

src/components/directorybrowser/directorybrowser.js

@@ -11,6 +11,15 @@ import '../formdialog.scss';
 import '../../elements/emby-button/emby-button';
 import alert from '../alert';
 
+function getSystemInfo() {
+    return systemInfo ? Promise.resolve(systemInfo) : ApiClient.getPublicSystemInfo().then(
+        info => {
+            systemInfo = info;
+            return info;
+        }
+    );
+}
+
 function onDialogClosed() {
     loading.hide();
 }
@@ -74,14 +83,25 @@ function getItem(cssClass, type, path, name) {
     return html;
 }
 
-function getEditorHtml(options) {
+function getEditorHtml(options, systemInfo) {
     let html = '';
     html += '<div class="formDialogContent scrollY">';
     html += '<div class="dialogContentInner dialog-content-centered" style="padding-top:2em;">';
-    if (!options.pathReadOnly && options.instruction) {
-        const instruction = `${escapeHtml(options.instruction)}<br/><br/>`;
+    if (!options.pathReadOnly) {
+        const instruction = options.instruction ? `${escapeHtml(options.instruction)}<br/><br/>` : '';
         html += '<div class="infoBanner" style="margin-bottom:1.5em;">';
         html += instruction;
+        if (systemInfo.OperatingSystem.toLowerCase() === 'bsd') {
+            html += '<br/>';
+            html += '<br/>';
+            html += globalize.translate('MessageDirectoryPickerBSDInstruction');
+            html += '<br/>';
+        } else if (systemInfo.OperatingSystem.toLowerCase() === 'linux') {
+            html += '<br/>';
+            html += '<br/>';
+            html += globalize.translate('MessageDirectoryPickerLinuxInstruction');
+            html += '<br/>';
+        }
         html += '</div>';
     }
     html += '<form style="margin:auto;">';
@@ -103,6 +123,14 @@ function getEditorHtml(options) {
     if (!readOnlyAttribute) {
         html += '<div class="results paperList" style="max-height: 200px; overflow-y: auto;"></div>';
     }
+    if (options.enableNetworkSharePath) {
+        html += '<div class="inputContainer" style="margin-top:2em;">';
+        html += `<input is="emby-input" id="txtNetworkPath" type="text" label="${globalize.translate('LabelOptionalNetworkPath')}"/>`;
+        html += '<div class="fieldDescription">';
+        html += globalize.translate('LabelOptionalNetworkPathHelp', '<b>\\\\server</b>', '<b>\\\\192.168.1.101</b>');
+        html += '</div>';
+        html += '</div>';
+    }
     html += '<div class="formDialogFooter">';
     html += `<button is="emby-button" type="submit" class="raised button-submit block formDialogFooterItem">${globalize.translate('ButtonOk')}</button>`;
     html += '</div>';
@@ -181,10 +209,12 @@ function initEditor(content, options, fileOptions) {
 
     content.querySelector('form').addEventListener('submit', function(e) {
         if (options.callback) {
+            let networkSharePath = this.querySelector('#txtNetworkPath');
+            networkSharePath = networkSharePath ? networkSharePath.value : null;
             const path = this.querySelector('#txtDirectoryPickerPath').value;
-            validatePath(path, options.validateWriteable, ApiClient)
-                .then(options.callback(path))
-                .catch(() => { /* no-op */ });
+            validatePath(path, options.validateWriteable, ApiClient).then(
+                options.callback(path, networkSharePath)
+            ).catch(() => { /* no-op */ });
         }
         e.preventDefault();
         e.stopPropagation();
@@ -206,6 +236,7 @@ function getDefaultPath(options) {
     }
 }
 
+let systemInfo;
 class DirectoryBrowser {
     currentDialog;
 
@@ -220,8 +251,10 @@ class DirectoryBrowser {
         if (options.includeFiles != null) {
             fileOptions.includeFiles = options.includeFiles;
         }
-        getDefaultPath(options).then(
-            fetchedInitialPath => {
+        Promise.all([getSystemInfo(), getDefaultPath(options)]).then(
+            responses => {
+                const fetchedSystemInfo = responses[0];
+                const fetchedInitialPath = responses[1];
                 const dlg = dialogHelper.createDialog({
                     size: 'small',
                     removeOnClose: true,
@@ -239,7 +272,7 @@ class DirectoryBrowser {
                 html += escapeHtml(options.header || '') || globalize.translate('HeaderSelectPath');
                 html += '</h3>';
                 html += '</div>';
-                html += getEditorHtml(options);
+                html += getEditorHtml(options, fetchedSystemInfo);
                 dlg.innerHTML = html;
                 initEditor(dlg, options, fileOptions);
                 dlg.addEventListener('close', onDialogClosed);
@@ -249,6 +282,10 @@ class DirectoryBrowser {
                 });
                 this.currentDialog = dlg;
                 dlg.querySelector('#txtDirectoryPickerPath').value = fetchedInitialPath;
+                const txtNetworkPath = dlg.querySelector('#txtNetworkPath');
+                if (txtNetworkPath) {
+                    txtNetworkPath.value = options.networkSharePath || '';
+                }
                 if (!options.pathReadOnly) {
                     refreshDirectoryBrowser(dlg, fetchedInitialPath, fileOptions, true);
                 }

src/components/displaySettings/displaySettings.js

@@ -89,7 +89,6 @@ function loadForm(context, user, userSettings) {
     }
 
     context.querySelector('.selectDashboardThemeContainer').classList.toggle('hide', !user.Policy.IsAdministrator);
-    context.querySelector('.txtSlideshowIntervalContainer').classList.remove('hide');
 
     if (appHost.supports(AppFeature.Screensaver)) {
         context.querySelector('.selectScreensaverContainer').classList.remove('hide');
@@ -113,7 +112,6 @@ function loadForm(context, user, userSettings) {
     loadScreensavers(context, userSettings);
 
     context.querySelector('#txtBackdropScreensaverInterval').value = userSettings.backdropScreensaverInterval();
-    context.querySelector('#txtSlideshowInterval').value = userSettings.slideshowInterval();
     context.querySelector('#txtScreensaverTime').value = userSettings.screensaverTime();
 
     context.querySelector('.chkDisplayMissingEpisodes').checked = user.Configuration.DisplayMissingEpisodes || false;
@@ -159,7 +157,6 @@ function saveUser(context, user, userSettingsInstance, apiClient) {
     userSettingsInstance.dashboardTheme(context.querySelector('#selectDashboardTheme').value);
     userSettingsInstance.screensaver(context.querySelector('.selectScreensaver').value);
     userSettingsInstance.backdropScreensaverInterval(context.querySelector('#txtBackdropScreensaverInterval').value);
-    userSettingsInstance.slideshowInterval(context.querySelector('#txtSlideshowInterval').value);
     userSettingsInstance.screensaverTime(context.querySelector('#txtScreensaverTime').value);
 
     userSettingsInstance.libraryPageSize(context.querySelector('#txtLibraryPageSize').value);

src/components/displaySettings/displaySettings.template.html

@@ -172,6 +172,7 @@
             <option value="desktop">${Desktop}</option>
             <option value="mobile">${Mobile}</option>
             <option value="tv">${TV}</option>
+            <option value="experimental">${Experimental}</option>
         </select>
         <div class="fieldDescription">${DisplayModeHelp}</div>
         <div class="fieldDescription">${LabelPleaseRestart}</div>
@@ -213,11 +214,6 @@
         <div class="fieldDescription">${LabelBackdropScreensaverIntervalHelp}</div>
     </div>
 
-    <div class="inputContainer hide txtSlideshowIntervalContainer inputContainer-withDescription">
-        <input is="emby-input" type="number" id="txtSlideshowInterval" pattern="[0-9]*" required="required" min="1" max="3600" step="1" label="${LabelSlideshowInterval}" />
-        <div class="fieldDescription">${LabelSlideshowIntervalHelp}</div>
-    </div>
-
     <div class="checkboxContainer checkboxContainer-withDescription">
         <label>
             <input type="checkbox" is="emby-checkbox" id="chkFadein" />

src/components/filterdialog/filterdialog.js

@@ -53,7 +53,7 @@ function renderFilters(context, result, query) {
         const delimeter = '|';
         return (delimeter + (query.Tags || '') + delimeter).includes(delimeter + i + delimeter);
     });
-    renderOptions(context, '.yearFilters', 'chkYearFilter', merge(result.Years.map(String), query.Years, ','), function (i) {
+    renderOptions(context, '.yearFilters', 'chkYearFilter', merge(result.Years, query.Years, ','), function (i) {
         const delimeter = ',';
         return (delimeter + (query.Years || '') + delimeter).includes(delimeter + i + delimeter);
     });

src/components/guide/guide.js

@@ -1,11 +1,8 @@
 import escapeHtml from 'escape-html';
-
-import { ItemAction } from 'constants/itemAction';
-import { ServerConnections } from 'lib/jellyfin-apiclient';
-
 import inputManager from '../../scripts/inputManager';
 import browser from '../../scripts/browser';
 import globalize from '../../lib/globalize';
+import { ServerConnections } from 'lib/jellyfin-apiclient';
 import Events from '../../utils/events.ts';
 import scrollHelper from '../../scripts/scrollHelper';
 import serverNotifications from '../../scripts/serverNotifications';
@@ -18,7 +15,6 @@ import imageLoader from '../images/imageLoader';
 import layoutManager from '../layoutManager';
 import itemShortcuts from '../shortcuts';
 import dom from '../../utils/dom';
-
 import './guide.scss';
 import './programs.scss';
 import 'material-design-icons-iconfont';
@@ -30,7 +26,6 @@ import '../../elements/emby-tabs/emby-tabs';
 import '../../elements/emby-scroller/emby-scroller';
 import '../../styles/flexstyles.scss';
 import 'webcomponents.js/webcomponents-lite';
-
 import template from './tvguide.template.html';
 
 function showViewSettings(instance) {
@@ -446,7 +441,7 @@ function Guide(options) {
 
         html += '<div class="' + outerCssClass + '" data-channelid="' + channel.Id + '">';
 
-        const clickAction = layoutManager.tv ? ItemAction.Link : ItemAction.ProgramDialog;
+        const clickAction = layoutManager.tv ? 'link' : 'programdialog';
 
         const categories = self.categoryOptions.categories || [];
         const displayMovieContent = !categories.length || categories.indexOf('movies') !== -1;
@@ -612,7 +607,7 @@ function Guide(options) {
                 title.push(channel.Name);
             }
 
-            html += `<button title="${escapeHtml(title.join(' '))}" type="button" class="${cssClass}" data-action="${ItemAction.Link}" data-isfolder="${channel.IsFolder}" data-id="${channel.Id}" data-serverid="${channel.ServerId}" data-type="${channel.Type}">`;
+            html += '<button title="' + escapeHtml(title.join(' ')) + '" type="button" class="' + cssClass + '"' + ' data-action="link" data-isfolder="' + channel.IsFolder + '" data-id="' + channel.Id + '" data-serverid="' + channel.ServerId + '" data-type="' + channel.Type + '">';
 
             if (hasChannelImage) {
                 const url = apiClient.getScaledImageUrl(channel.Id, {

src/components/htmlMediaHelper.js

@@ -48,6 +48,12 @@ export function enableHlsJsPlayer(runTimeTicks, mediaType) {
         return false;
     }
 
+    // Native HLS support in WebOS only plays stereo sound. hls.js works better, but works only on WebOS 4 or newer.
+    // Using hls.js also seems to fix fast forward issues that native HLS has.
+    if (browser.web0sVersion >= 4) {
+        return true;
+    }
+
     // The native players on these devices support seeking live streams, no need to use hls.js here
     if (browser.tizen || browser.web0s) {
         return false;
@@ -59,12 +65,6 @@ export function enableHlsJsPlayer(runTimeTicks, mediaType) {
             return true;
         }
 
-        // Chromium 141+ brings native HLS support that does not support switching HDR/SDR playlists.
-        // Always use hls.js to avoid falling back to transcoding from remuxing and client side tone-mapping.
-        if (browser.chrome || browser.edgeChromium || browser.opera) {
-            return true;
-        }
-
         // simple playback should use the native support
         if (runTimeTicks) {
             return false;

src/components/itemContextMenu.js

@@ -1,8 +1,4 @@
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
-import { getLibraryApi } from '@jellyfin/sdk/lib/utils/api/library-api';
-
-import { AppFeature } from 'constants/appFeature';
-import { toApi } from 'utils/jellyfin-apiclient/compat';
 
 import browser from '../scripts/browser';
 import { copy } from '../scripts/clipboard';
@@ -16,6 +12,7 @@ import itemHelper, { canEditPlaylist } from './itemHelper';
 import { playbackManager } from './playback/playbackmanager';
 import toast from './toast/toast';
 import * as userSettings from '../scripts/settings/userSettings';
+import { AppFeature } from 'constants/appFeature';
 
 /** Item types that support downloading all children. */
 const DOWNLOAD_ALL_TYPES = [
@@ -390,7 +387,6 @@ function executeCommand(item, id, options) {
     const itemId = item.Id;
     const serverId = item.ServerId;
     const apiClient = ServerConnections.getApiClient(serverId);
-    const api = toApi(apiClient);
 
     return new Promise(function (resolve, reject) {
         // eslint-disable-next-line sonarjs/max-switch-cases
@@ -415,9 +411,9 @@ function executeCommand(item, id, options) {
                 break;
             case 'download':
                 import('../scripts/fileDownloader').then((fileDownloader) => {
-                    const url = getLibraryApi(api).getDownloadUrl({ itemId });
+                    const downloadHref = apiClient.getItemDownloadUrl(itemId);
                     fileDownloader.download([{
-                        url,
+                        url: downloadHref,
                         item,
                         itemId,
                         serverId,
@@ -433,9 +429,9 @@ function executeCommand(item, id, options) {
                         const downloads = items
                             .filter(i => i.CanDownload)
                             .map(i => {
-                                const url = getLibraryApi(api).getDownloadUrl({ itemId: i.Id });
+                                const downloadHref = apiClient.getItemDownloadUrl(i.Id);
                                 return {
-                                    url,
+                                    url: downloadHref,
                                     item: i,
                                     itemId: i.Id,
                                     serverId,
@@ -482,7 +478,7 @@ function executeCommand(item, id, options) {
                 break;
             }
             case 'copy-stream': {
-                const downloadHref = getLibraryApi(api).getDownloadUrl({ itemId });
+                const downloadHref = apiClient.getItemDownloadUrl(itemId);
                 copy(downloadHref).then(() => {
                     toast(globalize.translate('CopyStreamURLSuccess'));
                 }).catch(() => {

src/components/itemHelper.js

@@ -52,6 +52,14 @@ export function getDisplayName(item, options = {}) {
         }
     }
 
+    if (Array.isArray(item)) {
+        if (item.length > 1) {
+            return item.map(i => getDisplayName(i, options)).join(' / ');
+        } else if (item.length === 1) {
+            return item[0].Name;
+        }
+    }
+
     return name;
 }
 

src/components/itemMediaInfo/itemMediaInfo.js

@@ -133,8 +133,8 @@ function getMediaSourceHtml(user, item, version) {
             }
             attributes.push(createAttribute(globalize.translate('MediaInfoInterlaced'), (stream.IsInterlaced ? 'Yes' : 'No')));
         }
-        if (stream.ReferenceFrameRate && stream.Type === 'Video') {
-            attributes.push(createAttribute(globalize.translate('MediaInfoFramerate'), stream.ReferenceFrameRate));
+        if ((stream.AverageFrameRate || stream.RealFrameRate) && stream.Type === 'Video') {
+            attributes.push(createAttribute(globalize.translate('MediaInfoFramerate'), (stream.AverageFrameRate || stream.RealFrameRate)));
         }
         if (stream.ChannelLayout) {
             attributes.push(createAttribute(globalize.translate('MediaInfoLayout'), stream.ChannelLayout));

src/components/itemsrefresher.js

@@ -0,0 +1,228 @@
+import { playbackManager } from './playback/playbackmanager';
+import serverNotifications from '../scripts/serverNotifications';
+import Events from '../utils/events.ts';
+
+function onUserDataChanged() {
+    const instance = this;
+    const eventsToMonitor = getEventsToMonitor(instance);
+
+    // TODO: Check user data change reason?
+    if (eventsToMonitor.indexOf('markfavorite') !== -1
+        || eventsToMonitor.indexOf('markplayed') !== -1
+    ) {
+        instance.notifyRefreshNeeded();
+    }
+}
+
+function getEventsToMonitor(instance) {
+    const options = instance.options;
+    const monitor = options ? options.monitorEvents : null;
+    if (monitor) {
+        return monitor.split(',');
+    }
+
+    return [];
+}
+
+function notifyTimerRefresh() {
+    const instance = this;
+
+    if (getEventsToMonitor(instance).indexOf('timers') !== -1) {
+        instance.notifyRefreshNeeded();
+    }
+}
+
+function notifySeriesTimerRefresh() {
+    const instance = this;
+    if (getEventsToMonitor(instance).indexOf('seriestimers') !== -1) {
+        instance.notifyRefreshNeeded();
+    }
+}
+
+function onLibraryChanged(e, apiClient, data) {
+    const instance = this;
+    const eventsToMonitor = getEventsToMonitor(instance);
+    if (eventsToMonitor.indexOf('seriestimers') !== -1 || eventsToMonitor.indexOf('timers') !== -1) {
+        // yes this is an assumption
+        return;
+    }
+
+    const itemsAdded = data.ItemsAdded || [];
+    const itemsRemoved = data.ItemsRemoved || [];
+    if (!itemsAdded.length && !itemsRemoved.length) {
+        return;
+    }
+
+    const options = instance.options || {};
+    const parentId = options.parentId;
+    if (parentId) {
+        const foldersAddedTo = data.FoldersAddedTo || [];
+        const foldersRemovedFrom = data.FoldersRemovedFrom || [];
+        const collectionFolders = data.CollectionFolders || [];
+
+        if (foldersAddedTo.indexOf(parentId) === -1 && foldersRemovedFrom.indexOf(parentId) === -1 && collectionFolders.indexOf(parentId) === -1) {
+            return;
+        }
+    }
+
+    instance.notifyRefreshNeeded();
+}
+
+function onPlaybackStopped(e, stopInfo) {
+    const instance = this;
+
+    const state = stopInfo.state;
+
+    const eventsToMonitor = getEventsToMonitor(instance);
+    if (state.NowPlayingItem?.MediaType === 'Video') {
+        if (eventsToMonitor.indexOf('videoplayback') !== -1) {
+            instance.notifyRefreshNeeded(true);
+            return;
+        }
+    } else if (state.NowPlayingItem?.MediaType === 'Audio' && eventsToMonitor.indexOf('audioplayback') !== -1) {
+        instance.notifyRefreshNeeded(true);
+        return;
+    }
+}
+
+function addNotificationEvent(instance, name, handler, owner) {
+    const localHandler = handler.bind(instance);
+    owner = owner || serverNotifications;
+    Events.on(owner, name, localHandler);
+    instance['event_' + name] = localHandler;
+}
+
+function removeNotificationEvent(instance, name, owner) {
+    const handler = instance['event_' + name];
+    if (handler) {
+        owner = owner || serverNotifications;
+        Events.off(owner, name, handler);
+        instance['event_' + name] = null;
+    }
+}
+
+class ItemsRefresher {
+    constructor(options) {
+        this.options = options || {};
+
+        addNotificationEvent(this, 'UserDataChanged', onUserDataChanged);
+        addNotificationEvent(this, 'TimerCreated', notifyTimerRefresh);
+        addNotificationEvent(this, 'SeriesTimerCreated', notifySeriesTimerRefresh);
+        addNotificationEvent(this, 'TimerCancelled', notifyTimerRefresh);
+        addNotificationEvent(this, 'SeriesTimerCancelled', notifySeriesTimerRefresh);
+        addNotificationEvent(this, 'LibraryChanged', onLibraryChanged);
+        addNotificationEvent(this, 'playbackstop', onPlaybackStopped, playbackManager);
+    }
+
+    pause() {
+        clearRefreshInterval(this, true);
+
+        this.paused = true;
+    }
+
+    resume(options) {
+        this.paused = false;
+
+        const refreshIntervalEndTime = this.refreshIntervalEndTime;
+        if (refreshIntervalEndTime) {
+            const remainingMs = refreshIntervalEndTime - new Date().getTime();
+            if (remainingMs > 0 && !this.needsRefresh) {
+                resetRefreshInterval(this, remainingMs);
+            } else {
+                this.needsRefresh = true;
+                this.refreshIntervalEndTime = null;
+            }
+        }
+
+        if (this.needsRefresh || (options?.refresh)) {
+            return this.refreshItems();
+        }
+
+        return Promise.resolve();
+    }
+
+    refreshItems() {
+        if (!this.fetchData) {
+            return Promise.resolve();
+        }
+
+        if (this.paused) {
+            this.needsRefresh = true;
+            return Promise.resolve();
+        }
+
+        this.needsRefresh = false;
+
+        return this.fetchData().then(onDataFetched.bind(this));
+    }
+
+    notifyRefreshNeeded(isInForeground) {
+        if (this.paused) {
+            this.needsRefresh = true;
+            return;
+        }
+
+        const timeout = this.refreshTimeout;
+        if (timeout) {
+            clearTimeout(timeout);
+        }
+
+        if (isInForeground === true) {
+            this.refreshItems();
+        } else {
+            this.refreshTimeout = setTimeout(this.refreshItems.bind(this), 10000);
+        }
+    }
+
+    destroy() {
+        clearRefreshInterval(this);
+
+        removeNotificationEvent(this, 'UserDataChanged');
+        removeNotificationEvent(this, 'TimerCreated');
+        removeNotificationEvent(this, 'SeriesTimerCreated');
+        removeNotificationEvent(this, 'TimerCancelled');
+        removeNotificationEvent(this, 'SeriesTimerCancelled');
+        removeNotificationEvent(this, 'LibraryChanged');
+        removeNotificationEvent(this, 'playbackstop', playbackManager);
+
+        this.fetchData = null;
+        this.options = null;
+    }
+}
+
+function clearRefreshInterval(instance, isPausing) {
+    if (instance.refreshInterval) {
+        clearInterval(instance.refreshInterval);
+        instance.refreshInterval = null;
+
+        if (!isPausing) {
+            instance.refreshIntervalEndTime = null;
+        }
+    }
+}
+
+function resetRefreshInterval(instance, intervalMs) {
+    clearRefreshInterval(instance);
+
+    if (!intervalMs) {
+        const options = instance.options;
+        if (options) {
+            intervalMs = options.refreshIntervalMs;
+        }
+    }
+
+    if (intervalMs) {
+        instance.refreshInterval = setInterval(instance.notifyRefreshNeeded.bind(instance), intervalMs);
+        instance.refreshIntervalEndTime = new Date().getTime() + intervalMs;
+    }
+}
+
+function onDataFetched(result) {
+    resetRefreshInterval(this);
+
+    if (this.afterRefresh) {
+        this.afterRefresh(result);
+    }
+}
+
+export default ItemsRefresher;

src/components/layoutManager.js

@@ -1,4 +1,3 @@
-import { LayoutMode } from 'constants/layoutMode';
 
 import { appHost } from './apphost';
 import browser from '../scripts/browser';
@@ -15,47 +14,51 @@ function setLayout(instance, layout, selectedLayout) {
     }
 }
 
-export const SETTING_KEY = 'layout';
-
 class LayoutManager {
     tv = false;
     mobile = false;
     desktop = false;
     experimental = false;
 
-    setLayout(layout = '', save = true) {
-        const layoutValue = (!layout || layout === LayoutMode.Auto) ? '' : layout;
-
-        if (!layoutValue) {
+    setLayout(layout, save) {
+        if (!layout || layout === 'auto') {
             this.autoLayout();
+
+            if (save !== false) {
+                appSettings.set('layout', '');
+            }
         } else {
-            setLayout(this, LayoutMode.Mobile, layoutValue);
-            setLayout(this, LayoutMode.Tv, layoutValue);
-            setLayout(this, LayoutMode.Desktop, layoutValue);
-        }
+            setLayout(this, 'mobile', layout);
+            setLayout(this, 'tv', layout);
+            setLayout(this, 'desktop', layout);
 
-        console.debug('[LayoutManager] using layout mode', layoutValue);
-        this.experimental = layoutValue === LayoutMode.Experimental;
-        if (this.experimental) {
-            const legacyLayoutMode = browser.mobile ? LayoutMode.Mobile : LayoutMode.Desktop;
-            console.debug('[LayoutManager] using legacy layout mode', legacyLayoutMode);
-            setLayout(this, legacyLayoutMode, legacyLayoutMode);
-        }
+            this.experimental = layout === 'experimental';
+            if (this.experimental) {
+                const legacyLayoutMode = browser.mobile ? 'mobile' : this.defaultLayout || 'desktop';
+                setLayout(this, legacyLayoutMode, legacyLayoutMode);
+            }
 
-        if (save) appSettings.set(SETTING_KEY, layoutValue);
+            if (save !== false) {
+                appSettings.set('layout', layout);
+            }
+        }
 
         Events.trigger(this, 'modechange');
     }
 
     getSavedLayout() {
-        return appSettings.get(SETTING_KEY);
+        return appSettings.get('layout');
     }
 
     autoLayout() {
-        // Take a guess at initial layout. The consuming app can override.
-        // NOTE: The fallback to TV mode seems like an outdated choice. TVs should be detected properly or override the
-        // default layout.
-        this.setLayout(browser.tv ? LayoutMode.Tv : this.defaultLayout || LayoutMode.Tv, false);
+        // Take a guess at initial layout. The consuming app can override
+        if (browser.mobile) {
+            this.setLayout('mobile', false);
+        } else if (browser.tv || browser.xboxOne || browser.ps4) {
+            this.setLayout('tv', false);
+        } else {
+            this.setLayout(this.defaultLayout || 'tv', false);
+        }
     }
 
     init() {

src/components/listview/List/ListContent.tsx

@@ -4,8 +4,6 @@ import DragHandleIcon from '@mui/icons-material/DragHandle';
 import Box from '@mui/material/Box';
 
 import useIndicator from 'components/indicators/useIndicator';
-import { ItemAction } from 'constants/itemAction';
-
 import PrimaryMediaInfo from '../../mediainfo/PrimaryMediaInfo';
 import ListContentWrapper from './ListContentWrapper';
 import ListItemBody from './ListItemBody';
@@ -22,7 +20,7 @@ interface ListContentProps {
     enableOverview?: boolean;
     enableSideMediaInfo?: boolean;
     clickEntireItem?: boolean;
-    action?: ItemAction;
+    action?: string;
     isLargeStyle: boolean;
     downloadWidth?: number;
 }

src/components/listview/List/ListImageContainer.tsx

@@ -1,14 +1,7 @@
 import React, { type FC } from 'react';
 import classNames from 'classnames';
 import Box from '@mui/material/Box';
-
-import Media from 'components/common/Media';
-import PlayArrowIconButton from 'components/common/PlayArrowIconButton';
-import { ItemAction } from 'constants/itemAction';
 import { useApi } from 'hooks/useApi';
-import type { ItemDto } from 'types/base/models/item-dto';
-import type { ListOptions } from 'types/listOptions';
-
 import useIndicator from '../../indicators/useIndicator';
 import layoutManager from '../../layoutManager';
 import { getDefaultBackgroundClass } from '../../cardbuilder/cardBuilderUtils';
@@ -18,10 +11,15 @@ import {
     getImageUrl
 } from './listHelper';
 
+import Media from 'components/common/Media';
+import PlayArrowIconButton from 'components/common/PlayArrowIconButton';
+import type { ItemDto } from 'types/base/models/item-dto';
+import type { ListOptions } from 'types/listOptions';
+
 interface ListImageContainerProps {
     item: ItemDto;
     listOptions: ListOptions;
-    action?: ItemAction | null;
+    action?: string | null;
     isLargeStyle: boolean;
     clickEntireItem?: boolean;
     downloadWidth?: number;
@@ -57,7 +55,7 @@ const ListImageContainer: FC<ListImageContainerProps> = ({
 
     const playOnImageClick = listOptions.imagePlayButton && !layoutManager.tv;
 
-    const imageAction = playOnImageClick ? ItemAction.Link : action;
+    const imageAction = playOnImageClick ? 'link' : action;
 
     const btnCssClass =
         'paper-icon-button-light listItemImageButton itemAction';
@@ -87,7 +85,7 @@ const ListImageContainer: FC<ListImageContainerProps> = ({
                 <PlayArrowIconButton
                     className={btnCssClass}
                     action={
-                        canResume(playbackPositionTicks) ? ItemAction.Resume : ItemAction.Play
+                        canResume(playbackPositionTicks) ? 'resume' : 'play'
                     }
                     title={
                         canResume(playbackPositionTicks) ?

src/components/listview/List/ListItemBody.tsx

@@ -3,16 +3,15 @@ import classNames from 'classnames';
 import Box from '@mui/material/Box';
 
 import TextLines from 'components/common/textLines/TextLines';
-import { ItemAction } from 'constants/itemAction';
+import PrimaryMediaInfo from '../../mediainfo/PrimaryMediaInfo';
+
 import type { ItemDto } from 'types/base/models/item-dto';
 import type { ListOptions } from 'types/listOptions';
 
-import PrimaryMediaInfo from '../../mediainfo/PrimaryMediaInfo';
-
 interface ListItemBodyProps {
     item: ItemDto;
     listOptions: ListOptions;
-    action?: ItemAction | null;
+    action?: string | null;
     isLargeStyle?: boolean;
     clickEntireItem?: boolean;
     enableContentWrapper?: boolean;

src/components/listview/List/ListWrapper.tsx

@@ -2,16 +2,13 @@ import classNames from 'classnames';
 import React, { type FC, type PropsWithChildren } from 'react';
 import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
-
-import { ItemAction } from 'constants/itemAction';
-import type { DataAttributes } from 'types/dataAttributes';
-
 import layoutManager from '../../layoutManager';
+import type { DataAttributes } from 'types/dataAttributes';
 
 interface ListWrapperProps {
     index: number | undefined;
     title?: string | null;
-    action?: ItemAction | null;
+    action?: string | null;
     dataAttributes?: DataAttributes;
     className?: string;
 }

src/components/listview/List/useList.ts

@@ -1,8 +1,6 @@
 import classNames from 'classnames';
-
-import layoutManager from 'components/layoutManager';
-import { ItemAction } from 'constants/itemAction';
 import { getDataAttributes } from 'utils/items';
+import layoutManager from 'components/layoutManager';
 
 import type { ItemDto } from 'types/base/models/item-dto';
 import type { ListOptions } from 'types/listOptions';
@@ -13,7 +11,7 @@ interface UseListProps {
 }
 
 function useList({ item, listOptions }: UseListProps) {
-    const action = listOptions.action ?? ItemAction.Link;
+    const action = listOptions.action ?? 'link';
     const isLargeStyle = listOptions.imageSize === 'large';
     const enableOverview = listOptions.enableOverview;
     const clickEntireItem = !!layoutManager.tv;

src/components/listview/listview.js

@@ -4,13 +4,7 @@
  * @module components/listview/listview
  */
 
-import DOMPurify from 'dompurify';
 import escapeHtml from 'escape-html';
-import markdownIt from 'markdown-it';
-
-import { ItemAction } from 'constants/itemAction';
-
-import { getDefaultBackgroundClass } from '../cardbuilder/cardBuilderUtils';
 import itemHelper from '../itemHelper';
 import mediaInfo from '../mediainfo/mediainfo';
 import indicators from '../indicators/indicators';
@@ -19,10 +13,12 @@ import globalize from '../../lib/globalize';
 import { ServerConnections } from 'lib/jellyfin-apiclient';
 import datetime from '../../scripts/datetime';
 import cardBuilder from '../cardbuilder/cardBuilder';
-
 import './listview.scss';
 import '../../elements/emby-ratingbutton/emby-ratingbutton';
 import '../../elements/emby-playstatebutton/emby-playstatebutton';
+import { getDefaultBackgroundClass } from '../cardbuilder/cardBuilderUtils';
+import markdownIt from 'markdown-it';
+import DOMPurify from 'dompurify';
 
 function getIndex(item, options) {
     if (options.index === 'disc') {
@@ -169,7 +165,7 @@ function getRightButtonsHtml(options) {
     for (let i = 0, length = options.rightButtons.length; i < length; i++) {
         const button = options.rightButtons[i];
 
-        html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="${ItemAction.Custom}" data-customaction="${button.id}" title="${button.title}"><span class="material-icons ${button.icon}" aria-hidden="true"></span></button>`;
+        html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="${button.id}" title="${button.title}"><span class="material-icons ${button.icon}" aria-hidden="true"></span></button>`;
     }
 
     return html;
@@ -179,7 +175,7 @@ export function getListViewHtml(options) {
     const items = options.items;
 
     let groupTitle = '';
-    const action = options.action || ItemAction.Link;
+    const action = options.action || 'link';
 
     const isLargeStyle = options.imageSize === 'large';
     const enableOverview = options.enableOverview;
@@ -281,7 +277,7 @@ export function getListViewHtml(options) {
                 imageClass += ' itemAction';
             }
 
-            const imageAction = playOnImageClick ? ItemAction.Link : action;
+            const imageAction = playOnImageClick ? 'link' : action;
 
             if (imgUrl) {
                 html += '<div data-action="' + imageAction + '" class="' + imageClass + ' lazy" data-src="' + imgUrl + '" item-icon>';
@@ -302,7 +298,7 @@ export function getListViewHtml(options) {
             }
 
             if (playOnImageClick) {
-                html += `<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="${ItemAction.Resume}"><span class="material-icons listItemImageButton-icon play_arrow" aria-hidden="true"></span></button>`;
+                html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><span class="material-icons listItemImageButton-icon play_arrow" aria-hidden="true"></span></button>';
             }
 
             const progressHtml = indicators.getProgressBarHtml(item, {
@@ -453,11 +449,11 @@ export function getListViewHtml(options) {
 
         if (!clickEntireItem) {
             if (options.addToListButton) {
-                html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="${ItemAction.AddToPlaylist}"><span class="material-icons playlist_add" aria-hidden="true"></span></button>`;
+                html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><span class="material-icons playlist_add" aria-hidden="true"></span></button>';
             }
 
             if (options.infoButton) {
-                html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="${ItemAction.Link}"><span class="material-icons info_outline" aria-hidden="true"></span></button>`;
+                html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><span class="material-icons info_outline" aria-hidden="true"></span></button>';
             }
 
             if (options.rightButtons) {
@@ -478,7 +474,7 @@ export function getListViewHtml(options) {
             }
 
             if (options.moreButton !== false) {
-                html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="${ItemAction.Menu}"><span class="material-icons more_vert" aria-hidden="true"></span></button>`;
+                html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
             }
         }
         html += '</div>';

src/components/mediaLibraryCreator/mediaLibraryCreator.js

@@ -122,9 +122,9 @@ function onAddButtonClick() {
     import('../directorybrowser/directorybrowser').then(({ default: DirectoryBrowser }) => {
         const picker = new DirectoryBrowser();
         picker.show({
-            callback: function (path) {
+            callback: function (path, networkSharePath) {
                 if (path) {
-                    addMediaLocation(page, path);
+                    addMediaLocation(page, path, networkSharePath);
                 }
 
                 picker.close();
@@ -161,7 +161,7 @@ function renderPaths(page) {
     }
 }
 
-function addMediaLocation(page, path) {
+function addMediaLocation(page, path, networkSharePath) {
     const pathLower = path.toLowerCase();
     const pathFilter = pathInfos.filter(p => {
         return p.Path.toLowerCase() == pathLower;
@@ -172,6 +172,10 @@ function addMediaLocation(page, path) {
             Path: path
         };
 
+        if (networkSharePath) {
+            pathInfo.NetworkPath = networkSharePath;
+        }
+
         pathInfos.push(pathInfo);
         renderPaths(page);
     }

src/components/mediaLibraryEditor/mediaLibraryEditor.js

@@ -56,10 +56,10 @@ function onEditLibrary() {
     return false;
 }
 
-function addMediaLocation(page, path) {
+function addMediaLocation(page, path, networkSharePath) {
     const virtualFolder = currentOptions.library;
     const refreshAfterChange = currentOptions.refresh;
-    ApiClient.addMediaPath(virtualFolder.Name, path, null, refreshAfterChange).then(() => {
+    ApiClient.addMediaPath(virtualFolder.Name, path, networkSharePath, refreshAfterChange).then(() => {
         hasChanges = true;
         refreshLibraryFromServer(page);
     }, () => {
@@ -67,10 +67,11 @@ function addMediaLocation(page, path) {
     });
 }
 
-function updateMediaLocation(page, path) {
+function updateMediaLocation(page, path, networkSharePath) {
     const virtualFolder = currentOptions.library;
     ApiClient.updateMediaPath(virtualFolder.Name, {
-        Path: path
+        Path: path,
+        NetworkPath: networkSharePath
     }).then(() => {
         hasChanges = true;
         refreshLibraryFromServer(page);
@@ -114,7 +115,7 @@ function onListItemClick(e) {
             return;
         }
 
-        showDirectoryBrowser(dom.parentWithClass(listItem, 'dlg-libraryeditor'), originalPath);
+        showDirectoryBrowser(dom.parentWithClass(listItem, 'dlg-libraryeditor'), originalPath, pathInfo.NetworkPath);
     }
 }
 
@@ -173,18 +174,19 @@ function onAddButtonClick() {
     showDirectoryBrowser(dom.parentWithClass(this, 'dlg-libraryeditor'));
 }
 
-function showDirectoryBrowser(context, originalPath) {
+function showDirectoryBrowser(context, originalPath, networkPath) {
     import('../directorybrowser/directorybrowser').then(({ default: DirectoryBrowser }) => {
         const picker = new DirectoryBrowser();
         picker.show({
             pathReadOnly: originalPath != null,
             path: originalPath,
-            callback: function (path) {
+            networkSharePath: networkPath,
+            callback: function (path, networkSharePath) {
                 if (path) {
                     if (originalPath) {
-                        updateMediaLocation(context, originalPath);
+                        updateMediaLocation(context, originalPath, networkSharePath);
                     } else {
-                        addMediaLocation(context, path);
+                        addMediaLocation(context, path, networkSharePath);
                     }
                 }
 

src/components/playback/playbackmanager.js

@@ -1024,7 +1024,7 @@ export class PlaybackManager {
         self.canPlay = function (item) {
             const itemType = item.Type;
 
-            if (itemType === 'Book' || itemType === 'PhotoAlbum' || itemType === 'MusicGenre' || itemType === 'Season' || itemType === 'Series' || itemType === 'BoxSet' || itemType === 'MusicAlbum' || itemType === 'MusicArtist' || itemType === 'Playlist') {
+            if (itemType === 'PhotoAlbum' || itemType === 'MusicGenre' || itemType === 'Season' || itemType === 'Series' || itemType === 'BoxSet' || itemType === 'MusicAlbum' || itemType === 'MusicArtist' || itemType === 'Playlist') {
                 return true;
             }
 
@@ -1980,18 +1980,28 @@ export class PlaybackManager {
             const startSeasonId = firstItem.Type === 'Season' ? items[options.startIndex || 0].Id : undefined;
 
             const seasonId = (startSeasonId && items.length === 1) ? startSeasonId : undefined;
-            const SeriesId = firstItem.SeriesId || firstItem.Id;
+            const seriesId = firstItem.SeriesId || firstItem.Id;
             const UserId = apiClient.getCurrentUserId();
 
             let startItemId;
 
             // Start from a specific (the next unwatched) episode if we want to watch in order and have not chosen a specific season
             if (!options.shuffle && !seasonId) {
-                const nextUp = await apiClient.getNextUpEpisodes({ SeriesId, UserId });
-                startItemId = nextUp?.Items?.[0]?.Id;
+                const initialUnplayedEpisode = await getItems(apiClient, UserId, {
+                    SortBy: 'SeriesSortName,SortName',
+                    SortOrder: 'Ascending',
+                    IncludeItemTypes: 'Episode',
+                    Recursive: true,
+                    IsMissing: false,
+                    ParentId: seriesId,
+                    limit: 1,
+                    Filters: 'IsUnplayed'
+                });
+
+                startItemId = initialUnplayedEpisode?.Items?.at(0)?.Id;
             }
 
-            const episodesResult = await apiClient.getEpisodes(SeriesId, {
+            const episodesResult = await apiClient.getEpisodes(seriesId, {
                 IsVirtualUnaired: false,
                 IsMissing: false,
                 SeasonId: seasonId,
@@ -3483,7 +3493,7 @@ export class PlaybackManager {
             const nextItemPlayOptions = nextItem ? (nextItem.item.playOptions || getDefaultPlayOptions()) : getDefaultPlayOptions();
             const newPlayer = nextItem ? getPlayer(nextItem.item, nextItemPlayOptions) : null;
 
-            if (!newPlayer) {
+            if (newPlayer !== player) {
                 data.streamInfo = null;
                 destroyPlayer(player);
                 removeCurrentPlayer(player);
@@ -3491,21 +3501,12 @@ export class PlaybackManager {
 
             if (errorOccurred) {
                 showPlaybackInfoErrorMessage(self, 'PlaybackError' + displayErrorCode);
-            } else if (newPlayer) {
+            } else if (nextItem) {
                 const apiClient = ServerConnections.getApiClient(nextItem.item.ServerId);
 
                 apiClient.getCurrentUser().then(function (user) {
                     if (user.Configuration.EnableNextEpisodeAutoPlay || nextMediaType !== MediaType.Video) {
                         self.nextTrack();
-
-                        if (newPlayer !== player) {
-                            Events.trigger(self, 'playbackstop', [{
-                                player,
-                                state,
-                                nextItem,
-                                nextMediaType
-                            }]);
-                        }
                     }
                 });
             }

src/components/playback/playersettingsmenu.js

@@ -93,16 +93,12 @@ function getQualitySecondaryText(player) {
         return stream.Type === 'Video';
     })[0];
 
-    const videoCodec = videoStream ? videoStream.Codec : null;
-    const videoBitRate = videoStream ? videoStream.BitRate : null;
     const videoWidth = videoStream ? videoStream.Width : null;
     const videoHeight = videoStream ? videoStream.Height : null;
 
     const options = qualityoptions.getVideoQualityOptions({
         currentMaxBitrate: playbackManager.getMaxStreamingBitrate(player),
         isAutomaticBitrateEnabled: playbackManager.enableAutomaticBitrateDetection(player),
-        videoCodec,
-        videoBitRate,
         videoWidth: videoWidth,
         videoHeight: videoHeight,
         enableAuto: true

src/components/playback/skipsegment.ts

@@ -1,7 +1,6 @@
 import { PlaybackManager } from './playbackmanager';
 import { TICKS_PER_MILLISECOND, TICKS_PER_SECOND } from 'constants/time';
 import type { MediaSegmentDto } from '@jellyfin/sdk/lib/generated-client/models/media-segment-dto';
-import type { PlaybackStopInfo } from 'types/playbackStopInfo';
 import { PlaybackSubscriber } from 'apps/stable/features/playback/utils/playbackSubscriber';
 import { isInSegment } from 'apps/stable/features/playback/utils/mediaSegments';
 import Events, { type Event } from 'utils/events';
@@ -189,12 +188,10 @@ class SkipSegment extends PlaybackSubscriber {
         }
     }
 
-    onPlaybackStop(_e: Event, playbackStopInfo: PlaybackStopInfo) {
+    onPlaybackStop() {
         this.currentSegment = null;
         this.hideSkipButton();
-        if (!playbackStopInfo.nextItem) {
-            Events.off(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged);
-        }
+        Events.off(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged);
     }
 }
 

src/components/playerstats/playerstats.js

@@ -204,7 +204,7 @@ function getDisplayTranscodeFps(session, player) {
     const mediaSource = playbackManager.currentMediaSource(player) || {};
     const videoStream = (mediaSource.MediaStreams || []).find((s) => s.Type === 'Video') || {};
 
-    const originalFramerate = videoStream.ReferenceFrameRate;
+    const originalFramerate = videoStream.ReferenceFrameRate || videoStream.RealFrameRate;
     const transcodeFramerate = session.TranscodingInfo.Framerate;
 
     if (!originalFramerate) {

src/components/prompt/prompt.js

@@ -1,3 +1,4 @@
+import browser from '../../scripts/browser';
 import dialogHelper from '../dialogHelper/dialogHelper';
 import layoutManager from '../layoutManager';
 import scrollHelper from '../../scripts/scrollHelper';
@@ -91,13 +92,33 @@ export default (() => {
         });
     }
 
-    return options => {
-        if (typeof options === 'string') {
-            options = {
-                title: '',
-                text: options
-            };
-        }
-        return showDialog(options);
-    };
+    if ((browser.tv || browser.xboxOne) && window.confirm) {
+        return options => {
+            if (typeof options === 'string') {
+                options = {
+                    label: '',
+                    text: options
+                };
+            }
+
+            const label = (options.label || '').replaceAll('<br/>', '\n');
+            const result = prompt(label, options.text || '');
+
+            if (result) {
+                return Promise.resolve(result);
+            } else {
+                return Promise.reject(result);
+            }
+        };
+    } else {
+        return options => {
+            if (typeof options === 'string') {
+                options = {
+                    title: '',
+                    text: options
+                };
+            }
+            return showDialog(options);
+        };
+    }
 })();

src/components/remotecontrol/remotecontrol.js

@@ -3,7 +3,6 @@ import escapeHtml from 'escape-html';
 import { getImageUrl } from 'apps/stable/features/playback/utils/image';
 import { getItemTextLines } from 'apps/stable/features/playback/utils/itemText';
 import { AppFeature } from 'constants/appFeature';
-import { ItemAction } from 'constants/itemAction';
 
 import datetime from '../../scripts/datetime';
 import { clearBackdrop, setBackdrops } from '../backdrop/backdrop';
@@ -17,9 +16,6 @@ import { ServerConnections } from 'lib/jellyfin-apiclient';
 import layoutManager from '../layoutManager';
 import * as userSettings from '../../scripts/settings/userSettings';
 import itemContextMenu from '../itemContextMenu';
-import toast from '../toast/toast';
-import { appRouter } from '../router/appRouter';
-import { getDefaultBackgroundClass } from '../cardbuilder/cardBuilderUtils';
 
 import '../cardbuilder/card.scss';
 import '../../elements/emby-button/emby-button';
@@ -28,6 +24,9 @@ import '../../elements/emby-itemscontainer/emby-itemscontainer';
 import './remotecontrol.scss';
 import '../../elements/emby-ratingbutton/emby-ratingbutton';
 import '../../elements/emby-slider/emby-slider';
+import toast from '../toast/toast';
+import { appRouter } from '../router/appRouter';
+import { getDefaultBackgroundClass } from '../cardbuilder/cardBuilderUtils';
 
 let showMuteButton = true;
 let showVolumeSlider = true;
@@ -209,7 +208,7 @@ function setImageUrl(context, state, url) {
         context.querySelector('.nowPlayingPageImage').classList.toggle('nowPlayingPageImageAudio', item.Type === 'Audio');
         context.querySelector('.nowPlayingPageImage').classList.toggle('nowPlayingPageImagePoster', item.Type !== 'Audio');
     } else {
-        imgContainer.innerHTML = `<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="${ItemAction.Link}" class="cardImageContainer coveredImage ${getDefaultBackgroundClass(item.Name)} cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album" aria-hidden="true"></span></button></div>`;
+        imgContainer.innerHTML = '<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="link" class="cardImageContainer coveredImage ' + getDefaultBackgroundClass(item.Name) + ' cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album" aria-hidden="true"></span></button></div>';
     }
 }
 

src/components/router/appRouter.js

@@ -6,7 +6,6 @@ import itemHelper from '../itemHelper';
 import loading from '../loading/loading';
 import alert from '../alert';
 
-import { LayoutMode } from 'constants/layoutMode';
 import { getItemQuery } from 'hooks/useItem';
 import { ServerConnections } from 'lib/jellyfin-apiclient';
 import { toApi } from 'utils/jellyfin-apiclient/compat';
@@ -435,7 +434,7 @@ class AppRouter {
 
             const layoutMode = localStorage.getItem('layout');
 
-            if (layoutMode === LayoutMode.Experimental && item.CollectionType == CollectionType.Homevideos) {
+            if (layoutMode === 'experimental' && item.CollectionType == CollectionType.Homevideos) {
                 url = '#/homevideos?topParentId=' + item.Id;
 
                 return url;

src/components/scrollManager.js

@@ -41,7 +41,7 @@ try {
     const opts = Object.defineProperty({}, 'behavior', {
         get: function () {
             supportsScrollToOptions = true;
-            return 'auto';
+            return null;
         }
     });
 

src/components/shortcuts.js

@@ -1,20 +1,19 @@
 /**
- * "Shortcut" action handlers for BaseItems.
+ * Module shortcuts.
+ * @module components/shortcuts
  */
 import { getPlaylistsApi } from '@jellyfin/sdk/lib/utils/api/playlists-api';
 
-import { ItemAction } from 'constants/itemAction';
-import { ServerConnections } from 'lib/jellyfin-apiclient';
-import { toApi } from 'utils/jellyfin-apiclient/compat';
-
 import { playbackManager } from './playback/playbackmanager';
 import inputManager from '../scripts/inputManager';
 import { appRouter } from './router/appRouter';
 import globalize from '../lib/globalize';
+import { ServerConnections } from 'lib/jellyfin-apiclient';
 import dom from '../utils/dom';
 import recordingHelper from './recordingcreator/recordinghelper';
 import toast from './toast/toast';
 import * as userSettings from '../scripts/settings/userSettings';
+import { toApi } from 'utils/jellyfin-apiclient/compat';
 
 function playAllFromHere(card, serverId, queue) {
     const parent = card.parentNode;
@@ -232,114 +231,95 @@ function executeAction(card, target, action) {
 
     const playableItemId = type === 'Program' ? item.ChannelId : item.Id;
 
-    if (item.MediaType === 'Photo' && action === ItemAction.Link) {
-        action = ItemAction.Play;
+    if (item.MediaType === 'Photo' && action === 'link') {
+        action = 'play';
     }
 
-    switch (action) {
-        case ItemAction.Link:
-            appRouter.showItem(item, {
-                context: card.getAttribute('data-context'),
-                parentId: card.getAttribute('data-parentid')
+    if (action === 'link') {
+        appRouter.showItem(item, {
+            context: card.getAttribute('data-context'),
+            parentId: card.getAttribute('data-parentid')
+        });
+    } else if (action === 'programdialog') {
+        showProgramDialog(item);
+    } else if (action === 'instantmix') {
+        playbackManager.instantMix({
+            Id: playableItemId,
+            ServerId: serverId
+        });
+    } else if (action === 'play' || action === 'resume') {
+        const startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0', 10);
+        const sortValues = userSettings.getSortValuesLegacy(sortParentId, 'SortName');
+
+        if (playbackManager.canPlay(item)) {
+            playbackManager.play({
+                ids: [playableItemId],
+                startPositionTicks: startPositionTicks,
+                serverId: serverId,
+                queryOptions: {
+                    SortBy: sortValues.sortBy,
+                    SortOrder: sortValues.sortOrder
+                }
             });
-            break;
-        case ItemAction.ProgramDialog:
-            showProgramDialog(item);
-            break;
-        case ItemAction.InstantMix:
-            playbackManager.instantMix({
-                Id: playableItemId,
-                ServerId: serverId
+        } else {
+            console.warn('Unable to play item', item);
+        }
+    } else if (action === 'queue') {
+        if (playbackManager.isPlaying()) {
+            playbackManager.queue({
+                ids: [playableItemId],
+                serverId: serverId
             });
-            break;
-        case ItemAction.Play:
-        case ItemAction.Resume: {
-            const startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0', 10);
-            const sortValues = userSettings.getSortValuesLegacy(sortParentId, 'SortName');
-
-            if (playbackManager.canPlay(item)) {
-                playbackManager.play({
-                    ids: [playableItemId],
-                    startPositionTicks: startPositionTicks,
-                    serverId: serverId,
-                    queryOptions: {
-                        SortBy: sortValues.sortBy,
-                        SortOrder: sortValues.sortOrder
-                    }
-                });
-            } else {
-                console.warn('Unable to play item', item);
-            }
-            break;
-        }
-        case ItemAction.Queue:
-            if (playbackManager.isPlaying()) {
-                playbackManager.queue({
-                    ids: [playableItemId],
-                    serverId: serverId
-                });
-                toast(globalize.translate('MediaQueued'));
-            } else {
-                playbackManager.queue({
-                    ids: [playableItemId],
-                    serverId: serverId
-                });
-            }
-            break;
-        case ItemAction.PlayAllFromHere:
-            playAllFromHere(card, serverId);
-            break;
-        case ItemAction.QueueAllFromHere:
-            playAllFromHere(card, serverId, true);
-            break;
-        case ItemAction.SetPlaylistIndex:
-            playbackManager.setCurrentPlaylistItem(card.getAttribute('data-playlistitemid'));
-            break;
-        case ItemAction.Record:
-            onRecordCommand(serverId, id, type, card.getAttribute('data-timerid'), card.getAttribute('data-seriestimerid'));
-            break;
-        case ItemAction.Menu: {
-            const options = target.getAttribute('data-playoptions') === 'false' ?
-                {
-                    shuffle: false,
-                    instantMix: false,
-                    play: false,
-                    playAllFromHere: false,
-                    queue: false,
-                    queueAllFromHere: false
-                } :
-                {};
-
-            options.positionTo = target;
-
-            showContextMenu(card, options);
-            break;
-        }
-        case ItemAction.PlayMenu:
-            showPlayMenu(card, target);
-            break;
-        case ItemAction.Edit:
-            getItem(target).then(itemToEdit => {
-                editItem(itemToEdit, serverId);
+            toast(globalize.translate('MediaQueued'));
+        } else {
+            playbackManager.queue({
+                ids: [playableItemId],
+                serverId: serverId
             });
-            break;
-        case ItemAction.PlayTrailer:
-            getItem(target).then(playTrailer);
-            break;
-        case ItemAction.AddToPlaylist:
-            getItem(target).then(addToPlaylist);
-            break;
-        case ItemAction.Custom: {
-            const customAction = target.getAttribute('data-customaction');
-
-            card.dispatchEvent(new CustomEvent(`action-${customAction}`, {
-                detail: {
-                    playlistItemId: card.getAttribute('data-playlistitemid')
-                },
-                cancelable: false,
-                bubbles: true
-            }));
         }
+    } else if (action === 'playallfromhere') {
+        playAllFromHere(card, serverId);
+    } else if (action === 'queueallfromhere') {
+        playAllFromHere(card, serverId, true);
+    } else if (action === 'setplaylistindex') {
+        playbackManager.setCurrentPlaylistItem(card.getAttribute('data-playlistitemid'));
+    } else if (action === 'record') {
+        onRecordCommand(serverId, id, type, card.getAttribute('data-timerid'), card.getAttribute('data-seriestimerid'));
+    } else if (action === 'menu') {
+        const options = target.getAttribute('data-playoptions') === 'false' ?
+            {
+                shuffle: false,
+                instantMix: false,
+                play: false,
+                playAllFromHere: false,
+                queue: false,
+                queueAllFromHere: false
+            } :
+            {};
+
+        options.positionTo = target;
+
+        showContextMenu(card, options);
+    } else if (action === 'playmenu') {
+        showPlayMenu(card, target);
+    } else if (action === 'edit') {
+        getItem(target).then(itemToEdit => {
+            editItem(itemToEdit, serverId);
+        });
+    } else if (action === 'playtrailer') {
+        getItem(target).then(playTrailer);
+    } else if (action === 'addtoplaylist') {
+        getItem(target).then(addToPlaylist);
+    } else if (action === 'custom') {
+        const customAction = target.getAttribute('data-customaction');
+
+        card.dispatchEvent(new CustomEvent(`action-${customAction}`, {
+            detail: {
+                playlistItemId: card.getAttribute('data-playlistitemid')
+            },
+            cancelable: false,
+            bubbles: true
+        }));
     }
 }
 
@@ -410,7 +390,7 @@ export function onClick(e) {
             }
         }
 
-        if (action && action !== ItemAction.None) {
+        if (action) {
             executeAction(card, actionElement, action);
 
             e.preventDefault();

src/components/slideshow/slideshow.js

@@ -2,15 +2,9 @@
  * Image viewer component
  * @module components/slideshow/slideshow
  */
-import { getLibraryApi } from '@jellyfin/sdk/lib/utils/api/library-api';
-import screenfull from 'screenfull';
-
 import { AppFeature } from 'constants/appFeature';
-import { ServerConnections } from 'lib/jellyfin-apiclient';
-import { toApi } from 'utils/jellyfin-apiclient/compat';
-import { randomInt } from 'utils/number';
-
 import dialogHelper from '../dialogHelper/dialogHelper';
+import { ServerConnections } from 'lib/jellyfin-apiclient';
 import inputManager from '../../scripts/inputManager';
 import layoutManager from '../layoutManager';
 import focusManager from '../focusManager';
@@ -21,6 +15,8 @@ import dom from '../../utils/dom';
 import './style.scss';
 import 'material-design-icons-iconfont';
 import '../../elements/emby-button/paper-icon-button-light';
+import screenfull from 'screenfull';
+import { randomInt } from '../../utils/number.ts';
 
 /**
  * Name of transition event.
@@ -92,15 +88,14 @@ function getBackdropImageUrl(item, options, apiClient) {
  * @returns {string} URL of the item's image.
  */
 function getImgUrl(item, user) {
-    const apiClient = ServerConnections.getApiClient(item);
-    const api = toApi(apiClient);
+    const apiClient = ServerConnections.getApiClient(item.ServerId);
     const imageOptions = {};
 
     if (item.BackdropImageTags?.length) {
         return getBackdropImageUrl(item, imageOptions, apiClient);
     } else {
         if (item.MediaType === 'Photo' && user?.Policy.EnableContentDownloading) {
-            return getLibraryApi(api).getDownloadUrl({ itemId: item.Id });
+            return apiClient.getItemDownloadUrl(item.Id);
         }
         imageOptions.type = 'Primary';
         return getImageUrl(item, imageOptions, apiClient);

src/components/subtitleuploader/subtitleuploader.js

@@ -80,12 +80,11 @@ function setFiles(page, files) {
 }
 
 async function onSubmit(e) {
-    e.preventDefault();
-
     const file = currentFile;
 
     if (!isValidSubtitleFile(file)) {
         toast(globalize.translate('MessageSubtitleFileTypeAllowed'));
+        e.preventDefault();
         return;
     }
 
@@ -110,6 +109,8 @@ async function onSubmit(e) {
         hasChanges = true;
         dialogHelper.close(dlg);
     });
+
+    e.preventDefault();
 }
 
 function initEditor(page) {

src/constants/itemAction.ts

@@ -1,37 +0,0 @@
-/** Actions that can be performed on a BaseItem. */
-export enum ItemAction {
-    /** Add the Item to a playlist. */
-    AddToPlaylist = 'addtoplaylist',
-    /** Trigger a custom action via an Event. */
-    Custom = 'custom',
-    /** Open an editor for the Item. */
-    Edit = 'edit',
-    /** Create an instant mix based on the Item. */
-    InstantMix = 'instantmix',
-    /** Open the details view for the Item. */
-    Link = 'link',
-    /** Open the context menu for the Item. */
-    Menu = 'menu',
-    /** Perform no action. Used to prevent a parent element's action being triggered. */
-    None = 'none',
-    /** Play the Item. */
-    Play = 'play',
-    /** Queue the Item and all subsequent Items and start playback. */
-    PlayAllFromHere = 'playallfromhere',
-    /** Open the play menu for the Item. */
-    PlayMenu = 'playmenu',
-    /** Play the trailer for the Item. */
-    PlayTrailer = 'playtrailer',
-    /** Open the program dialog for the Item. */
-    ProgramDialog = 'programdialog',
-    /** Queue the Item. */
-    Queue = 'queue',
-    /** Queue the Item and all subsequent Items. */
-    QueueAllFromHere = 'queueallfromhere',
-    /** Record the Item. */
-    Record = 'record',
-    /** Resume playback of the Item. */
-    Resume = 'resume',
-    /** Set this Item as the Item to be currently played from a playlist. */
-    SetPlaylistIndex = 'setplaylistindex'
-};

src/constants/layoutMode.ts

@@ -1,13 +0,0 @@
-/** The different layout modes supported by the web app. */
-export enum LayoutMode {
-    /** Automatic layout - the app chose the best layout for the detected device. */
-    Auto = 'auto',
-    /** The legacy desktop layout. */
-    Desktop = 'desktop',
-    /** The modern React based layout. */
-    Experimental = 'experimental',
-    /** The legacy mobile layout. */
-    Mobile = 'mobile',
-    /** The TV layout. */
-    Tv = 'tv'
-};

src/controllers/itemDetails/index.html

@@ -176,86 +176,88 @@
             </div>
         </div>
 
-        <div class="detailPageSecondaryContainer padded-left padded-bottom-page">
-            <div id="childrenCollapsible" class="hide verticalSection detailVerticalSection">
-                <h2 class="sectionTitle sectionTitle-cards hide">
-                    <span></span>
-                </h2>
-                <div>
-                    <div is="emby-itemscontainer" class="itemsContainer padded-right" style="text-align: left;"></div>
+        <div class="detailPageSecondaryContainer padded-bottom-page">
+            <div class="detailPageContent">
+                <div id="childrenCollapsible" class="hide verticalSection detailVerticalSection">
+                    <h2 class="sectionTitle sectionTitle-cards hide">
+                        <span></span>
+                    </h2>
+                    <div>
+                        <div is="emby-itemscontainer" class="itemsContainer padded-right" style="text-align: left;"></div>
+                    </div>
                 </div>
-            </div>
 
-            <div id="additionalPartsCollapsible" class="verticalSection detailVerticalSection hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderAdditionalParts}</h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div id="additionalPartsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div id="additionalPartsCollapsible" class="verticalSection detailVerticalSection hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderAdditionalParts}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div id="additionalPartsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
-            </div>
 
-            <div class="verticalSection detailVerticalSection moreFromSeasonSection hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right"></h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div class="verticalSection detailVerticalSection moreFromSeasonSection hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right"></h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
-            </div>
 
-            <div id="lyricsSection" class="verticalSection-extrabottompadding detailVerticalSection lyricsContainer hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right">${Lyrics}</h2>
-                <div is="emby-itemscontainer" class="vertical-list itemsContainer"></div>
-            </div>
-
-            <div class="verticalSection detailVerticalSection moreFromArtistSection hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right"></h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div id="lyricsSection" class="verticalSection-extrabottompadding detailVerticalSection lyricsContainer hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${Lyrics}</h2>
+                    <div is="emby-itemscontainer" class="vertical-list itemsContainer"></div>
                 </div>
-            </div>
 
-            <div id="castCollapsible" class="verticalSection detailVerticalSection hide">
-                <h2 id="peopleHeader" class="sectionTitle sectionTitle-cards padded-right">${HeaderCastAndCrew}</h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div id="castContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div class="verticalSection detailVerticalSection moreFromArtistSection hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right"></h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
-            </div>
 
-            <div id="guestCastCollapsible" class="verticalSection detailVerticalSection hide">
-                <h2 id="guestCastHeader" class="sectionTitle sectionTitle-cards padded-right">${HeaderGuestCast}</h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div id="guestCastContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div id="castCollapsible" class="verticalSection detailVerticalSection hide">
+                    <h2 id="peopleHeader" class="sectionTitle sectionTitle-cards padded-right">${HeaderCastAndCrew}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div id="castContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
-            </div>
 
-            <div id="seriesScheduleSection" class="verticalSection detailVerticalSection hide">
-                <h2 class="sectionTitle padded-right">${HeaderUpcomingOnTV}</h2>
-                <div id="seriesScheduleList" is="emby-itemscontainer" class="itemsContainer vertical-list padded-right"></div>
-            </div>
-
-            <div id="specialsCollapsible" class="verticalSection detailVerticalSection hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right">${SpecialFeatures}</h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div id="specialsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div id="guestCastCollapsible" class="verticalSection detailVerticalSection hide">
+                    <h2 id="guestCastHeader" class="sectionTitle sectionTitle-cards padded-right">${HeaderGuestCast}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div id="guestCastContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
-            </div>
 
-            <div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right">${MusicVideos}</h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div id="musicVideosContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div id="seriesScheduleSection" class="verticalSection detailVerticalSection hide">
+                    <h2 class="sectionTitle padded-right">${HeaderUpcomingOnTV}</h2>
+                    <div id="seriesScheduleList" is="emby-itemscontainer" class="itemsContainer vertical-list padded-right"></div>
                 </div>
-            </div>
 
-            <div id="scenesCollapsible" class="verticalSection detailVerticalSection verticalSection-extrabottompadding hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderScenes}</h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div id="scenesContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                <div id="specialsCollapsible" class="verticalSection detailVerticalSection hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${SpecialFeatures}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div id="specialsContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
                 </div>
-            </div>
 
-            <div id="similarCollapsible" class="verticalSection detailVerticalSection verticalSection-extrabottompadding hide">
-                <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderMoreLikeThis}</h2>
-                <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
-                    <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer similarContent"></div>
+                <div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${MusicVideos}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div id="musicVideosContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
+                </div>
+
+                <div id="scenesCollapsible" class="verticalSection detailVerticalSection verticalSection-extrabottompadding hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderScenes}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div id="scenesContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
+                    </div>
+                </div>
+
+                <div id="similarCollapsible" class="verticalSection detailVerticalSection verticalSection-extrabottompadding hide">
+                    <h2 class="sectionTitle sectionTitle-cards padded-right">${HeaderMoreLikeThis}</h2>
+                    <div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale no-padding" data-centerfocus="true">
+                        <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer similarContent"></div>
+                    </div>
                 </div>
             </div>
         </div>

src/controllers/itemDetails/index.js

@@ -1,6 +1,5 @@
 import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
 import { PersonKind } from '@jellyfin/sdk/lib/generated-client/models/person-kind';
-import { getLibraryApi } from '@jellyfin/sdk/lib/utils/api/library-api';
 import { intervalToDuration } from 'date-fns';
 import DOMPurify from 'dompurify';
 import escapeHtml from 'escape-html';
@@ -23,7 +22,6 @@ import { playbackManager } from 'components/playback/playbackmanager';
 import { appRouter } from 'components/router/appRouter';
 import itemShortcuts from 'components/shortcuts';
 import { AppFeature } from 'constants/appFeature';
-import { ItemAction } from 'constants/itemAction';
 import globalize from 'lib/globalize';
 import { ServerConnections } from 'lib/jellyfin-apiclient';
 import browser from 'scripts/browser';
@@ -36,7 +34,6 @@ import { getPortraitShape, getSquareShape } from 'utils/card';
 import Dashboard from 'utils/dashboard';
 import Events from 'utils/events';
 import { getItemBackdropImageUrl } from 'utils/jellyfin-apiclient/backdropImage';
-import { toApi } from 'utils/jellyfin-apiclient/compat';
 
 import 'elements/emby-itemscontainer/emby-itemscontainer';
 import 'elements/emby-checkbox/emby-checkbox';
@@ -437,19 +434,19 @@ function renderName(item, container, context) {
         parentNameHtml.push(getArtistLinksHtml(item.ArtistItems, item.ServerId, context));
         parentNameLast = true;
     } else if (item.SeriesName && item.Type === 'Episode') {
-        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="${ItemAction.Link}" data-id="${item.SeriesId}" data-serverid="${item.ServerId}" data-type="Series" data-isfolder="true">${escapeHtml(item.SeriesName)}</a>`);
+        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="link" data-id="${item.SeriesId}" data-serverid="${item.ServerId}" data-type="Series" data-isfolder="true">${escapeHtml(item.SeriesName)}</a>`);
     } else if (item.IsSeries || item.EpisodeTitle) {
         parentNameHtml.push(escapeHtml(item.Name));
     }
 
     if (item.SeriesName && item.Type === 'Season') {
-        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="${ItemAction.Link}" data-id="${item.SeriesId}" data-serverid="${item.ServerId}" data-type="Series" data-isfolder="true">${escapeHtml(item.SeriesName)}</a>`);
+        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="link" data-id="${item.SeriesId}" data-serverid="${item.ServerId}" data-type="Series" data-isfolder="true">${escapeHtml(item.SeriesName)}</a>`);
     } else if (item.ParentIndexNumber != null && item.Type === 'Episode') {
-        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="${ItemAction.Link}" data-id="${item.SeasonId}" data-serverid="${item.ServerId}" data-type="Season" data-isfolder="true">${escapeHtml(item.SeasonName)}</a>`);
+        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="link" data-id="${item.SeasonId}" data-serverid="${item.ServerId}" data-type="Season" data-isfolder="true">${escapeHtml(item.SeasonName)}</a>`);
     } else if (item.ParentIndexNumber != null && item.IsSeries) {
         parentNameHtml.push(escapeHtml(item.SeasonName || 'S' + item.ParentIndexNumber));
     } else if (item.Album && item.AlbumId && (item.Type === 'MusicVideo' || item.Type === 'Audio')) {
-        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="${ItemAction.Link}" data-id="${item.AlbumId}" data-serverid="${item.ServerId}" data-type="MusicAlbum" data-isfolder="true">${escapeHtml(item.Album)}</a>`);
+        parentNameHtml.push(`<a style="color:inherit;" class="button-link itemAction" is="emby-linkbutton" href="#" data-action="link" data-id="${item.AlbumId}" data-serverid="${item.ServerId}" data-type="MusicAlbum" data-isfolder="true">${escapeHtml(item.Album)}</a>`);
     } else if (item.Album) {
         parentNameHtml.push(escapeHtml(item.Album));
     }
@@ -1985,7 +1982,7 @@ export default function (view, params) {
             return;
         }
 
-        playItem(item, item.UserData && mode === ItemAction.Resume ? item.UserData.PlaybackPositionTicks : 0);
+        playItem(item, item.UserData && mode === 'resume' ? item.UserData.PlaybackPositionTicks : 0);
     }
 
     function onPlayClick() {
@@ -2029,10 +2026,9 @@ export default function (view, params) {
     }
 
     function onDownloadClick() {
-        const api = toApi(getApiClient());
-        const url = getLibraryApi(api).getDownloadUrl({ itemId: currentItem.Id });
+        const downloadHref = getApiClient().getItemDownloadUrl(currentItem.Id);
         download([{
-            url,
+            url: downloadHref,
             item: currentItem,
             itemId: currentItem.Id,
             serverId: currentItem.ServerId,

src/elements/emby-playstatebutton/PlayedButton.tsx

@@ -3,8 +3,8 @@ import { useQueryClient } from '@tanstack/react-query';
 import React, { type FC, useCallback } from 'react';
 import IconButton from '@mui/material/IconButton';
 import CheckIcon from '@mui/icons-material/Check';
+import classNames from 'classnames';
 
-import { ItemAction } from 'constants/itemAction';
 import globalize from 'lib/globalize';
 import { useTogglePlayedMutation } from 'hooks/useFetchItems';
 
@@ -59,17 +59,22 @@ const PlayedButton: FC<PlayedButtonProps> = ({
         }
     }, [itemId, togglePlayedMutation, isPlayed, queryClient, queryKey]);
 
+    const btnClass = classNames(
+        className,
+        { 'playstatebutton-played': isPlayed }
+    );
+
+    const iconClass = classNames(
+        { 'playstatebutton-icon-played': isPlayed }
+    );
     return (
         <IconButton
-            data-action={ItemAction.None}
             title={getTitle()}
-            className={className}
+            className={btnClass}
             size='small'
             onClick={onClick}
         >
-            <CheckIcon
-                color={isPlayed ? 'error' : undefined}
-            />
+            <CheckIcon className={iconClass} />
         </IconButton>
     );
 };