admin/jellyfin-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6732 from thornbill/eslint-import-rules

Browse Source
This commit is contained in:
Bill Thornton
2025-04-12 10:08:50 -04:00
committed by GitHub
parent 833c33a417 887795eeb3
commit 47e1a5fd72
39 changed files with 93 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
eslint.config.mjs
View File

@@ -128,7 +128,35 @@ export default tseslint.config(
'@stylistic/quotes': ['error', 'single', { 'avoidEscape': true, 'allowTemplateLiterals': false }],
'@stylistic/semi': 'error',
'@stylistic/space-before-blocks': 'error',
'@stylistic/space-infix-ops': 'error'
'@stylistic/space-infix-ops': 'error',
'@typescript-eslint/no-restricted-imports': [
'error',
{
paths: [
{
name: '@jellyfin/sdk/lib/generated-client',
message: 'Use direct file imports for tree-shaking',
allowTypeImports: true
},
{
name: '@jellyfin/sdk/lib/generated-client/api',
message: 'Use direct file imports for tree-shaking',
allowTypeImports: true
},
{
name: '@jellyfin/sdk/lib/generated-client/models',
message: 'Use direct file imports for tree-shaking',
allowTypeImports: true
},
{
name: '@mui/material',
message: 'Use direct file imports for tree-shaking',
allowTypeImports: true
}
]
}
]
}
},

2
src/apps/dashboard/components/UserAvatarButton.tsx
View File

@@ -1,6 +1,6 @@
import type { UserDto } from '@jellyfin/sdk/lib/generated-client/models/user-dto';
import type { SxProps, Theme } from '@mui/material';
import IconButton from '@mui/material/IconButton/IconButton';
import IconButton from '@mui/material/IconButton';
import React, { type FC } from 'react';
import { Link } from 'react-router-dom';

2
src/apps/dashboard/components/toolbar/HelpButton.tsx
View File

@@ -1,5 +1,5 @@
import HelpOutline from '@mui/icons-material/HelpOutline';
import IconButton from '@mui/material/IconButton/IconButton';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip/Tooltip';
import React from 'react';
import { Route, Routes } from 'react-router-dom';

2
src/apps/dashboard/features/activity/components/ActionsCell.tsx
View File

@@ -1,4 +1,4 @@
import IconButton from '@mui/material/IconButton/IconButton';
import IconButton from '@mui/material/IconButton';
import PermMedia from '@mui/icons-material/PermMedia';
import React, { type FC } from 'react';
import { Link } from 'react-router-dom';

2
src/apps/dashboard/features/keys/api/useRevokeKey.ts
View File

@@ -1,4 +1,4 @@
import { ApiKeyApiRevokeKeyRequest } from '@jellyfin/sdk/lib/generated-client';
import type { ApiKeyApiRevokeKeyRequest } from '@jellyfin/sdk/lib/generated-client';
import { getApiKeyApi } from '@jellyfin/sdk/lib/utils/api/api-key-api';
import { useMutation } from '@tanstack/react-query';
import { useApi } from 'hooks/useApi';

2
src/apps/dashboard/features/plugins/components/PluginRevisions.tsx
View File

