Merge branch 'wip/rv-integrations' into feat/org-home-redesign

Author: waleedlatif1

apps/sim/app/o/[organizationId]/integrations/[provider]/page.tsx

@@ -0,0 +1,19 @@
+import type { Metadata } from 'next'
+import { requireIntegrationsViewer } from '@/app/o/[organizationId]/integrations/access'
+import { OrganizationIntegrations } from '@/app/o/[organizationId]/integrations/integrations'
+import { integrationPath } from '@/platform/lib/integrations/model'
+
+export const metadata: Metadata = {
+  title: 'Integrations',
+  referrer: 'no-referrer',
+}
+
+interface IntegrationProviderPageProps {
+  params: Promise<{ organizationId: string; provider: string }>
+}
+
+export default async function IntegrationProviderPage({ params }: IntegrationProviderPageProps) {
+  const { organizationId, provider } = await params
+  await requireIntegrationsViewer(organizationId, integrationPath(organizationId, provider))
+  return <OrganizationIntegrations section={provider} />
+}

apps/sim/app/o/[organizationId]/integrations/access.ts

@@ -0,0 +1,16 @@
+import { notFound, redirect } from 'next/navigation'
+import { getSession } from '@/lib/auth'
+import { getOrganizationSurfaceContext } from '@/lib/organizations/surface'
+import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
+
+/**
+ * The gate the integrations index and provider pages share. `callbackUrl` is the page to come back to after
+ * sign-in, carrying whatever connection or Slack context the visit arrived with.
+ */
+export async function requireIntegrationsViewer(organizationId: string, callbackUrl: string) {
+  const session = await getSession()
+  if (!session?.user) redirect(buildAuthCrossLink('/login', { callbackUrl, isInviteFlow: false }))
+  const context = await getOrganizationSurfaceContext(organizationId, session.user.id)
+  if (!context?.searchAccess.memberScoped) notFound()
+  return session.user.id
+}

apps/sim/app/o/[organizationId]/integrations/account-connection-actions.tsx

@@ -1,7 +1,10 @@
 import { Suspense } from 'react'
 import type { Metadata } from 'next'
+import { organizationRoutes } from '@/lib/navigation/paths'
 import Loading from '@/app/o/[organizationId]/integrations/accounts/[credentialId]/loading'
-import { AccountToolPermissions } from '@/app/o/[organizationId]/integrations/accounts/[credentialId]/tool-permissions'
+import { IntegrationsHost } from '@/app/o/[organizationId]/integrations/integrations-host'
+import { IntegrationsPage } from '@/platform/app/(shell)/integrations/_components/integrations-page/integrations-page'
+import { ToolPermissionsPanel } from '@/platform/app/(shell)/integrations/_components/tool-permissions/tool-permissions-panel'
 
 export const metadata: Metadata = { title: 'Tool permissions', referrer: 'no-referrer' }
 
@@ -12,9 +15,20 @@ interface AccountToolPermissionsPageProps {
 export default async function AccountToolPermissionsPage({
   params,
 }: AccountToolPermissionsPageProps) {
+  const { organizationId, credentialId } = await params
   return (
     <Suspense fallback={<Loading />}>
-      <AccountToolPermissions {...(await params)} />
+      <IntegrationsHost>
+        <IntegrationsPage
+          back={{ href: organizationRoutes(organizationId).integrations, label: 'Integrations' }}
+        >
+          <ToolPermissionsPanel
+            organizationId={organizationId}
+            credentialId={credentialId}
+            showHeading
+          />
+        </IntegrationsPage>
+      </IntegrationsHost>
     </Suspense>
   )
 }