copy over next standalone

.cursor/rules/build-and-deployment.mdc

@@ -1,61 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: false
----
-# Build & Deployment Best Practices
-
-## Build Process
-
-### Running Builds
-- Use `pnpm build` from project root for full build
-- Monitor for React hooks warnings and fix them immediately
-- Ensure all TypeScript errors are resolved before deployment
-
-### Common Build Issues & Fixes
-
-#### React Hooks Warnings
-- Capture ref values in variables within useEffect cleanup
-- Avoid accessing `.current` directly in cleanup functions
-- Pattern for fixing ref cleanup warnings:
-```typescript
-useEffect(() => {
-  const currentRef = myRef.current;
-  return () => {
-    if (currentRef) {
-      currentRef.cleanup();
-    }
-  };
-}, []);
-```
-
-#### Test Failures During Build
-- Ensure all test mocks include required constants like `SESSION_MAX_AGE`
-- Mock Next.js navigation hooks properly: `useParams`, `useRouter`, `useSearchParams`
-- Remove unused imports and constants from test files
-- Use literal values instead of imported constants when the constant isn't actually needed
-
-### Test Execution
-- Run `pnpm test` to execute all tests
-- Use `pnpm test -- --run filename.test.tsx` for specific test files
-- Fix test failures before merging code
-- Ensure 100% test coverage for new components
-
-### Performance Monitoring
-- Monitor build times and optimize if necessary
-- Watch for memory usage during builds
-- Use proper caching strategies for faster rebuilds
-
-### Deployment Checklist
-1. All tests passing
-2. Build completes without warnings
-3. TypeScript compilation successful
-4. No linter errors
-5. Database migrations applied (if any)
-6. Environment variables configured
-
-### EKS Deployment Considerations
-- Ensure latest code is deployed to all pods
-- Monitor AWS RDS Performance Insights for database issues
-- Verify environment-specific configurations
-- Check pod health and resource usage

.cursor/rules/cache-optimization.mdc

@@ -1,414 +0,0 @@
----
-description: Caching rules for performance improvements
-globs: 
-alwaysApply: false
----
-# Cache Optimization Patterns for Formbricks
-
-## Cache Strategy Overview
-
-Formbricks uses a **hybrid caching approach** optimized for enterprise scale:
-
-- **Redis** for persistent cross-request caching  
-- **React `cache()`** for request-level deduplication
-- **NO Next.js `unstable_cache()`** - avoid for reliability
-
-## Key Files
-
-### Core Cache Infrastructure
-- [apps/web/modules/cache/lib/service.ts](mdc:apps/web/modules/cache/lib/service.ts) - Redis cache service
-- [apps/web/modules/cache/lib/withCache.ts](mdc:apps/web/modules/cache/lib/withCache.ts) - Cache wrapper utilities
-- [apps/web/modules/cache/lib/cacheKeys.ts](mdc:apps/web/modules/cache/lib/cacheKeys.ts) - Enterprise cache key patterns and utilities
-
-### Environment State Caching (Critical Endpoint)
-- [apps/web/app/api/v1/client/[environmentId]/environment/route.ts](mdc:apps/web/app/api/v1/client/[environmentId]/environment/route.ts) - Main endpoint serving hundreds of thousands of SDK clients
-- [apps/web/app/api/v1/client/[environmentId]/environment/lib/data.ts](mdc:apps/web/app/api/v1/client/[environmentId]/environment/lib/data.ts) - Optimized data layer with caching
-
-## Enterprise-Grade Cache Key Patterns
-
-**Always use** the `createCacheKey` utilities from [cacheKeys.ts](mdc:apps/web/modules/cache/lib/cacheKeys.ts):
-
-```typescript
-// ✅ Correct patterns
-createCacheKey.environment.state(environmentId)     // "fb:env:abc123:state"
-createCacheKey.organization.billing(organizationId) // "fb:org:xyz789:billing"
-createCacheKey.license.status(organizationId)       // "fb:license:org123:status"
-createCacheKey.user.permissions(userId, orgId)      // "fb:user:456:org:123:permissions"
-
-// ❌ Never use flat keys - collision-prone
-"environment_abc123"
-"user_data_456"
-```
-
-## When to Use Each Cache Type
-
-### Use React `cache()` for Request Deduplication
-```typescript
-// ✅ Prevents multiple calls within same request
-export const getEnterpriseLicense = reactCache(async () => {
-  // Complex license validation logic
-});
-```
-
-### Use `withCache()` for Simple Database Queries
-```typescript
-// ✅ Simple caching with automatic fallback (TTL in milliseconds)
-export const getActionClasses = (environmentId: string) => {
-  return withCache(() => fetchActionClassesFromDB(environmentId), {
-    key: createCacheKey.environment.actionClasses(environmentId),
-    ttl: 60 * 30 * 1000, // 30 minutes in milliseconds
-  })();
-};
-```
-
-### Use Explicit Redis Cache for Complex Business Logic
-```typescript
-// ✅ Full control for high-stakes endpoints
-export const getEnvironmentState = async (environmentId: string) => {
-  const cached = await environmentStateCache.getEnvironmentState(environmentId);
-  if (cached) return cached;
-  
-  const fresh = await buildComplexState(environmentId);
-  await environmentStateCache.setEnvironmentState(environmentId, fresh);
-  return fresh;
-};
-```
-
-## Caching Decision Framework
-
-### When TO Add Caching
-
-```typescript
-// ✅ Expensive operations that benefit from caching
-- Database queries (>10ms typical)
-- External API calls (>50ms typical)  
-- Complex computations (>5ms)
-- File system operations
-- Heavy data transformations
-
-// Example: Database query with complex joins (TTL in milliseconds)
-export const getEnvironmentWithDetails = withCache(
-  async (environmentId: string) => {
-    return prisma.environment.findUnique({
-      where: { id: environmentId },
-      include: { /* complex joins */ }
-    });
-  },
-  { key: createCacheKey.environment.details(environmentId), ttl: 60 * 30 * 1000 } // 30 minutes
-)();
-```
-
-### When NOT to Add Caching
-
-```typescript
-// ❌ Don't cache these operations - minimal overhead
-- Simple property access (<0.1ms)
-- Basic transformations (<1ms)
-- Functions that just call already-cached functions
-- Pure computation without I/O
-
-// ❌ Bad example: Redundant caching
-const getCachedLicenseFeatures = withCache(
-  async () => {
-    const license = await getEnterpriseLicense(); // Already cached!
-    return license.active ? license.features : null; // Just property access
-  },
-  { key: "license-features", ttl: 1800 * 1000 } // 30 minutes in milliseconds
-);
-
-// ✅ Good example: Simple and efficient
-const getLicenseFeatures = async () => {
-  const license = await getEnterpriseLicense(); // Already cached
-  return license.active ? license.features : null; // 0.1ms overhead
-};
-```
-
-### Computational Overhead Analysis
-
-Before adding caching, analyze the overhead:
-
-```typescript
-// ✅ High overhead - CACHE IT
-- Database queries: ~10-100ms
-- External APIs: ~50-500ms  
-- File I/O: ~5-50ms
-- Complex algorithms: >5ms
-
-// ❌ Low overhead - DON'T CACHE
-- Property access: ~0.001ms
-- Simple lookups: ~0.1ms
-- Basic validation: ~1ms
-- Type checks: ~0.01ms
-
-// Example decision tree:
-const expensiveOperation = async () => {
-  return prisma.query(); // 50ms - CACHE IT
-};
-
-const cheapOperation = (data: any) => {
-  return data.property; // 0.001ms - DON'T CACHE
-};
-```
-
-### Avoid Cache Wrapper Anti-Pattern
-
-```typescript
-// ❌ Don't create wrapper functions just for caching
-const getCachedUserPermissions = withCache(
-  async (userId: string) => getUserPermissions(userId),
-  { key: createCacheKey.user.permissions(userId), ttl: 3600 * 1000 } // 1 hour in milliseconds
-);
-
-// ✅ Add caching directly to the original function
-export const getUserPermissions = withCache(
-  async (userId: string) => {
-    return prisma.user.findUnique({
-      where: { id: userId },
-      include: { permissions: true }
-    });
-  },
-  { key: createCacheKey.user.permissions(userId), ttl: 3600 * 1000 } // 1 hour in milliseconds
-);
-```
-
-## TTL Coordination Strategy
-
-### Multi-Layer Cache Coordination
-For endpoints serving client SDKs, coordinate TTLs across layers:
-
-```typescript
-// Client SDK cache (expiresAt) - longest TTL for fewer requests
-const CLIENT_TTL = 60 * 60;           // 1 hour (seconds for client)
-
-// Server Redis cache - shorter TTL ensures fresh data for clients  
-const SERVER_TTL = 60 * 30 * 1000;   // 30 minutes in milliseconds
-
-// HTTP cache headers (seconds)
-const BROWSER_TTL = 60 * 60;         // 1 hour (max-age)
-const CDN_TTL = 60 * 30;             // 30 minutes (s-maxage)
-const CORS_TTL = 60 * 60;            // 1 hour (balanced approach)
-```
-
-### Standard TTL Guidelines (in milliseconds for cache-manager + Keyv)
-```typescript
-// Configuration data - rarely changes
-const CONFIG_TTL = 60 * 60 * 24 * 1000;     // 24 hours
-
-// User data - moderate frequency  
-const USER_TTL = 60 * 60 * 2 * 1000;        // 2 hours
-
-// Survey data - changes moderately
-const SURVEY_TTL = 60 * 15 * 1000;          // 15 minutes
-
-// Billing data - expensive to compute
-const BILLING_TTL = 60 * 30 * 1000;         // 30 minutes
-
-// Action classes - infrequent changes
-const ACTION_CLASS_TTL = 60 * 30 * 1000;    // 30 minutes
-```
-
-## High-Frequency Endpoint Optimization
-
-### Performance Patterns for High-Volume Endpoints
-
-```typescript
-// ✅ Optimized high-frequency endpoint pattern
-export const GET = async (request: NextRequest, props: { params: Promise<{ id: string }> }) => {
-  const params = await props.params;
-
-  try {
-    // Simple validation (avoid Zod for high-frequency)
-    if (!params.id || typeof params.id !== 'string') {
-      return responses.badRequestResponse("ID is required", undefined, true);
-    }
-
-    // Single optimized query with caching
-    const data = await getOptimizedData(params.id);
-
-    return responses.successResponse(
-      {
-        data,
-        expiresAt: new Date(Date.now() + CLIENT_TTL * 1000), // SDK cache duration
-      },
-      true,
-      "public, s-maxage=1800, max-age=3600, stale-while-revalidate=1800, stale-if-error=3600"
-    );
-  } catch (err) {
-    // Simplified error handling for performance
-    if (err instanceof ResourceNotFoundError) {
-      return responses.notFoundResponse(err.resourceType, err.resourceId);
-    }
-    logger.error({ error: err, url: request.url }, "Error in high-frequency endpoint");
-    return responses.internalServerErrorResponse(err.message, true);
-  }
-};
-```
-
-### Avoid These Performance Anti-Patterns
-
-```typescript
-// ❌ Avoid for high-frequency endpoints
-const inputValidation = ZodSchema.safeParse(input);     // Too slow
-const startTime = Date.now(); logger.debug(...);       // Logging overhead
-const { data, revalidateEnvironment } = await get();   // Complex return types
-```
-
-### CORS Optimization
-```typescript
-// ✅ Balanced CORS caching (not too aggressive)
-export const OPTIONS = async (): Promise<Response> => {
-  return responses.successResponse(
-    {},
-    true,
-    "public, s-maxage=3600, max-age=3600" // 1 hour balanced approach
-  );
-};
-```
-
-## Redis Cache Migration from Next.js
-
-### Avoid Legacy Next.js Patterns
-```typescript
-// ❌ Old Next.js unstable_cache pattern (avoid)
-const getCachedData = unstable_cache(
-  async (id) => fetchData(id),
-  ['cache-key'],
-  { tags: ['environment'], revalidate: 900 }
-);
-
-// ❌ Don't use revalidateEnvironment flags with Redis
-return { data, revalidateEnvironment: true }; // This gets cached incorrectly!
-
-// ✅ New Redis pattern with withCache (TTL in milliseconds)
-export const getCachedData = (id: string) => 
-  withCache(
-    () => fetchData(id),
-    {
-      key: createCacheKey.environment.data(id),
-      ttl: 60 * 15 * 1000, // 15 minutes in milliseconds
-    }
-  )();
-```
-
-### Remove Revalidation Logic
-When migrating from Next.js `unstable_cache`:
-- Remove `revalidateEnvironment` or similar flags
-- Remove tag-based invalidation logic  
-- Use TTL-based expiration instead
-- Handle one-time updates (like `appSetupCompleted`) directly in cache
-
-## Data Layer Optimization
-
-### Single Query Pattern
-```typescript
-// ✅ Optimize with single database query
-export const getOptimizedEnvironmentData = async (environmentId: string) => {
-  return prisma.environment.findUniqueOrThrow({
-    where: { id: environmentId },
-    include: {
-      project: { 
-        select: { id: true, recontactDays: true, /* ... */ }
-      },
-      organization: {
-        select: { id: true, billing: true }
-      },
-      surveys: {
-        where: { status: "inProgress" },
-        select: { id: true, name: true, /* ... */ }
-      },
-      actionClasses: {
-        select: { id: true, name: true, /* ... */ }
-      }
-    }
-  });
-};
-
-// ❌ Avoid multiple separate queries
-const environment = await getEnvironment(id);
-const organization = await getOrganization(environment.organizationId);  
-const surveys = await getSurveys(id);
-const actionClasses = await getActionClasses(id);
-```
-
-## Invalidation Best Practices
-
-**Always use explicit key-based invalidation:**
-
-```typescript
-// ✅ Clear and debuggable
-await invalidateCache(createCacheKey.environment.state(environmentId));
-await invalidateCache([
-  createCacheKey.environment.surveys(environmentId),
-  createCacheKey.environment.actionClasses(environmentId)
-]);
-
-// ❌ Avoid complex tag systems
-await invalidateByTags(["environment", "survey"]); // Don't do this
-```
-
-## Critical Performance Targets
-
-### High-Frequency Endpoint Goals
-- **Cache hit ratio**: >85%
-- **Response time P95**: <200ms  
-- **Database load reduction**: >60%
-- **HTTP cache duration**: 1hr browser, 30min Cloudflare
-- **SDK refresh interval**: 1 hour with 30min server cache
-
-### Performance Monitoring
-- Use **existing elastic cache analytics** for metrics
-- Log cache errors and warnings (not debug info)
-- Track database query reduction
-- Monitor response times for cached endpoints
-- **Avoid performance logging** in high-frequency endpoints
-
-## Error Handling Pattern
-
-Always provide fallback to fresh data on cache errors:
-
-```typescript
-try {
-  const cached = await cache.get(key);
-  if (cached) return cached;
-  
-  const fresh = await fetchFresh();
-  await cache.set(key, fresh, ttl); // ttl in milliseconds
-  return fresh;
-} catch (error) {
-  // ✅ Always fallback to fresh data
-  logger.warn("Cache error, fetching fresh", { key, error });
-  return fetchFresh();
-}
-```
-
-## Common Pitfalls to Avoid
-
-1. **Never use Next.js `unstable_cache()`** - unreliable in production
-2. **Don't use revalidation flags with Redis** - they get cached incorrectly
-3. **Avoid Zod validation** for simple parameters in high-frequency endpoints
-4. **Don't add performance logging** to high-frequency endpoints
-5. **Coordinate TTLs** between client and server caches
-6. **Don't over-engineer** with complex tag systems  
-7. **Avoid caching rapidly changing data** (real-time metrics)
-8. **Always validate cache keys** to prevent collisions
-9. **Don't add redundant caching layers** - analyze computational overhead first
-10. **Avoid cache wrapper functions** - add caching directly to expensive operations
-11. **Don't cache property access or simple transformations** - overhead is negligible
-12. **Analyze the full call chain** before adding caching to avoid double-caching
-13. **Remember TTL is in milliseconds** for cache-manager + Keyv stack (not seconds)
-
-## Monitoring Strategy
-
-- Use **existing elastic cache analytics** for metrics
-- Log cache errors and warnings  
-- Track database query reduction
-- Monitor response times for cached endpoints
-- **Don't add custom metrics** that duplicate existing monitoring
-
-## Important Notes
-
-### TTL Units
-- **cache-manager + Keyv**: TTL in **milliseconds**
-- **Direct Redis commands**: TTL in **seconds** (EXPIRE, SETEX) or **milliseconds** (PEXPIRE, PSETEX)
-- **HTTP cache headers**: TTL in **seconds** (max-age, s-maxage)
-- **Client SDK**: TTL in **seconds** (expiresAt calculation)

.cursor/rules/database-performance.mdc

@@ -1,41 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: false
----
-# Database Performance & Prisma Best Practices
-
-## Critical Performance Rules
-
-### Response Count Queries
-- **NEVER** use `skip`/`offset` with `prisma.response.count()` - this causes expensive subqueries with OFFSET
-- Always use only `where` clauses for count operations: `prisma.response.count({ where: { ... } })`
-- For pagination, separate count queries from data queries
-- Reference: [apps/web/lib/response/service.ts](mdc:apps/web/lib/response/service.ts) line 654-686
-
-### Prisma Query Optimization
-- Use proper indexes defined in [packages/database/schema.prisma](mdc:packages/database/schema.prisma)
-- Leverage existing indexes: `@@index([surveyId, createdAt])`, `@@index([createdAt])`
-- Use cursor-based pagination for large datasets instead of offset-based
-- Cache frequently accessed data using React Cache and custom cache tags
-
-### Date Range Filtering
-- When filtering by `createdAt`, always use indexed queries
-- Combine with `surveyId` for optimal performance: `{ surveyId, createdAt: { gte: start, lt: end } }`
-- Avoid complex WHERE clauses that can't utilize indexes
-
-### Count vs Data Separation
-- Always separate count queries from data fetching queries
-- Use `Promise.all()` to run count and data queries in parallel
-- Example pattern from [apps/web/modules/api/v2/management/responses/lib/response.ts](mdc:apps/web/modules/api/v2/management/responses/lib/response.ts):
-```typescript
-const [responses, totalCount] = await Promise.all([
-  prisma.response.findMany(query),
-  prisma.response.count({ where: whereClause }),
-]);
-```
-
-### Monitoring & Debugging
-- Monitor AWS RDS Performance Insights for problematic queries
-- Look for queries with OFFSET in count operations - these indicate performance issues
-- Use proper error handling with `DatabaseError` for Prisma exceptions

.cursor/rules/database.mdc

@@ -1,101 +0,0 @@
----
-description: >
-  This rule provides comprehensive knowledge about the Formbricks database structure, relationships, 
-  and data patterns. It should be used **only when the agent explicitly requests database schema-level 
-  details** to support tasks such as: writing/debugging Prisma queries, designing/reviewing data models, 
-  investigating multi-tenancy behavior, creating API endpoints, or understanding data relationships.
-globs: []
-alwaysApply: agent-requested
----
-# Formbricks Database Schema Reference
-
-This rule provides a reference to the Formbricks database structure. For the most up-to-date and complete schema definitions, please refer to the schema.prisma file directly.
-
-## Database Overview
-
-Formbricks uses PostgreSQL with Prisma ORM. The schema is designed for multi-tenancy with strong data isolation between organizations.
-
-### Core Hierarchy
-```
-Organization
-└── Project
-    └── Environment (production/development)
-        ├── Survey
-        ├── Contact
-        ├── ActionClass
-        └── Integration
-```
-
-## Schema Reference
-
-For the complete and up-to-date database schema, please refer to:
-- Main schema: `packages/database/schema.prisma`
-- JSON type definitions: `packages/database/json-types.ts`
-
-The schema.prisma file contains all model definitions, relationships, enums, and field types. The json-types.ts file contains TypeScript type definitions for JSON fields.
-
-## Data Access Patterns
-
-### Multi-tenancy
-- All data is scoped by Organization
-- Environment-level isolation for surveys and contacts
-- Project-level grouping for related surveys
-
-### Soft Deletion
-Some models use soft deletion patterns:
-- Check `isActive` fields where present
-- Use proper filtering in queries
-
-### Cascading Deletes
-Configured cascade relationships:
-- Organization deletion cascades to all child entities
-- Survey deletion removes responses, displays, triggers
-- Contact deletion removes attributes and responses
-
-## Common Query Patterns
-
-### Survey with Responses
-```typescript
-// Include response count and latest responses
-const survey = await prisma.survey.findUnique({
-  where: { id: surveyId },
-  include: {
-    responses: {
-      take: 10,
-      orderBy: { createdAt: 'desc' }
-    },
-    _count: {
-      select: { responses: true }
-    }
-  }
-});
-```
-
-### Environment Scoping
-```typescript
-// Always scope by environment
-const surveys = await prisma.survey.findMany({
-  where: {
-    environmentId: environmentId,
-    // Additional filters...
-  }
-});
-```
-
-### Contact with Attributes
-```typescript
-const contact = await prisma.contact.findUnique({
-  where: { id: contactId },
-  include: {
-    attributes: {
-      include: {
-        attributeKey: true
-      }
-    }
-  }
-});
-```
-
-This schema supports Formbricks' core functionality: multi-tenant survey management, user targeting, response collection, and analysis, all while maintaining strict data isolation and security.
-
-

.cursor/rules/documentations.mdc

@@ -1,23 +0,0 @@
----
-description: Guideline for writing end-user facing documentation in the apps/docs folder
-globs: 
-alwaysApply: false
----
-Follow these instructions and guidelines when asked to write documentation in the apps/docs folder
-
-Follow this structure to write the title, describtion and pick a matching icon and insert it at the top of the MDX file:
-
----
-title: "FEATURE NAME"
-description: "1 concise sentence to describe WHEN the feature is being used and FOR WHAT BENEFIT."
-icon: "link"
----
-
-- Description: 1 concise sentence to describe WHEN the feature is being used and FOR WHAT BENEFIT.
-- Make ample use of the Mintlify components you can find here https://mintlify.com/docs/llms.txt
-- In all Headlines, only capitalize the current feature and nothing else, to Camel Case
-- If a feature is part of the Enterprise Edition, use this note:
-
-<Note>
-  FEATURE NAME is part of the @Enterprise Edition. 
-</Note>

.cursor/rules/eks-alb-optimization.mdc

@@ -1,152 +0,0 @@
----
-description:
-globs:
-alwaysApply: false
----
-# EKS & ALB Optimization Guide for Error Reduction
-
-## Infrastructure Overview
-
-This project uses AWS EKS with Application Load Balancer (ALB) for the Formbricks application. The infrastructure has been optimized to minimize ELB 502/504 errors through careful configuration of connection handling, health checks, and pod lifecycle management.
-
-## Key Infrastructure Files
-
-### Terraform Configuration
-- **Main Infrastructure**: [infra/terraform/main.tf](mdc:infra/terraform/main.tf) - EKS cluster, VPC, Karpenter, and core AWS resources
-- **Monitoring**: [infra/terraform/cloudwatch.tf](mdc:infra/terraform/cloudwatch.tf) - CloudWatch alarms for 502/504 error tracking and alerting
-- **Database**: [infra/terraform/rds.tf](mdc:infra/terraform/rds.tf) - Aurora PostgreSQL configuration
-
-### Helm Configuration
-- **Production**: [infra/formbricks-cloud-helm/values.yaml.gotmpl](mdc:infra/formbricks-cloud-helm/values.yaml.gotmpl) - Optimized ALB and pod configurations
-- **Staging**: [infra/formbricks-cloud-helm/values-staging.yaml.gotmpl](mdc:infra/formbricks-cloud-helm/values-staging.yaml.gotmpl) - Staging environment with spot instances
-- **Deployment**: [infra/formbricks-cloud-helm/helmfile.yaml.gotmpl](mdc:infra/formbricks-cloud-helm/helmfile.yaml.gotmpl) - Multi-environment Helm releases
-
-## ALB Optimization Patterns
-
-### Connection Handling Optimizations
-```yaml
-# Key ALB annotations for reducing 502/504 errors
-alb.ingress.kubernetes.io/load-balancer-attributes: |
-  idle_timeout.timeout_seconds=120,
-  connection_logs.s3.enabled=false,
-  access_logs.s3.enabled=false
-
-alb.ingress.kubernetes.io/target-group-attributes: |
-  deregistration_delay.timeout_seconds=30,
-  stickiness.enabled=false,
-  load_balancing.algorithm.type=least_outstanding_requests,
-  target_group_health.dns_failover.minimum_healthy_targets.count=1
-```
-
-### Health Check Configuration
-- **Interval**: 15 seconds for faster detection of unhealthy targets
-- **Timeout**: 5 seconds to prevent false positives
-- **Thresholds**: 2 healthy, 3 unhealthy for balanced responsiveness
-- **Path**: `/health` endpoint optimized for < 100ms response time
-
-## Pod Lifecycle Management
-
-### Graceful Shutdown Pattern
-```yaml
-# PreStop hook to allow connection draining
-lifecycle:
-  preStop:
-    exec:
-      command: ["/bin/sh", "-c", "sleep 15"]
-
-# Termination grace period for complete cleanup
-terminationGracePeriodSeconds: 45
-```
-
-### Health Probe Strategy
-- **Startup Probe**: 5s initial delay, 5s interval, max 60s startup time
-- **Readiness Probe**: 10s delay, 10s interval for traffic readiness
-- **Liveness Probe**: 30s delay, 30s interval for container health
-
-### Rolling Update Configuration
-```yaml
-strategy:
-  type: RollingUpdate
-  rollingUpdate:
-    maxUnavailable: 25%  # Maintain capacity during updates
-    maxSurge: 50%        # Allow faster rollouts
-```
-
-## Karpenter Node Management
-
-### Node Lifecycle Optimization
-- **Startup Taints**: Prevent traffic during node initialization
-- **Graceful Shutdown**: 30s grace period for pod eviction
-- **Consolidation Delay**: 60s to reduce unnecessary churn
-- **Eviction Policies**: Configured for smooth pod migrations
-
-### Instance Selection
-- **Families**: c8g, c7g, m8g, m7g, r8g, r7g (ARM64 Graviton)
-- **Sizes**: 2, 4, 8 vCPUs for cost optimization
-- **Bottlerocket AMI**: Enhanced security and performance
-
-## Monitoring & Alerting
-
-### Critical ALB Metrics
-1. **ELB 502 Errors**: Threshold 20 over 5 minutes
-2. **ELB 504 Errors**: Threshold 15 over 5 minutes  
-3. **Target Connection Errors**: Threshold 50 over 5 minutes
-4. **4XX Errors**: Threshold 100 over 10 minutes (client issues)
-
-### Expected Improvements
-- **60-80% reduction** in ELB 502 errors
-- **Faster recovery** during pod restarts
-- **Better connection reuse** efficiency
-- **Improved autoscaling** responsiveness
-
-## Deployment Patterns
-
-### Infrastructure Updates
-1. **Terraform First**: Apply infrastructure changes via [infra/deploy-improvements.sh](mdc:infra/deploy-improvements.sh)
-2. **Helm Second**: Deploy application configurations
-3. **Verification**: Check pod status, endpoints, and ALB health
-4. **Monitoring**: Watch CloudWatch metrics for 24-48 hours
-
-### Environment-Specific Configurations
-- **Production**: On-demand instances, stricter resource limits
-- **Staging**: Spot instances, rate limiting disabled, relaxed resources
-
-## Troubleshooting Patterns
-
-### 502 Error Investigation
-1. Check pod readiness and health probe status
-2. Verify ALB target group health
-3. Review deregistration timing during deployments
-4. Monitor connection pool utilization
-
-### 504 Error Analysis  
-1. Check application response times
-2. Verify timeout configurations (ALB: 120s, App: aligned)
-3. Review database query performance
-4. Monitor resource utilization during traffic spikes
-
-### Connection Error Patterns
-1. Verify Karpenter node lifecycle timing
-2. Check pod termination grace periods
-3. Review ALB connection draining settings
-4. Monitor cluster autoscaling events
-
-## Best Practices
-
-### When Making Changes
-- **Test in staging first** with same configurations
-- **Monitor metrics** for 24-48 hours after changes
-- **Use gradual rollouts** with proper health checks
-- **Maintain ALB timeout alignment** across all layers
-
-### Performance Optimization
-- **Health endpoint** should respond < 100ms consistently  
-- **Connection pooling** aligned with ALB idle timeouts
-- **Resource requests/limits** tuned for consistent performance
-- **Graceful shutdown** implemented in application code
-
-### Monitoring Strategy
-- **Real-time alerts** for error rate spikes
-- **Trend analysis** for connection patterns
-- **Capacity planning** based on LCU usage
-- **4XX pattern analysis** for client behavior insights

.cursor/rules/formbricks-architecture.mdc

@@ -1,332 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: false
----
-# Formbricks Architecture & Patterns
-
-## Monorepo Structure
-
-### Apps Directory
-- `apps/web/` - Main Next.js web application
-- `packages/` - Shared packages and utilities
-
-### Key Directories in Web App
-```
-apps/web/
-├── app/                    # Next.js 13+ app directory
-│   ├── (app)/             # Main application routes
-│   ├── (auth)/            # Authentication routes
-│   ├── api/               # API routes
-├── components/            # Shared components
-├── lib/                   # Utility functions and services
-└── modules/               # Feature-specific modules
-```
-
-## Routing Patterns
-
-### App Router Structure
-The application uses Next.js 13+ app router with route groups:
-
-```
-(app)/environments/[environmentId]/
-├── surveys/[surveyId]/
-│   ├── (analysis)/        # Analysis views
-│   │   ├── responses/     # Response management
-│   │   ├── summary/       # Survey summary
-│   │   └── hooks/         # Analysis-specific hooks
-│   ├── edit/              # Survey editing
-│   └── settings/          # Survey settings
-```
-
-### Dynamic Routes
-- `[environmentId]` - Environment-specific routes
-- `[surveyId]` - Survey-specific routes
-
-## Service Layer Pattern
-
-### Service Organization
-Services are organized by domain in `apps/web/lib/`:
-
-```typescript
-// Example: Response service
-// apps/web/lib/response/service.ts
-export const getResponseCountAction = async ({
-  surveyId,
-  filterCriteria,
-}: {
-  surveyId: string;
-  filterCriteria: any;
-}) => {
-  // Service implementation
-};
-```
-
-### Action Pattern
-Server actions follow a consistent pattern:
-
-```typescript
-// Action wrapper for service calls
-export const getResponseCountAction = async (params) => {
-  try {
-    const result = await responseService.getCount(params);
-    return { data: result };
-  } catch (error) {
-    return { error: error.message };
-  }
-};
-```
-
-## Context Patterns
-
-### Provider Structure
-Context providers follow a consistent pattern:
-
-```typescript
-// Provider component
-export const ResponseFilterProvider = ({ children }: { children: React.ReactNode }) => {
-  const [selectedFilter, setSelectedFilter] = useState(defaultFilter);
-  
-  const value = {
-    selectedFilter,
-    setSelectedFilter,
-    // ... other state and methods
-  };
-
-  return (
-    <ResponseFilterContext.Provider value={value}>
-      {children}
-    </ResponseFilterContext.Provider>
-  );
-};
-
-// Hook for consuming context
-export const useResponseFilter = () => {
-  const context = useContext(ResponseFilterContext);
-  if (!context) {
-    throw new Error('useResponseFilter must be used within ResponseFilterProvider');
-  }
-  return context;
-};
-```
-
-### Context Composition
-Multiple contexts are often composed together:
-
-```typescript
-// Layout component with multiple providers
-export default function AnalysisLayout({ children }: { children: React.ReactNode }) {
-  return (
-    <ResponseFilterProvider>
-      <ResponseCountProvider>
-        {children}
-      </ResponseCountProvider>
-    </ResponseFilterProvider>
-  );
-}
-```
-
-## Component Patterns
-
-### Page Components
-Page components are located in the app directory and follow this pattern:
-
-```typescript
-// apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/page.tsx
-export default function ResponsesPage() {
-  return (
-    <div>
-      <ResponsesTable />
-      <ResponsesPagination />
-    </div>
-  );
-}
-```
-
-### Component Organization
-- **Pages** - Route components in app directory
-- **Components** - Reusable UI components
-- **Modules** - Feature-specific components and logic
-
-### Shared Components
-Common components are in `apps/web/components/`:
-- UI components (buttons, inputs, modals)
-- Layout components (headers, sidebars)
-- Data display components (tables, charts)
-
-## Hook Patterns
-
-### Custom Hook Structure
-Custom hooks follow consistent patterns:
-
-```typescript
-export const useResponseCount = ({ 
-  survey, 
-  initialCount 
-}: {
-  survey: TSurvey;
-  initialCount?: number;
-}) => {
-  const [responseCount, setResponseCount] = useState(initialCount ?? 0);
-  const [isLoading, setIsLoading] = useState(false);
-  
-  // Hook logic...
-  
-  return {
-    responseCount,
-    isLoading,
-    refetch,
-  };
-};
-```
-
-### Hook Dependencies
-- Use context hooks for shared state
-- Implement proper cleanup with AbortController
-- Optimize dependency arrays to prevent unnecessary re-renders
-
-## Data Fetching Patterns
-
-### Server Actions
-The app uses Next.js server actions for data fetching:
-
-```typescript
-// Server action
-export async function getResponsesAction(params: GetResponsesParams) {
-  const responses = await getResponses(params);
-  return { data: responses };
-}
-
-// Client usage
-const { data } = await getResponsesAction(params);
-```
-
-### Error Handling
-Consistent error handling across the application:
-
-```typescript
-try {
-  const result = await apiCall();
-  return { data: result };
-} catch (error) {
-  console.error("Operation failed:", error);
-  return { error: error.message };
-}
-```
-
-## Type Safety
-
-### Type Organization
-Types are organized in packages:
-- `@formbricks/types` - Shared type definitions
-- Local types in component/hook files
-
-### Common Types
-```typescript
-import { TSurvey } from "@formbricks/types/surveys/types";
-import { TResponse } from "@formbricks/types/responses";
-import { TEnvironment } from "@formbricks/types/environment";
-```
-
-## State Management
-
-### Local State
-- Use `useState` for component-specific state
-- Use `useReducer` for complex state logic
-- Use refs for mutable values that don't trigger re-renders
-
-### Global State
-- React Context for feature-specific shared state
-- URL state for filters and pagination
-- Server state through server actions
-
-## Performance Considerations
-
-### Code Splitting
-- Dynamic imports for heavy components
-- Route-based code splitting with app router
-- Lazy loading for non-critical features
-
-### Caching Strategy
-- Server-side caching for database queries
-- Client-side caching with React Query (where applicable)
-- Static generation for public pages
-
-## Testing Strategy
-
-### Test Organization
-```
-component/
-├── Component.tsx
-├── Component.test.tsx
-└── hooks/
-    ├── useHook.ts
-    └── useHook.test.tsx
-```
-
-### Test Patterns
-- Unit tests for utilities and services
-- Integration tests for components with context
-- Hook tests with proper mocking
-
-## Build & Deployment
-
-### Build Process
-- TypeScript compilation
-- Next.js build optimization
-- Asset optimization and bundling
-
-### Environment Configuration
-- Environment-specific configurations
-- Feature flags for gradual rollouts
-- Database connection management
-
-## Security Patterns
-
-### Authentication
-- Session-based authentication
-- Environment-based access control
-- API route protection
-
-### Data Validation
-- Input validation on both client and server
-- Type-safe API contracts
-- Sanitization of user inputs
-
-## Monitoring & Observability
-
-### Error Tracking
-- Client-side error boundaries
-- Server-side error logging
-- Performance monitoring
-
-### Analytics
-- User interaction tracking
-- Performance metrics
-- Database query monitoring
-
-## Best Practices Summary
-
-### Code Organization
-- ✅ Follow the established directory structure
-- ✅ Use consistent naming conventions
-- ✅ Separate concerns (UI, logic, data)
-- ✅ Keep components focused and small
-
-### Performance
-- ✅ Implement proper loading states
-- ✅ Use AbortController for async operations
-- ✅ Optimize database queries
-- ✅ Implement proper caching strategies
-
-### Type Safety
-- ✅ Use TypeScript throughout
-- ✅ Define proper interfaces for props
-- ✅ Use type guards for runtime validation
-- ✅ Leverage shared type packages
-
-### Testing
-- ✅ Write tests for critical functionality
-- ✅ Mock external dependencies properly
-- ✅ Test error scenarios and edge cases
-- ✅ Maintain good test coverage

.cursor/rules/performance-optimization.mdc