@@ -1,3 +1,4 @@
import type { VersionInfo } from '@jellyfin/sdk/lib/generated-client';
import Download from '@mui/icons-material/Download';
import DownloadDone from '@mui/icons-material/DownloadDone';
import ExpandMore from '@mui/icons-material/ExpandMore';
@@ -13,7 +14,6 @@ import { getDisplayDateTime } from 'scripts/datetime';
import globalize from 'lib/globalize';
import type { PluginDetails } from '../types/PluginDetails';
import { VersionInfo } from '@jellyfin/sdk/lib/generated-client';
interface PluginRevisionsProps {
pluginDetails?: PluginDetails,

2
src/apps/dashboard/routes/devices/index.tsx
View File

@@ -3,7 +3,7 @@ import Delete from '@mui/icons-material/Delete';
import Edit from '@mui/icons-material/Edit';
import Box from '@mui/material/Box/Box';
import Button from '@mui/material/Button/Button';
import IconButton from '@mui/material/IconButton/IconButton';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip/Tooltip';
import parseISO from 'date-fns/parseISO';
import { type MRT_ColumnDef, useMaterialReactTable } from 'material-react-table';

4
src/apps/experimental/components/library/GridListViewButton.tsx
View File

@@ -1,7 +1,9 @@
import React, { FC, useCallback } from 'react';
import { ButtonGroup, IconButton } from '@mui/material';
import ButtonGroup from '@mui/material/ButtonGroup/ButtonGroup';
import IconButton from '@mui/material/IconButton';
import ViewModuleIcon from '@mui/icons-material/ViewModule';
import ViewListIcon from '@mui/icons-material/ViewList';
import globalize from 'lib/globalize';
import { LibraryViewSettings, ViewMode } from 'types/library';
import { LibraryTab } from 'types/libraryTab';

2
src/apps/experimental/components/library/ItemsView.tsx
View File

@@ -1,6 +1,6 @@
import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
import { ImageType } from '@jellyfin/sdk/lib/generated-client';
import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import React, { type FC, useCallback } from 'react';
import Box from '@mui/material/Box';

2
src/apps/experimental/components/library/NewCollectionButton.tsx
View File

@@ -1,5 +1,5 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import AddIcon from '@mui/icons-material/Add';
import globalize from 'lib/globalize';

2
src/apps/experimental/components/library/PlayAllButton.tsx
View File

@@ -1,5 +1,5 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import PlayArrowIcon from '@mui/icons-material/PlayArrow';
import { playbackManager } from 'components/playback/playbackmanager';

2
src/apps/experimental/components/library/QueueButton.tsx
View File

@@ -1,5 +1,5 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import QueueIcon from '@mui/icons-material/Queue';
import { playbackManager } from 'components/playback/playbackmanager';

2
src/apps/experimental/components/library/ShuffleButton.tsx
View File

@@ -1,6 +1,6 @@
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import ShuffleIcon from '@mui/icons-material/Shuffle';
import { playbackManager } from 'components/playback/playbackmanager';

4
src/apps/experimental/components/library/SortButton.tsx
View File

@@ -1,3 +1,5 @@
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
import React, { FC, useCallback } from 'react';
import IconButton from '@mui/material/IconButton';
import MenuItem from '@mui/material/MenuItem';
@@ -13,8 +15,6 @@ import SortByAlphaIcon from '@mui/icons-material/SortByAlpha';
import globalize from 'lib/globalize';
import { LibraryViewSettings } from 'types/library';
import { LibraryTab } from 'types/libraryTab';
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import { SortOrder } from '@jellyfin/sdk/lib/generated-client';
type SortOption = {
label: string;

2
src/apps/experimental/components/library/ViewSettingsButton.tsx
View File

@@ -1,4 +1,4 @@
import { ImageType } from '@jellyfin/sdk/lib/generated-client';
import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
import React, { FC, useCallback } from 'react';
import IconButton from '@mui/material/IconButton';

2
src/apps/experimental/components/library/filter/FilterButton.tsx
View File

@@ -9,8 +9,8 @@ import MuiAccordionDetails from '@mui/material/AccordionDetails';
import MuiAccordionSummary, {
AccordionSummaryProps
} from '@mui/material/AccordionSummary';
import Badge from '@mui/material/Badge';
import IconButton from '@mui/material/IconButton';
import { Badge } from '@mui/material';
import { styled } from '@mui/material/styles';
import Typography from '@mui/material/Typography';

3
src/apps/experimental/components/library/filter/FiltersSeriesStatus.tsx
View File

@@ -1,10 +1,11 @@
import { SeriesStatus } from '@jellyfin/sdk/lib/generated-client/models/series-status';
import React, { FC, useCallback } from 'react';
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import Checkbox from '@mui/material/Checkbox';
import globalize from 'lib/globalize';
import { LibraryViewSettings } from 'types/library';
import { SeriesStatus } from '@jellyfin/sdk/lib/generated-client';
const statusFiltersOptions = [
{ label: 'Continuing', value: SeriesStatus.Continuing },

3
src/apps/experimental/components/library/filter/FiltersStatus.tsx
View File

@@ -1,10 +1,11 @@
import { ItemFilter } from '@jellyfin/sdk/lib/generated-client/models/item-filter';
import React, { FC, useCallback } from 'react';
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import Checkbox from '@mui/material/Checkbox';
import globalize from 'lib/globalize';
import { LibraryViewSettings } from 'types/library';
import { ItemFilter } from '@jellyfin/sdk/lib/generated-client';
import { LibraryTab } from 'types/libraryTab';
const statusFiltersOptions = [

3
src/apps/experimental/components/library/filter/FiltersVideoTypes.tsx
View File

@@ -1,9 +1,10 @@
import { VideoType } from '@jellyfin/sdk/lib/generated-client/models/video-type';
import React, { FC, useCallback } from 'react';
import FormGroup from '@mui/material/FormGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import Checkbox from '@mui/material/Checkbox';
import { LibraryViewSettings, VideoBasicFilter } from 'types/library';
import { VideoType } from '@jellyfin/sdk/lib/generated-client';
const videoBasicFilterOptions = [
{ label: 'SD', value: VideoBasicFilter.IsSD },

2
src/apps/experimental/features/details/components/buttons/CancelSeriesTimerButton.tsx
View File

@@ -1,6 +1,6 @@
import React, { FC, useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import DeleteIcon from '@mui/icons-material/Delete';
import { useCancelSeriesTimer } from 'hooks/api/liveTvHooks';

3
src/apps/experimental/features/details/components/buttons/CancelTimerButton.tsx
View File

@@ -1,7 +1,8 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import StopIcon from '@mui/icons-material/Stop';
import { useQueryClient } from '@tanstack/react-query';
import { useCancelTimer } from 'hooks/api/liveTvHooks';
import globalize from 'lib/globalize';
import loading from 'components/loading/loading';

3
src/apps/experimental/features/details/components/buttons/DownloadButton.tsx
View File

@@ -1,6 +1,7 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import FileDownloadIcon from '@mui/icons-material/FileDownload';
import { useGetDownload } from 'hooks/api/libraryHooks';
import globalize from 'lib/globalize';
import { download } from 'scripts/fileDownloader';

3
src/apps/experimental/features/details/components/buttons/InstantMixButton.tsx
View File

@@ -1,6 +1,7 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import ExploreIcon from '@mui/icons-material/Explore';
import { playbackManager } from 'components/playback/playbackmanager';
import globalize from 'lib/globalize';
import type { ItemDto } from 'types/base/models/item-dto';

3
src/apps/experimental/features/details/components/buttons/MoreCommandsButton.tsx
View File

@@ -1,7 +1,8 @@
import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import MoreVertIcon from '@mui/icons-material/MoreVert';
import { useQueryClient } from '@tanstack/react-query';
import { useApi } from 'hooks/useApi';
import { useGetItemByType } from '../../hooks/api/useGetItemByType';
import globalize from 'lib/globalize';

3
src/apps/experimental/features/details/components/buttons/PlayOrResumeButton.tsx
View File

@@ -1,8 +1,9 @@
import React, { FC, useCallback, useMemo } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import PlayArrowIcon from '@mui/icons-material/PlayArrow';
import ReplayIcon from '@mui/icons-material/Replay';
import { useQueryClient } from '@tanstack/react-query';
import { useApi } from 'hooks/useApi';
import { getChannelQuery } from 'hooks/api/liveTvHooks/useGetChannel';
import globalize from 'lib/globalize';

3
src/apps/experimental/features/details/components/buttons/PlayTrailerButton.tsx
View File

@@ -1,6 +1,7 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import TheatersIcon from '@mui/icons-material/Theaters';
import { playbackManager } from 'components/playback/playbackmanager';
import globalize from 'lib/globalize';
import type { ItemDto } from 'types/base/models/item-dto';

2
src/apps/experimental/features/details/components/buttons/ShuffleButton.tsx
View File

@@ -1,5 +1,5 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import ShuffleIcon from '@mui/icons-material/Shuffle';
import { playbackManager } from 'components/playback/playbackmanager';

3
src/apps/experimental/features/details/components/buttons/SplitVersionsButton.tsx
View File

@@ -1,7 +1,8 @@
import React, { FC, useCallback } from 'react';
import { IconButton } from '@mui/material';
import IconButton from '@mui/material/IconButton';
import CallSplitIcon from '@mui/icons-material/CallSplit';
import { useQueryClient } from '@tanstack/react-query';
import { useDeleteAlternateSources } from 'hooks/api/videosHooks';
import globalize from 'lib/globalize';
import confirm from 'components/confirm/confirm';

3
src/apps/stable/features/search/api/useSearchSuggestions.ts
View File

@@ -1,9 +1,10 @@
import type { AxiosRequestConfig } from 'axios';
import type { Api } from '@jellyfin/sdk';
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client';
import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import { getItemsApi } from '@jellyfin/sdk/lib/utils/api/items-api';
import { useQuery } from '@tanstack/react-query';
import { useApi } from 'hooks/useApi';
const fetchGetItems = async (

4
src/components/common/Media.tsx
View File

@@ -1,5 +1,7 @@
import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
import React, { type FC } from 'react';
import Image from './Image';
import DefaultIconText from './DefaultIconText';
import type { ItemDto } from 'types/base/models/item-dto';

3
src/components/listview/List/ListViewUserDataButtons.tsx
View File

@@ -1,5 +1,6 @@
import React, { type FC } from 'react';
import { Box } from '@mui/material';
import Box from '@mui/material/Box';
import itemHelper from '../../itemHelper';
import PlayedButton from 'elements/emby-playstatebutton/PlayedButton';
import FavoriteButton from 'elements/emby-ratingbutton/FavoriteButton';

5
src/components/listview/List/listHelper.ts
View File

@@ -1,8 +1,9 @@
import { Api } from '@jellyfin/sdk';
import { BaseItemKind, ImageType } from '@jellyfin/sdk/lib/generated-client';
import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
import { ImageType } from '@jellyfin/sdk/lib/generated-client/models/image-type';
import { getImageApi } from '@jellyfin/sdk/lib/utils/api/image-api';
import globalize from 'lib/globalize';
import globalize from 'lib/globalize';
import type { ItemDto } from 'types/base/models/item-dto';
import type { ListOptions } from 'types/listOptions';

2
src/components/metadataEditor/personEditor.js
View File

@@ -1,8 +1,8 @@
import { PersonKind } from '@jellyfin/sdk/lib/generated-client/models/person-kind';
import dialogHelper from '../dialogHelper/dialogHelper';
import layoutManager from '../layoutManager';
import globalize from '../../lib/globalize';
import { PersonKind } from '@jellyfin/sdk/lib/generated-client';
import '../../elements/emby-button/paper-icon-button-light';
import '../../elements/emby-input/emby-input';
import '../../elements/emby-select/emby-select';

2
src/components/themeMediaPlayer.js
View File

@@ -1,3 +1,4 @@
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import { MediaType } from '@jellyfin/sdk/lib/generated-client/models/media-type';
import { getLibraryApi } from '@jellyfin/sdk/lib/utils/api/library-api';
@@ -10,7 +11,6 @@ import { queryClient } from 'utils/query/queryClient';
import { playbackManager } from './playback/playbackmanager';
import ServerConnections from './ServerConnections';
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client';
let currentOwnerId;
let currentThemeIds = [];

7
src/elements/emby-itemscontainer/ItemsContainer.tsx
View File

@@ -1,13 +1,12 @@
import {
MediaType,
type LibraryUpdateInfo
} from '@jellyfin/sdk/lib/generated-client';
import type { LibraryUpdateInfo } from '@jellyfin/sdk/lib/generated-client/models/library-update-info';
import { MediaType } from '@jellyfin/sdk/lib/generated-client/models/media-type';
import { ApiClient } from 'jellyfin-apiclient';
import React, { type FC, type PropsWithChildren, useCallback, useEffect, useRef } from 'react';
import classNames from 'classnames';
import Box from '@mui/material/Box';
import Sortable from 'sortablejs';
import { useQueryClient } from '@tanstack/react-query';
import { usePlaylistsMoveItemMutation } from 'hooks/useFetchItems';
import Events, { type Event } from 'utils/events';
import serverNotifications from 'scripts/serverNotifications';

3
src/elements/emby-playstatebutton/PlayedButton.tsx
View File

@@ -1,9 +1,10 @@
import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
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 { IconButton } from '@mui/material';
import classNames from 'classnames';
import globalize from 'lib/globalize';
import { useTogglePlayedMutation } from 'hooks/useFetchItems';

3
src/elements/emby-ratingbutton/FavoriteButton.tsx
View File

@@ -1,7 +1,8 @@
import React, { type FC, useCallback } from 'react';
import { useQueryClient } from '@tanstack/react-query';
import IconButton from '@mui/material/IconButton';
import FavoriteIcon from '@mui/icons-material/Favorite';
import { IconButton } from '@mui/material';
import classNames from 'classnames';
import { useToggleFavoriteMutation } from 'hooks/useFetchItems';
import globalize from 'lib/globalize';

2
src/themes/UserThemeProvider.tsx
View File

@@ -1,4 +1,4 @@
import { ThemeProvider } from '@mui/material';
import { ThemeProvider } from '@mui/material/styles';
import React, { type FC, type PropsWithChildren, useState, useEffect } from 'react';
import { useLocation } from 'react-router-dom';

6
src/types/sections.ts
View File

@@ -1,5 +1,7 @@
import { BaseItemKind, SortOrder } from '@jellyfin/sdk/lib/generated-client';
import { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import type { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
import type { ItemSortBy } from '@jellyfin/sdk/lib/generated-client/models/item-sort-by';
import type { SortOrder } from '@jellyfin/sdk/lib/generated-client/models/sort-order';
import { CardOptions } from './cardOptions';
import { SectionsView } from './libraryTabContent';