From 6e215b00b0dade6d887104cb6c94c470d5d22135 Mon Sep 17 00:00:00 2001
From: zhengjitf <zhengjitf@gmail.com>
Date: Thu, 28 Dec 2023 16:49:06 +0800
Subject: [PATCH] fix: cannot redirect to last visited location on relaunch

---
 .../insomnia/src/ui/routes/organization.tsx    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/insomnia/src/ui/routes/organization.tsx b/packages/insomnia/src/ui/routes/organization.tsx
index 36f3f469eb2..48504a6ab2c 100644
--- a/packages/insomnia/src/ui/routes/organization.tsx
+++ b/packages/insomnia/src/ui/routes/organization.tsx
@@ -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);