chore: add more locale time "translations"

.env.example

@@ -185,10 +185,6 @@ ENTERPRISE_LICENSE_KEY=
 # Ignore Rate Limiting across the Formbricks app
 # RATE_LIMITING_DISABLED=1
 
-# Public unauthenticated IP-based rate limits can be handled by an edge provider.
-# Supported values: none, cloudflare, cloudarmor, envoy
-# EDGE_RATE_LIMIT_PROVIDER=none
-
 # OpenTelemetry OTLP endpoint (base URL, exporters append /v1/traces and /v1/metrics)
 # OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318
 # OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf

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

@@ -1,6 +1,5 @@
 import { XIcon } from "lucide-react";
 import Link from "next/link";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { ConnectWithFormbricks } from "@/app/(app)/(onboarding)/environments/[environmentId]/connect/components/ConnectWithFormbricks";
 import { getEnvironment } from "@/lib/environment/service";
 import { getPublicDomain } from "@/lib/getPublicUrl";
@@ -21,12 +20,12 @@ const Page = async (props: ConnectPageProps) => {
   const environment = await getEnvironment(params.environmentId);
 
   if (!environment) {
-    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
+    throw new Error(t("common.environment_not_found"));
   }
 
   const project = await getProjectByEnvironmentId(environment.id);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   const channel = project.config.channel || null;

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

@@ -1,7 +1,6 @@
 import { XIcon } from "lucide-react";
 import { getServerSession } from "next-auth";
 import Link from "next/link";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { XMTemplateList } from "@/app/(app)/(onboarding)/environments/[environmentId]/xm-templates/components/XMTemplateList";
 import { getEnvironment } from "@/lib/environment/service";
 import { getProjectByEnvironmentId, getUserProjects } from "@/lib/project/service";
@@ -24,22 +23,22 @@ const Page = async (props: XMTemplatePageProps) => {
   const environment = await getEnvironment(params.environmentId);
   const t = await getTranslate();
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
   if (!environment) {
-    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
+    throw new Error(t("common.environment_not_found"));
   }
 
   const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
   const project = await getProjectByEnvironmentId(environment.id);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   const projects = await getUserProjects(session.user.id, organizationId);

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

@@ -1,6 +1,6 @@
 import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
-import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { canUserAccessOrganization } from "@/lib/organization/auth";
 import { getOrganization } from "@/lib/organization/service";
 import { getUser } from "@/lib/user/service";
@@ -25,7 +25,7 @@ const ProjectOnboardingLayout = async (props: {
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   const isAuthorized = await canUserAccessOrganization(session.user.id, params.organizationId);
@@ -36,7 +36,7 @@ const ProjectOnboardingLayout = async (props: {
 
   const organization = await getOrganization(params.organizationId);
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), params.organizationId);
+    throw new Error(t("common.organization_not_found"));
   }
 
   return (

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

@@ -1,6 +1,5 @@
 import { getServerSession } from "next-auth";
 import { notFound, redirect } from "next/navigation";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
 import { getOrganization } from "@/lib/organization/service";
@@ -29,7 +28,7 @@ const OnboardingLayout = async (props: {
 
   const organization = await getOrganization(params.organizationId);
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), params.organizationId);
+    throw new Error(t("common.organization_not_found"));
   }
 
   const [organizationProjectsLimit, organizationProjectsCount] = await Promise.all([

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

@@ -1,7 +1,6 @@
 import { XIcon } from "lucide-react";
 import Link from "next/link";
 import { redirect } from "next/navigation";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { TProjectConfigChannel, TProjectConfigIndustry, TProjectMode } from "@formbricks/types/project";
 import { getTeamsByOrganizationId } from "@/app/(app)/(onboarding)/lib/onboarding";
 import { ProjectSettings } from "@/app/(app)/(onboarding)/organizations/[organizationId]/workspaces/new/settings/components/ProjectSettings";
@@ -46,7 +45,7 @@ const Page = async (props: ProjectSettingsPageProps) => {
   const isAccessControlAllowed = await getAccessControlPermission(organization.id);
 
   if (!organizationTeams) {
-    throw new ResourceNotFoundError(t("common.team"), null);
+    throw new Error(t("common.organization_teams_not_found"));
   }
 
   const publicDomain = getPublicDomain();

apps/web/app/(app)/(survey-editor)/environments/[environmentId]/layout.tsx

@@ -1,5 +1,4 @@
 import { redirect } from "next/navigation";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getEnvironment } from "@/lib/environment/service";
 import { environmentIdLayoutChecks } from "@/modules/environments/lib/utils";
 
@@ -18,13 +17,13 @@ const SurveyEditorEnvironmentLayout = async (props: {
   }
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   const environment = await getEnvironment(params.environmentId);
 
   if (!environment) {
-    throw new ResourceNotFoundError(t("common.environment"), params.environmentId);
+    throw new Error(t("common.environment_not_found"));
   }
 
   return (

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

@@ -2,11 +2,7 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import {
-  AuthorizationError,
-  OperationNotAllowedError,
-  ResourceNotFoundError,
-} from "@formbricks/types/errors";
+import { AuthorizationError, OperationNotAllowedError } from "@formbricks/types/errors";
 import { ZProjectUpdateInput } from "@formbricks/types/project";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getOrganization } from "@/lib/organization/service";
@@ -50,7 +46,7 @@ export const createProjectAction = authenticatedActionClient.inputSchema(ZCreate
     const organization = await getOrganization(organizationId);
 
     if (!organization) {
-      throw new ResourceNotFoundError("Organization", organizationId);
+      throw new Error("Organization not found");
     }
 
     const organizationProjectsLimit = await getOrganizationProjectsLimit(organization.id);

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

@@ -1,4 +1,3 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { MainNavigation } from "@/app/(app)/environments/[environmentId]/components/MainNavigation";
 import { TopControlBar } from "@/app/(app)/environments/[environmentId]/components/TopControlBar";
 import { IS_DEVELOPMENT, IS_FORMBRICKS_CLOUD } from "@/lib/constants";
@@ -43,7 +42,7 @@ export const EnvironmentLayout = async ({ layoutData, children }: EnvironmentLay
 
   // Validate that project permission exists for members
   if (isMember && !projectPermission) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_permission_not_found"));
   }
 
   return (

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

@@ -1,5 +1,4 @@
 import { getServerSession } from "next-auth";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -21,15 +20,15 @@ const AccountSettingsLayout = async (props: {
   ]);
 
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
 
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   return <>{children}</>;

apps/web/app/(app)/environments/[environmentId]/settings/(account)/notifications/page.tsx

@@ -1,6 +1,5 @@
 import { getServerSession } from "next-auth";
 import { prisma } from "@formbricks/database";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TUserNotificationSettings } from "@formbricks/types/user";
 import { AccountSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar";
 import { SettingsCard } from "@/app/(app)/environments/[environmentId]/settings/components/SettingsCard";
@@ -147,18 +146,18 @@ const Page = async (props: {
   const t = await getTranslate();
   const session = await getServerSession(authOptions);
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
   const autoDisableNotificationType = searchParams["type"];
   const autoDisableNotificationElementId = searchParams["elementId"];
 
   const [user, memberships] = await Promise.all([getUser(session.user.id), getMemberships(session.user.id)]);
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   if (!memberships) {
-    throw new ResourceNotFoundError(t("common.membership"), null);
+    throw new Error(t("common.membership_not_found"));
   }
 
   if (user?.notificationSettings) {

apps/web/app/(app)/environments/[environmentId]/settings/(account)/profile/page.tsx

@@ -1,4 +1,3 @@
-import { AuthenticationError } from "@formbricks/types/errors";
 import { AccountSettingsNavbar } from "@/app/(app)/environments/[environmentId]/settings/(account)/components/AccountSettingsNavbar";
 import { AccountSecurity } from "@/app/(app)/environments/[environmentId]/settings/(account)/profile/components/AccountSecurity";
 import { EMAIL_VERIFICATION_DISABLED, IS_FORMBRICKS_CLOUD, PASSWORD_RESET_DISABLED } from "@/lib/constants";
@@ -29,7 +28,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   const user = session?.user ? await getUser(session.user.id) : null;
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   const isPasswordResetEnabled = !PASSWORD_RESET_DISABLED && user.identityProvider === "email";

apps/web/app/(app)/environments/[environmentId]/settings/(organization)/domain/page.tsx

@@ -1,5 +1,4 @@
 import { notFound } from "next/navigation";
-import { AuthenticationError } from "@formbricks/types/errors";
 import { IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED } from "@/lib/constants";
 import { getTranslate } from "@/lingodotdev/server";
 import { getWhiteLabelPermission } from "@/modules/ee/license-check/lib/utils";
@@ -26,7 +25,7 @@ const Page = async (props: { params: Promise<{ environmentId: string }> }) => {
   );
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   const hasWhiteLabelPermission = await getWhiteLabelPermission(organization.id);

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

@@ -1,5 +1,4 @@
 import { getServerSession } from "next-auth";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "@/lib/organization/service";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -18,15 +17,15 @@ const Layout = async (props: { params: Promise<{ environmentId: string }>; child
   ]);
 
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
 
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   return <>{children}</>;

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponseTable.tsx

@@ -300,6 +300,7 @@ export const ResponseTable = ({
         <DataTableSettingsModal
           open={isTableSettingsModalOpen}
           setOpen={setIsTableSettingsModalOpen}
+          survey={survey}
           table={table}
           columnOrder={columnOrder}
           handleDragEnd={handleDragEnd}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/page.tsx

@@ -1,8 +1,12 @@
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
 import { ResponsePage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/responses/components/ResponsePage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
-import { IS_FORMBRICKS_CLOUD, IS_STORAGE_CONFIGURED, RESPONSES_PER_PAGE } from "@/lib/constants";
+import {
+  DEFAULT_LOCALE,
+  IS_FORMBRICKS_CLOUD,
+  IS_STORAGE_CONFIGURED,
+  RESPONSES_PER_PAGE,
+} from "@/lib/constants";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getResponseCountBySurveyId, getResponses } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
@@ -32,15 +36,15 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
   ]);
 
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), params.surveyId);
+    throw new Error(t("common.survey_not_found"));
   }
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
 
   const segments = isContactsEnabled ? await getSegments(params.environmentId) : [];
@@ -49,7 +53,7 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
 
   const organizationBilling = await getOrganizationBilling(organization.id);
   if (!organizationBilling) {
-    throw new ResourceNotFoundError(t("common.organization"), organization.id);
+    throw new Error(t("common.organization_not_found"));
   }
 
   const isQuotasAllowed = await getIsQuotasEnabled(organization.id);
@@ -85,7 +89,7 @@ const Page = async (props: { params: Promise<{ environmentId: string; surveyId:
         environmentTags={tags}
         user={user}
         responsesPerPage={RESPONSES_PER_PAGE}
-        locale={user.locale}
+        locale={user.locale ?? DEFAULT_LOCALE}
         isReadOnly={isReadOnly}
         isQuotasAllowed={isQuotasAllowed}
         quotas={quotas}

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/DateElementSummary.tsx

@@ -34,12 +34,7 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
   const renderResponseValue = (value: string) => {
     const formattedDate = formatStoredDateForDisplay(value, elementSummary.element.format, locale);
 
-    return (
-      formattedDate ??
-      t("common.invalid_date_with_value", {
-        value,
-      })
-    );
+    return formattedDate ?? `${t("common.invalid_date")}(${value})`;
   };
 
   return (
@@ -60,7 +55,7 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
             elementSummary.samples.slice(0, visibleResponses).map((response) => (
               <div
                 key={response.id}
-                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent">
+                className="grid grid-cols-4 items-center border-b border-slate-100 py-2 text-sm text-slate-800 last:border-transparent md:text-base">
                 <div className="pl-4 md:pl-6">
                   {response.contact ? (
                     <Link
@@ -85,7 +80,7 @@ export const DateElementSummary = ({ elementSummary, environmentId, survey, loca
                 <div className="ph-no-capture col-span-2 whitespace-pre-wrap pl-6 font-semibold">
                   {renderResponseValue(response.value)}
                 </div>
-                <div className="px-4 md:px-6">
+                <div className="px-4 text-slate-500 md:px-6">
                   {timeSince(new Date(response.updatedAt).toISOString(), locale)}
                 </div>
               </div>

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/emailTemplate.tsx

@@ -1,4 +1,3 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getPublicDomain } from "@/lib/getPublicUrl";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getSurvey } from "@/lib/survey/service";
@@ -10,11 +9,11 @@ export const getEmailTemplateHtml = async (surveyId: string, locale: string) =>
   const t = await getTranslate();
   const survey = await getSurvey(surveyId);
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), surveyId);
+    throw new Error("Survey not found");
   }
   const project = await getProjectByEnvironmentId(survey.environmentId);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error("Workspace not found");
   }
 
   const styling = getStyling(project, survey);

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/surveySummary.test.ts

@@ -11,7 +11,8 @@ import { getDisplayCountBySurveyId } from "@/lib/display/service";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { getResponseCountBySurveyId } from "@/lib/response/service";
 import { getSurvey } from "@/lib/survey/service";
-import { getElementsFromBlocks } from "@/lib/survey/utils";
+import { evaluateLogic, performActions } from "@/lib/surveyLogic/utils";
+import { getElementsFromBlocks } from "@/modules/survey/lib/client-utils";
 import {
   getElementSummary,
   getResponsesForSummary,
@@ -43,7 +44,7 @@ vi.mock("@/lib/survey/service", () => ({
 }));
 vi.mock("@/lib/surveyLogic/utils", () => ({
   evaluateLogic: vi.fn(),
-  performActions: vi.fn(() => ({ jumpTarget: undefined, requiredElementIds: [], calculations: {} })),
+  performActions: vi.fn(() => ({ jumpTarget: undefined, requiredQuestionIds: [], calculations: {} })),
 }));
 vi.mock("@/lib/utils/validate", () => ({
   validateInputs: vi.fn(),
@@ -228,6 +229,12 @@ describe("getSurveySummaryDropOff", () => {
     vi.mocked(convertFloatTo2Decimal).mockImplementation((num) =>
       num !== undefined && num !== null ? parseFloat(num.toFixed(2)) : 0
     );
+    vi.mocked(evaluateLogic).mockReturnValue(false); // Default: no logic triggers
+    vi.mocked(performActions).mockReturnValue({
+      jumpTarget: undefined,
+      requiredElementIds: [],
+      calculations: {},
+    });
   });
 
   test("calculates dropOff correctly with welcome card disabled", () => {
@@ -239,7 +246,7 @@ describe("getSurveySummaryDropOff", () => {
         contact: null,
         contactAttributes: {},
         language: "en",
-        ttc: { q1: 10, q2: 5 }, // Saw q2 but didn't answer it
+        ttc: { q1: 10 },
         finished: false,
       }, // Dropped at q2
       {
@@ -262,55 +269,22 @@ describe("getSurveySummaryDropOff", () => {
     );
 
     expect(dropOff.length).toBe(2);
-    // Q1: welcome card disabled so impressions = displayCount
+    // Q1
     expect(dropOff[0].elementId).toBe("q1");
-    expect(dropOff[0].impressions).toBe(displayCount);
+    expect(dropOff[0].impressions).toBe(displayCount); // Welcome card disabled, so first question impressions = displayCount
     expect(dropOff[0].dropOffCount).toBe(displayCount - responses.length); // 5 displays - 2 started = 3 dropped before q1
     expect(dropOff[0].dropOffPercentage).toBe(60); // (3/5)*100
     expect(dropOff[0].ttc).toBe(10);
 
-    // Q2: both responses saw q2 (r1 has ttc for q2, r2 answered q2)
+    // Q2
     expect(dropOff[1].elementId).toBe("q2");
-    expect(dropOff[1].impressions).toBe(2);
-    expect(dropOff[1].dropOffCount).toBe(1); // r1 dropped at q2 (last seen element)
+    expect(dropOff[1].impressions).toBe(responses.length); // 2 responses reached q1, so 2 impressions for q2
+    expect(dropOff[1].dropOffCount).toBe(1); // 1 response dropped at q2
     expect(dropOff[1].dropOffPercentage).toBe(50); // (1/2)*100
-    expect(dropOff[1].ttc).toBe(7.5); // avg of r1(5ms) and r2(10ms)
+    expect(dropOff[1].ttc).toBe(10);
   });
 
-  test("drop-off attributed to last seen element when user doesn't reach next question", () => {
-    // Welcome card enabled so first element drop-off is NOT overridden by displayCount
-    const surveyWithWelcome: TSurvey = {
-      ...surveyWithBlocks,
-      welcomeCard: { enabled: true, headline: { default: "Welcome" } } as unknown as TSurvey["welcomeCard"],
-    };
-    const responses = [
-      {
-        id: "r1",
-        data: { q1: "a" },
-        updatedAt: new Date(),
-        contact: null,
-        contactAttributes: {},
-        language: "en",
-        ttc: { q1: 10 }, // Only saw q1, never reached q2
-        finished: false,
-      },
-    ] as any;
-    const displayCount = 1;
-    const dropOff = getSurveySummaryDropOff(
-      surveyWithWelcome,
-      getElementsFromBlocks(surveyWithWelcome.blocks),
-      responses,
-      displayCount
-    );
-
-    expect(dropOff[0].impressions).toBe(1); // Saw q1
-    expect(dropOff[0].dropOffCount).toBe(1); // Dropped at q1 (last seen element)
-    expect(dropOff[1].impressions).toBe(0); // Never saw q2
-    expect(dropOff[1].dropOffCount).toBe(0);
-  });
-
-  test("handles logic jumps — impressions based on actual ttc/data, not logic replay", () => {
-    // Survey with 4 questions across 4 blocks, logic on block2 jumps q2->q4 (skipping q3)
+  test("handles logic jumps", () => {
     const surveyWithLogic: TSurvey = {
       ...mockBaseSurvey,
       blocks: [
@@ -341,6 +315,36 @@ describe("getSurveySummaryDropOff", () => {
               charLimit: { enabled: false },
             },
           ] as TSurveyElement[],
+          logic: [
+            {
+              id: "logic1",
+              conditions: {
+                id: "condition1",
+                connector: "and" as const,
+                conditions: [
+                  {
+                    id: "c1",
+                    leftOperand: {
+                      type: "element" as const,
+                      value: "q2",
+                    },
+                    operator: "equals" as const,
+                    rightOperand: {
+                      type: "static" as const,
+                      value: "b",
+                    },
+                  },
+                ],
+              },
+              actions: [
+                {
+                  id: "action1",
+                  objective: "jumpToBlock" as const,
+                  target: "q4",
+                },
+              ],
+            },
+          ],
         },
         {
           id: "block3",
@@ -373,21 +377,28 @@ describe("getSurveySummaryDropOff", () => {
       ],
       questions: [],
     };
-
-    // Response where user answered q1, q2, then logic jumped to q4 (skipping q3).
-    // The ttc/data reflects exactly what elements were shown — no logic replay needed.
     const responses = [
       {
         id: "r1",
-        data: { q1: "a", q2: "b", q4: "d" },
+        data: { q1: "a", q2: "b" },
         updatedAt: new Date(),
         contact: null,
         contactAttributes: {},
         language: "en",
-        ttc: { q1: 10, q2: 10, q4: 10 }, // q3 has no ttc entry — was skipped by logic
+        ttc: { q1: 10, q2: 10 },
         finished: false,
-      },
+      }, // Jumps from q2 to q4, drops at q4
     ];
+    vi.mocked(evaluateLogic).mockImplementation((_s, data, _v, _, _l) => {
+      // Simulate logic on q2 triggering
+      return data.q2 === "b";
+    });
+    vi.mocked(performActions).mockImplementation((_s, actions, _d, _v) => {
+      if (actions[0] && "objective" in actions[0] && actions[0].objective === "jumpToBlock") {
+        return { jumpTarget: actions[0].target, requiredElementIds: [], calculations: {} };
+      }
+      return { jumpTarget: undefined, requiredElementIds: [], calculations: {} };
+    });
 
     const dropOff = getSurveySummaryDropOff(
       surveyWithLogic,
@@ -396,11 +407,11 @@ describe("getSurveySummaryDropOff", () => {
       1
     );
 
-    expect(dropOff[0].impressions).toBe(1); // q1: seen
-    expect(dropOff[1].impressions).toBe(1); // q2: seen
-    expect(dropOff[2].impressions).toBe(0); // q3: skipped by logic (no ttc, no data)
-    expect(dropOff[3].impressions).toBe(1); // q4: jumped to, seen
-    expect(dropOff[3].dropOffCount).toBe(1); // Dropped at q4 (last seen element, not finished)
+    expect(dropOff[0].impressions).toBe(1); // q1
+    expect(dropOff[1].impressions).toBe(1); // q2
+    expect(dropOff[2].impressions).toBe(0); // q3 (skipped)
+    expect(dropOff[3].impressions).toBe(1); // q4 (jumped to)
+    expect(dropOff[3].dropOffCount).toBe(1); // Dropped at q4
   });
 });
 

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/lib/surveySummary.ts

@@ -11,6 +11,7 @@ import {
   TResponseData,
   TResponseFilterCriteria,
   TResponseTtc,
+  TResponseVariables,
   ZResponseFilterCriteria,
 } from "@formbricks/types/responses";
 import { TSurveyElement, TSurveyElementTypeEnum } from "@formbricks/types/surveys/elements";
@@ -36,7 +37,8 @@ import { getDisplayCountBySurveyId } from "@/lib/display/service";
 import { getLocalizedValue } from "@/lib/i18n/utils";
 import { buildWhereClause } from "@/lib/response/utils";
 import { getSurvey } from "@/lib/survey/service";
-import { getElementsFromBlocks } from "@/lib/survey/utils";
+import { findElementLocation, getElementsFromBlocks } from "@/lib/survey/utils";
+import { evaluateLogic, performActions } from "@/lib/surveyLogic/utils";
 import { validateInputs } from "@/lib/utils/validate";
 import { convertFloatTo2Decimal } from "./utils";
 
@@ -91,13 +93,63 @@ export const getSurveySummaryMeta = (
   };
 };
 
-// Determine whether a response interacted with a given element.
-// An element was "seen" if the respondent has a ttc entry for it OR provided an answer.
-// This is more reliable than replaying survey logic, which can misattribute impressions
-// when branching logic skips elements or when partial response data is insufficient
-// to evaluate conditions correctly.
-const wasElementSeen = (response: TSurveySummaryResponse, elementId: string): boolean => {
-  return (response.ttc != null && response.ttc[elementId] > 0) || response.data[elementId] !== undefined;
+const evaluateLogicAndGetNextElementId = (
+  localSurvey: TSurvey,
+  elements: TSurveyElement[],
+  data: TResponseData,
+  localVariables: TResponseVariables,
+  currentElementIndex: number,
+  currElementTemp: TSurveyElement,
+  selectedLanguage: string | null
+): {
+  nextElementId: string | undefined;
+  updatedSurvey: TSurvey;
+  updatedVariables: TResponseVariables;
+} => {
+  let updatedSurvey = { ...localSurvey };
+  let updatedVariables = { ...localVariables };
+
+  let firstJumpTarget: string | undefined;
+
+  const { block: currentBlock } = findElementLocation(localSurvey, currElementTemp.id);
+
+  if (currentBlock?.logic && currentBlock.logic.length > 0) {
+    for (const logic of currentBlock.logic) {
+      if (evaluateLogic(localSurvey, data, localVariables, logic.conditions, selectedLanguage ?? "default")) {
+        const { jumpTarget, requiredElementIds, calculations } = performActions(
+          updatedSurvey,
+          logic.actions,
+          data,
+          updatedVariables
+        );
+
+        if (requiredElementIds.length > 0) {
+          // Update blocks to mark elements as required
+          updatedSurvey.blocks = updatedSurvey.blocks.map((block) => ({
+            ...block,
+            elements: block.elements.map((e) =>
+              requiredElementIds.includes(e.id) ? { ...e, required: true } : e
+            ),
+          }));
+        }
+        updatedVariables = { ...updatedVariables, ...calculations };
+
+        if (jumpTarget && !firstJumpTarget) {
+          firstJumpTarget = jumpTarget;
+        }
+      }
+    }
+  }
+
+  // If no jump target was set, check for a fallback logic
+  if (!firstJumpTarget && currentBlock?.logicFallback) {
+    firstJumpTarget = currentBlock.logicFallback;
+  }
+
+  // Return the first jump target if found, otherwise go to the next element
+  const nextElementId = firstJumpTarget || elements[currentElementIndex + 1]?.id || undefined;
+
+  return { nextElementId, updatedSurvey, updatedVariables };
 };
 
 export const getSurveySummaryDropOff = (
@@ -118,8 +170,16 @@ export const getSurveySummaryDropOff = (
   let impressionsArr = new Array(elements.length).fill(0) as number[];
   let dropOffPercentageArr = new Array(elements.length).fill(0) as number[];
 
+  const surveyVariablesData = survey.variables?.reduce(
+    (acc, variable) => {
+      acc[variable.id] = variable.value;
+      return acc;
+    },
+    {} as Record<string, string | number>
+  );
+
   responses.forEach((response) => {
-    // Calculate total time-to-completion per element
+    // Calculate total time-to-completion
     Object.keys(totalTtc).forEach((elementId) => {
       if (response.ttc && response.ttc[elementId]) {
         totalTtc[elementId] += response.ttc[elementId];
@@ -127,21 +187,51 @@ export const getSurveySummaryDropOff = (
       }
     });
 
-    // Count impressions based on actual interaction data (ttc + response data)
-    // instead of replaying survey logic which is unreliable with branching
-    let lastSeenIdx = -1;
+    let localSurvey = structuredClone(survey);
+    let localResponseData: TResponseData = { ...response.data };
+    let localVariables: TResponseVariables = {
+      ...surveyVariablesData,
+    };
 
-    for (let i = 0; i < elements.length; i++) {
-      const element = elements[i];
-      if (wasElementSeen(response, element.id)) {
-        impressionsArr[i]++;
-        lastSeenIdx = i;
+    let currQuesIdx = 0;
+
+    while (currQuesIdx < elements.length) {
+      const currQues = elements[currQuesIdx];
+      if (!currQues) break;
+
+      // element is not answered and required
+      if (response.data[currQues.id] === undefined && currQues.required) {
+        dropOffArr[currQuesIdx]++;
+        impressionsArr[currQuesIdx]++;
+        break;
       }
-    }
 
-    // Attribute drop-off to the last element the respondent interacted with
-    if (!response.finished && lastSeenIdx >= 0) {
-      dropOffArr[lastSeenIdx]++;
+      impressionsArr[currQuesIdx]++;
+
+      const { nextElementId, updatedSurvey, updatedVariables } = evaluateLogicAndGetNextElementId(
+        localSurvey,
+        elements,
+        localResponseData,
+        localVariables,
+        currQuesIdx,
+        currQues,
+        response.language
+      );
+
+      localSurvey = updatedSurvey;
+      localVariables = updatedVariables;
+
+      if (nextElementId) {
+        const nextQuesIdx = elements.findIndex((q) => q.id === nextElementId);
+        if (!response.data[nextElementId] && !response.finished) {
+          dropOffArr[nextQuesIdx]++;
+          impressionsArr[nextQuesIdx]++;
+          break;
+        }
+        currQuesIdx = nextQuesIdx;
+      } else {
+        currQuesIdx++;
+      }
     }
   });
 
@@ -150,8 +240,6 @@ export const getSurveySummaryDropOff = (
     totalTtc[elementId] = responseCounts[elementId] > 0 ? totalTtc[elementId] / responseCounts[elementId] : 0;
   });
 
-  // When the welcome card is disabled, the first element's impressions should equal displayCount
-  // because every survey display is an impression of the first element
   if (!survey.welcomeCard.enabled) {
     dropOffArr[0] = displayCount - impressionsArr[0];
     if (impressionsArr[0] > displayCount) dropOffPercentageArr[0] = 0;
@@ -163,7 +251,7 @@ export const getSurveySummaryDropOff = (
 
     impressionsArr[0] = displayCount;
   } else {
-    dropOffPercentageArr[0] = impressionsArr[0] > 0 ? (dropOffArr[0] / impressionsArr[0]) * 100 : 0;
+    dropOffPercentageArr[0] = (dropOffArr[0] / impressionsArr[0]) * 100;
   }
 
   for (let i = 1; i < elements.length; i++) {

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/page.tsx

@@ -1,5 +1,4 @@
 import { notFound } from "next/navigation";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { SurveyAnalysisNavigation } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/components/SurveyAnalysisNavigation";
 import { SummaryPage } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SummaryPage";
 import { SurveyAnalysisCTA } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/(analysis)/summary/components/SurveyAnalysisCTA";
@@ -33,13 +32,13 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   const survey = await getSurvey(params.surveyId);
 
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), params.surveyId);
+    throw new Error(t("common.survey_not_found"));
   }
 
   const user = await getUser(session.user.id);
 
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
   const organizationId = await getOrganizationIdFromEnvironmentId(environment.id);
 
@@ -47,11 +46,11 @@ const SurveyPage = async (props: { params: Promise<{ environmentId: string; surv
   const segments = isContactsEnabled ? await getSegments(environment.id) : [];
 
   if (!organizationId) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
   const organizationBilling = await getOrganizationBilling(organizationId);
   if (!organizationBilling) {
-    throw new ResourceNotFoundError(t("common.organization"), organizationId);
+    throw new Error(t("common.organization_not_found"));
   }
   const isQuotasAllowed = await getIsQuotasEnabled(organizationId);
 

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

@@ -2,16 +2,21 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
+import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { ZResponseFilterCriteria } from "@formbricks/types/responses";
+import { ZSurvey } from "@formbricks/types/surveys/types";
+import { getOrganization } from "@/lib/organization/service";
 import { getResponseDownloadFile, getResponseFilteringValues } from "@/lib/response/service";
-import { getSurvey } from "@/lib/survey/service";
+import { getSurvey, updateSurvey } from "@/lib/survey/service";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import { getOrganizationIdFromSurveyId, getProjectIdFromSurveyId } from "@/lib/utils/helper";
+import { withAuditLogging } from "@/modules/ee/audit-logs/lib/handler";
 import { getIsQuotasEnabled } from "@/modules/ee/license-check/lib/utils";
 import { getQuotas } from "@/modules/ee/quotas/lib/quotas";
+import { getSurveyFollowUpsPermission } from "@/modules/survey/follow-ups/lib/utils";
+import { checkSpamProtectionPermission } from "@/modules/survey/lib/permission";
 import { getOrganizationBilling } from "@/modules/survey/lib/survey";
 
 const ZGetResponsesDownloadUrlAction = z.object({
@@ -92,3 +97,68 @@ export const getSurveyFilterDataAction = authenticatedActionClient
 
     return { environmentTags: tags, attributes, meta, hiddenFields, quotas };
   });
+
+/**
+ * Checks if survey follow-ups are enabled for the given organization.
+ *
+ * @param {string} organizationId  The ID of the organization to check.
+ * @returns {Promise<void>}  A promise that resolves if the permission is granted.
+ * @throws {ResourceNotFoundError}  If the organization is not found.
+ * @throws {OperationNotAllowedError}  If survey follow-ups are not enabled for the organization.
+ */
+const checkSurveyFollowUpsPermission = async (organizationId: string): Promise<void> => {
+  const organization = await getOrganization(organizationId);
+
+  if (!organization) {
+    throw new ResourceNotFoundError("Organization not found", organizationId);
+  }
+
+  const isSurveyFollowUpsEnabled = await getSurveyFollowUpsPermission(organizationId);
+  if (!isSurveyFollowUpsEnabled) {
+    throw new OperationNotAllowedError("Survey follow ups are not enabled for this organization");
+  }
+};
+
+export const updateSurveyAction = authenticatedActionClient.inputSchema(ZSurvey).action(
+  withAuditLogging("updated", "survey", async ({ ctx, parsedInput }) => {
+    const organizationId = await getOrganizationIdFromSurveyId(parsedInput.id);
+    await checkAuthorizationUpdated({
+      userId: ctx.user?.id ?? "",
+      organizationId,
+      access: [
+        {
+          type: "organization",
+          roles: ["owner", "manager"],
+        },
+        {
+          type: "projectTeam",
+          projectId: await getProjectIdFromSurveyId(parsedInput.id),
+          minPermission: "readWrite",
+        },
+      ],
+    });
+
+    const { followUps } = parsedInput;
+
+    const oldSurvey = await getSurvey(parsedInput.id);
+
+    if (parsedInput.recaptcha?.enabled) {
+      await checkSpamProtectionPermission(organizationId);
+    }
+
+    if (followUps?.length) {
+      await checkSurveyFollowUpsPermission(organizationId);
+    }
+
+    // Context for audit log
+    ctx.auditLoggingCtx.surveyId = parsedInput.id;
+    ctx.auditLoggingCtx.organizationId = organizationId;
+    ctx.auditLoggingCtx.oldObject = oldSurvey;
+
+    const newSurvey = await updateSurvey(parsedInput);
+
+    ctx.auditLoggingCtx.newObject = newSurvey;
+
+    return newSurvey;
+  })
+);

apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/components/SurveyStatusDropdown.tsx

@@ -6,7 +6,6 @@ import { useTranslation } from "react-i18next";
 import { TEnvironment } from "@formbricks/types/environment";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { getFormattedErrorMessage } from "@/lib/utils/helper";
-import { updateSurveyAction } from "@/modules/survey/editor/actions";
 import {
   Select,
   SelectContent,
@@ -15,6 +14,7 @@ import {
   SelectValue,
 } from "@/modules/ui/components/select";
 import { SurveyStatusIndicator } from "@/modules/ui/components/survey-status-indicator";
+import { updateSurveyAction } from "../actions";
 
 interface SurveyStatusDropdownProps {
   environment: TEnvironment;

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

@@ -1,6 +1,4 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getSurvey } from "@/lib/survey/service";
-import { getTranslate } from "@/lingodotdev/server";
 import { SurveyContextWrapper } from "./context/survey-context";
 
 interface SurveyLayoutProps {
@@ -12,10 +10,9 @@ const SurveyLayout = async ({ params, children }: SurveyLayoutProps) => {
   const resolvedParams = await params;
 
   const survey = await getSurvey(resolvedParams.surveyId);
-  const t = await getTranslate();
 
   if (!survey) {
-    throw new ResourceNotFoundError(t("common.survey"), resolvedParams.surveyId);
+    throw new Error("Survey not found");
   }
 
   return <SurveyContextWrapper survey={survey}>{children}</SurveyContextWrapper>;

apps/web/app/(app)/layout.tsx

@@ -6,10 +6,8 @@ import {
   CHATWOOT_WEBSITE_TOKEN,
   IS_CHATWOOT_CONFIGURED,
   POSTHOG_KEY,
-  SESSION_MAX_AGE,
 } from "@/lib/constants";
 import { getUser } from "@/lib/user/service";
-import { NextAuthProvider } from "@/modules/auth/components/next-auth-provider";
 import { authOptions } from "@/modules/auth/lib/authOptions";
 import { ClientLogout } from "@/modules/ui/components/client-logout";
 import { NoMobileOverlay } from "@/modules/ui/components/no-mobile-overlay";
@@ -25,7 +23,7 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
   }
 
   return (
-    <NextAuthProvider sessionMaxAge={SESSION_MAX_AGE}>
+    <>
       <NoMobileOverlay />
       {POSTHOG_KEY && user && (
         <PostHogIdentify posthogKey={POSTHOG_KEY} userId={user.id} email={user.email} name={user.name} />
@@ -41,7 +39,7 @@ const AppLayout = async ({ children }: { children: React.ReactNode }) => {
       )}
       <ToasterClient />
       {children}
-    </NextAuthProvider>
+    </>
   );
 };
 

apps/web/app/api/v2/client/[environmentId]/displays/route.ts

@@ -4,11 +4,6 @@ import { ZDisplayCreateInputV2 } from "@/app/api/v2/client/[environmentId]/displ
 import { responses } from "@/app/lib/api/response";
 import { transformErrorToDetails } from "@/app/lib/api/validator";
 import { getOrganizationIdFromEnvironmentId } from "@/lib/utils/helper";
-import {
-  applyPublicIpRateLimit,
-  publicEdgeRateLimitPolicies,
-} from "@/modules/core/rate-limit/public-edge-rate-limit";
-import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { createDisplay } from "./lib/display";
 
@@ -29,15 +24,6 @@ export const OPTIONS = async (): Promise<Response> => {
 };
 
 export const POST = async (request: Request, context: Context): Promise<Response> => {
-  try {
-    await applyPublicIpRateLimit(publicEdgeRateLimitPolicies.v2ClientDisplays, rateLimitConfigs.api.client);
-  } catch (error) {
-    return responses.tooManyRequestsResponse(
-      error instanceof Error ? error.message : "Rate limit exceeded",
-      true
-    );
-  }
-
   const params = await context.params;
   const jsonInput = await request.json();
   const inputValidation = ZDisplayCreateInputV2.safeParse({

apps/web/app/api/v2/client/[environmentId]/responses/route.ts

@@ -14,11 +14,6 @@ import { getClientIpFromHeaders } from "@/lib/utils/client-ip";
 import { getOrganizationIdFromEnvironmentId } from "@/lib/utils/helper";
 import { formatValidationErrorsForV1Api, validateResponseData } from "@/modules/api/lib/validation";
 import { validateOtherOptionLengthForMultipleChoice } from "@/modules/api/v2/lib/element";
-import {
-  applyPublicIpRateLimit,
-  publicEdgeRateLimitPolicies,
-} from "@/modules/core/rate-limit/public-edge-rate-limit";
-import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { getIsContactsEnabled } from "@/modules/ee/license-check/lib/utils";
 import { createQuotaFullObject } from "@/modules/ee/quotas/lib/helpers";
 import { createResponseWithQuotaEvaluation } from "./lib/response";
@@ -41,15 +36,6 @@ export const OPTIONS = async (): Promise<Response> => {
 };
 
 export const POST = async (request: Request, context: Context): Promise<Response> => {
-  try {
-    await applyPublicIpRateLimit(publicEdgeRateLimitPolicies.v2ClientResponses, rateLimitConfigs.api.client);
-  } catch (error) {
-    return responses.tooManyRequestsResponse(
-      error instanceof Error ? error.message : "Rate limit exceeded",
-      true
-    );
-  }
-
   const params = await context.params;
   const requestHeaders = await headers();
   let responseInput;

apps/web/app/api/v3/lib/api-wrapper.test.ts

@@ -1,324 +0,0 @@
-import { NextRequest } from "next/server";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { z } from "zod";
-import { TooManyRequestsError } from "@formbricks/types/errors";
-import { withV3ApiWrapper } from "./api-wrapper";
-
-const { mockAuthenticateRequest, mockGetServerSession } = vi.hoisted(() => ({
-  mockAuthenticateRequest: vi.fn(),
-  mockGetServerSession: vi.fn(),
-}));
-
-vi.mock("next-auth", () => ({
-  getServerSession: mockGetServerSession,
-}));
-
-vi.mock("@/app/api/v1/auth", () => ({
-  authenticateRequest: mockAuthenticateRequest,
-}));
-
-vi.mock("@/modules/auth/lib/authOptions", () => ({
-  authOptions: {},
-}));
-
-vi.mock("@/modules/core/rate-limit/helpers", () => ({
-  applyRateLimit: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      error: vi.fn(),
-      warn: vi.fn(),
-    })),
-  },
-}));
-
-describe("withV3ApiWrapper", () => {
-  beforeEach(() => {
-    vi.resetAllMocks();
-    mockGetServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue(null);
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("uses session auth first in both mode and injects request id into plain responses", async () => {
-    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1", name: "Test", email: "t@example.com" },
-      expires: "2026-01-01",
-    });
-
-    const handler = vi.fn(async ({ authentication, requestId, instance }) => {
-      expect(authentication).toMatchObject({ user: { id: "user_1" } });
-      expect(requestId).toBe("req-1");
-      expect(instance).toBe("/api/v3/surveys");
-      return Response.json({ ok: true });
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys?limit=10", {
-        headers: { "x-request-id": "req-1" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(200);
-    expect(response.headers.get("X-Request-Id")).toBe("req-1");
-    expect(handler).toHaveBeenCalledOnce();
-    expect(vi.mocked(applyRateLimit)).toHaveBeenCalledWith(
-      expect.objectContaining({ namespace: "api:v3" }),
-      "user_1"
-    );
-    expect(mockAuthenticateRequest).not.toHaveBeenCalled();
-  });
-
-  test("falls back to api key auth in both mode", async () => {
-    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
-    mockAuthenticateRequest.mockResolvedValue({
-      type: "apiKey",
-      apiKeyId: "key_1",
-      organizationId: "org_1",
-      organizationAccess: { accessControl: { read: true, write: false } },
-      environmentPermissions: [],
-    });
-
-    const handler = vi.fn(async ({ authentication }) => {
-      expect(authentication).toMatchObject({ apiKeyId: "key_1" });
-      return Response.json({ ok: true });
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys", {
-        headers: { "x-api-key": "fbk_test" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(200);
-    expect(vi.mocked(applyRateLimit)).toHaveBeenCalledWith(
-      expect.objectContaining({ namespace: "api:v3" }),
-      "key_1"
-    );
-    expect(mockGetServerSession).not.toHaveBeenCalled();
-  });
-
-  test("returns 401 problem response when authentication is required but missing", async () => {
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler,
-    });
-
-    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {} as never);
-
-    expect(response.status).toBe(401);
-    expect(handler).not.toHaveBeenCalled();
-    expect(response.headers.get("Content-Type")).toBe("application/problem+json");
-  });
-
-  test("returns 400 problem response for invalid query input", async () => {
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1" },
-      expires: "2026-01-01",
-    });
-
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      schemas: {
-        query: z.object({
-          limit: z.coerce.number().int().positive(),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys?limit=oops", {
-        headers: { "x-request-id": "req-invalid" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(400);
-    expect(handler).not.toHaveBeenCalled();
-    const body = await response.json();
-    expect(body.invalid_params).toEqual(expect.arrayContaining([expect.objectContaining({ name: "limit" })]));
-    expect(body.requestId).toBe("req-invalid");
-  });
-
-  test("parses body, repeated query params, and async route params", async () => {
-    const handler = vi.fn(async ({ parsedInput }) => {
-      expect(parsedInput).toEqual({
-        body: { name: "Survey API" },
-        query: { tag: ["a", "b"] },
-        params: { workspaceId: "ws_123" },
-      });
-
-      return Response.json(
-        { ok: true },
-        {
-          headers: {
-            "X-Request-Id": "handler-request-id",
-          },
-        }
-      );
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "none",
-      schemas: {
-        body: z.object({
-          name: z.string(),
-        }),
-        query: z.object({
-          tag: z.array(z.string()),
-        }),
-        params: z.object({
-          workspaceId: z.string(),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys?tag=a&tag=b", {
-        method: "POST",
-        body: JSON.stringify({ name: "Survey API" }),
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }),
-      {
-        params: Promise.resolve({
-          workspaceId: "ws_123",
-        }),
-      } as never
-    );
-
-    expect(response.status).toBe(200);
-    expect(response.headers.get("X-Request-Id")).toBe("handler-request-id");
-    expect(handler).toHaveBeenCalledOnce();
-  });
-
-  test("returns 400 problem response for malformed JSON input", async () => {
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "none",
-      schemas: {
-        body: z.object({
-          name: z.string(),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys", {
-        method: "POST",
-        body: "{",
-        headers: {
-          "Content-Type": "application/json",
-        },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(400);
-    expect(handler).not.toHaveBeenCalled();
-    const body = await response.json();
-    expect(body.invalid_params).toEqual([
-      {
-        name: "body",
-        reason: "Malformed JSON input, please check your request body",
-      },
-    ]);
-  });
-
-  test("returns 400 problem response for invalid route params", async () => {
-    const handler = vi.fn(async () => Response.json({ ok: true }));
-    const wrapped = withV3ApiWrapper({
-      auth: "none",
-      schemas: {
-        params: z.object({
-          workspaceId: z.string().min(3),
-        }),
-      },
-      handler,
-    });
-
-    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {
-      params: Promise.resolve({
-        workspaceId: "x",
-      }),
-    } as never);
-
-    expect(response.status).toBe(400);
-    expect(handler).not.toHaveBeenCalled();
-    const body = await response.json();
-    expect(body.invalid_params).toEqual(
-      expect.arrayContaining([expect.objectContaining({ name: "workspaceId" })])
-    );
-  });
-
-  test("returns 429 problem response when rate limited", async () => {
-    const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1" },
-      expires: "2026-01-01",
-    });
-    vi.mocked(applyRateLimit).mockRejectedValueOnce(new TooManyRequestsError("Too many requests", 60));
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler: async () => Response.json({ ok: true }),
-    });
-
-    const response = await wrapped(new NextRequest("http://localhost/api/v3/surveys"), {} as never);
-
-    expect(response.status).toBe(429);
-    expect(response.headers.get("Retry-After")).toBe("60");
-    const body = await response.json();
-    expect(body.code).toBe("too_many_requests");
-  });
-
-  test("returns 500 problem response when the handler throws unexpectedly", async () => {
-    mockGetServerSession.mockResolvedValue({
-      user: { id: "user_1" },
-      expires: "2026-01-01",
-    });
-
-    const wrapped = withV3ApiWrapper({
-      auth: "both",
-      handler: async () => {
-        throw new Error("boom");
-      },
-    });
-
-    const response = await wrapped(
-      new NextRequest("http://localhost/api/v3/surveys", {
-        headers: { "x-request-id": "req-boom" },
-      }),
-      {} as never
-    );
-
-    expect(response.status).toBe(500);
-    const body = await response.json();
-    expect(body.code).toBe("internal_server_error");
-    expect(body.requestId).toBe("req-boom");
-  });
-});

apps/web/app/api/v3/lib/api-wrapper.ts

@@ -1,349 +0,0 @@
-import { getServerSession } from "next-auth";
-import { type NextRequest } from "next/server";
-import { z } from "zod";
-import { logger } from "@formbricks/logger";
-import { TooManyRequestsError } from "@formbricks/types/errors";
-import { authenticateRequest } from "@/app/api/v1/auth";
-import { authOptions } from "@/modules/auth/lib/authOptions";
-import { applyRateLimit } from "@/modules/core/rate-limit/helpers";
-import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
-import type { TRateLimitConfig } from "@/modules/core/rate-limit/types/rate-limit";
-import {
-  type InvalidParam,
-  problemBadRequest,
-  problemInternalError,
-  problemTooManyRequests,
-  problemUnauthorized,
-} from "./response";
-import type { TV3Authentication } from "./types";
-
-type TV3Schema = z.ZodTypeAny;
-type MaybePromise<T> = T | Promise<T>;
-
-export type TV3AuthMode = "none" | "session" | "apiKey" | "both";
-
-export type TV3Schemas = {
-  body?: TV3Schema;
-  query?: TV3Schema;
-  params?: TV3Schema;
-};
-
-export type TV3ParsedInput<S extends TV3Schemas | undefined> = S extends object
-  ? {
-      [K in keyof S as NonNullable<S[K]> extends TV3Schema ? K : never]: z.infer<NonNullable<S[K]>>;
-    }
-  : Record<string, never>;
-
-export type TV3HandlerParams<TParsedInput = Record<string, never>, TProps = unknown> = {
-  req: NextRequest;
-  props: TProps;
-  authentication: TV3Authentication;
-  parsedInput: TParsedInput;
-  requestId: string;
-  instance: string;
-};
-
-export type TWithV3ApiWrapperParams<S extends TV3Schemas | undefined, TProps = unknown> = {
-  auth?: TV3AuthMode;
-  schemas?: S;
-  rateLimit?: boolean;
-  customRateLimitConfig?: TRateLimitConfig;
-  handler: (params: TV3HandlerParams<TV3ParsedInput<S>, TProps>) => MaybePromise<Response>;
-};
-
-function getUnauthenticatedDetail(authMode: TV3AuthMode): string {
-  if (authMode === "session") {
-    return "Session required";
-  }
-
-  if (authMode === "apiKey") {
-    return "API key required";
-  }
-
-  return "Not authenticated";
-}
-
-function formatZodIssues(error: z.ZodError, fallbackName: "body" | "query" | "params"): InvalidParam[] {
-  return error.issues.map((issue) => ({
-    name: issue.path.length > 0 ? issue.path.join(".") : fallbackName,
-    reason: issue.message,
-  }));
-}
-
-function searchParamsToObject(searchParams: URLSearchParams): Record<string, string | string[]> {
-  const query: Record<string, string | string[]> = {};
-
-  for (const key of new Set(searchParams.keys())) {
-    const values = searchParams.getAll(key);
-    query[key] = values.length > 1 ? values : (values[0] ?? "");
-  }
-
-  return query;
-}
-
-function getRateLimitIdentifier(authentication: TV3Authentication): string | null {
-  if (!authentication) {
-    return null;
-  }
-
-  if ("user" in authentication && authentication.user?.id) {
-    return authentication.user.id;
-  }
-
-  if ("apiKeyId" in authentication) {
-    return authentication.apiKeyId;
-  }
-
-  return null;
-}
-
-function isPromiseLike<T>(value: unknown): value is Promise<T> {
-  return typeof value === "object" && value !== null && "then" in value;
-}
-
-async function getRouteParams<TProps>(props: TProps): Promise<Record<string, unknown>> {
-  if (!props || typeof props !== "object" || !("params" in props)) {
-    return {};
-  }
-
-  const params = (props as { params?: unknown }).params;
-  if (!params) {
-    return {};
-  }
-
-  const resolvedParams = isPromiseLike<Record<string, unknown>>(params) ? await params : params;
-  return typeof resolvedParams === "object" && resolvedParams !== null
-    ? (resolvedParams as Record<string, unknown>)
-    : {};
-}
-
-async function authenticateV3Request(req: NextRequest, authMode: TV3AuthMode): Promise<TV3Authentication> {
-  if (authMode === "none") {
-    return null;
-  }
-
-  if (authMode === "both" && req.headers.has("x-api-key")) {
-    const apiKeyAuth = await authenticateRequest(req);
-    if (apiKeyAuth) {
-      return apiKeyAuth;
-    }
-  }
-
-  if (authMode === "session" || authMode === "both") {
-    const session = await getServerSession(authOptions);
-    if (session?.user?.id) {
-      return session;
-    }
-
-    if (authMode === "session") {
-      return null;
-    }
-  }
-
-  if (authMode === "apiKey" || authMode === "both") {
-    return await authenticateRequest(req);
-  }
-
-  return null;
-}
-
-async function parseV3Input<S extends TV3Schemas | undefined, TProps>(
-  req: NextRequest,
-  props: TProps,
-  schemas: S | undefined,
-  requestId: string,
-  instance: string
-): Promise<
-  | { ok: true; parsedInput: TV3ParsedInput<S> }
-  | {
-      ok: false;
-      response: Response;
-    }
-> {
-  const parsedInput = {} as TV3ParsedInput<S>;
-
-  if (schemas?.body) {
-    let bodyData: unknown;
-
-    try {
-      bodyData = await req.json();
-    } catch {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid request body", {
-          instance,
-          invalid_params: [{ name: "body", reason: "Malformed JSON input, please check your request body" }],
-        }),
-      };
-    }
-
-    const bodyResult = schemas.body.safeParse(bodyData);
-    if (!bodyResult.success) {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid request body", {
-          instance,
-          invalid_params: formatZodIssues(bodyResult.error, "body"),
-        }),
-      };
-    }
-
-    parsedInput.body = bodyResult.data as TV3ParsedInput<S>["body"];
-  }
-
-  if (schemas?.query) {
-    const queryResult = schemas.query.safeParse(searchParamsToObject(req.nextUrl.searchParams));
-    if (!queryResult.success) {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid query parameters", {
-          instance,
-          invalid_params: formatZodIssues(queryResult.error, "query"),
-        }),
-      };
-    }
-
-    parsedInput.query = queryResult.data as TV3ParsedInput<S>["query"];
-  }
-
-  if (schemas?.params) {
-    const paramsResult = schemas.params.safeParse(await getRouteParams(props));
-    if (!paramsResult.success) {
-      return {
-        ok: false,
-        response: problemBadRequest(requestId, "Invalid route parameters", {
-          instance,
-          invalid_params: formatZodIssues(paramsResult.error, "params"),
-        }),
-      };
-    }
-
-    parsedInput.params = paramsResult.data as TV3ParsedInput<S>["params"];
-  }
-
-  return { ok: true, parsedInput };
-}
-
-function ensureRequestIdHeader(response: Response, requestId: string): Response {
-  if (response.headers.get("X-Request-Id")) {
-    return response;
-  }
-
-  const headers = new Headers(response.headers);
-  headers.set("X-Request-Id", requestId);
-
-  return new Response(response.body, {
-    status: response.status,
-    statusText: response.statusText,
-    headers,
-  });
-}
-
-async function authenticateV3RequestOrRespond(
-  req: NextRequest,
-  authMode: TV3AuthMode,
-  requestId: string,
-  instance: string
-): Promise<
-  { authentication: TV3Authentication; response: null } | { authentication: null; response: Response }
-> {
-  const authentication = await authenticateV3Request(req, authMode);
-
-  if (!authentication && authMode !== "none") {
-    return {
-      authentication: null,
-      response: problemUnauthorized(requestId, getUnauthenticatedDetail(authMode), instance),
-    };
-  }
-
-  return {
-    authentication,
-    response: null,
-  };
-}
-
-async function applyV3RateLimitOrRespond(params: {
-  authentication: TV3Authentication;
-  enabled: boolean;
-  config: TRateLimitConfig;
-  requestId: string;
-  log: ReturnType<typeof logger.withContext>;
-}): Promise<Response | null> {
-  const { authentication, enabled, config, requestId, log } = params;
-  if (!enabled) {
-    return null;
-  }
-
-  const identifier = getRateLimitIdentifier(authentication);
-  if (!identifier) {
-    return null;
-  }
-
-  try {
-    await applyRateLimit(config, identifier);
-  } catch (error) {
-    log.warn({ error, statusCode: 429 }, "V3 API rate limit exceeded");
-    return problemTooManyRequests(
-      requestId,
-      error instanceof Error ? error.message : "Rate limit exceeded",
-      error instanceof TooManyRequestsError ? error.retryAfter : undefined
-    );
-  }
-
-  return null;
-}
-
-export const withV3ApiWrapper = <S extends TV3Schemas | undefined, TProps = unknown>(
-  params: TWithV3ApiWrapperParams<S, TProps>
-): ((req: NextRequest, props: TProps) => Promise<Response>) => {
-  const { auth = "both", schemas, rateLimit = true, customRateLimitConfig, handler } = params;
-
-  return async (req: NextRequest, props: TProps): Promise<Response> => {
-    const requestId = req.headers.get("x-request-id") ?? crypto.randomUUID();
-    const instance = req.nextUrl.pathname;
-    const log = logger.withContext({
-      requestId,
-      method: req.method,
-      path: instance,
-    });
-
-    try {
-      const authResult = await authenticateV3RequestOrRespond(req, auth, requestId, instance);
-      if (authResult.response) {
-        log.warn({ statusCode: authResult.response.status }, "V3 API authentication failed");
-        return authResult.response;
-      }
-
-      const parsedInputResult = await parseV3Input(req, props, schemas, requestId, instance);
-      if (!parsedInputResult.ok) {
-        log.warn({ statusCode: parsedInputResult.response.status }, "V3 API request validation failed");
-        return parsedInputResult.response;
-      }
-
-      const rateLimitResponse = await applyV3RateLimitOrRespond({
-        authentication: authResult.authentication,
-        enabled: rateLimit,
-        config: customRateLimitConfig ?? rateLimitConfigs.api.v3,
-        requestId,
-        log,
-      });
-      if (rateLimitResponse) {
-        return rateLimitResponse;
-      }
-
-      const response = await handler({
-        req,
-        props,
-        authentication: authResult.authentication,
-        parsedInput: parsedInputResult.parsedInput,
-        requestId,
-        instance,
-      });
-
-      return ensureRequestIdHeader(response, requestId);
-    } catch (error) {
-      log.error({ error, statusCode: 500 }, "V3 API unexpected error");
-      return problemInternalError(requestId, "An unexpected error occurred.", instance);
-    }
-  };
-};

apps/web/app/api/v3/lib/auth.test.ts

@@ -1,274 +0,0 @@
-import { ApiKeyPermission, EnvironmentType } from "@prisma/client";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
-import { getEnvironment } from "@/lib/utils/services";
-import { requireSessionWorkspaceAccess, requireV3WorkspaceAccess } from "./auth";
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      warn: vi.fn(),
-      error: vi.fn(),
-    })),
-  },
-}));
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromProjectId: vi.fn(),
-}));
-
-vi.mock("@/lib/utils/services", () => ({
-  getEnvironment: vi.fn(),
-}));
-
-vi.mock("@/lib/utils/action-client/action-client-middleware", () => ({
-  checkAuthorizationUpdated: vi.fn(),
-}));
-
-const requestId = "req-123";
-
-describe("requireSessionWorkspaceAccess", () => {
-  test("returns 401 when authentication is null", async () => {
-    const result = await requireSessionWorkspaceAccess(null, "proj_abc", "read", requestId);
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(401);
-    expect((result as Response).headers.get("Content-Type")).toBe("application/problem+json");
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.status).toBe(401);
-    expect(body.code).toBe("not_authenticated");
-    expect(getEnvironment).not.toHaveBeenCalled();
-    expect(checkAuthorizationUpdated).not.toHaveBeenCalled();
-  });
-
-  test("returns 401 when authentication is API key (no user)", async () => {
-    const result = await requireSessionWorkspaceAccess(
-      { apiKeyId: "key_1", organizationId: "org_1", environmentPermissions: [] } as any,
-      "proj_abc",
-      "read",
-      requestId
-    );
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(401);
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.code).toBe("not_authenticated");
-    expect(getEnvironment).not.toHaveBeenCalled();
-  });
-
-  test("returns 403 when workspace (environment) is not found (avoid leaking existence)", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
-    const result = await requireSessionWorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_nonexistent",
-      "read",
-      requestId
-    );
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(403);
-    expect((result as Response).headers.get("Content-Type")).toBe("application/problem+json");
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.code).toBe("forbidden");
-    expect(getEnvironment).toHaveBeenCalledWith("env_nonexistent");
-    expect(checkAuthorizationUpdated).not.toHaveBeenCalled();
-  });
-
-  test("returns 403 when user has no access to workspace", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_abc",
-      projectId: "proj_abc",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
-    vi.mocked(checkAuthorizationUpdated).mockRejectedValueOnce(new AuthorizationError("Not authorized"));
-    const result = await requireSessionWorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_abc",
-      "read",
-      requestId
-    );
-    expect(result).toBeInstanceOf(Response);
-    expect((result as Response).status).toBe(403);
-    const body = await (result as Response).json();
-    expect(body.requestId).toBe(requestId);
-    expect(body.code).toBe("forbidden");
-    expect(checkAuthorizationUpdated).toHaveBeenCalledWith({
-      userId: "user_1",
-      organizationId: "org_1",
-      access: [
-        { type: "organization", roles: ["owner", "manager"] },
-        { type: "projectTeam", projectId: "proj_abc", minPermission: "read" },
-      ],
-    });
-  });
-
-  test("returns workspace context when session is valid and user has access", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_abc",
-      projectId: "proj_abc",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_1");
-    vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
-    const result = await requireSessionWorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_abc",
-      "readWrite",
-      requestId
-    );
-    expect(result).not.toBeInstanceOf(Response);
-    expect(result).toEqual({
-      environmentId: "env_abc",
-      projectId: "proj_abc",
-      organizationId: "org_1",
-    });
-    expect(checkAuthorizationUpdated).toHaveBeenCalledWith({
-      userId: "user_1",
-      organizationId: "org_1",
-      access: [
-        { type: "organization", roles: ["owner", "manager"] },
-        { type: "projectTeam", projectId: "proj_abc", minPermission: "readWrite" },
-      ],
-    });
-  });
-});
-
-const keyBase = {
-  type: "apiKey" as const,
-  apiKeyId: "key_1",
-  organizationId: "org_k",
-  organizationAccess: { accessControl: { read: true, write: false } },
-};
-
-function envPerm(environmentId: string, permission: ApiKeyPermission = ApiKeyPermission.read) {
-  return {
-    environmentId,
-    environmentType: EnvironmentType.development,
-    projectId: "proj_k",
-    projectName: "K",
-    permission,
-  };
-}
-
-describe("requireV3WorkspaceAccess", () => {
-  beforeEach(() => {
-    vi.mocked(getEnvironment).mockResolvedValue({
-      id: "env_k",
-      projectId: "proj_k",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValue("org_k");
-  });
-
-  test("401 when authentication is null", async () => {
-    const r = await requireV3WorkspaceAccess(null, "env_x", "read", requestId);
-    expect((r as Response).status).toBe(401);
-  });
-
-  test("delegates to session flow when user is present", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_s",
-      projectId: "proj_s",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_s");
-    vi.mocked(checkAuthorizationUpdated).mockResolvedValueOnce(undefined as any);
-    const r = await requireV3WorkspaceAccess(
-      { user: { id: "user_1" }, expires: "" } as any,
-      "env_s",
-      "read",
-      requestId
-    );
-    expect(r).toEqual({
-      environmentId: "env_s",
-      projectId: "proj_s",
-      organizationId: "org_s",
-    });
-  });
-
-  test("returns context for API key with read on workspace", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_a", ApiKeyPermission.read)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_a", "read", requestId);
-    expect(r).toEqual({
-      environmentId: "ws_a",
-      projectId: "proj_k",
-      organizationId: "org_k",
-    });
-    expect(getEnvironment).toHaveBeenCalledWith("ws_a");
-  });
-
-  test("returns context for API key with write on workspace", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_b", ApiKeyPermission.write)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_b", "read", requestId);
-    expect(r).toEqual({
-      environmentId: "ws_b",
-      projectId: "proj_k",
-      organizationId: "org_k",
-    });
-  });
-
-  test("returns 403 when API key permission is lower than the required permission", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_write", ApiKeyPermission.read)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_write", "readWrite", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("403 when API key has no matching environment", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("other_env")],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "wanted", "read", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("403 when API key permission is not list-eligible (runtime value)", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [
-        {
-          ...envPerm("ws_c"),
-          permission: "invalid" as unknown as ApiKeyPermission,
-        },
-      ],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_c", "read", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("returns context for API key with manage on workspace", async () => {
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_m", ApiKeyPermission.manage)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_m", "manage", requestId);
-    expect(r).toEqual({
-      environmentId: "ws_m",
-      projectId: "proj_k",
-      organizationId: "org_k",
-    });
-  });
-
-  test("returns 403 when the workspace cannot be resolved for an API key", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
-    const auth = {
-      ...keyBase,
-      environmentPermissions: [envPerm("ws_missing", ApiKeyPermission.manage)],
-    };
-    const r = await requireV3WorkspaceAccess(auth as any, "ws_missing", "read", requestId);
-    expect((r as Response).status).toBe(403);
-  });
-
-  test("401 when auth is neither session nor valid API key payload", async () => {
-    const r = await requireV3WorkspaceAccess({ user: {} } as any, "env", "read", requestId);
-    expect((r as Response).status).toBe(401);
-  });
-});

apps/web/app/api/v3/lib/auth.ts

@@ -1,122 +0,0 @@
-/**
- * V3 API auth — session (browser) or API key with environment-scoped access.
- */
-import { ApiKeyPermission } from "@prisma/client";
-import { logger } from "@formbricks/logger";
-import type { TAuthenticationApiKey } from "@formbricks/types/auth";
-import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
-import type { TTeamPermission } from "@/modules/ee/teams/project-teams/types/team";
-import { problemForbidden, problemUnauthorized } from "./response";
-import type { TV3Authentication } from "./types";
-import { type V3WorkspaceContext, resolveV3WorkspaceContext } from "./workspace-context";
-
-function apiKeyPermissionAllows(permission: ApiKeyPermission, minPermission: TTeamPermission): boolean {
-  const grantedRank = {
-    [ApiKeyPermission.read]: 1,
-    [ApiKeyPermission.write]: 2,
-    [ApiKeyPermission.manage]: 3,
-  }[permission];
-
-  const requiredRank = {
-    read: 1,
-    readWrite: 2,
-    manage: 3,
-  }[minPermission];
-
-  return grantedRank >= requiredRank;
-}
-
-/**
- * Require session and workspace access. workspaceId is resolved via the V3 workspace-context layer.
- * Returns a Response (401 or 403) on failure, or the resolved workspace context on success so callers
- * use internal IDs (environmentId, projectId, organizationId) without resolving again.
- * We use 403 (not 404) when the workspace is not found to avoid leaking resource existence.
- */
-export async function requireSessionWorkspaceAccess(
-  authentication: TV3Authentication,
-  workspaceId: string,
-  minPermission: TTeamPermission,
-  requestId: string,
-  instance?: string
-): Promise<Response | V3WorkspaceContext> {
-  // --- Session checks ---
-  if (!authentication) {
-    return problemUnauthorized(requestId, "Not authenticated", instance);
-  }
-  if (!("user" in authentication) || !authentication.user?.id) {
-    return problemUnauthorized(requestId, "Session required", instance);
-  }
-
-  const userId = authentication.user.id;
-  const log = logger.withContext({ requestId, workspaceId });
-
-  try {
-    // Resolve workspaceId → environmentId, projectId, organizationId (single place to change when Workspace exists).
-    const context = await resolveV3WorkspaceContext(workspaceId);
-
-    // Org + project-team access; we use internal IDs from context.
-    await checkAuthorizationUpdated({
-      userId,
-      organizationId: context.organizationId,
-      access: [
-        { type: "organization", roles: ["owner", "manager"] },
-        { type: "projectTeam", projectId: context.projectId, minPermission },
-      ],
-    });
-
-    return context;
-  } catch (err) {
-    if (err instanceof ResourceNotFoundError || err instanceof AuthorizationError) {
-      const message = err instanceof ResourceNotFoundError ? "Workspace not found" : "Forbidden";
-      log.warn({ statusCode: 403, errorCode: err.name }, message);
-      return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-    }
-    throw err;
-  }
-}
-
-/** Session or API key: authorize `workspaceId` against the resolved V3 workspace context. */
-export async function requireV3WorkspaceAccess(
-  authentication: TV3Authentication,
-  workspaceId: string,
-  minPermission: TTeamPermission,
-  requestId: string,
-  instance?: string
-): Promise<Response | V3WorkspaceContext> {
-  if (!authentication) {
-    return problemUnauthorized(requestId, "Not authenticated", instance);
-  }
-
-  if ("user" in authentication && authentication.user?.id) {
-    return requireSessionWorkspaceAccess(authentication, workspaceId, minPermission, requestId, instance);
-  }
-
-  const keyAuth = authentication as TAuthenticationApiKey;
-  if (keyAuth.apiKeyId && Array.isArray(keyAuth.environmentPermissions)) {
-    const log = logger.withContext({ requestId, workspaceId, apiKeyId: keyAuth.apiKeyId });
-
-    try {
-      const context = await resolveV3WorkspaceContext(workspaceId);
-      const permission = keyAuth.environmentPermissions.find(
-        (environmentPermission) => environmentPermission.environmentId === context.environmentId
-      );
-
-      if (!permission || !apiKeyPermissionAllows(permission.permission, minPermission)) {
-        log.warn({ statusCode: 403 }, "API key not allowed for workspace");
-        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-      }
-
-      return context;
-    } catch (error) {
-      if (error instanceof ResourceNotFoundError) {
-        log.warn({ statusCode: 403, errorCode: error.name }, "Workspace not found");
-        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-      }
-
-      throw error;
-    }
-  }
-
-  return problemUnauthorized(requestId, "Not authenticated", instance);
-}

apps/web/app/api/v3/lib/response.test.ts

@@ -1,95 +0,0 @@
-import { describe, expect, test } from "vitest";
-import {
-  problemBadRequest,
-  problemForbidden,
-  problemInternalError,
-  problemNotFound,
-  problemTooManyRequests,
-  problemUnauthorized,
-  successListResponse,
-} from "./response";
-
-describe("v3 problem responses", () => {
-  test("problemBadRequest includes invalid_params", async () => {
-    const res = problemBadRequest("rid", "bad", {
-      invalid_params: [{ name: "x", reason: "y" }],
-      instance: "/p",
-    });
-    expect(res.status).toBe(400);
-    expect(res.headers.get("X-Request-Id")).toBe("rid");
-    const body = await res.json();
-    expect(body.code).toBe("bad_request");
-    expect(body.requestId).toBe("rid");
-    expect(body.invalid_params).toEqual([{ name: "x", reason: "y" }]);
-    expect(body.instance).toBe("/p");
-  });
-
-  test("problemUnauthorized default detail", async () => {
-    const res = problemUnauthorized("r1");
-    expect(res.status).toBe(401);
-    const body = await res.json();
-    expect(body.detail).toBe("Not authenticated");
-    expect(body.code).toBe("not_authenticated");
-  });
-
-  test("problemForbidden", async () => {
-    const res = problemForbidden("r2", undefined, "/api/x");
-    expect(res.status).toBe(403);
-    const body = await res.json();
-    expect(body.code).toBe("forbidden");
-    expect(body.instance).toBe("/api/x");
-  });
-
-  test("problemInternalError", async () => {
-    const res = problemInternalError("r3", "oops", "/i");
-    expect(res.status).toBe(500);
-    const body = await res.json();
-    expect(body.code).toBe("internal_server_error");
-    expect(body.detail).toBe("oops");
-  });
-
-  test("problemNotFound includes details", async () => {
-    const res = problemNotFound("r4", "Survey", "s1", "/s");
-    expect(res.status).toBe(404);
-    const body = await res.json();
-    expect(body.code).toBe("not_found");
-    expect(body.details).toEqual({ resource_type: "Survey", resource_id: "s1" });
-  });
-
-  test("problemTooManyRequests with Retry-After", async () => {
-    const res = problemTooManyRequests("r5", "slow down", 60);
-    expect(res.status).toBe(429);
-    expect(res.headers.get("Retry-After")).toBe("60");
-    const body = await res.json();
-    expect(body.code).toBe("too_many_requests");
-  });
-
-  test("problemTooManyRequests without Retry-After", async () => {
-    const res = problemTooManyRequests("r6", "nope");
-    expect(res.headers.get("Retry-After")).toBeNull();
-  });
-});
-
-describe("successListResponse", () => {
-  test("sets X-Request-Id and default cache", async () => {
-    const res = successListResponse(
-      [{ a: 1 }],
-      { limit: 10, nextCursor: "cursor-1" },
-      {
-        requestId: "req-x",
-      }
-    );
-    expect(res.status).toBe(200);
-    expect(res.headers.get("X-Request-Id")).toBe("req-x");
-    expect(res.headers.get("Cache-Control")).toContain("no-store");
-    expect(await res.json()).toEqual({
-      data: [{ a: 1 }],
-      meta: { limit: 10, nextCursor: "cursor-1" },
-    });
-  });
-
-  test("custom Cache-Control", async () => {
-    const res = successListResponse([], { limit: 5, nextCursor: null }, { cache: "private, max-age=0" });
-    expect(res.headers.get("Cache-Control")).toBe("private, max-age=0");
-  });
-});

apps/web/app/api/v3/lib/response.ts

@@ -1,149 +0,0 @@
-/**
- * V3 API response helpers — RFC 9457 Problem Details (application/problem+json)
- * and list envelope for success responses.
- */
-
-const PROBLEM_JSON = "application/problem+json" as const;
-const CACHE_NO_STORE = "private, no-store" as const;
-
-export type InvalidParam = { name: string; reason: string };
-
-export type ProblemExtension = {
-  code?: string;
-  requestId: string;
-  details?: Record<string, unknown>;
-  invalid_params?: InvalidParam[];
-};
-
-export type ProblemBody = {
-  type?: string;
-  title: string;
-  status: number;
-  detail: string;
-  instance?: string;
-} & ProblemExtension;
-
-function problemResponse(
-  status: number,
-  title: string,
-  detail: string,
-  requestId: string,
-  options?: {
-    type?: string;
-    instance?: string;
-    code?: string;
-    details?: Record<string, unknown>;
-    invalid_params?: InvalidParam[];
-    headers?: Record<string, string>;
-  }
-): Response {
-  const body: ProblemBody = {
-    title,
-    status,
-    detail,
-    requestId,
-    ...(options?.type && { type: options.type }),
-    ...(options?.instance && { instance: options.instance }),
-    ...(options?.code && { code: options.code }),
-    ...(options?.details && { details: options.details }),
-    ...(options?.invalid_params && { invalid_params: options.invalid_params }),
-  };
-
-  const headers: Record<string, string> = {
-    "Content-Type": PROBLEM_JSON,
-    "Cache-Control": CACHE_NO_STORE,
-    "X-Request-Id": requestId,
-    ...options?.headers,
-  };
-
-  return Response.json(body, { status, headers });
-}
-
-export function problemBadRequest(
-  requestId: string,
-  detail: string,
-  options?: { invalid_params?: InvalidParam[]; instance?: string }
-): Response {
-  return problemResponse(400, "Bad Request", detail, requestId, {
-    code: "bad_request",
-    instance: options?.instance,
-    invalid_params: options?.invalid_params,
-  });
-}
-
-export function problemUnauthorized(
-  requestId: string,
-  detail: string = "Not authenticated",
-  instance?: string
-): Response {
-  return problemResponse(401, "Unauthorized", detail, requestId, {
-    code: "not_authenticated",
-    instance,
-  });
-}
-
-export function problemForbidden(
-  requestId: string,
-  detail: string = "You are not authorized to access this resource",
-  instance?: string
-): Response {
-  return problemResponse(403, "Forbidden", detail, requestId, {
-    code: "forbidden",
-    instance,
-  });
-}
-
-/**
- * 404 with resource details. Do not use for auth-sensitive or existence-sensitive resources:
- * the body includes resource_type and resource_id, which can leak existence to unauthenticated or unauthorized callers.
- * Prefer problemForbidden with a generic message for those cases.
- */
-export function problemNotFound(
-  requestId: string,
-  resourceType: string,
-  resourceId: string | null,
-  instance?: string
-): Response {
-  return problemResponse(404, "Not Found", `${resourceType} not found`, requestId, {
-    code: "not_found",
-    details: { resource_type: resourceType, resource_id: resourceId },
-    instance,
-  });
-}
-
-export function problemInternalError(
-  requestId: string,
-  detail: string = "An unexpected error occurred.",
-  instance?: string
-): Response {
-  return problemResponse(500, "Internal Server Error", detail, requestId, {
-    code: "internal_server_error",
-    instance,
-  });
-}
-
-export function problemTooManyRequests(requestId: string, detail: string, retryAfter?: number): Response {
-  const headers: Record<string, string> = {};
-  if (retryAfter !== undefined) {
-    headers["Retry-After"] = String(retryAfter);
-  }
-  return problemResponse(429, "Too Many Requests", detail, requestId, {
-    code: "too_many_requests",
-    headers,
-  });
-}
-
-export function successListResponse<T, TMeta extends Record<string, unknown>>(
-  data: T[],
-  meta: TMeta,
-  options?: { requestId?: string; cache?: string }
-): Response {
-  const headers: Record<string, string> = {
-    "Content-Type": "application/json",
-    "Cache-Control": options?.cache ?? CACHE_NO_STORE,
-  };
-  if (options?.requestId) {
-    headers["X-Request-Id"] = options.requestId;
-  }
-  return Response.json({ data, meta }, { status: 200, headers });
-}

apps/web/app/api/v3/lib/types.ts

@@ -1,4 +0,0 @@
-import type { Session } from "next-auth";
-import type { TAuthenticationApiKey } from "@formbricks/types/auth";
-
-export type TV3Authentication = TAuthenticationApiKey | Session | null;

apps/web/app/api/v3/lib/workspace-context.test.ts

@@ -1,38 +0,0 @@
-import { describe, expect, test, vi } from "vitest";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
-import { getEnvironment } from "@/lib/utils/services";
-import { resolveV3WorkspaceContext } from "./workspace-context";
-
-vi.mock("@/lib/utils/helper", () => ({
-  getOrganizationIdFromProjectId: vi.fn(),
-}));
-
-vi.mock("@/lib/utils/services", () => ({
-  getEnvironment: vi.fn(),
-}));
-
-describe("resolveV3WorkspaceContext", () => {
-  test("returns environmentId, projectId and organizationId when workspace exists (today: workspaceId === environmentId)", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce({
-      id: "env_abc",
-      projectId: "proj_xyz",
-    } as any);
-    vi.mocked(getOrganizationIdFromProjectId).mockResolvedValueOnce("org_123");
-    const result = await resolveV3WorkspaceContext("env_abc");
-    expect(result).toEqual({
-      environmentId: "env_abc",
-      projectId: "proj_xyz",
-      organizationId: "org_123",
-    });
-    expect(getEnvironment).toHaveBeenCalledWith("env_abc");
-    expect(getOrganizationIdFromProjectId).toHaveBeenCalledWith("proj_xyz");
-  });
-
-  test("throws when workspace (environment) does not exist", async () => {
-    vi.mocked(getEnvironment).mockResolvedValueOnce(null);
-    await expect(resolveV3WorkspaceContext("env_nonexistent")).rejects.toThrow(ResourceNotFoundError);
-    expect(getEnvironment).toHaveBeenCalledWith("env_nonexistent");
-    expect(getOrganizationIdFromProjectId).not.toHaveBeenCalled();
-  });
-});

apps/web/app/api/v3/lib/workspace-context.ts

@@ -1,50 +0,0 @@
-/**
- * V3 API workspace → internal IDs translation layer (retro-compatibility / future-proofing).
- *
- * Workspace is the default container for surveys. We are deprecating Environment and making
- * Workspace that container. In the API, workspaceId refers to that container.
- *
- * Today: workspaceId is mapped to environmentId (Environment is the current container for surveys).
- * When Environment is deprecated and Workspace exists: resolve workspaceId to the Workspace entity
- * (and derive environmentId or equivalent from it). Change only this file.
- */
-import { ResourceNotFoundError } from "@formbricks/types/errors";
-import { getOrganizationIdFromProjectId } from "@/lib/utils/helper";
-import { getEnvironment } from "@/lib/utils/services";
-
-/**
- * Internal IDs derived from a V3 workspace identifier.
- * Today: environmentId is the workspace (Environment = container for surveys until Workspace exists).
- */
-export type V3WorkspaceContext = {
-  /** Environment ID — the container for surveys today. Replaced by workspace when Environment is deprecated. */
-  environmentId: string;
-  /** Project ID used for projectTeam auth. */
-  projectId: string;
-  /** Organization ID used for org-level auth. */
-  organizationId: string;
-};
-
-/**
- * Resolves a V3 API workspaceId to internal environmentId, projectId, and organizationId.
- * Today: workspaceId is treated as environmentId (workspace = container for surveys = Environment).
- *
- * @throws ResourceNotFoundError if the workspace (environment) does not exist.
- */
-export async function resolveV3WorkspaceContext(workspaceId: string): Promise<V3WorkspaceContext> {
-  // Today: workspaceId is the environment id (survey container). Look it up.
-  const environment = await getEnvironment(workspaceId);
-  if (!environment) {
-    throw new ResourceNotFoundError("environment", workspaceId);
-  }
-
-  // Derive org for auth; project comes from the environment.
-  const organizationId = await getOrganizationIdFromProjectId(environment.projectId);
-
-  // We looked up by workspaceId (as environment id), so the resolved environment id is workspaceId.
-  return {
-    environmentId: workspaceId,
-    projectId: environment.projectId,
-    organizationId,
-  };
-}

apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.test.ts

@@ -1,122 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { collectMultiValueQueryParam, parseV3SurveysListQuery } from "./parse-v3-surveys-list-query";
-
-const wid = "clxx1234567890123456789012";
-
-function params(qs: string): URLSearchParams {
-  return new URLSearchParams(qs);
-}
-
-describe("collectMultiValueQueryParam", () => {
-  test("merges repeated keys and comma-separated values", () => {
-    const sp = params("status=draft&status=inProgress&type=link,app");
-    expect(collectMultiValueQueryParam(sp, "status")).toEqual(["draft", "inProgress"]);
-    expect(collectMultiValueQueryParam(sp, "type")).toEqual(["link", "app"]);
-  });
-
-  test("dedupes", () => {
-    const sp = params("status=draft&status=draft");
-    expect(collectMultiValueQueryParam(sp, "status")).toEqual(["draft"]);
-  });
-});
-
-describe("parseV3SurveysListQuery", () => {
-  test("rejects unsupported query parameters like filterCriteria", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filterCriteria={}`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) expect(r.invalid_params[0].name).toBe("filterCriteria");
-  });
-
-  test("rejects unknown query parameters", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&foo=bar`));
-    expect(r.ok).toBe(false);
-    if (!r.ok)
-      expect(r.invalid_params[0]).toEqual({
-        name: "foo",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-  });
-
-  test("rejects the legacy after query parameter", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&after=legacy-cursor`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params[0]).toEqual({
-        name: "after",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-    }
-  });
-
-  test("rejects the legacy flat name query parameter", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&name=Foo`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params[0]).toEqual({
-        name: "name",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-    }
-  });
-
-  test("parses minimal query", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}`));
-    expect(r.ok).toBe(true);
-    if (r.ok) {
-      expect(r.limit).toBe(20);
-      expect(r.cursor).toBeNull();
-      expect(r.sortBy).toBe("updatedAt");
-      expect(r.filterCriteria).toBeUndefined();
-    }
-  });
-
-  test("builds filter from explicit operator params", () => {
-    const r = parseV3SurveysListQuery(
-      params(
-        `workspaceId=${wid}&filter[name][contains]=Foo&filter[status][in]=inProgress&filter[status][in]=draft&filter[type][in]=link&sortBy=updatedAt`
-      )
-    );
-    expect(r.ok).toBe(true);
-    if (r.ok) {
-      expect(r.filterCriteria).toEqual({
-        name: "Foo",
-        status: ["inProgress", "draft"],
-        type: ["link"],
-      });
-      expect(r.sortBy).toBe("updatedAt");
-    }
-  });
-
-  test("invalid status", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[status][in]=notastatus`));
-    expect(r.ok).toBe(false);
-  });
-
-  test("rejects the createdBy filter", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&filter[createdBy][in]=you`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params[0]).toEqual({
-        name: "filter[createdBy][in]",
-        reason:
-          "Unsupported query parameter. Use only workspaceId, limit, cursor, filter[name][contains], filter[status][in], filter[type][in], sortBy.",
-      });
-    }
-  });
-
-  test("rejects an invalid cursor", () => {
-    const r = parseV3SurveysListQuery(params(`workspaceId=${wid}&cursor=not-a-real-cursor`));
-    expect(r.ok).toBe(false);
-    if (!r.ok) {
-      expect(r.invalid_params).toEqual([
-        {
-          name: "cursor",
-          reason: "The cursor is invalid.",
-        },
-      ]);
-    }
-  });
-});

apps/web/app/api/v3/surveys/parse-v3-surveys-list-query.ts

@@ -1,159 +0,0 @@
-/**
- * Validates GET /api/v3/surveys query string and builds {@link TSurveyFilterCriteria} for list/count.
- * Keeps HTTP parsing separate from the route handler and shared survey list service.
- */
-import { z } from "zod";
-import { ZId } from "@formbricks/types/common";
-import {
-  type TSurveyFilterCriteria,
-  ZSurveyFilters,
-  ZSurveyStatus,
-  ZSurveyType,
-} from "@formbricks/types/surveys/types";
-import {
-  type TSurveyListPageCursor,
-  type TSurveyListSort,
-  decodeSurveyListPageCursor,
-  normalizeSurveyListSort,
-} from "@/modules/survey/list/lib/survey-page";
-
-const V3_SURVEYS_DEFAULT_LIMIT = 20;
-const V3_SURVEYS_MAX_LIMIT = 100;
-
-const FILTER_NAME_CONTAINS_QUERY_PARAM = "filter[name][contains]" as const;
-const FILTER_STATUS_IN_QUERY_PARAM = "filter[status][in]" as const;
-const FILTER_TYPE_IN_QUERY_PARAM = "filter[type][in]" as const;
-
-const SUPPORTED_QUERY_PARAMS = [
-  "workspaceId",
-  "limit",
-  "cursor",
-  FILTER_NAME_CONTAINS_QUERY_PARAM,
-  FILTER_STATUS_IN_QUERY_PARAM,
-  FILTER_TYPE_IN_QUERY_PARAM,
-  "sortBy",
-] as const;
-const SUPPORTED_QUERY_PARAM_SET = new Set<string>(SUPPORTED_QUERY_PARAMS);
-
-type InvalidParam = { name: string; reason: string };
-
-/** Collect repeated query keys and comma-separated values for operator-style filters. */
-export function collectMultiValueQueryParam(searchParams: URLSearchParams, key: string): string[] {
-  const acc: string[] = [];
-  for (const raw of searchParams.getAll(key)) {
-    for (const part of raw.split(",")) {
-      const t = part.trim();
-      if (t) acc.push(t);
-    }
-  }
-  return [...new Set(acc)];
-}
-
-const ZV3SurveysListQuery = z.object({
-  workspaceId: ZId,
-  limit: z.coerce.number().int().min(1).max(V3_SURVEYS_MAX_LIMIT).default(V3_SURVEYS_DEFAULT_LIMIT),
-  cursor: z.string().min(1).optional(),
-  [FILTER_NAME_CONTAINS_QUERY_PARAM]: z
-    .string()
-    .max(512)
-    .optional()
-    .transform((s) => (s === undefined || s.trim() === "" ? undefined : s.trim())),
-  [FILTER_STATUS_IN_QUERY_PARAM]: z.array(ZSurveyStatus).optional(),
-  [FILTER_TYPE_IN_QUERY_PARAM]: z.array(ZSurveyType).optional(),
-  sortBy: ZSurveyFilters.shape.sortBy.optional(),
-});
-
-export type TV3SurveysListQuery = z.infer<typeof ZV3SurveysListQuery>;
-
-export type TV3SurveysListQueryParseResult =
-  | {
-      ok: true;
-      workspaceId: string;
-      limit: number;
-      cursor: TSurveyListPageCursor | null;
-      sortBy: TSurveyListSort;
-      filterCriteria: TSurveyFilterCriteria | undefined;
-    }
-  | { ok: false; invalid_params: InvalidParam[] };
-
-function getUnsupportedQueryParams(searchParams: URLSearchParams): InvalidParam[] {
-  const unsupportedParams = [
-    ...new Set(Array.from(searchParams.keys()).filter((key) => !SUPPORTED_QUERY_PARAM_SET.has(key))),
-  ];
-
-  return unsupportedParams.map((name) => ({
-    name,
-    reason: `Unsupported query parameter. Use only ${SUPPORTED_QUERY_PARAMS.join(", ")}.`,
-  }));
-}
-
-function buildFilterCriteria(q: TV3SurveysListQuery): TSurveyFilterCriteria | undefined {
-  const f: TSurveyFilterCriteria = {};
-  if (q[FILTER_NAME_CONTAINS_QUERY_PARAM]) f.name = q[FILTER_NAME_CONTAINS_QUERY_PARAM];
-  if (q[FILTER_STATUS_IN_QUERY_PARAM]?.length) f.status = q[FILTER_STATUS_IN_QUERY_PARAM];
-  if (q[FILTER_TYPE_IN_QUERY_PARAM]?.length) f.type = q[FILTER_TYPE_IN_QUERY_PARAM];
-  return Object.keys(f).length > 0 ? f : undefined;
-}
-
-export function parseV3SurveysListQuery(searchParams: URLSearchParams): TV3SurveysListQueryParseResult {
-  const unsupportedQueryParams = getUnsupportedQueryParams(searchParams);
-  if (unsupportedQueryParams.length > 0) {
-    return {
-      ok: false,
-      invalid_params: unsupportedQueryParams,
-    };
-  }
-
-  const statusVals = collectMultiValueQueryParam(searchParams, FILTER_STATUS_IN_QUERY_PARAM);
-  const typeVals = collectMultiValueQueryParam(searchParams, FILTER_TYPE_IN_QUERY_PARAM);
-
-  const raw = {
-    workspaceId: searchParams.get("workspaceId"),
-    limit: searchParams.get("limit") ?? undefined,
-    cursor: searchParams.get("cursor")?.trim() || undefined,
-    [FILTER_NAME_CONTAINS_QUERY_PARAM]: searchParams.get(FILTER_NAME_CONTAINS_QUERY_PARAM) ?? undefined,
-    [FILTER_STATUS_IN_QUERY_PARAM]: statusVals.length > 0 ? statusVals : undefined,
-    [FILTER_TYPE_IN_QUERY_PARAM]: typeVals.length > 0 ? typeVals : undefined,
-    sortBy: searchParams.get("sortBy")?.trim() || undefined,
-  };
-
-  const result = ZV3SurveysListQuery.safeParse(raw);
-  if (!result.success) {
-    return {
-      ok: false,
-      invalid_params: result.error.issues.map((issue) => ({
-        name: issue.path.join(".") || "query",
-        reason: issue.message,
-      })),
-    };
-  }
-
-  const q = result.data;
-  const sortBy = normalizeSurveyListSort(q.sortBy);
-  let cursor: TSurveyListPageCursor | null = null;
-
-  if (q.cursor) {
-    try {
-      cursor = decodeSurveyListPageCursor(q.cursor, sortBy);
-    } catch (error) {
-      return {
-        ok: false,
-        invalid_params: [
-          {
-            name: "cursor",
-            reason: error instanceof Error ? error.message : "The cursor is invalid.",
-          },
-        ],
-      };
-    }
-  }
-
-  return {
-    ok: true,
-    workspaceId: q.workspaceId,
-    limit: q.limit,
-    cursor,
-    sortBy,
-    filterCriteria: buildFilterCriteria(q),
-  };
-}

apps/web/app/api/v3/surveys/route.test.ts

@@ -1,357 +0,0 @@
-import { ApiKeyPermission, EnvironmentType } from "@prisma/client";
-import { NextRequest } from "next/server";
-import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
-import { getSurveyCount } from "@/modules/survey/list/lib/survey";
-import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
-import { GET } from "./route";
-
-const { mockAuthenticateRequest } = vi.hoisted(() => ({
-  mockAuthenticateRequest: vi.fn(),
-}));
-
-vi.mock("next-auth", () => ({
-  getServerSession: vi.fn(),
-}));
-
-vi.mock("@/app/api/v1/auth", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/app/api/v1/auth")>();
-  return { ...actual, authenticateRequest: mockAuthenticateRequest };
-});
-
-vi.mock("@/modules/core/rate-limit/helpers", () => ({
-  applyRateLimit: vi.fn().mockResolvedValue(undefined),
-  applyIPRateLimit: vi.fn().mockResolvedValue(undefined),
-}));
-
-vi.mock("@/lib/constants", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/lib/constants")>();
-  return { ...actual, AUDIT_LOG_ENABLED: false };
-});
-
-vi.mock("@/app/api/v3/lib/auth", () => ({
-  requireV3WorkspaceAccess: vi.fn(),
-}));
-
-vi.mock("@/modules/survey/list/lib/survey-page", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/modules/survey/list/lib/survey-page")>();
-  return {
-    ...actual,
-    getSurveyListPage: vi.fn(),
-  };
-});
-
-vi.mock("@/modules/survey/list/lib/survey", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("@/modules/survey/list/lib/survey")>();
-  return {
-    ...actual,
-    getSurveyCount: vi.fn(),
-  };
-});
-
-vi.mock("@formbricks/logger", () => ({
-  logger: {
-    withContext: vi.fn(() => ({
-      warn: vi.fn(),
-      error: vi.fn(),
-    })),
-  },
-}));
-
-const getServerSession = vi.mocked((await import("next-auth")).getServerSession);
-
-const validWorkspaceId = "clxx1234567890123456789012";
-const resolvedEnvironmentId = "clzz9876543210987654321098";
-
-function createRequest(url: string, requestId?: string, extraHeaders?: Record<string, string>): NextRequest {
-  const headers: Record<string, string> = { ...extraHeaders };
-  if (requestId) headers["x-request-id"] = requestId;
-  return new NextRequest(url, { headers });
-}
-
-const apiKeyAuth = {
-  type: "apiKey" as const,
-  apiKeyId: "key_1",
-  organizationId: "org_1",
-  organizationAccess: {
-    accessControl: { read: true, write: false },
-  },
-  environmentPermissions: [
-    {
-      environmentId: validWorkspaceId,
-      environmentType: EnvironmentType.development,
-      projectId: "proj_1",
-      projectName: "P",
-      permission: ApiKeyPermission.read,
-    },
-  ],
-};
-
-describe("GET /api/v3/surveys", () => {
-  beforeEach(() => {
-    vi.resetAllMocks();
-    getServerSession.mockResolvedValue({
-      user: { id: "user_1", name: "User", email: "u@example.com" },
-      expires: "2026-01-01",
-    } as any);
-    mockAuthenticateRequest.mockResolvedValue(null);
-    vi.mocked(requireV3WorkspaceAccess).mockImplementation(async (auth, workspaceId) => {
-      if (auth && "apiKeyId" in auth) {
-        const p = auth.environmentPermissions.find((e) => e.environmentId === workspaceId);
-        if (!p) {
-          return new Response(
-            JSON.stringify({
-              title: "Forbidden",
-              status: 403,
-              detail: "You are not authorized to access this resource",
-              requestId: "req",
-            }),
-            { status: 403, headers: { "Content-Type": "application/problem+json" } }
-          );
-        }
-        return {
-          environmentId: workspaceId,
-          projectId: p.projectId,
-          organizationId: auth.organizationId,
-        };
-      }
-      return {
-        environmentId: resolvedEnvironmentId,
-        projectId: "proj_1",
-        organizationId: "org_1",
-      };
-    });
-    vi.mocked(getSurveyListPage).mockResolvedValue({ surveys: [], nextCursor: null });
-    vi.mocked(getSurveyCount).mockResolvedValue(0);
-  });
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
-  test("returns 401 when no session and no API key", async () => {
-    getServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue(null);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(401);
-    expect(res.headers.get("Content-Type")).toBe("application/problem+json");
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 200 with session and valid workspaceId", async () => {
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-456");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    expect(res.headers.get("Content-Type")).toBe("application/json");
-    expect(res.headers.get("X-Request-Id")).toBe("req-456");
-    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
-      expect.objectContaining({ user: expect.any(Object) }),
-      validWorkspaceId,
-      "read",
-      "req-456",
-      "/api/v3/surveys"
-    );
-    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
-      limit: 20,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria: undefined,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, undefined);
-  });
-
-  test("returns 200 with x-api-key when workspace is on the key", async () => {
-    getServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue(apiKeyAuth as any);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-k", {
-      "x-api-key": "fbk_test",
-    });
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    expect(requireV3WorkspaceAccess).toHaveBeenCalledWith(
-      expect.objectContaining({ apiKeyId: "key_1" }),
-      validWorkspaceId,
-      "read",
-      "req-k",
-      "/api/v3/surveys"
-    );
-    expect(getSurveyListPage).toHaveBeenCalledWith(validWorkspaceId, {
-      limit: 20,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria: undefined,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(validWorkspaceId, undefined);
-  });
-
-  test("returns 403 when API key does not include workspace", async () => {
-    getServerSession.mockResolvedValue(null);
-    mockAuthenticateRequest.mockResolvedValue({
-      ...apiKeyAuth,
-      environmentPermissions: [
-        {
-          environmentId: "claa1111111111111111111111",
-          environmentType: EnvironmentType.development,
-          projectId: "proj_x",
-          projectName: "X",
-          permission: ApiKeyPermission.read,
-        },
-      ],
-    } as any);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, undefined, {
-      "x-api-key": "fbk_test",
-    });
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(403);
-  });
-
-  test("returns 400 when the createdBy filter is used", async () => {
-    const req = createRequest(
-      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filter[createdBy][in]=you`
-    );
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-    const body = await res.json();
-    expect(body.invalid_params?.some((p: { name: string }) => p.name === "filter[createdBy][in]")).toBe(true);
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 400 when workspaceId is missing", async () => {
-    const req = createRequest("http://localhost/api/v3/surveys");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 400 when workspaceId is not cuid2", async () => {
-    const req = createRequest("http://localhost/api/v3/surveys?workspaceId=not-a-cuid");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-  });
-
-  test("returns 400 when limit exceeds max", async () => {
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&limit=101`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-  });
-
-  test("reflects limit, nextCursor, and totalCount in meta", async () => {
-    vi.mocked(getSurveyListPage).mockResolvedValue({
-      surveys: [],
-      nextCursor: "cursor-123",
-    });
-    vi.mocked(getSurveyCount).mockResolvedValue(42);
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&limit=10`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    const body = await res.json();
-    expect(body.meta).toEqual({ limit: 10, nextCursor: "cursor-123", totalCount: 42 });
-    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
-      limit: 10,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria: undefined,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, undefined);
-  });
-
-  test("passes filter query to getSurveyListPage", async () => {
-    const filterCriteria = { status: ["inProgress"] };
-    const req = createRequest(
-      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filter[status][in]=inProgress&sortBy=updatedAt`
-    );
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(200);
-    expect(getSurveyListPage).toHaveBeenCalledWith(resolvedEnvironmentId, {
-      limit: 20,
-      cursor: null,
-      sortBy: "updatedAt",
-      filterCriteria,
-    });
-    expect(getSurveyCount).toHaveBeenCalledWith(resolvedEnvironmentId, filterCriteria);
-  });
-
-  test("returns 400 when filterCriteria is used", async () => {
-    const req = createRequest(
-      `http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}&filterCriteria=${encodeURIComponent("{}")}`
-    );
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(400);
-    expect(requireV3WorkspaceAccess).not.toHaveBeenCalled();
-  });
-
-  test("returns 403 when auth returns 403", async () => {
-    vi.mocked(requireV3WorkspaceAccess).mockResolvedValueOnce(
-      new Response(
-        JSON.stringify({
-          title: "Forbidden",
-          status: 403,
-          detail: "You are not authorized to access this resource",
-          requestId: "req-789",
-        }),
-        { status: 403, headers: { "Content-Type": "application/problem+json" } }
-      )
-    );
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(403);
-  });
-
-  test("list items expose workspaceId instead of environmentId and omit internal fields", async () => {
-    vi.mocked(getSurveyListPage).mockResolvedValue({
-      surveys: [
-        {
-          id: "s1",
-          name: "Survey 1",
-          environmentId: "env_1",
-          type: "link",
-          status: "draft",
-          createdAt: new Date(),
-          updatedAt: new Date(),
-          responseCount: 0,
-          creator: { name: "Test" },
-          singleUse: null,
-        } as any,
-      ],
-      nextCursor: null,
-    });
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`);
-    const res = await GET(req, {} as any);
-    const body = await res.json();
-    expect(body.data[0]).not.toHaveProperty("blocks");
-    expect(body.data[0]).not.toHaveProperty("singleUse");
-    expect(body.data[0]).not.toHaveProperty("_count");
-    expect(body.data[0]).not.toHaveProperty("environmentId");
-    expect(body.data[0].id).toBe("s1");
-    expect(body.data[0].workspaceId).toBe("env_1");
-  });
-
-  test("returns 403 when getSurveyListPage throws ResourceNotFoundError", async () => {
-    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new ResourceNotFoundError("survey", "s1"));
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-nf");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(403);
-    const body = await res.json();
-    expect(body.code).toBe("forbidden");
-  });
-
-  test("returns 500 when getSurveyListPage throws DatabaseError", async () => {
-    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new DatabaseError("db down"));
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-db");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(500);
-    const body = await res.json();
-    expect(body.code).toBe("internal_server_error");
-  });
-
-  test("returns 500 on unexpected error from getSurveyListPage", async () => {
-    vi.mocked(getSurveyListPage).mockRejectedValueOnce(new Error("boom"));
-    const req = createRequest(`http://localhost/api/v3/surveys?workspaceId=${validWorkspaceId}`, "req-err");
-    const res = await GET(req, {} as any);
-    expect(res.status).toBe(500);
-    const body = await res.json();
-    expect(body.code).toBe("internal_server_error");
-  });
-});

apps/web/app/api/v3/surveys/route.ts

@@ -1,81 +0,0 @@
-/**
- * GET /api/v3/surveys — list surveys for a workspace.
- * Session cookie or x-api-key; scope by workspaceId only.
- */
-import { logger } from "@formbricks/logger";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
-import { withV3ApiWrapper } from "@/app/api/v3/lib/api-wrapper";
-import { requireV3WorkspaceAccess } from "@/app/api/v3/lib/auth";
-import {
-  problemBadRequest,
-  problemForbidden,
-  problemInternalError,
-  successListResponse,
-} from "@/app/api/v3/lib/response";
-import { getSurveyCount } from "@/modules/survey/list/lib/survey";
-import { getSurveyListPage } from "@/modules/survey/list/lib/survey-page";
-import { parseV3SurveysListQuery } from "./parse-v3-surveys-list-query";
-import { serializeV3SurveyListItem } from "./serializers";
-
-export const GET = withV3ApiWrapper({
-  auth: "both",
-  handler: async ({ req, authentication, requestId, instance }) => {
-    const log = logger.withContext({ requestId });
-
-    try {
-      const searchParams = new URL(req.url).searchParams;
-      const parsed = parseV3SurveysListQuery(searchParams);
-      if (!parsed.ok) {
-        log.warn({ statusCode: 400, invalidParams: parsed.invalid_params }, "Validation failed");
-        return problemBadRequest(requestId, "Invalid query parameters", {
-          invalid_params: parsed.invalid_params,
-          instance,
-        });
-      }
-
-      const authResult = await requireV3WorkspaceAccess(
-        authentication,
-        parsed.workspaceId,
-        "read",
-        requestId,
-        instance
-      );
-      if (authResult instanceof Response) {
-        return authResult;
-      }
-
-      const { environmentId } = authResult;
-
-      const [{ surveys, nextCursor }, totalCount] = await Promise.all([
-        getSurveyListPage(environmentId, {
-          limit: parsed.limit,
-          cursor: parsed.cursor,
-          sortBy: parsed.sortBy,
-          filterCriteria: parsed.filterCriteria,
-        }),
-        getSurveyCount(environmentId, parsed.filterCriteria),
-      ]);
-
-      return successListResponse(
-        surveys.map(serializeV3SurveyListItem),
-        {
-          limit: parsed.limit,
-          nextCursor,
-          totalCount,
-        },
-        { requestId, cache: "private, no-store" }
-      );
-    } catch (err) {
-      if (err instanceof ResourceNotFoundError) {
-        log.warn({ statusCode: 403, errorCode: err.name }, "Resource not found");
-        return problemForbidden(requestId, "You are not authorized to access this resource", instance);
-      }
-      if (err instanceof DatabaseError) {
-        log.error({ error: err, statusCode: 500 }, "Database error");
-        return problemInternalError(requestId, "An unexpected error occurred.", instance);
-      }
-      log.error({ error: err, statusCode: 500 }, "V3 surveys list unexpected error");
-      return problemInternalError(requestId, "An unexpected error occurred.", instance);
-    }
-  },
-});

apps/web/app/api/v3/surveys/serializers.ts

@@ -1,18 +0,0 @@
-import type { TSurvey } from "@/modules/survey/list/types/surveys";
-
-export type TV3SurveyListItem = Omit<TSurvey, "environmentId" | "singleUse"> & {
-  workspaceId: string;
-};
-
-/**
- * Keep the v3 API contract isolated from internal persistence naming.
- * Internally surveys are still scoped by environmentId; externally v3 exposes workspaceId.
- */
-export function serializeV3SurveyListItem(survey: TSurvey): TV3SurveyListItem {
-  const { environmentId, singleUse: _omitSingleUse, ...rest } = survey;
-
-  return {
-    ...rest,
-    workspaceId: environmentId,
-  };
-}

apps/web/app/components/NoScriptWarning.tsx

@@ -1,21 +0,0 @@
-import type { TUserLocale } from "@formbricks/types/user";
-import { getTranslate } from "@/lingodotdev/server";
-
-interface NoScriptWarningProps {
-  locale: TUserLocale;
-}
-
-export const NoScriptWarning = async ({ locale }: NoScriptWarningProps) => {
-  const t = await getTranslate(locale);
-
-  return (
-    <noscript>
-      <div className="fixed inset-0 z-[9999] flex h-dvh w-full items-center justify-center bg-slate-50">
-        <div className="rounded-xl border border-slate-200 bg-white p-8 text-center shadow-lg">
-          <h1 className="mb-4 text-2xl font-bold text-slate-800">{t("common.javascript_required")}</h1>
-          <p className="text-slate-600">{t("common.javascript_required_description")}</p>
-        </div>
-      </div>
-    </noscript>
-  );
-};

apps/web/app/layout.tsx

@@ -1,6 +1,5 @@
 import { Metadata } from "next";
 import React from "react";
-import { NoScriptWarning } from "@/app/components/NoScriptWarning";
 import { SentryProvider } from "@/app/sentry/SentryProvider";
 import {
   DEFAULT_LOCALE,
@@ -27,7 +26,6 @@ const RootLayout = async ({ children }: { children: React.ReactNode }) => {
   return (
     <html lang={locale} translate="no">
       <body className="flex h-dvh flex-col transition-all ease-in-out">
-        <NoScriptWarning locale={locale} />
         <SentryProvider
           sentryDsn={SENTRY_DSN}
           sentryRelease={SENTRY_RELEASE}

apps/web/app/lib/api/with-api-logging.test.ts

@@ -12,10 +12,6 @@ vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
   queueAuditEvent: vi.fn(),
 }));
 
-vi.mock("@/modules/ee/audit-logs/types/audit-log", () => ({
-  UNKNOWN_DATA: "unknown",
-}));
-
 vi.mock("@sentry/nextjs", () => ({
   captureException: vi.fn(),
   withScope: vi.fn((callback) => {
@@ -76,13 +72,10 @@ vi.mock("@/app/middleware/endpoint-validator", async () => {
 });
 
 vi.mock("@/modules/core/rate-limit/helpers", () => ({
+  applyIPRateLimit: vi.fn(),
   applyRateLimit: vi.fn(),
 }));
 
-vi.mock("@/modules/core/rate-limit/public-edge-rate-limit", () => ({
-  applyPublicIpRateLimitForRoute: vi.fn(),
-}));
-
 vi.mock("@/modules/core/rate-limit/rate-limit-configs", () => ({
   rateLimitConfigs: {
     api: {
@@ -122,7 +115,6 @@ describe("withV1ApiWrapper", () => {
 
     vi.doMock("@/lib/constants", () => ({
       AUDIT_LOG_ENABLED: true,
-      EDGE_RATE_LIMIT_PROVIDER: "none",
       IS_PRODUCTION: true,
       SENTRY_DSN: "dsn",
       ENCRYPTION_KEY: "test-key",
@@ -139,13 +131,11 @@ describe("withV1ApiWrapper", () => {
   });
 
   test("logs and audits on error response with API key authentication", async () => {
-    const { queueAuditEvent: mockedQueueAuditEvent } = (await import(
-      "@/modules/ee/audit-logs/lib/handler"
-    )) as unknown as { queueAuditEvent: Mock };
+    const { queueAuditEvent: mockedQueueAuditEvent } =
+      (await import("@/modules/ee/audit-logs/lib/handler")) as unknown as { queueAuditEvent: Mock };
     const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
 
     vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
     vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
@@ -193,13 +183,11 @@ describe("withV1ApiWrapper", () => {
   });
 
   test("does not log Sentry if not 500", async () => {
-    const { queueAuditEvent: mockedQueueAuditEvent } = (await import(
-      "@/modules/ee/audit-logs/lib/handler"
-    )) as unknown as { queueAuditEvent: Mock };
+    const { queueAuditEvent: mockedQueueAuditEvent } =
+      (await import("@/modules/ee/audit-logs/lib/handler")) as unknown as { queueAuditEvent: Mock };
     const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
 
     vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
     vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
@@ -241,13 +229,11 @@ describe("withV1ApiWrapper", () => {
   });
 
   test("logs and audits on thrown error", async () => {
-    const { queueAuditEvent: mockedQueueAuditEvent } = (await import(
-      "@/modules/ee/audit-logs/lib/handler"
-    )) as unknown as { queueAuditEvent: Mock };
+    const { queueAuditEvent: mockedQueueAuditEvent } =
+      (await import("@/modules/ee/audit-logs/lib/handler")) as unknown as { queueAuditEvent: Mock };
     const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
 
     vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
     vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
@@ -299,13 +285,11 @@ describe("withV1ApiWrapper", () => {
   });
 
   test("does not log on success response but still audits", async () => {
-    const { queueAuditEvent: mockedQueueAuditEvent } = (await import(
-      "@/modules/ee/audit-logs/lib/handler"
-    )) as unknown as { queueAuditEvent: Mock };
+    const { queueAuditEvent: mockedQueueAuditEvent } =
+      (await import("@/modules/ee/audit-logs/lib/handler")) as unknown as { queueAuditEvent: Mock };
     const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
 
     vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
     vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
@@ -349,20 +333,17 @@ describe("withV1ApiWrapper", () => {
   test("does not call audit if AUDIT_LOG_ENABLED is false", async () => {
     vi.doMock("@/lib/constants", () => ({
       AUDIT_LOG_ENABLED: false,
-      EDGE_RATE_LIMIT_PROVIDER: "none",
       IS_PRODUCTION: true,
       SENTRY_DSN: "dsn",
       ENCRYPTION_KEY: "test-key",
       REDIS_URL: "redis://localhost:6379",
     }));
 
-    const { queueAuditEvent: mockedQueueAuditEvent } = (await import(
-      "@/modules/ee/audit-logs/lib/handler"
-    )) as unknown as { queueAuditEvent: Mock };
+    const { queueAuditEvent: mockedQueueAuditEvent } =
+      (await import("@/modules/ee/audit-logs/lib/handler")) as unknown as { queueAuditEvent: Mock };
     const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
     const { withV1ApiWrapper } = await import("./with-api-logging");
 
     vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
@@ -385,13 +366,10 @@ describe("withV1ApiWrapper", () => {
   });
 
   test("handles client-side API routes without authentication", async () => {
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
     const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { applyPublicIpRateLimitForRoute } = await import(
-      "@/modules/core/rate-limit/public-edge-rate-limit"
-    );
+    const { applyIPRateLimit } = await import("@/modules/core/rate-limit/helpers");
 
     vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: true, isRateLimited: true });
     vi.mocked(isManagementApiRoute).mockReturnValue({
@@ -400,7 +378,7 @@ describe("withV1ApiWrapper", () => {
     });
     vi.mocked(isIntegrationRoute).mockReturnValue(false);
     vi.mocked(authenticateRequest).mockResolvedValue(null);
-    vi.mocked(applyPublicIpRateLimitForRoute).mockResolvedValue("app");
+    vi.mocked(applyIPRateLimit).mockResolvedValue(undefined);
 
     const handler = vi.fn().mockResolvedValue({
       response: responses.successResponse({ data: "test" }),
@@ -418,17 +396,11 @@ describe("withV1ApiWrapper", () => {
       auditLog: undefined,
       authentication: null,
     });
-    expect(applyPublicIpRateLimitForRoute).toHaveBeenCalledWith(
-      "/api/v1/client/displays",
-      "GET",
-      expect.objectContaining({ max: 100 })
-    );
   });
 
   test("returns authentication error for non-client routes without auth", async () => {
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
     const { authenticateRequest } = await import("@/app/api/v1/auth");
 
     vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
@@ -449,44 +421,10 @@ describe("withV1ApiWrapper", () => {
     expect(handler).not.toHaveBeenCalled();
   });
 
-  test("uses unauthenticatedResponse when provided instead of default 401", async () => {
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
-    const { getServerSession } = await import("next-auth");
-
-    vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });
-    vi.mocked(isManagementApiRoute).mockReturnValue({
-      isManagementApi: true,
-      authenticationMethod: AuthenticationMethod.Session,
-    });
-    vi.mocked(isIntegrationRoute).mockReturnValue(false);
-    vi.mocked(getServerSession).mockResolvedValue(null);
-
-    const custom401 = new Response(JSON.stringify({ title: "Custom", status: 401 }), {
-      status: 401,
-      headers: { "Content-Type": "application/problem+json" },
-    });
-
-    const handler = vi.fn();
-    const req = createMockRequest({ url: "https://api.test/api/v3/surveys" });
-    const { withV1ApiWrapper } = await import("./with-api-logging");
-    const wrapped = withV1ApiWrapper({
-      handler,
-      unauthenticatedResponse: () => custom401,
-    });
-    const res = await wrapped(req, undefined);
-
-    expect(res).toBe(custom401);
-    expect(handler).not.toHaveBeenCalled();
-    expect(mockContextualLoggerError).toHaveBeenCalled();
-  });
-
   test("handles rate limiting errors", async () => {
     const { applyRateLimit } = await import("@/modules/core/rate-limit/helpers");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
     const { authenticateRequest } = await import("@/app/api/v1/auth");
 
     vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
@@ -511,13 +449,11 @@ describe("withV1ApiWrapper", () => {
   });
 
   test("skips audit log creation when no action/targetType provided", async () => {
-    const { queueAuditEvent: mockedQueueAuditEvent } = (await import(
-      "@/modules/ee/audit-logs/lib/handler"
-    )) as unknown as { queueAuditEvent: Mock };
+    const { queueAuditEvent: mockedQueueAuditEvent } =
+      (await import("@/modules/ee/audit-logs/lib/handler")) as unknown as { queueAuditEvent: Mock };
     const { authenticateRequest } = await import("@/app/api/v1/auth");
-    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } = await import(
-      "@/app/middleware/endpoint-validator"
-    );
+    const { isClientSideApiRoute, isManagementApiRoute, isIntegrationRoute } =
+      await import("@/app/middleware/endpoint-validator");
 
     vi.mocked(authenticateRequest).mockResolvedValue(mockApiAuthentication);
     vi.mocked(isClientSideApiRoute).mockReturnValue({ isClientSideApi: false, isRateLimited: true });

apps/web/app/lib/api/with-api-logging.ts

@@ -13,8 +13,7 @@ import {
 } from "@/app/middleware/endpoint-validator";
 import { AUDIT_LOG_ENABLED, IS_PRODUCTION, SENTRY_DSN } from "@/lib/constants";
 import { authOptions } from "@/modules/auth/lib/authOptions";
-import { applyRateLimit } from "@/modules/core/rate-limit/helpers";
-import { applyPublicIpRateLimitForRoute } from "@/modules/core/rate-limit/public-edge-rate-limit";
+import { applyIPRateLimit, applyRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { TRateLimitConfig } from "@/modules/core/rate-limit/types/rate-limit";
 import { queueAuditEvent } from "@/modules/ee/audit-logs/lib/handler";
@@ -39,11 +38,6 @@ export interface TWithV1ApiWrapperParams<TResult extends { response: Response },
   action?: TAuditAction;
   targetType?: TAuditTarget;
   customRateLimitConfig?: TRateLimitConfig;
-  /**
-   * When the route requires auth but the client is unauthenticated, the wrapper normally returns
-   * the legacy JSON 401. Use this to return a custom response (e.g. RFC 9457 problem+json for V3).
-   */
-  unauthenticatedResponse?: (req: NextRequest) => Response;
 }
 
 enum ApiV1RouteTypeEnum {
@@ -55,22 +49,14 @@ enum ApiV1RouteTypeEnum {
 /**
  * Apply client-side API rate limiting (IP-based)
  */
-const applyClientRateLimit = async (
-  req: NextRequest,
-  customRateLimitConfig?: TRateLimitConfig
-): Promise<void> => {
-  await applyPublicIpRateLimitForRoute(
-    req.nextUrl.pathname,
-    req.method,
-    customRateLimitConfig ?? rateLimitConfigs.api.client
-  );
+const applyClientRateLimit = async (customRateLimitConfig?: TRateLimitConfig): Promise<void> => {
+  await applyIPRateLimit(customRateLimitConfig ?? rateLimitConfigs.api.client);
 };
 
 /**
  * Handle rate limiting based on authentication and API type
  */
 const handleRateLimiting = async (
-  req: NextRequest,
   authentication: TApiV1Authentication,
   routeType: ApiV1RouteTypeEnum,
   customRateLimitConfig?: TRateLimitConfig
@@ -90,7 +76,7 @@ const handleRateLimiting = async (
     }
 
     if (routeType === ApiV1RouteTypeEnum.Client) {
-      await applyClientRateLimit(req, customRateLimitConfig);
+      await applyClientRateLimit(customRateLimitConfig);
     }
   } catch (error) {
     return responses.tooManyRequestsResponse(error instanceof Error ? error.message : "Rate limit exceeded");
@@ -279,7 +265,7 @@ const getRouteType = (
 export const withV1ApiWrapper = <TResult extends { response: Response }, TProps = unknown>(
   params: TWithV1ApiWrapperParams<TResult, TProps>
 ): ((req: NextRequest, props: TProps) => Promise<Response>) => {
-  const { handler, action, targetType, customRateLimitConfig, unauthenticatedResponse } = params;
+  const { handler, action, targetType, customRateLimitConfig } = params;
   return async (req: NextRequest, props: TProps): Promise<Response> => {
     // === Audit Log Setup ===
     const saveAuditLog = action && targetType;
@@ -301,11 +287,6 @@ export const withV1ApiWrapper = <TResult extends { response: Response }, TProps
     const authentication = await handleAuthentication(authenticationMethod, req);
 
     if (!authentication && routeType !== ApiV1RouteTypeEnum.Client) {
-      if (unauthenticatedResponse) {
-        const res = unauthenticatedResponse(req);
-        await processResponse(res, req, auditLog);
-        return res;
-      }
       return responses.notAuthenticatedResponse();
     }
 
@@ -314,12 +295,7 @@ export const withV1ApiWrapper = <TResult extends { response: Response }, TProps
 
     // === Rate Limiting ===
     if (isRateLimited) {
-      const rateLimitResponse = await handleRateLimiting(
-        req,
-        authentication,
-        routeType,
-        customRateLimitConfig
-      );
+      const rateLimitResponse = await handleRateLimiting(authentication, routeType, customRateLimitConfig);
       if (rateLimitResponse) return rateLimitResponse;
     }
 

apps/web/app/middleware/endpoint-validator.test.ts

@@ -48,10 +48,6 @@ describe("endpoint-validator", () => {
         isClientSideApi: true,
         isRateLimited: false,
       });
-      expect(isClientSideApiRoute("/api/v1/client/og-image")).toEqual({
-        isClientSideApi: true,
-        isRateLimited: true,
-      });
     });
 
     test("should return false for non-client-side API routes", () => {
@@ -94,17 +90,6 @@ describe("endpoint-validator", () => {
   });
 
   describe("isManagementApiRoute", () => {
-    test("should return Both for v3 surveys routes", () => {
-      expect(isManagementApiRoute("/api/v3/surveys")).toEqual({
-        isManagementApi: true,
-        authenticationMethod: AuthenticationMethod.Both,
-      });
-      expect(isManagementApiRoute("/api/v3/surveys/clxxxxxxxxxxxxxxxxxxxxxxxx")).toEqual({
-        isManagementApi: true,
-        authenticationMethod: AuthenticationMethod.Both,
-      });
-    });
-
     test("should return correct object for management API routes with API key authentication", () => {
       expect(isManagementApiRoute("/api/v1/management/something")).toEqual({
         isManagementApi: true,

apps/web/app/middleware/endpoint-validator.ts

@@ -13,7 +13,7 @@ export enum AuthenticationMethod {
 
 export const isClientSideApiRoute = (url: string): { isClientSideApi: boolean; isRateLimited: boolean } => {
   // Open Graph image generation route is a client side API route but it should not be rate limited
-  if (/^\/api\/v1\/client\/og(?:\/.*)?$/.test(url)) return { isClientSideApi: true, isRateLimited: false };
+  if (url.includes("/api/v1/client/og")) return { isClientSideApi: true, isRateLimited: false };
 
   const regex = /^\/api\/v\d+\/client\//;
   return { isClientSideApi: regex.test(url), isRateLimited: true };
@@ -22,9 +22,6 @@ export const isClientSideApiRoute = (url: string): { isClientSideApi: boolean; i
 export const isManagementApiRoute = (
   url: string
 ): { isManagementApi: boolean; authenticationMethod: AuthenticationMethod } => {
-  // V3 surveys: session cookie or x-api-key (same pattern as management storage)
-  if (/^\/api\/v3\/surveys(?:\/|$)/.test(url))
-    return { isManagementApi: true, authenticationMethod: AuthenticationMethod.Both };
   if (url.includes("/api/v1/management/storage"))
     return { isManagementApi: true, authenticationMethod: AuthenticationMethod.Both };
   if (url.includes("/api/v1/webhooks"))

apps/web/i18n.lock

@@ -140,7 +140,6 @@ checksums:
     common/connect: 8778ee245078a8be4a2ce855c8c56edc
     common/connect_formbricks: a9dd747575e7e035da69251366df6f95
     common/connected: aa0ceca574641de34c74b9e590664230
-    common/contact: 9afa39bc47019ee6dec6c74b6273967c
     common/contacts: d5b6c3f890b3904eaf5754081945c03d
     common/continue: 3cfba90b4600131e82fc4260c568d044
     common/copied: 29208e06d704c4fc4b8b534dc7acc4ef
@@ -148,7 +147,6 @@ checksums:
     common/copy: 627c00d2c850b9b45f7341a6ac01b6bb
     common/copy_code: 704c13d9bc01caad29a1cf3179baa111
     common/copy_link: 57a37acfe6d7ed71d00fbbc8079fbb35
-    common/copy_to_environment: c482d26b8fd4962af6542bbf49e49a32
     common/count_attributes: 48805e836a9b50f9635ad00fed953058
     common/count_contacts: 9f71d503455264f1eec1ae58894cf143
     common/count_members: 31ce64ca63fdf95e02ab5543b6e2f717
@@ -193,6 +191,7 @@ checksums:
     common/enter_url: 468c2276d0f2cb971ff5a47a20fa4b97
     common/enterprise_license: e81bf506f47968870c7bd07245648a0d
     common/environment: 0844e8dc1485339c8de066dc0a9bb6a1
+    common/environment_not_found: 4d7610bdb55a8b5e6131bb5b08ce04c5
     common/environment_notice: 228a8668be1812e031f438d166861729
     common/error: 3c95bcb32c2104b99a46f5b3dd015248
     common/error_component_description: fa9eee04f864c3fe6e6681f716caa015
@@ -229,13 +228,11 @@ checksums:
     common/inactive_surveys: 324b8e1844739cdc2a3bc71aef143a76
     common/integration: 40d02f65c4356003e0e90ffb944907d2
     common/integrations: 0ccce343287704cd90150c32e2fcad36
-    common/invalid_date_with_value: f7f9dbe99f25f1724367ee57572b52bf
+    common/invalid_date: 4c18c82f7317d4a02f8d5fef611e82b7
     common/invalid_file_name: 8243c91b898110fb15ebb24aa6a7d313
     common/invalid_file_type: f0c83e7d61dbad8250abb59869af4b9e
     common/invite: 181884cea804cbde665f160811ee7ad0
     common/invite_them: d4b7aadbd3c924b04ad4fce419709f10
-    common/javascript_required: d7988e5934af4d0df54fda369c0e4fb6
-    common/javascript_required_description: 4b65f456db79af4898888a3dd034fe2f
     common/key: 3d1065ab98a1c2f1210507fd5c7bf515
     common/label: a5c71bf158481233f8215dbd38cc196b
     common/language: 277fd1a41cc237a437cd1d5e4a80463b
@@ -256,7 +253,6 @@ checksums:
     common/marketing: fcf0f06f8b64b458c7ca6d95541a3cc8
     common/members: 0932e80cba1e3e0a7f52bb67ff31da32
     common/members_and_teams: bf5c3fadcb9fc23533ec1532b805ac08
-    common/membership: 83c856bbc2af99d8c3d860959d1d2a85
     common/membership_not_found: 7ac63584af23396aace9992ad919ffd4
     common/metadata: 695d4f7da261ba76e3be4de495491028
     common/mobile_overlay_app_works_best_on_desktop: 4509f7bfbb4edbd42e534042d6cb7e72
@@ -297,7 +293,9 @@ checksums:
     common/or: 7b133c38bec0d5ee23cc6bcf9a8de50b
     common/organization: 3dc8489af7e74121f65ce6d9677bc94d
     common/organization_id: ef09b71c84a25b5da02a23c77e68a335
+    common/organization_not_found: 4cb8c07ec2c599b6f48750e06ffa182b
     common/organization_settings: 11528aa89ae9935e55dcb54478058775
+    common/organization_teams_not_found: ce29fcb7a4e8b4582f92b65dea9b7d4e
     common/other: 79acaa6cd481262bea4e743a422529d2
     common/others: 39160224ce0e35eb4eb252c997edf4d8
     common/overlay_color: 4b72073285d13fff93d094aabffe05ac
@@ -357,7 +355,6 @@ checksums:
     common/select: 5ac04c47a98deb85906bc02e0de91ab0
     common/select_all: eedc7cdb02de467c15dc418a066a77f2
     common/select_filter: c50082c3981f1161022f9787a19aed71
-    common/select_language: d75cf5fbce8a4c7a9055e2210af74480
     common/select_survey: bac52e59c7847417bef6fe7b7096b475
     common/select_teams: ae5d451929846ae6367562bc671a1af9
     common/selected: 9f09e059ba20c88ed34e2b4e8e032d56
@@ -390,6 +387,7 @@ checksums:
     common/survey_id: 08303e98b3d4134947256e494b0c829e
     common/survey_languages: 93e4a10ab190e6b1e1f7fe5f702df249
     common/survey_live: d1f370505c67509e7b2759952daba20d
+    common/survey_not_found: 0485ea98d13a414eeefc8f1118b9c293
     common/survey_paused: c770d174d6b57e8425a54906a09c8b39
     common/survey_type: 417fcfecf8eaedefc4f11172426811f9
     common/surveys: 33f68ad4111b32a6361beb9d5c184533
@@ -404,6 +402,7 @@ checksums:
     common/team_name: 549d949de4b9adad4afd6427a60a329e
     common/team_role: 66db395781aef64ef3791417b3b67c0b
     common/teams: b63448c05270497973ac4407047dae02
+    common/teams_not_found: 02f333a64a83c1c014d8900ec9666345
     common/text: 4ddccc1974775ed7357f9beaf9361cec
     common/time: b504a03d52e8001bfdc5cb6205364f42
     common/time_to_finish: c8f6abdb886bee3619bb50b08fada5fa
@@ -427,6 +426,7 @@ checksums:
     common/url: ca97457614226960d41dd18c3c29c86b
     common/user: 61073457a5c3901084b557d065f876be
     common/user_id: 37f5ba37f71cb50607af32a6a203b1d4
+    common/user_not_found: 5903581136ac6c1c1351a482a6d8fdf7
     common/variable: c13db5775ba9791b1522cc55c9c7acce
     common/variable_ids: 44bf93b70703b7699fa9f21bc6c8eed4
     common/variables: ffd3eec5497af36d7b4e4185bad1313a
@@ -442,13 +442,14 @@ checksums:
     common/weeks: 545de30df4f44d3f6d1d344af6a10815
     common/welcome_card: 76081ebd5b2e35da9b0f080323704ae7
     common/workflows: b0c9c8615a9ba7d9cb73e767290a7f72
-    common/workspace: b63ef0e99ee6f7fef6cbe4971ca6cf0f
     common/workspace_configuration: d0a5812d6a97d7724d565b1017c34387
     common/workspace_created_successfully: bf401ae83da954f1db48724e2a8e40f1
     common/workspace_creation_description: aea2f480ba0c54c5cabac72c9c900ddf
     common/workspace_id: bafef925e1b57b52a69844fdf47aac3c
     common/workspace_name: 14c04a902a874ab5ddbe9cf369ef0414
     common/workspace_name_placeholder: 8a9e30ab01666af13c44a73b82c37ec1
+    common/workspace_not_found: 038fb0aaf3570610f4377b9eaed13752
+    common/workspace_permission_not_found: e94bdff8af51175c5767714f82bb4833
     common/workspaces: 8ba082a84aa35cf851af1cf874b853e2
     common/years: eb4f5fdd2b320bf13e200fd6a6c1abff
     common/you: db2a4a796b70cc1430d1b21f6ffb6dcb
@@ -624,6 +625,7 @@ checksums:
     environments/contacts/attributes_msg_new_attribute_created: 5cba6158c4305c05104814ec1479267c
     environments/contacts/attributes_msg_userid_already_exists: 9c695538befc152806c460f52a73821a
     environments/contacts/contact_deleted_successfully: c5b64a42a50e055f9e27ec49e20e03fa
+    environments/contacts/contact_not_found: 045396f0b13fafd43612a286263737c0
     environments/contacts/contacts_table_refresh: 6a959475991dd4ab28ad881bae569a09
     environments/contacts/contacts_table_refresh_success: 40951396e88e5c8fdafa0b3bb4fadca8
     environments/contacts/create_attribute: 87320615901f95b4f35ee83c290a3a6c
@@ -803,16 +805,9 @@ checksums:
     environments/integrations/webhooks/created_by_third_party: b40197eabbbce500b80b44268b8b1ee9
     environments/integrations/webhooks/discord_webhook_not_supported: 23432534f908b2ba63a517fb1f9bbe0e
     environments/integrations/webhooks/empty_webhook_message: 4c4d8709576a38cb8eb59866331d2405
-    environments/integrations/webhooks/endpoint_bad_gateway_error: 48ab17e9a77030b289ec22f497f50b63
-    environments/integrations/webhooks/endpoint_gateway_timeout_error: 5da45e2f6933927d1f8b0aaa9566e6a6
-    environments/integrations/webhooks/endpoint_internal_server_error: 6773fc34349febf95475cde88d8ee072
-    environments/integrations/webhooks/endpoint_method_not_allowed_error: 9963b503311393f4d7bffae9df46d422
-    environments/integrations/webhooks/endpoint_not_found_error: 607b75b7b7aa92ca81fe44e466f7c318
     environments/integrations/webhooks/endpoint_pinged: 3b1fce00e61d4b9d2bdca390649c58b6
     environments/integrations/webhooks/endpoint_pinged_error: 96c312fe8214757c4a934cdfbe177027
-    environments/integrations/webhooks/endpoint_service_unavailable_error: f9d4874c322f2963f5afaede354c9416
     environments/integrations/webhooks/learn_to_verify: 25b2a035e2109170b28f4e16db76ad39
-    environments/integrations/webhooks/no_triggers: 6b68cddfc45b3f7e20644a24a1bbea69
     environments/integrations/webhooks/please_check_console: 7b1787e82a0d762df02c011ebb1650ea
     environments/integrations/webhooks/please_enter_a_url: c24c74d0ce7ed3a6b858aadbc82108fe
     environments/integrations/webhooks/response_created: 8c43b1b6d748f6096f6f8d9232a3c469
@@ -1347,6 +1342,7 @@ checksums:
     environments/surveys/edit/custom_hostname: bc2b1c8de3f9b8ef145b45aeba6ab429
     environments/surveys/edit/customize_survey_logo: 7f7e26026c88a727228f2d7a00d914e2
     environments/surveys/edit/darken_or_lighten_background_of_your_choice: 304a64a8050ebf501d195e948cd25b6f
+    environments/surveys/edit/date_format: e95dfc41ac944874868487457ddc057a
     environments/surveys/edit/days_before_showing_this_survey_again: 9ee757e5c3a07844b12ceb406dc65b04
     environments/surveys/edit/delete_anyways: cc8683ab625280eefc9776bd381dc2e8
     environments/surveys/edit/delete_block: c00617cb0724557e486304276063807a
@@ -1608,8 +1604,6 @@ checksums:
     environments/surveys/edit/response_limit_needs_to_exceed_number_of_received_responses: 9a9c223c0918ded716ddfaa84fbaa8d9
     environments/surveys/edit/response_limits_redirections_and_more: e4f1cf94e56ad0e1b08701158d688802
     environments/surveys/edit/response_options: 2988136d5248d7726583108992dcbaee
-    environments/surveys/edit/reverse_order_occasionally: 170fd50de940f382fa2e605228e4e088
-    environments/surveys/edit/reverse_order_occasionally_except_last: 1c833001b940f1419dd7534b199a0b4a
     environments/surveys/edit/roundness: 5a161c8f5f258defb57ed1d551737cc4
     environments/surveys/edit/roundness_description: 03940a6871ae43efa4810cba7cadb74b
     environments/surveys/edit/row_used_in_logic_error: f89453ff1b6db77ad84af840fedd9813
@@ -1638,13 +1632,13 @@ checksums:
     environments/surveys/edit/show_survey_maximum_of: 721ed61b01a9fc8ce4becb72823bb72e
     environments/surveys/edit/show_survey_to_users: d5e90fd17babfea978fce826e9df89b0
     environments/surveys/edit/show_to_x_percentage_of_targeted_users: b745169011fa7e8ca475baa5500c5197
-    environments/surveys/edit/shrink_preview: 42567389520b226f211f94f052197ad8
     environments/surveys/edit/simple: 65575bd903091299bc4a94b7517a6288
     environments/surveys/edit/six_points: c6c09b3f07171dc388cb5a610ea79af7
     environments/surveys/edit/smiley: e68e3b28fc3c04255e236c6a0feb662b
     environments/surveys/edit/spam_protection_note: 94059310d07c30f6704e216297036d05
     environments/surveys/edit/spam_protection_threshold_description: ed8b8c9c583077a88bf5dd3ec8b59e60
     environments/surveys/edit/spam_protection_threshold_heading: 29f9a8b00c5bcbb43aedc48138a5cf9c
+    environments/surveys/edit/shrink_preview: 42567389520b226f211f94f052197ad8
     environments/surveys/edit/star: 0586c1c76e8a0367c0a7b93adf598cb7
     environments/surveys/edit/starts_with: f6673c17475708313c6a0f245b561781
     environments/surveys/edit/state: 118de561d4525b14f9bb29ac9e86161d

apps/web/instrumentation.ts

@@ -1,19 +1,7 @@
 import * as Sentry from "@sentry/nextjs";
-import { type Instrumentation } from "next";
-import { isExpectedError } from "@formbricks/types/errors";
 import { IS_PRODUCTION, PROMETHEUS_ENABLED, SENTRY_DSN } from "@/lib/constants";
 
-export const onRequestError: Instrumentation.onRequestError = (...args) => {
-  const [error] = args;
-
-  // Skip expected business-logic errors (AuthorizationError, ResourceNotFoundError, etc.)
-  // These are handled gracefully in the UI and don't need server-side Sentry reporting
-  if (error instanceof Error && isExpectedError(error)) {
-    return;
-  }
-
-  Sentry.captureRequestError(...args);
-};
+export const onRequestError = Sentry.captureRequestError;
 
 export const register = async () => {
   if (process.env.NEXT_RUNTIME === "nodejs") {

apps/web/lib/constants.ts

@@ -3,7 +3,6 @@ import { TUserLocale } from "@formbricks/types/user";
 import { env } from "./env";
 
 export const IS_FORMBRICKS_CLOUD = env.IS_FORMBRICKS_CLOUD === "1";
-export const EDGE_RATE_LIMIT_PROVIDER = env.EDGE_RATE_LIMIT_PROVIDER ?? "none";
 
 export const IS_PRODUCTION = env.NODE_ENV === "production";
 

apps/web/lib/env.ts

@@ -21,7 +21,6 @@ export const env = createEnv({
     E2E_TESTING: z.enum(["1", "0"]).optional(),
     EMAIL_AUTH_DISABLED: z.enum(["1", "0"]).optional(),
     EMAIL_VERIFICATION_DISABLED: z.enum(["1", "0"]).optional(),
-    EDGE_RATE_LIMIT_PROVIDER: z.enum(["none", "cloudflare", "cloudarmor", "envoy"]).optional(),
     ENCRYPTION_KEY: z.string(),
     ENTERPRISE_LICENSE_KEY: z.string().optional(),
     ENVIRONMENT: z.enum(["production", "staging"]).prefault("production"),
@@ -148,7 +147,6 @@ export const env = createEnv({
     E2E_TESTING: process.env.E2E_TESTING,
     EMAIL_AUTH_DISABLED: process.env.EMAIL_AUTH_DISABLED,
     EMAIL_VERIFICATION_DISABLED: process.env.EMAIL_VERIFICATION_DISABLED,
-    EDGE_RATE_LIMIT_PROVIDER: process.env.EDGE_RATE_LIMIT_PROVIDER,
     ENCRYPTION_KEY: process.env.ENCRYPTION_KEY,
     ENTERPRISE_LICENSE_KEY: process.env.ENTERPRISE_LICENSE_KEY,
     ENVIRONMENT: process.env.ENVIRONMENT,

apps/web/lib/membership/hooks/actions.ts

@@ -1,7 +1,7 @@
 "use server";
 
 import "server-only";
-import { AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { getOrganizationByEnvironmentId } from "../../organization/service";
 import { getMembershipByUserIdOrganizationId } from "../service";
 
@@ -9,7 +9,7 @@ export const getMembershipByUserIdOrganizationIdAction = async (environmentId: s
   const organization = await getOrganizationByEnvironmentId(environmentId);
 
   if (!organization) {
-    throw new ResourceNotFoundError("Organization", null);
+    throw new Error("Organization not found");
   }
 
   const currentUserMembership = await getMembershipRole(userId, organization.id);

apps/web/lib/response/service.ts

@@ -378,7 +378,7 @@ export const getResponseDownloadFile = async (
 
     const organizationId = await getOrganizationIdFromEnvironmentId(survey.environmentId);
     if (!organizationId) {
-      throw new ResourceNotFoundError("Organization", null);
+      throw new Error("Organization ID not found");
     }
 
     const organizationBilling = await getOrganizationBilling(organizationId);

apps/web/lib/time.test.ts

@@ -1,13 +1,88 @@
 import { describe, expect, test } from "vitest";
 import {
+  convertDateString,
+  convertDateTimeString,
+  convertDateTimeStringShort,
   convertDatesInObject,
+  convertTimeString,
   formatDate,
+  getTodaysDateFormatted,
   getTodaysDateTimeFormatted,
   timeSince,
   timeSinceDate,
 } from "./time";
 
 describe("Time Utilities", () => {
+  describe("convertDateString", () => {
+    test("should format date string correctly", () => {
+      expect(convertDateString("2024-03-20:12:30:00")).toBe("Mar 20, 2024");
+    });
+
+    test("should format date string with the provided locale", () => {
+      const date = new Date("2024-03-20T12:30:00");
+
+      expect(convertDateString("2024-03-20T12:30:00", "de-DE")).toBe(
+        new Intl.DateTimeFormat("de-DE", {
+          year: "numeric",
+          month: "short",
+          day: "numeric",
+        }).format(date)
+      );
+    });
+
+    test("should return empty string for empty input", () => {
+      expect(convertDateString("")).toBe("");
+    });
+
+    test("should return null for null input", () => {
+      expect(convertDateString(null as any)).toBe(null);
+    });
+
+    test("should handle invalid date strings", () => {
+      expect(convertDateString("not-a-date")).toBe("Invalid Date");
+    });
+  });
+
+  describe("convertDateTimeString", () => {
+    test("should format date and time string correctly", () => {
+      expect(convertDateTimeString("2024-03-20T15:30:00")).toBe("Wednesday, March 20, 2024 at 3:30 PM");
+    });
+
+    test("should return empty string for empty input", () => {
+      expect(convertDateTimeString("")).toBe("");
+    });
+  });
+
+  describe("convertDateTimeStringShort", () => {
+    test("should format date and time string in short format", () => {
+      expect(convertDateTimeStringShort("2024-03-20T15:30:00")).toBe("March 20, 2024 at 3:30 PM");
+    });
+
+    test("should format date and time string in the provided locale", () => {
+      const date = new Date("2024-03-20T15:30:00");
+
+      expect(convertDateTimeStringShort("2024-03-20T15:30:00", "fr-FR")).toBe(
+        new Intl.DateTimeFormat("fr-FR", {
+          year: "numeric",
+          month: "long",
+          day: "numeric",
+          hour: "numeric",
+          minute: "2-digit",
+        }).format(date)
+      );
+    });
+
+    test("should return empty string for empty input", () => {
+      expect(convertDateTimeStringShort("")).toBe("");
+    });
+  });
+
+  describe("convertTimeString", () => {
+    test("should format time string correctly", () => {
+      expect(convertTimeString("2024-03-20T15:30:45")).toBe("3:30:45 PM");
+    });
+  });
+
   describe("timeSince", () => {
     test("should format time since in English", () => {
       const now = new Date();
@@ -73,6 +148,14 @@ describe("Time Utilities", () => {
     });
   });
 
+  describe("getTodaysDateFormatted", () => {
+    test("should format today's date with specified separator", () => {
+      const today = new Date();
+      const expected = today.toISOString().split("T")[0].split("-").join(".");
+      expect(getTodaysDateFormatted(".")).toBe(expected);
+    });
+  });
+
   describe("getTodaysDateTimeFormatted", () => {
     test("should format today's date and time with specified separator", () => {
       const today = new Date();

apps/web/lib/time.ts

@@ -1,33 +1,109 @@
-import { type Locale, formatDistance } from "date-fns";
+import { formatDistance, intlFormat } from "date-fns";
 import { de, enUS, es, fr, hu, ja, nl, pt, ptBR, ro, ru, sv, zhCN, zhTW } from "date-fns/locale";
 import { TUserLocale } from "@formbricks/types/user";
-import { formatDateForDisplay } from "./utils/datetime";
+import { formatDateForDisplay, formatDateTimeForDisplay } from "./utils/datetime";
 
-const DEFAULT_LOCALE: TUserLocale = "en-US";
-const TIME_SINCE_LOCALES: Record<TUserLocale, Locale> = {
-  "de-DE": de,
-  "en-US": enUS,
-  "es-ES": es,
-  "fr-FR": fr,
-  "hu-HU": hu,
-  "ja-JP": ja,
-  "nl-NL": nl,
-  "pt-BR": ptBR,
-  "pt-PT": pt,
-  "ro-RO": ro,
-  "ru-RU": ru,
-  "sv-SE": sv,
-  "zh-Hans-CN": zhCN,
-  "zh-Hant-TW": zhTW,
+const DEFAULT_LOCALE = "en-US";
+
+export const convertDateString = (dateString: string | null, locale: string = DEFAULT_LOCALE) => {
+  if (dateString === null) return null;
+  if (!dateString) {
+    return dateString;
+  }
+
+  const date = new Date(dateString);
+  if (isNaN(date.getTime())) {
+    return "Invalid Date";
+  }
+  return formatDateForDisplay(date, locale);
 };
 
-const isUserLocale = (locale: string): locale is TUserLocale => Object.hasOwn(TIME_SINCE_LOCALES, locale);
+export const convertDateTimeString = (dateString: string, locale: string = DEFAULT_LOCALE) => {
+  if (!dateString) {
+    return dateString;
+  }
+  const date = new Date(dateString);
+  return formatDateTimeForDisplay(date, locale, {
+    weekday: "long",
+    year: "numeric",
+    month: "long",
+    day: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+  });
+};
 
-/** Maps locale strings to date-fns locales and falls back to English for unsupported inputs. */
-const getLocaleForTimeSince = (locale: string): Locale =>
-  isUserLocale(locale) ? TIME_SINCE_LOCALES[locale] : enUS;
+export const convertDateTimeStringShort = (dateString: string, locale: string = DEFAULT_LOCALE) => {
+  if (!dateString) {
+    return dateString;
+  }
+  const date = new Date(dateString);
+  return intlFormat(
+    date,
+    {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+      hour: "numeric",
+      minute: "2-digit",
+    },
+    {
+      locale,
+    }
+  );
+};
 
-export const timeSince = (dateString: string, locale: string = DEFAULT_LOCALE) => {
+export const convertTimeString = (dateString: string, locale: string = DEFAULT_LOCALE) => {
+  const date = new Date(dateString);
+  return intlFormat(
+    date,
+    {
+      hour: "numeric",
+      minute: "2-digit",
+      second: "2-digit",
+    },
+    {
+      locale,
+    }
+  );
+};
+
+const getLocaleForTimeSince = (locale: TUserLocale | string) => {
+  switch (locale) {
+    case "de-DE":
+      return de;
+    case "en-US":
+      return enUS;
+    case "es-ES":
+      return es;
+    case "fr-FR":
+      return fr;
+    case "hu-HU":
+      return hu;
+    case "ja-JP":
+      return ja;
+    case "nl-NL":
+      return nl;
+    case "pt-BR":
+      return ptBR;
+    case "pt-PT":
+      return pt;
+    case "ro-RO":
+      return ro;
+    case "ru-RU":
+      return ru;
+    case "sv-SE":
+      return sv;
+    case "zh-Hans-CN":
+      return zhCN;
+    case "zh-Hant-TW":
+      return zhTW;
+    default:
+      return enUS;
+  }
+};
+
+export const timeSince = (dateString: string, locale: TUserLocale | string = DEFAULT_LOCALE) => {
   const date = new Date(dateString);
   return formatDistance(date, new Date(), {
     addSuffix: true,
@@ -35,14 +111,14 @@ export const timeSince = (dateString: string, locale: string = DEFAULT_LOCALE) =
   });
 };
 
-export const timeSinceDate = (date: Date, locale: string = DEFAULT_LOCALE) => {
+export const timeSinceDate = (date: Date, locale: TUserLocale | string = DEFAULT_LOCALE) => {
   return formatDistance(date, new Date(), {
     addSuffix: true,
     locale: getLocaleForTimeSince(locale),
   });
 };
 
-export const formatDate = (date: Date, locale: string = DEFAULT_LOCALE) => {
+export const formatDate = (date: Date, locale: TUserLocale | string = DEFAULT_LOCALE) => {
   return formatDateForDisplay(date, locale, {
     year: "numeric",
     month: "long",
@@ -50,6 +126,13 @@ export const formatDate = (date: Date, locale: string = DEFAULT_LOCALE) => {
   });
 };
 
+export const getTodaysDateFormatted = (seperator: string) => {
+  const date = new Date();
+  const formattedDate = date.toISOString().split("T")[0].split("-").join(seperator);
+
+  return formattedDate;
+};
+
 export const getTodaysDateTimeFormatted = (seperator: string) => {
   const date = new Date();
   const formattedDate = date.toISOString().split("T")[0].split("-").join(seperator);

apps/web/lib/utils/date-display.ts

@@ -3,8 +3,6 @@ import { formatDateWithOrdinal } from "./datetime";
 
 export type TSurveyDateFormatMap = Partial<Record<string, TSurveyDateElement["format"]>>;
 
-const ISO_STORED_DATE_PATTERN = /^(\d{4})-(\d{1,2})-(\d{1,2})$/;
-
 const buildDate = (year: number, month: number, day: number): Date | null => {
   if ([year, month, day].some((value) => Number.isNaN(value))) {
     return null;
@@ -43,7 +41,7 @@ const parseLegacyStoredDateValue = (value: string, format: TSurveyDateElement["f
 };
 
 export const parseStoredDateValue = (value: string, format?: TSurveyDateElement["format"]): Date | null => {
-  const isoMatch = ISO_STORED_DATE_PATTERN.exec(value);
+  const isoMatch = value.match(/^(\d{4})-(\d{1,2})-(\d{1,2})$/);
 
   if (isoMatch) {
     return buildDate(Number(isoMatch[1]), Number(isoMatch[2]), Number(isoMatch[3]));

apps/web/locales/de-DE.json

@@ -167,7 +167,6 @@
     "connect": "Verbinden",
     "connect_formbricks": "Formbricks verbinden",
     "connected": "Verbunden",
-    "contact": "Kontakt",
     "contacts": "Kontakte",
     "continue": "Weitermachen",
     "copied": "Kopiert",
@@ -175,7 +174,6 @@
     "copy": "Kopieren",
     "copy_code": "Code kopieren",
     "copy_link": "Link kopieren",
-    "copy_to_environment": "In {{environment}} kopieren",
     "count_attributes": "{count, plural, one {{count} Attribut} other {{count} Attribute}}",
     "count_contacts": "{count, plural, one {{count} Kontakt} other {{count} Kontakte}}",
     "count_members": "{count, plural, one {{count} Mitglied} other {{count} Mitglieder}}",
@@ -220,6 +218,7 @@
     "enter_url": "URL eingeben",
     "enterprise_license": "Enterprise Lizenz",
     "environment": "Umgebung",
+    "environment_not_found": "Umgebung nicht gefunden",
     "environment_notice": "Du befindest dich derzeit in der {environment}-Umgebung.",
     "error": "Fehler",
     "error_component_description": "Diese Ressource existiert nicht oder Du hast nicht die notwendigen Rechte, um darauf zuzugreifen.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Inaktive Umfragen",
     "integration": "Integration",
     "integrations": "Integrationen",
-    "invalid_date_with_value": "Ungültiges Datum: {value}",
+    "invalid_date": "Ungültiges Datum",
     "invalid_file_name": "Ungültiger Dateiname, bitte benennen Sie Ihre Datei um und versuchen Sie es erneut",
     "invalid_file_type": "Ungültiger Dateityp",
     "invite": "Einladen",
     "invite_them": "Lade sie ein",
-    "javascript_required": "JavaScript erforderlich",
-    "javascript_required_description": "Formbricks benötigt JavaScript, um ordnungsgemäß zu funktionieren. Bitte aktiviere JavaScript in deinen Browsereinstellungen, um fortzufahren.",
     "key": "Schlüssel",
     "label": "Bezeichnung",
     "language": "Sprache",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Mitglieder",
     "members_and_teams": "Mitglieder & Teams",
-    "membership": "Mitgliedschaft",
     "membership_not_found": "Mitgliedschaft nicht gefunden",
     "metadata": "Metadaten",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funktioniert am besten auf einem größeren Bildschirm. Um Umfragen zu verwalten oder zu erstellen, wechsle zu einem anderen Gerät.",
@@ -324,7 +320,9 @@
     "or": "oder",
     "organization": "Organisation",
     "organization_id": "Organisations-ID",
+    "organization_not_found": "Organisation nicht gefunden",
     "organization_settings": "Organisationseinstellungen",
+    "organization_teams_not_found": "Organisations-Teams nicht gefunden",
     "other": "Andere",
     "others": "Andere",
     "overlay_color": "Overlay-Farbe",
@@ -384,7 +382,6 @@
     "select": "Auswählen",
     "select_all": "Alles auswählen",
     "select_filter": "Filter auswählen",
-    "select_language": "Sprache auswählen",
     "select_survey": "Umfrage auswählen",
     "select_teams": "Teams auswählen",
     "selected": "Ausgewählt",
@@ -417,6 +414,7 @@
     "survey_id": "Umfrage-ID",
     "survey_languages": "Umfragesprachen",
     "survey_live": "Umfrage live",
+    "survey_not_found": "Umfrage nicht gefunden",
     "survey_paused": "Umfrage pausiert.",
     "survey_type": "Umfragetyp",
     "surveys": "Umfragen",
@@ -431,6 +429,7 @@
     "team_name": "Teamname",
     "team_role": "Team-Rolle",
     "teams": "Teams",
+    "teams_not_found": "Teams nicht gefunden",
     "text": "Text",
     "time": "Zeit",
     "time_to_finish": "Zeit zum Fertigstellen",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Benutzer",
     "user_id": "Benutzer-ID",
+    "user_not_found": "Benutzer nicht gefunden",
     "variable": "Variable",
     "variable_ids": "Variablen-IDs",
     "variables": "Variablen",
@@ -469,13 +469,14 @@
     "weeks": "Wochen",
     "welcome_card": "Willkommenskarte",
     "workflows": "Workflows",
-    "workspace": "Arbeitsbereich",
     "workspace_configuration": "Projektkonfiguration",
     "workspace_created_successfully": "Projekt erfolgreich erstellt",
     "workspace_creation_description": "Organisieren Sie Umfragen in Projekten für eine bessere Zugriffskontrolle.",
     "workspace_id": "Projekt-ID",
     "workspace_name": "Projektname",
     "workspace_name_placeholder": "z. B. Formbricks",
+    "workspace_not_found": "Projekt nicht gefunden",
+    "workspace_permission_not_found": "Projektberechtigung nicht gefunden",
     "workspaces": "Projekte",
     "years": "Jahre",
     "you": "Du",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Neues Attribut “{key}” mit Typ “{dataType}” erstellt",
       "attributes_msg_userid_already_exists": "Die Benutzer-ID existiert bereits für diese Umgebung und wurde nicht aktualisiert.",
       "contact_deleted_successfully": "Kontakt erfolgreich gelöscht",
+      "contact_not_found": "Kein solcher Kontakt gefunden",
       "contacts_table_refresh": "Kontakte aktualisieren",
       "contacts_table_refresh_success": "Kontakte erfolgreich aktualisiert",
       "create_attribute": "Attribut erstellen",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Erstellt von einer dritten Partei",
         "discord_webhook_not_supported": "Discord-Webhooks werden derzeit nicht unterstützt.",
         "empty_webhook_message": "Deine Webhooks werden hier angezeigt, sobald Du sie hinzufügst ⏲️",
-        "endpoint_bad_gateway_error": "Ungültiges Gateway (502): Proxy-/Gateway-Fehler, Dienst nicht erreichbar",
-        "endpoint_gateway_timeout_error": "Gateway-Zeitüberschreitung (504): Gateway-Zeitüberschreitung, Dienst nicht erreichbar",
-        "endpoint_internal_server_error": "Interner Serverfehler (500): Der Dienst ist auf einen unerwarteten Fehler gestoßen",
-        "endpoint_method_not_allowed_error": "Methode nicht erlaubt (405): Der Endpoint existiert, akzeptiert aber keine POST-Anfragen",
-        "endpoint_not_found_error": "Nicht gefunden (404): Der Endpoint existiert nicht",
         "endpoint_pinged": "Juhu! Wir können den Webhook anpingen!",
         "endpoint_pinged_error": "Kann den Webhook nicht anpingen!",
-        "endpoint_service_unavailable_error": "Dienst nicht verfügbar (503): Dienst ist vorübergehend nicht verfügbar",
         "learn_to_verify": "Erfahren Sie, wie Sie Webhook-Signaturen verifizieren",
-        "no_triggers": "Keine Trigger",
         "please_check_console": "Bitte überprüfe die Konsole für weitere Details",
         "please_enter_a_url": "Bitte gib eine URL ein",
         "response_created": "Antwort erstellt",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Benutzerdefinierter Hostname",
         "customize_survey_logo": "Umfragelogo anpassen",
         "darken_or_lighten_background_of_your_choice": "Hintergrund deiner Wahl abdunkeln oder aufhellen.",
+        "date_format": "Datumsformat",
         "days_before_showing_this_survey_again": "oder mehr Tage müssen zwischen der zuletzt angezeigten Umfrage und der Anzeige dieser Umfrage vergehen.",
         "delete_anyways": "Trotzdem löschen",
         "delete_block": "Block löschen",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Antwortlimit muss die Anzahl der erhaltenen Antworten ({responseCount}) überschreiten.",
         "response_limits_redirections_and_more": "Antwort Limits, Weiterleitungen und mehr.",
         "response_options": "Antwortoptionen",
-        "reverse_order_occasionally": "Reihenfolge gelegentlich umkehren",
-        "reverse_order_occasionally_except_last": "Reihenfolge gelegentlich umkehren, außer letzter",
         "roundness": "Rundheit",
         "roundness_description": "Steuert, wie abgerundet die Ecken sind.",
         "row_used_in_logic_error": "Diese Zeile wird in der Logik der Frage {questionIndex} verwendet. Bitte entferne sie zuerst aus der Logik.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Umfrage maximal anzeigen von",
         "show_survey_to_users": "Umfrage % der Nutzer anzeigen",
         "show_to_x_percentage_of_targeted_users": "Zeige {percentage}% der Zielbenutzer",
-        "shrink_preview": "Vorschau verkleinern",
         "simple": "Einfach",
         "six_points": "6 Punkte",
         "smiley": "Smiley",
         "spam_protection_note": "Spamschutz funktioniert nicht für Umfragen, die mit den iOS-, React Native- und Android-SDKs angezeigt werden. Es wird die Umfrage unterbrechen.",
         "spam_protection_threshold_description": "Wert zwischen 0 und 1 festlegen, Antworten unter diesem Wert werden abgelehnt.",
         "spam_protection_threshold_heading": "Antwortschwelle",
+        "shrink_preview": "Vorschau verkleinern",
         "star": "Stern",
         "starts_with": "Fängt an mit",
         "state": "Bundesland",

apps/web/locales/en-US.json

@@ -167,7 +167,6 @@
     "connect": "Connect",
     "connect_formbricks": "Connect Formbricks",
     "connected": "Connected",
-    "contact": "Contact",
     "contacts": "Contacts",
     "continue": "Continue",
     "copied": "Copied",
@@ -175,7 +174,6 @@
     "copy": "Copy",
     "copy_code": "Copy code",
     "copy_link": "Copy Link",
-    "copy_to_environment": "Copy to {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribute} other {{count} attributes}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacts}}",
     "count_members": "{count, plural, one {{count} member} other {{count} members}}",
@@ -220,6 +218,7 @@
     "enter_url": "Enter URL",
     "enterprise_license": "Enterprise License",
     "environment": "Environment",
+    "environment_not_found": "Environment not found",
     "environment_notice": "You are currently in the {environment} environment.",
     "error": "Error",
     "error_component_description": "This resource does not exist or you do not have the necessary rights to access it.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Inactive surveys",
     "integration": "integration",
     "integrations": "Integrations",
-    "invalid_date_with_value": "Invalid date: {value}",
+    "invalid_date": "Invalid date",
     "invalid_file_name": "Invalid file name, please rename your file and try again",
     "invalid_file_type": "Invalid file type",
     "invite": "Invite",
     "invite_them": "Invite them",
-    "javascript_required": "JavaScript Required",
-    "javascript_required_description": "Formbricks requires JavaScript to function properly. Please enable JavaScript in your browser settings to continue.",
     "key": "Key",
     "label": "Label",
     "language": "Language",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Members",
     "members_and_teams": "Members & Teams",
-    "membership": "Membership",
     "membership_not_found": "Membership not found",
     "metadata": "Metadata",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks works best on a bigger screen. To manage or build surveys, switch to another device.",
@@ -324,7 +320,9 @@
     "or": "or",
     "organization": "Organization",
     "organization_id": "Organization ID",
+    "organization_not_found": "Organization not found",
     "organization_settings": "Organization settings",
+    "organization_teams_not_found": "Organization teams not found",
     "other": "Other",
     "others": "Others",
     "overlay_color": "Overlay color",
@@ -384,7 +382,6 @@
     "select": "Select",
     "select_all": "Select all",
     "select_filter": "Select filter",
-    "select_language": "Select Language",
     "select_survey": "Select Survey",
     "select_teams": "Select teams",
     "selected": "Selected",
@@ -417,6 +414,7 @@
     "survey_id": "Survey ID",
     "survey_languages": "Survey Languages",
     "survey_live": "Survey live",
+    "survey_not_found": "Survey not found",
     "survey_paused": "Survey paused.",
     "survey_type": "Survey Type",
     "surveys": "Surveys",
@@ -431,6 +429,7 @@
     "team_name": "Team name",
     "team_role": "Team role",
     "teams": "Teams",
+    "teams_not_found": "Teams not found",
     "text": "Text",
     "time": "Time",
     "time_to_finish": "Time to finish",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "User",
     "user_id": "User ID",
+    "user_not_found": "User not found",
     "variable": "Variable",
     "variable_ids": "Variable IDs",
     "variables": "Variables",
@@ -469,13 +469,14 @@
     "weeks": "weeks",
     "welcome_card": "Welcome card",
     "workflows": "Workflows",
-    "workspace": "Workspace",
     "workspace_configuration": "Workspace Configuration",
     "workspace_created_successfully": "Workspace created successfully",
     "workspace_creation_description": "Organize surveys in workspaces for better access control.",
     "workspace_id": "Workspace ID",
     "workspace_name": "Workspace Name",
     "workspace_name_placeholder": "e.g. Formbricks",
+    "workspace_not_found": "Workspace not found",
+    "workspace_permission_not_found": "Workspace permission not found",
     "workspaces": "Workspaces",
     "years": "years",
     "you": "You",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Created new attribute “{key}” with type “{dataType}”",
       "attributes_msg_userid_already_exists": "The user ID already exists for this environment and was not updated.",
       "contact_deleted_successfully": "Contact deleted successfully",
+      "contact_not_found": "No such contact found",
       "contacts_table_refresh": "Refresh contacts",
       "contacts_table_refresh_success": "Contacts refreshed successfully",
       "create_attribute": "Create attribute",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Created by a Third Party",
         "discord_webhook_not_supported": "Discord webhooks are currently not supported.",
         "empty_webhook_message": "Your webhooks will appear here as soon as you add them. ⏲️",
-        "endpoint_bad_gateway_error": "Bad Gateway (502): Proxy/gateway error, service not reachable",
-        "endpoint_gateway_timeout_error": "Gateway Timeout (504): Gateway timeout, service not reachable",
-        "endpoint_internal_server_error": "Internal Server Error (500): The service encountered an unexpected error",
-        "endpoint_method_not_allowed_error": "Method Not Allowed (405): The endpoint exists, but doesn't accept POST requests",
-        "endpoint_not_found_error": "Not Found (404): The endpoint doesn't exist",
         "endpoint_pinged": "Yay! We are able to ping the webhook!",
         "endpoint_pinged_error": "Unable to ping the webhook!",
-        "endpoint_service_unavailable_error": "Service Unavailable (503): Service is temporarily down",
         "learn_to_verify": "Learn how to verify webhook signatures",
-        "no_triggers": "No Triggers",
         "please_check_console": "Please check the console for more details",
         "please_enter_a_url": "Please enter a URL",
         "response_created": "Response Created",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Custom hostname",
         "customize_survey_logo": "Customize the survey logo",
         "darken_or_lighten_background_of_your_choice": "Darken or lighten background of your choice.",
+        "date_format": "Date format",
         "days_before_showing_this_survey_again": "or more days to pass between the last shown survey and showing this survey.",
         "delete_anyways": "Delete anyways",
         "delete_block": "Delete block",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Response limit needs to exceed number of received responses ({responseCount}).",
         "response_limits_redirections_and_more": "Response limits, redirections and more.",
         "response_options": "Response Options",
-        "reverse_order_occasionally": "Reverse order occasionally",
-        "reverse_order_occasionally_except_last": "Reverse order occasionally except last",
         "roundness": "Roundness",
         "roundness_description": "Controls how rounded corners are.",
         "row_used_in_logic_error": "This row is used in logic of question {questionIndex}. Please remove it from logic first.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Show survey maximum of",
         "show_survey_to_users": "Show survey to % of users",
         "show_to_x_percentage_of_targeted_users": "Show to {percentage}% of targeted users",
-        "shrink_preview": "Shrink Preview",
         "simple": "Simple",
         "six_points": "6 points",
         "smiley": "Smiley",
         "spam_protection_note": "Spam protection does not work for surveys displayed with the iOS, React Native, and Android SDKs. It will break the survey.",
         "spam_protection_threshold_description": "Set value between 0 and 1, responses below this value will be rejected.",
         "spam_protection_threshold_heading": "Response threshold",
+        "shrink_preview": "Shrink Preview",
         "star": "Star",
         "starts_with": "Starts with",
         "state": "State",

apps/web/locales/es-ES.json

@@ -167,7 +167,6 @@
     "connect": "Conectar",
     "connect_formbricks": "Conectar Formbricks",
     "connected": "Conectado",
-    "contact": "Contacto",
     "contacts": "Contactos",
     "continue": "Continuar",
     "copied": "Copiado",
@@ -175,7 +174,6 @@
     "copy": "Copiar",
     "copy_code": "Copiar código",
     "copy_link": "Copiar enlace",
-    "copy_to_environment": "Copiar a {{environment}}",
     "count_attributes": "{count, plural, one {{count} atributo} other {{count} atributos}}",
     "count_contacts": "{count, plural, one {{count} contacto} other {{count} contactos}}",
     "count_members": "{count, plural, one {{count} miembro} other {{count} miembros}}",
@@ -220,6 +218,7 @@
     "enter_url": "Introducir URL",
     "enterprise_license": "Licencia empresarial",
     "environment": "Entorno",
+    "environment_not_found": "Entorno no encontrado",
     "environment_notice": "Actualmente estás en el entorno {environment}.",
     "error": "Error",
     "error_component_description": "Este recurso no existe o no tienes los derechos necesarios para acceder a él.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Encuestas inactivas",
     "integration": "integración",
     "integrations": "Integraciones",
-    "invalid_date_with_value": "Fecha no válida: {value}",
+    "invalid_date": "Fecha no válida",
     "invalid_file_name": "Nombre de archivo no válido, por favor renombre su archivo e inténtelo de nuevo",
     "invalid_file_type": "Tipo de archivo no válido",
     "invite": "Invitar",
     "invite_them": "Invítales",
-    "javascript_required": "Se requiere JavaScript",
-    "javascript_required_description": "Formbricks requiere JavaScript para funcionar correctamente. Por favor, activa JavaScript en la configuración de tu navegador para continuar.",
     "key": "Clave",
     "label": "Etiqueta",
     "language": "Idioma",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Miembros",
     "members_and_teams": "Miembros y equipos",
-    "membership": "Membresía",
     "membership_not_found": "Membresía no encontrada",
     "metadata": "Metadatos",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funciona mejor en una pantalla más grande. Para gestionar o crear encuestas, cambia a otro dispositivo.",
@@ -324,7 +320,9 @@
     "or": "o",
     "organization": "Organización",
     "organization_id": "ID de organización",
+    "organization_not_found": "Organización no encontrada",
     "organization_settings": "Ajustes de la organización",
+    "organization_teams_not_found": "Equipos de la organización no encontrados",
     "other": "Otro",
     "others": "Otros",
     "overlay_color": "Color de superposición",
@@ -384,7 +382,6 @@
     "select": "Seleccionar",
     "select_all": "Seleccionar todo",
     "select_filter": "Seleccionar filtro",
-    "select_language": "Seleccionar idioma",
     "select_survey": "Seleccionar encuesta",
     "select_teams": "Seleccionar equipos",
     "selected": "Seleccionado",
@@ -417,6 +414,7 @@
     "survey_id": "ID de encuesta",
     "survey_languages": "Idiomas de la encuesta",
     "survey_live": "Encuesta activa",
+    "survey_not_found": "Encuesta no encontrada",
     "survey_paused": "Encuesta pausada.",
     "survey_type": "Tipo de encuesta",
     "surveys": "Encuestas",
@@ -431,6 +429,7 @@
     "team_name": "Nombre del equipo",
     "team_role": "Rol del equipo",
     "teams": "Equipos",
+    "teams_not_found": "Equipos no encontrados",
     "text": "Texto",
     "time": "Hora",
     "time_to_finish": "Tiempo para finalizar",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Usuario",
     "user_id": "ID de usuario",
+    "user_not_found": "Usuario no encontrado",
     "variable": "Variable",
     "variable_ids": "IDs de variables",
     "variables": "Variables",
@@ -469,13 +469,14 @@
     "weeks": "semanas",
     "welcome_card": "Tarjeta de bienvenida",
     "workflows": "Flujos de trabajo",
-    "workspace": "Espacio de trabajo",
     "workspace_configuration": "Configuración del proyecto",
     "workspace_created_successfully": "Proyecto creado correctamente",
     "workspace_creation_description": "Organiza las encuestas en proyectos para un mejor control de acceso.",
     "workspace_id": "ID del proyecto",
     "workspace_name": "Nombre del proyecto",
     "workspace_name_placeholder": "p. ej. Formbricks",
+    "workspace_not_found": "Proyecto no encontrado",
+    "workspace_permission_not_found": "Permiso del proyecto no encontrado",
     "workspaces": "Proyectos",
     "years": "años",
     "you": "Tú",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Se creó el atributo nuevo “{key}” con el tipo “{dataType}”",
       "attributes_msg_userid_already_exists": "El ID de usuario ya existe para este entorno y no se actualizó.",
       "contact_deleted_successfully": "Contacto eliminado correctamente",
+      "contact_not_found": "No se ha encontrado dicho contacto",
       "contacts_table_refresh": "Actualizar contactos",
       "contacts_table_refresh_success": "Contactos actualizados correctamente",
       "create_attribute": "Crear atributo",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Creado por un tercero",
         "discord_webhook_not_supported": "Los webhooks de Discord no son compatibles actualmente.",
         "empty_webhook_message": "Tus webhooks aparecerán aquí tan pronto como los añadas. ⏲️",
-        "endpoint_bad_gateway_error": "Puerta de enlace incorrecta (502): Error de proxy o puerta de enlace, servicio no accesible",
-        "endpoint_gateway_timeout_error": "Tiempo de espera de la puerta de enlace agotado (504): Tiempo de espera de la puerta de enlace agotado, servicio no accesible",
-        "endpoint_internal_server_error": "Error interno del servidor (500): El servicio encontró un error inesperado",
-        "endpoint_method_not_allowed_error": "Método no permitido (405): El endpoint existe, pero no acepta solicitudes POST",
-        "endpoint_not_found_error": "No encontrado (404): El endpoint no existe",
         "endpoint_pinged": "¡Genial! ¡Podemos hacer ping al webhook!",
         "endpoint_pinged_error": "¡No se puede hacer ping al webhook!",
-        "endpoint_service_unavailable_error": "Servicio no disponible (503): El servicio está temporalmente caído",
         "learn_to_verify": "Aprende a verificar las firmas de webhook",
-        "no_triggers": "Sin activadores",
         "please_check_console": "Por favor, consulta la consola para más detalles",
         "please_enter_a_url": "Por favor, introduce una URL",
         "response_created": "Respuesta creada",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Nombre de host personalizado",
         "customize_survey_logo": "Personalizar el logotipo de la encuesta",
         "darken_or_lighten_background_of_your_choice": "Oscurece o aclara el fondo de tu elección.",
+        "date_format": "Formato de fecha",
         "days_before_showing_this_survey_again": "o más días deben transcurrir entre la última encuesta mostrada y la visualización de esta encuesta.",
         "delete_anyways": "Eliminar de todos modos",
         "delete_block": "Eliminar bloque",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "El límite de respuestas debe superar el número de respuestas recibidas ({responseCount}).",
         "response_limits_redirections_and_more": "Límites de respuestas, redirecciones y más.",
         "response_options": "Opciones de respuesta",
-        "reverse_order_occasionally": "Invertir orden ocasionalmente",
-        "reverse_order_occasionally_except_last": "Invertir orden ocasionalmente excepto el último",
         "roundness": "Redondez",
         "roundness_description": "Controla qué tan redondeadas están las esquinas.",
         "row_used_in_logic_error": "Esta fila se utiliza en la lógica de la pregunta {questionIndex}. Por favor, elimínala de la lógica primero.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Mostrar encuesta un máximo de",
         "show_survey_to_users": "Mostrar encuesta al % de usuarios",
         "show_to_x_percentage_of_targeted_users": "Mostrar al {percentage} % de usuarios objetivo",
-        "shrink_preview": "Contraer vista previa",
         "simple": "Simple",
         "six_points": "6 puntos",
         "smiley": "Emoticono",
         "spam_protection_note": "La protección contra spam no funciona para encuestas mostradas con los SDK de iOS, React Native y Android. Romperá la encuesta.",
         "spam_protection_threshold_description": "Establece un valor entre 0 y 1, las respuestas por debajo de este valor serán rechazadas.",
         "spam_protection_threshold_heading": "Umbral de respuesta",
+        "shrink_preview": "Contraer vista previa",
         "star": "Estrella",
         "starts_with": "Comienza con",
         "state": "Estado",

apps/web/locales/fr-FR.json

@@ -167,7 +167,6 @@
     "connect": "Connecter",
     "connect_formbricks": "Connecter Formbricks",
     "connected": "Connecté",
-    "contact": "Contact",
     "contacts": "Contacts",
     "continue": "Continuer",
     "copied": "Copié",
@@ -175,7 +174,6 @@
     "copy": "Copier",
     "copy_code": "Copier le code",
     "copy_link": "Copier le lien",
-    "copy_to_environment": "Copier vers {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribut} other {{count} attributs}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacts}}",
     "count_members": "{count, plural, one {{count} membre} other {{count} membres}}",
@@ -220,6 +218,7 @@
     "enter_url": "Saisir l'URL",
     "enterprise_license": "Licence d'entreprise",
     "environment": "Environnement",
+    "environment_not_found": "Environnement non trouvé",
     "environment_notice": "Vous êtes actuellement dans l'environnement {environment}.",
     "error": "Erreur",
     "error_component_description": "Cette ressource n'existe pas ou vous n'avez pas les droits nécessaires pour y accéder.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Sondages inactifs",
     "integration": "intégration",
     "integrations": "Intégrations",
-    "invalid_date_with_value": "Date invalide: {value}",
+    "invalid_date": "Date invalide",
     "invalid_file_name": "Nom de fichier invalide, veuillez renommer votre fichier et réessayer",
     "invalid_file_type": "Type de fichier invalide",
     "invite": "Inviter",
     "invite_them": "Invitez-les",
-    "javascript_required": "JavaScript requis",
-    "javascript_required_description": "Formbricks nécessite JavaScript pour fonctionner correctement. Veuillez activer JavaScript dans les paramètres de votre navigateur pour continuer.",
     "key": "Clé",
     "label": "Étiquette",
     "language": "Langue",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Membres",
     "members_and_teams": "Membres & Équipes",
-    "membership": "Adhésion",
     "membership_not_found": "Abonnement non trouvé",
     "metadata": "Métadonnées",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks fonctionne mieux sur un écran plus grand. Pour gérer ou créer des sondages, passez à un autre appareil.",
@@ -324,7 +320,9 @@
     "or": "ou",
     "organization": "Organisation",
     "organization_id": "Identifiant de l'organisation",
+    "organization_not_found": "Organisation non trouvée",
     "organization_settings": "Paramètres de l'organisation",
+    "organization_teams_not_found": "Équipes d'organisation non trouvées",
     "other": "Autre",
     "others": "Autres",
     "overlay_color": "Couleur de superposition",
@@ -384,7 +382,6 @@
     "select": "Sélectionner",
     "select_all": "Sélectionner tout",
     "select_filter": "Sélectionner un filtre",
-    "select_language": "Sélectionner la langue",
     "select_survey": "Sélectionner l'enquête",
     "select_teams": "Sélectionner les équipes",
     "selected": "Sélectionné",
@@ -417,6 +414,7 @@
     "survey_id": "ID de l'enquête",
     "survey_languages": "Langues de l'enquête",
     "survey_live": "Sondage en direct",
+    "survey_not_found": "Sondage non trouvé",
     "survey_paused": "Sondage en pause.",
     "survey_type": "Type de sondage",
     "surveys": "Enquêtes",
@@ -431,6 +429,7 @@
     "team_name": "Nom de l'équipe",
     "team_role": "Rôle dans l'équipe",
     "teams": "Équipes",
+    "teams_not_found": "Équipes non trouvées",
     "text": "Texte",
     "time": "Temps",
     "time_to_finish": "Temps de finir",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Utilisateur",
     "user_id": "Identifiant d'utilisateur",
+    "user_not_found": "Utilisateur non trouvé",
     "variable": "Variable",
     "variable_ids": "Identifiants variables",
     "variables": "Variables",
@@ -469,13 +469,14 @@
     "weeks": "semaines",
     "welcome_card": "Carte de bienvenue",
     "workflows": "Workflows",
-    "workspace": "Espace de travail",
     "workspace_configuration": "Configuration du projet",
     "workspace_created_successfully": "Projet créé avec succès",
     "workspace_creation_description": "Organisez les enquêtes dans des projets pour un meilleur contrôle d'accès.",
     "workspace_id": "ID du projet",
     "workspace_name": "Nom du projet",
     "workspace_name_placeholder": "par ex. Formbricks",
+    "workspace_not_found": "Projet introuvable",
+    "workspace_permission_not_found": "Permission du projet introuvable",
     "workspaces": "Projets",
     "years": "années",
     "you": "Vous",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Nouvel attribut “{key}” créé avec le type “{dataType}”",
       "attributes_msg_userid_already_exists": "L'identifiant utilisateur existe déjà pour cet environnement et n'a pas été mis à jour.",
       "contact_deleted_successfully": "Contact supprimé avec succès",
+      "contact_not_found": "Aucun contact trouvé",
       "contacts_table_refresh": "Actualiser les contacts",
       "contacts_table_refresh_success": "Contacts rafraîchis avec succès",
       "create_attribute": "Créer un attribut",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Créé par un tiers",
         "discord_webhook_not_supported": "Les webhooks Discord ne sont actuellement pas pris en charge.",
         "empty_webhook_message": "Vos webhooks apparaîtront ici dès que vous les ajouterez. ⏲️",
-        "endpoint_bad_gateway_error": "Mauvaise passerelle (502) : Erreur de proxy/passerelle, service inaccessible",
-        "endpoint_gateway_timeout_error": "Délai d'attente de la passerelle dépassé (504) : Le délai d'attente de la passerelle a expiré, service inaccessible",
-        "endpoint_internal_server_error": "Erreur interne du serveur (500) : Le service a rencontré une erreur inattendue",
-        "endpoint_method_not_allowed_error": "Méthode non autorisée (405) : Le point de terminaison existe, mais n'accepte pas les requêtes POST",
-        "endpoint_not_found_error": "Introuvable (404) : Le point de terminaison n'existe pas",
         "endpoint_pinged": "Yay ! Nous pouvons pinger le webhook !",
         "endpoint_pinged_error": "Impossible de pinger le webhook !",
-        "endpoint_service_unavailable_error": "Service indisponible (503) : Le service est temporairement indisponible",
         "learn_to_verify": "Découvrez comment vérifier les signatures de webhook",
-        "no_triggers": "Aucun déclencheur",
         "please_check_console": "Veuillez vérifier la console pour plus de détails.",
         "please_enter_a_url": "Veuillez entrer une URL.",
         "response_created": "Réponse créée",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Nom d'hôte personnalisé",
         "customize_survey_logo": "Personnaliser le logo de l'enquête",
         "darken_or_lighten_background_of_your_choice": "Assombrir ou éclaircir l'arrière-plan de votre choix.",
+        "date_format": "Format de date",
         "days_before_showing_this_survey_again": "ou plus de jours doivent s'écouler entre le dernier sondage affiché et l'affichage de ce sondage.",
         "delete_anyways": "Supprimer quand même",
         "delete_block": "Supprimer le bloc",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "La limite de réponses doit dépasser le nombre de réponses reçues ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de réponse, redirections et plus.",
         "response_options": "Options de réponse",
-        "reverse_order_occasionally": "Inverser l'ordre occasionnellement",
-        "reverse_order_occasionally_except_last": "Inverser l'ordre occasionnellement sauf le dernier",
         "roundness": "Rondeur",
         "roundness_description": "Contrôle l'arrondi des coins.",
         "row_used_in_logic_error": "Cette ligne est utilisée dans la logique de la question {questionIndex}. Veuillez d'abord la supprimer de la logique.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Afficher le maximum du sondage de",
         "show_survey_to_users": "Afficher l'enquête à % des utilisateurs",
         "show_to_x_percentage_of_targeted_users": "Afficher à {percentage}% des utilisateurs ciblés",
-        "shrink_preview": "Réduire l'aperçu",
         "simple": "Simple",
         "six_points": "6 points",
         "smiley": "Sourire",
         "spam_protection_note": "La protection contre le spam ne fonctionne pas pour les enquêtes affichées avec les SDK iOS, React Native et Android. Cela cassera l'enquête.",
         "spam_protection_threshold_description": "Définir une valeur entre 0 et 1, les réponses en dessous de cette valeur seront rejetées.",
         "spam_protection_threshold_heading": "Seuil de réponse",
+        "shrink_preview": "Réduire l'aperçu",
         "star": "Étoile",
         "starts_with": "Commence par",
         "state": "État",

apps/web/locales/hu-HU.json

@@ -167,7 +167,6 @@
     "connect": "Kapcsolódás",
     "connect_formbricks": "Kapcsolódás a Formbrickshez",
     "connected": "Kapcsolódva",
-    "contact": "Kapcsolat",
     "contacts": "Partnerek",
     "continue": "Folytatás",
     "copied": "Másolva",
@@ -175,7 +174,6 @@
     "copy": "Másolás",
     "copy_code": "Kód másolása",
     "copy_link": "Hivatkozás másolása",
-    "copy_to_environment": "Másolás ide: {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribútum} other {{count} attribútum}}",
     "count_contacts": "{count, plural, one {{count} partner} other {{count} partner}}",
     "count_members": "{count, plural, one {{count} tag} other {{count} tag}}",
@@ -220,6 +218,7 @@
     "enter_url": "URL megadása",
     "enterprise_license": "Vállalati licenc",
     "environment": "Környezet",
+    "environment_not_found": "A környezet nem található",
     "environment_notice": "Ön jelenleg a(z) {environment} környezetben van.",
     "error": "Hiba",
     "error_component_description": "Ez az erőforrás nem létezik, vagy nem rendelkezik a hozzáféréshez szükséges jogosultságokkal.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Inaktív kérdőívek",
     "integration": "integráció",
     "integrations": "Integrációk",
-    "invalid_date_with_value": "Érvénytelen dátum: {value}",
+    "invalid_date": "Érvénytelen dátum",
     "invalid_file_name": "Érvénytelen fájlnév, nevezze át a fájlt, és próbálja újra",
     "invalid_file_type": "Érvénytelen fájltípus",
     "invite": "Meghívás",
     "invite_them": "Meghívó nekik",
-    "javascript_required": "JavaScript szükséges",
-    "javascript_required_description": "A Formbricks használatához JavaScript szükséges. Kérjük, engedélyezze a JavaScriptet a böngésző beállításaiban a folytatáshoz.",
     "key": "Kulcs",
     "label": "Címke",
     "language": "Nyelv",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Tagok",
     "members_and_teams": "Tagok és csapatok",
-    "membership": "Tagság",
     "membership_not_found": "A tagság nem található",
     "metadata": "Metaadatok",
     "mobile_overlay_app_works_best_on_desktop": "A Formbricks nagyobb képernyőn működik a legjobban. A kérdőívek kezeléséhez vagy összeállításához váltson másik eszközre.",
@@ -324,7 +320,9 @@
     "or": "vagy",
     "organization": "Szervezet",
     "organization_id": "Szervezetazonosító",
+    "organization_not_found": "A szervezet nem található",
     "organization_settings": "Szervezet beállításai",
+    "organization_teams_not_found": "A szervezeti csapatok nem találhatók",
     "other": "Egyéb",
     "others": "Mások",
     "overlay_color": "Rávetítés színe",
@@ -384,7 +382,6 @@
     "select": "Kiválasztás",
     "select_all": "Összes kiválasztása",
     "select_filter": "Szűrő kiválasztása",
-    "select_language": "Nyelv kiválasztása",
     "select_survey": "Kérdőív kiválasztása",
     "select_teams": "Csapatok kiválasztása",
     "selected": "Kiválasztva",
@@ -417,6 +414,7 @@
     "survey_id": "Kérdőív-azonosító",
     "survey_languages": "Kérdőív nyelvei",
     "survey_live": "A kérdőív élő",
+    "survey_not_found": "A kérdőív nem található",
     "survey_paused": "A kérdőív szüneteltetve.",
     "survey_type": "Kérdőív típusa",
     "surveys": "Kérdőívek",
@@ -431,6 +429,7 @@
     "team_name": "Csapat neve",
     "team_role": "Csapatszerep",
     "teams": "Csapatok",
+    "teams_not_found": "A csapatok nem találhatók",
     "text": "Szöveg",
     "time": "Idő",
     "time_to_finish": "Idő a befejezésig",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Felhasználó",
     "user_id": "Felhasználó-azonosító",
+    "user_not_found": "A felhasználó nem található",
     "variable": "Változó",
     "variable_ids": "Változóazonosítók",
     "variables": "Változók",
@@ -469,13 +469,14 @@
     "weeks": "hét",
     "welcome_card": "Üdvözlő kártya",
     "workflows": "Munkafolyamatok",
-    "workspace": "Munkaterület",
     "workspace_configuration": "Munkaterület beállítása",
     "workspace_created_successfully": "A munkaterület sikeresen létrehozva",
     "workspace_creation_description": "Kérdőívek munkaterületekre szervezése a jobb hozzáférés-vezérlés érdekében.",
     "workspace_id": "Munkaterület-azonosító",
     "workspace_name": "Munkaterület neve",
     "workspace_name_placeholder": "például Formbricks",
+    "workspace_not_found": "A munkaterület nem található",
+    "workspace_permission_not_found": "A munkaterület-jogosultság nem található",
     "workspaces": "Munkaterületek",
     "years": "év",
     "you": "Ön",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Az új „{dataType}” típusú „{key}” attribútum létrehozva",
       "attributes_msg_userid_already_exists": "A felhasználó-azonosító már létezik ennél a környezetnél, és nem lett frissítve.",
       "contact_deleted_successfully": "A partner sikeresen törölve",
+      "contact_not_found": "Nem található ilyen partner",
       "contacts_table_refresh": "Partnerek frissítése",
       "contacts_table_refresh_success": "A partnerek sikeresen frissítve",
       "create_attribute": "Attribútum létrehozása",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Harmadik fél által létrehozva",
         "discord_webhook_not_supported": "A Discord webhorgok jelenleg nem támogatottak.",
         "empty_webhook_message": "A webhorgai itt fognak megjelenni, amint hozzáadja azokat. ⏲️",
-        "endpoint_bad_gateway_error": "Hibás átjáró (502): Proxy-/átjáróhiba, a szolgáltatás nem érhető el",
-        "endpoint_gateway_timeout_error": "Átjáró időtúllépés (504): Átjáró időtúllépés, a szolgáltatás nem érhető el",
-        "endpoint_internal_server_error": "Belső szerverhiba (500): A szolgáltatás váratlan hibába ütközött",
-        "endpoint_method_not_allowed_error": "A metódus nem engedélyezett (405): A végpont létezik, de nem fogad POST kéréseket",
-        "endpoint_not_found_error": "Nem található (404): A végpont nem létezik",
         "endpoint_pinged": "Hurrá! Képesek vagyunk pingelni a webhorgot!",
         "endpoint_pinged_error": "Nem lehet pingelni a webhorgot!",
-        "endpoint_service_unavailable_error": "A szolgáltatás nem érhető el (503): A szolgáltatás átmenetileg nem elérhető",
         "learn_to_verify": "Tudja meg, hogy kell ellenőrizni a webhorog aláírásait",
-        "no_triggers": "Nincsenek Triggerek",
         "please_check_console": "További részletekért nézze meg a konzolt",
         "please_enter_a_url": "Adjon meg egy URL-t",
         "response_created": "Válasz létrehozva",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Egyéni gépnév",
         "customize_survey_logo": "A kérdőív logójának személyre szabása",
         "darken_or_lighten_background_of_your_choice": "A választási lehetőség hátterének sötétítése vagy világosítása.",
+        "date_format": "Dátumformátum",
         "days_before_showing_this_survey_again": "vagy több napnak kell eltelnie az utolsó megjelenített kérdőív és ezen kérdőív megjelenése között.",
         "delete_anyways": "Törlés mindenképp",
         "delete_block": "Blokk törlése",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "A válaszkorlátnak meg kell haladnia a kapott válaszok számát ({responseCount}).",
         "response_limits_redirections_and_more": "Válaszkorlátok, átirányítások és egyebek.",
         "response_options": "Válasz beállításai",
-        "reverse_order_occasionally": "Sorrend alkalmi megfordítása",
-        "reverse_order_occasionally_except_last": "Sorrend alkalmi megfordítása az utolsó kivételével",
         "roundness": "Kerekesség",
         "roundness_description": "Annak vezérlése, hogy a sarkok mennyire legyenek lekerekítve.",
         "row_used_in_logic_error": "Ez a sor használatban van a(z) {questionIndex}. kérdés logikájában. Először távolítsa el a logikából.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Kérdőív megjelenítése legfeljebb:",
         "show_survey_to_users": "Kérdőív megjelenítése a felhasználók ennyi százalékának",
         "show_to_x_percentage_of_targeted_users": "Megjelenítés a célzott felhasználók {percentage}%-ának",
-        "shrink_preview": "Előnézet összecsukása",
         "simple": "Egyszerű",
         "six_points": "6 pont",
         "smiley": "Hangulatjel",
         "spam_protection_note": "A szemét elleni védekezés nem működik az iOS, React Native és Android SDK-kkal megjelenített kérdőíveknél. El fogja rontani a kérdőívet.",
         "spam_protection_threshold_description": "Állítsa az értéket 0 és 1 közé, az ezen érték alatt lévő válaszok elutasításra kerülnek.",
         "spam_protection_threshold_heading": "Válasz küszöbszintje",
+        "shrink_preview": "Előnézet összecsukása",
         "star": "Csillag",
         "starts_with": "Ezzel kezdődik",
         "state": "Állapot",

apps/web/locales/ja-JP.json

@@ -167,7 +167,6 @@
     "connect": "接続",
     "connect_formbricks": "Formbricksを接続",
     "connected": "接続済み",
-    "contact": "連絡先",
     "contacts": "連絡先",
     "continue": "続行",
     "copied": "コピーしました",
@@ -175,7 +174,6 @@
     "copy": "コピー",
     "copy_code": "コードをコピー",
     "copy_link": "リンクをコピー",
-    "copy_to_environment": "{{environment}} にコピー",
     "count_attributes": "{count, plural, other {{count} 個の属性}}",
     "count_contacts": "{count, plural, other {{count} 件の連絡先}}",
     "count_members": "{count, plural, other {{count} 名のメンバー}}",
@@ -220,6 +218,7 @@
     "enter_url": "URLを入力",
     "enterprise_license": "エンタープライズライセンス",
     "environment": "環境",
+    "environment_not_found": "環境が見つかりません",
     "environment_notice": "現在、{environment} 環境にいます。",
     "error": "エラー",
     "error_component_description": "この リソース は 存在 しない か、アクセス する ための 必要な 権限 が ありません。",
@@ -256,13 +255,11 @@
     "inactive_surveys": "非アクティブなフォーム",
     "integration": "連携",
     "integrations": "連携",
-    "invalid_date_with_value": "無効な日付です: {value}",
+    "invalid_date": "無効な日付です",
     "invalid_file_name": "ファイル名が無効です。ファイル名を変更して再試行してください",
     "invalid_file_type": "無効なファイルタイプです",
     "invite": "招待",
     "invite_them": "招待する",
-    "javascript_required": "JavaScriptが必要です",
-    "javascript_required_description": "Formbricksを正常に動作させるには、JavaScriptが必要です。続行するには、ブラウザの設定でJavaScriptを有効にしてください。",
     "key": "キー",
     "label": "ラベル",
     "language": "言語",
@@ -283,7 +280,6 @@
     "marketing": "マーケティング",
     "members": "メンバー",
     "members_and_teams": "メンバー＆チーム",
-    "membership": "メンバーシップ",
     "membership_not_found": "メンバーシップが見つかりません",
     "metadata": "メタデータ",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks は より 大きな 画面 で最適に 作動します。 フォーム を 管理または 構築する には、 別の デバイス に 切り替える 必要が あります。",
@@ -324,7 +320,9 @@
     "or": "または",
     "organization": "組織",
     "organization_id": "組織ID",
+    "organization_not_found": "組織が見つかりません",
     "organization_settings": "組織設定",
+    "organization_teams_not_found": "組織のチームが見つかりません",
     "other": "その他",
     "others": "その他",
     "overlay_color": "オーバーレイの色",
@@ -384,7 +382,6 @@
     "select": "選択",
     "select_all": "すべて選択",
     "select_filter": "フィルターを選択",
-    "select_language": "言語を選択",
     "select_survey": "フォームを選択",
     "select_teams": "チームを選択",
     "selected": "選択済み",
@@ -417,6 +414,7 @@
     "survey_id": "フォームID",
     "survey_languages": "フォームの言語",
     "survey_live": "フォーム公開中",
+    "survey_not_found": "フォームが見つかりません",
     "survey_paused": "フォームは一時停止中です。",
     "survey_type": "フォームの種類",
     "surveys": "フォーム",
@@ -431,6 +429,7 @@
     "team_name": "チーム名",
     "team_role": "チームの役割",
     "teams": "チーム",
+    "teams_not_found": "チームが見つかりません",
     "text": "テキスト",
     "time": "時間",
     "time_to_finish": "所要時間",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "ユーザー",
     "user_id": "ユーザーID",
+    "user_not_found": "ユーザーが見つかりません",
     "variable": "変数",
     "variable_ids": "変数ID",
     "variables": "変数",
@@ -469,13 +469,14 @@
     "weeks": "週間",
     "welcome_card": "ウェルカムカード",
     "workflows": "ワークフロー",
-    "workspace": "ワークスペース",
     "workspace_configuration": "ワークスペース設定",
     "workspace_created_successfully": "ワークスペースが正常に作成されました",
     "workspace_creation_description": "アクセス制御を改善するために、フォームをワークスペースで整理します。",
     "workspace_id": "ワークスペースID",
     "workspace_name": "ワークスペース名",
     "workspace_name_placeholder": "例: Formbricks",
+    "workspace_not_found": "ワークスペースが見つかりません",
+    "workspace_permission_not_found": "ワークスペースの権限が見つかりません",
     "workspaces": "ワークスペース",
     "years": "年",
     "you": "あなた",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "新しい属性“{key}”を型“{dataType}”で作成しました",
       "attributes_msg_userid_already_exists": "この環境にはすでにユーザーIDが存在するため、更新されませんでした。",
       "contact_deleted_successfully": "連絡先を正常に削除しました",
+      "contact_not_found": "そのような連絡先は見つかりません",
       "contacts_table_refresh": "連絡先を更新",
       "contacts_table_refresh_success": "連絡先を正常に更新しました",
       "create_attribute": "属性を作成",
@@ -850,16 +852,9 @@
         "created_by_third_party": "サードパーティによって作成",
         "discord_webhook_not_supported": "現在、Discord Webhook はサポートしていません。",
         "empty_webhook_message": "Webhook は追加するとここに表示されます。⏲️",
-        "endpoint_bad_gateway_error": "不正なゲートウェイ (502): プロキシまたはゲートウェイのエラーにより、サービスに到達できません",
-        "endpoint_gateway_timeout_error": "ゲートウェイタイムアウト (504): ゲートウェイのタイムアウトにより、サービスに到達できません",
-        "endpoint_internal_server_error": "内部サーバーエラー (500): サービスで予期しないエラーが発生しました",
-        "endpoint_method_not_allowed_error": "許可されていないメソッド (405): エンドポイントは存在しますが、POST リクエストを受け付けません",
-        "endpoint_not_found_error": "見つかりません (404): エンドポイントが存在しません",
         "endpoint_pinged": "成功！Webhook に ping できました。",
         "endpoint_pinged_error": "Webhook への ping に失敗しました。",
-        "endpoint_service_unavailable_error": "サービス利用不可 (503): サービスは一時的に停止しています",
         "learn_to_verify": "Webhook署名の検証方法を学ぶ",
-        "no_triggers": "トリガーなし",
         "please_check_console": "詳細はコンソールを確認してください",
         "please_enter_a_url": "URL を入力してください",
         "response_created": "回答作成",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "カスタムホスト名",
         "customize_survey_logo": "アンケートのロゴをカスタマイズする",
         "darken_or_lighten_background_of_your_choice": "お好みの背景を暗くしたり明るくしたりします。",
+        "date_format": "日付形式",
         "days_before_showing_this_survey_again": "最後に表示されたアンケートとこのアンケートを表示するまでに、この日数以上の期間を空ける必要があります。",
         "delete_anyways": "削除する",
         "delete_block": "ブロックを削除",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "回答数の上限は、受信済みの回答数 ({responseCount}) を超える必要があります。",
         "response_limits_redirections_and_more": "回答数の上限、リダイレクトなど。",
         "response_options": "回答オプション",
-        "reverse_order_occasionally": "順序をランダムに逆転",
-        "reverse_order_occasionally_except_last": "最後以外の順序をランダムに逆転",
         "roundness": "丸み",
         "roundness_description": "角の丸みを調整します。",
         "row_used_in_logic_error": "この行は質問 {questionIndex} のロジックで使用されています。まず、ロジックから削除してください。",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "フォームの最大表示回数",
         "show_survey_to_users": "ユーザーの {percentage}% にフォームを表示",
         "show_to_x_percentage_of_targeted_users": "ターゲットユーザーの {percentage}% に表示",
-        "shrink_preview": "プレビューを縮小",
         "simple": "シンプル",
         "six_points": "6点",
         "smiley": "スマイリー",
         "spam_protection_note": "スパム対策は、iOS、React Native、およびAndroid SDKで表示されるフォームでは機能しません。フォームが壊れます。",
         "spam_protection_threshold_description": "値を0から1の間で設定してください。この値より低い回答は拒否されます。",
         "spam_protection_threshold_heading": "回答のしきい値",
+        "shrink_preview": "プレビューを縮小",
         "star": "星",
         "starts_with": "で始まる",
         "state": "都道府県",

apps/web/locales/nl-NL.json

@@ -167,7 +167,6 @@
     "connect": "Verbinden",
     "connect_formbricks": "Sluit Formbricks aan",
     "connected": "Aangesloten",
-    "contact": "Contact",
     "contacts": "Contacten",
     "continue": "Doorgaan",
     "copied": "Gekopieerd",
@@ -175,7 +174,6 @@
     "copy": "Kopiëren",
     "copy_code": "Kopieer code",
     "copy_link": "Kopieer link",
-    "copy_to_environment": "Kopiëren naar {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribuut} other {{count} attributen}}",
     "count_contacts": "{count, plural, one {{count} contact} other {{count} contacten}}",
     "count_members": "{count, plural, one {{count} lid} other {{count} leden}}",
@@ -220,6 +218,7 @@
     "enter_url": "URL invoeren",
     "enterprise_license": "Enterprise-licentie",
     "environment": "Omgeving",
+    "environment_not_found": "Omgeving niet gevonden",
     "environment_notice": "U bevindt zich momenteel in de {environment}-omgeving.",
     "error": "Fout",
     "error_component_description": "Deze bron bestaat niet of u beschikt niet over de benodigde toegangsrechten.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Inactieve enquêtes",
     "integration": "integratie",
     "integrations": "Integraties",
-    "invalid_date_with_value": "Ongeldige datum: {value}",
+    "invalid_date": "Ongeldige datum",
     "invalid_file_name": "Ongeldige bestandsnaam. Hernoem uw bestand en probeer het opnieuw",
     "invalid_file_type": "Ongeldig bestandstype",
     "invite": "Uitnodiging",
     "invite_them": "Nodig ze uit",
-    "javascript_required": "JavaScript vereist",
-    "javascript_required_description": "Formbricks heeft JavaScript nodig om correct te functioneren. Schakel JavaScript in je browserinstellingen in om door te gaan.",
     "key": "Sleutel",
     "label": "Label",
     "language": "Taal",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Leden",
     "members_and_teams": "Leden & teams",
-    "membership": "Lidmaatschap",
     "membership_not_found": "Lidmaatschap niet gevonden",
     "metadata": "Metagegevens",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks werkt het beste op een groter scherm. Schakel over naar een ander apparaat om enquêtes te beheren of samen te stellen.",
@@ -324,7 +320,9 @@
     "or": "of",
     "organization": "Organisatie",
     "organization_id": "Organisatie-ID",
+    "organization_not_found": "Organisatie niet gevonden",
     "organization_settings": "Organisatie-instellingen",
+    "organization_teams_not_found": "Organisatieteams niet gevonden",
     "other": "Ander",
     "others": "Anderen",
     "overlay_color": "Overlaykleur",
@@ -384,7 +382,6 @@
     "select": "Selecteer",
     "select_all": "Selecteer alles",
     "select_filter": "Filter selecteren",
-    "select_language": "Selecteer taal",
     "select_survey": "Selecteer Enquête",
     "select_teams": "Selecteer teams",
     "selected": "Gekozen",
@@ -417,6 +414,7 @@
     "survey_id": "Enquête-ID",
     "survey_languages": "Enquêtetalen",
     "survey_live": "Enquête live",
+    "survey_not_found": "Enquête niet gevonden",
     "survey_paused": "Enquête onderbroken.",
     "survey_type": "Enquêtetype",
     "surveys": "Enquêtes",
@@ -431,6 +429,7 @@
     "team_name": "Teamnaam",
     "team_role": "Teamrol",
     "teams": "Teams",
+    "teams_not_found": "Teams niet gevonden",
     "text": "Tekst",
     "time": "Tijd",
     "time_to_finish": "Tijd om af te ronden",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Gebruiker",
     "user_id": "Gebruikers-ID",
+    "user_not_found": "Gebruiker niet gevonden",
     "variable": "Variabel",
     "variable_ids": "Variabele ID's",
     "variables": "Variabelen",
@@ -469,13 +469,14 @@
     "weeks": "weken",
     "welcome_card": "Welkomstkaart",
     "workflows": "Workflows",
-    "workspace": "Werkruimte",
     "workspace_configuration": "Werkruimte-configuratie",
     "workspace_created_successfully": "Project succesvol aangemaakt",
     "workspace_creation_description": "Organiseer enquêtes in werkruimtes voor beter toegangsbeheer.",
     "workspace_id": "Werkruimte-ID",
     "workspace_name": "Werkruimtenaam",
     "workspace_name_placeholder": "bijv. Formbricks",
+    "workspace_not_found": "Werkruimte niet gevonden",
+    "workspace_permission_not_found": "Werkruimte-machtiging niet gevonden",
     "workspaces": "Werkruimtes",
     "years": "jaren",
     "you": "Jij",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Nieuw attribuut “{key}” aangemaakt met type “{dataType}”",
       "attributes_msg_userid_already_exists": "De gebruikers-ID bestaat al voor deze omgeving en is niet bijgewerkt.",
       "contact_deleted_successfully": "Contact succesvol verwijderd",
+      "contact_not_found": "Er is geen dergelijk contact gevonden",
       "contacts_table_refresh": "Vernieuw contacten",
       "contacts_table_refresh_success": "Contacten zijn vernieuwd",
       "create_attribute": "Attribuut aanmaken",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Gemaakt door een derde partij",
         "discord_webhook_not_supported": "Discord-webhooks worden momenteel niet ondersteund.",
         "empty_webhook_message": "Uw webhooks verschijnen hier zodra u ze toevoegt. ⏲️",
-        "endpoint_bad_gateway_error": "Ongeldige gateway (502): Proxy-/gatewayfout, service niet bereikbaar",
-        "endpoint_gateway_timeout_error": "Gateway-time-out (504): Gateway-time-out, service niet bereikbaar",
-        "endpoint_internal_server_error": "Interne serverfout (500): De service is een onverwachte fout tegengekomen",
-        "endpoint_method_not_allowed_error": "Methode niet toegestaan (405): Het endpoint bestaat, maar accepteert geen POST-verzoeken",
-        "endpoint_not_found_error": "Niet gevonden (404): Het endpoint bestaat niet",
         "endpoint_pinged": "Jawel! We kunnen de webhook pingen!",
         "endpoint_pinged_error": "Kan de webhook niet pingen!",
-        "endpoint_service_unavailable_error": "Service niet beschikbaar (503): De service is tijdelijk niet beschikbaar",
         "learn_to_verify": "Leer hoe je webhook-handtekeningen kunt verifiëren",
-        "no_triggers": "Geen triggers",
         "please_check_console": "Controleer de console voor meer details",
         "please_enter_a_url": "Voer een URL in",
         "response_created": "Reactie gemaakt",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Aangepaste hostnaam",
         "customize_survey_logo": "Pas het enquêtelogo aan",
         "darken_or_lighten_background_of_your_choice": "Maak de achtergrond naar keuze donkerder of lichter.",
+        "date_format": "Datumformaat",
         "days_before_showing_this_survey_again": "of meer dagen moeten verstrijken tussen de laatst getoonde enquête en het tonen van deze enquête.",
         "delete_anyways": "Toch verwijderen",
         "delete_block": "Blok verwijderen",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "De responslimiet moet groter zijn dan het aantal ontvangen reacties ({responseCount}).",
         "response_limits_redirections_and_more": "Reactielimieten, omleidingen en meer.",
         "response_options": "Reactieopties",
-        "reverse_order_occasionally": "Volgorde af en toe omkeren",
-        "reverse_order_occasionally_except_last": "Volgorde af en toe omkeren behalve laatste",
         "roundness": "Rondheid",
         "roundness_description": "Bepaalt hoe afgerond de hoeken zijn.",
         "row_used_in_logic_error": "Deze rij wordt gebruikt in de logica van vraag {questionIndex}. Verwijder het eerst uit de logica.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Toon onderzoek maximaal",
         "show_survey_to_users": "Enquête tonen aan % van de gebruikers",
         "show_to_x_percentage_of_targeted_users": "Toon aan {percentage}% van de getargete gebruikers",
-        "shrink_preview": "Voorbeeld invouwen",
         "simple": "Eenvoudig",
         "six_points": "6 punten",
         "smiley": "Smiley",
         "spam_protection_note": "Spambeveiliging werkt niet voor enquêtes die worden weergegeven met de iOS-, React Native- en Android SDK's. Het zal de enquête breken.",
         "spam_protection_threshold_description": "Stel een waarde in tussen 0 en 1, reacties onder deze waarde worden afgewezen.",
         "spam_protection_threshold_heading": "Reactiedrempel",
+        "shrink_preview": "Voorbeeld invouwen",
         "star": "Ster",
         "starts_with": "Begint met",
         "state": "Staat",

apps/web/locales/pt-BR.json

@@ -167,7 +167,6 @@
     "connect": "Conectar",
     "connect_formbricks": "Conectar Formbricks",
     "connected": "conectado",
-    "contact": "Contato",
     "contacts": "Contatos",
     "continue": "Continuar",
     "copied": "Copiado",
@@ -175,7 +174,6 @@
     "copy": "Copiar",
     "copy_code": "Copiar código",
     "copy_link": "Copiar Link",
-    "copy_to_environment": "Copiar para {{environment}}",
     "count_attributes": "{count, plural, one {{count} atributo} other {{count} atributos}}",
     "count_contacts": "{count, plural, one {{count} contato} other {{count} contatos}}",
     "count_members": "{count, plural, one {{count} membro} other {{count} membros}}",
@@ -220,6 +218,7 @@
     "enter_url": "Inserir URL",
     "enterprise_license": "Licença Empresarial",
     "environment": "Ambiente",
+    "environment_not_found": "Ambiente não encontrado",
     "environment_notice": "Você está atualmente no ambiente {environment}.",
     "error": "Erro",
     "error_component_description": "Esse recurso não existe ou você não tem permissão para acessá-lo.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Pesquisas inativas",
     "integration": "integração",
     "integrations": "Integrações",
-    "invalid_date_with_value": "Data inválida: {value}",
+    "invalid_date": "Data inválida",
     "invalid_file_name": "Nome de arquivo inválido, por favor renomeie seu arquivo e tente novamente",
     "invalid_file_type": "Tipo de arquivo inválido",
     "invite": "convidar",
     "invite_them": "Convida eles",
-    "javascript_required": "JavaScript Necessário",
-    "javascript_required_description": "O Formbricks precisa do JavaScript para funcionar corretamente. Por favor, ative o JavaScript nas configurações do seu navegador para continuar.",
     "key": "Chave",
     "label": "Etiqueta",
     "language": "Língua",
@@ -283,7 +280,6 @@
     "marketing": "marketing",
     "members": "Membros",
     "members_and_teams": "Membros e equipes",
-    "membership": "Associação",
     "membership_not_found": "Assinatura não encontrada",
     "metadata": "metadados",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funciona melhor em uma tela maior. Para gerenciar ou criar pesquisas, mude para outro dispositivo.",
@@ -324,7 +320,9 @@
     "or": "ou",
     "organization": "organização",
     "organization_id": "ID da Organização",
+    "organization_not_found": "Organização não encontrada",
     "organization_settings": "Configurações da Organização",
+    "organization_teams_not_found": "Equipes da organização não encontradas",
     "other": "outro",
     "others": "Outros",
     "overlay_color": "Cor da sobreposição",
@@ -384,7 +382,6 @@
     "select": "Selecionar",
     "select_all": "Selecionar tudo",
     "select_filter": "Selecionar filtro",
-    "select_language": "Selecionar Idioma",
     "select_survey": "Selecionar Pesquisa",
     "select_teams": "Selecionar times",
     "selected": "Selecionado",
@@ -417,6 +414,7 @@
     "survey_id": "ID da Pesquisa",
     "survey_languages": "Idiomas da Pesquisa",
     "survey_live": "Pesquisa ao vivo",
+    "survey_not_found": "Pesquisa não encontrada",
     "survey_paused": "Pesquisa pausada.",
     "survey_type": "Tipo de Pesquisa",
     "surveys": "Pesquisas",
@@ -431,6 +429,7 @@
     "team_name": "Nome da equipe",
     "team_role": "Função na equipe",
     "teams": "Equipes",
+    "teams_not_found": "Equipes não encontradas",
     "text": "Texto",
     "time": "tempo",
     "time_to_finish": "Hora de terminar",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Usuário",
     "user_id": "ID do usuário",
+    "user_not_found": "Usuário não encontrado",
     "variable": "variável",
     "variable_ids": "IDs de variáveis",
     "variables": "Variáveis",
@@ -469,13 +469,14 @@
     "weeks": "semanas",
     "welcome_card": "Cartão de boas-vindas",
     "workflows": "Fluxos de trabalho",
-    "workspace": "Espaço de trabalho",
     "workspace_configuration": "Configuração do projeto",
     "workspace_created_successfully": "Projeto criado com sucesso",
     "workspace_creation_description": "Organize pesquisas em projetos para melhor controle de acesso.",
     "workspace_id": "ID do projeto",
     "workspace_name": "Nome do projeto",
     "workspace_name_placeholder": "ex: Formbricks",
+    "workspace_not_found": "Projeto não encontrado",
+    "workspace_permission_not_found": "Permissão do projeto não encontrada",
     "workspaces": "Projetos",
     "years": "anos",
     "you": "Você",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Novo atributo “{key}” criado com tipo “{dataType}”",
       "attributes_msg_userid_already_exists": "O ID de usuário já existe para este ambiente e não foi atualizado.",
       "contact_deleted_successfully": "Contato excluído com sucesso",
+      "contact_not_found": "Nenhum contato encontrado",
       "contacts_table_refresh": "Atualizar contatos",
       "contacts_table_refresh_success": "Contatos atualizados com sucesso",
       "create_attribute": "Criar atributo",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Criado por um Terceiro",
         "discord_webhook_not_supported": "Webhooks do Discord não são suportados no momento.",
         "empty_webhook_message": "Seus webhooks vão aparecer aqui assim que você adicioná-los. ⏲️",
-        "endpoint_bad_gateway_error": "Gateway inválido (502): Erro de proxy/gateway, serviço inacessível",
-        "endpoint_gateway_timeout_error": "Tempo limite do gateway esgotado (504): Tempo limite do gateway esgotado, serviço inacessível",
-        "endpoint_internal_server_error": "Erro interno do servidor (500): O serviço encontrou um erro inesperado",
-        "endpoint_method_not_allowed_error": "Método não permitido (405): O endpoint existe, mas não aceita solicitações POST",
-        "endpoint_not_found_error": "Não encontrado (404): O endpoint não existe",
         "endpoint_pinged": "Uhul! Conseguimos pingar o webhook!",
         "endpoint_pinged_error": "Não consegui pingar o webhook!",
-        "endpoint_service_unavailable_error": "Serviço indisponível (503): O serviço está temporariamente indisponível",
         "learn_to_verify": "Aprenda como verificar assinaturas de webhook",
-        "no_triggers": "Nenhum Gatilho",
         "please_check_console": "Por favor, verifica o console para mais detalhes",
         "please_enter_a_url": "Por favor, insira uma URL",
         "response_created": "Resposta Criada",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Hostname personalizado",
         "customize_survey_logo": "Personalizar o logo da pesquisa",
         "darken_or_lighten_background_of_your_choice": "Escureça ou clareie o fundo da sua escolha.",
+        "date_format": "Formato de data",
         "days_before_showing_this_survey_again": "ou mais dias devem passar entre a última pesquisa exibida e a exibição desta pesquisa.",
         "delete_anyways": "Excluir mesmo assim",
         "delete_block": "Excluir bloco",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "O limite de respostas precisa exceder o número de respostas recebidas ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de resposta, redirecionamentos e mais.",
         "response_options": "Opções de Resposta",
-        "reverse_order_occasionally": "Inverter ordem ocasionalmente",
-        "reverse_order_occasionally_except_last": "Inverter ordem ocasionalmente exceto o último",
         "roundness": "Circularidade",
         "roundness_description": "Controla o arredondamento dos cantos.",
         "row_used_in_logic_error": "Esta linha é usada na lógica da pergunta {questionIndex}. Por favor, remova-a da lógica primeiro.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Mostrar no máximo",
         "show_survey_to_users": "Mostrar pesquisa para % dos usuários",
         "show_to_x_percentage_of_targeted_users": "Mostrar para {percentage}% dos usuários segmentados",
-        "shrink_preview": "Recolher prévia",
         "simple": "Simples",
         "six_points": "6 pontos",
         "smiley": "Sorridente",
         "spam_protection_note": "A proteção contra spam não funciona para pesquisas exibidas com os SDKs iOS, React Native e Android. Isso vai quebrar a pesquisa.",
         "spam_protection_threshold_description": "Defina um valor entre 0 e 1, respostas abaixo desse valor serão rejeitadas.",
         "spam_protection_threshold_heading": "Limite de resposta",
+        "shrink_preview": "Recolher prévia",
         "star": "Estrela",
         "starts_with": "Começa com",
         "state": "Estado",

apps/web/locales/pt-PT.json

@@ -167,7 +167,6 @@
     "connect": "Conectar",
     "connect_formbricks": "Ligar Formbricks",
     "connected": "Conectado",
-    "contact": "Contacto",
     "contacts": "Contactos",
     "continue": "Continuar",
     "copied": "Copiado",
@@ -175,7 +174,6 @@
     "copy": "Copiar",
     "copy_code": "Copiar código",
     "copy_link": "Copiar Link",
-    "copy_to_environment": "Copiar para {{environment}}",
     "count_attributes": "{count, plural, one {{count} atributo} other {{count} atributos}}",
     "count_contacts": "{count, plural, one {{count} contacto} other {{count} contactos}}",
     "count_members": "{count, plural, one {{count} membro} other {{count} membros}}",
@@ -220,6 +218,7 @@
     "enter_url": "Introduzir URL",
     "enterprise_license": "Licença Enterprise",
     "environment": "Ambiente",
+    "environment_not_found": "Ambiente não encontrado",
     "environment_notice": "Está atualmente no ambiente {environment}.",
     "error": "Erro",
     "error_component_description": "Este recurso não existe ou não tem os direitos necessários para aceder a ele.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Inquéritos inativos",
     "integration": "integração",
     "integrations": "Integrações",
-    "invalid_date_with_value": "Data inválida: {value}",
+    "invalid_date": "Data inválida",
     "invalid_file_name": "Nome de ficheiro inválido, por favor renomeie o seu ficheiro e tente novamente",
     "invalid_file_type": "Tipo de ficheiro inválido",
     "invite": "Convidar",
     "invite_them": "Convide-os",
-    "javascript_required": "JavaScript Necessário",
-    "javascript_required_description": "O Formbricks necessita de JavaScript para funcionar corretamente. Por favor, ativa o JavaScript nas definições do teu navegador para continuar.",
     "key": "Chave",
     "label": "Etiqueta",
     "language": "Idioma",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Membros",
     "members_and_teams": "Membros e equipas",
-    "membership": "Subscrição",
     "membership_not_found": "Associação não encontrada",
     "metadata": "Metadados",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funciona melhor num ecrã maior. Para gerir ou criar inquéritos, mude de dispositivo.",
@@ -324,7 +320,9 @@
     "or": "ou",
     "organization": "Organização",
     "organization_id": "ID da Organização",
+    "organization_not_found": "Organização não encontrada",
     "organization_settings": "Configurações da Organização",
+    "organization_teams_not_found": "Equipas da organização não encontradas",
     "other": "Outro",
     "others": "Outros",
     "overlay_color": "Cor da sobreposição",
@@ -384,7 +382,6 @@
     "select": "Selecionar",
     "select_all": "Selecionar tudo",
     "select_filter": "Selecionar filtro",
-    "select_language": "Selecionar Idioma",
     "select_survey": "Selecionar Inquérito",
     "select_teams": "Selecionar equipas",
     "selected": "Selecionado",
@@ -417,6 +414,7 @@
     "survey_id": "ID do Inquérito",
     "survey_languages": "Idiomas da Pesquisa",
     "survey_live": "Inquérito ao vivo",
+    "survey_not_found": "Inquérito não encontrado",
     "survey_paused": "Inquérito pausado.",
     "survey_type": "Tipo de Inquérito",
     "surveys": "Inquéritos",
@@ -431,6 +429,7 @@
     "team_name": "Nome da equipa",
     "team_role": "Função na equipa",
     "teams": "Equipas",
+    "teams_not_found": "Equipas não encontradas",
     "text": "Texto",
     "time": "Tempo",
     "time_to_finish": "Tempo para concluir",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Utilizador",
     "user_id": "ID do Utilizador",
+    "user_not_found": "Utilizador não encontrado",
     "variable": "Variável",
     "variable_ids": "IDs de variáveis",
     "variables": "Variáveis",
@@ -469,13 +469,14 @@
     "weeks": "semanas",
     "welcome_card": "Cartão de boas-vindas",
     "workflows": "Fluxos de trabalho",
-    "workspace": "Espaço de trabalho",
     "workspace_configuration": "Configuração do projeto",
     "workspace_created_successfully": "Projeto criado com sucesso",
     "workspace_creation_description": "Organize inquéritos em projetos para melhor controlo de acesso.",
     "workspace_id": "ID do projeto",
     "workspace_name": "Nome do projeto",
     "workspace_name_placeholder": "ex. Formbricks",
+    "workspace_not_found": "Projeto não encontrado",
+    "workspace_permission_not_found": "Permissão do projeto não encontrada",
     "workspaces": "Projetos",
     "years": "anos",
     "you": "Você",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Criado novo atributo “{key}” com tipo “{dataType}”",
       "attributes_msg_userid_already_exists": "O ID de utilizador já existe para este ambiente e não foi atualizado.",
       "contact_deleted_successfully": "Contacto eliminado com sucesso",
+      "contact_not_found": "Nenhum contacto encontrado",
       "contacts_table_refresh": "Atualizar contactos",
       "contacts_table_refresh_success": "Contactos atualizados com sucesso",
       "create_attribute": "Criar atributo",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Criado por um Terceiro",
         "discord_webhook_not_supported": "Os webhooks do Discord não são atualmente suportados.",
         "empty_webhook_message": "Os seus webhooks aparecerão aqui assim que os adicionar. ⏲️",
-        "endpoint_bad_gateway_error": "Gateway inválido (502): Erro de proxy/gateway, serviço inacessível",
-        "endpoint_gateway_timeout_error": "Tempo limite do gateway excedido (504): Tempo limite do gateway excedido, serviço inacessível",
-        "endpoint_internal_server_error": "Erro interno do servidor (500): O serviço encontrou um erro inesperado",
-        "endpoint_method_not_allowed_error": "Método não permitido (405): O endpoint existe, mas não aceita pedidos POST",
-        "endpoint_not_found_error": "Não encontrado (404): O endpoint não existe",
         "endpoint_pinged": "Yay! Conseguimos aceder ao webhook!",
         "endpoint_pinged_error": "Não foi possível aceder ao webhook!",
-        "endpoint_service_unavailable_error": "Serviço indisponível (503): O serviço está temporariamente indisponível",
         "learn_to_verify": "Aprenda a verificar assinaturas de webhook",
-        "no_triggers": "Sem Acionadores",
         "please_check_console": "Por favor, verifique a consola para mais detalhes",
         "please_enter_a_url": "Por favor, insira um URL",
         "response_created": "Resposta Criada",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Nome do host personalizado",
         "customize_survey_logo": "Personalizar o logótipo do inquérito",
         "darken_or_lighten_background_of_your_choice": "Escurecer ou clarear o fundo da sua escolha.",
+        "date_format": "Formato da data",
         "days_before_showing_this_survey_again": "ou mais dias a decorrer entre o último inquérito apresentado e a apresentação deste inquérito.",
         "delete_anyways": "Eliminar mesmo assim",
         "delete_block": "Eliminar bloco",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "O limite de respostas precisa exceder o número de respostas recebidas ({responseCount}).",
         "response_limits_redirections_and_more": "Limites de resposta, redirecionamentos e mais.",
         "response_options": "Opções de Resposta",
-        "reverse_order_occasionally": "Inverter ordem ocasionalmente",
-        "reverse_order_occasionally_except_last": "Inverter ordem ocasionalmente exceto o último",
         "roundness": "Arredondamento",
         "roundness_description": "Controla o arredondamento dos cantos.",
         "row_used_in_logic_error": "Esta linha é usada na lógica da pergunta {questionIndex}. Por favor, remova-a da lógica primeiro.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Mostrar inquérito máximo de",
         "show_survey_to_users": "Mostrar inquérito a % dos utilizadores",
         "show_to_x_percentage_of_targeted_users": "Mostrar a {percentage}% dos utilizadores alvo",
-        "shrink_preview": "Reduzir pré-visualização",
         "simple": "Simples",
         "six_points": "6 pontos",
         "smiley": "Sorridente",
         "spam_protection_note": "A proteção contra spam não funciona para inquéritos exibidos com os SDKs iOS, React Native e Android. Isso irá quebrar o inquérito.",
         "spam_protection_threshold_description": "Defina um valor entre 0 e 1, respostas abaixo deste valor serão rejeitadas.",
         "spam_protection_threshold_heading": "Limite de resposta",
+        "shrink_preview": "Reduzir pré-visualização",
         "star": "Estrela",
         "starts_with": "Começa com",
         "state": "Estado",

apps/web/locales/ro-RO.json

@@ -167,7 +167,6 @@
     "connect": "Conectează",
     "connect_formbricks": "Conectează Formbricks",
     "connected": "Conectat",
-    "contact": "Contact",
     "contacts": "Contacte",
     "continue": "Continuă",
     "copied": "Copiat",
@@ -175,7 +174,6 @@
     "copy": "Copiază",
     "copy_code": "Copiază codul",
     "copy_link": "Copiază legătura",
-    "copy_to_environment": "Copiază în {{environment}}",
     "count_attributes": "{count, plural, one {{count} atribut} few {{count} atribute} other {{count} de atribute}}",
     "count_contacts": "{count, plural, one {{count} contact} few {{count} contacte} other {{count} de contacte}}",
     "count_members": "{count, plural, one {{count} membru} few {{count} membri} other {{count} de membri}}",
@@ -220,6 +218,7 @@
     "enter_url": "Introduceți URL-ul",
     "enterprise_license": "Licență Întreprindere",
     "environment": "Mediu",
+    "environment_not_found": "Mediul nu a fost găsit",
     "environment_notice": "Te afli în prezent în mediul {environment}",
     "error": "Eroare",
     "error_component_description": "Această resursă nu există sau nu aveți drepturile necesare pentru a o accesa.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Sondaje inactive",
     "integration": "integrare",
     "integrations": "Integrări",
-    "invalid_date_with_value": "Dată invalidă: {value}",
+    "invalid_date": "Dată invalidă",
     "invalid_file_name": "Nume de fișier invalid, vă rugăm să redenumiți fișierul și să încercați din nou",
     "invalid_file_type": "Tip de fișier nevalid",
     "invite": "Invită",
     "invite_them": "Invită-i",
-    "javascript_required": "JavaScript necesar",
-    "javascript_required_description": "Formbricks necesită JavaScript pentru a funcționa corect. Te rugăm să activezi JavaScript în setările browserului tău pentru a continua.",
     "key": "Cheie",
     "label": "Etichetă",
     "language": "Limba",
@@ -283,7 +280,6 @@
     "marketing": "Marketing",
     "members": "Membri",
     "members_and_teams": "Membri și echipe",
-    "membership": "Abonament",
     "membership_not_found": "Apartenența nu a fost găsită",
     "metadata": "Metadate",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks funcționează cel mai bine pe un ecran mai mare. Pentru a gestiona sau crea chestionare, treceți la un alt dispozitiv.",
@@ -324,7 +320,9 @@
     "or": "sau",
     "organization": "Organizație",
     "organization_id": "ID Organizație",
+    "organization_not_found": "Organizația nu a fost găsită",
     "organization_settings": "Setări Organizație",
+    "organization_teams_not_found": "Echipele organizației nu au fost găsite",
     "other": "Altele",
     "others": "Altele",
     "overlay_color": "Culoare overlay",
@@ -384,7 +382,6 @@
     "select": "Selectați",
     "select_all": "Selectați toate",
     "select_filter": "Selectați filtrul",
-    "select_language": "Selectează limba",
     "select_survey": "Selectați chestionar",
     "select_teams": "Selectați echipele",
     "selected": "Selectat",
@@ -417,6 +414,7 @@
     "survey_id": "ID Chestionar",
     "survey_languages": "Limbi chestionar",
     "survey_live": "Chestionar activ",
+    "survey_not_found": "Sondajul nu a fost găsit",
     "survey_paused": "Chestionar oprit.",
     "survey_type": "Tip Chestionar",
     "surveys": "Sondaje",
@@ -431,6 +429,7 @@
     "team_name": "Nume echipă",
     "team_role": "Rol în echipă",
     "teams": "Echipe",
+    "teams_not_found": "Echipele nu au fost găsite",
     "text": "Text",
     "time": "Timp",
     "time_to_finish": "Timp până la finalizare",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Utilizator",
     "user_id": "ID Utilizator",
+    "user_not_found": "Utilizatorul nu a fost găsit",
     "variable": "Variabilă",
     "variable_ids": "ID-uri variabile",
     "variables": "Variante",
@@ -469,13 +469,14 @@
     "weeks": "săptămâni",
     "welcome_card": "Card de bun venit",
     "workflows": "Workflows",
-    "workspace": "Spațiu de lucru",
     "workspace_configuration": "Configurare workspace",
     "workspace_created_successfully": "Spațiul de lucru a fost creat cu succes",
     "workspace_creation_description": "Organizează sondajele în workspaces pentru un control mai bun al accesului.",
     "workspace_id": "ID workspace",
     "workspace_name": "Nume workspace",
     "workspace_name_placeholder": "ex: Formbricks",
+    "workspace_not_found": "Workspace-ul nu a fost găsit",
+    "workspace_permission_not_found": "Permisiunea pentru workspace nu a fost găsită",
     "workspaces": "Workspaces",
     "years": "ani",
     "you": "Tu",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "A fost creat un nou atribut „{key}” cu tipul „{dataType}”",
       "attributes_msg_userid_already_exists": "ID-ul de utilizator există deja pentru acest mediu și nu a fost actualizat.",
       "contact_deleted_successfully": "Contact șters cu succes",
+      "contact_not_found": "Nu a fost găsit niciun contact",
       "contacts_table_refresh": "Reîmprospătare contacte",
       "contacts_table_refresh_success": "Contactele au fost actualizate cu succes",
       "create_attribute": "Creează atribut",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Creat de o Parte Terță",
         "discord_webhook_not_supported": "Webhook-urile Discord nu sunt în prezent suportate.",
         "empty_webhook_message": "Webhook-urile tale vor apărea aici de îndată ce le vei adăuga. ⏲️",
-        "endpoint_bad_gateway_error": "Gateway invalid (502): Eroare de proxy/gateway, serviciul nu este accesibil",
-        "endpoint_gateway_timeout_error": "Timp de așteptare gateway depășit (504): Timpul de așteptare al gateway-ului a fost depășit, serviciul nu este accesibil",
-        "endpoint_internal_server_error": "Eroare internă de server (500): Serviciul a întâmpinat o eroare neașteptată",
-        "endpoint_method_not_allowed_error": "Metodă nepermisă (405): Endpointul există, dar nu acceptă cereri POST",
-        "endpoint_not_found_error": "Negăsit (404): Endpointul nu există",
         "endpoint_pinged": "Grozav! Am reușit să ping-ui webhooks-ul!",
         "endpoint_pinged_error": "Nu pot să ping-ui webhooks-ul!",
-        "endpoint_service_unavailable_error": "Serviciu indisponibil (503): Serviciul este temporar indisponibil",
         "learn_to_verify": "Află cum să verifici semnăturile webhook",
-        "no_triggers": "Fără declanșatori",
         "please_check_console": "Vă rugăm să verificați consola pentru mai multe detalii",
         "please_enter_a_url": "Vă rugăm să introduceți un URL",
         "response_created": "Răspuns creat",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Gazdă personalizată",
         "customize_survey_logo": "Personalizează logo-ul chestionarului",
         "darken_or_lighten_background_of_your_choice": "Întunecați sau luminați fundalul după preferințe.",
+        "date_format": "Format dată",
         "days_before_showing_this_survey_again": "sau mai multe zile să treacă între ultima afișare a sondajului și afișarea acestui sondaj.",
         "delete_anyways": "Șterge oricum",
         "delete_block": "Șterge blocul",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Limita răspunsurilor trebuie să depășească numărul de răspunsuri primite ({responseCount}).",
         "response_limits_redirections_and_more": "Limite de răspunsuri, redirecționări și altele.",
         "response_options": "Opțiuni răspuns",
-        "reverse_order_occasionally": "Inversare ordine ocazional",
-        "reverse_order_occasionally_except_last": "Inversare ordine ocazional cu excepția ultimului",
         "roundness": "Rotunjire",
         "roundness_description": "Controlează cât de rotunjite sunt colțurile.",
         "row_used_in_logic_error": "Această linie este folosită în logica întrebării {questionIndex}. Vă rugăm să-l eliminați din logică mai întâi.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Afișează sondajul de maxim",
         "show_survey_to_users": "Afișați sondajul la % din utilizatori",
         "show_to_x_percentage_of_targeted_users": "Afișați la {percentage}% din utilizatorii vizați",
-        "shrink_preview": "Restrânge previzualizarea",
         "simple": "Simplu",
         "six_points": "6 puncte",
         "smiley": "Smiley",
         "spam_protection_note": "Protecția împotriva spamului nu funcționează pentru sondajele afișate folosind SDK-urile iOS, React Native și Android. Va întrerupe sondajul.",
         "spam_protection_threshold_description": "Setați valoarea între 0 și 1, răspunsurile sub această valoare vor fi respinse.",
         "spam_protection_threshold_heading": "Pragul răspunsurilor",
+        "shrink_preview": "Restrânge previzualizarea",
         "star": "Stea",
         "starts_with": "Începe cu",
         "state": "Stare",

apps/web/locales/ru-RU.json

@@ -167,7 +167,6 @@
     "connect": "Подключить",
     "connect_formbricks": "Подключить Formbricks",
     "connected": "Подключено",
-    "contact": "Контакт",
     "contacts": "Контакты",
     "continue": "Продолжить",
     "copied": "Скопировано",
@@ -175,7 +174,6 @@
     "copy": "Копировать",
     "copy_code": "Скопировать код",
     "copy_link": "Скопировать ссылку",
-    "copy_to_environment": "Копировать в {{environment}}",
     "count_attributes": "{count, plural, one {{count} атрибут} few {{count} атрибута} many {{count} атрибутов} other {{count} атрибута}}",
     "count_contacts": "{count, plural, one {{count} контакт} few {{count} контакта} many {{count} контактов} other {{count} контакта}}",
     "count_members": "{count, plural, one {{count} участник} few {{count} участника} many {{count} участников} other {{count} участника}}",
@@ -220,6 +218,7 @@
     "enter_url": "Введите URL",
     "enterprise_license": "Корпоративная лицензия",
     "environment": "Окружение",
+    "environment_not_found": "Среда не найдена",
     "environment_notice": "В данный момент вы находитесь в среде {environment}.",
     "error": "Ошибка",
     "error_component_description": "Этот ресурс не существует или у вас нет необходимых прав для доступа к нему.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Неактивные опросы",
     "integration": "интеграция",
     "integrations": "Интеграции",
-    "invalid_date_with_value": "Неверная дата: {value}",
+    "invalid_date": "Неверная дата",
     "invalid_file_name": "Недопустимое имя файла, переименуйте файл и попробуйте снова",
     "invalid_file_type": "Недопустимый тип файла",
     "invite": "Пригласить",
     "invite_them": "Пригласить их",
-    "javascript_required": "Требуется JavaScript",
-    "javascript_required_description": "Для корректной работы Formbricks необходим JavaScript. Пожалуйста, включите JavaScript в настройках вашего браузера, чтобы продолжить.",
     "key": "Ключ",
     "label": "Метка",
     "language": "Язык",
@@ -283,7 +280,6 @@
     "marketing": "Маркетинг",
     "members": "Участники",
     "members_and_teams": "Участники и команды",
-    "membership": "Членство",
     "membership_not_found": "Участие не найдено",
     "metadata": "Метаданные",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks лучше всего работает на большом экране. Для управления или создания опросов перейдите на другое устройство.",
@@ -324,7 +320,9 @@
     "or": "или",
     "organization": "Организация",
     "organization_id": "ID организации",
+    "organization_not_found": "Организация не найдена",
     "organization_settings": "Настройки организации",
+    "organization_teams_not_found": "Команды организации не найдены",
     "other": "Другое",
     "others": "Другие",
     "overlay_color": "Цвет наложения",
@@ -384,7 +382,6 @@
     "select": "Выбрать",
     "select_all": "Выбрать все",
     "select_filter": "Выбрать фильтр",
-    "select_language": "Выберите язык",
     "select_survey": "Выбрать опрос",
     "select_teams": "Выбрать команды",
     "selected": "Выбрано",
@@ -417,6 +414,7 @@
     "survey_id": "ID опроса",
     "survey_languages": "Языки опроса",
     "survey_live": "Опрос активен",
+    "survey_not_found": "Опрос не найден",
     "survey_paused": "Опрос приостановлен.",
     "survey_type": "Тип опроса",
     "surveys": "Опросы",
@@ -431,6 +429,7 @@
     "team_name": "Название команды",
     "team_role": "Роль в команде",
     "teams": "Команды",
+    "teams_not_found": "Команды не найдены",
     "text": "Текст",
     "time": "Время",
     "time_to_finish": "Время до завершения",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Пользователь",
     "user_id": "ID пользователя",
+    "user_not_found": "Пользователь не найден",
     "variable": "Переменная",
     "variable_ids": "ID переменных",
     "variables": "Переменные",
@@ -469,13 +469,14 @@
     "weeks": "недели",
     "welcome_card": "Приветственная карточка",
     "workflows": "Воркфлоу",
-    "workspace": "Рабочее пространство",
     "workspace_configuration": "Настройка рабочего пространства",
     "workspace_created_successfully": "Рабочий проект успешно создан",
     "workspace_creation_description": "Организуйте опросы в рабочих пространствах для лучшего контроля доступа.",
     "workspace_id": "ID рабочего пространства",
     "workspace_name": "Название рабочего пространства",
     "workspace_name_placeholder": "например, Formbricks",
+    "workspace_not_found": "Рабочее пространство не найдено",
+    "workspace_permission_not_found": "Разрешение на рабочее пространство не найдено",
     "workspaces": "Рабочие пространства",
     "years": "годы",
     "you": "Вы",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Создан новый атрибут «{key}» с типом «{dataType}»",
       "attributes_msg_userid_already_exists": "Этот user ID уже существует в данной среде и не был обновлён.",
       "contact_deleted_successfully": "Контакт успешно удалён",
+      "contact_not_found": "Такой контакт не найден",
       "contacts_table_refresh": "Обновить контакты",
       "contacts_table_refresh_success": "Контакты успешно обновлены",
       "create_attribute": "Создать атрибут",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Создано сторонней организацией",
         "discord_webhook_not_supported": "В настоящее время webhooks Discord не поддерживаются.",
         "empty_webhook_message": "Ваши webhooks появятся здесь, как только вы их добавите. ⏲️",
-        "endpoint_bad_gateway_error": "Ошибка шлюза (502): Ошибка прокси/шлюза, сервис недоступен",
-        "endpoint_gateway_timeout_error": "Тайм-аут шлюза (504): Тайм-аут шлюза, сервис недоступен",
-        "endpoint_internal_server_error": "Внутренняя ошибка сервера (500): Сервис столкнулся с непредвиденной ошибкой",
-        "endpoint_method_not_allowed_error": "Метод не разрешен (405): Конечная точка существует, но не принимает POST-запросы",
-        "endpoint_not_found_error": "Не найдено (404): Конечная точка не существует",
         "endpoint_pinged": "Ура! Нам удалось отправить ping на webhook!",
         "endpoint_pinged_error": "Не удалось отправить ping на webhook!",
-        "endpoint_service_unavailable_error": "Сервис недоступен (503): Сервис временно недоступен",
         "learn_to_verify": "Узнайте, как проверить подписи вебхуков",
-        "no_triggers": "Нет триггеров",
         "please_check_console": "Пожалуйста, проверьте консоль для получения подробностей",
         "please_enter_a_url": "Пожалуйста, введите URL",
         "response_created": "Ответ создан",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Пользовательский хостнейм",
         "customize_survey_logo": "Настроить логотип опроса",
         "darken_or_lighten_background_of_your_choice": "Затемните или осветлите выбранный фон.",
+        "date_format": "Формат даты",
         "days_before_showing_this_survey_again": "или больше дней должно пройти между последним показом опроса и показом этого опроса.",
         "delete_anyways": "Удалить в любом случае",
         "delete_block": "Удалить блок",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Лимит ответов должен превышать количество полученных ответов ({responseCount}).",
         "response_limits_redirections_and_more": "Лимиты ответов, перенаправления и другое.",
         "response_options": "Параметры ответа",
-        "reverse_order_occasionally": "Иногда обращать порядок",
-        "reverse_order_occasionally_except_last": "Иногда обращать порядок кроме последнего",
         "roundness": "Скругление",
         "roundness_description": "Определяет степень скругления углов.",
         "row_used_in_logic_error": "Эта строка используется в логике вопроса {questionIndex}. Пожалуйста, сначала удалите её из логики.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Показать опрос максимум",
         "show_survey_to_users": "Показать опрос % пользователей",
         "show_to_x_percentage_of_targeted_users": "Показать {percentage}% целевых пользователей",
-        "shrink_preview": "Свернуть предпросмотр",
         "simple": "Простой",
         "six_points": "6 баллов",
         "smiley": "Смайлик",
         "spam_protection_note": "Защита от спама не работает для опросов, отображаемых с помощью SDK iOS, React Native и Android. Это приведёт к сбою опроса.",
         "spam_protection_threshold_description": "Установите значение от 0 до 1, ответы ниже этого значения будут отклонены.",
         "spam_protection_threshold_heading": "Порог ответа",
+        "shrink_preview": "Свернуть предпросмотр",
         "star": "Звезда",
         "starts_with": "Начинается с",
         "state": "Состояние",

apps/web/locales/sv-SE.json

@@ -167,7 +167,6 @@
     "connect": "Anslut",
     "connect_formbricks": "Anslut Formbricks",
     "connected": "Ansluten",
-    "contact": "Kontakt",
     "contacts": "Kontakter",
     "continue": "Fortsätt",
     "copied": "Kopierad",
@@ -175,7 +174,6 @@
     "copy": "Kopiera",
     "copy_code": "Kopiera kod",
     "copy_link": "Kopiera länk",
-    "copy_to_environment": "Kopiera till {{environment}}",
     "count_attributes": "{count, plural, one {{count} attribut} other {{count} attribut}}",
     "count_contacts": "{count, plural, one {{count} kontakt} other {{count} kontakter}}",
     "count_members": "{count, plural, one {{count} medlem} other {{count} medlemmar}}",
@@ -220,6 +218,7 @@
     "enter_url": "Ange URL",
     "enterprise_license": "Företagslicens",
     "environment": "Miljö",
+    "environment_not_found": "Miljö hittades inte",
     "environment_notice": "Du är för närvarande i {environment}-miljön.",
     "error": "Fel",
     "error_component_description": "Denna resurs finns inte eller så har du inte de nödvändiga rättigheterna för att komma åt den.",
@@ -256,13 +255,11 @@
     "inactive_surveys": "Inaktiva enkäter",
     "integration": "integration",
     "integrations": "Integrationer",
-    "invalid_date_with_value": "Ogiltigt datum: {value}",
+    "invalid_date": "Ogiltigt datum",
     "invalid_file_name": "Ogiltigt filnamn, vänligen byt namn på din fil och försök igen",
     "invalid_file_type": "Ogiltig filtyp",
     "invite": "Bjud in",
     "invite_them": "Bjud in dem",
-    "javascript_required": "JavaScript krävs",
-    "javascript_required_description": "Formbricks kräver JavaScript för att fungera korrekt. Vänligen aktivera JavaScript i dina webbläsarinställningar för att fortsätta.",
     "key": "Nyckel",
     "label": "Etikett",
     "language": "Språk",
@@ -283,7 +280,6 @@
     "marketing": "Marknadsföring",
     "members": "Medlemmar",
     "members_and_teams": "Medlemmar och team",
-    "membership": "Medlemskap",
     "membership_not_found": "Medlemskap hittades inte",
     "metadata": "Metadata",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks fungerar bäst på en större skärm. Byt till en annan enhet för att hantera eller bygga enkäter.",
@@ -324,7 +320,9 @@
     "or": "eller",
     "organization": "Organisation",
     "organization_id": "Organisations-ID",
+    "organization_not_found": "Organisation hittades inte",
     "organization_settings": "Organisationsinställningar",
+    "organization_teams_not_found": "Organisationsteam hittades inte",
     "other": "Annat",
     "others": "Andra",
     "overlay_color": "Overlay-färg",
@@ -384,7 +382,6 @@
     "select": "Välj",
     "select_all": "Välj alla",
     "select_filter": "Välj filter",
-    "select_language": "Välj språk",
     "select_survey": "Välj enkät",
     "select_teams": "Välj team",
     "selected": "Vald",
@@ -417,6 +414,7 @@
     "survey_id": "Enkät-ID",
     "survey_languages": "Enkätspråk",
     "survey_live": "Enkät live",
+    "survey_not_found": "Enkät hittades inte",
     "survey_paused": "Enkät pausad.",
     "survey_type": "Enkättyp",
     "surveys": "Enkäter",
@@ -431,6 +429,7 @@
     "team_name": "Teamnamn",
     "team_role": "Teamroll",
     "teams": "Åtkomstkontroll",
+    "teams_not_found": "Team hittades inte",
     "text": "Text",
     "time": "Tid",
     "time_to_finish": "Tid att slutföra",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "Användare",
     "user_id": "Användar-ID",
+    "user_not_found": "Användare hittades inte",
     "variable": "Variabel",
     "variable_ids": "Variabel-ID:n",
     "variables": "Variabler",
@@ -469,13 +469,14 @@
     "weeks": "veckor",
     "welcome_card": "Välkomstkort",
     "workflows": "Arbetsflöden",
-    "workspace": "Arbetsyta",
     "workspace_configuration": "Arbetsytans konfiguration",
     "workspace_created_successfully": "Arbetsytan har skapats",
     "workspace_creation_description": "Organisera enkäter i arbetsytor för bättre åtkomstkontroll.",
     "workspace_id": "Arbetsyte-ID",
     "workspace_name": "Arbetsytans namn",
     "workspace_name_placeholder": "t.ex. Formbricks",
+    "workspace_not_found": "Arbetsyta hittades inte",
+    "workspace_permission_not_found": "Arbetsytebehörighet hittades inte",
     "workspaces": "Arbetsytor",
     "years": "år",
     "you": "Du",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "Nytt attribut ”{key}” med typen ”{dataType}” har skapats",
       "attributes_msg_userid_already_exists": "Användar-ID finns redan för denna miljö och uppdaterades inte.",
       "contact_deleted_successfully": "Kontakt borttagen",
+      "contact_not_found": "Ingen sådan kontakt hittades",
       "contacts_table_refresh": "Uppdatera kontakter",
       "contacts_table_refresh_success": "Kontakter uppdaterade",
       "create_attribute": "Skapa attribut",
@@ -850,16 +852,9 @@
         "created_by_third_party": "Skapad av tredje part",
         "discord_webhook_not_supported": "Discord-webhooks stöds för närvarande inte.",
         "empty_webhook_message": "Dina webhooks visas här så snart du lägger till dem. ⏲️",
-        "endpoint_bad_gateway_error": "Felaktig gateway (502): Proxy-/gatewayfel, tjänsten kan inte nås",
-        "endpoint_gateway_timeout_error": "Gateway-timeout (504): Gateway-timeout, tjänsten kan inte nås",
-        "endpoint_internal_server_error": "Internt serverfel (500): Tjänsten stötte på ett oväntat fel",
-        "endpoint_method_not_allowed_error": "Metoden tillåts inte (405): Endpointen finns, men accepterar inte POST-förfrågningar",
-        "endpoint_not_found_error": "Hittades inte (404): Endpointen finns inte",
         "endpoint_pinged": "Ja! Vi kan nå webhooken!",
         "endpoint_pinged_error": "Kunde inte nå webhooken!",
-        "endpoint_service_unavailable_error": "Tjänsten är inte tillgänglig (503): Tjänsten är tillfälligt nere",
         "learn_to_verify": "Lär dig hur du verifierar webhook-signaturer",
-        "no_triggers": "Inga utlösare",
         "please_check_console": "Vänligen kontrollera konsolen för mer information",
         "please_enter_a_url": "Vänligen ange en URL",
         "response_created": "Svar skapat",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "Anpassat värdnamn",
         "customize_survey_logo": "Anpassa undersökningens logotyp",
         "darken_or_lighten_background_of_your_choice": "Gör bakgrunden mörkare eller ljusare efter eget val.",
+        "date_format": "Datumformat",
         "days_before_showing_this_survey_again": "eller fler dagar måste gå mellan den senaste visade enkäten och att visa denna enkät.",
         "delete_anyways": "Ta bort ändå",
         "delete_block": "Ta bort block",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "Svarsgränsen måste överstiga antalet mottagna svar ({responseCount}).",
         "response_limits_redirections_and_more": "Svarsgränser, omdirigeringar och mer.",
         "response_options": "Svarsalternativ",
-        "reverse_order_occasionally": "Vänd ordning ibland",
-        "reverse_order_occasionally_except_last": "Vänd ordning ibland utom sista",
         "roundness": "Rundhet",
         "roundness_description": "Styr hur rundade hörnen är.",
         "row_used_in_logic_error": "Denna rad används i logiken för fråga {questionIndex}. Vänligen ta bort den från logiken först.",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "Visa enkät maximalt",
         "show_survey_to_users": "Visa enkät för % av användare",
         "show_to_x_percentage_of_targeted_users": "Visa för {percentage}% av målgruppens användare",
-        "shrink_preview": "Minimera förhandsgranskning",
         "simple": "Enkel",
         "six_points": "6 poäng",
         "smiley": "Smiley",
         "spam_protection_note": "Spamskydd fungerar inte för enkäter som visas med iOS, React Native och Android SDK:er. Det kommer att bryta enkäten.",
         "spam_protection_threshold_description": "Ställ in värde mellan 0 och 1, svar under detta värde kommer att avvisas.",
         "spam_protection_threshold_heading": "Svarströskel",
+        "shrink_preview": "Minimera förhandsgranskning",
         "star": "Stjärna",
         "starts_with": "Börjar med",
         "state": "Delstat",

apps/web/locales/zh-Hans-CN.json

@@ -167,7 +167,6 @@
     "connect": "连接",
     "connect_formbricks": "连接 Formbricks",
     "connected": "已连接",
-    "contact": "联系人",
     "contacts": "联系人",
     "continue": "继续",
     "copied": "已复制",
@@ -175,7 +174,6 @@
     "copy": "复制",
     "copy_code": "复制 代码",
     "copy_link": "复制 链接",
-    "copy_to_environment": "复制到{{environment}}",
     "count_attributes": "{count, plural, one {{count} 个属性} other {{count} 个属性}}",
     "count_contacts": "{count, plural, other {{count} 联系人} }",
     "count_members": "{count, plural, one {{count} 位成员} other {{count} 位成员}}",
@@ -220,6 +218,7 @@
     "enter_url": "输入 URL",
     "enterprise_license": "企业 许可证",
     "environment": "环境",
+    "environment_not_found": "环境 未找到",
     "environment_notice": "你 目前 位于 {environment} 环境。",
     "error": "错误",
     "error_component_description": "这个资源不存在或您没有权限访问它。",
@@ -256,13 +255,11 @@
     "inactive_surveys": "不 活跃 调查",
     "integration": "集成",
     "integrations": "集成",
-    "invalid_date_with_value": "无效 日期: {value}",
+    "invalid_date": "无效 日期",
     "invalid_file_name": "文件名无效，请重命名文件后重试",
     "invalid_file_type": "无效 的 文件 类型",
     "invite": "邀请",
     "invite_them": "邀请 他们",
-    "javascript_required": "需要启用 JavaScript",
-    "javascript_required_description": "Formbricks 需要 JavaScript 才能正常运行。请在浏览器设置中启用 JavaScript 以继续。",
     "key": "键",
     "label": "标签",
     "language": "语言",
@@ -283,7 +280,6 @@
     "marketing": "市场营销",
     "members": "成员",
     "members_and_teams": "成员和团队",
-    "membership": "会员资格",
     "membership_not_found": "未找到会员资格",
     "metadata": "元数据",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks 在 更大 的 屏幕 上 效果 最佳。 若 需要 管理 或 构建 调查， 请 切换 到 其他 设备。",
@@ -324,7 +320,9 @@
     "or": "或",
     "organization": "组织",
     "organization_id": "组织 ID",
+    "organization_not_found": "组织 未找到",
     "organization_settings": "组织 设置",
+    "organization_teams_not_found": "未找到 组织 团队",
     "other": "其他",
     "others": "其他",
     "overlay_color": "覆盖层颜色",
@@ -384,7 +382,6 @@
     "select": "选择",
     "select_all": "选择 全部",
     "select_filter": "选择过滤器",
-    "select_language": "选择语言",
     "select_survey": "选择 调查",
     "select_teams": "选择 团队",
     "selected": "已选择",
@@ -417,6 +414,7 @@
     "survey_id": "调查 ID",
     "survey_languages": "调查 语言",
     "survey_live": "调查 运行中",
+    "survey_not_found": "调查 未找到",
     "survey_paused": "调查 暂停。",
     "survey_type": "调查 类型",
     "surveys": "调查",
@@ -431,6 +429,7 @@
     "team_name": "团队 名称",
     "team_role": "团队角色",
     "teams": "团队",
+    "teams_not_found": "未找到 团队",
     "text": "文本",
     "time": "时间",
     "time_to_finish": "完成 时间",
@@ -454,6 +453,7 @@
     "url": "URL",
     "user": "用户",
     "user_id": "用户 ID",
+    "user_not_found": "用户 不存在",
     "variable": "变量",
     "variable_ids": "变量 ID",
     "variables": "变量",
@@ -469,13 +469,14 @@
     "weeks": "周",
     "welcome_card": "欢迎 卡片",
     "workflows": "工作流",
-    "workspace": "工作区",
     "workspace_configuration": "工作区配置",
     "workspace_created_successfully": "工作区创建成功",
     "workspace_creation_description": "在工作区中组织调查，以便更好地进行访问控制。",
     "workspace_id": "工作区 ID",
     "workspace_name": "工作区名称",
     "workspace_name_placeholder": "例如：Formbricks",
+    "workspace_not_found": "未找到工作区",
+    "workspace_permission_not_found": "未找到工作区权限",
     "workspaces": "工作区",
     "years": "年",
     "you": "你 ",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "已创建新属性“{key}”，类型为“{dataType}”",
       "attributes_msg_userid_already_exists": "该环境下的用户ID已存在，未进行更新。",
       "contact_deleted_successfully": "联系人 删除 成功",
+      "contact_not_found": "未找到此 联系人",
       "contacts_table_refresh": "刷新 联系人",
       "contacts_table_refresh_success": "联系人 已成功刷新",
       "create_attribute": "创建属性",
@@ -850,16 +852,9 @@
         "created_by_third_party": "由 第三方 创建",
         "discord_webhook_not_supported": "Discord webhooks 目前不 支持。",
         "empty_webhook_message": "您的 Webhooks 会在您 添加 后 出现在这里。 ⏲️",
-        "endpoint_bad_gateway_error": "错误网关 (502)：代理/网关错误，服务不可达",
-        "endpoint_gateway_timeout_error": "网关超时 (504)：网关超时，服务不可达",
-        "endpoint_internal_server_error": "内部服务器错误 (500)：服务遇到了意外错误",
-        "endpoint_method_not_allowed_error": "方法不被允许 (405)：该端点存在，但不接受 POST 请求",
-        "endpoint_not_found_error": "未找到 (404)：该端点不存在",
         "endpoint_pinged": "太好了! 我们能 ping 该 webhook!",
         "endpoint_pinged_error": "无法 ping 该 webhook！",
-        "endpoint_service_unavailable_error": "服务不可用 (503)：服务暂时不可用",
         "learn_to_verify": "了解如何验证 webhook 签名",
-        "no_triggers": "无触发器",
         "please_check_console": "请查看控制台以获取更多详情",
         "please_enter_a_url": "请输入一个 URL",
         "response_created": "创建 响应",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "自 定 义 主 机 名",
         "customize_survey_logo": "自定义调查 logo",
         "darken_or_lighten_background_of_your_choice": "根据 您 的 选择 暗化 或 亮化 背景。",
+        "date_format": "日期格式",
         "days_before_showing_this_survey_again": "距离上次显示问卷后需间隔不少于指定天数，才能再次显示此问卷。",
         "delete_anyways": "仍然删除",
         "delete_block": "删除区块",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "限制 响应 需要 超过 收到 的 响应 数量 （{responseCount}）。",
         "response_limits_redirections_and_more": "响应 限制 、 重定向 和 更多 。",
         "response_options": "响应 选项",
-        "reverse_order_occasionally": "偶尔反转顺序",
-        "reverse_order_occasionally_except_last": "偶尔反转顺序（最后一项除外）",
         "roundness": "圆度",
         "roundness_description": "控制圆角的弧度。",
         "row_used_in_logic_error": "\"这个 行 在 问题 {questionIndex} 的 逻辑 中 使用。请 先 从 逻辑 中 删除 它。\"",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "显示 调查 最大 一次",
         "show_survey_to_users": "显示 问卷 给 % 的 用户",
         "show_to_x_percentage_of_targeted_users": "显示 给 {percentage}% 的 目标 用户",
-        "shrink_preview": "收起预览",
         "simple": "简单",
         "six_points": "6 分",
         "smiley": "笑脸",
         "spam_protection_note": "垃圾 邮件 保护 对于 与 iOS 、 React Native 和 Android SDK 一起 显示 的 调查 无效 。 它 将 破坏 调查。",
         "spam_protection_threshold_description": "设置 值 在 0 和 1 之间，响应 低于 此 值 将 被 拒绝。",
         "spam_protection_threshold_heading": "响应 阈值",
+        "shrink_preview": "收起预览",
         "star": "星",
         "starts_with": "以...开始",
         "state": "状态",

apps/web/locales/zh-Hant-TW.json

@@ -167,7 +167,6 @@
     "connect": "連線",
     "connect_formbricks": "連線 Formbricks",
     "connected": "已連線",
-    "contact": "聯絡人",
     "contacts": "聯絡人",
     "continue": "繼續",
     "copied": "已 複製",
@@ -175,7 +174,6 @@
     "copy": "複製",
     "copy_code": "複製程式碼",
     "copy_link": "複製連結",
-    "copy_to_environment": "複製到{{environment}}",
     "count_attributes": "{count, plural, other {{count} 個屬性}}",
     "count_contacts": "{count, plural, other {{count} 位聯絡人}}",
     "count_members": "{count, plural, other {{count} 位成員}}",
@@ -220,6 +218,7 @@
     "enter_url": "輸入 URL",
     "enterprise_license": "企業授權",
     "environment": "環境",
+    "environment_not_found": "找不到環境",
     "environment_notice": "您目前在 '{'environment'}' 環境中。",
     "error": "錯誤",
     "error_component_description": "此資源不存在或您沒有存取權限。",
@@ -256,13 +255,11 @@
     "inactive_surveys": "停用中的問卷",
     "integration": "整合",
     "integrations": "整合",
-    "invalid_date_with_value": "無效日期: {value}",
+    "invalid_date": "無效日期",
     "invalid_file_name": "檔案名稱無效，請重新命名檔案後再試一次",
     "invalid_file_type": "無效的檔案類型",
     "invite": "邀請",
     "invite_them": "邀請他們",
-    "javascript_required": "需要 JavaScript",
-    "javascript_required_description": "Formbricks 需要 JavaScript 才能正常運作。請在瀏覽器設定中啟用 JavaScript 以繼續使用。",
     "key": "金鑰",
     "label": "標籤",
     "language": "語言",
@@ -283,7 +280,6 @@
     "marketing": "行銷",
     "members": "成員",
     "members_and_teams": "成員與團隊",
-    "membership": "會員資格",
     "membership_not_found": "找不到成員資格",
     "metadata": "元數據",
     "mobile_overlay_app_works_best_on_desktop": "Formbricks 適合在大螢幕上使用。若要管理或建立問卷，請切換到其他裝置。",
@@ -324,7 +320,9 @@
     "or": "或",
     "organization": "組織",
     "organization_id": "組織 ID",
+    "organization_not_found": "找不到組織",
     "organization_settings": "組織設定",
+    "organization_teams_not_found": "找不到組織團隊",
     "other": "其他",
     "others": "其他",
     "overlay_color": "覆蓋層顏色",
@@ -384,7 +382,6 @@
     "select": "選擇",
     "select_all": "全選",
     "select_filter": "選擇篩選器",
-    "select_language": "選擇語言",
     "select_survey": "選擇問卷",
     "select_teams": "選擇 團隊",
     "selected": "已選取",
@@ -417,6 +414,7 @@
     "survey_id": "問卷 ID",
     "survey_languages": "問卷語言",
     "survey_live": "問卷已上線",
+    "survey_not_found": "找不到問卷",
     "survey_paused": "問卷已暫停。",
     "survey_type": "問卷類型",
     "surveys": "問卷",
@@ -431,6 +429,7 @@
     "team_name": "團隊名稱",
     "team_role": "團隊角色",
     "teams": "團隊",
+    "teams_not_found": "找不到團隊",
     "text": "文字",
     "time": "時間",
     "time_to_finish": "完成時間",
@@ -454,6 +453,7 @@
     "url": "網址",
     "user": "使用者",
     "user_id": "使用者 ID",
+    "user_not_found": "找不到使用者",
     "variable": "變數",
     "variable_ids": "變數 ID",
     "variables": "變數",
@@ -469,13 +469,14 @@
     "weeks": "週",
     "welcome_card": "歡迎卡片",
     "workflows": "工作流程",
-    "workspace": "工作區",
     "workspace_configuration": "工作區設定",
     "workspace_created_successfully": "工作區已成功建立",
     "workspace_creation_description": "將問卷組織在工作區中，以便更好地控管存取權限。",
     "workspace_id": "工作區 ID",
     "workspace_name": "工作區名稱",
     "workspace_name_placeholder": "例如：Formbricks",
+    "workspace_not_found": "找不到工作區",
+    "workspace_permission_not_found": "找不到工作區權限",
     "workspaces": "工作區",
     "years": "年",
     "you": "您",
@@ -660,6 +661,7 @@
       "attributes_msg_new_attribute_created": "已建立新屬性「{key}」，型別為「{dataType}」",
       "attributes_msg_userid_already_exists": "此環境已存在該使用者 ID，未進行更新。",
       "contact_deleted_successfully": "聯絡人已成功刪除",
+      "contact_not_found": "找不到此聯絡人",
       "contacts_table_refresh": "重新整理聯絡人",
       "contacts_table_refresh_success": "聯絡人已成功重新整理",
       "create_attribute": "建立屬性",
@@ -850,16 +852,9 @@
         "created_by_third_party": "由第三方建立",
         "discord_webhook_not_supported": "目前不支援 Discord webhooks。",
         "empty_webhook_message": "您的 Webhook 將在您新增後立即顯示在此處。⏲️",
-        "endpoint_bad_gateway_error": "錯誤的閘道 (502)：代理/閘道錯誤，服務無法連線",
-        "endpoint_gateway_timeout_error": "閘道逾時 (504)：閘道逾時，服務無法連線",
-        "endpoint_internal_server_error": "內部伺服器錯誤 (500)：服務遇到了未預期的錯誤",
-        "endpoint_method_not_allowed_error": "不允許的方法 (405)：該端點存在，但不接受 POST 請求",
-        "endpoint_not_found_error": "找不到 (404)：該端點不存在",
         "endpoint_pinged": "耶！我們能夠 ping Webhook！",
         "endpoint_pinged_error": "無法 ping Webhook！",
-        "endpoint_service_unavailable_error": "服務無法使用 (503)：服務暫時無法使用",
         "learn_to_verify": "了解如何驗證 webhook 簽章",
-        "no_triggers": "無觸發條件",
         "please_check_console": "請檢查主控台以取得更多詳細資料",
         "please_enter_a_url": "請輸入網址",
         "response_created": "已建立回應",
@@ -1418,6 +1413,7 @@
         "custom_hostname": "自訂主機名稱",
         "customize_survey_logo": "自訂問卷標誌",
         "darken_or_lighten_background_of_your_choice": "變暗或變亮您選擇的背景。",
+        "date_format": "日期格式",
         "days_before_showing_this_survey_again": "距離上次顯示問卷後，需間隔指定天數才能再次顯示此問卷。",
         "delete_anyways": "仍要刪除",
         "delete_block": "刪除區塊",
@@ -1681,8 +1677,6 @@
         "response_limit_needs_to_exceed_number_of_received_responses": "回應限制必須超過收到的回應數 ('{'responseCount'}')。",
         "response_limits_redirections_and_more": "回應限制、重新導向等。",
         "response_options": "回應選項",
-        "reverse_order_occasionally": "偶爾反轉順序",
-        "reverse_order_occasionally_except_last": "偶爾反轉順序（最後一項除外）",
         "roundness": "圓角",
         "roundness_description": "調整邊角的圓潤程度。",
         "row_used_in_logic_error": "此 row 用於問題 '{'questionIndex'}' 的邏輯中。請先從邏輯中移除。",
@@ -1711,13 +1705,13 @@
         "show_survey_maximum_of": "最多顯示問卷",
         "show_survey_to_users": "將問卷顯示給 % 的使用者",
         "show_to_x_percentage_of_targeted_users": "顯示給 '{'percentage'}'% 的目標使用者",
-        "shrink_preview": "收合預覽",
         "simple": "簡單",
         "six_points": "6 分",
         "smiley": "表情符號",
         "spam_protection_note": "垃圾郵件保護不適用於使用 iOS、React Native 和 Android SDK 顯示的問卷。它會破壞問卷。",
         "spam_protection_threshold_description": "設置值在 0 和 1 之間，低於此值的回應將被拒絕。",
         "spam_protection_threshold_heading": "回應閾值",
+        "shrink_preview": "收合預覽",
         "star": "星形",
         "starts_with": "開頭為",
         "state": "州/省",

apps/web/modules/analysis/components/ShareSurveyLink/components/LanguageDropdown.tsx

@@ -1,5 +1,4 @@
 import { Languages } from "lucide-react";
-import { useTranslation } from "react-i18next";
 import { getLanguageLabel } from "@formbricks/i18n-utils/src/utils";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";
@@ -19,7 +18,6 @@ interface LanguageDropdownProps {
 }
 
 export const LanguageDropdown = ({ survey, setLanguage, locale }: LanguageDropdownProps) => {
-  const { t } = useTranslation();
   const enabledLanguages = getEnabledLanguages(survey.languages ?? []);
 
   if (enabledLanguages.length <= 1) {
@@ -29,10 +27,7 @@ export const LanguageDropdown = ({ survey, setLanguage, locale }: LanguageDropdo
   return (
     <DropdownMenu>
       <DropdownMenuTrigger asChild>
-        <Button
-          variant="secondary"
-          title={t("common.select_language")}
-          aria-label={t("common.select_language")}>
+        <Button variant="secondary" title="Select Language" aria-label="Select Language">
           <Languages className="h-5 w-5" />
         </Button>
       </DropdownMenuTrigger>

apps/web/modules/analysis/components/SingleResponseCard/actions.ts

@@ -2,7 +2,6 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { deleteResponse, getResponse } from "@/lib/response/service";
 import { createTag } from "@/lib/tag/service";
 import { addTagToRespone, deleteTagOnResponse } from "@/lib/tagOnResponse/service";
@@ -69,7 +68,7 @@ export const createTagToResponseAction = authenticatedActionClient
       const tagEnvironment = await getTag(parsedInput.tagId);
 
       if (!responseEnvironmentId || !tagEnvironment) {
-        throw new ResourceNotFoundError("Environment", null);
+        throw new Error("Environment not found");
       }
 
       if (responseEnvironmentId !== tagEnvironment.environmentId) {
@@ -114,7 +113,7 @@ export const deleteTagOnResponseAction = authenticatedActionClient
       const tagEnvironment = await getTag(parsedInput.tagId);
       const organizationId = await getOrganizationIdFromResponseId(parsedInput.responseId);
       if (!responseEnvironmentId || !tagEnvironment) {
-        throw new ResourceNotFoundError("Environment", null);
+        throw new Error("Environment not found");
       }
 
       if (responseEnvironmentId !== tagEnvironment.environmentId) {

apps/web/modules/auth/components/next-auth-provider.tsx

@@ -1,15 +0,0 @@
-"use client";
-
-import { SessionProvider } from "next-auth/react";
-
-interface NextAuthProviderProps {
-  children: React.ReactNode;
-  sessionMaxAge: number;
-}
-
-export const NextAuthProvider = ({ children, sessionMaxAge }: NextAuthProviderProps) => {
-  // Refresh at 1/3 of session max age, capped at 5 minutes
-  const refetchInterval = Math.min(Math.max(Math.floor(sessionMaxAge / 3), 60), 300);
-
-  return <SessionProvider refetchInterval={refetchInterval}>{children}</SessionProvider>;
-};

apps/web/modules/auth/lib/authOptions.test.ts

@@ -3,14 +3,11 @@ import { Provider } from "next-auth/providers/index";
 import { afterEach, describe, expect, test, vi } from "vitest";
 import { prisma } from "@formbricks/database";
 import { EMAIL_VERIFICATION_DISABLED } from "@/lib/constants";
-import {
-  applyPublicIpRateLimit,
-  publicEdgeRateLimitPolicies,
-} from "@/modules/core/rate-limit/public-edge-rate-limit";
+// Import mocked rate limiting functions
+import { applyIPRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { authOptions } from "./authOptions";
 import { mockUser } from "./mock-data";
-import { getUserByEmail } from "./user";
 import { hashPassword } from "./utils";
 
 // Mock encryption utilities
@@ -22,48 +19,11 @@ vi.mock("@/lib/encryption", () => ({
 // Mock JWT
 vi.mock("@/lib/jwt");
 
-vi.mock("@/modules/core/rate-limit/public-edge-rate-limit", () => ({
-  applyPublicIpRateLimit: vi.fn(),
-  publicEdgeRateLimitPolicies: {
-    authLogin: "auth.login",
-    authVerifyEmail: "auth.verify_email",
-  },
+// Mock rate limiting dependencies
+vi.mock("@/modules/core/rate-limit/helpers", () => ({
+  applyIPRateLimit: vi.fn(),
 }));
 
-vi.mock("./user", () => ({
-  getUserByEmail: vi.fn(),
-  updateUser: vi.fn(),
-  updateUserLastLoginAt: vi.fn(),
-}));
-
-vi.mock("./brevo", () => ({
-  createBrevoCustomer: vi.fn(),
-}));
-
-vi.mock("@/modules/ee/sso/lib/providers", () => ({
-  getSSOProviders: vi.fn(() => []),
-}));
-
-vi.mock("@/modules/ee/sso/lib/sso-handlers", () => ({
-  handleSsoCallback: vi.fn(),
-}));
-
-vi.mock("@/modules/ee/audit-logs/lib/handler", () => ({
-  queueAuditEventBackground: vi.fn(),
-}));
-
-vi.mock("@/modules/ee/audit-logs/types/audit-log", () => ({
-  UNKNOWN_DATA: "unknown",
-}));
-
-vi.mock("./utils", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("./utils")>();
-  return {
-    ...actual,
-    shouldLogAuthFailure: vi.fn().mockResolvedValue(false),
-  };
-});
-
 vi.mock("@/modules/core/rate-limit/rate-limit-configs", () => ({
   rateLimitConfigs: {
     auth: {
@@ -73,22 +33,26 @@ vi.mock("@/modules/core/rate-limit/rate-limit-configs", () => ({
   },
 }));
 
-vi.mock("@/lib/constants", () => ({
-  EMAIL_VERIFICATION_DISABLED: false,
-  EDGE_RATE_LIMIT_PROVIDER: "none",
-  SESSION_MAX_AGE: 86400,
-  NEXTAUTH_SECRET: "test-secret",
-  WEBAPP_URL: "http://localhost:3000",
-  ENCRYPTION_KEY: "12345678901234567890123456789012", // 32 bytes for AES-256
-  REDIS_URL: undefined,
-  AUDIT_LOG_ENABLED: false,
-  AUDIT_LOG_GET_USER_IP: false,
-  ENTERPRISE_LICENSE_KEY: undefined,
-  SENTRY_DSN: undefined,
-  BREVO_API_KEY: undefined,
-  RATE_LIMITING_DISABLED: false,
-  CONTROL_HASH: "$2b$12$fzHf9le13Ss9UJ04xzmsjODXpFJxz6vsnupoepF5FiqDECkX2BH5q",
-}));
+// Mock constants that this test needs while preserving untouched exports.
+vi.mock("@/lib/constants", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/constants")>();
+  return {
+    ...actual,
+    EMAIL_VERIFICATION_DISABLED: false,
+    SESSION_MAX_AGE: 86400,
+    NEXTAUTH_SECRET: "test-secret",
+    WEBAPP_URL: "http://localhost:3000",
+    ENCRYPTION_KEY: "12345678901234567890123456789012", // 32 bytes for AES-256
+    REDIS_URL: undefined,
+    AUDIT_LOG_ENABLED: false,
+    AUDIT_LOG_GET_USER_IP: false,
+    ENTERPRISE_LICENSE_KEY: undefined,
+    SENTRY_DSN: undefined,
+    BREVO_API_KEY: undefined,
+    RATE_LIMITING_DISABLED: false,
+    CONTROL_HASH: "$2b$12$fzHf9le13Ss9UJ04xzmsjODXpFJxz6vsnupoepF5FiqDECkX2BH5q",
+  };
+});
 
 // Mock next/headers
 vi.mock("next/headers", () => ({
@@ -150,7 +114,7 @@ describe("authOptions", () => {
     });
 
     test("should throw error if user not found", async () => {
-      vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+      vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
       vi.spyOn(prisma.user, "findUnique").mockResolvedValue(null);
 
       const credentials = { email: mockUser.email, password: mockPassword };
@@ -161,7 +125,7 @@ describe("authOptions", () => {
     });
 
     test("should throw error if user has no password stored", async () => {
-      vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+      vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
       vi.spyOn(prisma.user, "findUnique").mockResolvedValue({
         id: mockUser.id,
         email: mockUser.email,
@@ -176,7 +140,7 @@ describe("authOptions", () => {
     });
 
     test("should throw error if password verification fails", async () => {
-      vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+      vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
       vi.spyOn(prisma.user, "findUnique").mockResolvedValue({
         id: mockUserId,
         email: mockUser.email,
@@ -191,7 +155,7 @@ describe("authOptions", () => {
     });
 
     test("should successfully login when credentials are valid", async () => {
-      vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+      vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
       const fakeUser = {
         id: mockUserId,
         email: mockUser.email,
@@ -214,7 +178,7 @@ describe("authOptions", () => {
 
     describe("Rate Limiting", () => {
       test("should apply rate limiting before credential validation", async () => {
-        vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+        vi.mocked(applyIPRateLimit).mockResolvedValue();
         vi.spyOn(prisma.user, "findUnique").mockResolvedValue({
           id: mockUserId,
           email: mockUser.email,
@@ -227,15 +191,12 @@ describe("authOptions", () => {
 
         await credentialsProvider.options.authorize(credentials, {});
 
-        expect(applyPublicIpRateLimit).toHaveBeenCalledWith(
-          publicEdgeRateLimitPolicies.authLogin,
-          rateLimitConfigs.auth.login
-        );
-        expect(applyPublicIpRateLimit).toHaveBeenCalledBefore(prisma.user.findUnique as any);
+        expect(applyIPRateLimit).toHaveBeenCalledWith(rateLimitConfigs.auth.login);
+        expect(applyIPRateLimit).toHaveBeenCalledBefore(prisma.user.findUnique as any);
       });
 
       test("should block login when rate limit exceeded", async () => {
-        vi.mocked(applyPublicIpRateLimit).mockRejectedValue(
+        vi.mocked(applyIPRateLimit).mockRejectedValue(
           new Error("Maximum number of requests reached. Please try again later.")
         );
         const findUniqueSpy = vi.spyOn(prisma.user, "findUnique");
@@ -250,7 +211,7 @@ describe("authOptions", () => {
       });
 
       test("should use correct rate limit configuration", async () => {
-        vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+        vi.mocked(applyIPRateLimit).mockResolvedValue();
         vi.spyOn(prisma.user, "findUnique").mockResolvedValue({
           id: mockUserId,
           email: mockUser.email,
@@ -263,7 +224,7 @@ describe("authOptions", () => {
 
         await credentialsProvider.options.authorize(credentials, {});
 
-        expect(applyPublicIpRateLimit).toHaveBeenCalledWith(publicEdgeRateLimitPolicies.authLogin, {
+        expect(applyIPRateLimit).toHaveBeenCalledWith({
           interval: 900,
           allowedPerInterval: 30,
           namespace: "auth:login",
@@ -273,7 +234,7 @@ describe("authOptions", () => {
 
     describe("Two-Factor Backup Code login", () => {
       test("should throw error if backup codes are missing", async () => {
-        vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+        vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
         const mockUser = {
           id: mockUserId,
           email: "2fa@example.com",
@@ -302,7 +263,7 @@ describe("authOptions", () => {
     });
 
     test("should throw error if token is invalid or user not found", async () => {
-      vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+      vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
       const credentials = { token: "badtoken" };
 
       await expect(tokenProvider.options.authorize(credentials, {})).rejects.toThrow(
@@ -312,20 +273,17 @@ describe("authOptions", () => {
 
     describe("Rate Limiting", () => {
       test("should apply rate limiting before token verification", async () => {
-        vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+        vi.mocked(applyIPRateLimit).mockResolvedValue();
 
         const credentials = { token: "sometoken" };
 
         await expect(tokenProvider.options.authorize(credentials, {})).rejects.toThrow();
 
-        expect(applyPublicIpRateLimit).toHaveBeenCalledWith(
-          publicEdgeRateLimitPolicies.authVerifyEmail,
-          rateLimitConfigs.auth.verifyEmail
-        );
+        expect(applyIPRateLimit).toHaveBeenCalledWith(rateLimitConfigs.auth.verifyEmail);
       });
 
       test("should block verification when rate limit exceeded", async () => {
-        vi.mocked(applyPublicIpRateLimit).mockRejectedValue(
+        vi.mocked(applyIPRateLimit).mockRejectedValue(
           new Error("Maximum number of requests reached. Please try again later.")
         );
         const findUniqueSpy = vi.spyOn(prisma.user, "findUnique");
@@ -344,7 +302,7 @@ describe("authOptions", () => {
   describe("Callbacks", () => {
     describe("jwt callback", () => {
       test("should add profile information to token if user is found", async () => {
-        vi.mocked(getUserByEmail).mockResolvedValue({
+        vi.spyOn(prisma.user, "findFirst").mockResolvedValue({
           id: mockUser.id,
           locale: mockUser.locale,
           email: mockUser.email,
@@ -363,7 +321,7 @@ describe("authOptions", () => {
       });
 
       test("should return token unchanged if no existing user is found", async () => {
-        vi.mocked(getUserByEmail).mockResolvedValue(null);
+        vi.spyOn(prisma.user, "findFirst").mockResolvedValue(null);
 
         const token = { email: "nonexistent@example.com" };
         if (!authOptions.callbacks?.jwt) {
@@ -408,7 +366,7 @@ describe("authOptions", () => {
     const credentialsProvider = getProviderById("credentials");
 
     test("should throw error if TOTP code is missing when 2FA is enabled", async () => {
-      vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+      vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
       const mockUser = {
         id: mockUserId,
         email: "2fa@example.com",
@@ -426,7 +384,7 @@ describe("authOptions", () => {
     });
 
     test("should throw error if two factor secret is missing", async () => {
-      vi.mocked(applyPublicIpRateLimit).mockResolvedValue("app");
+      vi.mocked(applyIPRateLimit).mockResolvedValue(); // Rate limiting passes
       const mockUser = {
         id: mockUserId,
         email: "2fa@example.com",

apps/web/modules/auth/lib/authOptions.ts

@@ -23,10 +23,7 @@ import {
   shouldLogAuthFailure,
   verifyPassword,
 } from "@/modules/auth/lib/utils";
-import {
-  applyPublicIpRateLimit,
-  publicEdgeRateLimitPolicies,
-} from "@/modules/core/rate-limit/public-edge-rate-limit";
+import { applyIPRateLimit } from "@/modules/core/rate-limit/helpers";
 import { rateLimitConfigs } from "@/modules/core/rate-limit/rate-limit-configs";
 import { UNKNOWN_DATA } from "@/modules/ee/audit-logs/types/audit-log";
 import { getSSOProviders } from "@/modules/ee/sso/lib/providers";
@@ -58,7 +55,7 @@ export const authOptions: NextAuthOptions = {
         backupCode: { label: "Backup Code", type: "input", placeholder: "Two-factor backup code" },
       },
       async authorize(credentials, _req) {
-        await applyPublicIpRateLimit(publicEdgeRateLimitPolicies.authLogin, rateLimitConfigs.auth.login);
+        await applyIPRateLimit(rateLimitConfigs.auth.login);
 
         // Use email for rate limiting when available, fall back to "unknown_user" for credential validation
         const identifier = credentials?.email || "unknown_user"; // NOSONAR // We want to check for empty strings
@@ -248,10 +245,7 @@ export const authOptions: NextAuthOptions = {
         },
       },
       async authorize(credentials, _req) {
-        await applyPublicIpRateLimit(
-          publicEdgeRateLimitPolicies.authVerifyEmail,
-          rateLimitConfigs.auth.verifyEmail
-        );
+        await applyIPRateLimit(rateLimitConfigs.auth.verifyEmail);
 
         // For token verification, we can't rate limit effectively by token (single-use)
         // So we use a generic identifier for token abuse attempts

apps/web/modules/core/rate-limit/helpers.test.ts

@@ -84,7 +84,7 @@ describe("helpers", () => {
     test("should allow request when rate limit check passes", async () => {
       (checkRateLimit as any).mockResolvedValue(ok({ allowed: true }));
 
-      await expect(applyRateLimit(mockConfig, mockIdentifier)).resolves.toEqual({ allowed: true });
+      await expect(applyRateLimit(mockConfig, mockIdentifier)).resolves.toBeUndefined();
 
       expect(checkRateLimit).toHaveBeenCalledWith(mockConfig, mockIdentifier);
     });
@@ -127,7 +127,7 @@ describe("helpers", () => {
 
       (checkRateLimit as any).mockResolvedValue(ok({ allowed: true }));
 
-      await expect(applyRateLimit(customConfig, "api-key-identifier")).resolves.toEqual({ allowed: true });
+      await expect(applyRateLimit(customConfig, "api-key-identifier")).resolves.toBeUndefined();
 
       expect(checkRateLimit).toHaveBeenCalledWith(customConfig, "api-key-identifier");
     });
@@ -138,7 +138,7 @@ describe("helpers", () => {
       const identifiers = ["user-123", "ip-192.168.1.1", "auth-login-hashedip", "api-key-abc123"];
 
       for (const identifier of identifiers) {
-        await expect(applyRateLimit(mockConfig, identifier)).resolves.toEqual({ allowed: true });
+        await expect(applyRateLimit(mockConfig, identifier)).resolves.toBeUndefined();
         expect(checkRateLimit).toHaveBeenCalledWith(mockConfig, identifier);
       }
 
@@ -161,7 +161,7 @@ describe("helpers", () => {
       (hashString as any).mockReturnValue("hashed-ip-123");
       (checkRateLimit as any).mockResolvedValue(ok({ allowed: true }));
 
-      await expect(applyIPRateLimit(mockConfig)).resolves.toEqual({ allowed: true });
+      await expect(applyIPRateLimit(mockConfig)).resolves.toBeUndefined();
 
       expect(getClientIpFromHeaders).toHaveBeenCalledTimes(1);
       expect(hashString).toHaveBeenCalledWith("192.168.1.1");

apps/web/modules/core/rate-limit/helpers.ts

@@ -3,7 +3,7 @@ import { TooManyRequestsError } from "@formbricks/types/errors";
 import { hashString } from "@/lib/hash-string";
 import { getClientIpFromHeaders } from "@/lib/utils/client-ip";
 import { checkRateLimit } from "./rate-limit";
-import { type TRateLimitConfig, type TRateLimitResponse } from "./types/rate-limit";
+import { type TRateLimitConfig } from "./types/rate-limit";
 
 /**
  * Get client identifier for rate limiting with IP hashing
@@ -31,20 +31,12 @@ export const getClientIdentifier = async (): Promise<string> => {
  * @param identifier - Unique identifier for rate limiting (IP hash, user ID, API key, etc.)
  * @throws {Error} When rate limit is exceeded or rate limiting system fails
  */
-export const applyRateLimit = async (
-  config: TRateLimitConfig,
-  identifier: string
-): Promise<TRateLimitResponse> => {
+export const applyRateLimit = async (config: TRateLimitConfig, identifier: string): Promise<void> => {
   const result = await checkRateLimit(config, identifier);
 
   if (!result.ok || !result.data.allowed) {
-    throw new TooManyRequestsError(
-      "Maximum number of requests reached. Please try again later.",
-      result.ok ? result.data.retryAfter : undefined
-    );
+    throw new TooManyRequestsError("Maximum number of requests reached. Please try again later.");
   }
-
-  return result.data;
 };
 
 /**
@@ -54,7 +46,7 @@ export const applyRateLimit = async (
  * @param config - Rate limit configuration to apply
  * @throws {Error} When rate limit is exceeded or IP hashing fails
  */
-export const applyIPRateLimit = async (config: TRateLimitConfig): Promise<TRateLimitResponse> => {
+export const applyIPRateLimit = async (config: TRateLimitConfig): Promise<void> => {
   const identifier = await getClientIdentifier();
-  return await applyRateLimit(config, identifier);
+  await applyRateLimit(config, identifier);
 };

apps/web/modules/core/rate-limit/public-edge-rate-limit.test.ts

@@ -1,142 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-import { applyIPRateLimit } from "./helpers";
-import {
-  applyPublicIpRateLimit,
-  applyPublicIpRateLimitForRoute,
-  getEdgeRateLimitProvider,
-  getPublicEdgeRateLimitPolicyId,
-  isPublicEdgeRateLimitManaged,
-  publicEdgeRateLimitPolicies,
-} from "./public-edge-rate-limit";
-
-vi.mock("./helpers", () => ({
-  applyIPRateLimit: vi.fn(),
-}));
-
-const mockConfig = {
-  interval: 60,
-  allowedPerInterval: 100,
-  namespace: "api:client",
-};
-
-describe("public-edge-rate-limit", () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  describe("getEdgeRateLimitProvider", () => {
-    test("falls back to none for unknown providers", () => {
-      expect(getEdgeRateLimitProvider(undefined)).toBe("none");
-      expect(getEdgeRateLimitProvider("unknown")).toBe("none");
-    });
-
-    test("accepts configured providers", () => {
-      expect(getEdgeRateLimitProvider("cloudflare")).toBe("cloudflare");
-      expect(getEdgeRateLimitProvider("cloudarmor")).toBe("cloudarmor");
-      expect(getEdgeRateLimitProvider("envoy")).toBe("envoy");
-    });
-  });
-
-  describe("getPublicEdgeRateLimitPolicyId", () => {
-    test("classifies auth callback routes", () => {
-      expect(getPublicEdgeRateLimitPolicyId("/api/auth/callback/credentials", "POST")).toBe(
-        publicEdgeRateLimitPolicies.authLogin
-      );
-      expect(getPublicEdgeRateLimitPolicyId("/api/auth/callback/token", "POST")).toBe(
-        publicEdgeRateLimitPolicies.authVerifyEmail
-      );
-    });
-
-    test("classifies v1 client routes", () => {
-      expect(getPublicEdgeRateLimitPolicyId("/api/v1/client/env_123/environment", "GET")).toBe(
-        publicEdgeRateLimitPolicies.v1ClientDefault
-      );
-      expect(getPublicEdgeRateLimitPolicyId("/api/v1/client/env_123/storage", "POST")).toBe(
-        publicEdgeRateLimitPolicies.v1ClientStorageUpload
-      );
-      expect(getPublicEdgeRateLimitPolicyId("/api/v1/client/og", "GET")).toBeNull();
-      expect(getPublicEdgeRateLimitPolicyId("/api/v1/client/og/image", "GET")).toBeNull();
-      expect(getPublicEdgeRateLimitPolicyId("/api/v1/client/og-image", "GET")).toBe(
-        publicEdgeRateLimitPolicies.v1ClientDefault
-      );
-    });
-
-    test("classifies v2 public write routes", () => {
-      expect(getPublicEdgeRateLimitPolicyId("/api/v2/client/env_123/responses", "POST")).toBe(
-        publicEdgeRateLimitPolicies.v2ClientResponses
-      );
-      expect(getPublicEdgeRateLimitPolicyId("/api/v2/client/env_123/responses/resp_123", "PUT")).toBe(
-        publicEdgeRateLimitPolicies.v2ClientResponses
-      );
-      expect(getPublicEdgeRateLimitPolicyId("/api/v2/client/env_123/displays", "POST")).toBe(
-        publicEdgeRateLimitPolicies.v2ClientDisplays
-      );
-      expect(getPublicEdgeRateLimitPolicyId("/api/v2/client/env_123/storage", "POST")).toBe(
-        publicEdgeRateLimitPolicies.v2ClientStorageUpload
-      );
-    });
-  });
-
-  describe("isPublicEdgeRateLimitManaged", () => {
-    test("manages public policies on cloudflare and cloudarmor only", () => {
-      expect(isPublicEdgeRateLimitManaged(publicEdgeRateLimitPolicies.authLogin, "cloudflare")).toBe(true);
-      expect(isPublicEdgeRateLimitManaged(publicEdgeRateLimitPolicies.authLogin, "cloudarmor")).toBe(true);
-      expect(isPublicEdgeRateLimitManaged(publicEdgeRateLimitPolicies.authLogin, "none")).toBe(false);
-      expect(isPublicEdgeRateLimitManaged(publicEdgeRateLimitPolicies.authLogin, "envoy")).toBe(false);
-    });
-  });
-
-  describe("applyPublicIpRateLimit", () => {
-    test("uses app rate limiting when no edge provider manages the policy", async () => {
-      vi.mocked(applyIPRateLimit).mockResolvedValue({ allowed: true });
-
-      const source = await applyPublicIpRateLimit(
-        publicEdgeRateLimitPolicies.v2ClientResponses,
-        mockConfig,
-        "none"
-      );
-
-      expect(source).toBe("app");
-      expect(applyIPRateLimit).toHaveBeenCalledWith(mockConfig);
-    });
-
-    test("skips app rate limiting when the edge provider manages the policy", async () => {
-      const source = await applyPublicIpRateLimit(
-        publicEdgeRateLimitPolicies.v2ClientResponses,
-        mockConfig,
-        "cloudflare"
-      );
-
-      expect(source).toBe("edge");
-      expect(applyIPRateLimit).not.toHaveBeenCalled();
-    });
-  });
-
-  describe("applyPublicIpRateLimitForRoute", () => {
-    test("uses the route classifier for managed public routes", async () => {
-      const source = await applyPublicIpRateLimitForRoute(
-        "/api/v2/client/env_123/displays",
-        "POST",
-        mockConfig,
-        "cloudarmor"
-      );
-
-      expect(source).toBe("edge");
-      expect(applyIPRateLimit).not.toHaveBeenCalled();
-    });
-
-    test("falls back to app rate limiting for unmanaged routes", async () => {
-      vi.mocked(applyIPRateLimit).mockResolvedValue({ allowed: true });
-
-      const source = await applyPublicIpRateLimitForRoute(
-        "/api/v1/client/env_123/environment",
-        "GET",
-        mockConfig,
-        "envoy"
-      );
-
-      expect(source).toBe("app");
-      expect(applyIPRateLimit).toHaveBeenCalledWith(mockConfig);
-    });
-  });
-});

apps/web/modules/core/rate-limit/public-edge-rate-limit.ts

@@ -1,135 +0,0 @@
-import { EDGE_RATE_LIMIT_PROVIDER } from "@/lib/constants";
-import { applyIPRateLimit } from "./helpers";
-import { TRateLimitConfig } from "./types/rate-limit";
-
-export const publicEdgeRateLimitPolicies = {
-  authLogin: "auth.login",
-  authVerifyEmail: "auth.verify_email",
-  v1ClientDefault: "client.v1.default",
-  v1ClientStorageUpload: "client.storage.upload.v1",
-  v2ClientResponses: "client.responses.v2",
-  v2ClientDisplays: "client.displays.v2",
-  v2ClientStorageUpload: "client.storage.upload.v2",
-} as const;
-
-export type TPublicEdgeRateLimitPolicyId =
-  (typeof publicEdgeRateLimitPolicies)[keyof typeof publicEdgeRateLimitPolicies];
-
-export type TEdgeRateLimitProvider = "none" | "cloudflare" | "cloudarmor" | "envoy";
-
-const managedPublicEdgePolicies = Object.values(
-  publicEdgeRateLimitPolicies
-) as TPublicEdgeRateLimitPolicyId[];
-
-const managedPublicEdgePoliciesByProvider: Record<
-  TEdgeRateLimitProvider,
-  readonly TPublicEdgeRateLimitPolicyId[]
-> = {
-  none: [],
-  cloudflare: managedPublicEdgePolicies,
-  cloudarmor: managedPublicEdgePolicies,
-  envoy: [],
-};
-
-const normalizeEdgeRateLimitProvider = (provider: string | undefined): TEdgeRateLimitProvider => {
-  switch (provider) {
-    case "cloudflare":
-    case "cloudarmor":
-    case "envoy":
-      return provider;
-    default:
-      return "none";
-  }
-};
-
-const normalizePathname = (pathname: string): string => {
-  if (pathname.length > 1 && pathname.endsWith("/")) {
-    return pathname.slice(0, -1);
-  }
-
-  return pathname;
-};
-
-export const getEdgeRateLimitProvider = (
-  provider: string | undefined = EDGE_RATE_LIMIT_PROVIDER
-): TEdgeRateLimitProvider => normalizeEdgeRateLimitProvider(provider);
-
-export const getPublicEdgeRateLimitPolicyId = (
-  pathname: string,
-  method: string
-): TPublicEdgeRateLimitPolicyId | null => {
-  const normalizedPathname = normalizePathname(pathname);
-  const normalizedMethod = method.toUpperCase();
-
-  if (normalizedMethod === "POST" && normalizedPathname === "/api/auth/callback/credentials") {
-    return publicEdgeRateLimitPolicies.authLogin;
-  }
-
-  if (normalizedMethod === "POST" && normalizedPathname === "/api/auth/callback/token") {
-    return publicEdgeRateLimitPolicies.authVerifyEmail;
-  }
-
-  if (/^\/api\/v1\/client\/og(?:\/.*)?$/.test(normalizedPathname)) {
-    return null;
-  }
-
-  if (/^\/api\/v1\/client\/[^/]+\/storage$/.test(normalizedPathname) && normalizedMethod === "POST") {
-    return publicEdgeRateLimitPolicies.v1ClientStorageUpload;
-  }
-
-  if (/^\/api\/v2\/client\/[^/]+\/storage$/.test(normalizedPathname) && normalizedMethod === "POST") {
-    return publicEdgeRateLimitPolicies.v2ClientStorageUpload;
-  }
-
-  if (
-    /^\/api\/v2\/client\/[^/]+\/responses(?:\/[^/]+)?$/.test(normalizedPathname) &&
-    (normalizedMethod === "POST" || normalizedMethod === "PUT")
-  ) {
-    return publicEdgeRateLimitPolicies.v2ClientResponses;
-  }
-
-  if (/^\/api\/v2\/client\/[^/]+\/displays$/.test(normalizedPathname) && normalizedMethod === "POST") {
-    return publicEdgeRateLimitPolicies.v2ClientDisplays;
-  }
-
-  if (normalizedPathname.startsWith("/api/v1/client/")) {
-    return publicEdgeRateLimitPolicies.v1ClientDefault;
-  }
-
-  return null;
-};
-
-export const isPublicEdgeRateLimitManaged = (
-  policyId: TPublicEdgeRateLimitPolicyId,
-  provider: string | undefined = EDGE_RATE_LIMIT_PROVIDER
-): boolean => managedPublicEdgePoliciesByProvider[getEdgeRateLimitProvider(provider)].includes(policyId);
-
-export const applyPublicIpRateLimit = async (
-  policyId: TPublicEdgeRateLimitPolicyId,
-  config: TRateLimitConfig,
-  provider: string | undefined = EDGE_RATE_LIMIT_PROVIDER
-): Promise<"app" | "edge"> => {
-  if (isPublicEdgeRateLimitManaged(policyId, provider)) {
-    return "edge";
-  }
-
-  await applyIPRateLimit(config);
-
-  return "app";
-};
-
-export const applyPublicIpRateLimitForRoute = async (
-  pathname: string,
-  method: string,
-  config: TRateLimitConfig,
-  provider: string | undefined = EDGE_RATE_LIMIT_PROVIDER
-): Promise<"app" | "edge"> => {
-  const policyId = getPublicEdgeRateLimitPolicyId(pathname, method);
-
-  if (!policyId) {
-    await applyIPRateLimit(config);
-    return "app";
-  }
-
-  return await applyPublicIpRateLimit(policyId, config, provider);
-};

apps/web/modules/core/rate-limit/rate-limit-configs.test.ts

@@ -68,7 +68,7 @@ describe("rateLimitConfigs", () => {
 
     test("should have all API configurations", () => {
       const apiConfigs = Object.keys(rateLimitConfigs.api);
-      expect(apiConfigs).toEqual(["v1", "v2", "v3", "client"]);
+      expect(apiConfigs).toEqual(["v1", "v2", "client"]);
     });
 
     test("should have all action configurations", () => {
@@ -127,7 +127,7 @@ describe("rateLimitConfigs", () => {
       mockEval.mockResolvedValue([1, 1]);
 
       const config = rateLimitConfigs.api.v1;
-      await expect(applyRateLimit(config, "api-key-123")).resolves.toEqual({ allowed: true });
+      await expect(applyRateLimit(config, "api-key-123")).resolves.toBeUndefined();
     });
 
     test("should enforce limits correctly for each config type", async () => {
@@ -136,7 +136,6 @@ describe("rateLimitConfigs", () => {
         { config: rateLimitConfigs.auth.signup, identifier: "user-signup" },
         { config: rateLimitConfigs.api.v1, identifier: "api-v1-key" },
         { config: rateLimitConfigs.api.v2, identifier: "api-v2-key" },
-        { config: rateLimitConfigs.api.v3, identifier: "api-v3-key" },
         { config: rateLimitConfigs.api.client, identifier: "client-api-key" },
         { config: rateLimitConfigs.actions.emailUpdate, identifier: "user-profile" },
         { config: rateLimitConfigs.storage.upload, identifier: "storage-upload" },

apps/web/modules/core/rate-limit/rate-limit-configs.ts

@@ -11,7 +11,6 @@ export const rateLimitConfigs = {
   api: {
     v1: { interval: 60, allowedPerInterval: 100, namespace: "api:v1" }, // 100 per minute (Management API)
     v2: { interval: 60, allowedPerInterval: 100, namespace: "api:v2" }, // 100 per minute
-    v3: { interval: 60, allowedPerInterval: 100, namespace: "api:v3" }, // 100 per minute
     client: { interval: 60, allowedPerInterval: 100, namespace: "api:client" }, // 100 per minute (Client API)
   },
 

apps/web/modules/core/rate-limit/rate-limit.ts

@@ -82,7 +82,6 @@ export const checkRateLimit = async (
 
     const response: TRateLimitResponse = {
       allowed: isAllowed === 1,
-      retryAfter: isAllowed === 1 ? undefined : ttlSeconds,
     };
 
     // Log rate limit violations for security monitoring

apps/web/modules/core/rate-limit/types/rate-limit.ts

@@ -13,7 +13,6 @@ export type TRateLimitConfig = z.infer<typeof ZRateLimitConfig>;
 
 const ZRateLimitResponse = z.object({
   allowed: z.boolean().describe("Whether the request is allowed"),
-  retryAfter: z.int().positive().optional().describe("Seconds until the current rate-limit window resets"),
 });
 
 export type TRateLimitResponse = z.infer<typeof ZRateLimitResponse>;

apps/web/modules/ee/contacts/[contactId]/components/activity-section.tsx

@@ -1,6 +1,5 @@
 import { getServerSession } from "next-auth";
 import { TEnvironment } from "@formbricks/types/environment";
-import { AuthenticationError, ResourceNotFoundError } from "@formbricks/types/errors";
 import { TSurvey } from "@formbricks/types/surveys/types";
 import { TTag } from "@formbricks/types/tags";
 import { DEFAULT_LOCALE } from "@/lib/constants";
@@ -36,12 +35,12 @@ export const ActivitySection = async ({ environment, contactId, environmentTags
   const t = await getTranslate();
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   const user = await getUser(session.user.id);
   if (!user) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.user_not_found"));
   }
 
   if (!responses) {
@@ -50,7 +49,7 @@ export const ActivitySection = async ({ environment, contactId, environmentTags
 
   const project = await getProjectByEnvironmentId(environment.id);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   const projectPermission = await getProjectPermissionByUserId(session.user.id, project.id);

apps/web/modules/ee/contacts/[contactId]/components/attributes-section.tsx

@@ -1,4 +1,3 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getDisplaysByContactId } from "@/lib/display/service";
 import { getResponsesByContactId } from "@/lib/response/service";
 import { getLocale } from "@/lingodotdev/language";
@@ -11,14 +10,14 @@ import { IdBadge } from "@/modules/ui/components/id-badge";
 
 export const AttributesSection = async ({ contactId }: { contactId: string }) => {
   const t = await getTranslate();
-  const [locale, contact, attributesWithKeyInfo] = await Promise.all([
-    getLocale(),
+  const locale = await getLocale();
+  const [contact, attributesWithKeyInfo] = await Promise.all([
     getContact(contactId),
     getContactAttributesWithKeyInfo(contactId),
   ]);
 
   if (!contact) {
-    throw new ResourceNotFoundError(t("common.contact"), contactId);
+    throw new Error(t("environments.contacts.contact_not_found"));
   }
 
   const [responses, displays] = await Promise.all([

apps/web/modules/ee/contacts/[contactId]/page.tsx

@@ -1,4 +1,3 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { getTagsByEnvironmentId } from "@/lib/tag/service";
 import { getTranslate } from "@/lingodotdev/server";
 import { AttributesSection } from "@/modules/ee/contacts/[contactId]/components/attributes-section";
@@ -32,7 +31,7 @@ export const SingleContactPage = async (props: {
     ]);
 
   if (!contact) {
-    throw new ResourceNotFoundError(t("common.contact"), params.contactId);
+    throw new Error(t("environments.contacts.contact_not_found"));
   }
 
   const isQuotasAllowed = await getIsQuotasEnabled(organization.id);

apps/web/modules/ee/contacts/actions.ts

@@ -3,7 +3,6 @@
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
 import { ZContactAttributesInput } from "@formbricks/types/contact-attribute";
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { authenticatedActionClient } from "@/lib/utils/action-client";
 import { checkAuthorizationUpdated } from "@/lib/utils/action-client/action-client-middleware";
 import {
@@ -165,7 +164,7 @@ export const updateContactAttributesAction = authenticatedActionClient
       // Get contact to access environmentId for revalidation
       const contact = await getContact(parsedInput.contactId);
       if (!contact) {
-        throw new ResourceNotFoundError("Contact", parsedInput.contactId);
+        throw new Error("Contact not found");
       }
 
       const result = await updateContactAttributes(parsedInput.contactId, parsedInput.attributes);

apps/web/modules/ee/contacts/api/v2/management/contacts/bulk/lib/openapi.ts

@@ -6,11 +6,11 @@ const bulkContactEndpoint: ZodOpenApiOperationObject = {
   operationId: "uploadBulkContacts",
   summary: "Upload Bulk Contacts",
   description:
-    "Uploads contacts in bulk. This endpoint expects the bulk request shape: `contacts` must be an array, and each contact item must contain an `attributes` array of `{ attributeKey, value }` objects. Unlike `POST /management/contacts`, this endpoint does not accept a top-level `attributes` object. Each contact must include an `email` attribute in its `attributes` array, and that email must be valid.",
+    "Uploads contacts in bulk. Each contact in the payload must have an 'email' attribute present in their attributes array. The email attribute is mandatory and must be a valid email format. Without a valid email, the contact will be skipped during processing.",
   requestBody: {
     required: true,
     description:
-      "The contacts to upload. Use the full nested bulk body shown in the example or cURL snippet: `{ environmentId, contacts: [{ attributes: [{ attributeKey: { key, name }, value }] }] }`. Each contact must include an `email` attribute inside its `attributes` array.",
+      "The contacts to upload. Each contact must include an 'email' attribute in their attributes array. The email is used as the unique identifier for the contact.",
     content: {
       "application/json": {
         schema: ZContactBulkUploadRequest,

apps/web/modules/ee/contacts/api/v2/management/contacts/lib/openapi.ts

@@ -6,13 +6,13 @@ export const createContactEndpoint: ZodOpenApiOperationObject = {
   operationId: "createContact",
   summary: "Create a contact",
   description:
-    "Creates a single contact in the database. This endpoint expects a top-level `attributes` object. For bulk uploads, use `PUT /management/contacts/bulk`, which expects `contacts[].attributes[]` instead. Each contact must have a valid email address in the attributes. All attribute keys must already exist in the environment. The email is used as the unique identifier along with the environment.",
+    "Creates a contact in the database. Each contact must have a valid email address in the attributes. All attribute keys must already exist in the environment. The email is used as the unique identifier along with the environment.",
   tags: ["Management API - Contacts"],
 
   requestBody: {
     required: true,
     description:
-      "The single contact to create. Must include a top-level `attributes` object with an email attribute, and all attribute keys must already exist in the environment.",
+      "The contact to create. Must include an email attribute and all attribute keys must already exist in the environment.",
     content: {
       "application/json": {
         schema: ZContactCreateRequest,

apps/web/modules/ee/contacts/components/contacts-secondary-navigation.tsx

@@ -1,4 +1,3 @@
-import { ResourceNotFoundError } from "@formbricks/types/errors";
 import { TProject } from "@formbricks/types/project";
 import { getProjectByEnvironmentId } from "@/lib/project/service";
 import { getTranslate } from "@/lingodotdev/server";
@@ -21,7 +20,7 @@ export const ContactsSecondaryNavigation = async ({
     project = await getProjectByEnvironmentId(environmentId);
 
     if (!project) {
-      throw new ResourceNotFoundError(t("common.workspace"), null);
+      throw new Error(t("common.workspace_not_found"));
     }
   }
 

apps/web/modules/ee/contacts/layout.tsx

@@ -1,6 +1,6 @@
 import { getServerSession } from "next-auth";
 import { redirect } from "next/navigation";
-import { AuthenticationError, AuthorizationError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { AuthorizationError } from "@formbricks/types/errors";
 import { hasUserEnvironmentAccess } from "@/lib/environment/auth";
 import { getMembershipByUserIdOrganizationId } from "@/lib/membership/service";
 import { getAccessFlags } from "@/lib/membership/utils";
@@ -24,11 +24,11 @@ const ConfigLayout = async (props: {
   ]);
 
   if (!organization) {
-    throw new ResourceNotFoundError(t("common.organization"), null);
+    throw new Error(t("common.organization_not_found"));
   }
 
   if (!session) {
-    throw new AuthenticationError(t("common.not_authenticated"));
+    throw new Error(t("common.session_not_found"));
   }
 
   const hasAccess = await hasUserEnvironmentAccess(session.user.id, params.environmentId);
@@ -45,7 +45,7 @@ const ConfigLayout = async (props: {
 
   const project = await getProjectByEnvironmentId(params.environmentId);
   if (!project) {
-    throw new ResourceNotFoundError(t("common.workspace"), null);
+    throw new Error(t("common.workspace_not_found"));
   }
 
   return children;

apps/web/modules/ee/contacts/segments/actions.ts

@@ -2,7 +2,7 @@
 
 import { z } from "zod";
 import { ZId } from "@formbricks/types/common";
-import { OperationNotAllowedError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { OperationNotAllowedError } from "@formbricks/types/errors";
 import { ZSegmentCreateInput, ZSegmentFilters, ZSegmentUpdateInput } from "@formbricks/types/segment";
 import { getOrganization } from "@/lib/organization/service";
 import { loadNewSegmentInSurvey } from "@/lib/survey/service";
@@ -35,7 +35,7 @@ const checkAdvancedTargetingPermission = async (organizationId: string) => {
   const organization = await getOrganization(organizationId);
 
   if (!organization) {
-    throw new ResourceNotFoundError("Organization", organizationId);
+    throw new Error("Organization not found");
   }
 
   const isContactsEnabled = await getIsContactsEnabled(organizationId);

apps/web/modules/ee/contacts/segments/components/edit-segment-modal.tsx

@@ -4,7 +4,7 @@ import { UsersIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
-import { TSegment, TSegmentWithSurveyRefs } from "@formbricks/types/segment";
+import { TSegment, TSegmentWithSurveyNames } from "@formbricks/types/segment";
 import { SegmentSettings } from "@/modules/ee/contacts/segments/components/segment-settings";
 import {
   Dialog,
@@ -15,63 +15,23 @@ import {
   DialogTitle,
 } from "@/modules/ui/components/dialog";
 import { SegmentActivityTab } from "./segment-activity-tab";
-import { TSegmentActivitySummary } from "./segment-activity-utils";
 
 interface EditSegmentModalProps {
   environmentId: string;
   open: boolean;
   setOpen: (open: boolean) => void;
-  currentSegment: TSegmentWithSurveyRefs;
-  activitySummary: TSegmentActivitySummary;
+  currentSegment: TSegmentWithSurveyNames;
   segments: TSegment[];
   contactAttributeKeys: TContactAttributeKey[];
   isContactsEnabled: boolean;
   isReadOnly: boolean;
 }
 
-const SegmentSettingsTab = ({
-  activitySummary,
-  contactAttributeKeys,
-  currentSegment,
-  environmentId,
-  isContactsEnabled,
-  isReadOnly,
-  segments,
-  setOpen,
-}: Pick<
-  EditSegmentModalProps,
-  | "activitySummary"
-  | "contactAttributeKeys"
-  | "currentSegment"
-  | "environmentId"
-  | "isContactsEnabled"
-  | "isReadOnly"
-  | "segments"
-  | "setOpen"
->) => {
-  if (!isContactsEnabled) {
-    return null;
-  }
-
-  return (
-    <SegmentSettings
-      activitySummary={activitySummary}
-      contactAttributeKeys={contactAttributeKeys}
-      environmentId={environmentId}
-      initialSegment={currentSegment}
-      segments={segments}
-      setOpen={setOpen}
-      isReadOnly={isReadOnly}
-    />
-  );
-};
-
 export const EditSegmentModal = ({
   environmentId,
   open,
   setOpen,
   currentSegment,
-  activitySummary,
   contactAttributeKeys,
   segments,
   isContactsEnabled,
@@ -80,25 +40,31 @@ export const EditSegmentModal = ({
   const { t } = useTranslation();
   const [activeTab, setActiveTab] = useState(0);
 
+  const SettingsTab = () => {
+    if (isContactsEnabled) {
+      return (
+        <SegmentSettings
+          contactAttributeKeys={contactAttributeKeys}
+          environmentId={environmentId}
+          initialSegment={currentSegment}
+          segments={segments}
+          setOpen={setOpen}
+          isReadOnly={isReadOnly}
+        />
+      );
+    }
+
+    return null;
+  };
+
   const tabs = [
     {
       title: t("common.activity"),
-      children: <SegmentActivityTab currentSegment={currentSegment} activitySummary={activitySummary} />,
+      children: <SegmentActivityTab currentSegment={currentSegment} />,
     },
     {
       title: t("common.settings"),
-      children: (
-        <SegmentSettingsTab
-          activitySummary={activitySummary}
-          contactAttributeKeys={contactAttributeKeys}
-          currentSegment={currentSegment}
-          environmentId={environmentId}
-          isContactsEnabled={isContactsEnabled}
-          isReadOnly={isReadOnly}
-          segments={segments}
-          setOpen={setOpen}
-        />
-      ),
+      children: <SettingsTab />,
     },
   ];
 

apps/web/modules/ee/contacts/segments/components/segment-activity-tab.tsx

@@ -1,22 +1,20 @@
 "use client";
 
 import { useTranslation } from "react-i18next";
-import { TSegmentWithSurveyRefs } from "@formbricks/types/segment";
+import { TSegmentWithSurveyNames } from "@formbricks/types/segment";
 import { formatDateTimeForDisplay } from "@/lib/utils/datetime";
 import { IdBadge } from "@/modules/ui/components/id-badge";
 import { Label } from "@/modules/ui/components/label";
-import { TSegmentActivitySummary } from "./segment-activity-utils";
 
 interface SegmentActivityTabProps {
-  currentSegment: TSegmentWithSurveyRefs;
-  activitySummary: TSegmentActivitySummary;
+  currentSegment: TSegmentWithSurveyNames;
 }
 
-export const SegmentActivityTab = ({ currentSegment, activitySummary }: SegmentActivityTabProps) => {
+export const SegmentActivityTab = ({ currentSegment }: SegmentActivityTabProps) => {
   const { t, i18n } = useTranslation();
   const locale = i18n.resolvedLanguage ?? i18n.language ?? "en-US";
 
-  const { activeSurveys, inactiveSurveys } = activitySummary;
+  const { activeSurveys, inactiveSurveys } = currentSegment;
 
   return (
     <div className="grid grid-cols-3 pb-2">
@@ -25,20 +23,20 @@ export const SegmentActivityTab = ({ currentSegment, activitySummary }: SegmentA
           <Label className="text-slate-500">{t("common.active_surveys")}</Label>
           {!activeSurveys?.length && <p className="text-sm text-slate-900">-</p>}
 
-          {activeSurveys?.map((surveyName) => (
-            <div className="py-0.5" key={surveyName}>
-              <p className="text-sm text-slate-900">{surveyName}</p>
-            </div>
+          {activeSurveys?.map((survey, index) => (
+            <p className="text-sm text-slate-900" key={index + survey}>
+              {survey}
+            </p>
           ))}
         </div>
         <div>
           <Label className="text-slate-500">{t("common.inactive_surveys")}</Label>
           {!inactiveSurveys?.length && <p className="text-sm text-slate-900">-</p>}
 
-          {inactiveSurveys?.map((surveyName) => (
-            <div className="py-0.5" key={surveyName}>
-              <p className="text-sm text-slate-900">{surveyName}</p>
-            </div>
+          {inactiveSurveys?.map((survey, index) => (
+            <p className="text-sm text-slate-900" key={index + survey}>
+              {survey}
+            </p>
           ))}
         </div>
       </div>

apps/web/modules/ee/contacts/segments/components/segment-activity-utils.test.ts

@@ -1,340 +0,0 @@
-import { describe, expect, test } from "vitest";
-import { TBaseFilters, TSegment, TSegmentWithSurveyRefs } from "@formbricks/types/segment";
-import { TSurvey } from "@formbricks/types/surveys/types";
-import {
-  buildSegmentActivitySummary,
-  buildSegmentActivitySummaryFromSegments,
-  doesSegmentReferenceSegment,
-  getReferencingSegments,
-} from "./segment-activity-utils";
-
-const createSurvey = (overrides: Partial<TSurvey>): TSurvey =>
-  ({
-    id: "survey_1",
-    createdAt: new Date(),
-    updatedAt: new Date(),
-    name: "Survey 1",
-    type: "app",
-    environmentId: "env_1",
-    status: "inProgress",
-    welcomeCard: {
-      enabled: false,
-      headline: {},
-      html: {},
-      fileUrl: "",
-      buttonLabel: {},
-      timeToFinish: false,
-    },
-    questions: [],
-    hiddenFields: { enabled: false, fieldIds: [] },
-    endings: [],
-    autoClose: null,
-    displayOption: "displayOnce",
-    displayPercentage: null,
-    recontactDays: null,
-    displayLimit: null,
-    delay: 0,
-    autoComplete: null,
-    triggers: [],
-    styling: null,
-    surveyClosedMessage: null,
-    segment: null,
-    segmentId: null,
-    projectOverwrites: null,
-    singleUse: null,
-    pin: null,
-    redirectUrl: null,
-    displayStatus: null,
-    displayCount: null,
-    languages: [],
-    showLanguageSwitch: false,
-    isVerifyEmailEnabled: false,
-    isSingleResponsePerEmailEnabled: false,
-    isBackButtonHidden: false,
-    recaptcha: null,
-    variables: [],
-    blocks: undefined,
-    followUps: [],
-    verifyEmailTemplateId: null,
-    ...overrides,
-  }) as TSurvey;
-
-const createSegment = (overrides: Partial<TSegment>): TSegment =>
-  ({
-    id: "segment_1",
-    title: "Segment 1",
-    description: null,
-    isPrivate: false,
-    environmentId: "env_1",
-    createdAt: new Date(),
-    updatedAt: new Date(),
-    surveys: [],
-    filters: [],
-    ...overrides,
-  }) as TSegment;
-
-const createSegmentWithSurveyNames = (overrides: Partial<TSegmentWithSurveyRefs>): TSegmentWithSurveyRefs =>
-  ({
-    ...createSegment(overrides),
-    activeSurveys: [],
-    inactiveSurveys: [],
-    ...overrides,
-  }) as TSegmentWithSurveyRefs;
-
-describe("segment activity utils", () => {
-  test("doesSegmentReferenceSegment returns true for nested segment filters", () => {
-    const filters: TBaseFilters = [
-      {
-        id: "group_1",
-        connector: null,
-        resource: [
-          {
-            id: "filter_1",
-            connector: null,
-            resource: {
-              id: "segment_filter_1",
-              root: {
-                type: "segment",
-                segmentId: "segment_target",
-              },
-              value: "segment_target",
-              qualifier: {
-                operator: "userIsNotIn",
-              },
-            },
-          },
-        ],
-      },
-    ];
-
-    expect(doesSegmentReferenceSegment(filters, "segment_target")).toBe(true);
-    expect(doesSegmentReferenceSegment(filters, "segment_other")).toBe(false);
-  });
-
-  test("getReferencingSegments excludes the current segment and returns only matching segments", () => {
-    const segments = [
-      createSegment({ id: "segment_target" }),
-      createSegment({
-        id: "segment_ref",
-        filters: [
-          {
-            id: "filter_1",
-            connector: null,
-            resource: {
-              id: "segment_filter_1",
-              root: {
-                type: "segment",
-                segmentId: "segment_target",
-              },
-              value: "segment_target",
-              qualifier: {
-                operator: "userIsIn",
-              },
-            },
-          },
-        ],
-      }),
-      createSegment({
-        id: "segment_other",
-        filters: [
-          {
-            id: "filter_2",
-            connector: null,
-            resource: {
-              id: "attribute_filter_1",
-              root: {
-                type: "attribute",
-                contactAttributeKey: "plan",
-              },
-              value: "enterprise",
-              qualifier: {
-                operator: "equals",
-              },
-            },
-          },
-        ],
-      }),
-    ] as TSegmentWithSurveyRefs[];
-
-    expect(getReferencingSegments(segments, "segment_target").map((segment) => segment.id)).toEqual([
-      "segment_ref",
-    ]);
-  });
-
-  test("buildSegmentActivitySummary returns direct surveys grouped by status", () => {
-    const directSurveys = [
-      createSurvey({
-        id: "survey_direct",
-        name: "Direct Survey",
-        status: "inProgress",
-      }),
-      createSurvey({
-        id: "survey_draft",
-        name: "Draft Survey",
-        status: "draft",
-      }),
-    ];
-
-    expect(buildSegmentActivitySummary(directSurveys, [])).toEqual({
-      activeSurveys: ["Direct Survey"],
-      inactiveSurveys: ["Draft Survey"],
-    });
-  });
-
-  test("buildSegmentActivitySummary includes indirect surveys when there is no direct match", () => {
-    const indirectSurveyGroups = [
-      {
-        segmentId: "segment_ref",
-        segmentTitle: "Referenced Segment",
-        surveys: [
-          createSurvey({
-            id: "survey_draft",
-            name: "Draft Survey",
-            status: "draft",
-          }),
-        ],
-      },
-    ];
-
-    expect(buildSegmentActivitySummary([], indirectSurveyGroups)).toEqual({
-      activeSurveys: [],
-      inactiveSurveys: ["Draft Survey"],
-    });
-  });
-
-  test("buildSegmentActivitySummary prefers direct surveys over indirect duplicates", () => {
-    const directSurveys = [
-      createSurvey({
-        id: "survey_shared",
-        name: "Shared Survey",
-        status: "inProgress",
-      }),
-    ];
-    const indirectSurveyGroups = [
-      {
-        segmentId: "segment_ref",
-        segmentTitle: "Referenced Segment",
-        surveys: [
-          createSurvey({
-            id: "survey_shared",
-            name: "Shared Survey",
-            status: "inProgress",
-          }),
-        ],
-      },
-    ];
-
-    expect(buildSegmentActivitySummary(directSurveys, indirectSurveyGroups)).toEqual({
-      activeSurveys: ["Shared Survey"],
-      inactiveSurveys: [],
-    });
-  });
-
-  test("buildSegmentActivitySummary deduplicates indirect surveys referenced by multiple segments", () => {
-    const indirectSurveyGroups = [
-      {
-        segmentId: "segment_ref_1",
-        segmentTitle: "Referenced Segment 1",
-        surveys: [
-          createSurvey({
-            id: "survey_indirect",
-            name: "Indirect Survey",
-            status: "paused",
-          }),
-        ],
-      },
-      {
-        segmentId: "segment_ref_2",
-        segmentTitle: "Referenced Segment 2",
-        surveys: [
-          createSurvey({
-            id: "survey_indirect",
-            name: "Indirect Survey",
-            status: "paused",
-          }),
-        ],
-      },
-    ];
-
-    expect(buildSegmentActivitySummary([], indirectSurveyGroups)).toEqual({
-      activeSurveys: [],
-      inactiveSurveys: ["Indirect Survey"],
-    });
-  });
-
-  test("buildSegmentActivitySummaryFromSegments merges direct and indirect surveys from segment table data", () => {
-    const currentSegment = createSegmentWithSurveyNames({
-      id: "segment_target",
-      activeSurveys: [{ id: "survey_direct", name: "Direct Survey" }],
-      inactiveSurveys: [{ id: "survey_paused", name: "Paused Survey" }],
-    });
-    const segments = [
-      currentSegment,
-      createSegmentWithSurveyNames({
-        id: "segment_ref",
-        title: "Referenced Segment",
-        activeSurveys: [{ id: "survey_indirect", name: "Indirect Survey" }],
-        inactiveSurveys: [{ id: "survey_paused", name: "Paused Survey" }],
-        filters: [
-          {
-            id: "filter_1",
-            connector: null,
-            resource: {
-              id: "segment_filter_1",
-              root: {
-                type: "segment",
-                segmentId: "segment_target",
-              },
-              value: "segment_target",
-              qualifier: {
-                operator: "userIsIn",
-              },
-            },
-          },
-        ],
-      }),
-    ];
-
-    expect(buildSegmentActivitySummaryFromSegments(currentSegment, segments)).toEqual({
-      activeSurveys: ["Direct Survey", "Indirect Survey"],
-      inactiveSurveys: ["Paused Survey"],
-    });
-  });
-
-  test("buildSegmentActivitySummaryFromSegments includes indirect usage from private survey segments", () => {
-    const currentSegment = createSegmentWithSurveyNames({
-      id: "segment_target",
-    });
-
-    const privateReferencingSegment = createSegmentWithSurveyNames({
-      id: "segment_private_ref",
-      title: "Private Survey Segment",
-      isPrivate: true,
-      activeSurveys: [{ id: "survey_private", name: "Indirect Private Survey" }],
-      filters: [
-        {
-          id: "filter_1",
-          connector: null,
-          resource: {
-            id: "segment_filter_1",
-            root: {
-              type: "segment",
-              segmentId: "segment_target",
-            },
-            value: "segment_target",
-            qualifier: {
-              operator: "userIsNotIn",
-            },
-          },
-        },
-      ],
-    });
-
-    expect(
-      buildSegmentActivitySummaryFromSegments(currentSegment, [currentSegment, privateReferencingSegment])
-    ).toEqual({
-      activeSurveys: ["Indirect Private Survey"],
-      inactiveSurveys: [],
-    });
-  });
-});

apps/web/modules/ee/contacts/segments/components/segment-activity-utils.ts

@@ -1,99 +0,0 @@
-import { TBaseFilters, TSegmentWithSurveyRefs } from "@formbricks/types/segment";
-import { TSurvey } from "@formbricks/types/surveys/types";
-
-type TSurveySummary = Pick<TSurvey, "id" | "name" | "status">;
-type TReferencingSegmentSurveyGroup = {
-  segmentId: string;
-  segmentTitle: string;
-  surveys: TSurveySummary[];
-};
-
-export type TSegmentActivitySummary = {
-  activeSurveys: string[];
-  inactiveSurveys: string[];
-};
-
-export const doesSegmentReferenceSegment = (filters: TBaseFilters, targetSegmentId: string): boolean => {
-  for (const filter of filters) {
-    const { resource } = filter;
-
-    if (Array.isArray(resource)) {
-      if (doesSegmentReferenceSegment(resource, targetSegmentId)) {
-        return true;
-      }
-      continue;
-    }
-
-    if (resource.root.type === "segment" && resource.root.segmentId === targetSegmentId) {
-      return true;
-    }
-  }
-
-  return false;
-};
-
-export const getReferencingSegments = (
-  segments: TSegmentWithSurveyRefs[],
-  targetSegmentId: string
-): TSegmentWithSurveyRefs[] =>
-  segments.filter(
-    (segment) =>
-      segment.id !== targetSegmentId && doesSegmentReferenceSegment(segment.filters, targetSegmentId)
-  );
-
-export const buildSegmentActivitySummary = (
-  directSurveys: TSurveySummary[],
-  indirectSurveyGroups: TReferencingSegmentSurveyGroup[]
-): TSegmentActivitySummary => {
-  const surveyMap = new Map<string, TSurveySummary>();
-
-  for (const survey of directSurveys) {
-    surveyMap.set(survey.id, survey);
-  }
-
-  for (const segment of indirectSurveyGroups) {
-    for (const survey of segment.surveys) {
-      if (!surveyMap.has(survey.id)) {
-        surveyMap.set(survey.id, survey);
-      }
-    }
-  }
-
-  const surveys = Array.from(surveyMap.values());
-
-  return {
-    activeSurveys: surveys.filter((survey) => survey.status === "inProgress").map((survey) => survey.name),
-    inactiveSurveys: surveys
-      .filter((survey) => survey.status === "draft" || survey.status === "paused")
-      .map((survey) => survey.name),
-  };
-};
-
-export const buildSegmentActivitySummaryFromSegments = (
-  currentSegment: TSegmentWithSurveyRefs,
-  segments: TSegmentWithSurveyRefs[]
-): TSegmentActivitySummary => {
-  const activeSurveyMap = new Map(currentSegment.activeSurveys.map((s) => [s.id, s.name]));
-  const inactiveSurveyMap = new Map(currentSegment.inactiveSurveys.map((s) => [s.id, s.name]));
-  const allDirectIds = new Set([...activeSurveyMap.keys(), ...inactiveSurveyMap.keys()]);
-
-  const referencingSegments = getReferencingSegments(segments, currentSegment.id);
-  for (const segment of referencingSegments) {
-    for (const survey of segment.activeSurveys) {
-      if (!allDirectIds.has(survey.id) && !activeSurveyMap.has(survey.id)) {
-        activeSurveyMap.set(survey.id, survey.name);
-      }
-    }
-
-    for (const survey of segment.inactiveSurveys) {
-      if (!allDirectIds.has(survey.id) && !inactiveSurveyMap.has(survey.id)) {
-        inactiveSurveyMap.set(survey.id, survey.name);
-      }
-    }
-  }
-
-  return {
-    activeSurveys: Array.from(activeSurveyMap.values()),
-    inactiveSurveys: Array.from(inactiveSurveyMap.values()),
-  };
-};

apps/web/modules/ee/contacts/segments/components/segment-settings.tsx

@@ -6,7 +6,7 @@ import { type Dispatch, type SetStateAction, useMemo, useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
-import type { TBaseFilter, TSegment, TSegmentWithSurveyRefs } from "@formbricks/types/segment";
+import type { TBaseFilter, TSegment, TSegmentWithSurveyNames } from "@formbricks/types/segment";
 import { ZSegmentFilters } from "@formbricks/types/segment";
 import { cn } from "@/lib/cn";
 import { structuredClone } from "@/lib/pollyfills/structuredClone";
@@ -16,21 +16,18 @@ import { Button } from "@/modules/ui/components/button";
 import { ConfirmDeleteSegmentModal } from "@/modules/ui/components/confirm-delete-segment-modal";
 import { Input } from "@/modules/ui/components/input";
 import { AddFilterModal } from "./add-filter-modal";
-import { TSegmentActivitySummary } from "./segment-activity-utils";
 import { SegmentEditor } from "./segment-editor";
 
 interface TSegmentSettingsTabProps {
-  activitySummary: TSegmentActivitySummary;
   environmentId: string;
   setOpen: (open: boolean) => void;
-  initialSegment: TSegmentWithSurveyRefs;
+  initialSegment: TSegmentWithSurveyNames;
   segments: TSegment[];
   contactAttributeKeys: TContactAttributeKey[];
   isReadOnly: boolean;
 }
 
 export function SegmentSettings({
-  activitySummary,
   environmentId,
   initialSegment,
   setOpen,
@@ -41,7 +38,7 @@ export function SegmentSettings({
   const router = useRouter();
   const { t } = useTranslation();
   const [addFilterModalOpen, setAddFilterModalOpen] = useState(false);
-  const [segment, setSegment] = useState<TSegmentWithSurveyRefs>(initialSegment);
+  const [segment, setSegment] = useState<TSegmentWithSurveyNames>(initialSegment);
 
   const [isUpdatingSegment, setIsUpdatingSegment] = useState(false);
   const [isDeletingSegment, setIsDeletingSegment] = useState(false);
@@ -263,9 +260,9 @@ export function SegmentSettings({
 
             {isDeleteSegmentModalOpen ? (
               <ConfirmDeleteSegmentModal
-                activitySummary={activitySummary}
                 onDelete={handleDeleteSegment}
                 open={isDeleteSegmentModalOpen}
+                segment={initialSegment}
                 setOpen={setIsDeleteSegmentModalOpen}
               />
             ) : null}

apps/web/modules/ee/contacts/segments/components/segment-table-columns.tsx

@@ -3,15 +3,15 @@
 import { ColumnDef } from "@tanstack/react-table";
 import { TFunction } from "i18next";
 import { UsersIcon } from "lucide-react";
-import { TSegmentWithSurveyRefs } from "@formbricks/types/segment";
+import { TSegmentWithSurveyNames } from "@formbricks/types/segment";
 import { timeSinceDate } from "@/lib/time";
 import { formatDateForDisplay } from "@/lib/utils/datetime";
 
 export const generateSegmentTableColumns = (
   t: TFunction,
   locale: string
-): ColumnDef<TSegmentWithSurveyRefs>[] => {
-  const titleColumn: ColumnDef<TSegmentWithSurveyRefs> = {
+): ColumnDef<TSegmentWithSurveyNames>[] => {
+  const titleColumn: ColumnDef<TSegmentWithSurveyNames> = {
     id: "title",
     accessorKey: "title",
     header: t("common.title"),
@@ -32,7 +32,7 @@ export const generateSegmentTableColumns = (
     },
   };
 
-  const updatedAtColumn: ColumnDef<TSegmentWithSurveyRefs> = {
+  const updatedAtColumn: ColumnDef<TSegmentWithSurveyNames> = {
     id: "updatedAt",
     accessorKey: "updatedAt",
     header: t("common.updated_at"),
@@ -41,7 +41,7 @@ export const generateSegmentTableColumns = (
     },
   };
 
-  const createdAtColumn: ColumnDef<TSegmentWithSurveyRefs> = {
+  const createdAtColumn: ColumnDef<TSegmentWithSurveyNames> = {
     id: "createdAt",
     accessorKey: "createdAt",
     header: t("common.created_at"),

apps/web/modules/ee/contacts/segments/components/segment-table-data-row-container.tsx

@@ -0,0 +1,46 @@
+import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
+import { TSegment } from "@formbricks/types/segment";
+import { getSurveysBySegmentId } from "@/lib/survey/service";
+import { SegmentTableDataRow } from "./segment-table-data-row";
+
+type TSegmentTableDataRowProps = {
+  currentSegment: TSegment;
+  segments: TSegment[];
+  contactAttributeKeys: TContactAttributeKey[];
+  isContactsEnabled: boolean;
+  isReadOnly: boolean;
+};
+
+export const SegmentTableDataRowContainer = async ({
+  currentSegment,
+  segments,
+  contactAttributeKeys,
+  isContactsEnabled,
+  isReadOnly,
+}: TSegmentTableDataRowProps) => {
+  const surveys = await getSurveysBySegmentId(currentSegment.id);
+
+  const activeSurveys = surveys?.length
+    ? surveys.filter((survey) => survey.status === "inProgress").map((survey) => survey.name)
+    : [];
+
+  const inactiveSurveys = surveys?.length
+    ? surveys.filter((survey) => ["draft", "paused"].includes(survey.status)).map((survey) => survey.name)
+    : [];
+
+  const filteredSegments = segments.filter((segment) => segment.id !== currentSegment.id);
+
+  return (
+    <SegmentTableDataRow
+      currentSegment={{
+        ...currentSegment,
+        activeSurveys,
+        inactiveSurveys,
+      }}
+      segments={filteredSegments}
+      contactAttributeKeys={contactAttributeKeys}
+      isContactsEnabled={isContactsEnabled}
+      isReadOnly={isReadOnly}
+    />
+  );
+};

apps/web/modules/ee/contacts/segments/components/segment-table-data-row.tsx

@@ -4,15 +4,13 @@ import { UsersIcon } from "lucide-react";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
-import { TSegment, TSegmentWithSurveyRefs } from "@formbricks/types/segment";
+import { TSegment, TSegmentWithSurveyNames } from "@formbricks/types/segment";
 import { timeSinceDate } from "@/lib/time";
 import { formatDateForDisplay } from "@/lib/utils/datetime";
 import { EditSegmentModal } from "./edit-segment-modal";
-import { TSegmentActivitySummary } from "./segment-activity-utils";
 
 type TSegmentTableDataRowProps = {
-  currentSegment: TSegmentWithSurveyRefs;
-  activitySummary: TSegmentActivitySummary;
+  currentSegment: TSegmentWithSurveyNames;
   segments: TSegment[];
   contactAttributeKeys: TContactAttributeKey[];
   isContactsEnabled: boolean;
@@ -21,15 +19,14 @@ type TSegmentTableDataRowProps = {
 
 export const SegmentTableDataRow = ({
   currentSegment,
-  activitySummary,
   contactAttributeKeys,
   segments,
   isContactsEnabled,
   isReadOnly,
 }: TSegmentTableDataRowProps) => {
-  const { i18n } = useTranslation();
   const { createdAt, environmentId, id, surveys, title, updatedAt, description } = currentSegment;
   const [isEditSegmentModalOpen, setIsEditSegmentModalOpen] = useState(false);
+  const { i18n } = useTranslation();
   const locale = i18n.resolvedLanguage ?? i18n.language ?? "en-US";
 
   return (
@@ -71,7 +68,6 @@ export const SegmentTableDataRow = ({
         open={isEditSegmentModalOpen}
         setOpen={setIsEditSegmentModalOpen}
         currentSegment={currentSegment}
-        activitySummary={activitySummary}
         contactAttributeKeys={contactAttributeKeys}
         segments={segments}
         isContactsEnabled={isContactsEnabled}