Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix breaking changes in backend #60

Closed
wants to merge 15 commits into from
+312 −90
Closed

Fix breaking changes in backend #60

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5570cca
I am not very good at frontend
shauneccles Dec 30, 2023
3add0b2
try in the blind
YeonV Jan 3, 2024
e2bf451
fix sVirtuals
YeonV Jan 3, 2024
5331ad3
Fix Edit Scenes Dialog
YeonV Jan 3, 2024
d4c6021
Remove client-side WLED detection during manual WLED add
shauneccles Jan 6, 2024
2296731
GifPicker
YeonV Jan 2, 2024
3b37782
Fix presets
YeonV Jan 3, 2024
9a144f3
Fix Presets
YeonV Jan 3, 2024
d24e98c
Fix Presets ini EditScenesDialog
YeonV Jan 3, 2024
a726c15
Release 2.0.87
YeonV Jan 3, 2024
e0cc06a
Release 2.0.87
YeonV Jan 3, 2024
1a56123
Release 2.0.87
YeonV Jan 3, 2024
d0830f0
remove yarn lock
YeonV Jan 3, 2024
c05cb87
Release 2.0.87
YeonV Jan 3, 2024
6c978bf
Refix presets - incorrect merge resolution
shauneccles Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/Dialogs/SceneDialogs/EditSceneDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ const EditSceneDialog = () => {
JSON.stringify(ordered((ledfx_presets[k] as any).config)) ===
JSON.stringify(
ordered(
// Question: We should already have the preset_id, do we need to remake it here?
scenes[data.name?.toLowerCase().replaceAll(' ', '-')].virtuals[
dev
].config
Expand All @@ -238,6 +239,7 @@ const EditSceneDialog = () => {
) ===
JSON.stringify(
ordered(
// Question: We should already have the preset_id, do we need to remake it here?
scenes[data.name?.toLowerCase().replaceAll(' ', '-')]
.virtuals[dev].config
)
Expand All @@ -254,7 +256,9 @@ const EditSceneDialog = () => {
e.target.value &&
activatePreset(
dev,
'default_presets',
// TODO: Change this from default_presets to either ledfx_presets or user_presets based on the preset that was selected
'user_presets',
// // Question: We should already have the preset_id, do we need to remake it here?
scenes[data.name?.toLowerCase().replaceAll(' ', '-')].virtuals[
dev
].type,
Expand Down
40 changes: 20 additions & 20 deletions src/pages/Device/Presets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ const PresetsCard = ({ virtual, effectType, presets, style }: any) => {
if (list && !Object.keys(list)?.length) {
return (
<Button style={{ margin: '1rem 0 0.5rem 1rem' }} size="medium" disabled>
No {CATEGORY === 'default_presets' ? '' : 'Custom'} Presets
No {CATEGORY === 'ledfx_presets' ? '' : 'Custom'} Presets
</Button>
)
}
Expand All @@ -193,7 +193,7 @@ const PresetsCard = ({ virtual, effectType, presets, style }: any) => {
Object.keys(list).map((preset) => {
return (
<Grid item key={preset}>
{CATEGORY !== 'default_presets' ? (
{CATEGORY !== 'ledfx_presets' ? (
<PresetButton
buttonColor={
JSON.stringify(virtual.effect.config) ===
Expand Down Expand Up @@ -245,7 +245,7 @@ const PresetsCard = ({ virtual, effectType, presets, style }: any) => {
const promises = Object.keys(cloudEffects).flatMap((effect) => {
return cloudEffects[effect].map((p: any, ind: number) => {
return new Promise((resolve) => {
if (!presets.custom_presets[p.effect.ledfx_id]) {
if (!presets.user_presets[p.effect.ledfx_id]) {
setTimeout(() => {
handleCloudPresets(p, true)
resolve(null)
Expand Down Expand Up @@ -281,11 +281,11 @@ const PresetsCard = ({ virtual, effectType, presets, style }: any) => {
/>
<CardContent>
<Grid spacing={2} container>
{renderPresetsButton(presets?.default_presets, 'default_presets')}
{renderPresetsButton(presets?.ledfx_presets, 'ledfx_presets')}
</Grid>
<Divider style={{ margin: '1rem 0' }} />
<Grid spacing={2} container>
{renderPresetsButton(presets?.custom_presets, 'custom_presets')}
{renderPresetsButton(presets?.user_presets, 'user_presets')}
<Grid item>
<Popover
popoverStyle={{ padding: '0.5rem' }}
Expand All @@ -298,25 +298,25 @@ const PresetsCard = ({ virtual, effectType, presets, style }: any) => {
<TextField
onKeyDown={(e: any) => e.key === 'Enter' && handleAddPreset()}
error={
presets.default_presets &&
(Object.keys(presets.default_presets).indexOf(name) > -1 ||
Object.values(presets.default_presets).filter(
presets.ledfx_presets &&
(Object.keys(presets.ledfx_presets).indexOf(name) > -1 ||
Object.values(presets.ledfx_presets).filter(
(p: any) => p.name === name
).length > 0)
}
size="small"
id="presetNameInput"
label={
presets.default_presets &&
(Object.keys(presets.default_presets).indexOf(name) > -1 ||
Object.values(presets.default_presets).filter(
presets.ledfx_presets &&
(Object.keys(presets.ledfx_presets).indexOf(name) > -1 ||
Object.values(presets.ledfx_presets).filter(
(p: any) => p.name === name
).length > 0)
? 'Default presets are readonly'
: presets.custom_presets &&
(Object.keys(presets.custom_presets).indexOf(name) >
: presets.user_presets &&
(Object.keys(presets.user_presets).indexOf(name) >
-1 ||
Object.values(presets.custom_presets).filter(
Object.values(presets.user_presets).filter(
(p: any) => p.name === name
).length > 0)
? 'Preset already exsisting'
Expand All @@ -327,11 +327,11 @@ const PresetsCard = ({ virtual, effectType, presets, style }: any) => {
onChange={(e) => {
setName(e.target.value)
if (
presets.custom_presets &&
(Object.keys(presets.custom_presets).indexOf(
presets.user_presets &&
(Object.keys(presets.user_presets).indexOf(
e.target.value
) > -1 ||
Object.values(presets.custom_presets).filter(
Object.values(presets.user_presets).filter(
(p: any) => p.name === e.target.value
).length > 0)
) {
Expand All @@ -354,9 +354,9 @@ const PresetsCard = ({ virtual, effectType, presets, style }: any) => {
}
confirmDisabled={
name.length === 0 ||
(presets.default_presets &&
(Object.keys(presets.default_presets).indexOf(name) > -1 ||
Object.values(presets.default_presets).filter(
(presets.ledfx_presets &&
(Object.keys(presets.ledfx_presets).indexOf(name) > -1 ||
Object.values(presets.ledfx_presets).filter(
(p: any) => p.name === name
).length > 0)) ||
!valid
Expand Down
14 changes: 7 additions & 7 deletions src/pages/Home/BladeScene.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ const BladeScene = ({ onClick }: { onClick: () => void }) => {
// if (noAuto) {
large.map((v) => {
setEffect(v, 'melt', {}, true)
return activatePreset(v, 'default_presets', 'melt', 'purple-red')
return activatePreset(v, 'ledfx_presets', 'melt', 'purple-red')
})
medium.map((v, _i) => {
setEffect(v, 'blade_power_plus', {}, true)
// if (_i % 2 === 0)
// updateEffect(v, 'blade_power_plus', { flip: true }, false)
return activatePreset(
v,
'default_presets',
'ledfx_presets',
'blade_power_plus',
'purplered-bass'
)
Expand All @@ -57,7 +57,7 @@ const BladeScene = ({ onClick }: { onClick: () => void }) => {
setEffect(v, 'blade_power_plus', {}, true)
return activatePreset(
v,
'default_presets',
'ledfx_presets',
'blade_power_plus',
'orange-hi-hat'
)
Expand All @@ -68,15 +68,15 @@ const BladeScene = ({ onClick }: { onClick: () => void }) => {
(a, b) => virtuals[a].pixel_count - virtuals[b].pixel_count
)[0]
setEffect(v, 'blade_power_plus', {}, true)
activatePreset(v, 'default_presets', 'blade_power_plus', 'orange-hi-hat')
activatePreset(v, 'ledfx_presets', 'blade_power_plus', 'orange-hi-hat')
}
// Use medium as large
if (Object.keys(large).length === 0 && Object.keys(medium).length > 2) {
const v = medium.sort(
(a, b) => virtuals[a].pixel_count - virtuals[b].pixel_count
)[Object.keys(medium).length - 1]
setEffect(v, 'melt', {}, true)
activatePreset(v, 'default_presets', 'melt', 'purple-red')
activatePreset(v, 'ledfx_presets', 'melt', 'purple-red')
}

// Use large as smalls
Expand All @@ -85,15 +85,15 @@ const BladeScene = ({ onClick }: { onClick: () => void }) => {
(a, b) => virtuals[a].pixel_count - virtuals[b].pixel_count
)[0]
setEffect(v, 'blade_power_plus', {}, true)
activatePreset(v, 'default_presets', 'blade_power_plus', 'orange-hi-hat')
activatePreset(v, 'ledfx_presets', 'blade_power_plus', 'orange-hi-hat')
}
// Use large as medium
if (Object.keys(medium).length === 0 && Object.keys(large).length > 2) {
const v = large.sort(
(a, b) => virtuals[a].pixel_count - virtuals[b].pixel_count
)[1]
setEffect(v, 'blade_power_plus', {}, true)
activatePreset(v, 'default_presets', 'blade_power_plus', 'purplered-bass')
activatePreset(v, 'ledfx_presets', 'blade_power_plus', 'purplered-bass')
}
if (Object.keys(matrix).length > 0) {
matrix.map((v) => {
Expand Down
4 changes: 2 additions & 2 deletions src/store/api/storeConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export interface IPreset {
}
export interface IPresets {
effect: string
default_presets: Record<string, IPreset>
custom_presets: Record<string, IPreset>
ledfx_presets: Record<string, IPreset>
user_presets: Record<string, IPreset>
}

export interface IDevice {
Expand Down