diff --git a/apps/web/modules/survey/list/page.test.tsx b/apps/web/modules/survey/list/page.test.tsx
index c238ba99ac..ff3559513b 100644
--- a/apps/web/modules/survey/list/page.test.tsx
+++ b/apps/web/modules/survey/list/page.test.tsx
@@ -5,7 +5,6 @@ import { Session } from "next-auth";
import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
import { TEnvironment } from "@formbricks/types/environment";
import { TProject } from "@formbricks/types/project";
-import { TTemplateRole } from "@formbricks/types/templates";
import { SurveysPage } from "./page";
// Mock all dependencies
@@ -53,19 +52,16 @@ vi.mock("@/modules/survey/list/lib/survey", () => ({
}));
vi.mock("@/modules/survey/templates/components/template-container", () => ({
- TemplateContainerWithPreview: vi.fn(
- ({ userId, environment, project, prefilledFilters, isTemplatePage }) => (
-
- Template Container
-
- )
- ),
+ TemplateContainerWithPreview: vi.fn(({ userId, environment, project, isTemplatePage }) => (
+
+ Template Container
+
+ )),
}));
vi.mock("@/modules/ui/components/button", () => ({
@@ -207,9 +203,8 @@ describe("SurveysPage", () => {
mockTranslate.mockReturnValue("Project not found");
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- await expect(SurveysPage({ params, searchParams })).rejects.toThrow("Project not found");
+ await expect(SurveysPage({ params })).rejects.toThrow("Project not found");
expect(mockGetProjectWithTeamIdsByEnvironmentId).toHaveBeenCalledWith("env-123");
expect(mockTranslate).toHaveBeenCalledWith("common.project_not_found");
@@ -225,9 +220,8 @@ describe("SurveysPage", () => {
});
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- await SurveysPage({ params, searchParams });
+ await SurveysPage({ params });
expect(mockRedirect).toHaveBeenCalledWith("/environments/env-123/settings/billing");
});
@@ -236,9 +230,8 @@ describe("SurveysPage", () => {
mockGetSurveyCount.mockResolvedValue(0);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({ role: "product_manager" as TTemplateRole });
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
expect(screen.getByTestId("template-container")).toBeInTheDocument();
@@ -246,20 +239,14 @@ describe("SurveysPage", () => {
expect(screen.getByTestId("template-container")).toHaveAttribute("data-environment-id", "env-123");
expect(screen.getByTestId("template-container")).toHaveAttribute("data-project-id", "project-123");
expect(screen.getByTestId("template-container")).toHaveAttribute("data-is-template-page", "false");
-
- const prefilledFilters = JSON.parse(
- screen.getByTestId("template-container").getAttribute("data-prefilled-filters") || "[]"
- );
- expect(prefilledFilters).toEqual(["website", "other", "product_manager"]);
});
test("renders surveys list when survey count is greater than 0", async () => {
mockGetSurveyCount.mockResolvedValue(5);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
expect(screen.getByTestId("page-content-wrapper")).toBeInTheDocument();
@@ -289,9 +276,8 @@ describe("SurveysPage", () => {
mockGetSurveyCount.mockResolvedValue(5);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
expect(screen.getByTestId("page-header")).toBeInTheDocument();
@@ -307,9 +293,8 @@ describe("SurveysPage", () => {
mockGetSurveyCount.mockResolvedValue(0);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
// When survey count is 0, it should render TemplateContainer regardless of read-only status
@@ -330,16 +315,11 @@ describe("SurveysPage", () => {
mockGetSurveyCount.mockResolvedValue(0);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
expect(screen.getByTestId("template-container")).toBeInTheDocument();
- const prefilledFilters = JSON.parse(
- screen.getByTestId("template-container").getAttribute("data-prefilled-filters") || "[]"
- );
- expect(prefilledFilters).toEqual([null, null, null]);
});
test("handles project with null styling", async () => {
@@ -351,9 +331,8 @@ describe("SurveysPage", () => {
mockGetSurveyCount.mockResolvedValue(0);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
expect(screen.getByTestId("template-container")).toBeInTheDocument();
@@ -365,9 +344,8 @@ describe("SurveysPage", () => {
mockGetSurveyCount.mockResolvedValue(5);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
expect(screen.getByTestId("surveys-list")).toHaveAttribute("data-locale", "en-US");
@@ -377,9 +355,8 @@ describe("SurveysPage", () => {
mockGetSurveyCount.mockResolvedValue(5);
const params = Promise.resolve({ environmentId: "env-123" });
- const searchParams = Promise.resolve({});
- const result = await SurveysPage({ params, searchParams });
+ const result = await SurveysPage({ params });
render(result);
expect(screen.getByTestId("link")).toHaveAttribute("href", "/environments/env-123/surveys/templates");
diff --git a/apps/web/modules/survey/list/page.tsx b/apps/web/modules/survey/list/page.tsx
index f38204e40e..49cd0e3f30 100644
--- a/apps/web/modules/survey/list/page.tsx
+++ b/apps/web/modules/survey/list/page.tsx
@@ -14,7 +14,6 @@ import { PlusIcon } from "lucide-react";
import { Metadata } from "next";
import Link from "next/link";
import { redirect } from "next/navigation";
-import { TTemplateRole } from "@formbricks/types/templates";
export const metadata: Metadata = {
title: "Your Surveys",
@@ -24,17 +23,10 @@ interface SurveyTemplateProps {
params: Promise<{
environmentId: string;
}>;
- searchParams: Promise<{
- role?: TTemplateRole;
- }>;
}
-export const SurveysPage = async ({
- params: paramsProps,
- searchParams: searchParamsProps,
-}: SurveyTemplateProps) => {
+export const SurveysPage = async ({ params: paramsProps }: SurveyTemplateProps) => {
const publicDomain = getPublicDomain();
- const searchParams = await searchParamsProps;
const params = await paramsProps;
const t = await getTranslate();
@@ -46,8 +38,6 @@ export const SurveysPage = async ({
const { session, isBilling, environment, isReadOnly } = await getEnvironmentAuth(params.environmentId);
- const prefilledFilters = [project?.config.channel, project.config.industry, searchParams.role ?? null];
-
if (isBilling) {
return redirect(`/environments/${params.environmentId}/settings/billing`);
}
@@ -79,7 +69,6 @@ export const SurveysPage = async ({
userId={session.user.id}
environment={environment}
project={projectWithRequiredProps}
- prefilledFilters={prefilledFilters}
isTemplatePage={false}
/>
);
diff --git a/apps/web/modules/survey/templates/components/template-container.test.tsx b/apps/web/modules/survey/templates/components/template-container.test.tsx
index 634137c54c..b281ee7e26 100644
--- a/apps/web/modules/survey/templates/components/template-container.test.tsx
+++ b/apps/web/modules/survey/templates/components/template-container.test.tsx
@@ -3,7 +3,6 @@ import "@testing-library/jest-dom/vitest";
import { cleanup, render, screen } from "@testing-library/react";
import { afterEach, describe, expect, test, vi } from "vitest";
import { TProjectConfigChannel, TProjectConfigIndustry } from "@formbricks/types/project";
-import { TTemplateRole } from "@formbricks/types/templates";
import { TemplateContainerWithPreview } from "./template-container";
// Mock dependencies
@@ -59,8 +58,6 @@ const mockEnvironment = {
appSetupCompleted: true,
};
-const mockPrefilledFilters: (TProjectConfigChannel | TProjectConfigIndustry | TTemplateRole | null)[] = [];
-
describe("TemplateContainerWithPreview", () => {
afterEach(() => {
cleanup();
@@ -72,7 +69,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={true}
/>
);
@@ -86,7 +82,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={false}
/>
);
@@ -100,7 +95,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={true}
/>
);
@@ -114,7 +108,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={false}
/>
);
@@ -128,7 +121,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={true}
/>
);
@@ -144,7 +136,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={true}
/>
);
@@ -158,7 +149,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={true}
/>
);
@@ -172,7 +162,6 @@ describe("TemplateContainerWithPreview", () => {
project={mockProject}
environment={mockEnvironment}
userId="user1"
- prefilledFilters={mockPrefilledFilters}
isTemplatePage={true}
/>
);
diff --git a/apps/web/modules/survey/templates/components/template-container.tsx b/apps/web/modules/survey/templates/components/template-container.tsx
index e64a1973f6..9701bf8ba2 100644
--- a/apps/web/modules/survey/templates/components/template-container.tsx
+++ b/apps/web/modules/survey/templates/components/template-container.tsx
@@ -5,19 +5,16 @@ import { TemplateList } from "@/modules/survey/components/template-list";
import { MenuBar } from "@/modules/survey/templates/components/menu-bar";
import { PreviewSurvey } from "@/modules/ui/components/preview-survey";
import { SearchBar } from "@/modules/ui/components/search-bar";
-import { Project } from "@prisma/client";
-import { Environment } from "@prisma/client";
+import type { Environment, Project } from "@prisma/client";
import { useTranslate } from "@tolgee/react";
import { useState } from "react";
-import type { TProjectConfigChannel, TProjectConfigIndustry } from "@formbricks/types/project";
-import type { TTemplate, TTemplateRole } from "@formbricks/types/templates";
+import type { TTemplate } from "@formbricks/types/templates";
import { getMinimalSurvey } from "../lib/minimal-survey";
type TemplateContainerWithPreviewProps = {
project: Project;
environment: Pick
;
userId: string;
- prefilledFilters: (TProjectConfigChannel | TProjectConfigIndustry | TTemplateRole | null)[];
isTemplatePage?: boolean;
};
@@ -25,7 +22,6 @@ export const TemplateContainerWithPreview = ({
project,
environment,
userId,
- prefilledFilters,
isTemplatePage = true,
}: TemplateContainerWithPreviewProps) => {
const { t } = useTranslate();
@@ -63,7 +59,6 @@ export const TemplateContainerWithPreview = ({
setActiveQuestionId(template.preset.questions[0].id);
setActiveTemplate(template);
}}
- prefilledFilters={prefilledFilters}
/>