From 2e750f3d5ae422ec4254dc7a512bc345b9246290 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:29:58 +0200 Subject: [PATCH] chore : use name instead of "_id" beacause BeatMods is broken --- .../version-viewer/slides/mods/mods-grid.component.tsx | 10 +++++----- .../slides/mods/mods-slide.component.tsx | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/renderer/components/version-viewer/slides/mods/mods-grid.component.tsx b/src/renderer/components/version-viewer/slides/mods/mods-grid.component.tsx index d45414f3..206941f8 100644 --- a/src/renderer/components/version-viewer/slides/mods/mods-grid.component.tsx +++ b/src/renderer/components/version-viewer/slides/mods/mods-grid.component.tsx @@ -24,7 +24,7 @@ export function ModsGrid({ modsMap, installed, modsSelected, onModChange, moreIn if (!installed?.get(key)) { return undefined; } - const installedMod = installed.get(key).find(m => m._id === mod._id); + const installedMod = installed.get(key).find(m => m.name === mod.name); if (!installedMod) { return undefined; } @@ -36,16 +36,16 @@ export function ModsGrid({ modsMap, installed, modsSelected, onModChange, moreIn const deps = m.dependencies.map(dep => Array.from(modsMap.values()) .flat() - .find(m => dep._id === m._id) + .find(m => dep.name === m.name) ); - if (deps.some(depMod => depMod._id === mod._id)) { + if (deps.some(depMod => depMod.name === mod.name)) { return true; } - return deps.some(depMod => depMod.dependencies.some(depModDep => depModDep._id === mod._id)); + return deps.some(depMod => depMod.dependencies.some(depModDep => depModDep.name === mod.name)); }); }; - const isSelected = (mod: Mod): boolean => modsSelected.some(m => m._id === mod._id); + const isSelected = (mod: Mod): boolean => modsSelected.some(m => m.name === mod.name); const handleInput = (val: string) => setFilter(val.toLowerCase()); diff --git a/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx b/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx index 52ef38b6..3010ca6d 100644 --- a/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx +++ b/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx @@ -57,14 +57,14 @@ export function ModsSlide({ version, onDisclamerDecline }: { version: BSVersion; if (selected) { return setModsSelected(mods => { - if (mods.some(m => m._id === mod._id)) { + if (mods.some(m => m.name === mod.name)) { return mods; } return [...mods, mod]; }); } - setModsSelected(mods => mods.filter(m => m._id !== mod._id)); + setModsSelected(mods => mods.filter(m => m.name !== mod.name)); }; const handleMoreInfo = (mod: Mod) => { @@ -90,7 +90,7 @@ export function ModsSlide({ version, onDisclamerDecline }: { version: BSVersion; } const modsToInstall = modsSelected.filter(mod => { - const installedMod = modsInstalled.get(mod.category)?.find(installedMod => installedMod._id === mod._id); + const installedMod = modsInstalled.get(mod.category)?.find(installedMod => installedMod.name === mod.name); if(reinstallAll || !installedMod){ return true; }