From 386436ad5f4ef551d82358c69fc02f78158c2262 Mon Sep 17 00:00:00 2001 From: Piyush Gupta <56182734+gupta-piyush19@users.noreply.github.com> Date: Mon, 6 May 2024 17:25:45 +0530 Subject: [PATCH 1/2] fix: fixes survey createdBy filtering for null createdBy surveys (#2577) --- packages/lib/survey/util.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/lib/survey/util.ts b/packages/lib/survey/util.ts index c2d30634bd..88a0192104 100644 --- a/packages/lib/survey/util.ts +++ b/packages/lib/survey/util.ts @@ -50,7 +50,18 @@ export const buildWhereClause = (filterCriteria?: TSurveyFilterCriteria) => { whereClause.push({ createdBy: filterCriteria.createdBy.userId }); } if (filterCriteria.createdBy.value[0] === "others") { - whereClause.push({ createdBy: { not: filterCriteria.createdBy.userId } }); + whereClause.push({ + OR: [ + { + createdBy: { + not: filterCriteria.createdBy.userId, + }, + }, + { + createdBy: null, + }, + ], + }); } } } From 7c388c975aed77469c769a1f6e357c3e6ceed0b9 Mon Sep 17 00:00:00 2001 From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com> Date: Mon, 6 May 2024 20:08:50 +0530 Subject: [PATCH 2/2] fix: image uploader on welcome card (#2576) --- packages/ui/QuestionFormInput/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ui/QuestionFormInput/utils.ts b/packages/ui/QuestionFormInput/utils.ts index 7e2201ac98..e547271f22 100644 --- a/packages/ui/QuestionFormInput/utils.ts +++ b/packages/ui/QuestionFormInput/utils.ts @@ -54,7 +54,7 @@ export const determineImageUploaderVisibility = (questionIdx: number, localSurve case localSurvey.questions.length: // Thank You Card return !!localSurvey.thankYouCard.imageUrl || !!localSurvey.thankYouCard.videoUrl; case -1: // Welcome Card - return !!localSurvey.welcomeCard.fileUrl || !!localSurvey.welcomeCard.videoUrl; + return false; default: // Regular Survey Question const question = localSurvey.questions[questionIdx];