Merge branch 'formbricks:main' into main

.github/ISSUE_TEMPLATE/feature_request.yml

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

.github/ISSUE_TEMPLATE/task.yml

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

apps/web/modules/survey/editor/components/add-ending-card-button.tsx

@@ -13,7 +13,7 @@ export const AddEndingCardButton = ({ localSurvey, addEndingCard }: AddEndingCar
   const { t } = useTranslate();
   return (
     <button
-      className="group inline-flex rounded-lg border border-slate-300 bg-slate-50 hover:cursor-pointer hover:bg-white"
+      className="group inline-flex items-stretch rounded-lg border border-slate-300 bg-slate-50 hover:cursor-pointer hover:bg-white"
       onClick={() => addEndingCard(localSurvey.endings.length)}>
       <div className="flex w-10 items-center justify-center rounded-l-lg bg-slate-400 transition-all duration-300 ease-in-out group-hover:bg-slate-500 group-aria-expanded:rounded-bl-none group-aria-expanded:rounded-br">
         <PlusIcon className="h-6 w-6 text-white" />

apps/web/modules/survey/list/components/survey-dropdown-menu.test.tsx

@@ -1,9 +1,16 @@
+// Import the actions to access mocked functions
+import { deleteSurveyAction } from "@/modules/survey/list/actions";
 import { TSurvey } from "@/modules/survey/list/types/surveys";
 import { cleanup, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
-import { afterEach, describe, expect, test, vi } from "vitest";
+import toast from "react-hot-toast";
+import { afterEach, beforeEach, describe, expect, test, vi } from "vitest";
 import { SurveyDropDownMenu } from "./survey-dropdown-menu";
 
+// Cast to mocked functions
+const mockDeleteSurveyAction = vi.mocked(deleteSurveyAction);
+const mockToast = vi.mocked(toast);
+
 // Mock translation
 vi.mock("@tolgee/react", () => ({
   useTranslate: () => ({ t: (key: string) => key }),
@@ -43,6 +50,24 @@ vi.mock("@/modules/survey/list/actions", () => ({
   getSurveyAction: vi.fn(() =>
     Promise.resolve({ data: { id: "duplicatedSurveyId", name: "Duplicated Survey" } })
   ),
+  deleteSurveyAction: vi.fn(),
+}));
+
+// Mock next/navigation
+const mockRouterRefresh = vi.fn();
+vi.mock("next/navigation", () => ({
+  useRouter: () => ({
+    refresh: mockRouterRefresh,
+    push: vi.fn(),
+  }),
+}));
+
+// Mock react-hot-toast
+vi.mock("react-hot-toast", () => ({
+  default: {
+    success: vi.fn(),
+    error: vi.fn(),
+  },
 }));
 
 describe("SurveyDropDownMenu", () => {
@@ -240,4 +265,245 @@ describe("SurveyDropDownMenu", () => {
       expect(mockDuplicateSurvey).toHaveBeenCalled();
     });
   });
+
+  describe("handleDeleteSurvey", () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    test("successfully deletes survey - calls all expected functions and shows success toast", async () => {
+      const mockDeleteSurvey = vi.fn();
+      mockDeleteSurveyAction.mockResolvedValueOnce({ data: true });
+
+      render(
+        <SurveyDropDownMenu
+          environmentId="env123"
+          survey={fakeSurvey}
+          publicDomain="http://survey.test"
+          refreshSingleUseId={vi.fn()}
+          duplicateSurvey={vi.fn()}
+          deleteSurvey={mockDeleteSurvey}
+        />
+      );
+
+      // Open dropdown and click delete
+      const menuWrapper = screen.getByTestId("survey-dropdown-menu");
+      const triggerElement = menuWrapper.querySelector("[class*='p-2']") as HTMLElement;
+      await userEvent.click(triggerElement);
+
+      const deleteButton = screen.getByText("common.delete");
+      await userEvent.click(deleteButton);
+
+      // Confirm deletion in dialog
+      const confirmDeleteButton = screen.getByText("common.delete");
+      await userEvent.click(confirmDeleteButton);
+
+      await waitFor(() => {
+        expect(mockDeleteSurveyAction).toHaveBeenCalledWith({ surveyId: "testSurvey" });
+        expect(mockDeleteSurvey).toHaveBeenCalledWith("testSurvey");
+        expect(mockToast.success).toHaveBeenCalledWith("environments.surveys.survey_deleted_successfully");
+        expect(mockRouterRefresh).toHaveBeenCalled();
+      });
+    });
+
+    test("handles deletion error - shows error toast and resets loading state", async () => {
+      const mockDeleteSurvey = vi.fn();
+      const deletionError = new Error("Deletion failed");
+      mockDeleteSurveyAction.mockRejectedValueOnce(deletionError);
+
+      render(
+        <SurveyDropDownMenu
+          environmentId="env123"
+          survey={fakeSurvey}
+          publicDomain="http://survey.test"
+          refreshSingleUseId={vi.fn()}
+          duplicateSurvey={vi.fn()}
+          deleteSurvey={mockDeleteSurvey}
+        />
+      );
+
+      // Open dropdown and click delete
+      const menuWrapper = screen.getByTestId("survey-dropdown-menu");
+      const triggerElement = menuWrapper.querySelector("[class*='p-2']") as HTMLElement;
+      await userEvent.click(triggerElement);
+
+      const deleteButton = screen.getByText("common.delete");
+      await userEvent.click(deleteButton);
+
+      // Confirm deletion in dialog
+      const confirmDeleteButton = screen.getByText("common.delete");
+      await userEvent.click(confirmDeleteButton);
+
+      await waitFor(() => {
+        expect(mockDeleteSurveyAction).toHaveBeenCalledWith({ surveyId: "testSurvey" });
+        expect(mockDeleteSurvey).not.toHaveBeenCalled();
+        expect(mockToast.error).toHaveBeenCalledWith("environments.surveys.error_deleting_survey");
+        expect(mockRouterRefresh).not.toHaveBeenCalled();
+      });
+    });
+
+    test("manages loading state correctly during successful deletion", async () => {
+      const mockDeleteSurvey = vi.fn();
+      mockDeleteSurveyAction.mockImplementation(
+        () => new Promise((resolve) => setTimeout(() => resolve({ data: true }), 100))
+      );
+
+      render(
+        <SurveyDropDownMenu
+          environmentId="env123"
+          survey={fakeSurvey}
+          publicDomain="http://survey.test"
+          refreshSingleUseId={vi.fn()}
+          duplicateSurvey={vi.fn()}
+          deleteSurvey={mockDeleteSurvey}
+        />
+      );
+
+      // Open dropdown and click delete
+      const menuWrapper = screen.getByTestId("survey-dropdown-menu");
+      const triggerElement = menuWrapper.querySelector("[class*='p-2']") as HTMLElement;
+      await userEvent.click(triggerElement);
+
+      const deleteButton = screen.getByText("common.delete");
+      await userEvent.click(deleteButton);
+
+      // Confirm deletion in dialog using a more reliable selector
+      const confirmDeleteButton = screen.getByText("common.delete");
+      await userEvent.click(confirmDeleteButton);
+
+      // Wait for the deletion process to complete
+      await waitFor(() => {
+        expect(mockDeleteSurveyAction).toHaveBeenCalled();
+        expect(mockDeleteSurvey).toHaveBeenCalled();
+        expect(mockToast.success).toHaveBeenCalled();
+      });
+    });
+
+    test("manages loading state correctly during failed deletion", async () => {
+      const mockDeleteSurvey = vi.fn();
+      mockDeleteSurveyAction.mockImplementation(
+        () => new Promise((_, reject) => setTimeout(() => reject(new Error("Network error")), 100))
+      );
+
+      render(
+        <SurveyDropDownMenu
+          environmentId="env123"
+          survey={fakeSurvey}
+          publicDomain="http://survey.test"
+          refreshSingleUseId={vi.fn()}
+          duplicateSurvey={vi.fn()}
+          deleteSurvey={mockDeleteSurvey}
+        />
+      );
+
+      // Open dropdown and click delete
+      const menuWrapper = screen.getByTestId("survey-dropdown-menu");
+      const triggerElement = menuWrapper.querySelector("[class*='p-2']") as HTMLElement;
+      await userEvent.click(triggerElement);
+
+      const deleteButton = screen.getByText("common.delete");
+      await userEvent.click(deleteButton);
+
+      // Confirm deletion in dialog using a more reliable selector
+      const confirmDeleteButton = screen.getByText("common.delete");
+      await userEvent.click(confirmDeleteButton);
+
+      // Wait for the error to occur
+      await waitFor(() => {
+        expect(mockDeleteSurveyAction).toHaveBeenCalled();
+        expect(mockToast.error).toHaveBeenCalledWith("environments.surveys.error_deleting_survey");
+      });
+
+      // Verify that deleteSurvey callback was not called due to error
+      expect(mockDeleteSurvey).not.toHaveBeenCalled();
+      expect(mockRouterRefresh).not.toHaveBeenCalled();
+    });
+
+    test("does not call router.refresh or success toast when deleteSurveyAction throws", async () => {
+      const mockDeleteSurvey = vi.fn();
+      mockDeleteSurveyAction.mockRejectedValueOnce(new Error("API Error"));
+
+      render(
+        <SurveyDropDownMenu
+          environmentId="env123"
+          survey={fakeSurvey}
+          publicDomain="http://survey.test"
+          refreshSingleUseId={vi.fn()}
+          duplicateSurvey={vi.fn()}
+          deleteSurvey={mockDeleteSurvey}
+        />
+      );
+
+      // Open dropdown and click delete
+      const menuWrapper = screen.getByTestId("survey-dropdown-menu");
+      const triggerElement = menuWrapper.querySelector("[class*='p-2']") as HTMLElement;
+      await userEvent.click(triggerElement);
+
+      const deleteButton = screen.getByText("common.delete");
+      await userEvent.click(deleteButton);
+
+      // Confirm deletion in dialog
+      const confirmDeleteButton = screen.getByText("common.delete");
+      await userEvent.click(confirmDeleteButton);
+
+      await waitFor(() => {
+        expect(mockDeleteSurveyAction).toHaveBeenCalled();
+        expect(mockToast.error).toHaveBeenCalled();
+      });
+
+      // Verify success-path functions are not called
+      expect(mockDeleteSurvey).not.toHaveBeenCalled();
+      expect(mockToast.success).not.toHaveBeenCalled();
+      expect(mockRouterRefresh).not.toHaveBeenCalled();
+    });
+
+    test("calls functions in correct order during successful deletion", async () => {
+      const mockDeleteSurvey = vi.fn();
+      const callOrder: string[] = [];
+
+      mockDeleteSurveyAction.mockImplementation(async () => {
+        callOrder.push("deleteSurveyAction");
+        return { data: true };
+      });
+
+      mockDeleteSurvey.mockImplementation(() => {
+        callOrder.push("deleteSurvey");
+      });
+
+      (mockToast.success as any).mockImplementation(() => {
+        callOrder.push("toast.success");
+      });
+
+      mockRouterRefresh.mockImplementation(() => {
+        callOrder.push("router.refresh");
+      });
+
+      render(
+        <SurveyDropDownMenu
+          environmentId="env123"
+          survey={fakeSurvey}
+          publicDomain="http://survey.test"
+          refreshSingleUseId={vi.fn()}
+          duplicateSurvey={vi.fn()}
+          deleteSurvey={mockDeleteSurvey}
+        />
+      );
+
+      // Open dropdown and click delete
+      const menuWrapper = screen.getByTestId("survey-dropdown-menu");
+      const triggerElement = menuWrapper.querySelector("[class*='p-2']") as HTMLElement;
+      await userEvent.click(triggerElement);
+
+      const deleteButton = screen.getByText("common.delete");
+      await userEvent.click(deleteButton);
+
+      // Confirm deletion in dialog
+      const confirmDeleteButton = screen.getByText("common.delete");
+      await userEvent.click(confirmDeleteButton);
+
+      await waitFor(() => {
+        expect(callOrder).toEqual(["deleteSurveyAction", "deleteSurvey", "toast.success", "router.refresh"]);
+      });
+    });
+  });
 });

apps/web/modules/survey/list/components/survey-dropdown-menu.tsx

@@ -71,13 +71,13 @@ export const SurveyDropDownMenu = ({
     try {
       await deleteSurveyAction({ surveyId });
       deleteSurvey(surveyId);
-      router.refresh();
-      setDeleteDialogOpen(false);
       toast.success(t("environments.surveys.survey_deleted_successfully"));
+      router.refresh();
     } catch (error) {
       toast.error(t("environments.surveys.error_deleting_survey"));
+    } finally {
+      setLoading(false);
     }
-    setLoading(false);
   };
 
   const handleCopyLink = async (e: React.MouseEvent<HTMLButtonElement>) => {
@@ -242,6 +242,7 @@ export const SurveyDropDownMenu = ({
           setOpen={setDeleteDialogOpen}
           onDelete={() => handleDeleteSurvey(survey.id)}
           text={t("environments.surveys.delete_survey_and_responses_warning")}
+          isDeleting={loading}
         />
       )}
 

apps/web/modules/survey/list/components/survey-list.test.tsx

@@ -10,7 +10,6 @@ import { TProjectConfigChannel } from "@formbricks/types/project";
 import { TSurveyFilters } from "@formbricks/types/surveys/types";
 import { TUserLocale } from "@formbricks/types/user";
 import { SurveyCard } from "./survey-card";
-import { SurveyFilters } from "./survey-filters";
 import { SurveysList, initialFilters as surveyFiltersInitialFiltersFromModule } from "./survey-list";
 import { SurveyLoading } from "./survey-loading";
 
@@ -324,6 +323,24 @@ describe("SurveysList", () => {
     expect(screen.getByText("Survey Two")).toBeInTheDocument();
   });
 
+  test("handleDeleteSurvey shows loading state when the last survey is deleted", async () => {
+    const surveysData = [{ ...surveyMock, id: "s1", name: "Last Survey" }];
+    vi.mocked(getSurveysAction).mockResolvedValueOnce({ data: surveysData });
+    const user = userEvent.setup();
+    render(<SurveysList {...defaultProps} />);
+
+    await waitFor(() => expect(screen.getByText("Last Survey")).toBeInTheDocument());
+    expect(screen.queryByTestId("survey-loading")).not.toBeInTheDocument();
+
+    const deleteButtonS1 = screen.getByTestId("delete-s1");
+    await user.click(deleteButtonS1);
+
+    await waitFor(() => {
+      expect(screen.queryByText("Last Survey")).not.toBeInTheDocument();
+      expect(screen.getByTestId("survey-loading")).toBeInTheDocument();
+    });
+  });
+
   test("handleDuplicateSurvey adds the duplicated survey to the beginning of the list", async () => {
     const initialSurvey = { ...surveyMock, id: "s1", name: "Original Survey" };
     vi.mocked(getSurveysAction).mockResolvedValueOnce({ data: [initialSurvey] });

apps/web/modules/survey/list/components/survey-list.tsx

@@ -123,6 +123,7 @@ export const SurveysList = ({
   const handleDeleteSurvey = async (surveyId: string) => {
     const newSurveys = surveys.filter((survey) => survey.id !== surveyId);
     setSurveys(newSurveys);
+    if (newSurveys.length === 0) setIsFetching(true);
   };
 
   const handleDuplicateSurvey = async (survey: TSurvey) => {

infra/formbricks-cloud-helm/values-staging.yaml.gotmpl

@@ -74,6 +74,8 @@ cronJob:
 
 ## Deployment & Autoscaling
 deployment:
+  image:
+    pullPolicy: Always
   resources:
     limits:
       cpu: 2