Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/sim/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ CRON_SECRET=your_cron_secret # Use `openssl rand -hex 32` to generate. Authentic
# FORKING_ENABLED= # Workspace forks
# CREDENTIAL_GROUPS= # Enterprise managed OAuth collections
# TABLE_ROW_TTL= # Table TTL columns and expired-row cleanup
# PERMISSION_ACCESS_REQUESTS_ENABLED= # Global access-request rollout; organizations may opt out
# KNOWLEDGE_MEMBER_ACCESS= # Per-member knowledge connectors and hybrid-by-default retrieval
# ORGANIZATIONS_ENABLED= / NEXT_PUBLIC_ORGANIZATIONS_ENABLED= # Organizations only

Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/access-requests/loading.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AccessRequestsLoading } from '@/components/access-requests/access-requests-loading'
import { AccessRequestsLoading } from '@/ee/access-requests/components/access-requests-loading'

export default function Loading() {
return <AccessRequestsLoading />
Expand Down
6 changes: 4 additions & 2 deletions apps/sim/app/access-requests/page.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'

const { redirect } = vi.hoisted(() => ({ redirect: vi.fn() }))
vi.mock('next/navigation', () => ({ redirect }))
vi.mock('@/components/access-requests/my-access-requests', () => ({ MyAccessRequests: () => null }))
vi.mock('@/components/access-requests/organization-access-requests', () => ({
vi.mock('@/ee/access-requests/components/my-access-requests', () => ({
MyAccessRequests: () => null,
}))
vi.mock('@/ee/access-requests/components/organization-access-requests', () => ({
OrganizationAccessRequests: () => null,
}))

Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/access-requests/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { ChipLink } from '@sim/emcn'
import type { Metadata } from 'next'
import { redirect } from 'next/navigation'
import { createSearchParamsCache, createSerializer } from 'nuqs/server'
import { AccessRequestsLoading } from '@/components/access-requests/access-requests-loading'
import { MyAccessRequests } from '@/components/access-requests/my-access-requests'
import { OrganizationAccessRequests } from '@/components/access-requests/organization-access-requests'
import { accessRequestEntrySearchParams } from '@/components/access-requests/search-params'
import { EmptyState } from '@/components/empty-state/empty-state'
import { getSession } from '@/lib/auth'
import { WORKSPACES_PATH } from '@/lib/navigation/paths'
import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
import { AccessRequestsLoading } from '@/ee/access-requests/components/access-requests-loading'
import { MyAccessRequests } from '@/ee/access-requests/components/my-access-requests'
import { OrganizationAccessRequests } from '@/ee/access-requests/components/organization-access-requests'
import { accessRequestEntrySearchParams } from '@/ee/access-requests/components/search-params'

export const metadata: Metadata = {
title: 'Access requests',
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/api/access-requests/[requestId]/cancel/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
internalRateLimits,
internalSessionAuth,
} from '@/lib/api/server/routes'
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
import { cancelAccessRequest } from '@/lib/permission-access-requests/application/requests'
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
import { cancelAccessRequest } from '@/ee/access-requests/lib/application/requests'

export const POST = defineInternalJsonRoute({
contract: cancelAccessRequestContract,
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/api/access-requests/discovery/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
internalRateLimits,
internalSessionAuth,
} from '@/lib/api/server/routes'
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
import { discoverAccessRequests } from '@/lib/permission-access-requests/application/requests'
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
import { discoverAccessRequests } from '@/ee/access-requests/lib/application/requests'

export const GET = defineInternalJsonRoute({
contract: discoverAccessRequestsContract,
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/api/access-requests/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import {
internalRateLimits,
internalSessionAuth,
} from '@/lib/api/server/routes'
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
import {
createAccessRequest,
listMyAccessRequests,
} from '@/lib/permission-access-requests/application/requests'
} from '@/ee/access-requests/lib/application/requests'

export const GET = defineInternalJsonRoute({
contract: listMyAccessRequestsContract,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
internalRateLimits,
internalSessionAuth,
} from '@/lib/api/server/routes'
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
import { previewAccessRequest } from '@/lib/permission-access-requests/application/review'
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
import { previewAccessRequest } from '@/ee/access-requests/lib/application/review'

export const GET = defineInternalJsonRoute({
contract: previewAccessRequestContract,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
internalRateLimits,
internalSessionAuth,
} from '@/lib/api/server/routes'
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
import { resolveAccessRequest } from '@/lib/permission-access-requests/application/review'
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
import { resolveAccessRequest } from '@/ee/access-requests/lib/application/review'

export const POST = defineInternalJsonRoute({
contract: resolveAccessRequestContract,
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/api/organizations/[id]/access-requests/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
internalRateLimits,
internalSessionAuth,
} from '@/lib/api/server/routes'
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
import { listOrganizationAccessRequests } from '@/lib/permission-access-requests/application/requests'
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
import { listOrganizationAccessRequests } from '@/ee/access-requests/lib/application/requests'

export const GET = defineInternalJsonRoute({
contract: listOrganizationAccessRequestsContract,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import {
internalRateLimits,
internalSessionAuth,
} from '@/lib/api/server/routes'
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
import {
getAccessRequestSettings,
updateAccessRequestSettings,
} from '@/lib/permission-access-requests/application/requests'
} from '@/ee/access-requests/lib/application/requests'

export const GET = defineInternalJsonRoute({
contract: getAccessRequestSettingsContract,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AccessRequestsLoading } from '@/components/access-requests/access-requests-loading'
import { AccessRequestsLoading } from '@/ee/access-requests/components/access-requests-loading'

export default function Loading() {
return <AccessRequestsLoading />
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/workspace/[workspaceId]/access-requests/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Suspense } from 'react'
import type { Metadata } from 'next'
import { AccessRequestsLoading } from '@/components/access-requests/access-requests-loading'
import { MyAccessRequests } from '@/components/access-requests/my-access-requests'
import { AccessRequestsLoading } from '@/ee/access-requests/components/access-requests-loading'
import { MyAccessRequests } from '@/ee/access-requests/components/my-access-requests'

export const metadata: Metadata = { title: 'My access requests' }

Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/workspace/[workspaceId]/files/files.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { getErrorMessage, toError } from '@sim/utils/errors'
import { useParams, useRouter } from 'next/navigation'
import { useQueryStates } from 'nuqs'
import { usePostHog } from 'posthog-js/react'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { getDocumentIcon } from '@/components/icons/document-icons'
import { useLimitUpgradeToast } from '@/lib/billing/client'
import { captureEvent } from '@/lib/posthog/client'
Expand Down Expand Up @@ -137,6 +136,7 @@ import {
} from '@/app/workspace/[workspaceId]/files/untitled-title'
import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
import { usePinItem, usePinnedIds, useUnpinItem } from '@/hooks/queries/pinned-items'
import { useWorkspaceMembersQuery, type WorkspaceMember } from '@/hooks/queries/workspace'
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { cn, Expandable, ExpandableContent, SecretReveal, Tooltip, toast } from
import { ArrowRight, Check, ChevronDown, SquareArrowUpRight, TerminalWindow } from '@sim/emcn/icons'
import { isRecordLike } from '@sim/utils/object'
import { useParams } from 'next/navigation'
import { MemberLimitRequestAction } from '@/components/access-requests/member-limit-request-action'
import { useSession } from '@/lib/auth/auth-client'
import { buildHostedUpgradeUrl, HOSTED_BILLING_SETTINGS_URL } from '@/lib/billing/upgrade-reasons'
import { canManageWorkspaceBilling } from '@/lib/billing/workspace-permissions'
Expand Down Expand Up @@ -62,6 +61,7 @@ import { useServiceAccountConnectTarget } from '@/app/workspace/[workspaceId]/in
import { useWorkspaceHostContext } from '@/app/workspace/[workspaceId]/providers/workspace-host-provider'
import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
import { BrandIcon } from '@/blocks/brand-icon'
import { MemberLimitRequestAction } from '@/ee/access-requests/components/member-limit-request-action'
import {
useUpdateWorkspaceCredential,
useWorkspaceCredential,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ vi.mock('@/app/workspace/[workspaceId]/providers/workspace-host-provider', () =>
vi.mock('@/hooks/use-settings-navigation', () => ({
useSettingsNavigation: () => ({ getSettingsHref: () => '/settings/billing' }),
}))
vi.mock('@/components/access-requests/member-limit-request-action', () => ({
vi.mock('@/ee/access-requests/components/member-limit-request-action', () => ({
MemberLimitRequestAction: () => <button type='button'>Request increase</button>,
}))

Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/workspace/[workspaceId]/home/home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { useQueryClient } from '@tanstack/react-query'
import { useParams, useRouter } from 'next/navigation'
import { useQueryState } from 'nuqs'
import { usePostHog } from 'posthog-js/react'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { requestJson } from '@/lib/api/client/request'
import { createWorkflowContract } from '@/lib/api/contracts'
import {
Expand All @@ -45,6 +44,7 @@ import {
resolveResourceSelectionUpdate,
} from '@/app/workspace/[workspaceId]/home/resource-view-policy'
import { resourceParam, resourceUrlKeys } from '@/app/workspace/[workspaceId]/home/search-params'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
import { useFolders } from '@/hooks/queries/folders'
import { useMarkMothershipChatRead } from '@/hooks/queries/mothership-chats'
import { useWorkflows } from '@/hooks/queries/workflows'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Suspense } from 'react'
import type { Metadata } from 'next'
import { notFound } from 'next/navigation'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { INTEGRATIONS } from '@/lib/integrations'
import { IntegrationBlockDetail } from '@/app/workspace/[workspaceId]/integrations/[block]/integration-block-detail'
import { IntegrationBlockDetailFallback } from '@/app/workspace/[workspaceId]/integrations/[block]/integration-block-detail-fallback'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'

export async function generateMetadata({
params,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Metadata } from 'next'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { ConnectedCredentialDetail } from '@/app/workspace/[workspaceId]/integrations/connected/[credentialId]/connected-credential-detail'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'

export const metadata: Metadata = {
title: 'Connected Integration',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
} from '@sim/emcn'
import { useParams } from 'next/navigation'
import { useQueryStates } from 'nuqs'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import {
blockTypeToIconMap,
formatIntegrationType,
Expand All @@ -35,6 +34,7 @@ import {
} from '@/app/workspace/[workspaceId]/integrations/search-params'
import { SettingsEmptyState } from '@/app/workspace/[workspaceId]/settings/components/settings-empty-state'
import { SettingsResourceRow } from '@/app/workspace/[workspaceId]/settings/components/settings-resource-row'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
import { useWorkspaceCredentials, type WorkspaceCredential } from '@/hooks/queries/credentials'
import { useDebouncedSearchSetter } from '@/hooks/use-debounced-search-setter'
import { usePermissionConfig } from '@/hooks/use-permission-config'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Suspense } from 'react'
import type { Metadata } from 'next'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { Document } from '@/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/document'
import DocumentLoading from '@/app/workspace/[workspaceId]/knowledge/[id]/[documentId]/loading'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'

interface DocumentPageProps {
params: Promise<{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Suspense } from 'react'
import type { Metadata } from 'next'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { KnowledgeBase } from '@/app/workspace/[workspaceId]/knowledge/[id]/base'
import KnowledgeBaseLoading from '@/app/workspace/[workspaceId]/knowledge/[id]/loading'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'

interface PageProps {
params: Promise<{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ vi.mock('@/hooks/use-permission-config', () => ({ usePermissionConfig: () => ({
vi.mock('@/ee/access-control/hooks/permission-groups', () => ({
useUserPermissionConfig: () => ({ data: { config: {} }, isPending: false }),
}))
vi.mock('@/hooks/queries/access-requests', () => ({
vi.mock('@/ee/access-requests/hooks/access-requests', () => ({
useDiscoverAccessRequests: () => ({ data: { enabled: false, entries: [] }, isPending: false }),
}))
vi.mock('@/app/workspace/[workspaceId]/providers/workspace-permissions-provider', () => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { createLogger } from '@sim/logger'
import { getErrorMessage } from '@sim/utils/errors'
import { useParams, useRouter } from 'next/navigation'
import { useQueryStates } from 'nuqs'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { MAX_KNOWLEDGE_BATCH_ITEMS } from '@/lib/knowledge/constants'
import type { KnowledgeBaseData } from '@/lib/knowledge/types'
import { SEARCH_DEBOUNCE_MS } from '@/lib/url-state'
Expand Down Expand Up @@ -85,6 +84,7 @@ import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/provide
import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
import { BrandIcon } from '@/blocks/brand-icon'
import { CONNECTOR_META_REGISTRY } from '@/connectors/registry'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
import { useKnowledgeBasesList } from '@/hooks/kb/use-knowledge'
import { useCreateFolder, useDeleteFolderMutation, useUpdateFolder } from '@/hooks/queries/folders'
import {
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/workspace/[workspaceId]/prefetch-access.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const mocks = vi.hoisted(() => ({
vi.mock('@/lib/permission-groups/application/read-user-config', () => ({
readUserPermissionConfig: { execute: mocks.policy },
}))
vi.mock('@/lib/permission-access-requests/application/requests', () => ({
vi.mock('@/ee/access-requests/lib/application/requests', () => ({
discoverAccessRequests: { execute: mocks.discovery },
}))
vi.mock('@/lib/api/client/request', () => ({ requestJson: mocks.requestJson }))
Expand All @@ -39,21 +39,21 @@ vi.mock('@sim/emcn/icons', () => ({
Upload: () => null,
BookOpen: () => null,
}))
vi.mock('@/components/access-requests/request-access-action', () => ({
vi.mock('@/ee/access-requests/components/request-access-action', () => ({
RequestAccessAction: ({ pendingRequestId }: { pendingRequestId: string | null }) => (
<button type='button'>{pendingRequestId ? 'Pending' : 'Request access'}</button>
),
}))

import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { ApiClientError } from '@/lib/api/client/errors'
import { getUserPermissionConfigContract } from '@/lib/api/contracts/permission-groups'
import { DEFAULT_PERMISSION_GROUP_CONFIG } from '@/lib/permission-groups/fields'
import { prefetchWorkspaceAccess } from '@/app/workspace/[workspaceId]/prefetch-access'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
import {
accessRequestKeys,
workspaceFeatureDiscoveryQuery,
} from '@/hooks/queries/utils/access-request-keys'
} from '@/ee/access-requests/hooks/access-request-keys'
import { permissionGroupKeys } from '@/hooks/queries/utils/permission-group-keys'

const principal = { kind: 'session', userId: 'viewer', sessionId: 'session' } as const
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/workspace/[workspaceId]/prefetch-access.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
ACCESS_REQUESTS_STALE_TIME,
accessRequestKeys,
workspaceFeatureDiscoveryQuery,
} from '@/hooks/queries/utils/access-request-keys'
} from '@/ee/access-requests/hooks/access-request-keys'
import {
PERMISSION_GROUPS_STALE_TIME,
permissionGroupKeys,
Expand Down Expand Up @@ -46,7 +46,7 @@ export async function prefetchWorkspaceAccess(
queryKey: accessRequestKeys.discovery(query),
queryFn: async () => {
const { discoverAccessRequests } = await import(
'@/lib/permission-access-requests/application/requests'
'@/ee/access-requests/lib/application/requests'
)
return discoverAccessRequestsContract.response.schema.parse(
await discoverAccessRequests.execute({ principal, input: query })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const {

vi.mock('next/navigation', () => ({ notFound: mockNotFound, redirect: mockRedirect }))
vi.mock('@/lib/auth', () => ({ getSession: mockGetSession }))
vi.mock('@/components/access-requests/permission-access-boundary', () => ({
vi.mock('@/ee/access-requests/components/permission-access-boundary', () => ({
PermissionAccessBoundary: vi.fn(() => null),
}))
vi.mock('@/lib/settings/application/workspace-section-access', () => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Suspense } from 'react'
import { dehydrate, HydrationBoundary } from '@tanstack/react-query'
import type { Metadata } from 'next'
import { notFound, redirect } from 'next/navigation'
import { PermissionAccessBoundary } from '@/components/access-requests/permission-access-boundary'
import { EmptyState } from '@/components/empty-state/empty-state'
import {
getOrganizationSettingsHref,
Expand All @@ -13,6 +12,7 @@ import { authorizeWorkspaceSettingsSection } from '@/lib/settings/application/wo
import { getWorkspaceHostContextForViewer } from '@/lib/workspaces/host-context'
import { getQueryClient } from '@/app/_shell/providers/get-query-client'
import { resolveSettingsSection } from '@/app/workspace/[workspaceId]/settings/navigation'
import { PermissionAccessBoundary } from '@/ee/access-requests/components/permission-access-boundary'
import { SECTION_PREFETCHERS } from './prefetch'
import { SettingsPage } from './settings'

Expand Down
Loading
Loading