[DO NOT MERGE] Org project view on the org routes: dev branch for Theo and Marcus

apps/sim/app/api/organizations/[id]/resources/search/route.ts

@@ -0,0 +1,64 @@
+import { searchOrganizationResourcesContract } from '@/lib/api/contracts/resource-search'
+import { cursorRoute, cursorScopeKey } from '@/lib/api/cursor-binding'
+import {
+  defineInternalJsonRoute,
+  internalOrchestrationErrorPolicy,
+  internalRateLimits,
+  internalSessionAuth,
+} from '@/lib/api/server/routes'
+import {
+  organizationResourceOperations,
+  searchOrganizationResources,
+} from '@/lib/workspaces/application/search-organization-resources'
+import { readSortedCursor, writeSortedCursor } from '@/app/api/v2/lib/response'
+
+export const dynamic = 'force-dynamic'
+
+/** Match position, then name: the one order this search pages in. */
+const SEARCH_SORT = 'relevance'
+
+/** Binds a cursor to the search it was minted for, so it cannot resume a different one. */
+function cursorScope(
+  organizationId: string,
+  search: string | undefined,
+  types: readonly string[] | undefined,
+  workspaceIds: readonly string[] | undefined
+) {
+  return cursorScopeKey(cursorRoute(searchOrganizationResourcesContract, { id: organizationId }), {
+    search,
+    types: types ? [...types].sort().join(',') : undefined,
+    workspaceIds: workspaceIds ? [...workspaceIds].sort().join(',') : undefined,
+  })
+}
+
+/** GET /api/organizations/[id]/resources/search — Resources named like `q` across the viewer's workspaces. */
+export const GET = defineInternalJsonRoute({
+  contract: searchOrganizationResourcesContract,
+  auth: internalSessionAuth,
+  operation: organizationResourceOperations.search,
+  rateLimit: internalRateLimits.user({ bucketName: 'organization-resource-search' }),
+  errorPolicy: internalOrchestrationErrorPolicy,
+  mapInput: ({ params, query }) => ({
+    organizationId: params.id,
+    search: query.q,
+    types: query.types,
+    workspaceIds: query.workspaceIds,
+    limit: query.limit,
+    cursorKeys: readSortedCursor(
+      query.cursor,
+      SEARCH_SORT,
+      'asc',
+      cursorScope(params.id, query.q, query.types, query.workspaceIds)
+    ),
+  }),
+  useCase: searchOrganizationResources,
+  present: ({ items, nextCursorKeys }, { input }) => ({
+    items,
+    nextCursor: writeSortedCursor(
+      nextCursorKeys,
+      SEARCH_SORT,
+      'asc',
+      cursorScope(input.organizationId, input.search, input.types, input.workspaceIds)
+    ),
+  }),
+})

apps/sim/app/api/workspaces/[id]/fork/mapping/route.ts

@@ -1,4 +1,5 @@
 import {
+  createForkSecretMappingContract,
   getForkMappingContract,
   updateForkMappingContract,
 } from '@/lib/api/contracts/workspace-fork'
@@ -8,6 +9,7 @@ import {
   internalSessionAuth,
 } from '@/lib/api/server/routes'
 import { internalForkErrorPolicy } from '@/ee/workspace-forking/api/route-policies'
+import { createWorkspaceForkSecretMapping } from '@/ee/workspace-forking/application/create-secret-mapping'
 import { getWorkspaceForkMappingDetails } from '@/ee/workspace-forking/application/mapping-details'
 import { forkOperations } from '@/ee/workspace-forking/application/operations'
 import { updateWorkspaceForkMappings } from '@/ee/workspace-forking/application/recovery-and-mappings'
@@ -38,3 +40,14 @@ export const PUT = defineInternalJsonRoute({
   useCase: updateWorkspaceForkMappings,
   present: (result) => ({ success: true as const, ...result }),
 })
+
+export const POST = defineInternalJsonRoute({
+  contract: createForkSecretMappingContract,
+  auth: internalSessionAuth,
+  operation: forkOperations.createSecretMapping,
+  rateLimit: internalRateLimits.none({ reason: 'Preserve existing internal fork request policy' }),
+  errorPolicy: internalForkErrorPolicy,
+  mapInput: ({ params, body }) => ({ workspaceId: params.id, ...body }),
+  useCase: createWorkspaceForkSecretMapping,
+  present: ({ name }) => ({ name }),
+})

apps/sim/app/api/workspaces/[id]/settings-navigation/route.ts

@@ -0,0 +1,24 @@
+import { getWorkspaceSettingsNavigationContract } from '@/lib/api/contracts/workspace-settings'
+import {
+  defineInternalJsonRoute,
+  internalOrchestrationErrorPolicy,
+  internalRateLimits,
+  internalSessionAuth,
+} from '@/lib/api/server/routes'
+import {
+  readWorkspaceSettingsNavigation,
+  readWorkspaceSettingsNavigationOperation,
+} from '@/lib/settings/application/workspace-navigation'
+
+export const GET = defineInternalJsonRoute({
+  contract: getWorkspaceSettingsNavigationContract,
+  auth: internalSessionAuth,
+  operation: readWorkspaceSettingsNavigationOperation,
+  rateLimit: internalRateLimits.none({
+    reason: 'Read-only settings navigation, matching existing settings-page admission',
+  }),
+  errorPolicy: internalOrchestrationErrorPolicy,
+  mapInput: ({ params }) => ({ workspaceId: params.id }),
+  useCase: readWorkspaceSettingsNavigation,
+  staticResponseHeaders: { 'Cache-Control': 'private, no-store' },
+})

