+
{IMPRINT_URL && (
- | }
{PRIVACY_URL && (
- {
+ const startTime = Date.now();
+ console.log("Starting data migration...");
+
+ await prisma.$transaction(
+ async (transactionPrisma) => {
+ const websiteSurveys = await transactionPrisma.survey.findMany({
+ where: { type: "website" },
+ });
+
+ const updationPromises = [];
+
+ for (const websiteSurvey of websiteSurveys) {
+ updationPromises.push(
+ transactionPrisma.survey.update({
+ where: { id: websiteSurvey.id },
+ data: {
+ type: "app",
+ segment: {
+ connectOrCreate: {
+ where: {
+ environmentId_title: {
+ environmentId: websiteSurvey.environmentId,
+ title: websiteSurvey.id,
+ },
+ },
+ create: {
+ title: websiteSurvey.id,
+ isPrivate: true,
+ environmentId: websiteSurvey.environmentId,
+ },
+ },
+ },
+ },
+ })
+ );
+ }
+
+ await Promise.all(updationPromises);
+ console.log(`Updated ${websiteSurveys.length.toString()} website surveys to app surveys`);
+ },
+ {
+ timeout: TRANSACTION_TIMEOUT,
+ }
+ );
+
+ const endTime = Date.now();
+ console.log(`Data migration completed. Total time: ${((endTime - startTime) / 1000).toFixed(2)}s`);
+}
+
+function handleError(error: unknown): void {
+ console.error("An error occurred during migration:", error);
+ process.exit(1);
+}
+
+function handleDisconnectError(): void {
+ console.error("Failed to disconnect Prisma client");
+ process.exit(1);
+}
+
+function main(): void {
+ runMigration()
+ .catch(handleError)
+ .finally(() => {
+ prisma.$disconnect().catch(handleDisconnectError);
+ });
+}
+
+main();
diff --git a/packages/database/migrations/20241004070040_removed_website_setup_completed/migration.sql b/packages/database/migrations/20241004070040_removed_website_setup_completed/migration.sql
new file mode 100644
index 0000000000..45812adf63
--- /dev/null
+++ b/packages/database/migrations/20241004070040_removed_website_setup_completed/migration.sql
@@ -0,0 +1,8 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `websiteSetupCompleted` on the `Environment` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Environment" DROP COLUMN "websiteSetupCompleted";
diff --git a/packages/database/package.json b/packages/database/package.json
index 75e628477c..ab164a8d35 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -51,23 +51,25 @@
"data-migration:add-display-id-to-response": "ts-node ./data-migrations/20240905120500_refactor_display_response_relationship/data-migration.ts",
"data-migration:address-question": "ts-node ./data-migrations/20240924123456_migrate_address_question/data-migration.ts",
"data-migration:advanced-logic": "ts-node ./data-migrations/20240828122408_advanced_logic_editor/data-migration.ts",
- "data-migration:segments-actions-cleanup": "ts-node ./data-migrations/20240904091113_removed_actions_table/data-migration.ts"
+ "data-migration:segments-actions-cleanup": "ts-node ./data-migrations/20240904091113_removed_actions_table/data-migration.ts",
+ "data-migration:migrate-survey-types": "ts-node ./data-migrations/20241002123456_migrate_survey_types/data-migration.ts",
+ "data-migration:v2.6": "pnpm data-migration:add-display-id-to-response && pnpm data-migration:address-question && pnpm data-migration:advanced-logic && pnpm data-migration:segments-actions-cleanup && pnpm data-migration:migrate-survey-types"
},
"dependencies": {
- "@prisma/client": "^5.18.0",
- "@prisma/extension-accelerate": "^1.1.0",
- "dotenv-cli": "^7.4.2"
+ "@prisma/client": "5.20.0",
+ "@prisma/extension-accelerate": "1.2.1",
+ "dotenv-cli": "7.4.2"
},
"devDependencies": {
"@formbricks/config-typescript": "workspace:*",
"@formbricks/types": "workspace:*",
- "@paralleldrive/cuid2": "^2.2.2",
+ "@paralleldrive/cuid2": "2.2.2",
"@formbricks/eslint-config": "workspace:*",
- "prisma": "^5.18.0",
- "prisma-dbml-generator": "^0.12.0",
- "prisma-json-types-generator": "^3.0.4",
- "ts-node": "^10.9.2",
- "zod": "^3.23.8",
- "zod-prisma": "^0.5.4"
+ "prisma": "5.20.0",
+ "prisma-dbml-generator": "0.12.0",
+ "prisma-json-types-generator": "3.1.1",
+ "ts-node": "10.9.2",
+ "zod": "3.23.8",
+ "zod-prisma": "0.5.4"
}
}
diff --git a/packages/database/schema.prisma b/packages/database/schema.prisma
index d7ed320930..3342dca9ed 100644
--- a/packages/database/schema.prisma
+++ b/packages/database/schema.prisma
@@ -386,24 +386,23 @@ model Integration {
}
model Environment {
- id String @id @default(cuid())
- createdAt DateTime @default(now()) @map(name: "created_at")
- updatedAt DateTime @updatedAt @map(name: "updated_at")
- type EnvironmentType
- product Product @relation(fields: [productId], references: [id], onDelete: Cascade)
- productId String
- widgetSetupCompleted Boolean @default(false)
- appSetupCompleted Boolean @default(false)
- websiteSetupCompleted Boolean @default(false)
- surveys Survey[]
- people Person[]
- actionClasses ActionClass[]
- attributeClasses AttributeClass[]
- apiKeys ApiKey[]
- webhooks Webhook[]
- tags Tag[]
- segments Segment[]
- integration Integration[]
+ id String @id @default(cuid())
+ createdAt DateTime @default(now()) @map(name: "created_at")
+ updatedAt DateTime @updatedAt @map(name: "updated_at")
+ type EnvironmentType
+ product Product @relation(fields: [productId], references: [id], onDelete: Cascade)
+ productId String
+ widgetSetupCompleted Boolean @default(false)
+ appSetupCompleted Boolean @default(false)
+ surveys Survey[]
+ people Person[]
+ actionClasses ActionClass[]
+ attributeClasses AttributeClass[]
+ apiKeys ApiKey[]
+ webhooks Webhook[]
+ tags Tag[]
+ segments Segment[]
+ integration Integration[]
@@index([productId])
}
diff --git a/packages/ee/advanced-targeting/components/advanced-targeting-card.tsx b/packages/ee/advanced-targeting/components/advanced-targeting-card.tsx
index 839b8d6fff..c09cf5a1d1 100644
--- a/packages/ee/advanced-targeting/components/advanced-targeting-card.tsx
+++ b/packages/ee/advanced-targeting/components/advanced-targeting-card.tsx
@@ -16,6 +16,7 @@ import type {
TSegmentUpdateInput,
} from "@formbricks/types/segment";
import type { TSurvey } from "@formbricks/types/surveys/types";
+import { Alert, AlertDescription } from "@formbricks/ui/components/Alert";
import { AlertDialog } from "@formbricks/ui/components/AlertDialog";
import { Button } from "@formbricks/ui/components/Button";
import { LoadSegmentModal } from "@formbricks/ui/components/LoadSegmentModal";
@@ -161,7 +162,7 @@ export function AdvancedTargetingCard({
return (
);
diff --git a/packages/ee/advanced-targeting/components/segment-editor.tsx b/packages/ee/advanced-targeting/components/segment-editor.tsx
index 435fbc1a36..4ee733f091 100644
--- a/packages/ee/advanced-targeting/components/segment-editor.tsx
+++ b/packages/ee/advanced-targeting/components/segment-editor.tsx
@@ -1,4 +1,4 @@
-import { MoreVertical, Trash2 } from "lucide-react";
+import { ArrowDownIcon, ArrowUpIcon, MoreVertical, Trash2 } from "lucide-react";
import { useState } from "react";
import { cn } from "@formbricks/lib/cn";
import { structuredClone } from "@formbricks/lib/pollyfills/structuredClone";
@@ -224,7 +224,8 @@ export function SegmentEditor({
@@ -232,7 +233,8 @@ export function SegmentEditor({
onClick={() => {
if (viewOnly) return;
handleMoveResource(groupId, "down");
- }}>
+ }}
+ icon={
}>
Move down
diff --git a/packages/ee/advanced-targeting/components/segment-filter.tsx b/packages/ee/advanced-targeting/components/segment-filter.tsx
index f80e9596e6..3c04143428 100644
--- a/packages/ee/advanced-targeting/components/segment-filter.tsx
+++ b/packages/ee/advanced-targeting/components/segment-filter.tsx
@@ -1,4 +1,6 @@
import {
+ ArrowDownIcon,
+ ArrowUpIcon,
FingerprintIcon,
MonitorSmartphoneIcon,
MoreVertical,
@@ -161,13 +163,15 @@ function SegmentFilterItemContextMenu({
diff --git a/packages/ee/lib/service.ts b/packages/ee/lib/service.ts
index d9c5572661..b2ca13e85d 100644
--- a/packages/ee/lib/service.ts
+++ b/packages/ee/lib/service.ts
@@ -1,6 +1,7 @@
import "server-only";
import { HttpsProxyAgent } from "https-proxy-agent";
import fetch from "node-fetch";
+import { cache as reactCache } from "react";
import { prisma } from "@formbricks/database";
import { cache, revalidateTag } from "@formbricks/lib/cache";
import {
@@ -184,53 +185,55 @@ export const getLicenseFeatures = async (): Promise