fix(webapp): drop the organization-gated pages on an organization switch

Logs and Query are gated by an organization feature flag, and their
loaders redirect home when it is off, so carrying either across an
organization switch sent the user through `/` instead of straight into
the organization they picked. They now travel with an environment or
project switch — both stay inside the organization whose flag let the
user open the page — and an organization switch falls back to Tasks, the
same shape the branch lists already use.

A test scans the routes below an environment for the ones that redirect
home and asserts they are exactly the pages the organization switch drops,
so a third gated page cannot be added without updating the list.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Nj3iCRvSP9sP7y7hxXVJbx

Author: claude

apps/webapp/app/hooks/useEnvironmentSwitcher.ts

@@ -2,6 +2,7 @@ import { useMatches } from "@remix-run/react";
 import { type RuntimeEnvironment } from "@trigger.dev/database";
 import {
   ENVIRONMENT_MATCH_ID,
+  organizationPortablePage,
   pageBelowEnvironment,
   pathForEnvironmentSwitch,
   portablePageSearch,
@@ -43,13 +44,15 @@ export function useEnvironmentSwitcher() {
 export function usePageSwitcher() {
   const location = useOptimisticLocation();
   const environmentPathname = useEnvironmentPathname();
-  const page = projectPortablePage(pageBelowEnvironment(location.pathname, environmentPathname));
-  const search = portablePageSearch(page);
+  const page = pageBelowEnvironment(location.pathname, environmentPathname);
+  const projectSearch = portablePageSearch(projectPortablePage(page));
+  const organizationSearch = portablePageSearch(organizationPortablePage(page));
 
   return {
     urlForProject: (organization: OrgForPath, project: ProjectForPath) =>
-      `${v3ProjectPath(organization, project)}${search}`,
-    urlForOrganization: (organization: OrgForPath) => `${organizationPath(organization)}${search}`,
+      `${v3ProjectPath(organization, project)}${projectSearch}`,
+    urlForOrganization: (organization: OrgForPath) =>
+      `${organizationPath(organization)}${organizationSearch}`,
   };
 }
 

apps/webapp/app/routes/_app.orgs.$organizationSlug._index/route.tsx

@@ -3,7 +3,7 @@ import { prisma } from "~/db.server";
 import { SelectBestEnvironmentPresenter } from "~/presenters/SelectBestEnvironmentPresenter.server";
 import { logger } from "~/services/logger.server";
 import { requireUser } from "~/services/session.server";
-import { portablePageSearch, requestedPortablePage } from "~/utils/pageSwitching";
+import { portablePageSearch, requestedOrganizationPortablePage } from "~/utils/pageSwitching";
 import {
   newOrganizationPath,
   newProjectPath,
@@ -52,5 +52,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
   const projectPath = v3ProjectPath({ slug: organizationSlug }, bestProject);
 
-  return redirect(`${projectPath}${portablePageSearch(requestedPortablePage(request))}`);
+  return redirect(
+    `${projectPath}${portablePageSearch(requestedOrganizationPortablePage(request))}`
+  );
 };

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam._index/route.tsx

@@ -2,7 +2,7 @@ import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { prisma } from "~/db.server";
 import { SelectBestEnvironmentPresenter } from "~/presenters/SelectBestEnvironmentPresenter.server";
 import { requireUser } from "~/services/session.server";
-import { pagePath, requestedPortablePage } from "~/utils/pageSwitching";
+import { pagePath, requestedProjectPortablePage } from "~/utils/pageSwitching";
 import { ProjectParamSchema, v3EnvironmentPath } from "~/utils/pathBuilder";
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
@@ -43,5 +43,5 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
   const environmentPath = v3EnvironmentPath({ slug: organizationSlug }, project, environment);
 
-  return redirect(pagePath(environmentPath, requestedPortablePage(request)));
+  return redirect(pagePath(environmentPath, requestedProjectPortablePage(request)));
 };

apps/webapp/app/utils/pageSwitching.test.ts

@@ -7,14 +7,18 @@ import {
   ENVIRONMENT_MATCH_ID,
   ENVIRONMENT_PORTABLE_PAGES,
   environmentPortablePage,
+  ORGANIZATION_PORTABLE_PAGES,
+  ORGANIZATION_SPECIFIC_PAGES,
+  organizationPortablePage,
   pageBelowEnvironment,
   pagePath,
   pathForEnvironmentSwitch,
   portablePageSearch,
   PROJECT_PORTABLE_PAGES,
   PROJECT_SPECIFIC_PAGES,
   projectPortablePage,
-  requestedPortablePage,
+  requestedOrganizationPortablePage,
+  requestedProjectPortablePage,
 } from "./pageSwitching";
 
 const APP_DIR = join(__dirname, "..");
@@ -40,11 +44,16 @@ function rendersAPage(file: string): boolean {
   return /^export default/m.test(readFileSync(join(APP_DIR, file), "utf8"));
 }
 
+function sendsYouHome(file: string): boolean {
+  return /redirect\("\/"\)/.test(readFileSync(join(APP_DIR, file), "utf8"));
+}
+
 const belowEnvironment = Object.values(compiledRoutes)
   .filter((route) => compiledUrl(route.id).startsWith(ENVIRONMENT_URL))
   .map((route) => ({
     suffix: compiledUrl(route.id).slice(ENVIRONMENT_URL.length).replace(/^\//, ""),
     rendersAPage: rendersAPage(route.file),
+    sendsYouHome: sendsYouHome(route.file),
   }));
 
 const environmentRoutes = [...new Set(belowEnvironment.map((route) => route.suffix))];
@@ -122,8 +131,12 @@ describe("portable pages", () => {
     for (const page of PROJECT_PORTABLE_PAGES) {
       expect(projectPortablePage(page)).toBe(page);
     }
+    for (const page of ORGANIZATION_PORTABLE_PAGES) {
+      expect(organizationPortablePage(page)).toBe(page);
+    }
     expect(environmentPortablePage("")).toBe("");
     expect(projectPortablePage("")).toBe("");
+    expect(organizationPortablePage("")).toBe("");
   });
 
   it("include the pages named in the request", () => {
@@ -133,7 +146,7 @@ describe("portable pages", () => {
   });
 });
 
-describe("pages a project or organization switch cannot carry", () => {
+describe("pages a project switch cannot carry", () => {
   it("are the branch lists, which not every project has", () => {
     expect([...PROJECT_SPECIFIC_PAGES].sort()).toEqual(["branches", "dev-branches"]);
 
@@ -174,10 +187,53 @@ describe("pages a project or organization switch cannot carry", () => {
   it("fall back to the tasks page when the project changes", () => {
     expect(portablePageSearch(projectPortablePage("branches"))).toBe("");
     expect(portablePageSearch(projectPortablePage("dev-branches"))).toBe("");
-    expect(requestedPortablePage(new Request("http://localhost/orgs/acme?page=branches"))).toBe("");
-    expect(requestedPortablePage(new Request("http://localhost/orgs/acme?page=dev-branches"))).toBe(
-      ""
-    );
+    expect(
+      requestedProjectPortablePage(new Request("http://localhost/orgs/acme?page=branches"))
+    ).toBe("");
+    expect(
+      requestedProjectPortablePage(new Request("http://localhost/orgs/acme?page=dev-branches"))
+    ).toBe("");
+  });
+});
+
+describe("pages an organization switch cannot carry", () => {
+  it("are the ones whose loaders send you home when the organization is not allowed in", () => {
+    const sendHome = [
+      ...new Set(
+        belowEnvironment.filter((route) => route.sendsYouHome).map((route) => route.suffix)
+      ),
+    ].sort();
+
+    expect(sendHome).toEqual([...ORGANIZATION_SPECIFIC_PAGES].sort());
+  });
+
+  it("still travel with an environment or project switch, which stay in the same organization", () => {
+    for (const page of ORGANIZATION_SPECIFIC_PAGES) {
+      expect(ENVIRONMENT_PORTABLE_PAGES.has(page)).toBe(true);
+      expect(PROJECT_PORTABLE_PAGES.has(page)).toBe(true);
+      expect(ORGANIZATION_PORTABLE_PAGES.has(page)).toBe(false);
+      expect(environmentPortablePage(page)).toBe(page);
+      expect(projectPortablePage(page)).toBe(page);
+      expect(organizationPortablePage(page)).toBe("");
+    }
+  });
+
+  it("are otherwise the same list, so nothing else is quietly dropped", () => {
+    const dropped = [...PROJECT_PORTABLE_PAGES]
+      .filter((page) => !ORGANIZATION_PORTABLE_PAGES.has(page))
+      .sort();
+
+    expect(dropped).toEqual([...ORGANIZATION_SPECIFIC_PAGES].sort());
+  });
+
+  it("fall back to the tasks page when the organization changes", () => {
+    const read = (search: string) =>
+      requestedOrganizationPortablePage(new Request(`http://localhost/orgs/acme${search}`));
+
+    expect(portablePageSearch(organizationPortablePage("logs"))).toBe("");
+    expect(read("?page=logs")).toBe("");
+    expect(read("?page=query")).toBe("");
+    expect(read("?page=apikeys")).toBe("apikeys");
   });
 });
 
@@ -194,6 +250,7 @@ describe("pages named after a resource", () => {
 
     expect(leaks(environmentPortablePage, ENVIRONMENT_PORTABLE_PAGES)).toEqual([]);
     expect(leaks(projectPortablePage, PROJECT_PORTABLE_PAGES)).toEqual([]);
+    expect(leaks(organizationPortablePage, ORGANIZATION_PORTABLE_PAGES)).toEqual([]);
   });
 
   it("truncate to the list they were reached from", () => {
@@ -272,6 +329,10 @@ describe("a page suffix that is not a plain relative page", () => {
         environmentPortablePage(attempt) === "" ||
           ENVIRONMENT_PORTABLE_PAGES.has(environmentPortablePage(attempt))
       ).toBe(true);
+      expect(
+        organizationPortablePage(attempt) === "" ||
+          ORGANIZATION_PORTABLE_PAGES.has(organizationPortablePage(attempt))
+      ).toBe(true);
     }
   });
 
@@ -392,7 +453,7 @@ describe("carrying a page across a project or organization switch", () => {
 
   it("reads the page back off the request, validating it again", () => {
     const read = (search: string) =>
-      requestedPortablePage(new Request(`http://localhost/orgs/acme${search}`));
+      requestedProjectPortablePage(new Request(`http://localhost/orgs/acme${search}`));
 
     expect(read("?page=apikeys")).toBe("apikeys");
     expect(read("?page=waitpoints/tokens")).toBe("waitpoints/tokens");

apps/webapp/app/utils/pageSwitching.ts

@@ -22,6 +22,9 @@ const NESTED_PORTABLE_PAGES = [
 /** The branch lists render under any environment of their project, but not in every project. */
 export const PROJECT_SPECIFIC_PAGES = ["branches", "dev-branches"];
 
+/** Gated by an organization feature flag, so their loaders send you home from an organization without it. */
+export const ORGANIZATION_SPECIFIC_PAGES = ["logs", "query"];
+
 /** Every page below an environment that names no resource, so any environment can render it. */
 export const ENVIRONMENT_PORTABLE_PAGES: ReadonlySet<string> = new Set(
   [
@@ -30,11 +33,16 @@ export const ENVIRONMENT_PORTABLE_PAGES: ReadonlySet<string> = new Set(
   ].filter((page) => page !== "")
 );
 
-/** The ones every project has, which is what a project or organization switch can carry. */
+/** The ones every project has, which is what a project switch can carry. */
 export const PROJECT_PORTABLE_PAGES: ReadonlySet<string> = new Set(
   [...ENVIRONMENT_PORTABLE_PAGES].filter((page) => !PROJECT_SPECIFIC_PAGES.includes(page))
 );
 
+/** The ones every organization has, which is what an organization switch can carry. */
+export const ORGANIZATION_PORTABLE_PAGES: ReadonlySet<string> = new Set(
+  [...PROJECT_PORTABLE_PAGES].filter((page) => !ORGANIZATION_SPECIFIC_PAGES.includes(page))
+);
+
 /**
  * The nearest page above `suffix` in `pages`, as a path relative to the environment. A page named
  * after a resource truncates to its list page, and anything else — an unknown page, or a suffix
@@ -56,14 +64,26 @@ export function environmentPortablePage(suffix: string): string {
   return nearestPage(suffix, ENVIRONMENT_PORTABLE_PAGES);
 }
 
-/** The page to keep when the project or organization changes. */
+/** The page to keep when the project changes. */
 export function projectPortablePage(suffix: string): string {
   return nearestPage(suffix, PROJECT_PORTABLE_PAGES);
 }
 
-export function requestedPortablePage(request: Request): string {
-  const requested = new URL(request.url).searchParams.get(PORTABLE_PAGE_PARAM);
-  return projectPortablePage(requested ?? "");
+/** The page to keep when the organization changes. */
+export function organizationPortablePage(suffix: string): string {
+  return nearestPage(suffix, ORGANIZATION_PORTABLE_PAGES);
+}
+
+function requestedPage(request: Request): string {
+  return new URL(request.url).searchParams.get(PORTABLE_PAGE_PARAM) ?? "";
+}
+
+export function requestedProjectPortablePage(request: Request): string {
+  return projectPortablePage(requestedPage(request));
+}
+
+export function requestedOrganizationPortablePage(request: Request): string {
+  return organizationPortablePage(requestedPage(request));
 }
 
 export function portablePageSearch(page: string): string {