Merge pull request 'fix/theme-playlists-performance' (#1) from fix/theme-playlists-performance into master
All checks were successful
Deploy to production / build (push) Successful in 20s

Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
2026-10-12 11:21:30 -05:00

View File

@@ -2,7 +2,7 @@ import { Box, Group, LoadingOverlay, SimpleGrid, Stack, Text } from '@mantine/co
import { useDebouncedValue, useDisclosure } from '@mantine/hooks'; import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
import { NoItemsFound, SettingsHeader } from 'components'; import { NoItemsFound, SettingsHeader } from 'components';
import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks'; import { useCommonHooks, useMutationAPI, useQueryAPI } from 'hooks';
import { useEffect, useState } from 'react'; import { useCallback, useEffect, useMemo, useState } from 'react';
import { FiChevronRight } from 'react-icons/fi'; import { FiChevronRight } from 'react-icons/fi';
import { textClasses } from 'styles'; import { textClasses } from 'styles';
import type { Theme, ThemePlaylist } from 'types'; import type { Theme, ThemePlaylist } from 'types';
@@ -21,13 +21,17 @@ export function ThemePlaylists() {
}); });
const [searchValue, setSearchValue] = useState<string | number>(''); const [searchValue, setSearchValue] = useState<string | number>('');
const [debouncedSearch] = useDebouncedValue(searchValue, 500); const [debouncedSearch] = useDebouncedValue(searchValue, 500);
const themePlaylists: ThemePlaylist[] =
themePlaylistData?.filter( const themePlaylists: ThemePlaylist[] = useMemo(() => {
(a: ThemePlaylist) => return (
a.name.toLowerCase().includes((debouncedSearch as string).toLowerCase()) || themePlaylistData?.filter(
a.name.includes('Time of Day'), (a: ThemePlaylist) =>
) || []; a.name.toLowerCase().includes((debouncedSearch as string).toLowerCase()) ||
const defaultPlaylist = { a.name.includes('Time of Day'),
) || []
);
}, [themePlaylistData, debouncedSearch]);
const defaultPlaylist: ThemePlaylist = {
id: undefined, id: undefined,
default: 0, default: 0,
name: 'New Playlist', name: 'New Playlist',
@@ -40,30 +44,94 @@ export function ThemePlaylists() {
const { currentThemePlaylist, theme, isMobile } = useCommonHooks(); const { currentThemePlaylist, theme, isMobile } = useCommonHooks();
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const handleOpen = (playlist: ThemePlaylist) => { const handleOpen = useCallback(
setSelectedPlaylist(playlist); (playlist: ThemePlaylist) => {
open(); setSelectedPlaylist(playlist);
}; open();
},
[open],
);
const handleClose = () => { const handleClose = useCallback(() => {
setSelectedPlaylist(defaultPlaylist); setSelectedPlaylist(defaultPlaylist);
close(); close();
}; }, [close]);
const handleSavePlaylist = () => { const handleSavePlaylist = useCallback(() => {
mutateAsync({ mutateAsync({
method: selectedPlaylist?.id === undefined ? 'POST' : 'PATCH', method: selectedPlaylist?.id === undefined ? 'POST' : 'PATCH',
endpoint: themePlaylistsEndpoint, endpoint: themePlaylistsEndpoint,
body: selectedPlaylist ?? {}, body: selectedPlaylist ?? {},
}); });
close(); close();
}; }, [selectedPlaylist, mutateAsync, themePlaylistsEndpoint, close]);
useEffect(() => { useEffect(() => {
if (debouncedSearch === searchValue) { if (debouncedSearch === searchValue) {
setIsLoading(false); setIsLoading(false);
} }
}, [debouncedSearch]); }, [debouncedSearch, searchValue]);
const allThemesIds = useMemo(
() => allThemeData?.map((a: Theme) => a.id) ?? [],
[allThemeData],
);
const backgroundsThemes = useMemo(
() =>
allThemeData?.filter(
(a: any) => !a.backgroundImage.toLowerCase().includes('none'),
) ?? [],
[allThemeData],
);
const noBackgroundsThemes = useMemo(
() =>
allThemeData?.filter((a: any) =>
a.backgroundImage.toLowerCase().includes('none'),
) ?? [],
[allThemeData],
);
const timeOfDayPlaylist = useMemo(() => {
const found = themePlaylists?.find((a: ThemePlaylist) => a.name === 'Time of Day');
return {
id: found?.id,
name: 'Time of Day',
default: 1,
themeList: found?.themeList ?? '[]',
};
}, [themePlaylists]);
const allStack = useMemo(
() => ({
id: undefined,
name: 'All',
default: 1,
themeList: `[${allThemesIds.join(',')}]`,
}),
[allThemesIds],
);
const backgroundsStack = useMemo(
() => ({
id: undefined,
name: 'Backgrounds',
default: 1,
themeList: `[${backgroundsThemes.map((a: Theme) => a.id).join(',')}]`,
}),
[backgroundsThemes],
);
const noBackgroundsStack = useMemo(
() => ({
id: undefined,
name: 'No Backgrounds',
default: 1,
themeList: `[${noBackgroundsThemes.map((a: Theme) => a.id).join(',')}]`,
}),
[noBackgroundsThemes],
);
return ( return (
<Stack> <Stack>
@@ -108,7 +176,7 @@ export function ThemePlaylists() {
/> />
{allThemeData && ( {allThemeData && (
<> <>
<Group justify='center' align='center' pos={'relative'}> <Stack w={'100%'} justify='center' align='center' pos={'relative'}>
<Text <Text
p={0} p={0}
className={textClasses.settingsSubTitle} className={textClasses.settingsSubTitle}
@@ -116,195 +184,171 @@ export function ThemePlaylists() {
> >
Defaults Defaults
</Text> </Text>
</Group> <Group>
<Group justify='center' align='center' pos={'relative'}> <Group pos={'relative'}>
<Group pos={'relative'}> {'All' === currentThemePlaylist && (
{'All' === currentThemePlaylist && ( <FiChevronRight
<FiChevronRight style={{
style={{ position: 'absolute',
position: 'absolute', left: -14,
left: -14, zIndex: 10,
zIndex: 10, fontSize: '2rem',
fontSize: '2rem', fontWeight: 'bold',
fontWeight: 'bold', borderRadius: '50%',
borderRadius: '50%', backgroundColor: 'var(--mantine-color-border-0)',
backgroundColor: 'var(--mantine-color-border-0)', color: 'var(--mantine-color-background-0)',
color: 'var(--mantine-color-background-0)', }}
}} />
/> )}
)} <Box>
<Box> <ThemePlaylistStack
<ThemePlaylistStack cardPlaylist={allStack}
cardPlaylist={{ handleOpen={handleOpen}
id: undefined, allThemes={allThemeData}
name: 'All', />
default: 1, </Box>
themeList: `[${allThemeData?.map((a: Theme) => a.id) ?? ''}]`,
}}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
<Group pos={'relative'}>
{'Backgrounds' === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-background-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={{
id: undefined,
name: 'Backgrounds',
default: 1,
themeList: `[${allThemeData?.filter((a: any) => !a.backgroundImage.toLowerCase().includes('none')).map((a: Theme) => a.id) ?? ''}]`,
}}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
<Group pos={'relative'}>
{'No Backgrounds' === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-background-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={{
id: undefined,
name: 'No Backgrounds',
default: 1,
themeList: `[${allThemeData?.filter((a: any) => a.backgroundImage.toLowerCase().includes('none')).map((a: Theme) => a.id) ?? ''}]`,
}}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
<Group pos={'relative'}>
{'Time of Day' === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-background-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={{
id:
themePlaylists?.find(
(a: ThemePlaylist) => a.name === 'Time of Day',
)?.id ?? undefined,
name: 'Time of Day',
default: 1,
themeList:
themePlaylists?.find(
(a: ThemePlaylist) => a.name === 'Time of Day',
)?.themeList ?? '[]',
}}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
</Group>
<Group justify='center' align='center' pos={'relative'}>
<Text
p={0}
className={textClasses.settingsSubTitle}
classNames={textClasses}
>
User Made
</Text>
</Group>
<Group
justify='center'
align='center'
pos={'relative'}
mb={isMobile ? '6rem' : undefined}
>
{themePlaylists.length > 1 ? (
<SimpleGrid cols={isMobile ? 1 : 4}>
{themePlaylists
.filter((playlist: ThemePlaylist) => playlist.default === 0)
.sort((a: ThemePlaylist, b: ThemePlaylist) =>
a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase() ? 1 : -1,
)
.map((cardPlaylist: ThemePlaylist) => {
return (
<Group key={cardPlaylist.name} pos={'relative'}>
{cardPlaylist.name === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-primary-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={cardPlaylist}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
);
})}
</SimpleGrid>
) : (
<Group w={'100%'} style={{ display: 'flex', justifyContent: 'center' }}>
<NoItemsFound />
</Group> </Group>
)} <Group pos={'relative'}>
</Group> {'Backgrounds' === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-background-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={backgroundsStack}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
<Group pos={'relative'}>
{'No Backgrounds' === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-background-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={noBackgroundsStack}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
<Group pos={'relative'}>
{'Time of Day' === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-background-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={timeOfDayPlaylist}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
</Group>
</Stack>
<Stack w={'100%'} justify='center' align='center' pos={'relative'}>
<Group justify='center' align='center' pos={'relative'}>
<Text
p={0}
className={textClasses.settingsSubTitle}
classNames={textClasses}
>
User Made
</Text>
</Group>
<Group
justify='center'
align='center'
pos={'relative'}
mb={isMobile ? '6rem' : undefined}
>
{themePlaylists.length > 1 ? (
<SimpleGrid cols={isMobile ? 1 : 4}>
{themePlaylists
.filter((playlist: ThemePlaylist) => playlist.default === 0)
.sort((a: ThemePlaylist, b: ThemePlaylist) =>
a.name.toLocaleLowerCase() > b.name.toLocaleLowerCase() ? 1 : -1,
)
.map((cardPlaylist: ThemePlaylist) => {
return (
<Group key={cardPlaylist.name} pos={'relative'}>
{cardPlaylist.name === currentThemePlaylist && (
<FiChevronRight
style={{
position: 'absolute',
left: -14,
zIndex: 10,
fontSize: '2rem',
fontWeight: 'bold',
borderRadius: '50%',
backgroundColor: 'var(--mantine-color-border-0)',
color:
theme.borderColor === theme.primaryColor
? 'var(--mantine-color-accent-0)'
: 'var(--mantine-color-primary-0)',
}}
/>
)}
<Box>
<ThemePlaylistStack
cardPlaylist={cardPlaylist}
handleOpen={handleOpen}
allThemes={allThemeData}
/>
</Box>
</Group>
);
})}
</SimpleGrid>
) : (
<Group w={'100%'} style={{ display: 'flex', justifyContent: 'center' }}>
<NoItemsFound />
</Group>
)}
</Group>
</Stack>
</> </>
)} )}
</Stack> </Stack>