@@ -1,5 +0,0 @@
----
-description:
-globs:
-alwaysApply: false
----

.cursor/rules/react-context-patterns.mdc

@@ -1,52 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: false
----
-# React Context & Provider Patterns
-
-## Context Provider Best Practices
-
-### Provider Implementation
-- Use TypeScript interfaces for provider props with optional `initialCount` for testing
-- Implement proper cleanup in `useEffect` to avoid React hooks warnings
-- Reference: [apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/ResponseCountProvider.tsx](mdc:apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/ResponseCountProvider.tsx)
-
-### Cleanup Pattern for Refs
-```typescript
-useEffect(() => {
-  const currentPendingRequests = pendingRequests.current;
-  const currentAbortController = abortController.current;
-  
-  return () => {
-    if (currentAbortController) {
-      currentAbortController.abort();
-    }
-    currentPendingRequests.clear();
-  };
-}, []);
-```
-
-### Testing Context Providers
-- Always wrap components using context in the provider during tests
-- Use `initialCount` prop for predictable test scenarios
-- Mock context dependencies like `useParams`, `useResponseFilter`
-- Example from [apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.test.tsx](mdc:apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA.test.tsx):
-
-```typescript
-render(
-  <ResponseCountProvider survey={dummySurvey} initialCount={5}>
-    <ComponentUnderTest />
-  </ResponseCountProvider>
-);
-```
-
-### Required Mocks for Context Testing
-- Mock `next/navigation` with `useParams` returning environment and survey IDs
-- Mock response filter context and actions
-- Mock API actions that the provider depends on
-
-### Context Hook Usage
-- Create custom hooks like `useResponseCountContext()` for consuming context
-- Provide meaningful error messages when context is used outside provider
-- Use context for shared state that multiple components need to access

.cursor/rules/react-context-providers.mdc

@@ -1,5 +0,0 @@
----
-description:
-globs:
-alwaysApply: false
----

.cursor/rules/storybook-component-migration.mdc

@@ -1,216 +0,0 @@
----
-description: Migrate deprecated UI components to a unified component
-globs: 
-alwaysApply: false
----
-# Component Migration Automation Rule
-
-## Overview
-This rule automates the migration of deprecated components to new component systems in React/TypeScript codebases.
-
-## Trigger
-When the user requests component migration (e.g., "migrate [DeprecatedComponent] to [NewComponent]" or "component migration").
-
-## Process
-
-### Step 1: Discovery and Planning
-1. **Identify migration parameters:**
-   - Ask user for deprecated component name (e.g., "Modal")
-   - Ask user for new component name(s) (e.g., "Dialog")
-   - Ask for any components to exclude (e.g., "ModalWithTabs")
-   - Ask for specific import paths if needed
-
-2. **Scan codebase** for deprecated components:
-   - Search for `import.*[DeprecatedComponent]` patterns
-   - Exclude specified components that should not be migrated
-   - List all found components with file paths
-   - Present numbered list to user for confirmation
-
-### Step 2: Component-by-Component Migration
-For each component, follow this exact sequence:
-
-#### 2.1 Component Migration
-- **Import changes:**
-  - Ask user to provide the new import structure
-  - Example transformation pattern:
-  ```typescript
-  // FROM:
-  import { [DeprecatedComponent] } from "@/components/ui/[DeprecatedComponent]"
-  
-  // TO:
-  import {
-    [NewComponent],
-    [NewComponentPart1],
-    [NewComponentPart2],
-    // ... other parts
-  } from "@/components/ui/[NewComponent]"
-  ```
-
-- **Props transformation:**
-  - Ask user for prop mapping rules (e.g., `open` → `open`, `setOpen` → `onOpenChange`)
-  - Ask for props to remove (e.g., `noPadding`, `closeOnOutsideClick`, `size`)
-  - Apply transformations based on user specifications
-
-- **Structure transformation:**
-  - Ask user for the new component structure pattern
-  - Apply the transformation maintaining all functionality
-  - Preserve all existing logic, state management, and event handlers
-
-#### 2.2 Wait for User Approval
-- Present the migration changes
-- Wait for explicit user approval before proceeding
-- If rejected, ask for specific feedback and iterate
-#### 2.3 Re-read and Apply Additional Changes
-- Re-read the component file to capture any user modifications
-- Apply any additional improvements the user made
-- Ensure all changes are incorporated
-
-#### 2.4 Test File Updates
-- **Find corresponding test file** (same name with `.test.tsx` or `.test.ts`)
-- **Update test mocks:**
-  - Ask user for new component mock structure
-  - Replace old component mocks with new ones
-  - Example pattern:
-  ```typescript
-  // Add to test setup:
-  jest.mock("@/components/ui/[NewComponent]", () => ({
-    [NewComponent]: ({ children, [props] }: any) => ([mock implementation]),
-    [NewComponentPart1]: ({ children }: any) => <div data-testid="[new-component-part1]">{children}</div>,
-    [NewComponentPart2]: ({ children }: any) => <div data-testid="[new-component-part2]">{children}</div>,
-    // ... other parts
-  }));
-  ```
-- **Update test expectations:**
-  - Change test IDs from old component to new component
-  - Update any component-specific assertions
-  - Ensure all new component parts used in the component are mocked
-
-#### 2.5 Run Tests and Optimize
-- Execute `Node package manager test -- ComponentName.test.tsx`
-- Fix any failing tests
-- Optimize code quality (imports, formatting, etc.)
-- Re-run tests until all pass
-- **Maximum 3 iterations** - if still failing, ask user for guidance
-
-#### 2.6 Wait for Final Approval
-- Present test results and any optimizations made
-- Wait for user approval of the complete migration
-- If rejected, iterate based on feedback
-
-#### 2.7 Git Commit
-- Run: `git add .`
-- Run: `git commit -m "migrate [ComponentName] from [DeprecatedComponent] to [NewComponent]"`
-- Confirm commit was successful
-
-### Step 3: Final Report Generation
-After all components are migrated, generate a comprehensive GitHub PR report:
-
-#### PR Title
-```
-feat: migrate [DeprecatedComponent] components to [NewComponent] system
-```
-
-#### PR Description Template
-```markdown
-## 🔄 [DeprecatedComponent] to [NewComponent] Migration
-
-### Overview
-Migrated [X] [DeprecatedComponent] components to the new [NewComponent] component system to modernize the UI architecture and improve consistency.
-
-### Components Migrated
-[List each component with file path]
-
-### Technical Changes
-- **Imports:** Replaced `[DeprecatedComponent]` with `[NewComponent], [NewComponentParts...]`
-- **Props:** [List prop transformations]
-- **Structure:** Implemented proper [NewComponent] component hierarchy
-- **Styling:** [Describe styling changes]
-- **Tests:** Updated all test mocks and expectations
-
-### Migration Pattern
-```typescript
-// Before
-<[DeprecatedComponent] [oldProps]>
-  [oldStructure]
-</[DeprecatedComponent]>
-
-// After
-<[NewComponent] [newProps]>
-  [newStructure]
-</[NewComponent]>
-```
-
-### Testing
-- ✅ All existing tests updated and passing
-- ✅ Component functionality preserved
-- ✅ UI/UX behavior maintained
-
-### How to Test This PR
-1. **Functional Testing:**
-   - Navigate to each migrated component's usage
-   - Verify [component] opens and closes correctly
-   - Test all interactive elements within [components]
-   - Confirm styling and layout are preserved
-
-2. **Automated Testing:**
-   ```bash
-   Node package manager test
-   ```
-
-3. **Visual Testing:**
-   - Check that all [components] maintain proper styling
-   - Verify responsive behavior
-   - Test keyboard navigation and accessibility
-
-### Breaking Changes
-[List any breaking changes or state "None - this is a drop-in replacement maintaining all existing functionality."]
-
-### Notes
-- [Any excluded components] were preserved as they already use [NewComponent] internally
-- All form validation and complex state management preserved
-- Enhanced code quality with better imports and formatting
-```
-
-## Special Considerations
-
-### Excluded Components
-- **DO NOT MIGRATE** components specified by user as exclusions
-- They may already use the new component internally or have other reasons
-- Inform user these are skipped and why
-
-### Complex Components
-- Preserve all existing functionality (forms, validation, state management)
-- Maintain prop interfaces
-- Keep all event handlers and callbacks
-- Preserve accessibility features
-
-### Test Coverage
-- Ensure all new component parts are mocked when used
-- Mock all new component parts that appear in the component
-- Update test IDs from old component to new component
-- Maintain all existing test scenarios
-
-### Error Handling
-- If tests fail after 3 iterations, stop and ask user for guidance
-- If component is too complex, ask user for specific guidance
-- If unsure about functionality preservation, ask for clarification
-
-### Migration Patterns
-- Always ask user for specific migration patterns before starting
-- Confirm import structures, prop mappings, and component hierarchies
-- Adapt to different component architectures (simple replacements, complex restructuring, etc.)
-
-## Success Criteria
-- All deprecated components successfully migrated to new components
-- All tests passing
-- No functionality lost
-- Code quality maintained or improved
-- User approval on each component
-- Successful git commits for each migration
-- Comprehensive PR report generated
-
-## Usage Examples
-- "migrate Modal to Dialog"
-- "migrate Button to NewButton" 
-- "migrate Card to ModernCard"
-- "component migration" (will prompt for details) 

.cursor/rules/storybook-create-new-story.mdc

@@ -1,177 +0,0 @@
----
-description: Create a story in Storybook for a given component
-globs:
-alwaysApply: false
----
-
-# Formbricks Storybook Stories
-
-## When generating Storybook stories for Formbricks components:
-
-### 1. **File Structure**
-- Create `stories.tsx` (not `.stories.tsx`) in component directory
-- Use exact import: `import { Meta, StoryObj } from "@storybook/react-vite";`
-- Import component from `"./index"`
-
-### 2. **Story Structure Template**
-```tsx
-import { Meta, StoryObj } from "@storybook/react-vite";
-import { ComponentName } from "./index";
-
-// For complex components with configurable options
-// consider this as an example the options need to reflect the props types
-interface StoryOptions {
-  showIcon: boolean;
-  numberOfElements: number;
-  customLabels: string[];
-}
-
-type StoryProps = React.ComponentProps<typeof ComponentName> & StoryOptions;
-
-const meta: Meta<StoryProps> = {
-  title: "UI/ComponentName",
-  component: ComponentName,
-  tags: ["autodocs"],
-  parameters: {
-    layout: "centered",
-    controls: { sort: "alpha", exclude: [] },
-    docs: {
-      description: {
-        component: "The **ComponentName** component provides [description].",
-      },
-    },
-  },
-  argTypes: {
-    // Organize in exactly these categories: Behavior, Appearance, Content
-  },
-};
-
-export default meta;
-type Story = StoryObj<typeof ComponentName> & { args: StoryOptions };
-```
-
-### 3. **ArgTypes Organization**
-Organize ALL argTypes into exactly three categories:
-- **Behavior**: disabled, variant, onChange, etc.
-- **Appearance**: size, color, layout, styling, etc.  
-- **Content**: text, icons, numberOfElements, etc.
-
-Format:
-```tsx
-argTypes: {
-  propName: {
-    control: "select" | "boolean" | "text" | "number",
-    options: ["option1", "option2"], // for select
-    description: "Clear description",
-    table: {
-      category: "Behavior" | "Appearance" | "Content",
-      type: { summary: "string" },
-      defaultValue: { summary: "default" },
-    },
-    order: 1,
-  },
-}
-```
-
-### 4. **Required Stories**
-Every component must include:
-- `Default`: Most common use case
-- `Disabled`: If component supports disabled state
-- `WithIcon`: If component supports icons
-- Variant stories for each variant (Primary, Secondary, Error, etc.)
-- Edge case stories (ManyElements, LongText, CustomStyling)
-
-### 5. **Story Format**
-```tsx
-export const Default: Story = {
-  args: {
-    // Props with realistic values
-  },
-};
-
-export const EdgeCase: Story = {
-  args: { /* ... */ },
-  parameters: {
-    docs: {
-      description: {
-        story: "Use this when [specific scenario].",
-      },
-    },
-  },
-};
-```
-
-### 6. **Dynamic Content Pattern**
-For components with dynamic content, create render function:
-```tsx
-const renderComponent = (args: StoryProps) => {
-  const { numberOfElements, showIcon, customLabels } = args;
-  
-  // Generate dynamic content
-  const elements = Array.from({ length: numberOfElements }, (_, i) => ({
-    id: `element-${i}`,
-    label: customLabels[i] || `Element ${i + 1}`,
-    icon: showIcon ? <IconComponent /> : undefined,
-  }));
-  
-  return <ComponentName {...args} elements={elements} />;
-};
-
-export const Dynamic: Story = {
-  render: renderComponent,
-  args: {
-    numberOfElements: 3,
-    showIcon: true,
-    customLabels: ["First", "Second", "Third"],
-  },
-};
-```
-
-### 7. **State Management**
-For interactive components:
-```tsx
-import { useState } from "react";
-
-const ComponentWithState = (args: any) => {
-  const [value, setValue] = useState(args.defaultValue);
-  
-  return (
-    <ComponentName
-      {...args}
-      value={value}
-      onChange={(newValue) => {
-        setValue(newValue);
-        args.onChange?.(newValue);
-      }}
-    />
-  );
-};
-
-export const Interactive: Story = {
-  render: ComponentWithState,
-  args: { defaultValue: "initial" },
-};
-```
-
-### 8. **Quality Requirements**
-- Include component description in parameters.docs
-- Add story documentation for non-obvious use cases
-- Test edge cases (overflow, empty states, many elements)
-- Ensure no TypeScript errors
-- Use realistic prop values
-- Include at least 3-5 story variants
-- Example values need to be in the context of survey application
-
-### 9. **Naming Conventions**
-- **Story titles**: "UI/ComponentName"
-- **Story exports**: PascalCase (Default, WithIcon, ManyElements)
-- **Categories**: "Behavior", "Appearance", "Content" (exact spelling)
-- **Props**: camelCase matching component props
-
-### 10. **Special Cases**
-- **Generic components**: Remove `component` from meta if type conflicts
-- **Form components**: Include Invalid, WithValue stories
-- **Navigation**: Include ManyItems stories
-- **Modals, Dropdowns and Popups **: Include trigger and content structure
-
-## Generate stories that are comprehensive, well-documented, and reflect all component states and edge cases. 

.cursor/rules/testing-patterns.mdc

@@ -1,322 +0,0 @@
----
-description: 
-globs: 
-alwaysApply: false
----
-# Testing Patterns & Best Practices
-
-## Running Tests
-
-### Test Commands
-From the **root directory** (formbricks/):
-- `npm test` - Run all tests across all packages (recommended for CI/full testing)
-- `npm run test:coverage` - Run all tests with coverage reports
-- `npm run test:e2e` - Run end-to-end tests with Playwright
-
-From the **apps/web directory** (apps/web/):
-- `npm run test` - Run only web app tests (fastest for development)
-- `npm run test:coverage` - Run web app tests with coverage
-- `npm run test -- <file-pattern>` - Run specific test files
-
-### Examples
-```bash
-# Run all tests from root (takes ~3 minutes, runs 790 test files with 5334+ tests)
-npm test
-
-# Run specific test file from apps/web (fastest for development)
-npm run test -- modules/cache/lib/service.test.ts
-
-# Run tests matching pattern from apps/web  
-npm run test -- modules/ee/license-check/lib/license.test.ts
-
-# Run with coverage from root
-npm run test:coverage
-
-# Run specific test with watch mode from apps/web (for development)
-npm run test -- --watch modules/cache/lib/service.test.ts
-
-# Run tests for a specific directory from apps/web
-npm run test -- modules/cache/
-```
-
-### Performance Tips
-- **For development**: Use `apps/web` directory commands to run only web app tests
-- **For CI/validation**: Use root directory commands to run all packages
-- **For specific features**: Use file patterns to target specific test files
-- **For debugging**: Use `--watch` mode for continuous testing during development
-
-### Test File Organization
-- Place test files in the **same directory** as the source file
-- Use `.test.ts` for utility/service tests (Node environment)
-- Use `.test.tsx` for React component tests (jsdom environment)
-
-## Test File Naming & Environment
-
-### File Extensions
-- Use `.test.tsx` for React component/hook tests (runs in jsdom environment)
-- Use `.test.ts` for utility/service tests (runs in Node environment)
-- The vitest config uses `environmentMatchGlobs` to automatically set jsdom for `.tsx` files
-
-### Test Structure
-```typescript
-// Import the mocked functions first
-import { useHook } from "@/path/to/hook";
-import { serviceFunction } from "@/path/to/service";
-import { renderHook, waitFor } from "@testing-library/react";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-// Mock dependencies
-vi.mock("@/path/to/hook", () => ({
-  useHook: vi.fn(),
-}));
-
-describe("ComponentName", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    // Setup default mocks
-  });
-
-  test("descriptive test name", async () => {
-    // Test implementation
-  });
-});
-```
-
-## React Hook Testing
-
-### Context Mocking
-When testing hooks that use React Context:
-```typescript
-vi.mocked(useResponseFilter).mockReturnValue({
-  selectedFilter: {
-    filter: [],
-    onlyComplete: false,
-  },
-  setSelectedFilter: vi.fn(),
-  selectedOptions: {
-    questionOptions: [],
-    questionFilterOptions: [],
-  },
-  setSelectedOptions: vi.fn(),
-  dateRange: { from: new Date(), to: new Date() },
-  setDateRange: vi.fn(),
-  resetState: vi.fn(),
-});
-```
-
-### Testing Async Hooks
-- Always use `waitFor` for async operations
-- Test both loading and completed states
-- Verify API calls with correct parameters
-
-```typescript
-test("fetches data on mount", async () => {
-  const { result } = renderHook(() => useHook());
-  
-  expect(result.current.isLoading).toBe(true);
-  
-  await waitFor(() => {
-    expect(result.current.isLoading).toBe(false);
-  });
-  
-  expect(result.current.data).toBe(expectedData);
-  expect(vi.mocked(apiCall)).toHaveBeenCalledWith(expectedParams);
-});
-```
-
-### Testing Hook Dependencies
-To test useEffect dependencies, ensure mocks return different values:
-```typescript
-// First render
-mockGetFormattedFilters.mockReturnValue(mockFilters);
-
-// Change dependency and trigger re-render
-const newMockFilters = { ...mockFilters, finished: true };
-mockGetFormattedFilters.mockReturnValue(newMockFilters);
-rerender();
-```
-
-## Performance Testing
-
-### Race Condition Testing
-Test AbortController implementation:
-```typescript
-test("cancels previous request when new request is made", async () => {
-  let resolveFirst: (value: any) => void;
-  let resolveSecond: (value: any) => void;
-
-  const firstPromise = new Promise((resolve) => {
-    resolveFirst = resolve;
-  });
-  const secondPromise = new Promise((resolve) => {
-    resolveSecond = resolve;
-  });
-
-  vi.mocked(apiCall)
-    .mockReturnValueOnce(firstPromise as any)
-    .mockReturnValueOnce(secondPromise as any);
-
-  const { result } = renderHook(() => useHook());
-  
-  // Trigger second request
-  result.current.refetch();
-  
-  // Resolve in order - first should be cancelled
-  resolveFirst!({ data: 100 });
-  resolveSecond!({ data: 200 });
-
-  await waitFor(() => {
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  // Should have result from second request
-  expect(result.current.data).toBe(200);
-});
-```
-
-### Cleanup Testing
-```typescript
-test("cleans up on unmount", () => {
-  const abortSpy = vi.spyOn(AbortController.prototype, "abort");
-  
-  const { unmount } = renderHook(() => useHook());
-  unmount();
-  
-  expect(abortSpy).toHaveBeenCalled();
-  abortSpy.mockRestore();
-});
-```
-
-## Error Handling Testing
-
-### API Error Testing
-```typescript
-test("handles API errors gracefully", async () => {
-  const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
-  vi.mocked(apiCall).mockRejectedValue(new Error("API Error"));
-
-  const { result } = renderHook(() => useHook());
-
-  await waitFor(() => {
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  expect(consoleSpy).toHaveBeenCalledWith("Error message:", expect.any(Error));
-  expect(result.current.data).toBe(fallbackValue);
-  
-  consoleSpy.mockRestore();
-});
-```
-
-### Cancelled Request Testing
-```typescript
-test("does not update state for cancelled requests", async () => {
-  const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
-
-  let rejectFirst: (error: any) => void;
-  const firstPromise = new Promise((_, reject) => {
-    rejectFirst = reject;
-  });
-
-  vi.mocked(apiCall)
-    .mockReturnValueOnce(firstPromise as any)
-    .mockResolvedValueOnce({ data: 42 });
-
-  const { result } = renderHook(() => useHook());
-  result.current.refetch();
-
-  const abortError = new Error("Request cancelled");
-  rejectFirst!(abortError);
-
-  await waitFor(() => {
-    expect(result.current.isLoading).toBe(false);
-  });
-
-  // Should not log error for cancelled request
-  expect(consoleSpy).not.toHaveBeenCalled();
-  consoleSpy.mockRestore();
-});
-```
-
-## Type Safety in Tests
-
-### Mock Type Assertions
-Use type assertions for edge cases:
-```typescript
-vi.mocked(apiCall).mockResolvedValue({
-  data: null as any, // For testing null handling
-});
-
-vi.mocked(apiCall).mockResolvedValue({
-  data: undefined as any, // For testing undefined handling
-});
-```
-
-### Proper Mock Typing
-Ensure mocks match the actual interface:
-```typescript
-const mockSurvey: TSurvey = {
-  id: "survey-123",
-  name: "Test Survey",
-  // ... other required properties
-} as unknown as TSurvey; // Use when partial mocking is needed
-```
-
-## Common Test Patterns
-
-### Testing State Changes
-```typescript
-test("updates state correctly", async () => {
-  const { result } = renderHook(() => useHook());
-  
-  // Initial state
-  expect(result.current.value).toBe(initialValue);
-  
-  // Trigger change
-  result.current.updateValue(newValue);
-  
-  // Verify change
-  expect(result.current.value).toBe(newValue);
-});
-```
-
-### Testing Multiple Scenarios
-```typescript
-test("handles different modes", async () => {
-  // Test regular mode
-  vi.mocked(useParams).mockReturnValue({ surveyId: "123" });
-  const { rerender } = renderHook(() => useHook());
-  
-  await waitFor(() => {
-    expect(vi.mocked(regularApi)).toHaveBeenCalled();
-  });
-  
-  rerender();
-  
-  await waitFor(() => {
-    expect(vi.mocked(sharingApi)).toHaveBeenCalled();
-  });
-});
-```
-
-## Test Organization
-
-### Comprehensive Test Coverage
-For hooks, ensure you test:
-- ✅ Initialization (with/without initial values)
-- ✅ Data fetching (success/error cases)
-- ✅ State updates and refetching
-- ✅ Dependency changes triggering effects
-- ✅ Manual actions (refetch, reset)
-- ✅ Race condition prevention
-- ✅ Cleanup on unmount
-- ✅ Mode switching (if applicable)
-- ✅ Edge cases (null/undefined data)
-
-### Test Naming
-Use descriptive test names that explain the scenario:
-- ✅ "initializes with initial count"
-- ✅ "fetches response count on mount for regular survey"
-- ✅ "cancels previous request when new request is made"
-- ❌ "test hook"
-- ❌ "it works"

.cursor/rules/testing.mdc

@@ -1,7 +0,0 @@
----
-description: Whenever the user asks to write or update a test file for .tsx or .ts files.
-globs: 
-alwaysApply: false
----
-Use the rules in this file when writing tests [copilot-instructions.md](mdc:.github/copilot-instructions.md).
-After writing the tests, run them and check if there's any issue with the tests and if all of them are passing. Fix the issues and rerun the tests until all pass.

.env.example

@@ -80,8 +80,8 @@ S3_ENDPOINT_URL=
 # Force path style for S3 compatible storage (0 for disabled, 1 for enabled)
 S3_FORCE_PATH_STYLE=0
 
-# Set this URL to add a public domain for all your client facing routes(default is WEBAPP_URL)
-# PUBLIC_URL=https://survey.example.com
+# Set this URL to add a custom domain to your survey links(default is WEBAPP_URL)
+# SURVEY_URL=https://survey.example.com
 
 #####################
 # Disable Features  #
@@ -172,6 +172,7 @@ ENTERPRISE_LICENSE_KEY=
 # Automatically assign new users to a specific organization and role within that organization
 # Insert an existing organization id or generate a valid CUID for a new one at https://www.getuniqueid.com/cuid (e.g. cjld2cjxh0000qzrmn831i7rn)
 # (Role Management is an Enterprise feature)
+# DEFAULT_ORGANIZATION_ROLE=owner
 # AUTH_SSO_DEFAULT_TEAM_ID=
 # AUTH_SKIP_INVITE_FOR_SSO=
 
@@ -189,11 +190,19 @@ ENTERPRISE_LICENSE_KEY=
 UNSPLASH_ACCESS_KEY=
 
 # The below is used for Next Caching (uses In-Memory from Next Cache if not provided)
+# You can also add more configuration to Redis using the redis.conf file in the root directory
 REDIS_URL=redis://localhost:6379
+REDIS_DEFAULT_TTL=86400 # 1 day 
 
 # The below is used for Rate Limiting (uses In-Memory LRU Cache if not provided) (You can use a service like Webdis for this)
 # REDIS_HTTP_URL:
 
+# The below is used for Rate Limiting for management API
+UNKEY_ROOT_KEY=
+
+# Disable custom cache handler if necessary (e.g. if deployed on Vercel)
+# CUSTOM_CACHE_DISABLED=1
+
 # INTERCOM_APP_ID=
 # INTERCOM_SECRET_KEY=
 
@@ -206,16 +215,6 @@ REDIS_URL=redis://localhost:6379
 # The SENTRY_AUTH_TOKEN variable is picked up by the Sentry Build Plugin.
 # It's used automatically by Sentry during the build for authentication when uploading source maps.
 # SENTRY_AUTH_TOKEN=
-# The SENTRY_ENVIRONMENT is the environment which the error will belong to in the Sentry dashboard
-# SENTRY_ENVIRONMENT=
 
-# Configure the minimum role for user management from UI(owner, manager, disabled)
-# USER_MANAGEMENT_MINIMUM_ROLE="manager"
-
-# Configure the maximum age for the session in seconds. Default is 86400 (24 hours)
-# SESSION_MAX_AGE=86400
-
-# Audit logs options. Default 0.
-# AUDIT_LOG_ENABLED=0
-# If the ip should be added in the log or not. Default 0
-# AUDIT_LOG_GET_USER_IP=0
+# Disable the user management from UI 
+# DISABLE_USER_MANAGEMENT=1

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,7 +1,6 @@
 name: Bug report
 description: "Found a bug? Please fill out the sections below. \U0001F44D"
 type: bug
-projects: "formbricks/8"
 labels: ["bug"]
 body:
   - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Questions
     url: https://github.com/formbricks/formbricks/discussions

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,7 +1,6 @@
 name: Feature request
 description: "Suggest an idea for this project \U0001F680"
 type: feature
-projects: "formbricks/21"
 body:
   - type: textarea
     id: problem-description

.github/ISSUE_TEMPLATE/task.yml

@@ -0,0 +1,11 @@
+name: Task (internal)
+description: "Template for creating a task. Used by the Formbricks Team only \U0001f4e5"
+type: task
+body:
+  - type: textarea
+    id: task-summary
+    attributes:
+      label: Task description
+      description: A clear detailed-rich description of the task.
+    validations:
+      required: true

.github/actions/cache-build-web/action.yml

@@ -49,7 +49,7 @@ runs:
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install pnpm
-      uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      uses: pnpm/action-setup@v4
       if: steps.cache-build.outputs.cache-hit != 'true'
 
     - name: Install dependencies

.github/actions/upload-sentry-sourcemaps/action.yml

@@ -1,125 +0,0 @@
-name: 'Upload Sentry Sourcemaps'
-description: 'Extract sourcemaps from Docker image and upload to Sentry'
-
-inputs:
-  docker_image:
-    description: 'Docker image to extract sourcemaps from'
-    required: true
-  release_version:
-    description: 'Sentry release version (e.g., v1.2.3)'
-    required: true
-  sentry_auth_token:
-    description: 'Sentry authentication token'
-    required: true
-  environment:
-    description: 'Sentry environment (e.g., production, staging)'
-    required: false
-    default: 'staging'
-
-runs:
-  using: 'composite'
-  steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Validate Sentry auth token
-      shell: bash
-      run: |
-        set -euo pipefail
-        echo "🔐 Validating Sentry authentication token..."
-
-        # Assign token to local variable for secure handling
-        SENTRY_TOKEN="${{ inputs.sentry_auth_token }}"
-
-        # Test the token by making a simple API call to Sentry
-        response=$(curl -s -w "%{http_code}" -o /tmp/sentry_response.json \
-          -H "Authorization: Bearer $SENTRY_TOKEN" \
-          "https://sentry.io/api/0/organizations/formbricks/")
-
-        http_code=$(echo "$response" | tail -n1)
-
-        if [ "$http_code" != "200" ]; then
-          echo "❌ Error: Invalid Sentry auth token (HTTP $http_code)"
-          echo "Please check your SENTRY_AUTH_TOKEN is correct and has the necessary permissions."
-          if [ -f /tmp/sentry_response.json ]; then
-            echo "Response body:"
-            cat /tmp/sentry_response.json
-          fi
-          exit 1
-        fi
-
-        echo "✅ Sentry auth token validated successfully"
-
-        # Clean up temp file
-        rm -f /tmp/sentry_response.json
-
-    - name: Extract sourcemaps from Docker image
-      shell: bash
-      run: |
-        set -euo pipefail
-        echo "📦 Extracting sourcemaps from Docker image: ${{ inputs.docker_image }}"
-
-        # Create temporary container from the image and capture its ID
-        echo "Creating temporary container..."
-        CONTAINER_ID=$(docker create "${{ inputs.docker_image }}")
-        echo "Container created with ID: $CONTAINER_ID"
-
-        # Set up cleanup function to ensure container is removed on script exit
-        cleanup_container() {
-          # Capture the current exit code to preserve it
-          local original_exit_code=$?
-          
-          echo "🧹 Cleaning up Docker container..."
-          
-          # Remove the container if it exists (ignore errors if already removed)
-          if [ -n "$CONTAINER_ID" ]; then
-            docker rm -f "$CONTAINER_ID" 2>/dev/null || true
-            echo "Container $CONTAINER_ID removed"
-          fi
-          
-          # Exit with the original exit code to preserve script success/failure status
-          exit $original_exit_code
-        }
-        
-        # Register cleanup function to run on script exit (success or failure)
-        trap cleanup_container EXIT
-
-        # Extract .next directory containing sourcemaps
-        docker cp "$CONTAINER_ID:/home/nextjs/apps/web/.next" ./extracted-next
-
-        # Verify sourcemaps exist
-        if [ ! -d "./extracted-next/static/chunks" ]; then
-          echo "❌ Error: .next/static/chunks directory not found in Docker image"
-          echo "Expected structure: /home/nextjs/apps/web/.next/static/chunks/"
-          exit 1
-        fi
-
-        sourcemap_count=$(find ./extracted-next/static/chunks -name "*.map" | wc -l)
-        echo "✅ Found $sourcemap_count sourcemap files"
-
-        if [ "$sourcemap_count" -eq 0 ]; then
-          echo "❌ Error: No sourcemap files found. Check that productionBrowserSourceMaps is enabled."
-          exit 1
-        fi
-
-    - name: Create Sentry release and upload sourcemaps
-      uses: getsentry/action-release@v3
-      env:
-        SENTRY_AUTH_TOKEN: ${{ inputs.sentry_auth_token }}
-        SENTRY_ORG: formbricks
-        SENTRY_PROJECT: formbricks-cloud
-      with:
-        environment: ${{ inputs.environment }}
-        version: ${{ inputs.release_version }}
-        sourcemaps: './extracted-next/'
-
-    - name: Clean up extracted files
-      shell: bash
-      if: always()
-      run: |
-        set -euo pipefail
-        # Clean up extracted files
-        rm -rf ./extracted-next
-        echo "🧹 Cleaned up extracted files"

.github/copilot-instructions.md

@@ -11,7 +11,7 @@ When generating test files inside the "/app/web" path, follow these rules:
 - Follow the same test pattern used for other files in the package where the file is located
 - All imports should be at the top of the file, not inside individual tests
 - For mocking inside "test" blocks use "vi.mocked"
-- If the file is located in the "packages/survey" path, use "@testing-library/preact" instead of "@testing-library/react"
+- Add the original file path to the "test.coverage.include"array in the "apps/web/vite.config.mts" file. Do this only when the test file is created.
 - Don't mock functions that are already mocked in the "apps/web/vitestSetup.ts" file
 - When using "screen.getByText" check for the tolgee string if it is being used in the file.
 - The types for mocked variables can be found in the "packages/types" path. Be sure that every imported type exists before using it. Don't create types that are not already in the codebase.
