add replace to a bunch of redirects

spacedriveapp · Dec 7, 2023 · 685f743 · 685f743
1 parent 0c42558
commit 685f743
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/interface/app/$libraryId/index.tsx b/interface/app/$libraryId/index.tsx
@@ -59,7 +59,9 @@ export default (platform: Platform) =>
 			loader: async () => {
 				if (!platform.userHomeDir) return null;
 				const homeDir = await platform.userHomeDir();
-				return redirect(`ephemeral/0?${new URLSearchParams({ path: homeDir })}`);
+				return redirect(`ephemeral/0?${new URLSearchParams({ path: homeDir })}`, {
+					replace: true
+				});
 			}
 		},
 		topBarRoutes,

diff --git a/interface/app/index.tsx b/interface/app/index.tsx
@@ -66,9 +66,10 @@ export const createRoutes = (platform: Platform, cache: NormalisedCache) =>
 
 						const libraryId = currentLibrary ? currentLibrary.uuid : libraries[0]?.uuid;
 
-						if (libraryId === undefined) return redirect('/onboarding');
+						if (libraryId === undefined)
+							return redirect('/onboarding', { replace: true });
 
-						return redirect(`/${libraryId}`);
+						return redirect(`/${libraryId}`, { replace: true });
 					}
 				},
 				{
@@ -86,8 +87,9 @@ export const createRoutes = (platform: Platform, cache: NormalisedCache) =>
 						if (!library) {
 							const firstLibrary = libraries[0];
 
-							if (firstLibrary) return redirect(`/${firstLibrary.uuid}`);
-							else return redirect('/onboarding');
+							if (firstLibrary)
+								return redirect(`/${firstLibrary.uuid}`, { replace: true });
+							else return redirect('/onboarding', { replace: true });
 						}
 
 						return null;

diff --git a/interface/app/onboarding/index.tsx b/interface/app/onboarding/index.tsx
@@ -25,9 +25,11 @@ export default [
 		index: true,
 		loader: () => {
 			if (getOnboardingStore().lastActiveScreen)
-				return redirect(`/onboarding/${getOnboardingStore().lastActiveScreen}`);
+				return redirect(`/onboarding/${getOnboardingStore().lastActiveScreen}`, {
+					replace: true
+				});
 
-			return redirect(`/onboarding/alpha`);
+			return redirect(`/onboarding/alpha`, { replace: true });
 		},
 		element: <Index />
 	},