Move LibraryItem type

src/renderer/api/types.ts

@@ -45,6 +45,14 @@ import {
   SSGenreList,
 } from '/@/renderer/api/subsonic.types';
 
+export enum LibraryItem {
+  ALBUM = 'album',
+  ALBUM_ARTIST = 'albumArtist',
+  ARTIST = 'artist',
+  PLAYLIST = 'playlist',
+  SONG = 'song',
+}
+
 export enum SortOrder {
   ASC = 'ASC',
   DESC = 'DESC',

src/renderer/components/card/album-card.tsx

@@ -6,10 +6,10 @@ import { Link } from 'react-router-dom';
 import { SimpleImg } from 'react-simple-img';
 import styled from 'styled-components';
 import { Text } from '/@/renderer/components/text';
-import type { LibraryItem, CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
+import type { CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
 import { Skeleton } from '/@/renderer/components/skeleton';
 import { CardControls } from '/@/renderer/components/card/card-controls';
-import { Album } from '/@/renderer/api/types';
+import { Album, LibraryItem } from '/@/renderer/api/types';
 
 const CardWrapper = styled.div<{
   link?: boolean;

src/renderer/components/card/card-controls.tsx

@@ -6,9 +6,10 @@ import { RiPlayFill, RiMore2Fill, RiHeartFill, RiHeartLine } from 'react-icons/r
 import styled from 'styled-components';
 import { _Button } from '/@/renderer/components/button';
 import { DropdownMenu } from '/@/renderer/components/dropdown-menu';
-import type { LibraryItem, PlayQueueAddOptions } from '/@/renderer/types';
+import type { PlayQueueAddOptions } from '/@/renderer/types';
 import { Play } from '/@/renderer/types';
 import { useSettingsStore } from '/@/renderer/store/settings.store';
+import { LibraryItem } from '/@/renderer/api/types';
 
 type PlayButtonType = UnstyledButtonProps & React.ComponentPropsWithoutRef<'button'>;
 

src/renderer/components/grid-carousel/index.tsx

@@ -6,10 +6,11 @@ import { RiArrowLeftSLine, RiArrowRightSLine } from 'react-icons/ri';
 import { Button } from '/@/renderer/components/button';
 import { AppRoute } from '/@/renderer/router/routes';
 import type { CardRow } from '/@/renderer/types';
-import { LibraryItem, Play } from '/@/renderer/types';
+import { Play } from '/@/renderer/types';
 import styled from 'styled-components';
 import { AlbumCard } from '/@/renderer/components/card';
 import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add';
+import { LibraryItem } from '/@/renderer/api/types';
 
 interface GridCarouselProps {
   cardRows: CardRow<any>[];

src/renderer/components/virtual-grid/grid-card/default-card.tsx

@@ -4,10 +4,10 @@ import { generatePath, useNavigate } from 'react-router';
 import { SimpleImg } from 'react-simple-img';
 import type { ListChildComponentProps } from 'react-window';
 import styled from 'styled-components';
-import type { LibraryItem, CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
+import type { CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
 import { Skeleton } from '/@/renderer/components/skeleton';
 import { GridCardControls } from '/@/renderer/components/virtual-grid/grid-card/grid-card-controls';
-import { Album, AlbumArtist, Artist } from '/@/renderer/api/types';
+import { Album, AlbumArtist, Artist, LibraryItem } from '/@/renderer/api/types';
 import { CardRows } from '/@/renderer/components/card';
 
 const CardWrapper = styled.div<{

src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx

@@ -6,9 +6,10 @@ import { RiPlayFill, RiMore2Fill, RiHeartFill, RiHeartLine } from 'react-icons/r
 import styled from 'styled-components';
 import { _Button } from '/@/renderer/components/button';
 import { DropdownMenu } from '/@/renderer/components/dropdown-menu';
-import type { LibraryItem, PlayQueueAddOptions } from '/@/renderer/types';
+import type { PlayQueueAddOptions } from '/@/renderer/types';
 import { Play } from '/@/renderer/types';
 import { useSettingsStore } from '/@/renderer/store/settings.store';
+import { LibraryItem } from '/@/renderer/api/types';
 
 type PlayButtonType = UnstyledButtonProps & React.ComponentPropsWithoutRef<'button'>;
 

src/renderer/components/virtual-grid/grid-card/poster-card.tsx

@@ -6,9 +6,9 @@ import { SimpleImg } from 'react-simple-img';
 import type { ListChildComponentProps } from 'react-window';
 import styled from 'styled-components';
 import { Skeleton } from '/@/renderer/components/skeleton';
-import type { LibraryItem, CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
+import type { CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
 import { GridCardControls } from '/@/renderer/components/virtual-grid/grid-card/grid-card-controls';
-import { Album, Artist, AlbumArtist } from '/@/renderer/api/types';
+import { Album, Artist, AlbumArtist, LibraryItem } from '/@/renderer/api/types';
 import { CardRows } from '/@/renderer/components/card';
 
 const CardWrapper = styled.div<{

src/renderer/components/virtual-grid/virtual-grid-wrapper.tsx

@@ -5,14 +5,8 @@ import type { FixedSizeListProps } from 'react-window';
 import { FixedSizeList } from 'react-window';
 import styled from 'styled-components';
 import { GridCard } from '/@/renderer/components/virtual-grid/grid-card';
-import type {
-  CardRow,
-  LibraryItem,
-  ListDisplayType,
-  CardRoute,
-  PlayQueueAddOptions,
-} from '/@/renderer/types';
-import { Album, AlbumArtist, Artist } from '/@/renderer/api/types';
+import type { CardRow, ListDisplayType, CardRoute, PlayQueueAddOptions } from '/@/renderer/types';
+import { Album, AlbumArtist, Artist, LibraryItem } from '/@/renderer/api/types';
 
 const createItemData = memoize(
   (

src/renderer/components/virtual-grid/virtual-infinite-grid.tsx

@@ -3,8 +3,9 @@ import debounce from 'lodash/debounce';
 import type { FixedSizeListProps } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 import { VirtualGridWrapper } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper';
-import type { CardRoute, CardRow, LibraryItem, PlayQueueAddOptions } from '/@/renderer/types';
+import type { CardRoute, CardRow, PlayQueueAddOptions } from '/@/renderer/types';
 import { ListDisplayType } from '/@/renderer/types';
+import { LibraryItem } from '/@/renderer/api/types';
 
 export type VirtualInfiniteGridRef = {
   resetLoadMoreItemsCache: () => void;

src/renderer/features/albums/components/album-detail-content.tsx

@@ -21,11 +21,11 @@ import { AppRoute } from '/@/renderer/router/routes';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 import { openContextMenu } from '/@/renderer/features/context-menu';
-import { LibraryItem, Play } from '/@/renderer/types';
+import { Play } from '/@/renderer/types';
 import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { PlayButton, PLAY_TYPES } from '/@/renderer/features/shared';
 import { useAlbumList } from '/@/renderer/features/albums/queries/album-list-query';
-import { AlbumListSort, SortOrder } from '/@/renderer/api/types';
+import { AlbumListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 
 const ContentContainer = styled.div`

src/renderer/features/albums/components/album-detail-header.tsx

@@ -2,12 +2,12 @@ import { Group, Stack } from '@mantine/core';
 import { forwardRef, Fragment, Ref } from 'react';
 import { generatePath, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
+import { LibraryItem } from '/@/renderer/api/types';
 import { Text } from '/@/renderer/components';
 import { useAlbumDetail } from '/@/renderer/features/albums/queries/album-detail-query';
 import { LibraryHeader } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { AppRoute } from '/@/renderer/router/routes';
-import { LibraryItem } from '/@/renderer/types';
 import { formatDurationString } from '/@/renderer/utils';
 
 interface AlbumDetailHeaderProps {

src/renderer/features/albums/components/album-list-content.tsx

@@ -8,14 +8,14 @@ import {
   VirtualTable,
 } from '/@/renderer/components';
 import { AppRoute } from '/@/renderer/router/routes';
-import { ListDisplayType, CardRow, LibraryItem } from '/@/renderer/types';
+import { ListDisplayType, CardRow } from '/@/renderer/types';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { MutableRefObject, useCallback, useMemo } from 'react';
 import { ListOnScrollProps } from 'react-window';
 import { api } from '/@/renderer/api';
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { Album, AlbumListSort } from '/@/renderer/api/types';
+import { Album, AlbumListSort, LibraryItem } from '/@/renderer/api/types';
 import { useAlbumList } from '/@/renderer/features/albums/queries/album-list-query';
 import { useQueryClient } from '@tanstack/react-query';
 import {

src/renderer/features/albums/routes/album-detail-route.tsx

@@ -9,7 +9,7 @@ import { AlbumDetailContent } from '/@/renderer/features/albums/components/album
 import { AlbumDetailHeader } from '/@/renderer/features/albums/components/album-detail-header';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { LibraryItem } from '/@/renderer/types';
+import { LibraryItem } from '/@/renderer/api/types';
 
 const AlbumDetailRoute = () => {
   const tableRef = useRef<AgGridReactType | null>(null);

src/renderer/features/artists/components/album-artist-list-content.tsx

@@ -8,13 +8,13 @@ import {
   VirtualTable,
 } from '/@/renderer/components';
 import { AppRoute } from '/@/renderer/router/routes';
-import { ListDisplayType, CardRow, LibraryItem } from '/@/renderer/types';
+import { ListDisplayType, CardRow } from '/@/renderer/types';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { MutableRefObject, useCallback, useMemo } from 'react';
 import { ListOnScrollProps } from 'react-window';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { AlbumArtist, AlbumArtistListSort } from '/@/renderer/api/types';
+import { AlbumArtist, AlbumArtistListSort, LibraryItem } from '/@/renderer/api/types';
 import { useQueryClient } from '@tanstack/react-query';
 import {
   useCurrentServer,

src/renderer/features/context-menu/context-menu-provider.tsx

@@ -2,6 +2,7 @@ import { Divider, Group, Stack } from '@mantine/core';
 import { useClickOutside, useResizeObserver, useSetState, useViewportSize } from '@mantine/hooks';
 import { closeAllModals, openModal } from '@mantine/modals';
 import { createContext, Fragment, useState } from 'react';
+import { LibraryItem } from '/@/renderer/api/types';
 import { ConfirmModal, ContextMenu, ContextMenuButton, Text, toast } from '/@/renderer/components';
 import {
   OpenContextMenuProps,
@@ -10,7 +11,7 @@ import {
 } from '/@/renderer/features/context-menu/events';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { useDeletePlaylist } from '/@/renderer/features/playlists';
-import { LibraryItem, Play } from '/@/renderer/types';
+import { Play } from '/@/renderer/types';
 
 type ContextMenuContextProps = {
   closeContextMenu: () => void;

src/renderer/features/context-menu/events.ts

@@ -1,5 +1,5 @@
 import { createUseExternalEvents } from '@mantine/utils';
-import { LibraryItem } from '/@/renderer/types';
+import { LibraryItem } from '/@/renderer/api/types';
 
 export type OpenContextMenuProps = {
   data: any[];

src/renderer/features/player/hooks/use-handle-playqueue-add.ts

@@ -13,11 +13,11 @@ import {
   usePlayerStore,
 } from '/@/renderer/store';
 import { usePlayerType } from '/@/renderer/store/settings.store';
-import { PlayQueueAddOptions, LibraryItem, Play, PlaybackType } from '/@/renderer/types';
+import { PlayQueueAddOptions, Play, PlaybackType } from '/@/renderer/types';
 import { toast } from '/@/renderer/components/toast';
 import isElectron from 'is-electron';
 import { nanoid } from 'nanoid/non-secure';
-import { SongListSort, SortOrder } from '/@/renderer/api/types';
+import { LibraryItem, SongListSort, SortOrder } from '/@/renderer/api/types';
 
 const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
 

src/renderer/features/playlists/components/playlist-detail-content.tsx

@@ -6,13 +6,13 @@ import { MutableRefObject, useMemo } from 'react';
 import { generatePath, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
+import { LibraryItem } from '/@/renderer/api/types';
 import { Button, getColumnDefs, Text, VirtualTable } from '/@/renderer/components';
 import { openContextMenu } from '/@/renderer/features/context-menu';
 import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { usePlaylistSongListInfinite } from '/@/renderer/features/playlists/queries/playlist-song-list-query';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useSongListStore } from '/@/renderer/store';
-import { LibraryItem } from '/@/renderer/types';
 
 const ContentContainer = styled.div`
   display: flex;

src/renderer/features/playlists/components/playlist-detail-header.tsx

@@ -13,9 +13,9 @@ import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playli
 import { LibraryHeader, PlayButton, PLAY_TYPES } from '/@/renderer/features/shared';
 import { AppRoute } from '/@/renderer/router/routes';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { LibraryItem, Play } from '/@/renderer/types';
+import { Play } from '/@/renderer/types';
 import { formatDurationString } from '/@/renderer/utils';
-import { UserListSort, SortOrder, UserListQuery } from '/@/renderer/api/types';
+import { UserListSort, SortOrder, UserListQuery, LibraryItem } from '/@/renderer/api/types';
 import { useCurrentServer } from '/@/renderer/store';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';

src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx

@@ -17,7 +17,7 @@ import {
   useSetPlaylistDetailTable,
   useSetPlaylistDetailTablePagination,
 } from '/@/renderer/store';
-import { LibraryItem, ListDisplayType } from '/@/renderer/types';
+import { ListDisplayType } from '/@/renderer/types';
 import { useQueryClient } from '@tanstack/react-query';
 import { AnimatePresence } from 'framer-motion';
 import debounce from 'lodash/debounce';
@@ -25,7 +25,13 @@ import { openContextMenu } from '/@/renderer/features/context-menu';
 import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import sortBy from 'lodash/sortBy';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { PlaylistSongListQuery, QueueSong, SongListSort, SortOrder } from '/@/renderer/api/types';
+import {
+  LibraryItem,
+  PlaylistSongListQuery,
+  QueueSong,
+  SongListSort,
+  SortOrder,
+} from '/@/renderer/api/types';
 import { usePlaylistSongList } from '/@/renderer/features/playlists/queries/playlist-song-list-query';
 import { useParams } from 'react-router';
 import { usePlayQueueAdd } from '/@/renderer/features/player';

src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx

@@ -8,7 +8,13 @@ import { useParams } from 'react-router';
 import styled from 'styled-components';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { PlaylistSongListQuery, ServerType, SongListSort, SortOrder } from '/@/renderer/api/types';
+import {
+  LibraryItem,
+  PlaylistSongListQuery,
+  ServerType,
+  SongListSort,
+  SortOrder,
+} from '/@/renderer/api/types';
 import {
   Button,
   DropdownMenu,
@@ -32,7 +38,7 @@ import {
   useSetPlaylistDetailFilters,
   useSetPlaylistStore,
 } from '/@/renderer/store';
-import { LibraryItem, ListDisplayType, Play, TableColumn } from '/@/renderer/types';
+import { ListDisplayType, Play, TableColumn } from '/@/renderer/types';
 
 const FILTERS = {
   jellyfin: [

src/renderer/features/playlists/components/playlist-list-content.tsx

@@ -26,7 +26,7 @@ import {
   useSetPlaylistTable,
   useSetPlaylistTablePagination,
 } from '/@/renderer/store';
-import { LibraryItem, ListDisplayType } from '/@/renderer/types';
+import { ListDisplayType } from '/@/renderer/types';
 import { AnimatePresence } from 'framer-motion';
 import debounce from 'lodash/debounce';
 import { openContextMenu } from '/@/renderer/features/context-menu';
@@ -35,6 +35,7 @@ import sortBy from 'lodash/sortBy';
 import { usePlaylistList } from '/@/renderer/features/playlists/queries/playlist-list-query';
 import { generatePath, useNavigate } from 'react-router';
 import { AppRoute } from '/@/renderer/router/routes';
+import { LibraryItem } from '/@/renderer/api/types';
 
 interface PlaylistListContentProps {
   tableRef: MutableRefObject<AgGridReactType | null>;

src/renderer/features/playlists/routes/playlist-detail-route.tsx

@@ -1,6 +1,7 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { useRef } from 'react';
 import { useParams } from 'react-router';
+import { LibraryItem } from '/@/renderer/api/types';
 import { NativeScrollArea } from '/@/renderer/components';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { PlaylistDetailContent } from '/@/renderer/features/playlists/components/playlist-detail-content';
@@ -9,7 +10,6 @@ import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playli
 import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useFastAverageColor } from '/@/renderer/hooks';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { LibraryItem } from '/@/renderer/types';
 
 const PlaylistDetailRoute = () => {
   const tableRef = useRef<AgGridReactType | null>(null);

src/renderer/features/shared/components/library-header.tsx

@@ -5,9 +5,9 @@ import { RiAlbumFill } from 'react-icons/ri';
 import { Link } from 'react-router-dom';
 import { SimpleImg } from 'react-simple-img';
 import styled from 'styled-components';
+import { LibraryItem } from '/@/renderer/api/types';
 import { Text, TextTitle } from '/@/renderer/components';
 import { useContainerQuery } from '/@/renderer/hooks';
-import { LibraryItem } from '/@/renderer/types';
 
 const HeaderContainer = styled.div<{ imageSize: number }>`
   position: relative;

src/renderer/features/sidebar/components/sidebar.tsx

@@ -37,9 +37,8 @@ import { AppRoute } from '/@/renderer/router/routes';
 import { useSidebarStore, useAppStoreActions, useCurrentSong } from '/@/renderer/store';
 import { fadeIn } from '/@/renderer/styles';
 import { CreatePlaylistForm, usePlaylistList } from '/@/renderer/features/playlists';
-import { PlaylistListSort, SortOrder } from '/@/renderer/api/types';
+import { LibraryItem, PlaylistListSort, SortOrder } from '/@/renderer/api/types';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { LibraryItem } from '/@/renderer/types';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 
 const SidebarContainer = styled.div`

src/renderer/features/songs/components/song-list-content.tsx

@@ -27,14 +27,14 @@ import {
   useSongListStore,
   useSongTablePagination,
 } from '/@/renderer/store';
-import { LibraryItem, ListDisplayType } from '/@/renderer/types';
+import { ListDisplayType } from '/@/renderer/types';
 import { AnimatePresence } from 'framer-motion';
 import debounce from 'lodash/debounce';
 import { openContextMenu } from '/@/renderer/features/context-menu';
 import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import sortBy from 'lodash/sortBy';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { QueueSong } from '/@/renderer/api/types';
+import { LibraryItem, QueueSong } from '/@/renderer/api/types';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 
 interface SongListContentProps {

src/renderer/types.ts

@@ -1,4 +1,4 @@
-import { Album, AlbumArtist, Artist, QueueSong } from '/@/renderer/api/types';
+import { Album, AlbumArtist, Artist, LibraryItem, QueueSong } from '/@/renderer/api/types';
 import { AppRoute } from '/@/renderer/router/routes';
 
 export type TablePagination = {
@@ -33,14 +33,6 @@ export enum ListDisplayType {
   TABLE_PAGINATED = 'paginatedTable',
 }
 
-export enum LibraryItem {
-  ALBUM = 'album',
-  ALBUM_ARTIST = 'albumArtist',
-  ARTIST = 'artist',
-  PLAYLIST = 'playlist',
-  SONG = 'song',
-}
-
 export enum Platform {
   LINUX = 'linux',
   MACOS = 'macos',
@@ -138,20 +130,21 @@ export enum TableColumn {
   DATE_ADDED = 'dateAdded',
   DISC_NUMBER = 'discNumber',
   DURATION = 'duration',
-  FAVORITE = 'favorite',
   GENRE = 'genre',
   LAST_PLAYED = 'lastPlayedAt',
   OWNER = 'username',
   PATH = 'path',
   PLAY_COUNT = 'playCount',
-  RATING = 'rating',
   RELEASE_DATE = 'releaseDate',
   ROW_INDEX = 'rowIndex',
+  SIZE = 'size',
+  SKIP = 'skip',
   SONG_COUNT = 'songCount',
-  // SKIP = 'skip',
   TITLE = 'title',
   TITLE_COMBINED = 'titleCombined',
   TRACK_NUMBER = 'trackNumber',
+  USER_FAVORITE = 'userFavorite',
+  USER_RATING = 'userRating',
   YEAR = 'releaseYear',
 }