Skip to content

Commit c822ec2

Browse files
authored
feat(access-requests): remove rollout flag and move feature into ee (#7986)
1 parent f070a34 commit c822ec2

103 files changed

Lines changed: 296 additions & 379 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/sim/.env.example‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ CRON_SECRET=your_cron_secret # Use `openssl rand -hex 32` to generate. Authentic
214214
# FORKING_ENABLED= # Workspace forks
215215
# CREDENTIAL_GROUPS= # Enterprise managed OAuth collections
216216
# TABLE_ROW_TTL= # Table TTL columns and expired-row cleanup
217-
# PERMISSION_ACCESS_REQUESTS_ENABLED= # Global access-request rollout; organizations may opt out
218217
# KNOWLEDGE_MEMBER_ACCESS= # Per-member knowledge connectors and hybrid-by-default retrieval
219218
# ORGANIZATIONS_ENABLED= / NEXT_PUBLIC_ORGANIZATIONS_ENABLED= # Organizations only
220219

‎apps/sim/app/access-requests/loading.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AccessRequestsLoading } from '@/components/access-requests/access-requests-loading'
1+
import { AccessRequestsLoading } from '@/ee/access-requests/components/access-requests-loading'
22

33
export default function Loading() {
44
return <AccessRequestsLoading />

‎apps/sim/app/access-requests/page.test.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
44

55
const { redirect } = vi.hoisted(() => ({ redirect: vi.fn() }))
66
vi.mock('next/navigation', () => ({ redirect }))
7-
vi.mock('@/components/access-requests/my-access-requests', () => ({ MyAccessRequests: () => null }))
8-
vi.mock('@/components/access-requests/organization-access-requests', () => ({
7+
vi.mock('@/ee/access-requests/components/my-access-requests', () => ({
8+
MyAccessRequests: () => null,
9+
}))
10+
vi.mock('@/ee/access-requests/components/organization-access-requests', () => ({
911
OrganizationAccessRequests: () => null,
1012
}))
1113

‎apps/sim/app/access-requests/page.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { ChipLink } from '@sim/emcn'
33
import type { Metadata } from 'next'
44
import { redirect } from 'next/navigation'
55
import { createSearchParamsCache, createSerializer } from 'nuqs/server'
6-
import { AccessRequestsLoading } from '@/components/access-requests/access-requests-loading'
7-
import { MyAccessRequests } from '@/components/access-requests/my-access-requests'
8-
import { OrganizationAccessRequests } from '@/components/access-requests/organization-access-requests'
9-
import { accessRequestEntrySearchParams } from '@/components/access-requests/search-params'
106
import { EmptyState } from '@/components/empty-state/empty-state'
117
import { getSession } from '@/lib/auth'
128
import { WORKSPACES_PATH } from '@/lib/navigation/paths'
139
import { buildAuthCrossLink } from '@/app/(auth)/auth-redirect'
10+
import { AccessRequestsLoading } from '@/ee/access-requests/components/access-requests-loading'
11+
import { MyAccessRequests } from '@/ee/access-requests/components/my-access-requests'
12+
import { OrganizationAccessRequests } from '@/ee/access-requests/components/organization-access-requests'
13+
import { accessRequestEntrySearchParams } from '@/ee/access-requests/components/search-params'
1414

1515
export const metadata: Metadata = {
1616
title: 'Access requests',

‎apps/sim/app/api/access-requests/[requestId]/cancel/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
internalRateLimits,
66
internalSessionAuth,
77
} from '@/lib/api/server/routes'
8-
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
9-
import { cancelAccessRequest } from '@/lib/permission-access-requests/application/requests'
8+
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
9+
import { cancelAccessRequest } from '@/ee/access-requests/lib/application/requests'
1010

1111
export const POST = defineInternalJsonRoute({
1212
contract: cancelAccessRequestContract,

‎apps/sim/app/api/access-requests/discovery/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
internalRateLimits,
66
internalSessionAuth,
77
} from '@/lib/api/server/routes'
8-
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
9-
import { discoverAccessRequests } from '@/lib/permission-access-requests/application/requests'
8+
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
9+
import { discoverAccessRequests } from '@/ee/access-requests/lib/application/requests'
1010

1111
export const GET = defineInternalJsonRoute({
1212
contract: discoverAccessRequestsContract,

‎apps/sim/app/api/access-requests/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import {
88
internalRateLimits,
99
internalSessionAuth,
1010
} from '@/lib/api/server/routes'
11-
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
11+
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
1212
import {
1313
createAccessRequest,
1414
listMyAccessRequests,
15-
} from '@/lib/permission-access-requests/application/requests'
15+
} from '@/ee/access-requests/lib/application/requests'
1616

1717
export const GET = defineInternalJsonRoute({
1818
contract: listMyAccessRequestsContract,

‎apps/sim/app/api/organizations/[id]/access-requests/[requestId]/preview/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
internalRateLimits,
66
internalSessionAuth,
77
} from '@/lib/api/server/routes'
8-
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
9-
import { previewAccessRequest } from '@/lib/permission-access-requests/application/review'
8+
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
9+
import { previewAccessRequest } from '@/ee/access-requests/lib/application/review'
1010

1111
export const GET = defineInternalJsonRoute({
1212
contract: previewAccessRequestContract,

‎apps/sim/app/api/organizations/[id]/access-requests/[requestId]/resolve/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
internalRateLimits,
66
internalSessionAuth,
77
} from '@/lib/api/server/routes'
8-
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
9-
import { resolveAccessRequest } from '@/lib/permission-access-requests/application/review'
8+
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
9+
import { resolveAccessRequest } from '@/ee/access-requests/lib/application/review'
1010

1111
export const POST = defineInternalJsonRoute({
1212
contract: resolveAccessRequestContract,

‎apps/sim/app/api/organizations/[id]/access-requests/route.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import {
55
internalRateLimits,
66
internalSessionAuth,
77
} from '@/lib/api/server/routes'
8-
import { accessRequestOperations } from '@/lib/permission-access-requests/application/operations'
9-
import { listOrganizationAccessRequests } from '@/lib/permission-access-requests/application/requests'
8+
import { accessRequestOperations } from '@/ee/access-requests/lib/application/operations'
9+
import { listOrganizationAccessRequests } from '@/ee/access-requests/lib/application/requests'
1010

1111
export const GET = defineInternalJsonRoute({
1212
contract: listOrganizationAccessRequestsContract,

0 commit comments

Comments
 (0)