Merge remote-tracking branch 'origin/feat/org-home-redesign' into wip/rv-e2e

Author: waleedlatif1

apps/sim/app/api/organizations/[id]/sim-links/route.ts

@@ -5,7 +5,7 @@ import {
   internalRateLimits,
   internalSessionAuth,
 } from '@/lib/api/server/routes'
-import { presentSimLink } from '@/lib/api/server/sim-link-presenters'
+import { presentSimLink, presentSimLinkPage } from '@/lib/api/server/sim-link-presenters'
 import { createSimLink, listSimLinks } from '@/lib/sim-links/application/use-cases'
 
 const policy = {
@@ -21,7 +21,7 @@ export const GET = defineInternalJsonRoute({
   operation: listSimLinks.operation,
   useCase: listSimLinks,
   mapInput: ({ params, query }) => ({ organizationId: params.id, ...query }),
-  present: ({ links, nextCursor }) => ({ links: links.map(presentSimLink), nextCursor }),
+  present: presentSimLinkPage,
 })
 
 export const POST = defineInternalJsonRoute({

apps/sim/app/o/[organizationId]/_redesign/hydrated.tsx

@@ -0,0 +1,15 @@
+import type { ReactNode } from 'react'
+import { type DehydratedState, HydrationBoundary } from '@tanstack/react-query'
+
+interface HydratedProps {
+  state: Promise<DehydratedState>
+  children: ReactNode
+}
+
+/**
+ * Children painted from a page's server reads. Put it inside a `Suspense`: it holds only that
+ * boundary, so the page's arrangement paints before the reads settle.
+ */
+export async function Hydrated({ state, children }: HydratedProps) {
+  return <HydrationBoundary state={await state}>{children}</HydrationBoundary>
+}

apps/sim/app/o/[organizationId]/_redesign/redesign-host.tsx

@@ -2,10 +2,9 @@
 
 import '@/platform/design-system/styles/embedded.css'
 import type { ReactNode } from 'react'
-import { InterfacePreferences } from '@/platform/app/(shell)/_components/session/interface-preferences'
 import { PlatformSurface } from '@/platform/design-system/components/surface/platform-surface'
 
-interface RedesignChildrenProps {
+interface RedesignSurfaceProps {
   children: ReactNode
 }
 
@@ -14,22 +13,8 @@ interface RedesignChildrenProps {
  * tracks every change and is right before hydration (`lib/postcss/platform-embed.cjs`).
  *
  * Never render a legacy component inside: the surface redefines tokens legacy utilities read. Compose
- * one beside a surface within {@link RedesignSession}.
+ * one beside a surface instead.
  */
-export function RedesignSurface({ children }: RedesignChildrenProps) {
+export function RedesignSurface({ children }: RedesignSurfaceProps) {
   return <PlatformSurface theme='system'>{children}</PlatformSurface>
 }
-
-/** The session state ported components read. Shared by every surface on a page. */
-export function RedesignSession({ children }: RedesignChildrenProps) {
-  return <InterfacePreferences>{children}</InterfacePreferences>
-}
-
-/** A page that is one design-system surface. */
-export function RedesignHost({ children }: RedesignChildrenProps) {
-  return (
-    <RedesignSession>
-      <RedesignSurface>{children}</RedesignSurface>
-    </RedesignSession>
-  )
-}

apps/sim/app/o/[organizationId]/chat/[chatId]/page.tsx

@@ -7,7 +7,10 @@ import { organizationRoutes, WORKSPACE_SETTINGS_PATH } from '@/lib/navigation/pa
 import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
 import OrganizationChatLoading from '@/app/o/[organizationId]/chat/[chatId]/loading'
 import { OrganizationConversation } from '@/app/o/[organizationId]/components/organization-conversation'
-import { getOrganizationBuildRedirect } from '@/app/o/[organizationId]/home/home-redirect'
+import {
+  canUseOrganizationChat,
+  getOrganizationBuildRedirect,
+} from '@/app/o/[organizationId]/home/home-redirect'
 
 export const metadata: Metadata = { title: 'Chat' }
 
@@ -21,7 +24,7 @@ export default async function OrganizationChatPage({
   if (!session?.user?.id) notFound()
   const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
   if (!context) notFound()
-  if (!context.mothershipAvailable || (!context.canBuild && !context.searchAccess.memberScoped)) {
+  if (!canUseOrganizationChat(context)) {
     const unavailableRedirect = getOrganizationBuildRedirect(context, organizationId)
     if (unavailableRedirect) redirect(unavailableRedirect)
   }