@@ -28,5 +28,4 @@ afterEach(() => {
 - The "afterEach" function should only have the "cleanup()" line inside it and should be adde to the "vitest" imports.
 - For click events, import userEvent from "@testing-library/user-event"
 - Mock other components that can make the text more complex and but at the same time mocking it wouldn't make the test flaky. It's ok to leave basic and simple components.
-- You don't need to mock @tolgee/react
-- Use "import "@testing-library/jest-dom/vitest";"
+- You don't need to mock @tolgee/react

.github/dependabot.yml

@@ -0,0 +1,84 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # For pnpm monorepos, use npm ecosystem
+    directory: "/" # Root package.json
+    schedule:
+      interval: "weekly"
+    versioning-strategy: increase
+
+  # Apps directory packages
+  - package-ecosystem: "npm"
+    directory: "/apps/demo"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/apps/demo-react-native"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/apps/storybook"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/apps/web"
+    schedule:
+      interval: "weekly"
+
+  # Packages directory
+  - package-ecosystem: "npm"
+    directory: "/packages/database"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/packages/lib"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/packages/types"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/packages/config-eslint"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/packages/config-prettier"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/packages/config-typescript"
+    schedule:
+      interval: "weekly"
+      
+  - package-ecosystem: "npm"
+    directory: "/packages/js-core"
+    schedule:
+      interval: "weekly"
+      
+  - package-ecosystem: "npm"
+    directory: "/packages/surveys"
+    schedule:
+      interval: "weekly"
+      
+  - package-ecosystem: "npm"
+    directory: "/packages/logger"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/chromatic.yml

@@ -10,11 +10,6 @@ jobs:
   chromatic:
     name: Run Chromatic
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
-      actions: read
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0

.github/workflows/dependency-review.yml

@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@38ecb5b593bf0eb19e335c03f97670f792489a8b # v4.7.0
+        uses: actions/dependency-review-action@ce3cf9537a52e8119d91fd484ab5b8a807627bf8 # v4.6.0

.github/workflows/deploy-formbricks-cloud.yml

@@ -4,34 +4,34 @@ on:
   workflow_dispatch:
     inputs:
       VERSION:
-        description: "The version of the Docker image to release, full image tag if image tag is v0.0.0 enter v0.0.0."
+        description: 'The version of the Docker image to release'
         required: true
         type: string
       REPOSITORY:
-        description: "The repository to use for the Docker image"
+        description: 'The repository to use for the Docker image'
         required: false
         type: string
-        default: "ghcr.io/formbricks/formbricks"
+        default: 'ghcr.io/formbricks/formbricks'
       ENVIRONMENT:
-        description: "The environment to deploy to"
+        description: 'The environment to deploy to'
         required: true
         type: choice
         options:
-          - staging
-          - production
+          - stage
+          - prod
   workflow_call:
     inputs:
       VERSION:
-        description: "The version of the Docker image to release"
+        description: 'The version of the Docker image to release'
         required: true
         type: string
       REPOSITORY:
-        description: "The repository to use for the Docker image"
+        description: 'The repository to use for the Docker image'
         required: false
         type: string
-        default: "ghcr.io/formbricks/formbricks"
+        default: 'ghcr.io/formbricks/formbricks'
       ENVIRONMENT:
-        description: "The environment to deploy to"
+        description: 'The environment to deploy to'
         required: true
         type: string
 
@@ -52,10 +52,9 @@ jobs:
           oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
           oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
           tags: tag:github
-          args: --accept-routes
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@f24d7193d98baebaeacc7e2227925dd47cc267f5 # v4.2.0
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
           aws-region: "eu-central-1"
@@ -67,8 +66,8 @@ jobs:
           AWS_REGION: eu-central-1
 
       - uses: helmfile/helmfile-action@v2
-        name: Deploy Formbricks Cloud Production
-        if: inputs.ENVIRONMENT == 'production'
+        name: Deploy Formbricks Cloud Prod
+        if: (github.event_name == 'workflow_call' || github.event_name == 'workflow_dispatch') && github.event.inputs.ENVIRONMENT == 'prod'
         env:
           VERSION: ${{ inputs.VERSION }}
           REPOSITORY: ${{ inputs.REPOSITORY }}
@@ -76,7 +75,6 @@ jobs:
           FORMBRICKS_INGRESS_CERT_ARN: ${{ secrets.FORMBRICKS_INGRESS_CERT_ARN }}
           FORMBRICKS_ROLE_ARN: ${{ secrets.FORMBRICKS_ROLE_ARN }}
         with:
-          helmfile-version: "v1.0.0"
           helm-plugins: >
             https://github.com/databus23/helm-diff,
             https://github.com/jkroepke/helm-secrets
@@ -85,15 +83,14 @@ jobs:
           helmfile-workdirectory: infra/formbricks-cloud-helm
 
       - uses: helmfile/helmfile-action@v2
-        name: Deploy Formbricks Cloud Staging
-        if: inputs.ENVIRONMENT == 'staging'
+        name: Deploy Formbricks Cloud Stage
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.ENVIRONMENT == 'stage'
         env:
           VERSION: ${{ inputs.VERSION }}
           REPOSITORY: ${{ inputs.REPOSITORY }}
           FORMBRICKS_INGRESS_CERT_ARN: ${{ secrets.STAGE_FORMBRICKS_INGRESS_CERT_ARN }}
           FORMBRICKS_ROLE_ARN: ${{ secrets.STAGE_FORMBRICKS_ROLE_ARN }}
         with:
-          helmfile-version: "v1.0.0"
           helm-plugins: >
             https://github.com/databus23/helm-diff,
             https://github.com/jkroepke/helm-secrets
@@ -101,43 +98,3 @@ jobs:
           helmfile-auto-init: "false"
           helmfile-workdirectory: infra/formbricks-cloud-helm
 
-      - name: Purge Cloudflare Cache
-        if: ${{ inputs.ENVIRONMENT == 'production' || inputs.ENVIRONMENT == 'staging' }}
-        env:
-          CF_ZONE_ID: ${{ secrets.CLOUDFLARE_ZONE_ID }}
-          CF_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-        run: |
-          # Set hostname based on environment
-          if [[ "${{ inputs.ENVIRONMENT }}" == "production" ]]; then
-            PURGE_HOST="app.formbricks.com"
-          else
-            PURGE_HOST="stage.app.formbricks.com"
-          fi
-
-          echo "Purging Cloudflare cache for host: $PURGE_HOST (environment: ${{ inputs.ENVIRONMENT }}, zone: $CF_ZONE_ID)"
-
-          # Prepare JSON payload for selective cache purge
-          json_payload=$(cat << EOF
-          {
-            "hosts": ["$PURGE_HOST"]
-          }
-          EOF
-          )
-
-          # Make API call to Cloudflare
-          response=$(curl -s -X POST \
-            "https://api.cloudflare.com/client/v4/zones/$CF_ZONE_ID/purge_cache" \
-            -H "Authorization: Bearer $CF_API_TOKEN" \
-            -H "Content-Type: application/json" \
-            --data "$json_payload")
-
-          echo "Cloudflare API response: $response"
-
-          # Verify the operation was successful
-          if [[ "$(echo "$response" | jq -r .success)" == "true" ]]; then
-            echo "✅ Successfully purged cache for $PURGE_HOST"
-          else
-            echo "❌ Cloudflare cache purge failed"
-            echo "Error details: $(echo "$response" | jq -r .errors)"
-            exit 1
-          fi

.github/workflows/e2e.yml

@@ -11,8 +11,6 @@ on:
         required: false
       PLAYWRIGHT_SERVICE_URL:
         required: false
-      ENTERPRISE_LICENSE_KEY:
-        required: true
       # Add other secrets if necessary
   workflow_dispatch:
 
@@ -25,6 +23,7 @@ permissions:
   id-token: write
   contents: read
   actions: read
+  checks: write
 
 jobs:
   build:
@@ -45,31 +44,19 @@ jobs:
           --health-interval=10s
           --health-timeout=5s
           --health-retries=5
-      valkey:
-        image: valkey/valkey:8.1.1
-        ports:
-          - 6379:6379
-        options: >-
-          --entrypoint "valkey-server"
-          --health-cmd="valkey-cli ping"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=5
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
         with:
-          egress-policy: allow
-          allowed-endpoints: |
-            ee.formbricks.com:443
+          egress-policy: audit
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: ./.github/actions/dangerous-git-checkout
 
-      - name: Setup Node.js 22.x
+      - name: Setup Node.js 20.x
         uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
         with:
-          node-version: 22.x
+          node-version: 20.x
 
       - name: Install pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
@@ -88,8 +75,7 @@ jobs:
           sed -i "s/ENCRYPTION_KEY=.*/ENCRYPTION_KEY=${RANDOM_KEY}/" .env
           sed -i "s/CRON_SECRET=.*/CRON_SECRET=${RANDOM_KEY}/" .env
           sed -i "s/NEXTAUTH_SECRET=.*/NEXTAUTH_SECRET=${RANDOM_KEY}/" .env
-          sed -i "s/ENTERPRISE_LICENSE_KEY=.*/ENTERPRISE_LICENSE_KEY=${{ secrets.ENTERPRISE_LICENSE_KEY }}/" .env
-          sed -i "s|REDIS_URL=.*|REDIS_URL=redis://localhost:6379|" .env
+          sed -i "s/ENTERPRISE_LICENSE_KEY=.*/ENTERPRISE_LICENSE_KEY=${RANDOM_KEY}/" .env
           echo "" >> .env
           echo "E2E_TESTING=1" >> .env
         shell: bash
@@ -103,24 +89,8 @@ jobs:
           # pnpm prisma migrate deploy
           pnpm db:migrate:dev
 
-      - name: Run Rate Limiter Load Tests
-        run: |
-          echo "Running rate limiter load tests with Redis/Valkey..."
-          cd apps/web && pnpm vitest run modules/core/rate-limit/rate-limit-load.test.ts
-        shell: bash
-
-      - name: Check for Enterprise License
-        run: |
-          LICENSE_KEY=$(grep '^ENTERPRISE_LICENSE_KEY=' .env | cut -d'=' -f2-)
-          if [ -z "$LICENSE_KEY" ]; then
-            echo "::error::ENTERPRISE_LICENSE_KEY in .env is empty. Please check your secret configuration."
-            exit 1
-          fi
-          echo "License key length: ${#LICENSE_KEY}"
-
       - name: Run App
         run: |
-          echo "Starting app with enterprise license..."
           NODE_ENV=test pnpm start --filter=@formbricks/web | tee app.log 2>&1 &
           sleep 10  # Optional: gives some buffer for the app to start
           for attempt in {1..10}; do

.github/workflows/formbricks-release.yml

@@ -1,22 +1,17 @@
 name: Build, release & deploy Formbricks images
 
 on:
-  release:
-    types: [published]
-
-permissions:
-  contents: read
-
-env:
-  ENVIRONMENT: ${{ github.event.release.prerelease && 'staging' || 'production' }}
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*"
 
 jobs:
   docker-build:
-    name: Build & release docker image
+    name: Build & release stable docker image
+    if: startsWith(github.ref, 'refs/tags/v')
     uses: ./.github/workflows/release-docker-github.yml
     secrets: inherit
-    with:
-      IS_PRERELEASE: ${{ github.event.release.prerelease }}
 
   helm-chart-release:
     name: Release Helm Chart
@@ -35,28 +30,5 @@ jobs:
       - docker-build
       - helm-chart-release
     with:
-      VERSION: v${{ needs.docker-build.outputs.VERSION }}
-      ENVIRONMENT: ${{ env.ENVIRONMENT }}
-
-  upload-sentry-sourcemaps:
-    name: Upload Sentry Sourcemaps
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    needs:
-      - docker-build
-      - deploy-formbricks-cloud
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Upload Sentry Sourcemaps
-        uses: ./.github/actions/upload-sentry-sourcemaps
-        continue-on-error: true
-        with:
-          docker_image: ghcr.io/formbricks/formbricks:v${{ needs.docker-build.outputs.VERSION }}
-          release_version: v${{ needs.docker-build.outputs.VERSION }}
-          sentry_auth_token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          environment: ${{ env.ENVIRONMENT }}
+      VERSION: ${{ needs.docker-build.outputs.VERSION }}
+      ENVIRONMENT: "prod"

.github/workflows/labeler.yml

@@ -0,0 +1,27 @@
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+permissions:
+  contents: read
+
+jobs:
+  labeler:
+    name: Pull Request Labeler
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          # https://github.com/actions/labeler/issues/442#issuecomment-1297359481
+          sync-labels: ""

.github/workflows/lint.yml

@@ -26,7 +26,7 @@ jobs:
           node-version: 20.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64

.github/workflows/pr.yml

@@ -10,6 +10,8 @@ permissions:
 
 on:
   pull_request:
+    branches:
+      - main
   merge_group:
   workflow_dispatch:
 

.github/workflows/release-docker-github-experimental.yml

@@ -29,10 +29,6 @@ jobs:
       # with sigstore/fulcio when running outside of PRs.
       id-token: write
 
-    outputs:
-      DOCKER_IMAGE: ${{ steps.extract_image_info.outputs.DOCKER_IMAGE }}
-      RELEASE_VERSION: ${{ steps.extract_image_info.outputs.RELEASE_VERSION }}
-
     steps:
       - name: Harden the runner (Audit all outbound calls)
         uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
@@ -42,53 +38,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Generate SemVer version from branch or tag
-        id: generate_version
-        run: |
-          # Get reference name and type
-          REF_NAME="${{ github.ref_name }}"
-          REF_TYPE="${{ github.ref_type }}"
-
-          echo "Reference type: $REF_TYPE"
-          echo "Reference name: $REF_NAME"
-
-          if [[ "$REF_TYPE" == "tag" ]]; then
-            # If running from a tag, use the tag name
-            if [[ "$REF_NAME" =~ ^v?[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
-              # Tag looks like a SemVer, use it directly (remove 'v' prefix if present)
-              VERSION=$(echo "$REF_NAME" | sed 's/^v//')
-              echo "Using SemVer tag: $VERSION"
-            else
-              # Tag is not SemVer, treat as prerelease
-              SANITIZED_TAG=$(echo "$REF_NAME" | sed 's/[^a-zA-Z0-9.-]/-/g' | sed 's/--*/-/g' | sed 's/^-\|-$//g')
-              VERSION="0.0.0-$SANITIZED_TAG"
-              echo "Using tag as prerelease: $VERSION"
-            fi
-          else
-            # Running from branch, use branch name as prerelease
-            SANITIZED_BRANCH=$(echo "$REF_NAME" | sed 's/[^a-zA-Z0-9.-]/-/g' | sed 's/--*/-/g' | sed 's/^-\|-$//g')
-            VERSION="0.0.0-$SANITIZED_BRANCH"
-            echo "Using branch as prerelease: $VERSION"
-          fi
-
-          echo "VERSION=$VERSION" >> $GITHUB_ENV
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-          echo "Generated SemVer version: $VERSION"
-
-      - name: Update package.json version
-        run: |
-          sed -i "s/\"version\": \"0.0.0\"/\"version\": \"${{ env.VERSION }}\"/" ./apps/web/package.json
-          cat ./apps/web/package.json | grep version
-
-      - name: Set Sentry environment in .env
-        run: |
-          if ! grep -q "^SENTRY_ENVIRONMENT=staging$" .env 2>/dev/null; then
-            echo "SENTRY_ENVIRONMENT=staging" >> .env
-            echo "Added SENTRY_ENVIRONMENT=staging to .env file"
-          else
-            echo "SENTRY_ENVIRONMENT=staging already exists in .env file"
-          fi
-
       - name: Set up Depot CLI
         uses: depot/setup-action@b0b1ea4f69e92ebf5dea3f8713a1b0c37b2126a5 # v1.6.0
 
@@ -134,21 +83,6 @@ jobs:
             database_url=${{ secrets.DUMMY_DATABASE_URL }}
             encryption_key=${{ secrets.DUMMY_ENCRYPTION_KEY }}
 
-      - name: Extract image info for sourcemap upload
-        id: extract_image_info
-        run: |
-          # Use the first readable tag from metadata action output
-          DOCKER_IMAGE=$(echo "${{ steps.meta.outputs.tags }}" | head -n1 | xargs)
-          echo "DOCKER_IMAGE=$DOCKER_IMAGE" >> $GITHUB_OUTPUT
-
-          # Use the generated version for Sentry release
-          RELEASE_VERSION="$VERSION"
-          echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
-
-          echo "Docker image: $DOCKER_IMAGE"
-          echo "Release version: $RELEASE_VERSION"
-          echo "Available tags: ${{ steps.meta.outputs.tags }}"
-
       # Sign the resulting Docker image digest except on PRs.
       # This will only write to the public Rekor transparency log when the Docker
       # repository is public to avoid leaking data.  If you would like to publish
@@ -163,25 +97,3 @@ jobs:
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
-
-  upload-sentry-sourcemaps:
-    name: Upload Sentry Sourcemaps
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    needs:
-      - build
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Upload Sentry Sourcemaps
-        uses: ./.github/actions/upload-sentry-sourcemaps
-        continue-on-error: true
-        with:
-          docker_image: ${{ needs.build.outputs.DOCKER_IMAGE }}
-          release_version: ${{ needs.build.outputs.RELEASE_VERSION }}
-          sentry_auth_token: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          environment: staging

.github/workflows/release-docker-github.yml

@@ -7,12 +7,6 @@ name: Docker Release to Github
 
 on:
   workflow_call:
-    inputs:
-      IS_PRERELEASE:
-        description: 'Whether this is a prerelease (affects latest tag)'
-        required: false
-        type: boolean
-        default: false
     outputs:
       VERSION:
         description: release version
@@ -26,15 +20,18 @@ env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-      id-token: write
       # This is used to complete the identity challenge
       # with sigstore/fulcio when running outside of PRs.
+      id-token: write
 
     outputs:
       VERSION: ${{ steps.extract_release_tag.outputs.VERSION }}
@@ -51,12 +48,10 @@ jobs:
       - name: Get Release Tag
         id: extract_release_tag
         run: |
-          # Extract version from tag (e.g., refs/tags/v1.2.3 -> 1.2.3)
           TAG=${{ github.ref }}
           TAG=${TAG#refs/tags/v}
           echo "RELEASE_TAG=$TAG" >> $GITHUB_ENV
           echo "VERSION=$TAG" >> $GITHUB_OUTPUT
-          echo "Using tag-based version: $TAG"
 
       - name: Update package.json version
         run: |
@@ -89,13 +84,6 @@ jobs:
         uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            # Default semver tags (version, major.minor, major)
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            # Only tag as 'latest' for stable releases (not prereleases)
-            type=raw,value=latest,enable=${{ inputs.IS_PRERELEASE != 'true' }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action

.github/workflows/release-helm-chart.yml

@@ -4,7 +4,7 @@ on:
   workflow_call:
     inputs:
       VERSION:
-        description: "The version of the Helm chart to release"
+        description: 'The version of the Helm chart to release'
         required: true
         type: string
 

.github/workflows/semantic-pull-requests.yml

@@ -40,7 +40,7 @@ jobs:
             revert
             ossgg
 
-      - uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db # v2.9.2
+      - uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2.9.1
         # When the previous steps fails, the workflow would stop. By adding this
         # condition you can continue the execution with the populated error message.
         if: always() && (steps.lint_pr_title.outputs.error_message != null)
@@ -59,7 +59,7 @@ jobs:
 
       # Delete a previous comment when the issue has been resolved
       - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
-        uses: marocchino/sticky-pull-request-comment@67d0dec7b07ed060a405f9b2a64b8ab319fdd7db # v2.9.2
+        uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728 # v2.9.1
         with:
           header: pr-title-lint-error
           message: |

.github/workflows/sonarqube.yml

@@ -29,7 +29,7 @@ jobs:
           node-version: 22.x
 
       - name: Install pnpm
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2
 
       - name: Install dependencies
         run: pnpm install --config.platform=linux --config.architecture=x64
@@ -43,13 +43,12 @@ jobs:
           sed -i "s/ENCRYPTION_KEY=.*/ENCRYPTION_KEY=${RANDOM_KEY}/" .env
           sed -i "s/CRON_SECRET=.*/CRON_SECRET=${RANDOM_KEY}/" .env
           sed -i "s/NEXTAUTH_SECRET=.*/NEXTAUTH_SECRET=${RANDOM_KEY}/" .env
-          sed -i "s|REDIS_URL=.*|REDIS_URL=|" .env
 
       - name: Run tests with coverage
         run: |
           pnpm test:coverage
       - name: SonarQube Scan
-        uses: SonarSource/sonarqube-scan-action@2500896589ef8f7247069a56136f8dc177c27ccf
+        uses: SonarSource/sonarqube-scan-action@aa494459d7c39c106cc77b166de8b4250a32bb97
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/terraform-plan-and-apply.yml

@@ -1,8 +1,8 @@
-name: "Terraform"
+name: 'Terraform'
 
 on:
   workflow_dispatch:
-  # TODO: enable it back when migration is completed.
+# TODO: enable it back when migration is completed.
   push:
     branches:
       - main
@@ -14,13 +14,14 @@ on:
     paths:
       - "infra/terraform/**"
 
+permissions:
+  id-token: write
+  contents: write
+  pull-requests: write
+
 jobs:
   terraform:
     runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-      contents: read
-      pull-requests: write
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -40,7 +41,7 @@ jobs:
           tags: tag:github
 
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@f24d7193d98baebaeacc7e2227925dd47cc267f5 # v4.2.0
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_ASSUME_ROLE_ARN }}
           aws-region: "eu-central-1"
@@ -70,7 +71,7 @@ jobs:
         working-directory: infra/terraform
 
       - name: Post PR comment
-        uses: borchero/terraform-plan-comment@434458316f8f24dd073cd2561c436cce41dc8f34 # v2.4.1
+        uses: borchero/terraform-plan-comment@3399d8dbae8b05185e815e02361ede2949cd99c4 # v2.4.0
         if: always() && github.ref != 'refs/heads/main' && (steps.plan.outcome == 'success' || steps.plan.outcome == 'failure')
         with:
           token: ${{ github.token }}
@@ -82,3 +83,4 @@ jobs:
         if: github.ref == 'refs/heads/main' && github.event_name == 'push'
         run: terraform apply .planfile
         working-directory: "infra/terraform"
+

.github/workflows/test.yml

@@ -41,7 +41,6 @@ jobs:
           sed -i "s/ENCRYPTION_KEY=.*/ENCRYPTION_KEY=${RANDOM_KEY}/" .env
           sed -i "s/CRON_SECRET=.*/CRON_SECRET=${RANDOM_KEY}/" .env
           sed -i "s/NEXTAUTH_SECRET=.*/NEXTAUTH_SECRET=${RANDOM_KEY}/" .env
-          sed -i "s|REDIS_URL=.*|REDIS_URL=|" .env
 
       - name: Test
         run: pnpm test

.github/workflows/upload-sentry-sourcemaps.yml

@@ -1,46 +0,0 @@
-name: Upload Sentry Sourcemaps (Manual)
-
-on:
-  workflow_dispatch:
-    inputs:
-      docker_image:
-        description: "Docker image to extract sourcemaps from"
-        required: true
-        type: string
-      release_version:
-        description: "Release version (e.g., v1.2.3)"
-        required: true
-        type: string
-      tag_version:
-        description: "Docker image tag (leave empty to use release_version)"
-        required: false
-        type: string
-
-permissions:
-  contents: read
-
-jobs:
-  upload-sourcemaps:
-    name: Upload Sourcemaps to Sentry
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-        with:
-          fetch-depth: 0
-
-      - name: Set Docker Image
-        run: |
-          if [ -n "${{ inputs.tag_version }}" ]; then
-            echo "DOCKER_IMAGE=${{ inputs.docker_image }}:${{ inputs.tag_version }}" >> $GITHUB_ENV
-          else
-            echo "DOCKER_IMAGE=${{ inputs.docker_image }}:${{ inputs.release_version }}" >> $GITHUB_ENV
-          fi
-
-      - name: Upload Sourcemaps to Sentry
-        uses: ./.github/actions/upload-sentry-sourcemaps
-        with:
-          docker_image: ${{ env.DOCKER_IMAGE }}
-          release_version: ${{ inputs.release_version }}
-          sentry_auth_token: ${{ secrets.SENTRY_AUTH_TOKEN }} 

.gitignore

@@ -73,4 +73,3 @@ infra/terraform/.terraform/
 /.idea/
 /*.iml
 packages/ios/FormbricksSDK/FormbricksSDK.xcodeproj/project.xcworkspace/xcuserdata
-.cursorrules

CONTRIBUTING.md

@@ -14,7 +14,17 @@ Are you brimming with brilliant ideas? For new features that can elevate Formbri
 
 ## 🛠 Crafting Pull Requests
 
-For the time being, we don't have the capacity to properly facilitate community contributions. It's a lot of engineering attention often spent on issues which don't follow our prioritization, so we've decided to only facilitate community code contributions in rare exceptions in the coming months.
+Ready to dive into the code and make a real impact? Here's your path:
+
+1. **Read our Best Practices**: [It takes 5 minutes](https://formbricks.com/docs/developer-docs/contributing/get-started) but will help you save hours 🤓
+
+1. **Fork the Repository:** Fork our repository or use [Gitpod](https://gitpod.io) or use [Github Codespaces](https://github.com/features/codespaces) to get started instantly.
+
+1. **Tweak and Transform:** Work your coding magic and apply your changes.
+
+1. **Pull Request Act:** If you're ready to go, craft a new pull request closely following our PR template 🙏
+
+Would you prefer a chat before you dive into a lot of work? [Github Discussions](https://github.com/formbricks/formbricks/discussions) is your harbor. Share your thoughts, and we'll meet you there with open arms. We're responsive and friendly, promise!
 
 ## 🚀 Aspiring Features
 

README.md

@@ -192,7 +192,7 @@ Here are a few options:
 
 - Upvote issues with 👍 reaction so we know what the demand for a particular issue is to prioritize it within the roadmap.
 
-- Note: For the time being, we can only facilitate code contributions as an exception.
+Please check out [our contribution guide](https://formbricks.com/docs/developer-docs/contributing/get-started) and our [list of open issues](https://github.com/formbricks/formbricks/issues) for more information.
 
 ## All Thanks To Our Contributors
 

apps/storybook/.storybook/main.ts

@@ -1,25 +1,23 @@
 import type { StorybookConfig } from "@storybook/react-vite";
-import { createRequire } from "module";
 import { dirname, join } from "path";
 
-const require = createRequire(import.meta.url);
-
 /**
  * This function is used to resolve the absolute path of a package.
  * It is needed in projects that use Yarn PnP or are set up within a monorepo.
  */
-function getAbsolutePath(value: string): any {
+const getAbsolutePath = (value: string) => {
   return dirname(require.resolve(join(value, "package.json")));
-}
+};
 
 const config: StorybookConfig = {
   stories: ["../src/**/*.mdx", "../../web/modules/ui/**/stories.@(js|jsx|mjs|ts|tsx)"],
   addons: [
     getAbsolutePath("@storybook/addon-onboarding"),
     getAbsolutePath("@storybook/addon-links"),
+    getAbsolutePath("@storybook/addon-essentials"),
     getAbsolutePath("@chromatic-com/storybook"),
+    getAbsolutePath("@storybook/addon-interactions"),
     getAbsolutePath("@storybook/addon-a11y"),
-    getAbsolutePath("@storybook/addon-docs"),
   ],
   framework: {
     name: getAbsolutePath("@storybook/react-vite"),

apps/storybook/.storybook/preview.ts

@@ -1,21 +1,5 @@
-import type { Preview } from "@storybook/react-vite";
-import { TolgeeProvider } from "@tolgee/react";
-import React from "react";
+import type { Preview } from "@storybook/react";
 import "../../web/modules/ui/globals.css";
-import { TolgeeBase } from "../../web/tolgee/shared";
-
-// Create a Storybook-specific Tolgee decorator
-const withTolgee = (Story: any) => {
-  const tolgee = TolgeeBase().init({
-    tagNewKeys: [], // No branch tagging in Storybook
-  });
-
-  return React.createElement(
-    TolgeeProvider,
-    { tolgee, fallback: "Loading", ssr: { language: "en", staticData: {} } },
-    React.createElement(Story)
-  );
-};
 
 const preview: Preview = {
   parameters: {
@@ -26,7 +10,6 @@ const preview: Preview = {
       },
     },
   },
-  decorators: [withTolgee],
 };
 
 export default preview;

apps/storybook/package.json

@@ -11,22 +11,28 @@
     "clean": "rimraf .turbo node_modules dist storybook-static"
   },
   "dependencies": {
-    "eslint-plugin-react-refresh": "0.4.20"
+    "eslint-plugin-react-refresh": "0.4.20",
+    "react": "19.1.0",
+    "react-dom": "19.1.0"
   },
   "devDependencies": {
-    "@chromatic-com/storybook": "^4.0.1",
-    "@storybook/addon-a11y": "9.0.15",
-    "@storybook/addon-links": "9.0.15",
-    "@storybook/addon-onboarding": "9.0.15",
-    "@storybook/react-vite": "9.0.15",
-    "@typescript-eslint/eslint-plugin": "8.32.0",
-    "@typescript-eslint/parser": "8.32.0",
+    "@chromatic-com/storybook": "3.2.6",
+    "@storybook/addon-a11y": "8.6.12",
+    "@storybook/addon-essentials": "8.6.12",
+    "@storybook/addon-interactions": "8.6.12",
+    "@storybook/addon-links": "8.6.12",
+    "@storybook/addon-onboarding": "8.6.12",
+    "@storybook/blocks": "8.6.12",
+    "@storybook/react": "8.6.12",
+    "@storybook/react-vite": "8.6.12",
+    "@storybook/test": "8.6.12",
+    "@typescript-eslint/eslint-plugin": "8.31.1",
+    "@typescript-eslint/parser": "8.31.1",
     "@vitejs/plugin-react": "4.4.1",
-    "esbuild": "0.25.4",
-    "eslint-plugin-storybook": "9.0.15",
+    "esbuild": "0.25.2",
+    "eslint-plugin-storybook": "0.12.0",
     "prop-types": "15.8.1",
-    "storybook": "9.0.15",
-    "vite": "6.3.5",
-    "@storybook/addon-docs": "9.0.15"
+    "storybook": "8.6.12",
+    "vite": "6.3.5"
   }
 }

apps/storybook/src/stories/Configure.mdx

@@ -1,4 +1,4 @@
-import { Meta } from "@storybook/addon-docs/blocks";
+import { Meta } from "@storybook/blocks";
 
 import Accessibility from "./assets/accessibility.png";
 import AddonLibrary from "./assets/addon-library.png";

apps/web/Dockerfile

@@ -18,16 +18,27 @@ FROM node:22-alpine3.21 AS base
 FROM base AS installer
 
 # Enable corepack and prepare pnpm
-RUN npm install --ignore-scripts -g corepack@latest 
+RUN npm install -g corepack@latest
 RUN corepack enable
-RUN corepack prepare pnpm@9.15.9 --activate
 
 # Install necessary build tools and compilers
 RUN apk update && apk add --no-cache cmake g++ gcc jq make openssl-dev python3
 
-# Copy the secrets handling script
-COPY apps/web/scripts/docker/read-secrets.sh /tmp/read-secrets.sh
-RUN chmod +x /tmp/read-secrets.sh
+# BuildKit secret handling without hardcoded fallback values
+# This approach relies entirely on secrets passed from GitHub Actions
+RUN echo '#!/bin/sh' > /tmp/read-secrets.sh && \
+    echo 'if [ -f "/run/secrets/database_url" ]; then' >> /tmp/read-secrets.sh && \
+    echo '  export DATABASE_URL=$(cat /run/secrets/database_url)' >> /tmp/read-secrets.sh && \
+    echo 'else' >> /tmp/read-secrets.sh && \
+    echo '  echo "DATABASE_URL secret not found. Build may fail if this is required."' >> /tmp/read-secrets.sh && \
+    echo 'fi' >> /tmp/read-secrets.sh && \
+    echo 'if [ -f "/run/secrets/encryption_key" ]; then' >> /tmp/read-secrets.sh && \
+    echo '  export ENCRYPTION_KEY=$(cat /run/secrets/encryption_key)' >> /tmp/read-secrets.sh && \
+    echo 'else' >> /tmp/read-secrets.sh && \
+    echo '  echo "ENCRYPTION_KEY secret not found. Build may fail if this is required."' >> /tmp/read-secrets.sh && \
+    echo 'fi' >> /tmp/read-secrets.sh && \
+    echo 'exec "$@"' >> /tmp/read-secrets.sh && \
+    chmod +x /tmp/read-secrets.sh
 
 # Increase Node.js memory limit as a regular build argument
 ARG NODE_OPTIONS="--max_old_space_size=4096"
@@ -48,10 +59,7 @@ COPY . .
 RUN touch apps/web/.env
 
 # Install the dependencies
-RUN pnpm install --ignore-scripts
-
-# Build the database package first
-RUN pnpm build --filter=@formbricks/database
+RUN pnpm install
 
 # Build the project using our secret reader script
 # This mounts the secrets only during this build step without storing them in layers
@@ -67,7 +75,7 @@ RUN jq -r '.devDependencies.prisma' packages/database/package.json > /prisma_ver
 #
 FROM base AS runner
 
-RUN npm install --ignore-scripts -g corepack@latest 
+RUN npm install -g corepack@latest
 RUN corepack enable
 
 RUN apk add --no-cache curl \
@@ -80,63 +88,4 @@ WORKDIR /home/nextjs
 
 # Ensure no write permissions are assigned to the copied resources
 COPY --from=installer /app/apps/web/.next/standalone ./
-RUN chown -R nextjs:nextjs ./ && chmod -R 755 ./
-
-COPY --from=installer /app/apps/web/next.config.mjs .
-RUN chmod 644 ./next.config.mjs
-
-COPY --from=installer /app/apps/web/package.json .
-RUN chmod 644 ./package.json
-
-COPY --from=installer /app/apps/web/.next/static ./apps/web/.next/static
-RUN chown -R nextjs:nextjs ./apps/web/.next/static && chmod -R 755 ./apps/web/.next/static
-
-COPY --from=installer /app/apps/web/public ./apps/web/public
-RUN chown -R nextjs:nextjs ./apps/web/public && chmod -R 755 ./apps/web/public
-
-COPY --from=installer /app/packages/database/schema.prisma ./packages/database/schema.prisma
-RUN chown nextjs:nextjs ./packages/database/schema.prisma && chmod 644 ./packages/database/schema.prisma
-
-COPY --from=installer /app/packages/database/dist ./packages/database/dist
-RUN chown -R nextjs:nextjs ./packages/database/dist && chmod -R 755 ./packages/database/dist
-
-COPY --from=installer /app/node_modules/@prisma/client ./node_modules/@prisma/client
-RUN chown -R nextjs:nextjs ./node_modules/@prisma/client && chmod -R 755 ./node_modules/@prisma/client
-
-COPY --from=installer /app/node_modules/.prisma ./node_modules/.prisma
-RUN chown -R nextjs:nextjs ./node_modules/.prisma && chmod -R 755 ./node_modules/.prisma
-
-COPY --from=installer /prisma_version.txt .
-RUN chown nextjs:nextjs ./prisma_version.txt && chmod 644 ./prisma_version.txt
-
-COPY /docker/cronjobs /app/docker/cronjobs
-RUN chmod -R 755 /app/docker/cronjobs
-
-COPY --from=installer /app/node_modules/@paralleldrive/cuid2 ./node_modules/@paralleldrive/cuid2
-RUN chmod -R 755 ./node_modules/@paralleldrive/cuid2
-
-COPY --from=installer /app/node_modules/@noble/hashes ./node_modules/@noble/hashes
-RUN chmod -R 755 ./node_modules/@noble/hashes
-
-COPY --from=installer /app/node_modules/zod ./node_modules/zod
-RUN chmod -R 755 ./node_modules/zod
-
-RUN npm install -g prisma
-
-# Create a startup script to handle the conditional logic
-COPY --from=installer /app/apps/web/scripts/docker/next-start.sh /home/nextjs/start.sh
-RUN chown nextjs:nextjs /home/nextjs/start.sh && chmod +x /home/nextjs/start.sh
-
-EXPOSE 3000
-ENV HOSTNAME="0.0.0.0"
-USER nextjs
-
-# Prepare volume for uploads
-RUN mkdir -p /home/nextjs/apps/web/uploads/
-VOLUME /home/nextjs/apps/web/uploads/
-
-# Prepare volume for SAML preloaded connection
-RUN mkdir -p /home/nextjs/apps/web/saml-connection
-VOLUME /home/nextjs/apps/web/saml-connection
-
-CMD ["/home/nextjs/start.sh"]
+RUN chown -R nextjs:nextjs ./ && chmod -R 755 ./

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks.test.tsx

@@ -1,79 +0,0 @@
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { ConnectWithFormbricks } from "./ConnectWithFormbricks";
-
-// Mocks before import
-const pushMock = vi.fn();
-const refreshMock = vi.fn();
-vi.mock("@tolgee/react", () => ({ useTranslate: () => ({ t: (key: string) => key }) }));
-vi.mock("next/navigation", () => ({ useRouter: vi.fn(() => ({ push: pushMock, refresh: refreshMock })) }));
-vi.mock("./OnboardingSetupInstructions", () => ({
-  OnboardingSetupInstructions: () => <div data-testid="instructions" />,
-}));
-
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("ConnectWithFormbricks", () => {
-  const environment = { id: "env1" } as any;
-  const webAppUrl = "http://app";
-  const channel = {} as any;
-
-  test("renders waiting state when widgetSetupCompleted is false", () => {
-    render(
-      <ConnectWithFormbricks
-        environment={environment}
-        publicDomain={webAppUrl}
-        widgetSetupCompleted={false}
-        channel={channel}
-      />
-    );
-    expect(screen.getByTestId("instructions")).toBeInTheDocument();
-    expect(screen.getByText("environments.connect.waiting_for_your_signal")).toBeInTheDocument();
-  });
-
-  test("renders success state when widgetSetupCompleted is true", () => {
-    render(
-      <ConnectWithFormbricks
-        environment={environment}
-        publicDomain={webAppUrl}
-        widgetSetupCompleted={true}
-        channel={channel}
-      />
-    );
-    expect(screen.getByText("environments.connect.congrats")).toBeInTheDocument();
-    expect(screen.getByText("environments.connect.connection_successful_message")).toBeInTheDocument();
-  });
-
-  test("clicking finish button navigates to surveys", async () => {
-    render(
-      <ConnectWithFormbricks
-        environment={environment}
-        publicDomain={webAppUrl}
-        widgetSetupCompleted={true}
-        channel={channel}
-      />
-    );
-    const button = screen.getByRole("button", { name: "environments.connect.finish_onboarding" });
-    await userEvent.click(button);
-    expect(pushMock).toHaveBeenCalledWith(`/environments/${environment.id}/surveys`);
-  });
-
-  test("refresh is called on visibilitychange to visible", () => {
-    render(
-      <ConnectWithFormbricks
-        environment={environment}
-        publicDomain={webAppUrl}
-        widgetSetupCompleted={false}
-        channel={channel}
-      />
-    );
-    Object.defineProperty(document, "visibilityState", { value: "visible", configurable: true });
-    document.dispatchEvent(new Event("visibilitychange"));
-    expect(refreshMock).toHaveBeenCalled();
-  });
-});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks.tsx

@@ -12,14 +12,14 @@ import { OnboardingSetupInstructions } from "./OnboardingSetupInstructions";
 
 interface ConnectWithFormbricksProps {
   environment: TEnvironment;
-  publicDomain: string;
+  webAppUrl: string;
   widgetSetupCompleted: boolean;
   channel: TProjectConfigChannel;
 }
 
 export const ConnectWithFormbricks = ({
   environment,
-  publicDomain,
+  webAppUrl,
   widgetSetupCompleted,
   channel,
 }: ConnectWithFormbricksProps) => {
@@ -49,7 +49,7 @@ export const ConnectWithFormbricks = ({
         <div className="flex w-1/2 flex-col space-y-4">
           <OnboardingSetupInstructions
             environmentId={environment.id}
-            publicDomain={publicDomain}
+            webAppUrl={webAppUrl}
             channel={channel}
             widgetSetupCompleted={widgetSetupCompleted}
           />

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/OnboardingSetupInstructions.test.tsx

@@ -33,7 +33,7 @@ describe("OnboardingSetupInstructions", () => {
   // Provide some default props for testing
   const defaultProps = {
     environmentId: "env-123",
-    publicDomain: "https://example.com",
+    webAppUrl: "https://example.com",
     channel: "app" as const, // Assuming channel is either "app" or "website"
     widgetSetupCompleted: false,
   };

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/components/OnboardingSetupInstructions.tsx

@@ -18,14 +18,14 @@ const tabs = [
 
 interface OnboardingSetupInstructionsProps {
   environmentId: string;
-  publicDomain: string;
+  webAppUrl: string;
   channel: TProjectConfigChannel;
   widgetSetupCompleted: boolean;
 }
 
 export const OnboardingSetupInstructions = ({
   environmentId,
-  publicDomain,
+  webAppUrl,
   channel,
   widgetSetupCompleted,
 }: OnboardingSetupInstructionsProps) => {
@@ -34,7 +34,7 @@ export const OnboardingSetupInstructions = ({
   const htmlSnippetForAppSurveys = `<!-- START Formbricks Surveys -->
   <script type="text/javascript">
   !function(){
-      var appUrl = "${publicDomain}";
+      var appUrl = "${webAppUrl}";
       var environmentId = "${environmentId}";
       var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=appUrl+"/js/formbricks.umd.cjs",t.onload=function(){window.formbricks?window.formbricks.setup({environmentId:environmentId,appUrl:appUrl}):console.error("Formbricks library failed to load properly. The formbricks object is not available.");};var e=document.getElementsByTagName("script")[0];e.parentNode.insertBefore(t,e)}();
   </script>
@@ -44,7 +44,7 @@ export const OnboardingSetupInstructions = ({
   const htmlSnippetForWebsiteSurveys = `<!-- START Formbricks Surveys -->
   <script type="text/javascript">
   !function(){
-    var appUrl = "${publicDomain}";
+    var appUrl = "${webAppUrl}";
     var environmentId = "${environmentId}";
     var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=appUrl+"/js/formbricks.umd.cjs",t.onload=function(){window.formbricks?window.formbricks.setup({environmentId:environmentId,appUrl:appUrl}):console.error("Formbricks library failed to load properly. The formbricks object is not available.");};var e=document.getElementsByTagName("script")[0];e.parentNode.insertBefore(t,e)}();
   </script>
@@ -57,7 +57,7 @@ export const OnboardingSetupInstructions = ({
   if (typeof window !== "undefined") {
     formbricks.setup({
       environmentId: "${environmentId}",
-      appUrl: "${publicDomain}",
+      appUrl: "${webAppUrl}",
     });
   }
   
@@ -75,7 +75,7 @@ export const OnboardingSetupInstructions = ({
   if (typeof window !== "undefined") {
     formbricks.setup({
       environmentId: "${environmentId}",
-      appUrl: "${publicDomain}",
+      appUrl: "${webAppUrl}",
     });
   }
   

apps/web/app/(app)/(onboarding)/environments/[environmentId]/connect/page.tsx

@@ -1,6 +1,6 @@
 import { ConnectWithFormbricks } from "@/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks";
+import { WEBAPP_URL } from "@/lib/constants";
 import { getEnvironment } from "@/lib/environment/service";
-import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { Button } from "@/modules/ui/components/button";
 import { Header } from "@/modules/ui/components/header";
@@ -30,8 +30,6 @@ const Page = async (props: ConnectPageProps) => {
 
   const channel = project.config.channel || null;
 
-  const publicDomain = getPublicDomain();
-
   return (
     <div className="flex min-h-full flex-col items-center justify-center py-10">
       <Header title={t("environments.connect.headline")} subtitle={t("environments.connect.subtitle")} />
@@ -41,12 +39,12 @@ const Page = async (props: ConnectPageProps) => {
       </div>
       <ConnectWithFormbricks
         environment={environment}
-        publicDomain={publicDomain}
+        webAppUrl={WEBAPP_URL}
         widgetSetupCompleted={environment.appSetupCompleted}
         channel={channel}
       />
       <Button
-        className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
+        className="absolute top-5 right-5 !mt-0 text-slate-500 hover:text-slate-700"
         variant="ghost"
         asChild>
         <Link href={`/environments/${environment.id}`}>

apps/web/app/(app)/(onboarding)/environments/[environmentId]/layout.test.tsx

@@ -1,147 +0,0 @@
-import { hasUserEnvironmentAccess } from "@/lib/environment/auth";
-import { cleanup, render, screen } from "@testing-library/react";
-import { getServerSession } from "next-auth";
-import { redirect } from "next/navigation";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import OnboardingLayout from "./layout";
-
-vi.mock("@/lib/constants", () => ({
-  IS_FORMBRICKS_CLOUD: false,
-  IS_PRODUCTION: false,
-  IS_DEVELOPMENT: true,
-  E2E_TESTING: false,
-  WEBAPP_URL: "http://localhost:3000",
-  PUBLIC_URL: "http://localhost:3000/survey",
-  ENCRYPTION_KEY: "mock-encryption-key",
-  CRON_SECRET: "mock-cron-secret",
-  DEFAULT_BRAND_COLOR: "#64748b",
-  FB_LOGO_URL: "https://mock-logo-url.com/logo.png",
-  PRIVACY_URL: "http://localhost:3000/privacy",
-  TERMS_URL: "http://localhost:3000/terms",
-  IMPRINT_URL: "http://localhost:3000/imprint",
-  IMPRINT_ADDRESS: "Mock Address",
-  PASSWORD_RESET_DISABLED: false,
-  EMAIL_VERIFICATION_DISABLED: false,
-  GOOGLE_OAUTH_ENABLED: false,
-  GITHUB_OAUTH_ENABLED: false,
-  AZURE_OAUTH_ENABLED: false,
-  OIDC_OAUTH_ENABLED: false,
-  SAML_OAUTH_ENABLED: false,
-  SAML_XML_DIR: "./mock-saml-connection",
-  SIGNUP_ENABLED: true,
-  EMAIL_AUTH_ENABLED: true,
-  INVITE_DISABLED: false,
-  SLACK_CLIENT_SECRET: "mock-slack-secret",
-  SLACK_CLIENT_ID: "mock-slack-id",
-  SLACK_AUTH_URL: "https://mock-slack-auth-url.com",
-  GOOGLE_SHEETS_CLIENT_ID: "mock-google-sheets-id",
-  GOOGLE_SHEETS_CLIENT_SECRET: "mock-google-sheets-secret",
-  GOOGLE_SHEETS_REDIRECT_URL: "http://localhost:3000/google-sheets-redirect",
-  NOTION_OAUTH_CLIENT_ID: "mock-notion-id",
-  NOTION_OAUTH_CLIENT_SECRET: "mock-notion-secret",
-  NOTION_REDIRECT_URI: "http://localhost:3000/notion-redirect",
-  NOTION_AUTH_URL: "https://mock-notion-auth-url.com",
-  AIRTABLE_CLIENT_ID: "mock-airtable-id",
-  SMTP_HOST: "mock-smtp-host",
-  SMTP_PORT: "587",
-  SMTP_SECURE_ENABLED: false,
-  SMTP_USER: "mock-smtp-user",
-  SMTP_PASSWORD: "mock-smtp-password",
-  SMTP_AUTHENTICATED: true,
-  SMTP_REJECT_UNAUTHORIZED_TLS: true,
-  MAIL_FROM: "mock@mail.com",
-  MAIL_FROM_NAME: "Mock Mail",
-  NEXTAUTH_SECRET: "mock-nextauth-secret",
-  ITEMS_PER_PAGE: 30,
-  SURVEYS_PER_PAGE: 12,
-  RESPONSES_PER_PAGE: 25,
-  TEXT_RESPONSES_PER_PAGE: 5,
-  INSIGHTS_PER_PAGE: 10,
-  DOCUMENTS_PER_PAGE: 10,
-  MAX_RESPONSES_FOR_INSIGHT_GENERATION: 500,
-  MAX_OTHER_OPTION_LENGTH: 250,
-  ENTERPRISE_LICENSE_KEY: "ABC",
-  GITHUB_ID: "mock-github-id",
-  GITHUB_SECRET: "mock-github-secret",
-  GITHUB_OAUTH_URL: "https://mock-github-auth-url.com",
-  AZURE_ID: "mock-azure-id",
-  AZUREAD_CLIENT_ID: "mock-azure-client-id",
-  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
-  GOOGLE_CLIENT_ID: "mock-google-client-id",
-  GOOGLE_CLIENT_SECRET: "mock-google-client-secret",
-  GOOGLE_OAUTH_URL: "https://mock-google-auth-url.com",
-  AZURE_OAUTH_URL: "https://mock-azure-auth-url.com",
-  OIDC_ID: "mock-oidc-id",
-  OIDC_OAUTH_URL: "https://mock-oidc-auth-url.com",
-  SAML_ID: "mock-saml-id",
-  SAML_OAUTH_URL: "https://mock-saml-auth-url.com",
-  SAML_METADATA_URL: "https://mock-saml-metadata-url.com",
-  AZUREAD_TENANT_ID: "mock-azure-tenant-id",
-  AZUREAD_OAUTH_URL: "https://mock-azuread-auth-url.com",
-  OIDC_DISPLAY_NAME: "Mock OIDC",
-  OIDC_CLIENT_ID: "mock-oidc-client-id",
-  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
-  OIDC_REDIRECT_URL: "http://localhost:3000/oidc-redirect",
-  OIDC_AUTH_URL: "https://mock-oidc-auth-url.com",
-  OIDC_ISSUER: "https://mock-oidc-issuer.com",
-  OIDC_SIGNING_ALGORITHM: "RS256",
-  SESSION_MAX_AGE: 1000,
-  REDIS_URL: undefined,
-  AUDIT_LOG_ENABLED: true,
-}));
-
-vi.mock("next/navigation", () => ({
-  redirect: vi.fn(),
-}));
-
-vi.mock("next-auth", () => ({
-  getServerSession: vi.fn(),
-}));
-
-vi.mock("@/lib/environment/auth", () => ({
-  hasUserEnvironmentAccess: vi.fn(),
-}));
-
-describe("OnboardingLayout", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  test("redirects to login if session is missing", async () => {
-    vi.mocked(getServerSession).mockResolvedValueOnce(null);
-
-    await OnboardingLayout({
-      params: { environmentId: "env1" },
-      children: <div>Test Content</div>,
-    });
-
-    expect(redirect).toHaveBeenCalledWith("/auth/login");
-  });
-
-  test("throws AuthorizationError if user lacks access", async () => {
-    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user1" } });
-    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(false);
-
-    await expect(
-      OnboardingLayout({
-        params: { environmentId: "env1" },
-        children: <div>Test Content</div>,
-      })
-    ).rejects.toThrow("User is not authorized to access this environment");
-  });
-
-  test("renders children if user has access", async () => {
-    vi.mocked(getServerSession).mockResolvedValueOnce({ user: { id: "user1" } });
-    vi.mocked(hasUserEnvironmentAccess).mockResolvedValueOnce(true);
-
-    const result = await OnboardingLayout({
-      params: { environmentId: "env1" },
-      children: <div data-testid="child">Test Content</div>,
-    });
-
-    render(result);
-
-    expect(screen.getByTestId("child")).toHaveTextContent("Test Content");
-  });
-});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/layout.tsx

@@ -16,7 +16,7 @@ const OnboardingLayout = async (props) => {
 
   const isAuthorized = await hasUserEnvironmentAccess(session.user.id, params.environmentId);
   if (!isAuthorized) {
-    throw new AuthorizationError("User is not authorized to access this environment");
+    throw AuthorizationError;
   }
 
   return <div className="flex-1 bg-slate-50">{children}</div>;

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/components/XMTemplateList.test.tsx

@@ -1,76 +0,0 @@
-import { createSurveyAction } from "@/modules/survey/components/template-list/actions";
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import toast from "react-hot-toast";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { XMTemplateList } from "./XMTemplateList";
-
-// Prepare push mock and module mocks before importing component
-const pushMock = vi.fn();
-vi.mock("@tolgee/react", () => ({ useTranslate: () => ({ t: (key: string) => key }) }));
-vi.mock("next/navigation", () => ({ useRouter: vi.fn(() => ({ push: pushMock })) }));
-vi.mock("react-hot-toast", () => ({ default: { error: vi.fn() } }));
-vi.mock("@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/xm-templates", () => ({
-  getXMTemplates: (t: any) => [
-    { id: 1, name: "tmpl1" },
-    { id: 2, name: "tmpl2" },
-  ],
-}));
-vi.mock("@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/utils", () => ({
-  replacePresetPlaceholders: (template: any, project: any) => ({ ...template, projectId: project.id }),
-}));
-vi.mock("@/modules/survey/components/template-list/actions", () => ({ createSurveyAction: vi.fn() }));
-vi.mock("@/lib/utils/helper", () => ({ getFormattedErrorMessage: () => "formatted-error" }));
-vi.mock("@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer", () => ({
-  OnboardingOptionsContainer: ({ options }: { options: any[] }) => (
-    <div>
-      {options.map((opt, idx) => (
-        <button key={idx} data-testid={`option-${idx}`} onClick={opt.onClick}>
-          {opt.title}
-        </button>
-      ))}
-    </div>
-  ),
-}));
-
-// Reset mocks between tests
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("XMTemplateList component", () => {
-  const project = { id: "proj1" } as any;
-  const user = { id: "user1" } as any;
-  const environmentId = "env1";
-
-  test("creates survey and navigates on success", async () => {
-    // Mock successful survey creation
-    vi.mocked(createSurveyAction).mockResolvedValue({ data: { id: "survey1" } } as any);
-
-    render(<XMTemplateList project={project} user={user} environmentId={environmentId} />);
-
-    const option0 = screen.getByTestId("option-0");
-    await userEvent.click(option0);
-
-    expect(createSurveyAction).toHaveBeenCalledWith({
-      environmentId,
-      surveyBody: expect.objectContaining({ id: 1, projectId: "proj1", type: "link", createdBy: "user1" }),
-    });
-    expect(pushMock).toHaveBeenCalledWith(`/environments/${environmentId}/surveys/survey1/edit?mode=cx`);
-  });
-
-  test("shows error toast on failure", async () => {
-    // Mock failed survey creation
-    vi.mocked(createSurveyAction).mockResolvedValue({ error: "err" } as any);
-
-    render(<XMTemplateList project={project} user={user} environmentId={environmentId} />);
-
-    const option1 = screen.getByTestId("option-1");
-    await userEvent.click(option1);
-
-    expect(createSurveyAction).toHaveBeenCalled();
-    expect(toast.error).toHaveBeenCalledWith("formatted-error");
-  });
-});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/utils.test.ts

@@ -1,80 +0,0 @@
-import "@testing-library/jest-dom/vitest";
-import { cleanup } from "@testing-library/react";
-import { afterEach, describe, expect, test } from "vitest";
-import { TProject } from "@formbricks/types/project";
-import { TXMTemplate } from "@formbricks/types/templates";
-import { replacePresetPlaceholders } from "./utils";
-
-// Mock data
-const mockProject: TProject = {
-  id: "project1",
-  createdAt: new Date(),
-  updatedAt: new Date(),
-  name: "Test Project",
-  organizationId: "org1",
-  styling: {
-    allowStyleOverwrite: true,
-    brandColor: { light: "#FFFFFF" },
-  },
-  recontactDays: 30,
-  inAppSurveyBranding: true,
-  linkSurveyBranding: true,
-  config: {
-    channel: "link" as const,
-    industry: "eCommerce" as "eCommerce" | "saas" | "other" | null,
-  },
-  placement: "bottomRight",
-  clickOutsideClose: true,
-  darkOverlay: false,
-  environments: [],
-  languages: [],
-  logo: null,
-};
-const mockTemplate: TXMTemplate = {
-  name: "$[projectName] Survey",
-  questions: [
-    {
-      id: "q1",
-      inputType: "text",
-      type: "email" as any,
-      headline: { default: "$[projectName] Question" },
-      required: false,
-      charLimit: { enabled: true, min: 400, max: 1000 },
-    },
-  ],
-  endings: [
-    {
-      id: "e1",
-      type: "endScreen",
-      headline: { default: "Thank you for completing the survey!" },
-    },
-  ],
-  styling: {
-    brandColor: { light: "#0000FF" },
-    questionColor: { light: "#00FF00" },
-    inputColor: { light: "#FF0000" },
-  },
-};
-
-describe("replacePresetPlaceholders", () => {
-  afterEach(() => {
-    cleanup();
-  });
-
-  test("replaces projectName placeholder in template name", () => {
-    const result = replacePresetPlaceholders(mockTemplate, mockProject);
-    expect(result.name).toBe("Test Project Survey");
-  });
-
-  test("replaces projectName placeholder in question headline", () => {
-    const result = replacePresetPlaceholders(mockTemplate, mockProject);
-    expect(result.questions[0].headline.default).toBe("Test Project Question");
-  });
-
-  test("returns a new object without mutating the original template", () => {
-    const originalTemplate = structuredClone(mockTemplate);
-    const result = replacePresetPlaceholders(mockTemplate, mockProject);
-    expect(result).not.toBe(mockTemplate);
-    expect(mockTemplate).toEqual(originalTemplate);
-  });
-});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/lib/xm-templates.test.ts

@@ -1,60 +0,0 @@
-import "@testing-library/jest-dom/vitest";
-import { cleanup } from "@testing-library/preact";
-import { TFnType } from "@tolgee/react";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { getXMSurveyDefault, getXMTemplates } from "./xm-templates";
-
-vi.mock("@formbricks/logger", () => ({
-  logger: { error: vi.fn() },
-}));
-
-describe("xm-templates", () => {
-  afterEach(() => {
-    cleanup();
-  });
-
-  test("getXMSurveyDefault returns default survey template", () => {
-    const tMock = vi.fn((key) => key) as TFnType;
-    const result = getXMSurveyDefault(tMock);
-
-    expect(result).toEqual({
-      name: "",
-      endings: expect.any(Array),
-      questions: [],
-      styling: {
-        overwriteThemeStyling: true,
-      },
-    });
-    expect(result.endings).toHaveLength(1);
-  });
-
-  test("getXMTemplates returns all templates", () => {
-    const tMock = vi.fn((key) => key) as TFnType;
-    const result = getXMTemplates(tMock);
-
-    expect(result).toHaveLength(6);
-    expect(result[0].name).toBe("templates.nps_survey_name");
-    expect(result[1].name).toBe("templates.star_rating_survey_name");
-    expect(result[2].name).toBe("templates.csat_survey_name");
-    expect(result[3].name).toBe("templates.cess_survey_name");
-    expect(result[4].name).toBe("templates.smileys_survey_name");
-    expect(result[5].name).toBe("templates.enps_survey_name");
-  });
-
-  test("getXMTemplates handles errors gracefully", async () => {
-    const tMock = vi.fn(() => {
-      throw new Error("Test error");
-    }) as TFnType;
-
-    const result = getXMTemplates(tMock);
-
-    // Dynamically import the mocked logger
-    const { logger } = await import("@formbricks/logger");
-
-    expect(result).toEqual([]);
-    expect(logger.error).toHaveBeenCalledWith(
-      expect.any(Error),
-      "Unable to load XM templates, returning empty array"
-    );
-  });
-});

apps/web/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/page.tsx

@@ -49,7 +49,7 @@ const Page = async (props: XMTemplatePageProps) => {
       <XMTemplateList project={project} user={user} environmentId={environment.id} />
       {projects.length >= 2 && (
         <Button
-          className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
+          className="absolute top-5 right-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"
           asChild>
           <Link href={`/environments/${environment.id}/surveys`}>

apps/web/app/(app)/(onboarding)/lib/onboarding.test.ts

@@ -1,44 +0,0 @@
-import { Prisma } from "@prisma/client";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { prisma } from "@formbricks/database";
-import { DatabaseError } from "@formbricks/types/errors";
-import { getTeamsByOrganizationId } from "./onboarding";
-
-vi.mock("@formbricks/database", () => ({
-  prisma: {
-    team: {
-      findMany: vi.fn(),
-    },
-  },
-}));
-
-describe("getTeamsByOrganizationId", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("returns mapped teams", async () => {
-    const mockTeams = [
-      { id: "t1", name: "Team 1" },
-      { id: "t2", name: "Team 2" },
-    ];
-    vi.mocked(prisma.team.findMany).mockResolvedValueOnce(mockTeams);
-    const result = await getTeamsByOrganizationId("org1");
-    expect(result).toEqual([
-      { id: "t1", name: "Team 1" },
-      { id: "t2", name: "Team 2" },
-    ]);
-  });
-
-  test("throws DatabaseError on Prisma error", async () => {
-    vi.mocked(prisma.team.findMany).mockRejectedValueOnce(
-      new Prisma.PrismaClientKnownRequestError("fail", { code: "P2002", clientVersion: "1.0.0" })
-    );
-    await expect(getTeamsByOrganizationId("org1")).rejects.toThrow(DatabaseError);
-  });
-
-  test("throws error on unknown error", async () => {
-    vi.mocked(prisma.team.findMany).mockRejectedValueOnce(new Error("fail"));
-    await expect(getTeamsByOrganizationId("org1")).rejects.toThrow("fail");
-  });
-});

apps/web/app/(app)/(onboarding)/lib/onboarding.ts

@@ -1,6 +1,8 @@
 "use server";
 
 import { TOrganizationTeam } from "@/app/(app)/(onboarding)/types/onboarding";
+import { cache } from "@/lib/cache";
+import { teamCache } from "@/lib/cache/team";
 import { validateInputs } from "@/lib/utils/validate";
 import { Prisma } from "@prisma/client";
 import { cache as reactCache } from "react";
@@ -9,31 +11,38 @@ import { ZId } from "@formbricks/types/common";
 import { DatabaseError } from "@formbricks/types/errors";
 
 export const getTeamsByOrganizationId = reactCache(
-  async (organizationId: string): Promise<TOrganizationTeam[] | null> => {
-    validateInputs([organizationId, ZId]);
-    try {
-      const teams = await prisma.team.findMany({
-        where: {
-          organizationId,
-        },
-        select: {
-          id: true,
-          name: true,
-        },
-      });
+  async (organizationId: string): Promise<TOrganizationTeam[] | null> =>
+    cache(
+      async () => {
+        validateInputs([organizationId, ZId]);
+        try {
+          const teams = await prisma.team.findMany({
+            where: {
+              organizationId,
+            },
+            select: {
+              id: true,
+              name: true,
+            },
+          });
 
-      const projectTeams = teams.map((team) => ({
-        id: team.id,
-        name: team.name,
-      }));
+          const projectTeams = teams.map((team) => ({
+            id: team.id,
+            name: team.name,
+          }));
 
-      return projectTeams;
-    } catch (error) {
-      if (error instanceof Prisma.PrismaClientKnownRequestError) {
-        throw new DatabaseError(error.message);
+          return projectTeams;
+        } catch (error) {
+          if (error instanceof Prisma.PrismaClientKnownRequestError) {
+            throw new DatabaseError(error.message);
+          }
+
+          throw error;
+        }
+      },
+      [`getTeamsByOrganizationId-${organizationId}`],
+      {
+        tags: [teamCache.tag.byOrganizationId(organizationId)],
       }
-
-      throw error;
-    }
-  }
+    )()
 );

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar.test.tsx

@@ -1,100 +0,0 @@
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { LandingSidebar } from "./landing-sidebar";
-
-// Mock constants that this test needs
-vi.mock("@/lib/constants", () => ({
-  IS_FORMBRICKS_CLOUD: false,
-  WEBAPP_URL: "http://localhost:3000",
-}));
-
-// Mock server actions that this test needs
-vi.mock("@/modules/auth/actions/sign-out", () => ({
-  logSignOutAction: vi.fn().mockResolvedValue(undefined),
-}));
-
-// Module mocks must be declared before importing the component
-vi.mock("@tolgee/react", () => ({
-  useTranslate: () => ({ t: (key: string) => key, isLoading: false }),
-}));
-
-// Mock our useSignOut hook
-const mockSignOut = vi.fn();
-vi.mock("@/modules/auth/hooks/use-sign-out", () => ({
-  useSignOut: () => ({
-    signOut: mockSignOut,
-  }),
-}));
-
-vi.mock("next/navigation", () => ({ useRouter: () => ({ push: vi.fn() }) }));
-vi.mock("@/modules/organization/components/CreateOrganizationModal", () => ({
-  CreateOrganizationModal: ({ open }: { open: boolean }) => (
-    <div data-testid={open ? "modal-open" : "modal-closed"} />
-  ),
-}));
-vi.mock("@/modules/ui/components/avatars", () => ({
-  ProfileAvatar: ({ userId }: { userId: string }) => <div data-testid="avatar">{userId}</div>,
-}));
-
-// Ensure mocks are reset between tests
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("LandingSidebar component", () => {
-  const user = { id: "u1", name: "Alice", email: "alice@example.com", imageUrl: "" } as any;
-  const organization = { id: "o1", name: "orgOne" } as any;
-  const organizations = [
-    { id: "o2", name: "betaOrg" },
-    { id: "o1", name: "alphaOrg" },
-  ] as any;
-
-  test("renders logo, avatar, and initial modal closed", () => {
-    render(
-      <LandingSidebar
-        isMultiOrgEnabled={false}
-        user={user}
-        organization={organization}
-        organizations={organizations}
-      />
-    );
-
-    // Formbricks logo
-    expect(screen.getByAltText("environments.formbricks_logo")).toBeInTheDocument();
-    // Profile avatar
-    expect(screen.getByTestId("avatar")).toHaveTextContent("u1");
-    // CreateOrganizationModal should be closed initially
-    expect(screen.getByTestId("modal-closed")).toBeInTheDocument();
-  });
-
-  test("clicking logout triggers signOut", async () => {
-    render(
-      <LandingSidebar
-        isMultiOrgEnabled={false}
-        user={user}
-        organization={organization}
-        organizations={organizations}
-      />
-    );
-
-    // Open user dropdown by clicking on avatar trigger
-    const trigger = screen.getByTestId("avatar").parentElement;
-    if (trigger) await userEvent.click(trigger);
-
-    // Click logout menu item
-    const logoutItem = await screen.findByText("common.logout");
-    await userEvent.click(logoutItem);
-
-    expect(mockSignOut).toHaveBeenCalledWith({
-      reason: "user_initiated",
-      redirectUrl: "/auth/login",
-      organizationId: "o1",
-      redirect: true,
-      callbackUrl: "/auth/login",
-      clearEnvironmentId: true,
-    });
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar.tsx

@@ -3,7 +3,6 @@
 import FBLogo from "@/images/formbricks-wordmark.svg";
 import { cn } from "@/lib/cn";
 import { capitalizeFirstLetter } from "@/lib/utils/strings";
-import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
 import { CreateOrganizationModal } from "@/modules/organization/components/CreateOrganizationModal";
 import { ProfileAvatar } from "@/modules/ui/components/avatars";
 import {
@@ -21,6 +20,7 @@ import {
 } from "@/modules/ui/components/dropdown-menu";
 import { useTranslate } from "@tolgee/react";
 import { ArrowUpRightIcon, ChevronRightIcon, LogOutIcon, PlusIcon } from "lucide-react";
+import { signOut } from "next-auth/react";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
@@ -44,7 +44,6 @@ export const LandingSidebar = ({
   const [openCreateOrganizationModal, setOpenCreateOrganizationModal] = useState<boolean>(false);
 
   const { t } = useTranslate();
-  const { signOut: signOutWithAudit } = useSignOut({ id: user.id, email: user.email });
 
   const router = useRouter();
 
@@ -124,14 +123,7 @@ export const LandingSidebar = ({
 
             <DropdownMenuItem
               onClick={async () => {
-                await signOutWithAudit({
-                  reason: "user_initiated",
-                  redirectUrl: "/auth/login",
-                  organizationId: organization.id,
-                  redirect: true,
-                  callbackUrl: "/auth/login",
-                  clearEnvironmentId: true,
-                });
+                await signOut({ callbackUrl: "/auth/login" });
               }}
               icon={<LogOutIcon className="mr-2 h-4 w-4" strokeWidth={1.5} />}>
               {t("common.logout")}

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/layout.test.tsx

@@ -1,187 +0,0 @@
-import { getEnvironments } from "@/lib/environment/service";
-import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
-import { getUserProjects } from "@/lib/project/service";
-import "@testing-library/jest-dom/vitest";
-import { cleanup } from "@testing-library/preact";
-import { getServerSession } from "next-auth";
-import { notFound, redirect } from "next/navigation";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import LandingLayout from "./layout";
-
-vi.mock("@/lib/constants", () => ({
-  IS_FORMBRICKS_CLOUD: false,
-  IS_PRODUCTION: false,
-  IS_DEVELOPMENT: true,
-  E2E_TESTING: false,
-  WEBAPP_URL: "http://localhost:3000",
-  PUBLIC_URL: "http://localhost:3000/survey",
-  ENCRYPTION_KEY: "mock-encryption-key",
-  CRON_SECRET: "mock-cron-secret",
-  DEFAULT_BRAND_COLOR: "#64748b",
-  FB_LOGO_URL: "https://mock-logo-url.com/logo.png",
-  PRIVACY_URL: "http://localhost:3000/privacy",
-  TERMS_URL: "http://localhost:3000/terms",
-  IMPRINT_URL: "http://localhost:3000/imprint",
-  IMPRINT_ADDRESS: "Mock Address",
-  PASSWORD_RESET_DISABLED: false,
-  EMAIL_VERIFICATION_DISABLED: false,
-  GOOGLE_OAUTH_ENABLED: false,
-  GITHUB_OAUTH_ENABLED: false,
-  AZURE_OAUTH_ENABLED: false,
-  OIDC_OAUTH_ENABLED: false,
-  SAML_OAUTH_ENABLED: false,
-  SAML_XML_DIR: "./mock-saml-connection",
-  SIGNUP_ENABLED: true,
-  EMAIL_AUTH_ENABLED: true,
-  INVITE_DISABLED: false,
-  SLACK_CLIENT_SECRET: "mock-slack-secret",
-  SLACK_CLIENT_ID: "mock-slack-id",
-  SLACK_AUTH_URL: "https://mock-slack-auth-url.com",
-  GOOGLE_SHEETS_CLIENT_ID: "mock-google-sheets-id",
-  GOOGLE_SHEETS_CLIENT_SECRET: "mock-google-sheets-secret",
-  GOOGLE_SHEETS_REDIRECT_URL: "http://localhost:3000/google-sheets-redirect",
-  NOTION_OAUTH_CLIENT_ID: "mock-notion-id",
-  NOTION_OAUTH_CLIENT_SECRET: "mock-notion-secret",
-  NOTION_REDIRECT_URI: "http://localhost:3000/notion-redirect",
-  NOTION_AUTH_URL: "https://mock-notion-auth-url.com",
-  AIRTABLE_CLIENT_ID: "mock-airtable-id",
-  SMTP_HOST: "mock-smtp-host",
-  SMTP_PORT: "587",
-  SMTP_SECURE_ENABLED: false,
-  SMTP_USER: "mock-smtp-user",
-  SMTP_PASSWORD: "mock-smtp-password",
-  SMTP_AUTHENTICATED: true,
-  SMTP_REJECT_UNAUTHORIZED_TLS: true,
-  MAIL_FROM: "mock@mail.com",
-  MAIL_FROM_NAME: "Mock Mail",
-  NEXTAUTH_SECRET: "mock-nextauth-secret",
-  ITEMS_PER_PAGE: 30,
-  SURVEYS_PER_PAGE: 12,
-  RESPONSES_PER_PAGE: 25,
-  TEXT_RESPONSES_PER_PAGE: 5,
-  INSIGHTS_PER_PAGE: 10,
-  DOCUMENTS_PER_PAGE: 10,
-  MAX_RESPONSES_FOR_INSIGHT_GENERATION: 500,
-  MAX_OTHER_OPTION_LENGTH: 250,
-  ENTERPRISE_LICENSE_KEY: "ABC",
-  GITHUB_ID: "mock-github-id",
-  GITHUB_SECRET: "mock-github-secret",
-  GITHUB_OAUTH_URL: "https://mock-github-auth-url.com",
-  AZURE_ID: "mock-azure-id",
-  AZUREAD_CLIENT_ID: "mock-azure-client-id",
-  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
-  GOOGLE_CLIENT_ID: "mock-google-client-id",
-  GOOGLE_CLIENT_SECRET: "mock-google-client-secret",
-  GOOGLE_OAUTH_URL: "https://mock-google-auth-url.com",
-  AZURE_OAUTH_URL: "https://mock-azure-auth-url.com",
-  OIDC_ID: "mock-oidc-id",
-  OIDC_OAUTH_URL: "https://mock-oidc-auth-url.com",
-  SAML_ID: "mock-saml-id",
-  SAML_OAUTH_URL: "https://mock-saml-auth-url.com",
-  SAML_METADATA_URL: "https://mock-saml-metadata-url.com",
-  AZUREAD_TENANT_ID: "mock-azure-tenant-id",
-  AZUREAD_OAUTH_URL: "https://mock-azuread-auth-url.com",
-  OIDC_DISPLAY_NAME: "Mock OIDC",
-  OIDC_CLIENT_ID: "mock-oidc-client-id",
-  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
-  OIDC_REDIRECT_URL: "http://localhost:3000/oidc-redirect",
-  OIDC_AUTH_URL: "https://mock-oidc-auth-url.com",
-  OIDC_ISSUER: "https://mock-oidc-issuer.com",
-  OIDC_SIGNING_ALGORITHM: "RS256",
-  SESSION_MAX_AGE: 1000,
-  REDIS_URL: undefined,
-  AUDIT_LOG_ENABLED: true,
-}));
-
-vi.mock("@/lib/environment/service");
-vi.mock("@/lib/membership/service");
-vi.mock("@/lib/project/service");
-vi.mock("next-auth");
-vi.mock("next/navigation");
-
-afterEach(() => {
-  cleanup();
-});
-
-describe("LandingLayout", () => {
-  test("redirects to login if no session exists", async () => {
-    vi.mocked(getServerSession).mockResolvedValue(null);
-
-    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
-
-    await LandingLayout(props);
-
-    expect(vi.mocked(redirect)).toHaveBeenCalledWith("/auth/login");
-  });
-
-  test("returns notFound if no membership is found", async () => {
-    vi.mocked(getServerSession).mockResolvedValue({ user: { id: "user-123" } });
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(null);
-
-    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
-
-    await LandingLayout(props);
-
-    expect(vi.mocked(notFound)).toHaveBeenCalled();
-  });
-
-  test("redirects to production environment if available", async () => {
-    vi.mocked(getServerSession).mockResolvedValue({ user: { id: "user-123" } });
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue({
-      organizationId: "org-123",
-      userId: "user-123",
-      accepted: true,
-      role: "owner",
-    });
-    vi.mocked(getUserProjects).mockResolvedValue([
-      {
-        id: "proj-123",
-        organizationId: "org-123",
-        createdAt: new Date("2023-01-01"),
-        updatedAt: new Date("2023-01-02"),
-        name: "Project 1",
-        styling: { allowStyleOverwrite: true },
-        recontactDays: 30,
-        inAppSurveyBranding: true,
-        linkSurveyBranding: true,
-      } as any,
-    ]);
-    vi.mocked(getEnvironments).mockResolvedValue([
-      {
-        id: "env-123",
-        type: "production",
-        projectId: "proj-123",
-        createdAt: new Date("2023-01-01"),
-        updatedAt: new Date("2023-01-02"),
-        appSetupCompleted: true,
-      },
-    ]);
-
-    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
-
-    await LandingLayout(props);
-
-    expect(vi.mocked(redirect)).toHaveBeenCalledWith("/environments/env-123/");
-  });
-
-  test("renders children if no projects or production environment exist", async () => {
-    vi.mocked(getServerSession).mockResolvedValue({ user: { id: "user-123" } });
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue({
-      organizationId: "org-123",
-      userId: "user-123",
-      accepted: true,
-      role: "owner",
-    });
-    vi.mocked(getUserProjects).mockResolvedValue([]);
-
-    const props = { params: { organizationId: "org-123" }, children: <div>Child Content</div> };
-
-    const result = await LandingLayout(props);
-
-    expect(result).toEqual(
-      <>
-        <div>Child Content</div>
-      </>
-    );
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/page.test.tsx

@@ -1,199 +0,0 @@
-import { getOrganizationsByUserId } from "@/lib/organization/service";
-import { getUser } from "@/lib/user/service";
-import { getOrganizationAuth } from "@/modules/organization/lib/utils";
-import { getTranslate } from "@/tolgee/server";
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import { notFound, redirect } from "next/navigation";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-
-vi.mock("@/modules/ee/license-check/lib/license", () => ({
-  getEnterpriseLicense: vi.fn().mockResolvedValue({
-    active: true,
-    features: { isMultiOrgEnabled: true },
-    lastChecked: new Date(),
-    isPendingDowngrade: false,
-    fallbackLevel: "live",
-  }),
-}));
-
-vi.mock("@/lib/constants", () => ({
-  IS_FORMBRICKS_CLOUD: false,
-  IS_PRODUCTION: false,
-  IS_DEVELOPMENT: true,
-  E2E_TESTING: false,
-  WEBAPP_URL: "http://localhost:3000",
-  ENCRYPTION_KEY: "mock-encryption-key",
-  CRON_SECRET: "mock-cron-secret",
-  DEFAULT_BRAND_COLOR: "#64748b",
-  FB_LOGO_URL: "https://mock-logo-url.com/logo.png",
-  PRIVACY_URL: "http://localhost:3000/privacy",
-  TERMS_URL: "http://localhost:3000/terms",
-  IMPRINT_URL: "http://localhost:3000/imprint",
-  IMPRINT_ADDRESS: "Mock Address",
-  PASSWORD_RESET_DISABLED: false,
-  EMAIL_VERIFICATION_DISABLED: false,
-  GOOGLE_OAUTH_ENABLED: false,
-  GITHUB_OAUTH_ENABLED: false,
-  AZURE_OAUTH_ENABLED: false,
-  OIDC_OAUTH_ENABLED: false,
-  SAML_OAUTH_ENABLED: false,
-  SAML_XML_DIR: "./mock-saml-connection",
-  SIGNUP_ENABLED: true,
-  EMAIL_AUTH_ENABLED: true,
-  INVITE_DISABLED: false,
-  SLACK_CLIENT_SECRET: "mock-slack-secret",
-  SLACK_CLIENT_ID: "mock-slack-id",
-  SLACK_AUTH_URL: "https://mock-slack-auth-url.com",
-  GOOGLE_SHEETS_CLIENT_ID: "mock-google-sheets-id",
-  GOOGLE_SHEETS_CLIENT_SECRET: "mock-google-sheets-secret",
-  GOOGLE_SHEETS_REDIRECT_URL: "http://localhost:3000/google-sheets-redirect",
-  NOTION_OAUTH_CLIENT_ID: "mock-notion-id",
-  NOTION_OAUTH_CLIENT_SECRET: "mock-notion-secret",
-  NOTION_REDIRECT_URI: "http://localhost:3000/notion-redirect",
-  NOTION_AUTH_URL: "https://mock-notion-auth-url.com",
-  AIRTABLE_CLIENT_ID: "mock-airtable-id",
-  SMTP_HOST: "mock-smtp-host",
-  SMTP_PORT: "587",
-  SMTP_SECURE_ENABLED: false,
-  SMTP_USER: "mock-smtp-user",
-  SMTP_PASSWORD: "mock-smtp-password",
-  SMTP_AUTHENTICATED: true,
-  SMTP_REJECT_UNAUTHORIZED_TLS: true,
-  MAIL_FROM: "mock@mail.com",
-  MAIL_FROM_NAME: "Mock Mail",
-  NEXTAUTH_SECRET: "mock-nextauth-secret",
-  ITEMS_PER_PAGE: 30,
-  SURVEYS_PER_PAGE: 12,
-  RESPONSES_PER_PAGE: 25,
-  TEXT_RESPONSES_PER_PAGE: 5,
-  INSIGHTS_PER_PAGE: 10,
-  DOCUMENTS_PER_PAGE: 10,
-  MAX_RESPONSES_FOR_INSIGHT_GENERATION: 500,
-  MAX_OTHER_OPTION_LENGTH: 250,
-  ENTERPRISE_LICENSE_KEY: "ABC",
-  GITHUB_ID: "mock-github-id",
-  GITHUB_SECRET: "mock-github-secret",
-  GITHUB_OAUTH_URL: "https://mock-github-auth-url.com",
-  AZURE_ID: "mock-azure-id",
-  AZUREAD_CLIENT_ID: "mock-azure-client-id",
-  AZUREAD_CLIENT_SECRET: "mock-azure-client-secret",
-  GOOGLE_CLIENT_ID: "mock-google-client-id",
-  GOOGLE_CLIENT_SECRET: "mock-google-client-secret",
-  GOOGLE_OAUTH_URL: "https://mock-google-auth-url.com",
-  AZURE_OAUTH_URL: "https://mock-azure-auth-url.com",
-  OIDC_ID: "mock-oidc-id",
-  OIDC_OAUTH_URL: "https://mock-oidc-auth-url.com",
-  SAML_ID: "mock-saml-id",
-  SAML_OAUTH_URL: "https://mock-saml-auth-url.com",
-  SAML_METADATA_URL: "https://mock-saml-metadata-url.com",
-  AZUREAD_TENANT_ID: "mock-azure-tenant-id",
-  AZUREAD_OAUTH_URL: "https://mock-azuread-auth-url.com",
-  OIDC_DISPLAY_NAME: "Mock OIDC",
-  OIDC_CLIENT_ID: "mock-oidc-client-id",
-  OIDC_CLIENT_SECRET: "mock-oidc-client-secret",
-  OIDC_REDIRECT_URL: "http://localhost:3000/oidc-redirect",
-  OIDC_AUTH_URL: "https://mock-oidc-auth-url.com",
-  OIDC_ISSUER: "https://mock-oidc-issuer.com",
-  OIDC_SIGNING_ALGORITHM: "RS256",
-  SESSION_MAX_AGE: 1000,
-  REDIS_URL: undefined,
-  AUDIT_LOG_ENABLED: true,
-}));
-
-vi.mock("@/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar", () => ({
-  LandingSidebar: () => <div data-testid="landing-sidebar" />,
-}));
-vi.mock("@/modules/organization/lib/utils");
-vi.mock("@/lib/user/service");
-vi.mock("@/lib/organization/service");
-vi.mock("@/tolgee/server");
-vi.mock("next/navigation", () => ({
-  redirect: vi.fn(() => "REDIRECT_STUB"),
-  notFound: vi.fn(() => "NOT_FOUND_STUB"),
-}));
-
-// Mock the React cache function
-vi.mock("react", async () => {
-  const actual = await vi.importActual("react");
-  return {
-    ...actual,
-    cache: (fn: any) => fn,
-  };
-});
-
-describe("Page component", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  beforeEach(() => {
-    vi.resetModules();
-  });
-
-  test("redirects to login if no user session", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: {}, organization: {} } as any);
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: true,
-        features: { isMultiOrgEnabled: true },
-        lastChecked: new Date(),
-        isPendingDowngrade: false,
-        fallbackLevel: "live",
-      }),
-    }));
-    const { default: Page } = await import("./page");
-    const result = await Page({ params: { organizationId: "org1" } });
-    expect(redirect).toHaveBeenCalledWith("/auth/login");
-    expect(result).toBe("REDIRECT_STUB");
-  });
-
-  test("returns notFound if user does not exist", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValue({
-      session: { user: { id: "user1" } },
-      organization: {},
-    } as any);
-    vi.mocked(getUser).mockResolvedValue(null);
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: true,
-        features: { isMultiOrgEnabled: true },
-        lastChecked: new Date(),
-        isPendingDowngrade: false,
-        fallbackLevel: "live",
-      }),
-    }));
-    const { default: Page } = await import("./page");
-    const result = await Page({ params: { organizationId: "org1" } });
-    expect(notFound).toHaveBeenCalled();
-    expect(result).toBe("NOT_FOUND_STUB");
-  });
-
-  test("renders header and sidebar for authenticated user", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValue({
-      session: { user: { id: "user1" } },
-      organization: { id: "org1" },
-    } as any);
-    vi.mocked(getUser).mockResolvedValue({ id: "user1", name: "Test User" } as any);
-    vi.mocked(getOrganizationsByUserId).mockResolvedValue([{ id: "org1", name: "Org One" } as any]);
-    vi.mocked(getTranslate).mockResolvedValue((props: any) =>
-      typeof props === "string" ? props : props.key || ""
-    );
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: true,
-        features: { isMultiOrgEnabled: true },
-        lastChecked: new Date(),
-        isPendingDowngrade: false,
-        fallbackLevel: "live",
-      }),
-    }));
-    const { default: Page } = await import("./page");
-    const element = await Page({ params: { organizationId: "org1" } });
-    render(element as React.ReactElement);
-    expect(screen.getByTestId("landing-sidebar")).toBeInTheDocument();
-    expect(screen.getByText("organizations.landing.no_projects_warning_title")).toBeInTheDocument();
-    expect(screen.getByText("organizations.landing.no_projects_warning_subtitle")).toBeInTheDocument();
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/landing/page.tsx

@@ -1,7 +1,7 @@
 import { LandingSidebar } from "@/app/(app)/(onboarding)/organizations/[organizationId]/landing/components/landing-sidebar";
 import { getOrganizationsByUserId } from "@/lib/organization/service";
 import { getUser } from "@/lib/user/service";
-import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/license";
+import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/utils";
 import { getOrganizationAuth } from "@/modules/organization/lib/utils";
 import { Header } from "@/modules/ui/components/header";
 import { getTranslate } from "@/tolgee/server";

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/layout.test.tsx

@@ -34,9 +34,6 @@ vi.mock("@/lib/constants", () => ({
   OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
   WEBAPP_URL: "test-webapp-url",
   IS_PRODUCTION: false,
-  SESSION_MAX_AGE: 1000,
-  REDIS_URL: undefined,
-  AUDIT_LOG_ENABLED: true,
 }));
 
 vi.mock("next-auth", () => ({

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/channel/page.test.tsx

@@ -1,88 +0,0 @@
-import { getUserProjects } from "@/lib/project/service";
-import { getOrganizationAuth } from "@/modules/organization/lib/utils";
-import { getTranslate } from "@/tolgee/server";
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import { redirect } from "next/navigation";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import Page from "./page";
-
-const mockTranslate = vi.fn((key) => key);
-
-// Module mocks must be declared before importing the component
-vi.mock("@/lib/project/service", () => ({ getUserProjects: vi.fn() }));
-vi.mock("@/modules/organization/lib/utils", () => ({ getOrganizationAuth: vi.fn() }));
-vi.mock("@/tolgee/server", () => ({ getTranslate: vi.fn() }));
-vi.mock("next/navigation", () => ({ redirect: vi.fn(() => "REDIRECT_STUB") }));
-vi.mock("@/modules/ui/components/header", () => ({
-  Header: ({ title, subtitle }: { title: string; subtitle: string }) => (
-    <div>
-      <h1>{title}</h1>
-      <p>{subtitle}</p>
-    </div>
-  ),
-}));
-vi.mock("@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer", () => ({
-  OnboardingOptionsContainer: ({ options }: { options: any[] }) => (
-    <div data-testid="options">{options.map((o) => o.title).join(",")}</div>
-  ),
-}));
-vi.mock("next/link", () => ({
-  default: ({ href, children }: { href: string; children: React.ReactNode }) => <a href={href}>{children}</a>,
-}));
-
-describe("Page component", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  const params = Promise.resolve({ organizationId: "org1" });
-
-  test("redirects to login if no user session", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: {} } as any);
-
-    const result = await Page({ params });
-
-    expect(redirect).toHaveBeenCalledWith("/auth/login");
-    expect(result).toBe("REDIRECT_STUB");
-  });
-
-  test("renders header, options, and close button when projects exist", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: { user: { id: "user1" } } } as any);
-    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
-    vi.mocked(getUserProjects).mockResolvedValue([{ id: 1 }] as any);
-
-    const element = await Page({ params });
-    render(element as React.ReactElement);
-
-    // Header title and subtitle
-    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent(
-      "organizations.projects.new.channel.channel_select_title"
-    );
-    expect(
-      screen.getByText("organizations.projects.new.channel.channel_select_subtitle")
-    ).toBeInTheDocument();
-
-    // Options container with correct titles
-    expect(screen.getByTestId("options")).toHaveTextContent(
-      "organizations.projects.new.channel.link_and_email_surveys," +
-        "organizations.projects.new.channel.in_product_surveys"
-    );
-
-    // Close button link rendered when projects >=1
-    const closeLink = screen.getByRole("link");
-    expect(closeLink).toHaveAttribute("href", "/");
-  });
-
-  test("does not render close button when no projects", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValue({ session: { user: { id: "user1" } } } as any);
-    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
-    vi.mocked(getUserProjects).mockResolvedValue([]);
-
-    const element = await Page({ params });
-    render(element as React.ReactElement);
-
-    expect(screen.queryByRole("link")).toBeNull();
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/channel/page.tsx

@@ -50,7 +50,7 @@ const Page = async (props: ChannelPageProps) => {
       <OnboardingOptionsContainer options={channelOptions} />
       {projects.length >= 1 && (
         <Button
-          className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
+          className="absolute top-5 right-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"
           asChild>
           <Link href={"/"}>

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/layout.test.tsx

@@ -1,223 +0,0 @@
-import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
-import { getOrganization } from "@/lib/organization/service";
-import { getOrganizationProjectsCount } from "@/lib/project/service";
-import { getOrganizationProjectsLimit } from "@/modules/ee/license-check/lib/utils";
-import "@testing-library/jest-dom/vitest";
-import { cleanup } from "@testing-library/react";
-import { getServerSession } from "next-auth";
-import { notFound, redirect } from "next/navigation";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { TMembership } from "@formbricks/types/memberships";
-import { TOrganization } from "@formbricks/types/organizations";
-import OnboardingLayout from "./layout";
-
-// Mock environment variables
-vi.mock("@/lib/constants", () => ({
-  IS_FORMBRICKS_CLOUD: false,
-  POSTHOG_API_KEY: "mock-posthog-api-key",
-  POSTHOG_HOST: "mock-posthog-host",
-  IS_POSTHOG_CONFIGURED: true,
-  ENCRYPTION_KEY: "mock-encryption-key",
-  ENTERPRISE_LICENSE_KEY: "mock-enterprise-license-key",
-  GITHUB_ID: "mock-github-id",
-  GITHUB_SECRET: "test-githubID",
-  GOOGLE_CLIENT_ID: "test-google-client-id",
-  GOOGLE_CLIENT_SECRET: "test-google-client-secret",
-  AZUREAD_CLIENT_ID: "test-azuread-client-id",
-  AZUREAD_CLIENT_SECRET: "test-azure",
-  AZUREAD_TENANT_ID: "test-azuread-tenant-id",
-  OIDC_DISPLAY_NAME: "test-oidc-display-name",
-  OIDC_CLIENT_ID: "test-oidc-client-id",
-  OIDC_ISSUER: "test-oidc-issuer",
-  OIDC_CLIENT_SECRET: "test-oidc-client-secret",
-  OIDC_SIGNING_ALGORITHM: "test-oidc-signing-algorithm",
-  WEBAPP_URL: "test-webapp-url",
-  IS_PRODUCTION: false,
-  SESSION_MAX_AGE: 1000,
-  REDIS_URL: undefined,
-  AUDIT_LOG_ENABLED: true,
-}));
-
-// Mock dependencies
-vi.mock("next-auth", () => ({
-  getServerSession: vi.fn(),
-}));
-
-vi.mock("@/lib/membership/service", () => ({
-  getMembershipByUserIdOrganizationId: vi.fn(),
-}));
-
-vi.mock("@/lib/organization/service", () => ({
-  getOrganization: vi.fn(),
-}));
-
-vi.mock("@/lib/project/service", () => ({
-  getOrganizationProjectsCount: vi.fn(),
-}));
-
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({
-  getOrganizationProjectsLimit: vi.fn(),
-}));
-
-vi.mock("@/tolgee/server", () => ({
-  getTranslate: async () => (key: string) => key,
-}));
-
-describe("OnboardingLayout", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  test("redirects to login if no session", async () => {
-    vi.mocked(getServerSession).mockResolvedValue(null);
-
-    const props = {
-      params: { organizationId: "test-org-id" },
-      children: <div>Test Child</div>,
-    };
-
-    await OnboardingLayout(props);
-    expect(redirect).toHaveBeenCalledWith("/auth/login");
-  });
-
-  test("returns not found if user is member or billing", async () => {
-    const mockSession = {
-      user: { id: "test-user-id" },
-    };
-    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
-
-    const mockMembership: TMembership = {
-      organizationId: "test-org-id",
-      userId: "test-user-id",
-      accepted: true,
-      role: "member",
-    };
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
-
-    const props = {
-      params: { organizationId: "test-org-id" },
-      children: <div>Test Child</div>,
-    };
-
-    await OnboardingLayout(props);
-    expect(notFound).toHaveBeenCalled();
-  });
-
-  test("throws error if organization is not found", async () => {
-    const mockSession = {
-      user: { id: "test-user-id" },
-    };
-    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
-
-    const mockMembership: TMembership = {
-      organizationId: "test-org-id",
-      userId: "test-user-id",
-      accepted: true,
-      role: "owner",
-    };
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
-    vi.mocked(getOrganization).mockResolvedValue(null);
-
-    const props = {
-      params: { organizationId: "test-org-id" },
-      children: <div>Test Child</div>,
-    };
-
-    await expect(OnboardingLayout(props)).rejects.toThrow("common.organization_not_found");
-  });
-
-  test("redirects to home if project limit is reached", async () => {
-    const mockSession = {
-      user: { id: "test-user-id" },
-    };
-    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
-
-    const mockMembership: TMembership = {
-      organizationId: "test-org-id",
-      userId: "test-user-id",
-      accepted: true,
-      role: "owner",
-    };
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
-
-    const mockOrganization: TOrganization = {
-      id: "test-org-id",
-      name: "Test Org",
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      isAIEnabled: false,
-      billing: {
-        stripeCustomerId: null,
-        plan: "free",
-        period: "monthly",
-        limits: {
-          projects: 3,
-          monthly: {
-            responses: 1500,
-            miu: 2000,
-          },
-        },
-        periodStart: new Date(),
-      },
-    };
-    vi.mocked(getOrganization).mockResolvedValue(mockOrganization);
-    vi.mocked(getOrganizationProjectsLimit).mockResolvedValue(3);
-    vi.mocked(getOrganizationProjectsCount).mockResolvedValue(3);
-
-    const props = {
-      params: { organizationId: "test-org-id" },
-      children: <div>Test Child</div>,
-    };
-
-    await OnboardingLayout(props);
-    expect(redirect).toHaveBeenCalledWith("/");
-  });
-
-  test("renders children when all conditions are met", async () => {
-    const mockSession = {
-      user: { id: "test-user-id" },
-    };
-    vi.mocked(getServerSession).mockResolvedValue(mockSession as any);
-
-    const mockMembership: TMembership = {
-      organizationId: "test-org-id",
-      userId: "test-user-id",
-      accepted: true,
-      role: "owner",
-    };
-    vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
-
-    const mockOrganization: TOrganization = {
-      id: "test-org-id",
-      name: "Test Org",
-      createdAt: new Date(),
-      updatedAt: new Date(),
-      isAIEnabled: false,
-      billing: {
-        stripeCustomerId: null,
-        plan: "free",
-        period: "monthly",
-        limits: {
-          projects: 3,
-          monthly: {
-            responses: 1500,
-            miu: 2000,
-          },
-        },
-        periodStart: new Date(),
-      },
-    };
-    vi.mocked(getOrganization).mockResolvedValue(mockOrganization);
-    vi.mocked(getOrganizationProjectsLimit).mockResolvedValue(3);
-    vi.mocked(getOrganizationProjectsCount).mockResolvedValue(2);
-
-    const props = {
-      params: { organizationId: "test-org-id" },
-      children: <div>Test Child</div>,
-    };
-
-    const result = await OnboardingLayout(props);
-    expect(result).toEqual(<>{props.children}</>);
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/mode/page.test.tsx

@@ -1,72 +0,0 @@
-import { getUserProjects } from "@/lib/project/service";
-import { getOrganizationAuth } from "@/modules/organization/lib/utils";
-import { getTranslate } from "@/tolgee/server";
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import { redirect } from "next/navigation";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import Page from "./page";
-
-const mockTranslate = vi.fn((key) => key);
-
-vi.mock("@/modules/organization/lib/utils", () => ({ getOrganizationAuth: vi.fn() }));
-vi.mock("@/lib/project/service", () => ({ getUserProjects: vi.fn() }));
-vi.mock("@/tolgee/server", () => ({ getTranslate: vi.fn() }));
-vi.mock("next/navigation", () => ({ redirect: vi.fn() }));
-vi.mock("next/link", () => ({
-  __esModule: true,
-  default: ({ href, children }: any) => <a href={href}>{children}</a>,
-}));
-vi.mock("@/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer", () => ({
-  OnboardingOptionsContainer: ({ options }: any) => (
-    <div data-testid="options">{options.map((o: any) => o.title).join(",")}</div>
-  ),
-}));
-vi.mock("@/modules/ui/components/header", () => ({ Header: ({ title }: any) => <h1>{title}</h1> }));
-vi.mock("@/modules/ui/components/button", () => ({
-  Button: ({ children, ...props }: any) => <button {...props}>{children}</button>,
-}));
-
-describe("Mode Page", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  const params = Promise.resolve({ organizationId: "org1" });
-
-  test("redirects to login if no session user", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: {} } as any);
-    await Page({ params });
-    expect(redirect).toHaveBeenCalledWith("/auth/login");
-  });
-
-  test("renders header and options without close link when no projects", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: { user: { id: "u1" } } } as any);
-    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
-    vi.mocked(getUserProjects).mockResolvedValueOnce([] as any);
-
-    const element = await Page({ params });
-    render(element as React.ReactElement);
-
-    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent(
-      "organizations.projects.new.mode.what_are_you_here_for"
-    );
-    expect(screen.getByTestId("options")).toHaveTextContent(
-      "organizations.projects.new.mode.formbricks_surveys," + "organizations.projects.new.mode.formbricks_cx"
-    );
-    expect(screen.queryByRole("link")).toBeNull();
-  });
-
-  test("renders close link when projects exist", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: { user: { id: "u1" } } } as any);
-    vi.mocked(getTranslate).mockResolvedValue(mockTranslate);
-    vi.mocked(getUserProjects).mockResolvedValueOnce([{ id: "p1" } as any]);
-
-    const element = await Page({ params });
-    render(element as React.ReactElement);
-
-    const link = screen.getByRole("link");
-    expect(link).toHaveAttribute("href", "/");
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/mode/page.tsx

@@ -47,7 +47,7 @@ const Page = async (props: ModePageProps) => {
       <OnboardingOptionsContainer options={channelOptions} />
       {projects.length >= 1 && (
         <Button
-          className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
+          className="absolute top-5 right-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"
           asChild>
           <Link href={"/"}>

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/components/ProjectSettings.test.tsx

@@ -1,124 +0,0 @@
-import { createProjectAction } from "@/app/(app)/environments/[environmentId]/actions";
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { toast } from "react-hot-toast";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { ProjectSettings } from "./ProjectSettings";
-
-// Mocks before imports
-const pushMock = vi.fn();
-vi.mock("next/navigation", () => ({ useRouter: () => ({ push: pushMock }) }));
-vi.mock("@tolgee/react", () => ({ useTranslate: () => ({ t: (key: string) => key }) }));
-vi.mock("react-hot-toast", () => ({ toast: { error: vi.fn() } }));
-vi.mock("@/app/(app)/environments/[environmentId]/actions", () => ({ createProjectAction: vi.fn() }));
-vi.mock("@/lib/utils/helper", () => ({ getFormattedErrorMessage: () => "formatted-error" }));
-vi.mock("@/modules/ui/components/color-picker", () => ({
-  ColorPicker: ({ color, onChange }: any) => (
-    <button data-testid="color-picker" onClick={() => onChange("#000")}>
-      {color}
-    </button>
-  ),
-}));
-vi.mock("@/modules/ui/components/input", () => ({
-  Input: ({ value, onChange, placeholder }: any) => (
-    <input placeholder={placeholder} value={value} onChange={(e) => onChange((e.target as any).value)} />
-  ),
-}));
-vi.mock("@/modules/ui/components/multi-select", () => ({
-  MultiSelect: ({ value, options, onChange }: any) => (
-    <select
-      data-testid="multi-select"
-      multiple
-      value={value}
-      onChange={(e) => onChange(Array.from((e.target as any).selectedOptions).map((o: any) => o.value))}>
-      {options.map((o: any) => (
-        <option key={o.value} value={o.value}>
-          {o.label}
-        </option>
-      ))}
-    </select>
-  ),
-}));
-vi.mock("@/modules/ui/components/survey", () => ({
-  SurveyInline: () => <div data-testid="survey-inline" />,
-}));
-vi.mock("@/lib/templates", () => ({ previewSurvey: () => ({}) }));
-vi.mock("@/modules/ee/teams/team-list/components/create-team-modal", () => ({
-  CreateTeamModal: ({ open }: any) => <div data-testid={open ? "team-modal-open" : "team-modal-closed"} />,
-}));
-
-// Clean up after each test
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-  localStorage.clear();
-});
-
-describe("ProjectSettings component", () => {
-  const baseProps = {
-    organizationId: "org1",
-    projectMode: "cx",
-    industry: "ind",
-    defaultBrandColor: "#fff",
-    organizationTeams: [],
-    canDoRoleManagement: false,
-    userProjectsCount: 0,
-  } as any;
-
-  const fillAndSubmit = async () => {
-    const nameInput = screen.getByPlaceholderText("e.g. Formbricks");
-    await userEvent.clear(nameInput);
-    await userEvent.type(nameInput, "TestProject");
-    const nextButton = screen.getByRole("button", { name: "common.next" });
-    await userEvent.click(nextButton);
-  };
-
-  test("successful createProject for link channel navigates to surveys and clears localStorage", async () => {
-    (createProjectAction as any).mockResolvedValue({
-      data: { environments: [{ id: "env123", type: "production" }] },
-    });
-    render(<ProjectSettings {...baseProps} channel="link" projectMode="cx" />);
-    await fillAndSubmit();
-    expect(createProjectAction).toHaveBeenCalledWith({
-      organizationId: "org1",
-      data: expect.objectContaining({ teamIds: [] }),
-    });
-    expect(pushMock).toHaveBeenCalledWith("/environments/env123/surveys");
-    expect(localStorage.getItem("FORMBRICKS_SURVEYS_FILTERS_KEY_LS")).toBeNull();
-  });
-
-  test("successful createProject for app channel navigates to connect", async () => {
-    (createProjectAction as any).mockResolvedValue({
-      data: { environments: [{ id: "env456", type: "production" }] },
-    });
-    render(<ProjectSettings {...baseProps} channel="app" projectMode="cx" />);
-    await fillAndSubmit();
-    expect(pushMock).toHaveBeenCalledWith("/environments/env456/connect");
-  });
-
-  test("successful createProject for cx mode navigates to xm-templates when channel is neither link nor app", async () => {
-    (createProjectAction as any).mockResolvedValue({
-      data: { environments: [{ id: "env789", type: "production" }] },
-    });
-    render(<ProjectSettings {...baseProps} channel="unknown" projectMode="cx" />);
-    await fillAndSubmit();
-    expect(pushMock).toHaveBeenCalledWith("/environments/env789/xm-templates");
-  });
-
-  test("shows error toast on createProject error response", async () => {
-    (createProjectAction as any).mockResolvedValue({ error: "err" });
-    render(<ProjectSettings {...baseProps} channel="link" projectMode="cx" />);
-    await fillAndSubmit();
-    expect(toast.error).toHaveBeenCalledWith("formatted-error");
-  });
-
-  test("shows error toast on exception", async () => {
-    (createProjectAction as any).mockImplementation(() => {
-      throw new Error("fail");
-    });
-    render(<ProjectSettings {...baseProps} channel="link" projectMode="cx" />);
-    await fillAndSubmit();
-    expect(toast.error).toHaveBeenCalledWith("organizations.projects.new.settings.project_creation_failed");
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/components/ProjectSettings.tsx

@@ -225,7 +225,7 @@ export const ProjectSettings = ({
             alt="Logo"
             width={256}
             height={56}
-            className="absolute left-2 top-2 -mb-6 h-20 w-auto max-w-64 rounded-lg border object-contain p-1"
+            className="absolute top-2 left-2 -mb-6 h-20 w-auto max-w-64 rounded-lg border object-contain p-1"
           />
         )}
         <p className="text-sm text-slate-400">{t("common.preview")}</p>

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/page.test.tsx

@@ -1,106 +0,0 @@
-import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
-import { getUserProjects } from "@/lib/project/service";
-import { getRoleManagementPermission } from "@/modules/ee/license-check/lib/utils";
-import { getOrganizationAuth } from "@/modules/organization/lib/utils";
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import { redirect } from "next/navigation";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import Page from "./page";
-
-vi.mock("@/lib/constants", () => ({ DEFAULT_BRAND_COLOR: "#fff" }));
-// Mocks before component import
-vi.mock("@/app/(app)/(onboarding)/lib/onboarding", () => ({ getTeamsByOrganizationId: vi.fn() }));
-vi.mock("@/lib/project/service", () => ({ getUserProjects: vi.fn() }));
-vi.mock("@/modules/ee/license-check/lib/utils", () => ({ getRoleManagementPermission: vi.fn() }));
-vi.mock("@/modules/organization/lib/utils", () => ({ getOrganizationAuth: vi.fn() }));
-vi.mock("@/tolgee/server", () => ({ getTranslate: () => Promise.resolve((key: string) => key) }));
-vi.mock("next/navigation", () => ({ redirect: vi.fn() }));
-vi.mock("next/link", () => ({
-  __esModule: true,
-  default: ({ href, children }: any) => <a href={href}>{children}</a>,
-}));
-vi.mock("@/modules/ui/components/header", () => ({
-  Header: ({ title, subtitle }: any) => (
-    <div>
-      <h1>{title}</h1>
-      <p>{subtitle}</p>
-    </div>
-  ),
-}));
-vi.mock("@/modules/ui/components/button", () => ({
-  Button: ({ children, ...props }: any) => <button {...props}>{children}</button>,
-}));
-vi.mock(
-  "@/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/components/ProjectSettings",
-  () => ({
-    ProjectSettings: (props: any) => <div data-testid="project-settings" data-mode={props.projectMode} />,
-  })
-);
-
-// Cleanup after each test
-afterEach(() => {
-  cleanup();
-  vi.clearAllMocks();
-});
-
-describe("ProjectSettingsPage", () => {
-  const params = Promise.resolve({ organizationId: "org1" });
-  const searchParams = Promise.resolve({ channel: "link", industry: "other", mode: "cx" } as any);
-
-  test("redirects to login when no session user", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({ session: {} } as any);
-    await Page({ params, searchParams });
-    expect(redirect).toHaveBeenCalledWith("/auth/login");
-  });
-
-  test("throws when teams not found", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({
-      session: { user: { id: "u1" } },
-      organization: { billing: { plan: "basic" } },
-    } as any);
-    vi.mocked(getUserProjects).mockResolvedValueOnce([] as any);
-    vi.mocked(getTeamsByOrganizationId).mockResolvedValueOnce(null as any);
-    vi.mocked(getRoleManagementPermission).mockResolvedValueOnce(false as any);
-
-    await expect(Page({ params, searchParams })).rejects.toThrow("common.organization_teams_not_found");
-  });
-
-  test("renders header, settings and close link when projects exist", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({
-      session: { user: { id: "u1" } },
-      organization: { billing: { plan: "basic" } },
-    } as any);
-    vi.mocked(getUserProjects).mockResolvedValueOnce([{ id: "p1" }] as any);
-    vi.mocked(getTeamsByOrganizationId).mockResolvedValueOnce([{ id: "t1", name: "Team1" }] as any);
-    vi.mocked(getRoleManagementPermission).mockResolvedValueOnce(true as any);
-
-    const element = await Page({ params, searchParams });
-    render(element as React.ReactElement);
-
-    // Header
-    expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent(
-      "organizations.projects.new.settings.project_settings_title"
-    );
-    // ProjectSettings stub receives mode prop
-    expect(screen.getByTestId("project-settings")).toHaveAttribute("data-mode", "cx");
-    // Close link for existing projects
-    const link = screen.getByRole("link");
-    expect(link).toHaveAttribute("href", "/");
-  });
-
-  test("renders without close link when no projects", async () => {
-    vi.mocked(getOrganizationAuth).mockResolvedValueOnce({
-      session: { user: { id: "u1" } },
-      organization: { billing: { plan: "basic" } },
-    } as any);
-    vi.mocked(getUserProjects).mockResolvedValueOnce([] as any);
-    vi.mocked(getTeamsByOrganizationId).mockResolvedValueOnce([{ id: "t1", name: "Team1" }] as any);
-    vi.mocked(getRoleManagementPermission).mockResolvedValueOnce(true as any);
-
-    const element = await Page({ params, searchParams });
-    render(element as React.ReactElement);
-
-    expect(screen.queryByRole("link")).toBeNull();
-  });
-});

apps/web/app/(app)/(onboarding)/organizations/[organizationId]/projects/new/settings/page.tsx

@@ -65,7 +65,7 @@ const Page = async (props: ProjectSettingsPageProps) => {
       />
       {projects.length >= 1 && (
         <Button
-          className="absolute right-5 top-5 !mt-0 text-slate-500 hover:text-slate-700"
+          className="absolute top-5 right-5 !mt-0 text-slate-500 hover:text-slate-700"
           variant="ghost"
           asChild>
           <Link href={"/"}>

apps/web/app/(app)/(onboarding)/organizations/components/OnboardingOptionsContainer.test.tsx

@@ -1,106 +0,0 @@
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { Home, Settings } from "lucide-react";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { OnboardingOptionsContainer } from "./OnboardingOptionsContainer";
-
-describe("OnboardingOptionsContainer", () => {
-  afterEach(() => {
-    cleanup();
-  });
-
-  test("renders options with links", () => {
-    const options = [
-      {
-        title: "Test Option",
-        description: "Test Description",
-        icon: Home,
-        href: "/test",
-      },
-    ];
-
-    render(<OnboardingOptionsContainer options={options} />);
-    expect(screen.getByText("Test Option")).toBeInTheDocument();
-    expect(screen.getByText("Test Description")).toBeInTheDocument();
-  });
-
-  test("renders options with onClick handler", () => {
-    const onClickMock = vi.fn();
-    const options = [
-      {
-        title: "Click Option",
-        description: "Click Description",
-        icon: Home,
-        onClick: onClickMock,
-      },
-    ];
-
-    render(<OnboardingOptionsContainer options={options} />);
-    expect(screen.getByText("Click Option")).toBeInTheDocument();
-    expect(screen.getByText("Click Description")).toBeInTheDocument();
-  });
-
-  test("renders options with iconText", () => {
-    const options = [
-      {
-        title: "Icon Text Option",
-        description: "Icon Text Description",
-        icon: Home,
-        iconText: "Custom Icon Text",
-      },
-    ];
-
-    render(<OnboardingOptionsContainer options={options} />);
-    expect(screen.getByText("Custom Icon Text")).toBeInTheDocument();
-  });
-
-  test("renders options with loading state", () => {
-    const options = [
-      {
-        title: "Loading Option",
-        description: "Loading Description",
-        icon: Home,
-        isLoading: true,
-      },
-    ];
-
-    render(<OnboardingOptionsContainer options={options} />);
-    expect(screen.getByText("Loading Option")).toBeInTheDocument();
-  });
-
-  test("renders multiple options", () => {
-    const options = [
-      {
-        title: "First Option",
-        description: "First Description",
-        icon: Home,
-      },
-      {
-        title: "Second Option",
-        description: "Second Description",
-        icon: Settings,
-      },
-    ];
-
-    render(<OnboardingOptionsContainer options={options} />);
-    expect(screen.getByText("First Option")).toBeInTheDocument();
-    expect(screen.getByText("Second Option")).toBeInTheDocument();
-  });
-
-  test("calls onClick handler when clicking an option", async () => {
-    const onClickMock = vi.fn();
-    const options = [
-      {
-        title: "Click Option",
-        description: "Click Description",
-        icon: Home,
-        onClick: onClickMock,
-      },
-    ];
-
-    render(<OnboardingOptionsContainer options={options} />);
-    await userEvent.click(screen.getByText("Click Option"));
-    expect(onClickMock).toHaveBeenCalledTimes(1);
-  });
-});

apps/web/app/(app)/environments/[environmentId]/(contacts)/contacts/[contactId]/page.test.tsx

@@ -25,15 +25,6 @@ vi.mock("@/lib/constants", () => ({
   SMTP_HOST: "mock-smtp-host",
   SMTP_PORT: "mock-smtp-port",
   IS_POSTHOG_CONFIGURED: true,
-  SESSION_MAX_AGE: 1000,
-  AUDIT_LOG_ENABLED: 1,
-  REDIS_URL: undefined,
-}));
-
-vi.mock("@/lib/env", () => ({
-  env: {
-    PUBLIC_URL: "https://public-domain.com",
-  },
 }));
 
 describe("Contact Page Re-export", () => {

apps/web/app/(app)/environments/[environmentId]/actions.ts

@@ -4,9 +4,7 @@ import { getOrganization } from "@/lib/organization/service";
 import { getOrganizationProjectsCount } from "@/lib/project/service";
 import { updateUser } from "@/lib/user/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
-import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
-import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
+import { checkAuthorizationUpdated } from "@/lib/utils/action-client-middleware";
 import {
   getOrganizationProjectsLimit,
   getRoleManagementPermission,
@@ -22,65 +20,62 @@ const ZCreateProjectAction = z.object({
   data: ZProjectUpdateInput,
 });
 
-export const createProjectAction = authenticatedActionClient.schema(ZCreateProjectAction).action(
-  withAuditLogging(
-    "created",
-    "project",
-    async ({ ctx, parsedInput }: { ctx: AuthenticatedActionClientCtx; parsedInput: Record<string, any> }) => {
-      const { user } = ctx;
+export const createProjectAction = authenticatedActionClient
+  .schema(ZCreateProjectAction)
+  .action(async ({ parsedInput, ctx }) => {
+    const { user } = ctx;
 
-      const organizationId = parsedInput.organizationId;
+    const organizationId = parsedInput.organizationId;
 
-      await checkAuthorizationUpdated({
-        userId: user.id,
-        organizationId: parsedInput.organizationId,
-        access: [
-          {
-            data: parsedInput.data,
-            schema: ZProjectUpdateInput,
-            type: "organization",
-            roles: ["owner", "manager"],
-          },
-        ],
-      });
-
-      const organization = await getOrganization(organizationId);
-
-      if (!organization) {
-        throw new Error("Organization not found");
-      }
-
-      const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.billing.limits);
-      const organizationProjectsCount = await getOrganizationProjectsCount(organization.id);
-
-      if (organizationProjectsCount >= organizationProjectsLimit) {
-        throw new OperationNotAllowedError("Organization project limit reached");
-      }
-
-      if (parsedInput.data.teamIds && parsedInput.data.teamIds.length > 0) {
-        const canDoRoleManagement = await getRoleManagementPermission(organization.billing.plan);
-
-        if (!canDoRoleManagement) {
-          throw new OperationNotAllowedError("You do not have permission to manage roles");
-        }
-      }
-
-      const project = await createProject(parsedInput.organizationId, parsedInput.data);
-      const updatedNotificationSettings = {
-        ...user.notificationSettings,
-        alert: {
-          ...user.notificationSettings?.alert,
+    await checkAuthorizationUpdated({
+      userId: user.id,
+      organizationId: parsedInput.organizationId,
+      access: [
+        {
+          data: parsedInput.data,
+          schema: ZProjectUpdateInput,
+          type: "organization",
+          roles: ["owner", "manager"],
         },
-      };
+      ],
+    });
 
-      await updateUser(user.id, {
-        notificationSettings: updatedNotificationSettings,
-      });
+    const organization = await getOrganization(organizationId);
 
-      ctx.auditLoggingCtx.organizationId = organizationId;
-      ctx.auditLoggingCtx.projectId = project.id;
-      ctx.auditLoggingCtx.newObject = project;
-      return project;
+    if (!organization) {
+      throw new Error("Organization not found");
     }
-  )
-);
+
+    const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.billing.limits);
+    const organizationProjectsCount = await getOrganizationProjectsCount(organization.id);
+
+    if (organizationProjectsCount >= organizationProjectsLimit) {
+      throw new OperationNotAllowedError("Organization project limit reached");
+    }
+
+    if (parsedInput.data.teamIds && parsedInput.data.teamIds.length > 0) {
+      const canDoRoleManagement = await getRoleManagementPermission(organization.billing.plan);
+
+      if (!canDoRoleManagement) {
+        throw new OperationNotAllowedError("You do not have permission to manage roles");
+      }
+    }
+
+    const project = await createProject(parsedInput.organizationId, parsedInput.data);
+    const updatedNotificationSettings = {
+      ...user.notificationSettings,
+      alert: {
+        ...user.notificationSettings?.alert,
+      },
+      weeklySummary: {
+        ...user.notificationSettings?.weeklySummary,
+        [project.id]: true,
+      },
+    };
+
+    await updateUser(user.id, {
+      notificationSettings: updatedNotificationSettings,
+    });
+
+    return project;
+  });

apps/web/app/(app)/environments/[environmentId]/actions/actions.ts

@@ -1,12 +1,11 @@
 "use server";
 
 import { deleteActionClass, getActionClass, updateActionClass } from "@/lib/actionClass/service";
+import { cache } from "@/lib/cache";
 import { getSurveysByActionClassId } from "@/lib/survey/service";
 import { actionClient, authenticatedActionClient } from "@/lib/utils/action-client";
-import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
+import { checkAuthorizationUpdated } from "@/lib/utils/action-client-middleware";
 import { getOrganizationIdFromActionClassId, getProjectIdFromActionClassId } from "@/lib/utils/helper";
-import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { z } from "zod";
 import { ZActionClassInput } from "@formbricks/types/action-classes";
 import { ZId } from "@formbricks/types/common";
@@ -16,80 +15,63 @@ const ZDeleteActionClassAction = z.object({
   actionClassId: ZId,
 });
 
-export const deleteActionClassAction = authenticatedActionClient.schema(ZDeleteActionClassAction).action(
-  withAuditLogging(
-    "deleted",
-    "actionClass",
-    async ({ ctx, parsedInput }: { ctx: AuthenticatedActionClientCtx; parsedInput: Record<string, any> }) => {
-      const organizationId = await getOrganizationIdFromActionClassId(parsedInput.actionClassId);
-      await checkAuthorizationUpdated({
-        userId: ctx.user.id,
-        organizationId,
-        access: [
-          {
-            type: "organization",
-            roles: ["owner", "manager"],
-          },
-          {
-            type: "projectTeam",
-            minPermission: "readWrite",
-            projectId: await getProjectIdFromActionClassId(parsedInput.actionClassId),
-          },
-        ],
-      });
-      ctx.auditLoggingCtx.organizationId = organizationId;
-      ctx.auditLoggingCtx.actionClassId = parsedInput.actionClassId;
-      ctx.auditLoggingCtx.oldObject = await getActionClass(parsedInput.actionClassId);
-      return await deleteActionClass(parsedInput.actionClassId);
-    }
-  )
-);
+export const deleteActionClassAction = authenticatedActionClient
+  .schema(ZDeleteActionClassAction)
+  .action(async ({ ctx, parsedInput }) => {
+    await checkAuthorizationUpdated({
+      userId: ctx.user.id,
+      organizationId: await getOrganizationIdFromActionClassId(parsedInput.actionClassId),
+      access: [
+        {
+          type: "organization",
+          roles: ["owner", "manager"],
+        },
+        {
+          type: "projectTeam",
+          minPermission: "readWrite",
+          projectId: await getProjectIdFromActionClassId(parsedInput.actionClassId),
+        },
+      ],
+    });
+
+    await deleteActionClass(parsedInput.actionClassId);
+  });
 
 const ZUpdateActionClassAction = z.object({
   actionClassId: ZId,
   updatedAction: ZActionClassInput,
 });
 
-export const updateActionClassAction = authenticatedActionClient.schema(ZUpdateActionClassAction).action(
-  withAuditLogging(
-    "updated",
-    "actionClass",
-    async ({ ctx, parsedInput }: { ctx: AuthenticatedActionClientCtx; parsedInput: Record<string, any> }) => {
-      const actionClass = await getActionClass(parsedInput.actionClassId);
-      if (actionClass === null) {
-        throw new ResourceNotFoundError("ActionClass", parsedInput.actionClassId);
-      }
-
-      const organizationId = await getOrganizationIdFromActionClassId(parsedInput.actionClassId);
-
-      await checkAuthorizationUpdated({
-        userId: ctx.user.id,
-        organizationId,
-        access: [
-          {
-            type: "organization",
-            roles: ["owner", "manager"],
-          },
-          {
-            type: "projectTeam",
-            minPermission: "readWrite",
-            projectId: await getProjectIdFromActionClassId(parsedInput.actionClassId),
-          },
-        ],
-      });
-      ctx.auditLoggingCtx.organizationId = organizationId;
-      ctx.auditLoggingCtx.actionClassId = parsedInput.actionClassId;
-      ctx.auditLoggingCtx.oldObject = actionClass;
-      const result = await updateActionClass(
-        actionClass.environmentId,
-        parsedInput.actionClassId,
-        parsedInput.updatedAction
-      );
-      ctx.auditLoggingCtx.newObject = result;
-      return result;
+export const updateActionClassAction = authenticatedActionClient
+  .schema(ZUpdateActionClassAction)
+  .action(async ({ ctx, parsedInput }) => {
+    const actionClass = await getActionClass(parsedInput.actionClassId);
+    if (actionClass === null) {
+      throw new ResourceNotFoundError("ActionClass", parsedInput.actionClassId);
     }
-  )
-);
+
+    await checkAuthorizationUpdated({
+      userId: ctx.user.id,
+      organizationId: await getOrganizationIdFromActionClassId(parsedInput.actionClassId),
+      access: [
+        {
+          type: "organization",
+          roles: ["owner", "manager"],
+        },
+        {
+          type: "projectTeam",
+          minPermission: "readWrite",
+          projectId: await getProjectIdFromActionClassId(parsedInput.actionClassId),
+        },
+      ],
+    });
+
+    return await updateActionClass(
+      actionClass.environmentId,
+      parsedInput.actionClassId,
+      parsedInput.updatedAction
+    );
+  });
 
 const ZGetActiveInactiveSurveysAction = z.object({
   actionClassId: ZId,
@@ -122,24 +104,31 @@ export const getActiveInactiveSurveysAction = authenticatedActionClient
     return response;
   });
 
-const getLatestStableFbRelease = async (): Promise<string | null> => {
-  try {
-    const res = await fetch("https://api.github.com/repos/formbricks/formbricks/releases");
-    const releases = await res.json();
+const getLatestStableFbRelease = async (): Promise<string | null> =>
+  cache(
+    async () => {
+      try {
+        const res = await fetch("https://api.github.com/repos/formbricks/formbricks/releases");
+        const releases = await res.json();
 
-    if (Array.isArray(releases)) {
-      const latestStableReleaseTag = releases.filter((release) => !release.prerelease)?.[0]
-        ?.tag_name as string;
-      if (latestStableReleaseTag) {
-        return latestStableReleaseTag;
+        if (Array.isArray(releases)) {
+          const latestStableReleaseTag = releases.filter((release) => !release.prerelease)?.[0]
+            ?.tag_name as string;
+          if (latestStableReleaseTag) {
+            return latestStableReleaseTag;
+          }
+        }
+
+        return null;
+      } catch (err) {
+        return null;
       }
+    },
+    ["latest-fb-release"],
+    {
+      revalidate: 60 * 60 * 24, // 24 hours
     }
-
-    return null;
-  } catch (err) {
-    return null;
-  }
-};
+  )();
 
 export const getLatestStableFbReleaseAction = actionClient.action(async () => {
   return await getLatestStableFbRelease();

apps/web/app/(app)/environments/[environmentId]/actions/components/ActionDetailModal.test.tsx

@@ -1,5 +1,5 @@
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
+import { ModalWithTabs } from "@/modules/ui/components/modal-with-tabs";
+import { cleanup, render } from "@testing-library/react";
 import { afterEach, describe, expect, test, vi } from "vitest";
 import { TActionClass } from "@formbricks/types/action-classes";
 import { TEnvironment } from "@formbricks/types/environment";
@@ -8,40 +8,23 @@ import { ActionDetailModal } from "./ActionDetailModal";
 // Import mocked components
 import { ActionSettingsTab } from "./ActionSettingsTab";
 
-// Mock the Dialog components
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({
-    open,
-    onOpenChange,
-    children,
-  }: {
-    open: boolean;
-    onOpenChange: (open: boolean) => void;
-    children: React.ReactNode;
-  }) =>
-    open ? (
-      <div data-testid="dialog">
-        {children}
-        <button data-testid="dialog-close" onClick={() => onOpenChange(false)}>
-          Close
-        </button>
-      </div>
-    ) : null,
-  DialogContent: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-content">{children}</div>
-  ),
-  DialogHeader: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-header">{children}</div>
-  ),
-  DialogTitle: ({ children }: { children: React.ReactNode }) => (
-    <h2 data-testid="dialog-title">{children}</h2>
-  ),
-  DialogDescription: ({ children }: { children: React.ReactNode }) => (
-    <p data-testid="dialog-description">{children}</p>
-  ),
-  DialogBody: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-body">{children}</div>
-  ),
+// Mock child components
+vi.mock("@/modules/ui/components/modal-with-tabs", () => ({
+  ModalWithTabs: vi.fn(({ tabs, icon, label, description, open, setOpen }) => (
+    <div data-testid="modal-with-tabs">
+      <span data-testid="modal-label">{label}</span>
+      <span data-testid="modal-description">{description}</span>
+      <span data-testid="modal-open">{open.toString()}</span>
+      <button onClick={() => setOpen(false)}>Close</button>
+      {icon}
+      {tabs.map((tab) => (
+        <div key={tab.title}>
+          <h2>{tab.title}</h2>
+          {tab.children}
+        </div>
+      ))}
+    </div>
+  )),
 }));
 
 vi.mock("./ActionActivityTab", () => ({
@@ -61,22 +44,6 @@ vi.mock("@/app/(app)/environments/[environmentId]/actions/utils", () => ({
   },
 }));
 
-// Mock useTranslate
-vi.mock("@tolgee/react", () => ({
-  useTranslate: () => ({
-    t: (key: string) => {
-      const translations = {
-        "common.activity": "Activity",
-        "common.settings": "Settings",
-        "common.no_code": "No Code",
-        "common.action": "Action",
-        "common.code": "Code",
-      };
-      return translations[key] || key;
-    },
-  }),
-}));
-
 const mockEnvironmentId = "test-env-id";
 const mockSetOpen = vi.fn();
 
@@ -122,68 +89,58 @@ describe("ActionDetailModal", () => {
     vi.clearAllMocks(); // Clear mocks after each test
   });
 
-  test("renders correctly when open", () => {
+  test("renders ModalWithTabs with correct props", () => {
     render(<ActionDetailModal {...defaultProps} />);
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Test Action");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("This is a test action");
-    expect(screen.getByTestId("code-icon")).toBeInTheDocument();
-    expect(screen.getByText("Activity")).toBeInTheDocument();
-    expect(screen.getByText("Settings")).toBeInTheDocument();
-    // Only the first tab (Activity) should be active initially
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
-  });
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
 
-  test("does not render when open is false", () => {
-    render(<ActionDetailModal {...defaultProps} open={false} />);
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
-  });
+    expect(mockedModalWithTabs).toHaveBeenCalled();
+    const props = mockedModalWithTabs.mock.calls[0][0];
 
-  test("switches tabs correctly", async () => {
-    const user = userEvent.setup();
-    render(<ActionDetailModal {...defaultProps} />);
+    // Check basic props
+    expect(props.open).toBe(true);
+    expect(props.setOpen).toBe(mockSetOpen);
+    expect(props.label).toBe(mockActionClass.name);
+    expect(props.description).toBe(mockActionClass.description);
 
-    // Initially shows activity tab (first tab is active)
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
+    // Check icon data-testid based on the mock for the default 'code' type
+    expect(props.icon).toBeDefined();
+    if (!props.icon) {
+      throw new Error("Icon prop is not defined");
+    }
+    expect((props.icon as any).props["data-testid"]).toBe("code-icon");
 
-    // Click settings tab
-    const settingsTab = screen.getByText("Settings");
-    await user.click(settingsTab);
+    // Check tabs structure
+    expect(props.tabs).toHaveLength(2);
+    expect(props.tabs[0].title).toBe("common.activity");
+    expect(props.tabs[1].title).toBe("common.settings");
 
-    // Now shows settings tab content
-    expect(screen.queryByTestId("action-activity-tab")).not.toBeInTheDocument();
-    expect(screen.getByTestId("action-settings-tab")).toBeInTheDocument();
+    // Check if the correct mocked components are used as children
+    // Access the mocked functions directly
+    const mockedActionActivityTab = vi.mocked(ActionActivityTab);
+    const mockedActionSettingsTab = vi.mocked(ActionSettingsTab);
 
-    // Click activity tab again
-    const activityTab = screen.getByText("Activity");
-    await user.click(activityTab);
+    if (!props.tabs[0].children || !props.tabs[1].children) {
+      throw new Error("Tabs children are not defined");
+    }
 
-    // Back to activity tab content
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
-  });
+    expect((props.tabs[0].children as any).type).toBe(mockedActionActivityTab);
+    expect((props.tabs[1].children as any).type).toBe(mockedActionSettingsTab);
 
-  test("resets to first tab when modal is reopened", async () => {
-    const user = userEvent.setup();
-    const { rerender } = render(<ActionDetailModal {...defaultProps} />);
+    // Check props passed to child components
+    const activityTabProps = (props.tabs[0].children as any).props;
+    expect(activityTabProps.otherEnvActionClasses).toBe(mockOtherEnvActionClasses);
+    expect(activityTabProps.otherEnvironment).toBe(mockOtherEnvironment);
+    expect(activityTabProps.isReadOnly).toBe(false);
+    expect(activityTabProps.environment).toBe(mockEnvironment);
+    expect(activityTabProps.actionClass).toBe(mockActionClass);
+    expect(activityTabProps.environmentId).toBe(mockEnvironmentId);
 
-    // Switch to settings tab
-    const settingsTab = screen.getByText("Settings");
-    await user.click(settingsTab);
-    expect(screen.getByTestId("action-settings-tab")).toBeInTheDocument();
-
-    // Close modal
-    rerender(<ActionDetailModal {...defaultProps} open={false} />);
-
-    // Reopen modal
-    rerender(<ActionDetailModal {...defaultProps} open={true} />);
-
-    // Should be back to activity tab (first tab)
-    expect(screen.getByTestId("action-activity-tab")).toBeInTheDocument();
-    expect(screen.queryByTestId("action-settings-tab")).not.toBeInTheDocument();
+    const settingsTabProps = (props.tabs[1].children as any).props;
+    expect(settingsTabProps.actionClass).toBe(mockActionClass);
+    expect(settingsTabProps.actionClasses).toBe(mockActionClasses);
+    expect(settingsTabProps.setOpen).toBe(mockSetOpen);
+    expect(settingsTabProps.isReadOnly).toBe(false);
   });
 
   test("renders correct icon based on action type", () => {
@@ -191,68 +148,33 @@ describe("ActionDetailModal", () => {
     const noCodeAction: TActionClass = { ...mockActionClass, type: "noCode" } as TActionClass;
     render(<ActionDetailModal {...defaultProps} actionClass={noCodeAction} />);
 
-    expect(screen.getByTestId("nocode-icon")).toBeInTheDocument();
-    expect(screen.queryByTestId("code-icon")).not.toBeInTheDocument();
-  });
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
+    const props = mockedModalWithTabs.mock.calls[0][0];
 
-  test("handles action without description", () => {
-    const actionWithoutDescription = { ...mockActionClass, description: "" };
-    render(<ActionDetailModal {...defaultProps} actionClass={actionWithoutDescription} />);
+    // Expect the 'nocode-icon' based on the updated mock and action type
+    expect(props.icon).toBeDefined();
 
-    expect(screen.getByTestId("dialog-title")).toHaveTextContent("Test Action");
-    expect(screen.getByTestId("dialog-description")).toHaveTextContent("Code action");
-  });
+    if (!props.icon) {
+      throw new Error("Icon prop is not defined");
+    }
 
-  test("passes correct props to ActionActivityTab", () => {
-    render(<ActionDetailModal {...defaultProps} />);
-
-    const mockedActionActivityTab = vi.mocked(ActionActivityTab);
-    expect(mockedActionActivityTab).toHaveBeenCalledWith(
-      {
-        otherEnvActionClasses: mockOtherEnvActionClasses,
-        otherEnvironment: mockOtherEnvironment,
-        isReadOnly: false,
-        environment: mockEnvironment,
-        actionClass: mockActionClass,
-        environmentId: mockEnvironmentId,
-      },
-      undefined
-    );
-  });
-
-  test("passes correct props to ActionSettingsTab when tab is active", async () => {
-    const user = userEvent.setup();
-    render(<ActionDetailModal {...defaultProps} />);
-
-    // ActionSettingsTab should not be called initially since first tab is active
-    const mockedActionSettingsTab = vi.mocked(ActionSettingsTab);
-    expect(mockedActionSettingsTab).not.toHaveBeenCalled();
-
-    // Click the settings tab to activate ActionSettingsTab
-    const settingsTab = screen.getByText("Settings");
-    await user.click(settingsTab);
-
-    // Now ActionSettingsTab should be called with correct props
-    expect(mockedActionSettingsTab).toHaveBeenCalledWith(
-      {
-        actionClass: mockActionClass,
-        actionClasses: mockActionClasses,
-        setOpen: mockSetOpen,
-        isReadOnly: false,
-      },
-      undefined
-    );
+    expect((props.icon as any).props["data-testid"]).toBe("nocode-icon");
   });
 
   test("passes isReadOnly prop correctly", () => {
     render(<ActionDetailModal {...defaultProps} isReadOnly={true} />);
+    // Access the mocked component directly
+    const mockedModalWithTabs = vi.mocked(ModalWithTabs);
+    const props = mockedModalWithTabs.mock.calls[0][0];
 
-    const mockedActionActivityTab = vi.mocked(ActionActivityTab);
-    expect(mockedActionActivityTab).toHaveBeenCalledWith(
-      expect.objectContaining({
-        isReadOnly: true,
-      }),
-      undefined
-    );
+    if (!props.tabs[0].children || !props.tabs[1].children) {
+      throw new Error("Tabs children are not defined");
+    }
+
+    const activityTabProps = (props.tabs[0].children as any).props;
+    expect(activityTabProps.isReadOnly).toBe(true);
+
+    const settingsTabProps = (props.tabs[1].children as any).props;
+    expect(settingsTabProps.isReadOnly).toBe(true);
   });
 });

apps/web/app/(app)/environments/[environmentId]/actions/components/ActionDetailModal.tsx

@@ -59,16 +59,6 @@ export const ActionDetailModal = ({
     },
   ];
 
-  const typeDescription = () => {
-    if (actionClass.description) return actionClass.description;
-    else
-      return (
-        (actionClass.type && actionClass.type === "noCode" ? t("common.no_code") : t("common.code")) +
-        " " +
-        t("common.action").toLowerCase()
-      );
-  };
-
   return (
     <>
       <ModalWithTabs
@@ -77,7 +67,7 @@ export const ActionDetailModal = ({
         tabs={tabs}
         icon={ACTION_TYPE_ICON_LOOKUP[actionClass.type]}
         label={actionClass.name}
-        description={typeDescription()}
+        description={actionClass.description || ""}
       />
     </>
   );

apps/web/app/(app)/environments/[environmentId]/actions/components/ActionRowData.tsx

@@ -11,21 +11,22 @@ export const ActionClassDataRow = ({
   locale: TUserLocale;
 }) => {
   return (
-    <div className="m-2 grid grid-cols-6 content-center rounded-lg transition-colors ease-in-out hover:bg-slate-100">
-      <div className="col-span-4 flex items-start py-3 pl-6 text-sm">
-        <div className="flex w-full items-center gap-4">
-          <div className="mt-1 h-5 w-5 flex-shrink-0 text-slate-500">
+    <div className="m-2 grid h-16 grid-cols-6 content-center rounded-lg transition-colors ease-in-out hover:bg-slate-100">
+      <div className="col-span-4 flex items-center pl-6 text-sm">
+        <div className="flex items-center">
+          <div className="h-5 w-5 flex-shrink-0 text-slate-500">
             {ACTION_TYPE_ICON_LOOKUP[actionClass.type]}
           </div>
-          <div className="text-left">
-            <div className="break-words font-medium text-slate-900">{actionClass.name}</div>
-            <div className="break-words text-xs text-slate-400">{actionClass.description}</div>
+          <div className="ml-4 text-left">
+            <div className="font-medium text-slate-900">{actionClass.name}</div>
+            <div className="text-xs text-slate-400">{actionClass.description}</div>
           </div>
         </div>
       </div>
-      <div className="col-span-2 my-auto whitespace-nowrap text-center text-sm text-slate-500">
+      <div className="col-span-2 my-auto text-center text-sm whitespace-nowrap text-slate-500">
         {timeSince(actionClass.createdAt.toString(), locale)}
       </div>
+      <div className="text-center"></div>
     </div>
   );
 };

apps/web/app/(app)/environments/[environmentId]/actions/components/ActionSettingsTab.tsx

@@ -210,13 +210,14 @@ export const ActionSettingsTab = ({
             )}
           </div>
 
-          <div className="flex justify-between gap-x-2 border-slate-200 pt-4">
-            <div className="flex items-center gap-x-2">
+          <div className="flex justify-between border-t border-slate-200 py-6">
+            <div>
               {!isReadOnly ? (
                 <Button
                   type="button"
                   variant="destructive"
                   onClick={() => setOpenDeleteDialog(true)}
+                  className="mr-3"
                   id="deleteActionModalTrigger">
                   <TrashIcon />
                   {t("common.delete")}

apps/web/app/(app)/environments/[environmentId]/actions/components/AddActionModal.test.tsx

@@ -22,29 +22,14 @@ vi.mock("@/modules/ui/components/button", () => ({
   ),
 }));
 
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ children, open, onOpenChange }: any) =>
+vi.mock("@/modules/ui/components/modal", () => ({
+  Modal: ({ children, open, setOpen, ...props }: any) =>
     open ? (
-      <div data-testid="dialog" role="dialog">
+      <div data-testid="modal" {...props}>
         {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
+        <button onClick={() => setOpen(false)}>Close Modal</button>
       </div>
     ) : null,
-  DialogContent: ({ children, ...props }: any) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children }: any) => <div data-testid="dialog-header">{children}</div>,
-  DialogTitle: ({ children, className }: any) => (
-    <h2 data-testid="dialog-title" className={className}>
-      {children}
-    </h2>
-  ),
-  DialogDescription: ({ children }: { children: React.ReactNode }) => (
-    <div data-testid="dialog-description">{children}</div>
-  ),
-  DialogBody: ({ children }: any) => <div data-testid="dialog-body">{children}</div>,
 }));
 
 vi.mock("@tolgee/react", () => ({
@@ -85,21 +70,17 @@ describe("AddActionModal", () => {
     );
     expect(screen.getByRole("button", { name: "common.add_action" })).toBeInTheDocument();
     expect(screen.getByTestId("plus-icon")).toBeInTheDocument();
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 
-  test("opens the dialog when the 'Add Action' button is clicked", async () => {
+  test("opens the modal when the 'Add Action' button is clicked", async () => {
     render(
       <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
     );
     const addButton = screen.getByRole("button", { name: "common.add_action" });
     await userEvent.click(addButton);
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-content")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-header")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-title")).toBeInTheDocument();
-    expect(screen.getByTestId("dialog-body")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
     expect(screen.getByTestId("mouse-pointer-icon")).toBeInTheDocument();
     expect(screen.getByText("environments.actions.track_new_user_action")).toBeInTheDocument();
     expect(
@@ -127,35 +108,35 @@ describe("AddActionModal", () => {
     expect(props.setActionClasses).toBeInstanceOf(Function);
   });
 
-  test("closes the dialog when the close button (simulated) is clicked", async () => {
+  test("closes the modal when the close button (simulated) is clicked", async () => {
     render(
       <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
     );
     const addButton = screen.getByRole("button", { name: "common.add_action" });
     await userEvent.click(addButton);
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
 
-    // Simulate closing via the mocked Dialog's close button
-    const closeDialogButton = screen.getByText("Close Dialog");
-    await userEvent.click(closeDialogButton);
+    // Simulate closing via the mocked Modal's close button
+    const closeModalButton = screen.getByText("Close Modal");
+    await userEvent.click(closeModalButton);
 
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 
-  test("closes the dialog when setOpen is called from CreateNewActionTab", async () => {
+  test("closes the modal when setOpen is called from CreateNewActionTab", async () => {
     render(
       <AddActionModal environmentId={environmentId} actionClasses={mockActionClasses} isReadOnly={false} />
     );
     const addButton = screen.getByRole("button", { name: "common.add_action" });
     await userEvent.click(addButton);
 
-    expect(screen.getByTestId("dialog")).toBeInTheDocument();
+    expect(screen.getByTestId("modal")).toBeInTheDocument();
 
     // Simulate closing via the mocked CreateNewActionTab's button
     const closeFromTabButton = screen.getByText("Close from Tab");
     await userEvent.click(closeFromTabButton);
 
-    expect(screen.queryByTestId("dialog")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("modal")).not.toBeInTheDocument();
   });
 });

apps/web/app/(app)/environments/[environmentId]/actions/components/AddActionModal.tsx

@@ -2,14 +2,7 @@
 
 import { CreateNewActionTab } from "@/modules/survey/editor/components/create-new-action-tab";
 import { Button } from "@/modules/ui/components/button";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
+import { Modal } from "@/modules/ui/components/modal";
 import { useTranslate } from "@tolgee/react";
 import { MousePointerClickIcon, PlusIcon } from "lucide-react";
 import { useState } from "react";
@@ -33,26 +26,36 @@ export const AddActionModal = ({ environmentId, actionClasses, isReadOnly }: Add
         {t("common.add_action")}
         <PlusIcon />
       </Button>
-      <Dialog open={open} onOpenChange={setOpen}>
-        <DialogContent disableCloseOnOutsideClick>
-          <DialogHeader>
-            <MousePointerClickIcon />
-            <DialogTitle>{t("environments.actions.track_new_user_action")}</DialogTitle>
-            <DialogDescription>
-              {t("environments.actions.track_user_action_to_display_surveys_or_create_user_segment")}
-            </DialogDescription>
-          </DialogHeader>
-          <DialogBody>
-            <CreateNewActionTab
-              actionClasses={newActionClasses}
-              environmentId={environmentId}
-              isReadOnly={isReadOnly}
-              setActionClasses={setNewActionClasses}
-              setOpen={setOpen}
-            />
-          </DialogBody>
-        </DialogContent>
-      </Dialog>
+      <Modal open={open} setOpen={setOpen} noPadding closeOnOutsideClick={false} restrictOverflow>
+        <div className="flex h-full flex-col rounded-lg">
+          <div className="rounded-t-lg bg-slate-100">
+            <div className="flex w-full items-center justify-between p-6">
+              <div className="flex items-center space-x-2">
+                <div className="mr-1.5 h-6 w-6 text-slate-500">
+                  <MousePointerClickIcon className="h-5 w-5" />
+                </div>
+                <div>
+                  <div className="text-xl font-medium text-slate-700">
+                    {t("environments.actions.track_new_user_action")}
+                  </div>
+                  <div className="text-sm text-slate-500">
+                    {t("environments.actions.track_user_action_to_display_surveys_or_create_user_segment")}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div className="px-6 py-4">
+          <CreateNewActionTab
+            actionClasses={newActionClasses}
+            environmentId={environmentId}
+            isReadOnly={isReadOnly}
+            setActionClasses={setNewActionClasses}
+            setOpen={setOpen}
+          />
+        </div>
+      </Modal>
     </>
   );
 };

apps/web/app/(app)/environments/[environmentId]/actions/loading.tsx

@@ -33,7 +33,7 @@ const Loading = () => {
                   </div>
                 </div>
               </div>
-              <div className="col-span-2 my-auto flex justify-center whitespace-nowrap text-center text-sm text-slate-500">
+              <div className="col-span-2 my-auto flex justify-center text-center text-sm whitespace-nowrap text-slate-500">
                 <div className="h-4 w-28 animate-pulse rounded-full bg-slate-200"></div>
               </div>
             </div>

apps/web/app/(app)/environments/[environmentId]/components/EnvironmentLayout.test.tsx

@@ -1,3 +1,4 @@
+import { EnvironmentLayout } from "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout";
 import { getEnvironment, getEnvironments } from "@/lib/environment/service";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
@@ -9,12 +10,8 @@ import {
 } from "@/lib/organization/service";
 import { getUserProjects } from "@/lib/project/service";
 import { getUser } from "@/lib/user/service";
-import {
-  getOrganizationProjectsLimit,
-  getRoleManagementPermission,
-} from "@/modules/ee/license-check/lib/utils";
+import { getEnterpriseLicense, getOrganizationProjectsLimit } from "@/modules/ee/license-check/lib/utils";
 import { getProjectPermissionByUserId } from "@/modules/ee/teams/lib/roles";
-import { getTeamsByOrganizationId } from "@/modules/ee/teams/team-list/lib/team";
 import { cleanup, render, screen } from "@testing-library/react";
 import type { Session } from "next-auth";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
@@ -52,15 +49,12 @@ vi.mock("@/lib/membership/utils", () => ({
   getAccessFlags: vi.fn(() => ({ isMember: true })), // Default to member for simplicity
 }));
 vi.mock("@/modules/ee/license-check/lib/utils", () => ({
+  getEnterpriseLicense: vi.fn(),
   getOrganizationProjectsLimit: vi.fn(),
-  getRoleManagementPermission: vi.fn(),
 }));
 vi.mock("@/modules/ee/teams/lib/roles", () => ({
   getProjectPermissionByUserId: vi.fn(),
 }));
-vi.mock("@/modules/ee/teams/team-list/lib/team", () => ({
-  getTeamsByOrganizationId: vi.fn(),
-}));
 vi.mock("@/tolgee/server", () => ({
   getTranslate: async () => (key: string) => key,
 }));
@@ -79,13 +73,7 @@ vi.mock("@/lib/constants", () => ({
 
 // Mock components
 vi.mock("@/app/(app)/environments/[environmentId]/components/MainNavigation", () => ({
-  MainNavigation: ({ organizationTeams, canDoRoleManagement }: any) => (
-    <div data-testid="main-navigation">
-      MainNavigation
-      <div data-testid="organization-teams">{JSON.stringify(organizationTeams || [])}</div>
-      <div data-testid="can-do-role-management">{canDoRoleManagement?.toString() || "false"}</div>
-    </div>
-  ),
+  MainNavigation: () => <div data-testid="main-navigation">MainNavigation</div>,
 }));
 vi.mock("@/app/(app)/environments/[environmentId]/components/TopControlBar", () => ({
   TopControlBar: () => <div data-testid="top-control-bar">TopControlBar</div>,
@@ -118,7 +106,7 @@ const mockUser = {
   identityProvider: "email",
   createdAt: new Date(),
   updatedAt: new Date(),
-  notificationSettings: { alert: {} },
+  notificationSettings: { alert: {}, weeklySummary: {} },
 } as unknown as TUser;
 
 const mockOrganization = {
@@ -170,17 +158,6 @@ const mockProjectPermission = {
   role: "admin",
 } as any;
 
-const mockOrganizationTeams = [
-  {
-    id: "team-1",
-    name: "Development Team",
-  },
-  {
-    id: "team-2",
-    name: "Marketing Team",
-  },
-];
-
 const mockSession: Session = {
   user: {
     id: "user-1",
@@ -199,10 +176,9 @@ describe("EnvironmentLayout", () => {
     vi.mocked(getMembershipByUserIdOrganizationId).mockResolvedValue(mockMembership);
     vi.mocked(getMonthlyActiveOrganizationPeopleCount).mockResolvedValue(100);
     vi.mocked(getMonthlyOrganizationResponseCount).mockResolvedValue(500);
+    vi.mocked(getEnterpriseLicense).mockResolvedValue(mockLicense);
     vi.mocked(getOrganizationProjectsLimit).mockResolvedValue(null as any);
     vi.mocked(getProjectPermissionByUserId).mockResolvedValue(mockProjectPermission);
-    vi.mocked(getTeamsByOrganizationId).mockResolvedValue(mockOrganizationTeams);
-    vi.mocked(getRoleManagementPermission).mockResolvedValue(true);
     mockIsDevelopment = false;
     mockIsFormbricksCloud = false;
   });
@@ -213,19 +189,13 @@ describe("EnvironmentLayout", () => {
   });
 
   test("renders correctly with default props", async () => {
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
+    // Ensure the default mockLicense has isPendingDowngrade: false and active: false
+    vi.mocked(getEnterpriseLicense).mockResolvedValue({
+      ...mockLicense,
+      isPendingDowngrade: false,
+      active: false,
+    });
+
     render(
       await EnvironmentLayout({
         environmentId: "env-1",
@@ -233,31 +203,20 @@ describe("EnvironmentLayout", () => {
         children: <div>Child Content</div>,
       })
     );
+
     expect(screen.getByTestId("main-navigation")).toBeInTheDocument();
     expect(screen.getByTestId("top-control-bar")).toBeInTheDocument();
     expect(screen.getByText("Child Content")).toBeInTheDocument();
     expect(screen.queryByTestId("dev-banner")).not.toBeInTheDocument();
     expect(screen.queryByTestId("limits-banner")).not.toBeInTheDocument();
-    expect(screen.queryByTestId("downgrade-banner")).not.toBeInTheDocument();
+    expect(screen.queryByTestId("downgrade-banner")).not.toBeInTheDocument(); // This should now pass
   });
 
   test("renders DevEnvironmentBanner in development environment", async () => {
     const devEnvironment = { ...mockEnvironment, type: "development" as const };
     vi.mocked(getEnvironment).mockResolvedValue(devEnvironment);
     mockIsDevelopment = true;
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
+
     render(
       await EnvironmentLayout({
         environmentId: "env-1",
@@ -265,24 +224,13 @@ describe("EnvironmentLayout", () => {
         children: <div>Child Content</div>,
       })
     );
+
     expect(screen.getByTestId("dev-banner")).toBeInTheDocument();
   });
 
   test("renders LimitsReachedBanner in Formbricks Cloud", async () => {
     mockIsFormbricksCloud = true;
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
+
     render(
       await EnvironmentLayout({
         environmentId: "env-1",
@@ -290,21 +238,17 @@ describe("EnvironmentLayout", () => {
         children: <div>Child Content</div>,
       })
     );
+
     expect(screen.getByTestId("limits-banner")).toBeInTheDocument();
     expect(vi.mocked(getMonthlyActiveOrganizationPeopleCount)).toHaveBeenCalledWith(mockOrganization.id);
     expect(vi.mocked(getMonthlyOrganizationResponseCount)).toHaveBeenCalledWith(mockOrganization.id);
   });
 
   test("renders PendingDowngradeBanner when pending downgrade", async () => {
+    // Ensure the license mock reflects the condition needed for the banner
     const pendingLicense = { ...mockLicense, isPendingDowngrade: true, active: true };
-    vi.mocked(getOrganizationProjectsLimit).mockResolvedValue(null as any);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue(pendingLicense),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
+    vi.mocked(getEnterpriseLicense).mockResolvedValue(pendingLicense);
+
     render(
       await EnvironmentLayout({
         environmentId: "env-1",
@@ -312,128 +256,12 @@ describe("EnvironmentLayout", () => {
         children: <div>Child Content</div>,
       })
     );
+
     expect(screen.getByTestId("downgrade-banner")).toBeInTheDocument();
   });
 
-  test("passes canDoRoleManagement props to MainNavigation", async () => {
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
-    render(
-      await EnvironmentLayout({
-        environmentId: "env-1",
-        session: mockSession,
-        children: <div>Child Content</div>,
-      })
-    );
-
-    expect(screen.getByTestId("can-do-role-management")).toHaveTextContent("true");
-    expect(vi.mocked(getRoleManagementPermission)).toHaveBeenCalledWith(mockOrganization.billing.plan);
-  });
-
-  test("handles empty organizationTeams array", async () => {
-    vi.mocked(getTeamsByOrganizationId).mockResolvedValue([]);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
-    render(
-      await EnvironmentLayout({
-        environmentId: "env-1",
-        session: mockSession,
-        children: <div>Child Content</div>,
-      })
-    );
-
-    expect(screen.getByTestId("organization-teams")).toHaveTextContent("[]");
-  });
-
-  test("handles null organizationTeams", async () => {
-    vi.mocked(getTeamsByOrganizationId).mockResolvedValue(null);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
-    render(
-      await EnvironmentLayout({
-        environmentId: "env-1",
-        session: mockSession,
-        children: <div>Child Content</div>,
-      })
-    );
-
-    expect(screen.getByTestId("organization-teams")).toHaveTextContent("[]");
-  });
-
-  test("handles canDoRoleManagement false", async () => {
-    vi.mocked(getRoleManagementPermission).mockResolvedValue(false);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
-    render(
-      await EnvironmentLayout({
-        environmentId: "env-1",
-        session: mockSession,
-        children: <div>Child Content</div>,
-      })
-    );
-
-    expect(screen.getByTestId("can-do-role-management")).toHaveTextContent("false");
-  });
-
   test("throws error if user not found", async () => {
     vi.mocked(getUser).mockResolvedValue(null);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
     await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
       "common.user_not_found"
     );
@@ -441,19 +269,6 @@ describe("EnvironmentLayout", () => {
 
   test("throws error if organization not found", async () => {
     vi.mocked(getOrganizationByEnvironmentId).mockResolvedValue(null);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
     await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
       "common.organization_not_found"
     );
@@ -461,39 +276,13 @@ describe("EnvironmentLayout", () => {
 
   test("throws error if environment not found", async () => {
     vi.mocked(getEnvironment).mockResolvedValue(null);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
     await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
       "common.environment_not_found"
     );
   });
 
   test("throws error if projects, environments or organizations not found", async () => {
-    vi.mocked(getUserProjects).mockResolvedValue(null as any);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
+    vi.mocked(getUserProjects).mockResolvedValue(null as any); // Simulate one of the promises failing
     await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
       "environments.projects_environments_organizations_not_found"
     );
@@ -502,19 +291,6 @@ describe("EnvironmentLayout", () => {
   test("throws error if member has no project permission", async () => {
     vi.mocked(getAccessFlags).mockReturnValue({ isMember: true } as any);
     vi.mocked(getProjectPermissionByUserId).mockResolvedValue(null);
-    vi.resetModules();
-    await vi.doMock("@/modules/ee/license-check/lib/license", () => ({
-      getEnterpriseLicense: vi.fn().mockResolvedValue({
-        active: false,
-        isPendingDowngrade: false,
-        features: { isMultiOrgEnabled: false },
-        lastChecked: new Date(),
-        fallbackLevel: "live",
-      }),
-    }));
-    const { EnvironmentLayout } = await import(
-      "@/app/(app)/environments/[environmentId]/components/EnvironmentLayout"
-    );
     await expect(EnvironmentLayout({ environmentId: "env-1", session: mockSession })).rejects.toThrow(
       "common.project_permission_not_found"
     );

apps/web/app/(app)/environments/[environmentId]/components/EnvironmentLayout.tsx

@@ -12,11 +12,7 @@ import {
 } from "@/lib/organization/service";
 import { getUserProjects } from "@/lib/project/service";
 import { getUser } from "@/lib/user/service";
-import { getEnterpriseLicense } from "@/modules/ee/license-check/lib/license";
-import {
-  getOrganizationProjectsLimit,
-  getRoleManagementPermission,
-} from "@/modules/ee/license-check/lib/utils";
+import { getEnterpriseLicense, getOrganizationProjectsLimit } from "@/modules/ee/license-check/lib/utils";
 import { getProjectPermissionByUserId } from "@/modules/ee/teams/lib/roles";
 import { DevEnvironmentBanner } from "@/modules/ui/components/dev-environment-banner";
 import { LimitsReachedBanner } from "@/modules/ui/components/limits-reached-banner";
@@ -51,10 +47,9 @@ export const EnvironmentLayout = async ({ environmentId, session, children }: En
     throw new Error(t("common.environment_not_found"));
   }
 
-  const [projects, environments, canDoRoleManagement] = await Promise.all([
+  const [projects, environments] = await Promise.all([
     getUserProjects(user.id, organization.id),
     getEnvironments(environment.projectId),
-    getRoleManagementPermission(organization.billing.plan),
   ]);
 
   if (!projects || !environments || !organizations) {
@@ -105,7 +100,6 @@ export const EnvironmentLayout = async ({ environmentId, session, children }: En
         isPendingDowngrade={isPendingDowngrade ?? false}
         active={active}
         environmentId={environment.id}
-        locale={user.locale}
       />
 
       <div className="flex h-full">
@@ -121,7 +115,6 @@ export const EnvironmentLayout = async ({ environmentId, session, children }: En
           membershipRole={membershipRole}
           isMultiOrgEnabled={isMultiOrgEnabled}
           isLicenseActive={active}
-          canDoRoleManagement={canDoRoleManagement}
         />
         <div id="mainContent" className="flex-1 overflow-y-auto bg-slate-50">
           <TopControlBar

apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.test.tsx

@@ -1,7 +1,6 @@
-import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
-import { TOrganizationTeam } from "@/modules/ee/teams/team-list/types/team";
 import { cleanup, render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+import { signOut } from "next-auth/react";
 import { usePathname, useRouter } from "next/navigation";
 import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { TEnvironment } from "@formbricks/types/environment";
@@ -11,17 +10,6 @@ import { TUser } from "@formbricks/types/user";
 import { getLatestStableFbReleaseAction } from "../actions/actions";
 import { MainNavigation } from "./MainNavigation";
 
-// Mock constants that this test needs
-vi.mock("@/lib/constants", () => ({
-  IS_FORMBRICKS_CLOUD: false,
-  WEBAPP_URL: "http://localhost:3000",
-}));
-
-// Mock server actions that this test needs
-vi.mock("@/modules/auth/actions/sign-out", () => ({
-  logSignOutAction: vi.fn().mockResolvedValue(undefined),
-}));
-
 // Mock dependencies
 vi.mock("next/navigation", () => ({
   useRouter: vi.fn(() => ({ push: vi.fn() })),
@@ -30,9 +18,6 @@ vi.mock("next/navigation", () => ({
 vi.mock("next-auth/react", () => ({
   signOut: vi.fn(),
 }));
-vi.mock("@/modules/auth/hooks/use-sign-out", () => ({
-  useSignOut: vi.fn(() => ({ signOut: vi.fn() })),
-}));
 vi.mock("@/app/(app)/environments/[environmentId]/actions/actions", () => ({
   getLatestStableFbReleaseAction: vi.fn(),
 }));
@@ -53,19 +38,9 @@ vi.mock("@/modules/organization/components/CreateOrganizationModal", () => ({
     open ? <div data-testid="create-org-modal">Create Org Modal</div> : null,
 }));
 vi.mock("@/modules/projects/components/project-switcher", () => ({
-  ProjectSwitcher: ({
-    isCollapsed,
-    organizationTeams,
-    canDoRoleManagement,
-  }: {
-    isCollapsed: boolean;
-    organizationTeams: TOrganizationTeam[];
-    canDoRoleManagement: boolean;
-  }) => (
+  ProjectSwitcher: ({ isCollapsed }: { isCollapsed: boolean }) => (
     <div data-testid="project-switcher" data-collapsed={isCollapsed}>
       Project Switcher
-      <div data-testid="organization-teams-count">{organizationTeams?.length || 0}</div>
-      <div data-testid="can-do-role-management">{canDoRoleManagement.toString()}</div>
     </div>
   ),
 }));
@@ -117,7 +92,7 @@ const mockUser = {
   identityProvider: "email",
   createdAt: new Date(),
   updatedAt: new Date(),
-  notificationSettings: { alert: {} },
+  notificationSettings: { alert: {}, weeklySummary: {} },
   role: "project_manager",
   objective: "other",
 } as unknown as TUser;
@@ -157,7 +132,6 @@ const defaultProps = {
   membershipRole: "owner" as const,
   organizationProjectsLimit: 5,
   isLicenseActive: true,
-  canDoRoleManagement: true,
 };
 
 describe("MainNavigation", () => {
@@ -229,11 +203,7 @@ describe("MainNavigation", () => {
   });
 
   test("renders user dropdown and handles logout", async () => {
-    const mockSignOut = vi.fn().mockResolvedValue({ url: "/auth/login" });
-    vi.mocked(useSignOut).mockReturnValue({ signOut: mockSignOut });
-
-    // Set up localStorage spy on the mocked localStorage
-
+    vi.mocked(signOut).mockResolvedValue({ url: "/auth/login" });
     render(<MainNavigation {...defaultProps} />);
 
     // Find the avatar and get its parent div which acts as the trigger
@@ -254,15 +224,7 @@ describe("MainNavigation", () => {
     const logoutButton = screen.getByText("common.logout");
     await userEvent.click(logoutButton);
 
-    expect(mockSignOut).toHaveBeenCalledWith({
-      reason: "user_initiated",
-      redirectUrl: "/auth/login",
-      organizationId: "org1",
-      redirect: false,
-      callbackUrl: "/auth/login",
-      clearEnvironmentId: true,
-    });
-
+    expect(signOut).toHaveBeenCalledWith({ redirect: false, callbackUrl: "/auth/login" });
     await waitFor(() => {
       expect(mockRouterPush).toHaveBeenCalledWith("/auth/login");
     });
@@ -346,23 +308,4 @@ describe("MainNavigation", () => {
     });
     expect(screen.queryByText("common.license")).not.toBeInTheDocument();
   });
-
-  test("passes canDoRoleManagement props to ProjectSwitcher", () => {
-    render(<MainNavigation {...defaultProps} />);
-
-    expect(screen.getByTestId("organization-teams-count")).toHaveTextContent("0");
-    expect(screen.getByTestId("can-do-role-management")).toHaveTextContent("true");
-  });
-
-  test("handles no organizationTeams", () => {
-    render(<MainNavigation {...defaultProps} />);
-
-    expect(screen.getByTestId("organization-teams-count")).toHaveTextContent("0");
-  });
-
-  test("handles canDoRoleManagement false", () => {
-    render(<MainNavigation {...defaultProps} canDoRoleManagement={false} />);
-
-    expect(screen.getByTestId("can-do-role-management")).toHaveTextContent("false");
-  });
 });

apps/web/app/(app)/environments/[environmentId]/components/MainNavigation.tsx

@@ -6,7 +6,6 @@ import FBLogo from "@/images/formbricks-wordmark.svg";
 import { cn } from "@/lib/cn";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { capitalizeFirstLetter } from "@/lib/utils/strings";
-import { useSignOut } from "@/modules/auth/hooks/use-sign-out";
 import { CreateOrganizationModal } from "@/modules/organization/components/CreateOrganizationModal";
 import { ProjectSwitcher } from "@/modules/projects/components/project-switcher";
 import { ProfileAvatar } from "@/modules/ui/components/avatars";
@@ -43,6 +42,7 @@ import {
   UserIcon,
   UsersIcon,
 } from "lucide-react";
+import { signOut } from "next-auth/react";
 import Image from "next/image";
 import Link from "next/link";
 import { usePathname, useRouter } from "next/navigation";
@@ -66,7 +66,6 @@ interface NavigationProps {
   membershipRole?: TOrganizationRole;
   organizationProjectsLimit: number;
   isLicenseActive: boolean;
-  canDoRoleManagement: boolean;
 }
 
 export const MainNavigation = ({
@@ -81,7 +80,6 @@ export const MainNavigation = ({
   organizationProjectsLimit,
   isLicenseActive,
   isDevelopment,
-  canDoRoleManagement,
 }: NavigationProps) => {
   const router = useRouter();
   const pathname = usePathname();
@@ -92,7 +90,6 @@ export const MainNavigation = ({
   const [isCollapsed, setIsCollapsed] = useState(true);
   const [isTextVisible, setIsTextVisible] = useState(true);
   const [latestVersion, setLatestVersion] = useState("");
-  const { signOut: signOutWithAudit } = useSignOut({ id: user.id, email: user.email });
 
   const project = projects.find((project) => project.id === environment.projectId);
   const { isManager, isOwner, isMember, isBilling } = getAccessFlags(membershipRole);
@@ -112,7 +109,7 @@ export const MainNavigation = ({
 
   useEffect(() => {
     const toggleTextOpacity = () => {
-      setIsTextVisible(isCollapsed);
+      setIsTextVisible(isCollapsed ? true : false);
     };
     const timeoutId = setTimeout(toggleTextOpacity, 150);
     return () => clearTimeout(timeoutId);
@@ -173,7 +170,7 @@ export const MainNavigation = ({
         name: t("common.actions"),
         href: `/environments/${environment.id}/actions`,
         icon: MousePointerClick,
-        isActive: pathname?.includes("/actions"),
+        isActive: pathname?.includes("/actions") || pathname?.includes("/actions"),
       },
       {
         name: t("common.integrations"),
@@ -267,7 +264,7 @@ export const MainNavigation = ({
                 size="icon"
                 onClick={toggleSidebar}
                 className={cn(
-                  "rounded-xl bg-slate-50 p-1 text-slate-600 transition-all hover:bg-slate-100 focus:outline-none focus:ring-0 focus:ring-transparent"
+                  "rounded-xl bg-slate-50 p-1 text-slate-600 transition-all hover:bg-slate-100 focus:ring-0 focus:ring-transparent focus:outline-none"
                 )}>
                 {isCollapsed ? (
                   <PanelLeftOpenIcon strokeWidth={1.5} />
@@ -325,7 +322,6 @@ export const MainNavigation = ({
                 isTextVisible={isTextVisible}
                 organization={organization}
                 organizationProjectsLimit={organizationProjectsLimit}
-                canDoRoleManagement={canDoRoleManagement}
               />
             )}
 
@@ -393,15 +389,8 @@ export const MainNavigation = ({
 
                   <DropdownMenuItem
                     onClick={async () => {
-                      const route = await signOutWithAudit({
-                        reason: "user_initiated",
-                        redirectUrl: "/auth/login",
-                        organizationId: organization.id,
-                        redirect: false,
-                        callbackUrl: "/auth/login",
-                        clearEnvironmentId: true,
-                      });
-                      router.push(route?.url || "/auth/login"); // NOSONAR // We want to check for empty strings
+                      const route = await signOut({ redirect: false, callbackUrl: "/auth/login" });
+                      router.push(route.url);
                     }}
                     icon={<LogOutIcon className="mr-2 h-4 w-4" strokeWidth={1.5} />}>
                     {t("common.logout")}

apps/web/app/(app)/environments/[environmentId]/components/WidgetStatusIndicator.tsx

@@ -53,7 +53,7 @@ export const WidgetStatusIndicator = ({ environment }: WidgetStatusIndicatorProp
         <currentStatus.icon />
       </div>
       <p className="text-md font-bold text-slate-800 md:text-xl">{currentStatus.title}</p>
-      <p className="w-2/3 text-balance text-sm text-slate-600">{currentStatus.subtitle}</p>
+      <p className="w-2/3 text-sm text-balance text-slate-600">{currentStatus.subtitle}</p>
       {status === "notImplemented" && (
         <Button variant="outline" size="sm" className="bg-white" onClick={() => router.refresh()}>
           <RotateCcwIcon />

apps/web/app/(app)/environments/[environmentId]/context/environment-context.test.tsx

@@ -1,157 +0,0 @@
-import "@testing-library/jest-dom/vitest";
-import { cleanup, render, screen } from "@testing-library/react";
-import { afterEach, describe, expect, test } from "vitest";
-import { TEnvironment } from "@formbricks/types/environment";
-import { TProject } from "@formbricks/types/project";
-import { EnvironmentContextWrapper, useEnvironment } from "./environment-context";
-
-// Mock environment data
-const mockEnvironment: TEnvironment = {
-  id: "test-env-id",
-  createdAt: new Date(),
-  updatedAt: new Date(),
-  type: "development",
-  projectId: "test-project-id",
-  appSetupCompleted: true,
-};
-
-// Mock project data
-const mockProject = {
-  id: "test-project-id",
-  createdAt: new Date(),
-  updatedAt: new Date(),
-  organizationId: "test-org-id",
-  config: {
-    channel: "app",
-    industry: "saas",
-  },
-  linkSurveyBranding: true,
-  styling: {
-    allowStyleOverwrite: true,
-    brandColor: {
-      light: "#ffffff",
-      dark: "#000000",
-    },
-    questionColor: {
-      light: "#000000",
-      dark: "#ffffff",
-    },
-    inputColor: {
-      light: "#000000",
-      dark: "#ffffff",
-    },
-    inputBorderColor: {
-      light: "#cccccc",
-      dark: "#444444",
-    },
-    cardBackgroundColor: {
-      light: "#ffffff",
-      dark: "#000000",
-    },
-    cardBorderColor: {
-      light: "#cccccc",
-      dark: "#444444",
-    },
-    isDarkModeEnabled: false,
-    isLogoHidden: false,
-    hideProgressBar: false,
-    roundness: 8,
-    cardArrangement: {
-      linkSurveys: "casual",
-      appSurveys: "casual",
-    },
-  },
-  recontactDays: 30,
-  inAppSurveyBranding: true,
-  logo: {
-    url: "test-logo.png",
-    bgColor: "#ffffff",
-  },
-  placement: "bottomRight",
-  clickOutsideClose: true,
-} as TProject;
-
-// Test component that uses the hook
-const TestComponent = () => {
-  const { environment, project } = useEnvironment();
-  return (
-    <div>
-      <div data-testid="environment-id">{environment.id}</div>
-      <div data-testid="environment-type">{environment.type}</div>
-      <div data-testid="project-id">{project.id}</div>
-      <div data-testid="project-organization-id">{project.organizationId}</div>
-    </div>
-  );
-};
-
-describe("EnvironmentContext", () => {
-  afterEach(() => {
-    cleanup();
-  });
-
-  test("provides environment and project data to child components", () => {
-    render(
-      <EnvironmentContextWrapper environment={mockEnvironment} project={mockProject}>
-        <TestComponent />
-      </EnvironmentContextWrapper>
-    );
-
-    expect(screen.getByTestId("environment-id")).toHaveTextContent("test-env-id");
-    expect(screen.getByTestId("environment-type")).toHaveTextContent("development");
-    expect(screen.getByTestId("project-id")).toHaveTextContent("test-project-id");
-    expect(screen.getByTestId("project-organization-id")).toHaveTextContent("test-org-id");
-  });
-
-  test("throws error when useEnvironment is used outside of provider", () => {
-    const TestComponentWithoutProvider = () => {
-      useEnvironment();
-      return <div>Should not render</div>;
-    };
-
-    expect(() => {
-      render(<TestComponentWithoutProvider />);
-    }).toThrow("useEnvironment must be used within an EnvironmentProvider");
-  });
-
-  test("updates context value when environment or project changes", () => {
-    const { rerender } = render(
-      <EnvironmentContextWrapper environment={mockEnvironment} project={mockProject}>
-        <TestComponent />
-      </EnvironmentContextWrapper>
-    );
-
-    expect(screen.getByTestId("environment-type")).toHaveTextContent("development");
-
-    const updatedEnvironment = {
-      ...mockEnvironment,
-      type: "production" as const,
-    };
-
-    rerender(
-      <EnvironmentContextWrapper environment={updatedEnvironment} project={mockProject}>
-        <TestComponent />
-      </EnvironmentContextWrapper>
-    );
-
-    expect(screen.getByTestId("environment-type")).toHaveTextContent("production");
-  });
-
-  test("memoizes context value correctly", () => {
-    const { rerender } = render(
-      <EnvironmentContextWrapper environment={mockEnvironment} project={mockProject}>
-        <TestComponent />
-      </EnvironmentContextWrapper>
-    );
-
-    // Re-render with same props
-    rerender(
-      <EnvironmentContextWrapper environment={mockEnvironment} project={mockProject}>
-        <TestComponent />
-      </EnvironmentContextWrapper>
-    );
-
-    // Should still work correctly
-    expect(screen.getByTestId("environment-id")).toHaveTextContent("test-env-id");
-    expect(screen.getByTestId("project-id")).toHaveTextContent("test-project-id");
-  });
-});

apps/web/app/(app)/environments/[environmentId]/context/environment-context.tsx

@@ -1,47 +0,0 @@
-"use client";
-
-import { createContext, useContext, useMemo } from "react";
-import { TEnvironment } from "@formbricks/types/environment";
-import { TProject } from "@formbricks/types/project";
-
-export interface EnvironmentContextType {
-  environment: TEnvironment;
-  project: TProject;
-  organizationId: string;
-}
-
-const EnvironmentContext = createContext<EnvironmentContextType | null>(null);
-
-export const useEnvironment = () => {
-  const context = useContext(EnvironmentContext);
-  if (!context) {
-    throw new Error("useEnvironment must be used within an EnvironmentProvider");
-  }
-  return context;
-};
-
-// Client wrapper component to be used in server components
-interface EnvironmentContextWrapperProps {
-  environment: TEnvironment;
-  project: TProject;
-  children: React.ReactNode;
-}
-
-export const EnvironmentContextWrapper = ({
-  environment,
-  project,
-  children,
-}: EnvironmentContextWrapperProps) => {
-  const environmentContextValue = useMemo(
-    () => ({
-      environment,
-      project,
-      organizationId: project.organizationId,
-    }),
-    [environment, project]
-  );
-
-  return (
-    <EnvironmentContext.Provider value={environmentContextValue}>{children}</EnvironmentContext.Provider>
-  );
-};

apps/web/app/(app)/environments/[environmentId]/integrations/actions.ts

@@ -2,15 +2,13 @@
 
 import { createOrUpdateIntegration, deleteIntegration } from "@/lib/integration/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
-import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { AuthenticatedActionClientCtx } from "@/lib/utils/action-client/types/context";
+import { checkAuthorizationUpdated } from "@/lib/utils/action-client-middleware";
 import {
   getOrganizationIdFromEnvironmentId,
   getOrganizationIdFromIntegrationId,
   getProjectIdFromEnvironmentId,
   getProjectIdFromIntegrationId,
 } from "@/lib/utils/helper";
-import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
 import { ZIntegrationInput } from "@formbricks/types/integration";
@@ -22,79 +20,48 @@ const ZCreateOrUpdateIntegrationAction = z.object({
 
 export const createOrUpdateIntegrationAction = authenticatedActionClient
   .schema(ZCreateOrUpdateIntegrationAction)
-  .action(
-    withAuditLogging(
-      "createdUpdated",
-      "integration",
-      async ({
-        ctx,
-        parsedInput,
-      }: {
-        ctx: AuthenticatedActionClientCtx;
-        parsedInput: Record<string, any>;
-      }) => {
-        const organizationId = await getOrganizationIdFromEnvironmentId(parsedInput.environmentId);
+  .action(async ({ ctx, parsedInput }) => {
+    await checkAuthorizationUpdated({
+      userId: ctx.user.id,
+      organizationId: await getOrganizationIdFromEnvironmentId(parsedInput.environmentId),
+      access: [
+        {
+          type: "organization",
+          roles: ["owner", "manager"],
+        },
+        {
+          type: "projectTeam",
+          minPermission: "readWrite",
+          projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
+        },
+      ],
+    });
 
-        await checkAuthorizationUpdated({
-          userId: ctx.user.id,
-          organizationId,
-          access: [
-            {
-              type: "organization",
-              roles: ["owner", "manager"],
-            },
-            {
-              type: "projectTeam",
-              minPermission: "readWrite",
-              projectId: await getProjectIdFromEnvironmentId(parsedInput.environmentId),
-            },
-          ],
-        });
-
-        ctx.auditLoggingCtx.organizationId = organizationId;
-        const result = await createOrUpdateIntegration(
-          parsedInput.environmentId,
-          parsedInput.integrationData
-        );
-        ctx.auditLoggingCtx.integrationId = result.id;
-        ctx.auditLoggingCtx.newObject = result;
-        return result;
-      }
-    )
-  );
+    return await createOrUpdateIntegration(parsedInput.environmentId, parsedInput.integrationData);
+  });
 
 const ZDeleteIntegrationAction = z.object({
   integrationId: ZId,
 });
 
-export const deleteIntegrationAction = authenticatedActionClient.schema(ZDeleteIntegrationAction).action(
-  withAuditLogging(
-    "deleted",
-    "integration",
-    async ({ ctx, parsedInput }: { ctx: AuthenticatedActionClientCtx; parsedInput: Record<string, any> }) => {
-      const organizationId = await getOrganizationIdFromIntegrationId(parsedInput.integrationId);
+export const deleteIntegrationAction = authenticatedActionClient
+  .schema(ZDeleteIntegrationAction)
+  .action(async ({ ctx, parsedInput }) => {
+    await checkAuthorizationUpdated({
+      userId: ctx.user.id,
+      organizationId: await getOrganizationIdFromIntegrationId(parsedInput.integrationId),
+      access: [
+        {
+          type: "organization",
+          roles: ["owner", "manager"],
+        },
+        {
+          type: "projectTeam",
+          projectId: await getProjectIdFromIntegrationId(parsedInput.integrationId),
+          minPermission: "readWrite",
+        },
+      ],
+    });
 
-      await checkAuthorizationUpdated({
-        userId: ctx.user.id,
-        organizationId,
-        access: [
-          {
-            type: "organization",
-            roles: ["owner", "manager"],
-          },
-          {
-            type: "projectTeam",
-            projectId: await getProjectIdFromIntegrationId(parsedInput.integrationId),
-            minPermission: "readWrite",
-          },
-        ],
-      });
-
-      ctx.auditLoggingCtx.organizationId = organizationId;
-      ctx.auditLoggingCtx.integrationId = parsedInput.integrationId;
-      const result = await deleteIntegration(parsedInput.integrationId);
-      ctx.auditLoggingCtx.oldObject = result;
-      return result;
-    }
-  )
-);
+    return await deleteIntegration(parsedInput.integrationId);
+  });

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.test.tsx

@@ -1,466 +0,0 @@
-import { createOrUpdateIntegrationAction } from "@/app/(app)/environments/[environmentId]/integrations/actions";
-import { fetchTables } from "@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable";
-import { cleanup, render, screen, waitFor } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { useRouter } from "next/navigation";
-import { toast } from "react-hot-toast";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { TIntegrationItem } from "@formbricks/types/integration";
-import {
-  TIntegrationAirtable,
-  TIntegrationAirtableConfigData,
-  TIntegrationAirtableCredential,
-  TIntegrationAirtableTables,
-} from "@formbricks/types/integration/airtable";
-import { TSurvey } from "@formbricks/types/surveys/types";
-import { AddIntegrationModal } from "./AddIntegrationModal";
-
-// Mock dependencies
-vi.mock("@/app/(app)/environments/[environmentId]/integrations/actions", () => ({
-  createOrUpdateIntegrationAction: vi.fn(),
-}));
-vi.mock(
-  "@/app/(app)/environments/[environmentId]/integrations/airtable/components/BaseSelectDropdown",
-  () => ({
-    BaseSelectDropdown: ({ control, airtableArray, fetchTable, defaultValue, setValue }) => (
-      <div>
-        <label htmlFor="base">Base</label>
-        <select
-          id="base"
-          defaultValue={defaultValue}
-          onChange={(e) => {
-            control._mockOnChange({ target: { name: "base", value: e.target.value } });
-            setValue("table", ""); // Reset table when base changes
-            fetchTable(e.target.value);
-          }}>
-          <option value="">Select Base</option>
-          {airtableArray.map((item) => (
-            <option key={item.id} value={item.id}>
-              {item.name}
-            </option>
-          ))}
-        </select>
-      </div>
-    ),
-  })
-);
-vi.mock("@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable", () => ({
-  fetchTables: vi.fn(),
-}));
-vi.mock("@/lib/i18n/utils", () => ({
-  getLocalizedValue: (value, _locale) => value?.default || value || "",
-}));
-vi.mock("@/lib/utils/recall", () => ({
-  replaceHeadlineRecall: (survey, _locale) => survey,
-}));
-vi.mock("@/modules/ui/components/additional-integration-settings", () => ({
-  AdditionalIntegrationSettings: ({
-    includeVariables,
-    setIncludeVariables,
-    includeHiddenFields,
-    setIncludeHiddenFields,
-    includeMetadata,
-    setIncludeMetadata,
-    includeCreatedAt,
-    setIncludeCreatedAt,
-  }) => (
-    <div data-testid="additional-settings">
-      <input
-        type="checkbox"
-        data-testid="include-variables"
-        checked={includeVariables}
-        onChange={(e) => setIncludeVariables(e.target.checked)}
-      />
-      <input
-        type="checkbox"
-        data-testid="include-hidden"
-        checked={includeHiddenFields}
-        onChange={(e) => setIncludeHiddenFields(e.target.checked)}
-      />
-      <input
-        type="checkbox"
-        data-testid="include-metadata"
-        checked={includeMetadata}
-        onChange={(e) => setIncludeMetadata(e.target.checked)}
-      />
-      <input
-        type="checkbox"
-        data-testid="include-createdat"
-        checked={includeCreatedAt}
-        onChange={(e) => setIncludeCreatedAt(e.target.checked)}
-      />
-    </div>
-  ),
-}));
-vi.mock("@/modules/ui/components/dialog", () => ({
-  Dialog: ({ children, open, onOpenChange }: any) =>
-    open ? (
-      <div data-testid="dialog" role="dialog">
-        {children}
-        <button onClick={() => onOpenChange(false)}>Close Dialog</button>
-      </div>
-    ) : null,
-  DialogContent: ({ children, ...props }: any) => (
-    <div data-testid="dialog-content" {...props}>
-      {children}
-    </div>
-  ),
-  DialogHeader: ({ children }: any) => <div data-testid="dialog-header">{children}</div>,
-  DialogTitle: ({ children }: any) => <h2 data-testid="dialog-title">{children}</h2>,
-  DialogDescription: ({ children }: any) => <p data-testid="dialog-description">{children}</p>,
-  DialogBody: ({ children }: any) => <div data-testid="dialog-body">{children}</div>,
-  DialogFooter: ({ children }: any) => <div data-testid="dialog-footer">{children}</div>,
-}));
-vi.mock("@/modules/ui/components/alert", () => ({
-  Alert: ({ children }) => <div data-testid="alert">{children}</div>,
-  AlertTitle: ({ children }) => <div data-testid="alert-title">{children}</div>,
-  AlertDescription: ({ children }) => <div data-testid="alert-description">{children}</div>,
-}));
-vi.mock("next/image", () => ({
-  // eslint-disable-next-line @next/next/no-img-element
-  default: (props) => <img alt="test" {...props} />,
-}));
-vi.mock("next/navigation", () => ({
-  useRouter: vi.fn(() => ({ refresh: vi.fn() })),
-}));
-
-// Mock the Select component used for Table and Survey selections
-vi.mock("@/modules/ui/components/select", () => ({
-  Select: ({ children }) => (
-    // Render children, assuming Controller passes props to the Trigger/Value
-    // The actual select logic will be handled by the mocked Controller/field
-    // We need to simulate the structure expected by the Controller render prop
-    <div>{children}</div>
-  ),
-  SelectTrigger: ({ children, ...props }) => <div {...props}>{children}</div>, // Mock Trigger
-  SelectValue: ({ placeholder }) => <span>{placeholder || "Select..."}</span>, // Mock Value display
-  SelectContent: ({ children }) => <div>{children}</div>, // Mock Content wrapper
-  SelectItem: ({ children, value, ...props }) => (
-    // Mock Item - crucial for userEvent.selectOptions if we were using a real select
-    // For Controller, the value change is handled by field.onChange directly
-    <div data-value={value} {...props}>
-      {children}
-    </div>
-  ),
-}));
-
-// Mock react-hook-form Controller to render a simple select
-vi.mock("react-hook-form", async () => {
-  const actual = await vi.importActual("react-hook-form");
-  let fields = {};
-  const mockReset = vi.fn((values) => {
-    fields = values || {}; // Reset fields, optionally with new values
-  });
-
-  return {
-    ...actual,
-    useForm: vi.fn((options) => {
-      fields = options?.defaultValues || {};
-      const mockControlOnChange = (event) => {
-        if (event && event.target) {
-          fields[event.target.name] = event.target.value;
-        }
-      };
-      return {
-        handleSubmit: (fn) => (e) => {
-          e?.preventDefault();
-          fn(fields);
-        },
-        control: {
-          _mockOnChange: mockControlOnChange,
-          // Add other necessary control properties if needed
-          register: vi.fn(),
-          unregister: vi.fn(),
-          getFieldState: vi.fn(() => ({ invalid: false, isDirty: false, isTouched: false, error: null })),
-          _names: { mount: new Set(), unMount: new Set(), array: new Set(), watch: new Set() },
-          _options: {},
-          _proxyFormState: {
-            isDirty: false,
-            isValidating: false,
-            dirtyFields: {},
-            touchedFields: {},
-            errors: {},
-          },
-          _formState: { isDirty: false, isValidating: false, dirtyFields: {}, touchedFields: {}, errors: {} },
-          _updateFormState: vi.fn(),
-          _updateFieldArray: vi.fn(),
-          _executeSchema: vi.fn().mockResolvedValue({ errors: {}, values: {} }),
-          _getWatch: vi.fn(),
-          _subjects: {
-            watch: { subscribe: vi.fn() },
-            array: { subscribe: vi.fn() },
-            state: { subscribe: vi.fn() },
-          },
-          _getDirty: vi.fn(),
-          _reset: vi.fn(),
-          _removeUnmounted: vi.fn(),
-        },
-        watch: (name) => fields[name],
-        setValue: (name, value) => {
-          fields[name] = value;
-        },
-        reset: mockReset,
-        formState: { errors: {}, isDirty: false, isValid: true, isSubmitting: false },
-        getValues: (name) => (name ? fields[name] : fields),
-      };
-    }),
-    Controller: ({ name, defaultValue }) => {
-      // Initialize field value if not already set by reset/defaultValues
-      if (fields[name] === undefined && defaultValue !== undefined) {
-        fields[name] = defaultValue;
-      }
-
-      const field = {
-        onChange: (valueOrEvent) => {
-          const value = valueOrEvent?.target ? valueOrEvent.target.value : valueOrEvent;
-          fields[name] = value;
-          // Re-render might be needed here in a real scenario, but testing library handles it
-        },
-        onBlur: vi.fn(),
-        value: fields[name],
-        name: name,
-        ref: vi.fn(),
-      };
-
-      // Find the corresponding label to associate with the select
-      const labelId = name; // Assuming label 'for' matches field name
-      const labelText =
-        name === "table" ? "environments.integrations.airtable.table_name" : "common.select_survey";
-
-      // Render a simple select element instead of the complex component
-      // This makes interaction straightforward with userEvent.selectOptions
-      return (
-        <>
-          {/* The actual label is rendered outside the Controller in the component */}
-          <select
-            id={labelId}
-            aria-label={labelText} // Use aria-label for accessibility in tests
-            {...field} // Spread field props
-            defaultValue={defaultValue} // Pass defaultValue
-          >
-            {/* Need to dynamically get options based on context, simplified here */}
-            {name === "table" &&
-              mockTables.map((t) => (
-                <option key={t.id} value={t.id}>
-                  {t.name}
-                </option>
-              ))}
-            {name === "survey" &&
-              mockSurveys.map((s) => (
-                <option key={s.id} value={s.id}>
-                  {s.name}
-                </option>
-              ))}
-          </select>
-        </>
-      );
-    },
-    reset: mockReset,
-  };
-});
-
-const environmentId = "test-env-id";
-const mockSurveys: TSurvey[] = [
-  {
-    id: "survey1",
-    name: "Survey 1",
-    questions: [
-      { id: "q1", headline: { default: "Question 1" } },
-      { id: "q2", headline: { default: "Question 2" } },
-    ],
-    hiddenFields: { enabled: true, fieldIds: ["hf1"] },
-    variables: { enabled: true, fieldIds: ["var1"] },
-  } as any,
-  {
-    id: "survey2",
-    name: "Survey 2",
-    questions: [{ id: "q3", headline: { default: "Question 3" } }],
-    hiddenFields: { enabled: false },
-    variables: { enabled: false },
-  } as any,
-];
-const mockAirtableArray: TIntegrationItem[] = [
-  { id: "base1", name: "Base 1" },
-  { id: "base2", name: "Base 2" },
-];
-const mockAirtableIntegration: TIntegrationAirtable = {
-  id: "integration1",
-  type: "airtable",
-  environmentId,
-  config: {
-    key: { access_token: "abc" } as TIntegrationAirtableCredential,
-    email: "test@test.com",
-    data: [],
-  },
-};
-const mockTables: TIntegrationAirtableTables["tables"] = [
-  { id: "table1", name: "Table 1" },
-  { id: "table2", name: "Table 2" },
-];
-const mockSetOpenWithStates = vi.fn();
-const mockRouterRefresh = vi.fn();
-
-describe("AddIntegrationModal", () => {
-  beforeEach(async () => {
-    vi.clearAllMocks();
-    vi.mocked(useRouter).mockReturnValue({ refresh: mockRouterRefresh } as any);
-  });
-
-  afterEach(() => {
-    cleanup();
-  });
-
-  test("renders in add mode correctly", () => {
-    render(
-      <AddIntegrationModal
-        open={true}
-        setOpenWithStates={mockSetOpenWithStates}
-        environmentId={environmentId}
-        airtableArray={mockAirtableArray}
-        surveys={mockSurveys}
-        airtableIntegration={mockAirtableIntegration}
-        isEditMode={false}
-      />
-    );
-
-    expect(screen.getByText("environments.integrations.airtable.link_airtable_table")).toBeInTheDocument();
-    expect(screen.getByLabelText("Base")).toBeInTheDocument();
-    // Use getByLabelText for the mocked selects
-    expect(screen.getByLabelText("environments.integrations.airtable.table_name")).toBeInTheDocument();
-    expect(screen.getByLabelText("common.select_survey")).toBeInTheDocument();
-    expect(screen.getByText("common.save")).toBeInTheDocument();
-    expect(screen.getByText("common.cancel")).toBeInTheDocument();
-    expect(screen.queryByText("common.delete")).not.toBeInTheDocument();
-  });
-
-  test("shows 'No Base Found' error when airtableArray is empty", () => {
-    render(
-      <AddIntegrationModal
-        open={true}
-        setOpenWithStates={mockSetOpenWithStates}
-        environmentId={environmentId}
-        airtableArray={[]}
-        surveys={mockSurveys}
-        airtableIntegration={mockAirtableIntegration}
-        isEditMode={false}
-      />
-    );
-    expect(screen.getByTestId("alert-title")).toHaveTextContent(
-      "environments.integrations.airtable.no_bases_found"
-    );
-  });
-
-  test("shows 'No Surveys Found' warning when surveys array is empty", () => {
-    render(
-      <AddIntegrationModal
-        open={true}
-        setOpenWithStates={mockSetOpenWithStates}
-        environmentId={environmentId}
-        airtableArray={mockAirtableArray}
-        surveys={[]}
-        airtableIntegration={mockAirtableIntegration}
-        isEditMode={false}
-      />
-    );
-    expect(screen.getByText("environments.integrations.create_survey_warning")).toBeInTheDocument();
-  });
-
-  test("fetches and displays tables when a base is selected", async () => {
-    vi.mocked(fetchTables).mockResolvedValue({ tables: mockTables });
-    render(
-      <AddIntegrationModal
-        open={true}
-        setOpenWithStates={mockSetOpenWithStates}
-        environmentId={environmentId}
-        airtableArray={mockAirtableArray}
-        surveys={mockSurveys}
-        airtableIntegration={mockAirtableIntegration}
-        isEditMode={false}
-      />
-    );
-
-    const baseSelect = screen.getByLabelText("Base");
-    await userEvent.selectOptions(baseSelect, "base1");
-
-    expect(fetchTables).toHaveBeenCalledWith(environmentId, "base1");
-    await waitFor(() => {
-      // Use getByLabelText (mocked select)
-      const tableSelect = screen.getByLabelText("environments.integrations.airtable.table_name");
-      expect(tableSelect).toBeEnabled();
-      // Check options within the mocked select
-      expect(tableSelect.querySelector("option[value='table1']")).toBeInTheDocument();
-      expect(tableSelect.querySelector("option[value='table2']")).toBeInTheDocument();
-    });
-  });
-
-  test("handles deletion in edit mode", async () => {
-    const initialData: TIntegrationAirtableConfigData = {
-      baseId: "base1",
-      tableId: "table1",
-      surveyId: "survey1",
-      questionIds: ["q1"],
-      questions: "common.selected_questions",
-      tableName: "Table 1",
-      surveyName: "Survey 1",
-      createdAt: new Date(),
-      includeVariables: false,
-      includeHiddenFields: false,
-      includeMetadata: false,
-      includeCreatedAt: true,
-    };
-    const integrationWithData = {
-      ...mockAirtableIntegration,
-      config: { ...mockAirtableIntegration.config, data: [initialData] },
-    };
-    const defaultData = { ...initialData, index: 0 } as any;
-
-    vi.mocked(fetchTables).mockResolvedValue({ tables: mockTables });
-    vi.mocked(createOrUpdateIntegrationAction).mockResolvedValue({ ok: true, data: {} } as any);
-
-    render(
-      <AddIntegrationModal
-        open={true}
-        setOpenWithStates={mockSetOpenWithStates}
-        environmentId={environmentId}
-        airtableArray={mockAirtableArray}
-        surveys={mockSurveys}
-        airtableIntegration={integrationWithData}
-        isEditMode={true}
-        defaultData={defaultData}
-      />
-    );
-
-    await waitFor(() => expect(fetchTables).toHaveBeenCalled()); // Wait for initial load
-
-    // Click delete
-    await userEvent.click(screen.getByText("common.delete"));
-
-    await waitFor(() => {
-      expect(createOrUpdateIntegrationAction).toHaveBeenCalledTimes(1);
-      const submittedData = vi.mocked(createOrUpdateIntegrationAction).mock.calls[0][0].integrationData;
-      // Expect data array to be empty after deletion
-      expect(submittedData.config.data).toHaveLength(0);
-    });
-
-    expect(toast.success).toHaveBeenCalledWith("environments.integrations.integration_removed_successfully");
-    expect(mockSetOpenWithStates).toHaveBeenCalledWith(false);
-    expect(mockRouterRefresh).toHaveBeenCalled();
-  });
-
-  test("handles cancel button click", async () => {
-    render(
-      <AddIntegrationModal
-        open={true}
-        setOpenWithStates={mockSetOpenWithStates}
-        environmentId={environmentId}
-        airtableArray={mockAirtableArray}
-        surveys={mockSurveys}
-        airtableIntegration={mockAirtableIntegration}
-        isEditMode={false}
-      />
-    );
-
-    await userEvent.click(screen.getByText("common.cancel"));
-    expect(mockSetOpenWithStates).toHaveBeenCalledWith(false);
-  });
-});

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AddIntegrationModal.tsx

@@ -10,16 +10,8 @@ import { AdditionalIntegrationSettings } from "@/modules/ui/components/additiona
 import { Alert, AlertDescription, AlertTitle } from "@/modules/ui/components/alert";
 import { Button } from "@/modules/ui/components/button";
 import { Checkbox } from "@/modules/ui/components/checkbox";
-import {
-  Dialog,
-  DialogBody,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/modules/ui/components/dialog";
 import { Label } from "@/modules/ui/components/label";
+import { Modal } from "@/modules/ui/components/modal";
 import {
   Select,
   SelectContent,
@@ -27,11 +19,11 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/modules/ui/components/select";
-import { TFnType, useTranslate } from "@tolgee/react";
+import { useTranslate } from "@tolgee/react";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
-import { Control, Controller, useForm } from "react-hook-form";
+import { Controller, useForm } from "react-hook-form";
 import { toast } from "react-hot-toast";
 import { TIntegrationItem } from "@formbricks/types/integration";
 import {
@@ -76,80 +68,6 @@ const NoBaseFoundError = () => {
   );
 };
 
-const renderQuestionSelection = ({
-  t,
-  selectedSurvey,
-  control,
-  includeVariables,
-  setIncludeVariables,
-  includeHiddenFields,
-  includeMetadata,
-  setIncludeHiddenFields,
-  setIncludeMetadata,
-  includeCreatedAt,
-  setIncludeCreatedAt,
-}: {
-  t: TFnType;
-  selectedSurvey: TSurvey;
-  control: Control<IntegrationModalInputs>;
-  includeVariables: boolean;
-  setIncludeVariables: (value: boolean) => void;
-  includeHiddenFields: boolean;
-  includeMetadata: boolean;
-  setIncludeHiddenFields: (value: boolean) => void;
-  setIncludeMetadata: (value: boolean) => void;
-  includeCreatedAt: boolean;
-  setIncludeCreatedAt: (value: boolean) => void;
-}) => {
-  return (
-    <div className="space-y-4">
-      <div>
-        <Label htmlFor="Surveys">{t("common.questions")}</Label>
-        <div className="mt-1 max-h-[15vh] overflow-y-auto rounded-lg border border-slate-200">
-          <div className="grid content-center rounded-lg bg-slate-50 p-3 text-left text-sm text-slate-900">
-            {replaceHeadlineRecall(selectedSurvey, "default")?.questions.map((question) => (
-              <Controller
-                key={question.id}
-                control={control}
-                name={"questions"}
-                render={({ field }) => (
-                  <div className="my-1 flex items-center space-x-2">
-                    <label htmlFor={question.id} className="flex cursor-pointer items-center">
-                      <Checkbox
-                        type="button"
-                        id={question.id}
-                        value={question.id}
-                        className="bg-white"
-                        checked={field.value?.includes(question.id)}
-                        onCheckedChange={(checked) => {
-                          return checked
-                            ? field.onChange([...field.value, question.id])
-                            : field.onChange(field.value?.filter((value) => value !== question.id));
-                        }}
-                      />
-                      <span className="ml-2">{getLocalizedValue(question.headline, "default")}</span>
-                    </label>
-                  </div>
-                )}
-              />
-            ))}
-          </div>
-        </div>
-      </div>
-      <AdditionalIntegrationSettings
-        includeVariables={includeVariables}
-        setIncludeVariables={setIncludeVariables}
-        includeHiddenFields={includeHiddenFields}
-        includeMetadata={includeMetadata}
-        setIncludeHiddenFields={setIncludeHiddenFields}
-        setIncludeMetadata={setIncludeMetadata}
-        includeCreatedAt={includeCreatedAt}
-        setIncludeCreatedAt={setIncludeCreatedAt}
-      />
-    </div>
-  );
-};
-
 export const AddIntegrationModal = ({
   open,
   setOpenWithStates,
@@ -292,148 +210,182 @@ export const AddIntegrationModal = ({
   };
 
   return (
-    <Dialog open={open} onOpenChange={setOpenWithStates}>
-      <DialogContent className="overflow-visible md:overflow-visible">
-        <DialogHeader>
+    <Modal open={open} setOpen={handleClose} noPadding>
+      <div className="rounded-t-lg bg-slate-100">
+        <div className="flex w-full items-center justify-between p-6">
           <div className="flex items-center space-x-2">
-            <div className="relative size-8">
-              <Image
-                fill
-                className="object-contain object-center"
-                src={AirtableLogo}
-                alt={t("environments.integrations.airtable.airtable_logo")}
-              />
+            <div className="mr-1.5 h-6 w-6 text-slate-500">
+              <Image className="w-12" src={AirtableLogo} alt="Airtable logo" />
             </div>
-            <div className="space-y-0.5">
-              <DialogTitle>{t("environments.integrations.airtable.link_airtable_table")}</DialogTitle>
-              <DialogDescription>
+            <div>
+              <div className="text-xl font-medium text-slate-700">
+                {t("environments.integrations.airtable.link_airtable_table")}
+              </div>
+              <div className="text-sm text-slate-500">
                 {t("environments.integrations.airtable.sync_responses_with_airtable")}
-              </DialogDescription>
+              </div>
             </div>
           </div>
-        </DialogHeader>
-        <form className="space-y-4" onSubmit={handleSubmit(submitHandler)}>
-          <DialogBody className="overflow-visible">
-            <div className="flex w-full flex-col gap-y-4">
-              {airtableArray.length ? (
-                <BaseSelectDropdown
-                  control={control}
-                  isLoading={isLoading}
-                  fetchTable={fetchTable}
-                  airtableArray={airtableArray}
-                  setValue={setValue}
-                  defaultValue={defaultData?.base}
-                />
-              ) : (
-                <NoBaseFoundError />
-              )}
+        </div>
+      </div>
+      <form onSubmit={handleSubmit(submitHandler)}>
+        <div className="flex rounded-lg p-6">
+          <div className="flex w-full flex-col gap-y-4 pt-5">
+            {airtableArray.length ? (
+              <BaseSelectDropdown
+                control={control}
+                isLoading={isLoading}
+                fetchTable={fetchTable}
+                airtableArray={airtableArray}
+                setValue={setValue}
+                defaultValue={defaultData?.base}
+              />
+            ) : (
+              <NoBaseFoundError />
+            )}
 
+            <div className="flex w-full flex-col">
+              <Label htmlFor="table">{t("environments.integrations.airtable.table_name")}</Label>
+              <div className="mt-1 flex">
+                <Controller
+                  control={control}
+                  name="table"
+                  render={({ field }) => (
+                    <Select
+                      required
+                      disabled={!tables.length}
+                      onValueChange={(val) => {
+                        field.onChange(val);
+                      }}
+                      defaultValue={defaultData?.table}>
+                      <SelectTrigger>
+                        <SelectValue />
+                      </SelectTrigger>
+                      {tables.length ? (
+                        <SelectContent>
+                          {tables.map((item) => (
+                            <SelectItem key={item.id} value={item.id}>
+                              {item.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
+                      ) : null}
+                    </Select>
+                  )}
+                />
+              </div>
+            </div>
+
+            {surveys.length ? (
               <div className="flex w-full flex-col">
-                <Label htmlFor="table">{t("environments.integrations.airtable.table_name")}</Label>
+                <Label htmlFor="survey">{t("common.select_survey")}</Label>
                 <div className="mt-1 flex">
                   <Controller
                     control={control}
-                    name="table"
+                    name="survey"
                     render={({ field }) => (
                       <Select
                         required
-                        disabled={!tables.length}
                         onValueChange={(val) => {
                           field.onChange(val);
+                          setValue("questions", []);
                         }}
-                        defaultValue={defaultData?.table}>
+                        defaultValue={defaultData?.survey}>
                         <SelectTrigger>
                           <SelectValue />
                         </SelectTrigger>
-                        {tables.length ? (
-                          <SelectContent>
-                            {tables.map((item) => (
-                              <SelectItem key={item.id} value={item.id}>
-                                {item.name}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        ) : null}
+                        <SelectContent>
+                          {surveys.map((item) => (
+                            <SelectItem key={item.id} value={item.id}>
+                              {item.name}
+                            </SelectItem>
+                          ))}
+                        </SelectContent>
                       </Select>
                     )}
                   />
                 </div>
               </div>
+            ) : null}
 
-              {surveys.length ? (
-                <div className="flex w-full flex-col">
-                  <Label htmlFor="survey">{t("common.select_survey")}</Label>
-                  <div className="mt-1 flex">
-                    <Controller
-                      control={control}
-                      name="survey"
-                      render={({ field }) => (
-                        <Select
-                          required
-                          onValueChange={(val) => {
-                            field.onChange(val);
-                            setValue("questions", []);
-                          }}
-                          defaultValue={defaultData?.survey}>
-                          <SelectTrigger>
-                            <SelectValue />
-                          </SelectTrigger>
-                          <SelectContent>
-                            {surveys.map((item) => (
-                              <SelectItem key={item.id} value={item.id}>
-                                {item.name}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
-                      )}
-                    />
+            {!surveys.length ? (
+              <p className="m-1 text-xs text-slate-500">
+                {t("environments.integrations.create_survey_warning")}
+              </p>
+            ) : null}
+
+            {survey && selectedSurvey && (
+              <div className="space-y-4">
+                <div>
+                  <Label htmlFor="Surveys">{t("common.questions")}</Label>
+                  <div className="mt-1 max-h-[15vh] overflow-y-auto rounded-lg border border-slate-200">
+                    <div className="grid content-center rounded-lg bg-slate-50 p-3 text-left text-sm text-slate-900">
+                      {replaceHeadlineRecall(selectedSurvey, "default")?.questions.map((question) => (
+                        <Controller
+                          key={question.id}
+                          control={control}
+                          name={"questions"}
+                          render={({ field }) => (
+                            <div className="my-1 flex items-center space-x-2">
+                              <label htmlFor={question.id} className="flex cursor-pointer items-center">
+                                <Checkbox
+                                  type="button"
+                                  id={question.id}
+                                  value={question.id}
+                                  className="bg-white"
+                                  checked={field.value?.includes(question.id)}
+                                  onCheckedChange={(checked) => {
+                                    return checked
+                                      ? field.onChange([...field.value, question.id])
+                                      : field.onChange(field.value?.filter((value) => value !== question.id));
+                                  }}
+                                />
+                                <span className="ml-2">
+                                  {getLocalizedValue(question.headline, "default")}
+                                </span>
+                              </label>
+                            </div>
+                          )}
+                        />
+                      ))}
+                    </div>
                   </div>
                 </div>
-              ) : (
-                <p className="m-1 text-xs text-slate-500">
-                  {t("environments.integrations.create_survey_warning")}
-                </p>
-              )}
-
-              {survey &&
-                selectedSurvey &&
-                renderQuestionSelection({
-                  t,
-                  selectedSurvey,
-                  control,
-                  includeVariables,
-                  setIncludeVariables,
-                  includeHiddenFields,
-                  includeMetadata,
-                  setIncludeHiddenFields,
-                  setIncludeMetadata,
-                  includeCreatedAt,
-                  setIncludeCreatedAt,
-                })}
-            </div>
-          </DialogBody>
-          <DialogFooter>
-            {isEditMode ? (
-              <Button
-                onClick={async () => {
-                  await handleDelete(defaultData.index);
-                }}
-                type="button"
-                loading={isLoading}
-                variant="destructive">
-                {t("common.delete")}
-              </Button>
-            ) : (
-              <Button type="button" loading={isLoading} variant="ghost" onClick={handleClose}>
-                {t("common.cancel")}
-              </Button>
+                <AdditionalIntegrationSettings
+                  includeVariables={includeVariables}
+                  setIncludeVariables={setIncludeVariables}
+                  includeHiddenFields={includeHiddenFields}
+                  includeMetadata={includeMetadata}
+                  setIncludeHiddenFields={setIncludeHiddenFields}
+                  setIncludeMetadata={setIncludeMetadata}
+                  includeCreatedAt={includeCreatedAt}
+                  setIncludeCreatedAt={setIncludeCreatedAt}
+                />
+              </div>
             )}
 
-            <Button type="submit">{t("common.save")}</Button>
-          </DialogFooter>
-        </form>
-      </DialogContent>
-    </Dialog>
+            <div className="flex justify-end gap-x-2">
+              {isEditMode ? (
+                <Button
+                  onClick={async () => {
+                    await handleDelete(defaultData.index);
+                  }}
+                  type="button"
+                  loading={isLoading}
+                  variant="destructive">
+                  {t("common.delete")}
+                </Button>
+              ) : (
+                <Button type="button" loading={isLoading} variant="ghost" onClick={handleClose}>
+                  {t("common.cancel")}
+                </Button>
+              )}
+
+              <Button type="submit">{t("common.save")}</Button>
+            </div>
+          </div>
+        </div>
+      </form>
+    </Modal>
   );
 };

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/AirtableWrapper.test.tsx

@@ -1,134 +0,0 @@
-import { authorize } from "@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable";
-import { cleanup, render, screen } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { TEnvironment } from "@formbricks/types/environment";
-import { TIntegrationAirtable } from "@formbricks/types/integration/airtable";
-import { AirtableWrapper } from "./AirtableWrapper";
-
-// Mock child components
-vi.mock(
-  "@/app/(app)/environments/[environmentId]/integrations/airtable/components/ManageIntegration",
-  () => ({
-    ManageIntegration: ({ setIsConnected }) => (
-      <div data-testid="manage-integration">
-        <button onClick={() => setIsConnected(false)}>Disconnect</button>
-      </div>
-    ),
-  })
-);
-vi.mock("@/modules/ui/components/connect-integration", () => ({
-  ConnectIntegration: ({ handleAuthorization, isEnabled }) => (
-    <div data-testid="connect-integration">
-      <button onClick={handleAuthorization} disabled={!isEnabled}>
-        Connect
-      </button>
-    </div>
-  ),
-}));
-
-// Mock library function
-vi.mock("@/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable", () => ({
-  authorize: vi.fn(),
-}));
-
-// Mock image import
-vi.mock("@/images/airtableLogo.svg", () => ({
-  default: "airtable-logo-path",
-}));
-
-// Mock window.location.replace
-Object.defineProperty(window, "location", {
-  value: {
-    replace: vi.fn(),
-  },
-  writable: true,
-});
-
-const environmentId = "test-env-id";
-const webAppUrl = "https://app.formbricks.com";
-const environment = { id: environmentId } as TEnvironment;
-const surveys = [];
-const airtableArray = [];
-const locale = "en-US" as const;
-
-const baseProps = {
-  environmentId,
-  airtableArray,
-  surveys,
-  environment,
-  webAppUrl,
-  locale,
-};
-
-describe("AirtableWrapper", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  test("renders ConnectIntegration when not connected (no integration)", () => {
-    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={undefined} />);
-    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
-    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
-    expect(screen.getByRole("button", { name: "Connect" })).toBeEnabled();
-  });
-
-  test("renders ConnectIntegration when not connected (integration without key)", () => {
-    const integrationWithoutKey = { config: {} } as TIntegrationAirtable;
-    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={integrationWithoutKey} />);
-    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
-    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
-  });
-
-  test("renders ConnectIntegration disabled when isEnabled is false", () => {
-    render(<AirtableWrapper {...baseProps} isEnabled={false} airtableIntegration={undefined} />);
-    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
-    expect(screen.getByRole("button", { name: "Connect" })).toBeDisabled();
-  });
-
-  test("calls authorize and redirects when Connect button is clicked", async () => {
-    const mockAuthorize = vi.mocked(authorize);
-    const redirectUrl = "https://airtable.com/auth";
-    mockAuthorize.mockResolvedValue(redirectUrl);
-
-    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={undefined} />);
-
-    const connectButton = screen.getByRole("button", { name: "Connect" });
-    await userEvent.click(connectButton);
-
-    expect(mockAuthorize).toHaveBeenCalledWith(environmentId, webAppUrl);
-    await vi.waitFor(() => {
-      expect(window.location.replace).toHaveBeenCalledWith(redirectUrl);
-    });
-  });
-
-  test("renders ManageIntegration when connected", () => {
-    const connectedIntegration = {
-      id: "int-1",
-      config: { key: { access_token: "abc" }, email: "test@test.com", data: [] },
-    } as unknown as TIntegrationAirtable;
-    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={connectedIntegration} />);
-    expect(screen.getByTestId("manage-integration")).toBeInTheDocument();
-    expect(screen.queryByTestId("connect-integration")).not.toBeInTheDocument();
-  });
-
-  test("switches from ManageIntegration to ConnectIntegration when disconnected", async () => {
-    const connectedIntegration = {
-      id: "int-1",
-      config: { key: { access_token: "abc" }, email: "test@test.com", data: [] },
-    } as unknown as TIntegrationAirtable;
-    render(<AirtableWrapper {...baseProps} isEnabled={true} airtableIntegration={connectedIntegration} />);
-
-    // Initially, ManageIntegration is shown
-    expect(screen.getByTestId("manage-integration")).toBeInTheDocument();
-
-    // Simulate disconnection via ManageIntegration's button
-    const disconnectButton = screen.getByRole("button", { name: "Disconnect" });
-    await userEvent.click(disconnectButton);
-
-    // Now, ConnectIntegration should be shown
-    expect(screen.getByTestId("connect-integration")).toBeInTheDocument();
-    expect(screen.queryByTestId("manage-integration")).not.toBeInTheDocument();
-  });
-});

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/BaseSelectDropdown.test.tsx

@@ -1,125 +0,0 @@
-import { cleanup, render, screen } from "@testing-library/react";
-import { useForm } from "react-hook-form";
-import { afterEach, describe, expect, test, vi } from "vitest";
-import { TIntegrationItem } from "@formbricks/types/integration";
-import { IntegrationModalInputs } from "./AddIntegrationModal";
-import { BaseSelectDropdown } from "./BaseSelectDropdown";
-
-// Mock UI components
-vi.mock("@/modules/ui/components/label", () => ({
-  Label: ({ children, htmlFor }: { children: React.ReactNode; htmlFor: string }) => (
-    <label htmlFor={htmlFor}>{children}</label>
-  ),
-}));
-vi.mock("@/modules/ui/components/select", () => ({
-  Select: ({ children, onValueChange, disabled, defaultValue }) => (
-    <select
-      data-testid="base-select"
-      onChange={(e) => onValueChange(e.target.value)}
-      disabled={disabled}
-      defaultValue={defaultValue}>
-      {children}
-    </select>
-  ),
-  SelectTrigger: ({ children }) => <div>{children}</div>,
-  SelectValue: () => <span>SelectValueMock</span>,
-  SelectContent: ({ children }) => <div>{children}</div>,
-  SelectItem: ({ children, value }) => <option value={value}>{children}</option>,
-}));
-
-// Mock react-hook-form's Controller specifically
-vi.mock("react-hook-form", async () => {
-  const actual = await vi.importActual("react-hook-form");
-  // Keep the actual useForm
-  const originalUseForm = actual.useForm;
-
-  // Mock Controller
-  const MockController = ({ name, _, render, defaultValue }) => {
-    // Minimal mock: call render with a basic field object
-    const field = {
-      onChange: vi.fn(), // Simple spy for field.onChange
-      onBlur: vi.fn(),
-      value: defaultValue, // Use defaultValue passed to Controller
-      name: name,
-      ref: vi.fn(),
-    };
-    // The component passes the render prop result to the actual Select component
-    return render({ field });
-  };
-
-  return {
-    ...actual,
-    useForm: originalUseForm, // Use the actual useForm
-    Controller: MockController, // Use the mocked Controller
-  };
-});
-
-const mockAirtableArray: TIntegrationItem[] = [
-  { id: "base1", name: "Base One" },
-  { id: "base2", name: "Base Two" },
-];
-
-const mockFetchTable = vi.fn();
-
-// Use a wrapper component that utilizes the actual useForm
-const renderComponent = (
-  isLoading = false,
-  defaultValue: string | undefined = undefined,
-  airtableArray = mockAirtableArray
-) => {
-  const Component = () => {
-    // Now uses the actual useForm because Controller is mocked separately
-    const { control, setValue } = useForm<IntegrationModalInputs>({
-      defaultValues: { base: defaultValue },
-    });
-    return (
-      <BaseSelectDropdown
-        control={control}
-        isLoading={isLoading}
-        fetchTable={mockFetchTable} // The spy
-        airtableArray={airtableArray}
-        setValue={setValue} // Actual RHF setValue
-        defaultValue={defaultValue}
-      />
-    );
-  };
-  return render(<Component />);
-};
-
-describe("BaseSelectDropdown", () => {
-  afterEach(() => {
-    cleanup();
-    vi.clearAllMocks();
-  });
-
-  test("renders the label and select trigger", () => {
-    renderComponent();
-    expect(screen.getByText("environments.integrations.airtable.airtable_base")).toBeInTheDocument();
-    expect(screen.getByTestId("base-select")).toBeInTheDocument();
-    expect(screen.getByText("SelectValueMock")).toBeInTheDocument(); // From mocked SelectValue
-  });
-
-  test("renders options from airtableArray", () => {
-    renderComponent();
-    const select = screen.getByTestId("base-select");
-    expect(select.querySelectorAll("option")).toHaveLength(mockAirtableArray.length);
-    expect(screen.getByText("Base One")).toBeInTheDocument();
-    expect(screen.getByText("Base Two")).toBeInTheDocument();
-  });
-
-  test("disables the select when isLoading is true", () => {
-    renderComponent(true);
-    expect(screen.getByTestId("base-select")).toBeDisabled();
-  });
-
-  test("enables the select when isLoading is false", () => {
-    renderComponent(false);
-    expect(screen.getByTestId("base-select")).toBeEnabled();
-  });
-
-  test("renders correctly with empty airtableArray", () => {
-    renderComponent(false, undefined, []);
-    const select = screen.getByTestId("base-select");
-    expect(select.querySelectorAll("option")).toHaveLength(0);
-  });
-});

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/components/ManageIntegration.tsx

@@ -30,16 +30,16 @@ interface ManageIntegrationProps {
   locale: TUserLocale;
 }
 
+const tableHeaders = [
+  "common.survey",
+  "environments.integrations.airtable.table_name",
+  "common.questions",
+  "common.updated_at",
+];
+
 export const ManageIntegration = (props: ManageIntegrationProps) => {
   const { airtableIntegration, environment, environmentId, setIsConnected, surveys, airtableArray } = props;
   const { t } = useTranslate();
-
-  const tableHeaders = [
-    t("common.survey"),
-    t("environments.integrations.airtable.table_name"),
-    t("common.questions"),
-    t("common.updated_at"),
-  ];
   const [isDeleting, setisDeleting] = useState(false);
   const [isDeleteIntegrationModalOpen, setIsDeleteIntegrationModalOpen] = useState(false);
   const [defaultValues, setDefaultValues] = useState<(IntegrationModalInputs & { index: number }) | null>(
@@ -100,7 +100,7 @@ export const ManageIntegration = (props: ManageIntegrationProps) => {
           <div className="grid h-12 grid-cols-8 content-center rounded-lg bg-slate-100 text-left text-sm font-semibold text-slate-900">
             {tableHeaders.map((header) => (
               <div key={header} className={`col-span-2 hidden text-center sm:block`}>
-                {header}
+                {t(header)}
               </div>
             ))}
           </div>

apps/web/app/(app)/environments/[environmentId]/integrations/airtable/lib/airtable.test.ts

@@ -1,85 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { logger } from "@formbricks/logger";
-import { TIntegrationAirtableTables } from "@formbricks/types/integration/airtable";
-import { authorize, fetchTables } from "./airtable";
-
-// Mock the logger
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    error: vi.fn(),
-  },
-}));
-
-// Mock fetch
-global.fetch = vi.fn();
-
-const environmentId = "test-env-id";
-const baseId = "test-base-id";
-const apiHost = "http://localhost:3000";
-
-describe("Airtable Library", () => {
-  beforeEach(() => {
-    vi.resetAllMocks();
-  });
-
-  describe("fetchTables", () => {
-    test("should fetch tables successfully", async () => {
-      const mockTables: TIntegrationAirtableTables = {
-        tables: [
-          { id: "tbl1", name: "Table 1" },
-          { id: "tbl2", name: "Table 2" },
-        ],
-      };
-      const mockResponse = {
-        ok: true,
-        json: async () => ({ data: mockTables }),
-      };
-      vi.mocked(fetch).mockResolvedValue(mockResponse as Response);
-
-      const tables = await fetchTables(environmentId, baseId);
-
-      expect(fetch).toHaveBeenCalledWith(`/api/v1/integrations/airtable/tables?baseId=${baseId}`, {
-        method: "GET",
-        headers: { environmentId: environmentId },
-        cache: "no-store",
-      });
-      expect(tables).toEqual(mockTables);
-    });
-  });
-
-  describe("authorize", () => {
-    test("should return authUrl successfully", async () => {
-      const mockAuthUrl = "https://airtable.com/oauth2/v1/authorize?...";
-      const mockResponse = {
-        ok: true,
-        json: async () => ({ data: { authUrl: mockAuthUrl } }),
-      };
-      vi.mocked(fetch).mockResolvedValue(mockResponse as Response);
-
-      const authUrl = await authorize(environmentId, apiHost);
-
-      expect(fetch).toHaveBeenCalledWith(`${apiHost}/api/v1/integrations/airtable`, {
-        method: "GET",
-        headers: { environmentId: environmentId },
-      });
-      expect(authUrl).toBe(mockAuthUrl);
-    });
-
-    test("should throw error and log when fetch fails", async () => {
-      const errorText = "Failed to fetch";
-      const mockResponse = {
-        ok: false,
-        text: async () => errorText,
-      };
-      vi.mocked(fetch).mockResolvedValue(mockResponse as Response);
-
-      await expect(authorize(environmentId, apiHost)).rejects.toThrow("Could not create response");
-
-      expect(fetch).toHaveBeenCalledWith(`${apiHost}/api/v1/integrations/airtable`, {
-        method: "GET",
-        headers: { environmentId: environmentId },
-      });
-      expect(logger.error).toHaveBeenCalledWith({ errorText }, "authorize: Could not fetch airtable config");
-    });
-  });
-});