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

Jump to bottom

fix: cannot redirect to last visited location on relaunch #6949

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

fix: cannot redirect to last visited location on relaunch #6949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 12 additions & 6 deletions packages/insomnia/src/ui/routes/organization.tsx
View file
Open in desktop
Expand Up @@ -195,12 +195,18 @@ export const indexLoader: LoaderFunction = async () => {
}
}

if (personalOrganization) {
return redirect(`/organization/${personalOrganization.id}`);
}

if (organizations.length > 0) {
return redirect(`/organization/${organizations[0].id}`);
const organizationId = personalOrganization?.id || organizations?.[0]?.id;
if (organizationId) {
const prevOrganizationLocation = localStorage.getItem(
`locationHistoryEntry:${organizationId}`
);
if (prevOrganizationLocation) {
console.log('Redirecting to last visited location', prevOrganizationLocation);
// Don't check if the resources referenced in location exist, such as project, workspace, etc.
// Leave that to the respective loaders, show more friendly notices and be able to fallback to home page.
return redirect(prevOrganizationLocation);
}
return redirect(`/organization/${organizationId}`);
}
} catch (error) {
console.log('Failed to load Organizations', error);
Expand Down