fix(settings): answer a closed section with the product's not-found page, not Next's bare default

Author: waleedlatif1

apps/sim/app/(product)/_components/live-shell/live-shell.tsx

@@ -1,6 +1,6 @@
 import { type ReactNode, Suspense } from 'react'
 import { cookies } from 'next/headers'
-import { notFound, redirect } from 'next/navigation'
+import { redirect } from 'next/navigation'
 import { loginHref, WORKSPACES_PATH } from '@/lib/navigation/paths'
 import { resolveLiveDestinations } from '@/app/(product)/_components/destinations'
 import { LiveComposerHost } from '@/app/(product)/_components/live-shell/live-composer-host'
@@ -13,7 +13,6 @@ import { startShellPrefetch } from '@/platform/lib/data/prefetch-shell'
 import { LiveProviders } from '@/platform/lib/data/providers'
 import {
   followProductRoute,
-  isClosedSettingsSection,
   type ProductLocation,
   readDocumentLocation,
 } from '@/platform/lib/data/route-resolution'
@@ -46,8 +45,7 @@ async function retiredOrganizationHref({
  * organization layout's gates, in its order, against data read in process. Each gate decides
  * before anything product-shaped renders. The page below streams inside the Suspense boundary, so a
  * redirect it raised would paint this shell first; the document's own route resolution
- * (`followProductRoute`) runs here instead, and answers with one HTTP redirect, as does a Settings
- * section the viewer may not open, with one 404 (`isClosedSettingsSection`).
+ * (`followProductRoute`) runs here instead, and answers with one HTTP redirect.
  */
 export async function LiveShell({
   telemetry,
@@ -89,7 +87,6 @@ export async function LiveShell({
     location && followProductRoute(organization, location),
     shellPrefetch.finish(organization),
   ])
-  if (location && isClosedSettingsSection(organization, location)) notFound()
 
   return (
     <LiveProviders

apps/sim/platform/AGENTS.md

@@ -110,7 +110,7 @@ A sub-view (one record's detail, where it is also edited, or the create flow) op
 
 A read is `SettingsRead`: nothing while pending, `FailureNotice` with Retry when the first read fails, the content under a `FailureNotice` when a later refresh fails. An on-or-off setting is `SwitchRow` (`switch-row`), never a `Switch` placed in a `SettingsRow`. A draft is committed with `SettingsSaveBar` (`save-owner`): EMCN's `SaveActions` plus the draft's registration with the Settings leave guard, so it is the only Save and Discard a settings page renders. A sub-view's back action leaves through `requestSettingsLeave`, which asks the same guard. A create form keeps its own submit button, Create {noun} or Add {noun}, because the bar only says Save. A list of `ActivityRow` rows is `ResourceList`, which bleeds through `PageOverflow`. A titled list that has no rows is `SettingsList` with `empty`: the `EmptyState` takes the surface's place under the section title, never sits inside a surface (`empty-in-surface`), where its own inset would set its text 8px inside the rows'. A create row that lived in that surface moves to the `EmptyState`'s action.
 
-A browser-rendered section's first reads start on the server: `lib/data/prefetch-settings.ts` seeds them under each hook's key and `staleTime`, and the page hands them to the section through a `HydrationBoundary`, as a server section's own `prefetch-*` read does. A read that depends on the browser (the viewer's time zone, a clock-relative range) is not prefetched, since its key would not match. A Settings section the viewer may not open is answered by the shell (`isClosedSettingsSection`) before the page streams, so the response is a 404; a `notFound()` inside the page arrives after the status has been sent.
+A browser-rendered section's first reads start on the server: `lib/data/prefetch-settings.ts` seeds them under each hook's key and `staleTime`, and the page hands them to the section through a `HydrationBoundary`, as a server section's own `prefetch-*` read does. A read that depends on the browser (the viewer's time zone, a clock-relative range) is not prefetched, since its key would not match. A Settings section the viewer may not open answers with the product's not-found page from inside the page (`LiveSettingsRoute`): the shell renders in the product root layout, where a `notFound()` would skip that page for Next's bare default.
 
 Every settings page uses these parts, and `save-owner`, `switch-row` and `empty-in-surface` grant no exceptions.
 

apps/sim/platform/lib/data/route-resolution.test.ts

@@ -27,7 +27,6 @@ import type { PlatformOrganization } from '@/platform/lib/data/organization-mode
 import {
   blockedWorkspaceEntryHref,
   deniedSurfaceHref,
-  isClosedSettingsSection,
   type RouteContext,
   resolveProductRedirect,
 } from '@/platform/lib/data/route-resolution'
@@ -331,27 +330,3 @@ describe('an organization the viewer can no longer open', () => {
     expect(deniedSurfaceHref(false)).toBeNull()
   })
 })
-
-describe('a Settings section the viewer may not open', () => {
-  const opens = (href: string, settingsSections: PlatformOrganization['settingsSections']) => {
-    const url = new URL(href, 'https://app.sim.test')
-    return isClosedSettingsSection(
-      { ...organization(), settingsSections },
-      { pathname: url.pathname, query: url.searchParams }
-    )
-  }
-
-  it('is answered by the shell before the page streams, with or without a subpath', () => {
-    expect(opens('/o/org-1/settings/billing', ['general'])).toBe(true)
-    expect(opens('/o/org-1/settings/billing/credit-usage', ['general'])).toBe(true)
-    expect(opens('/o/org-1/settings/admin', ['general', 'admin'])).toBe(true)
-    expect(opens('/o/org-1/settings/no-such-section', ['general'])).toBe(true)
-  })
-
-  it('leaves General, an open section and the routes beside the sections to the page', () => {
-    expect(opens('/o/org-1/settings', [])).toBe(false)
-    expect(opens('/o/org-1/settings/billing', ['general', 'billing'])).toBe(false)
-    expect(opens('/o/org-1/settings/billing/plans', ['general'])).toBe(false)
-    expect(opens('/o/org-1/home', [])).toBe(false)
-  })
-})

apps/sim/platform/lib/data/route-resolution.ts

@@ -21,7 +21,6 @@ import {
 import { resolveLegacyRequestLink } from '@/platform/lib/data/legacy-request-link'
 import { type PlatformOrganization, surfaceHref } from '@/platform/lib/data/organization-model'
 import { requireSessionViewer } from '@/platform/lib/data/server-read'
-import { resolveLiveSetting } from '@/platform/lib/data/settings-navigation'
 import { readWorkspaceShellOrganizationId } from '@/platform/lib/data/shell-scope'
 import { workspaceRootHref } from '@/platform/lib/workspace-navigation'
 
@@ -273,28 +272,6 @@ export async function followProductRoute(
   redirect(target.href)
 }
 
-/** Settings routes beside the sections' catch-all, which gate themselves. */
-const SETTINGS_ROUTES_BESIDE_SECTIONS = ['billing/plans']
-
-/**
- * Whether a document request opens a Settings section this viewer may not open, which the shell
- * answers as not found. The page streams inside the shell's Suspense boundary after the status has
- * been sent, so a section's own `notFound()` would reach the browser as a 200 with the not-found
- * body; the shell decides before anything streams, as it does for a redirect. A section's own gate
- * and subpaths still answer inside the page, and a client navigation, which has no status, there.
- */
-export function isClosedSettingsSection(
-  organization: PlatformOrganization,
-  location: ProductLocation
-): boolean {
-  if (!isSettingsPath(organization, location.pathname)) return false
-  const rest = location.pathname.slice(surfaceHref(organization, '/settings').length + 1)
-  if (!rest || SETTINGS_ROUTES_BESIDE_SECTIONS.some((route) => `${rest}/`.startsWith(`${route}/`)))
-    return false
-  const [key] = decodePathSegments(rest.split('/')) ?? []
-  return !key || !resolveLiveSetting(key, organization)
-}
-
 /**
  * The path and query this document request opens, as the proxy names it; `null` outside the proxy.
  * The shell renders above the page's Suspense boundary and without route params, so this is how it