From a1d83ac7b993ba85c5bb5ec193b99ab9e77b0baf Mon Sep 17 00:00:00 2001 From: Piyush Gupta <56182734+gupta-piyush19@users.noreply.github.com> Date: Tue, 3 Sep 2024 17:52:28 +0530 Subject: [PATCH] fix: final bugs in release 2.5 (#3084) --- apps/docs/app/self-hosting/migration-guide/page.mdx | 2 +- .../data-migration.ts | 4 ++++ .../ui/SingleResponseCard/components/RenderResponse.tsx | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/docs/app/self-hosting/migration-guide/page.mdx b/apps/docs/app/self-hosting/migration-guide/page.mdx index 25ac13b648..7c4e3d82d2 100644 --- a/apps/docs/app/self-hosting/migration-guide/page.mdx +++ b/apps/docs/app/self-hosting/migration-guide/page.mdx @@ -94,7 +94,7 @@ docker pull ghcr.io/formbricks/data-migrations:latest && \ docker run --rm \ --network=formbricks_default \ -e DATABASE_URL="postgresql://postgres:postgres@postgres:5432/formbricks?schema=public" \ - -e UPGRADE_TO_VERSION="v2.4" \ + -e UPGRADE_TO_VERSION="v2.5" \ ghcr.io/formbricks/data-migrations:latest ``` diff --git a/packages/database/data-migrations/20240807120500_cta_consent_dismissed_inconsistency/data-migration.ts b/packages/database/data-migrations/20240807120500_cta_consent_dismissed_inconsistency/data-migration.ts index 2b540f436d..d4a2ad4673 100644 --- a/packages/database/data-migrations/20240807120500_cta_consent_dismissed_inconsistency/data-migration.ts +++ b/packages/database/data-migrations/20240807120500_cta_consent_dismissed_inconsistency/data-migration.ts @@ -1,3 +1,5 @@ +/* eslint-disable @typescript-eslint/restrict-template-expressions -- using template strings for logging */ + /* eslint-disable no-console -- logging is allowed in migration scripts */ import { PrismaClient } from "@prisma/client"; import { type TSurveyQuestion, TSurveyQuestionTypeEnum } from "@formbricks/types/surveys/types"; @@ -69,6 +71,8 @@ async function runMigration(): Promise { await Promise.all(migrationPromises); + console.log(`Updated ${migrationPromises.length} questions in ${relevantSurveys.length} surveys`); + const endTime = Date.now(); console.log(`Data migration completed. Total time: ${((endTime - startTime) / 1000).toString()}s`); }, diff --git a/packages/ui/SingleResponseCard/components/RenderResponse.tsx b/packages/ui/SingleResponseCard/components/RenderResponse.tsx index 4bc4129a45..a6911b624b 100644 --- a/packages/ui/SingleResponseCard/components/RenderResponse.tsx +++ b/packages/ui/SingleResponseCard/components/RenderResponse.tsx @@ -35,6 +35,14 @@ export const RenderResponse: React.FC = ({ language, isExpanded = true, }) => { + if ( + (typeof responseData === "string" && responseData === "") || + (Array.isArray(responseData) && responseData.length === 0) || + (typeof responseData === "object" && Object.keys(responseData).length === 0) + ) { + return

-

; + } + const handleArray = (data: string | number | string[]): string => { if (Array.isArray(data)) { return data.join(", ");