Skip to content

Commit 8a29395

Browse files
authored
fix: oneclient versions page delay (#380)
1 parent e19f5a4 commit 8a29395

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,15 @@ export type VersionType =
254254
*/
255255
"old_beta"
256256

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

311311

312312
export type { InferCommandOutput }

apps/oneclient/frontend/src/routes/app/index.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ import type { ButtonProps } from 'react-aria-components';
33
import { GameBackground } from '@/components';
44
import { LaunchButton } from '@/components/LaunchButton';
55
import { useActiveCluster, useLastPlayedClusters } from '@/hooks/useClusters';
6+
import { bindings } from '@/main';
67
import useAppShellStore from '@/stores/appShellStore';
78
import { prettifyLoader } from '@/utils/loaders';
89
import { animations } from '@/utils/motion';
910
import { getVersionInfo, getVersionInfoOrDefault } from '@/utils/versionMap';
11+
import { useCommandSuspense } from '@onelauncher/common';
1012
import { Button } from '@onelauncher/common/components';
1113
import { createFileRoute, useNavigate } from '@tanstack/react-router';
1214
import { DotsGridIcon, Settings04Icon } from '@untitled-theme/icons-react';
@@ -19,6 +21,9 @@ export const Route = createFileRoute('/app/')({
1921
});
2022

2123
function RouteComponent() {
24+
// Preload the clusters for version page
25+
useCommandSuspense(['getClustersGroupedByMajor'], bindings.oneclient.getClustersGroupedByMajor);
26+
2227
const { data: lastPlayedClusters } = useLastPlayedClusters();
2328

2429
const setActiveClusterId = useAppShellStore(state => state.setActiveClusterId);

apps/oneclient/frontend/src/routes/onboarding/finished.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const Route = createFileRoute('/onboarding/finished')({
77

88
function RouteComponent() {
99
const { setSetting } = useSettings();
10-
setSetting('seen_onboarding', true)
10+
setSetting('seen_onboarding', true);
1111

1212
return (
1313
<Link to="/app">

0 commit comments

Comments
 (0)