chore(ModList): Clean up

Author: Kathund

apps/oneclient/frontend/src/bindings.gen.ts

@@ -301,12 +301,16 @@ export type VersionType =
  */
 "old_beta"
 
-const ARGS_MAP = { 'oneclient':'{"getBundlesFor":["cluster_id"],"getClustersGroupedByMajor":[],"getVersions":[],"openDevTools":[]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'core':'{"getLogByName":["id","name"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"createCluster":["options"],"openMsaLogin":[],"getWorlds":["id"],"getLogs":["id"],"getGlobalProfile":[],"launchCluster":["id","uuid"],"killProcess":["pid"],"writeSettings":["setting"],"removeCluster":["id"],"updateClusterProfile":["name","profile"],"createSettingsProfile":["name"],"getClusters":[],"getPackage":["provider","slug"],"getMods":["id"],"getRunningProcesses":[],"getUsersFromAuthor":["provider","author"],"getPackageBody":["provider","body"],"installModpack":["modpack","cluster_id"],"setDefaultUser":["uuid"],"getUser":["uuid"],"getClusterById":["id"],"searchPackages":["provider","query"],"convertUsernameUUID":["username_uuid"],"getLoadersForVersion":["mc_version"],"changeSkin":["access_token","skin_url","skin_variant"],"isClusterRunning":["cluster_id"],"readSettings":[],"getProfileOrDefault":["name"],"open":["input"],"fetchMinecraftProfile":["uuid"],"changeCape":["access_token","cape_uuid"],"getScreenshots":["id"],"getGameVersions":[],"getUsers":[],"updateClusterById":["id","request"],"removeUser":["uuid"],"getDefaultUser":["fallback"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCape":["access_token"],"getMultiplePackages":["provider","slugs"],"getRunningProcessesByClusterId":["cluster_id"],"fetchLoggedInProfile":["access_token"]}' }
-export type Router = { 'folders': { fromCluster: (folderName: string) => Promise<string>, 
-openCluster: (folderName: string) => Promise<null> },
-'events': { ingress: (event: IngressPayload) => Promise<void>, 
+const ARGS_MAP = { 'core':'{"getLogByName":["id","name"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"createCluster":["options"],"openMsaLogin":[],"getWorlds":["id"],"getLogs":["id"],"getGlobalProfile":[],"launchCluster":["id","uuid"],"killProcess":["pid"],"writeSettings":["setting"],"removeCluster":["id"],"updateClusterProfile":["name","profile"],"createSettingsProfile":["name"],"getClusters":[],"getPackage":["provider","slug"],"getMods":["id"],"getRunningProcesses":[],"getUsersFromAuthor":["provider","author"],"getPackageBody":["provider","body"],"installModpack":["modpack","cluster_id"],"setDefaultUser":["uuid"],"getUser":["uuid"],"getClusterById":["id"],"searchPackages":["provider","query"],"convertUsernameUUID":["username_uuid"],"getLoadersForVersion":["mc_version"],"changeSkin":["access_token","skin_url","skin_variant"],"isClusterRunning":["cluster_id"],"readSettings":[],"getProfileOrDefault":["name"],"open":["input"],"fetchMinecraftProfile":["uuid"],"changeCape":["access_token","cape_uuid"],"getScreenshots":["id"],"getGameVersions":[],"getUsers":[],"updateClusterById":["id","request"],"removeUser":["uuid"],"getDefaultUser":["fallback"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"removeCape":["access_token"],"getMultiplePackages":["provider","slugs"],"getRunningProcessesByClusterId":["cluster_id"],"fetchLoggedInProfile":["access_token"]}', 'oneclient':'{"getBundlesFor":["cluster_id"],"getVersions":[],"openDevTools":[],"getClustersGroupedByMajor":[]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}' }
+export type Router = { 'events': { ingress: (event: IngressPayload) => Promise<void>, 
 message: (event: MessagePayload) => Promise<void>, 
 process: (event: ProcessPayload) => Promise<void> },
+'folders': { fromCluster: (folderName: string) => Promise<string>, 
+openCluster: (folderName: string) => Promise<null> },
+'oneclient': { openDevTools: () => Promise<void>, 
+getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
+getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>, 
+getVersions: () => Promise<OnlineClusterManifest> },
 'core': { getClusters: () => Promise<ClusterModel[]>, 
 getClusterById: (id: number) => Promise<ClusterModel | null>, 
 removeCluster: (id: number) => Promise<null>, 
@@ -351,11 +355,7 @@ changeSkin: (accessToken: string, skinUrl: string, skinVariant: SkinVariant) =>
 changeCape: (accessToken: string, capeUuid: string) => Promise<MojangFullPlayerProfile>, 
 removeCape: (accessToken: string) => Promise<MojangFullPlayerProfile>, 
 convertUsernameUUID: (usernameUuid: string) => Promise<MowojangProfile>, 
-open: (input: string) => Promise<null> },
-'oneclient': { openDevTools: () => Promise<void>, 
-getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>>, 
-getBundlesFor: (clusterId: number) => Promise<ModpackArchive[]>, 
-getVersions: () => Promise<OnlineClusterManifest> } };
+open: (input: string) => Promise<null> } };
 
 
 export type { InferCommandOutput }

apps/oneclient/frontend/src/components/Bundle/Bundle.tsx

@@ -17,8 +17,8 @@ export function Bundle({ bundleData, cluster }: BundleProps) {
 	return (
 		<OverlayScrollbarsComponent>
 			<div className={twMerge('grid gap-2 max-h-112 p-1 bg-page-elevated rounded-lg', useGridLayout || useVerticalGridLayout ? 'grid-cols-3' : 'grid-cols-1')}>
-				{bundleData.manifest.files.map((file, index) => (
-					<ModCard cluster={cluster} file={file} key={index} />
+				{bundleData.manifest.files.map((file) => (
+					<ModCard cluster={cluster} file={file} key={'Managed' in file.kind ? file.kind.Managed[0].id : file.kind.External.url} />
 				))}
 				<div className="h-1" />
 			</div>

apps/oneclient/frontend/src/components/Bundle/ModCard.tsx

@@ -85,7 +85,7 @@ interface ModCardProps {
 	cluster: ClusterModel;
 }
 
-export type onClickOnMod = (file: ModpackFile, setSelected: React.Dispatch<React.SetStateAction<boolean>>) => void;
+export type onClickOnMod = (file: ModpackFile) => void;
 export interface ModCardContextApi {
 	showModDownloadButton?: boolean;
 	onClickOnMod?: onClickOnMod;
@@ -112,9 +112,12 @@ export function ModCard({ file, cluster }: ModCardProps) {
 	}, [file, useVerticalGridLayout]);
 
 	const [isSelected, setSelected] = useState(mods?.includes(file) ?? false);
+	useEffect(() => {
+		setSelected(mods?.includes(file) ?? false);
+	}, [mods, file]);
 	const handleOnClick = () => {
 		if (onClickOnMod)
-			onClickOnMod(file, setSelected);
+			onClickOnMod(file);
 	};
 
 	const { setting } = useSettings();

apps/oneclient/frontend/src/components/Bundle/ModList.tsx

@@ -23,7 +23,7 @@ export function ModList({ bundles, cluster, selectedTab, onTabChange }: ModListP
 		<Tabs defaultValue={selectedTab ?? getBundleName(bundles[0].manifest.name)} onTabChange={onTabChange}>
 			<TabList className="justify-between px-4">
 				<div className="flex flex-row gap-6 px-2">
-					{bundles.map(bundle => <Tab key={getBundleName(bundle.manifest.name)} value={getBundleName(bundle.manifest.name)}>{getBundleName(bundle.manifest.name)}</Tab>)}
+					{bundles.map(bundle => <Tab key={bundle.path} value={getBundleName(bundle.manifest.name)}>{getBundleName(bundle.manifest.name)}</Tab>)}
 				</div>
 				{!useVerticalGridLayout && (
 					<Button onPress={() => setUseGrid(!useGridLayout)}>

apps/oneclient/frontend/src/routes/onboarding/preferences/versionCategory.tsx

@@ -95,26 +95,24 @@ function ModCategory({ bundleData, name }: { bundleData: BundleData; name: strin
 }
 
 function ModCategoryCard({ art, fullVersionName, bundle, mods, setMods, clusterId }: { fullVersionName: string; art: string; bundle: ModpackArchive; mods: Array<ModpackFile>; setMods: React.Dispatch<React.SetStateAction<Array<ModpackFile>>>; clusterId: number }) {
-	const [isSelected, setSelected] = useState<boolean>(false);
 	const files = bundle.manifest.files;
+	const isSelected = files.every(file => mods.includes(file));
 	const handleDownload = () => {
 		setMods((prevMods) => {
 			if (isSelected)
 				return prevMods.filter(mod => !files.includes(mod));
 			else
 				return [...files, ...prevMods];
 		});
-		setSelected(prev => !prev);
 	};
 
-	const onClickOnMod: onClickOnMod = (file, setSelected) => {
+	const onClickOnMod: onClickOnMod = (file) => {
 		setMods((prevMods) => {
 			if (prevMods.includes(file))
 				return prevMods.filter(mod => mod !== file);
 			else
 				return [file, ...prevMods];
 		});
-		setSelected(prev => !prev);
 	};
 
 	const context = useMemo<ModCardContextApi>(() => ({