apps/sim/app/o/[organizationId]/components/create-project-modal/create-project-modal.tsx

@@ -0,0 +1,48 @@
+'use client'
+
+import { useRouter } from 'next/navigation'
+import { organizationRoutes } from '@/lib/navigation/paths'
+import { CreateWorkspaceModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/create-workspace-modal/create-workspace-modal'
+import { useCreateProject } from '@/hooks/queries/projects'
+import { useWorkspaceCreationPolicy } from '@/hooks/queries/workspace'
+
+/** Whether the viewer may create a project in this organization, and why not. */
+export function useProjectCreationPolicy(organizationId: string) {
+  const { data: policy } = useWorkspaceCreationPolicy()
+  const canCreate = Boolean(policy?.canCreate && policy.organizationId === organizationId)
+  return {
+    canCreate,
+    disabledReason: canCreate ? null : (policy?.reason ?? 'Project creation is unavailable.'),
+  }
+}
+
+interface CreateProjectModalProps {
+  organizationId: string
+  open: boolean
+  onOpenChange: (open: boolean) => void
+}
+
+/** Names a new project, creates it, and opens its pane on organization Home. */
+export function CreateProjectModal({
+  organizationId,
+  open,
+  onOpenChange,
+}: CreateProjectModalProps) {
+  const router = useRouter()
+  const { mutateAsync: createProject, isPending } = useCreateProject()
+  return (
+    <CreateWorkspaceModal
+      resource='project'
+      open={open}
+      onOpenChange={onOpenChange}
+      isCreating={isPending}
+      onConfirm={async (name) => {
+        const { initialEnvironment } = await createProject({ organizationId, name })
+        onOpenChange(false)
+        router.push(
+          `${organizationRoutes(organizationId).home}?project=${encodeURIComponent(initialEnvironment.id)}&pane=project`
+        )
+      }}
+    />
+  )
+}

apps/sim/app/o/[organizationId]/components/organization-sidebar/components/chats-section/chats-section.tsx

@@ -1,5 +1,6 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import {
   chipVariants,
   cn,
@@ -28,6 +29,8 @@ import {
 
 interface ChatRowProps {
   chat: OrganizationChat
+  /** Shown before the title, such as the projects the chat worked in. */
+  leading?: ReactNode
   isCurrentRoute: boolean
   isSelected: boolean
   isMenuOpen: boolean
@@ -39,6 +42,7 @@ interface ChatRowProps {
 
 function ChatRow({
   chat,
+  leading,
   isCurrentRoute,
   isSelected,
   isMenuOpen,
@@ -66,6 +70,7 @@ function ChatRow({
       onContextMenu={(e) => onContextMenu(e, chat.id)}
       onSelectChat={onSelectChat}
     >
+      {leading}
       <OverflowText label={chat.name} className='flex-1 text-[var(--text-body)]' />
       <RowActions
         open={isMenuOpen}
@@ -103,6 +108,8 @@ interface ChatsSectionProps {
   isLoading: boolean
   isCollapsed: boolean
   pathname: string | null
+  /** Renders before each chat's title; the org project view shows the chat's projects. */
+  leadingFor?: (chat: OrganizationChat) => ReactNode
 }
 
 export function ChatsSection({
@@ -111,6 +118,7 @@ export function ChatsSection({
   isLoading,
   isCollapsed,
   pathname,
+  leadingFor,
 }: ChatsSectionProps) {
   const actions = useOrganizationChatActions({ organizationId, chats })
   const { menu, hover, rename, selectedChat, selectedChats, menuOpenChatId } = actions
@@ -140,7 +148,7 @@ export function ChatsSection({
                   <CollapsedChatFlyoutItem
                     key={chat.id}
                     chat={chat}
-                    isCurrentRoute={pathname === chat.href}
+                    isCurrentRoute={pathname === chat.href.split('?')[0]}
                     isSelected={selectedChats.size > 1 && selectedChats.has(chat.id)}
                     onSelectChat={actions.handleChatClick}
                     isMenuOpen={menuOpenChatId === chat.id}
@@ -184,7 +192,8 @@ export function ChatsSection({
                     <ChatRow
                       key={chat.id}
                       chat={chat}
-                      isCurrentRoute={pathname === chat.href}
+                      leading={leadingFor?.(chat)}
+                      isCurrentRoute={pathname === chat.href.split('?')[0]}
                       isSelected={selectedChats.size > 1 && selectedChats.has(chat.id)}
                       isMenuOpen={menuOpenChatId === chat.id}
                       onSelectChat={actions.handleChatClick}

apps/sim/app/o/[organizationId]/components/organization-sidebar/components/index.ts

@@ -1,4 +1,5 @@
 export { ChatsSection } from './chats-section'
 export { OrganizationFooter } from './organization-footer'
 export { OrganizationHeader } from './organization-header'
+export { ProjectsSection } from './projects-section'
 export { WorkspacesSection } from './workspaces-section'

apps/sim/app/o/[organizationId]/components/organization-sidebar/components/projects-section/index.ts

@@ -0,0 +1 @@
+export { ProjectsSection } from './projects-section'