void;
lastQuestion: boolean;
+ isInValid: boolean;
}
export default function NPSQuestionForm({
@@ -17,6 +18,7 @@ export default function NPSQuestionForm({
questionIdx,
updateQuestion,
lastQuestion,
+ isInValid,
}: NPSQuestionFormProps): JSX.Element {
const [showSubheader, setShowSubheader] = useState(!!question.subheader);
@@ -31,6 +33,7 @@ export default function NPSQuestionForm({
name="headline"
value={question.headline}
onChange={(e) => updateQuestion(questionIdx, { headline: e.target.value })}
+ isInvalid={isInValid && question.headline.trim() === ""}
/>
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/OpenQuestionForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/OpenQuestionForm.tsx
index 55c9ec0a3a..9206c23fad 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/OpenQuestionForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/OpenQuestionForm.tsx
@@ -10,12 +10,14 @@ interface OpenQuestionFormProps {
questionIdx: number;
updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
lastQuestion: boolean;
+ isInValid: boolean;
}
export default function OpenQuestionForm({
question,
questionIdx,
updateQuestion,
+ isInValid,
}: OpenQuestionFormProps): JSX.Element {
const [showSubheader, setShowSubheader] = useState(!!question.subheader);
@@ -30,6 +32,7 @@ export default function OpenQuestionForm({
name="headline"
value={question.headline}
onChange={(e) => updateQuestion(questionIdx, { headline: e.target.value })}
+ isInvalid={isInValid && question.headline.trim() === ""}
/>
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx
index d422231eef..e8c91eb372 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionCard.tsx
@@ -39,6 +39,7 @@ interface QuestionCardProps {
activeQuestionId: string | null;
setActiveQuestionId: (questionId: string | null) => void;
lastQuestion: boolean;
+ isInValid: boolean;
}
export default function QuestionCard({
@@ -51,6 +52,7 @@ export default function QuestionCard({
activeQuestionId,
setActiveQuestionId,
lastQuestion,
+ isInValid,
}: QuestionCardProps) {
const question = localSurvey.questions[questionIdx];
const open = activeQuestionId === question.id;
@@ -69,7 +71,8 @@ export default function QuestionCard({
{questionIdx + 1}
@@ -136,6 +139,7 @@ export default function QuestionCard({
questionIdx={questionIdx}
updateQuestion={updateQuestion}
lastQuestion={lastQuestion}
+ isInValid={isInValid}
/>
) : question.type === QuestionType.MultipleChoiceSingle ? (
) : question.type === QuestionType.MultipleChoiceMulti ? (
) : question.type === QuestionType.NPS ? (
) : question.type === QuestionType.CTA ? (
) : question.type === QuestionType.Rating ? (
) : question.type === "consent" ? (
) : null}
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionsView.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionsView.tsx
index f4927fc83c..30f38e9cd3 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionsView.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/QuestionsView.tsx
@@ -9,6 +9,8 @@ import AddQuestionButton from "./AddQuestionButton";
import EditThankYouCard from "./EditThankYouCard";
import QuestionCard from "./QuestionCard";
import { StrictModeDroppable } from "./StrictModeDroppable";
+import { Question } from "@formbricks/types/questions";
+import { validateQuestion } from "./Validation";
interface QuestionsViewProps {
localSurvey: Survey;
@@ -16,6 +18,8 @@ interface QuestionsViewProps {
activeQuestionId: string | null;
setActiveQuestionId: (questionId: string | null) => void;
environmentId: string;
+ invalidQuestions: String[] | null;
+ setInvalidQuestions: (invalidQuestions: String[] | null) => void;
}
export default function QuestionsView({
@@ -24,6 +28,8 @@ export default function QuestionsView({
localSurvey,
setLocalSurvey,
environmentId,
+ invalidQuestions,
+ setInvalidQuestions,
}: QuestionsViewProps) {
const internalQuestionIdMap = useMemo(() => {
return localSurvey.questions.reduce((acc, question) => {
@@ -44,12 +50,33 @@ export default function QuestionsView({
return survey;
};
+ // function to validate individual questions
+ const validateSurvey = (question: Question) => {
+ // prevent this function to execute further if user hasnt still tried to save the survey
+ if (invalidQuestions === null) {
+ return;
+ }
+ let temp = JSON.parse(JSON.stringify(invalidQuestions));
+ if (validateQuestion(question)) {
+ temp = invalidQuestions.filter((id) => id !== question.id);
+ setInvalidQuestions(temp);
+ } else if (!invalidQuestions.includes(question.id)) {
+ temp.push(question.id);
+ setInvalidQuestions(temp);
+ }
+ };
+
const updateQuestion = (questionIdx: number, updatedAttributes: any) => {
let updatedSurvey = JSON.parse(JSON.stringify(localSurvey));
if ("id" in updatedAttributes) {
// if the survey whose id is to be changed is linked to logic of any other survey then changing it
const initialQuestionId = updatedSurvey.questions[questionIdx].id;
updatedSurvey = handleQuestionLogicChange(updatedSurvey, initialQuestionId, updatedAttributes.id);
+ if (invalidQuestions?.includes(initialQuestionId)) {
+ setInvalidQuestions(
+ invalidQuestions.map((id) => (id === initialQuestionId ? updatedAttributes.id : id))
+ );
+ }
// relink the question to internal Id
internalQuestionIdMap[updatedAttributes.id] =
@@ -63,6 +90,7 @@ export default function QuestionsView({
...updatedAttributes,
};
setLocalSurvey(updatedSurvey);
+ validateSurvey(updatedSurvey.questions[questionIdx]);
};
const deleteQuestion = (questionIdx: number) => {
@@ -120,7 +148,6 @@ export default function QuestionsView({
if (!result.destination) {
return;
}
-
const newQuestions = Array.from(localSurvey.questions);
const [reorderedQuestion] = newQuestions.splice(result.source.index, 1);
newQuestions.splice(result.destination.index, 0, reorderedQuestion);
@@ -134,7 +161,6 @@ export default function QuestionsView({
const [reorderedQuestion] = newQuestions.splice(questionIndex, 1);
const destinationIndex = up ? questionIndex - 1 : questionIndex + 1;
newQuestions.splice(destinationIndex, 0, reorderedQuestion);
-
const updatedSurvey = { ...localSurvey, questions: newQuestions };
setLocalSurvey(updatedSurvey);
};
@@ -159,6 +185,7 @@ export default function QuestionsView({
activeQuestionId={activeQuestionId}
setActiveQuestionId={setActiveQuestionId}
lastQuestion={questionIdx === localSurvey.questions.length - 1}
+ isInValid={invalidQuestions ? invalidQuestions.includes(question.id) : false}
/>
))}
{provided.placeholder}
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/RatingQuestionForm.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/RatingQuestionForm.tsx
index 95e05466b5..94a708de14 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/RatingQuestionForm.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/RatingQuestionForm.tsx
@@ -12,6 +12,7 @@ interface RatingQuestionFormProps {
questionIdx: number;
updateQuestion: (questionIdx: number, updatedAttributes: any) => void;
lastQuestion: boolean;
+ isInValid: boolean;
}
export default function RatingQuestionForm({
@@ -19,6 +20,7 @@ export default function RatingQuestionForm({
questionIdx,
updateQuestion,
lastQuestion,
+ isInValid,
}: RatingQuestionFormProps) {
const [showSubheader, setShowSubheader] = useState(!!question.subheader);
@@ -33,6 +35,7 @@ export default function RatingQuestionForm({
name="headline"
value={question.headline}
onChange={(e) => updateQuestion(questionIdx, { headline: e.target.value })}
+ isInvalid={isInValid && question.headline.trim() === ""}
/>
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
index d64bb83bf4..cb23359749 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
@@ -22,7 +22,7 @@ export default function SurveyEditor({ environmentId, surveyId }: SurveyEditorPr
const [activeView, setActiveView] = useState<"questions" | "settings">("questions");
const [activeQuestionId, setActiveQuestionId] = useState(null);
const [localSurvey, setLocalSurvey] = useState();
-
+ const [invalidQuestions, setInvalidQuestions] = useState(null);
const { survey, isLoadingSurvey, isErrorSurvey } = useSurvey(environmentId, surveyId);
const { product, isLoadingProduct, isErrorProduct } = useProduct(environmentId);
const { environment, isLoadingEnvironment, isErrorEnvironment } = useEnvironment(environmentId);
@@ -56,6 +56,7 @@ export default function SurveyEditor({ environmentId, surveyId }: SurveyEditorPr
environmentId={environmentId}
activeId={activeView}
setActiveId={setActiveView}
+ setInvalidQuestions={setInvalidQuestions}
/>
@@ -67,6 +68,8 @@ export default function SurveyEditor({ environmentId, surveyId }: SurveyEditorPr
activeQuestionId={activeQuestionId}
setActiveQuestionId={setActiveQuestionId}
environmentId={environmentId}
+ invalidQuestions={invalidQuestions}
+ setInvalidQuestions={setInvalidQuestions}
/>
) : (
void;
+ setInvalidQuestions: (invalidQuestions: String[]) => void;
}
export default function SurveyMenuBar({
@@ -30,6 +32,7 @@ export default function SurveyMenuBar({
setLocalSurvey,
activeId,
setActiveId,
+ setInvalidQuestions,
}: SurveyMenuBarProps) {
const router = useRouter();
const { triggerSurveyMutate, isMutatingSurvey } = useSurveyMutation(environmentId, localSurvey.id);
@@ -37,6 +40,7 @@ export default function SurveyMenuBar({
const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
const [isConfirmDialogOpen, setConfirmDialogOpen] = useState(false);
const { product } = useProduct(environmentId);
+ let faultyQuestions: String[] = [];
useEffect(() => {
if (audiencePrompt && activeId === "settings") {
@@ -85,6 +89,26 @@ export default function SurveyMenuBar({
}
};
+ const validateSurvey = (survey) => {
+ faultyQuestions = [];
+ for (let index = 0; index < survey.questions.length; index++) {
+ const question = survey.questions[index];
+ const isValid = validateQuestion(question);
+
+ if (!isValid) {
+ faultyQuestions.push(question.id);
+ }
+ }
+ // if there are any faulty questions, the user won't be allowed to save the survey
+ if (faultyQuestions.length > 0) {
+ setInvalidQuestions(faultyQuestions);
+ toast.error("Please fill required fields");
+ return false;
+ }
+
+ return true;
+ };
+
const saveSurveyAction = (shouldNavigateBack = false) => {
// variable named strippedSurvey that is a copy of localSurvey with isDraft removed from every question
const strippedSurvey = {
@@ -94,6 +118,11 @@ export default function SurveyMenuBar({
return rest;
}),
};
+
+ if (!validateSurvey(localSurvey)) {
+ return;
+ }
+
triggerSurveyMutate({ ...strippedSurvey })
.then(async (response) => {
if (!response?.ok) {
@@ -180,6 +209,9 @@ export default function SurveyMenuBar({
variant="darkCTA"
loading={isMutatingSurvey}
onClick={async () => {
+ if (!validateSurvey(localSurvey)) {
+ return;
+ }
await triggerSurveyMutate({ ...localSurvey, status: "inProgress" });
router.push(`/environments/${environmentId}/surveys/${localSurvey.id}/summary?success=true`);
}}>
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
new file mode 100644
index 0000000000..b11dc523e0
--- /dev/null
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/Validation.ts
@@ -0,0 +1,32 @@
+// extend this object in order to add more validation rules
+
+import {
+ MultipleChoiceMultiQuestion,
+ MultipleChoiceSingleQuestion,
+ Question,
+} from "@formbricks/types/questions";
+
+const validationRules = {
+ multipleChoiceMulti: (question: MultipleChoiceMultiQuestion) => {
+ return !question.choices.some((element) => element.label.trim() === "");
+ },
+ multipleChoiceSingle: (question: MultipleChoiceSingleQuestion) => {
+ return !question.choices.some((element) => element.label.trim() === "");
+ },
+ defaultValidation: (question: Question) => {
+ return question.headline.trim() !== "";
+ },
+};
+
+const validateQuestion = (question) => {
+ const specificValidation = validationRules[question.type];
+ const defaultValidation = validationRules.defaultValidation;
+
+ const specificValidationResult = specificValidation ? specificValidation(question) : true;
+ const defaultValidationResult = defaultValidation(question);
+
+ // Return true only if both specific and default validation pass
+ return specificValidationResult && defaultValidationResult;
+};
+
+export { validateQuestion };
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx
index fb72c0149e..baff375dbb 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/page.tsx
@@ -1,10 +1,15 @@
+export const revalidate = REVALIDATION_INTERVAL;
+
import ContentWrapper from "@/components/shared/ContentWrapper";
import WidgetStatusIndicator from "@/components/shared/WidgetStatusIndicator";
import SurveysList from "./SurveyList";
import { Metadata } from "next";
+import { REVALIDATION_INTERVAL } from "@formbricks/lib/constants";
+
export const metadata: Metadata = {
title: "Your Surveys",
};
+
export default async function SurveysPage({ params }) {
return (
diff --git a/apps/web/app/api/v1/client/responses/route.ts b/apps/web/app/api/v1/client/responses/route.ts
index fac01954e7..152c496e76 100644
--- a/apps/web/app/api/v1/client/responses/route.ts
+++ b/apps/web/app/api/v1/client/responses/route.ts
@@ -45,6 +45,7 @@ export async function POST(request: Request): Promise {
let response: TResponse;
try {
const meta = {
+ url: responseInput?.meta?.url ?? "",
userAgent: {
browser: agent?.browser.name,
device: agent?.device.type,
diff --git a/apps/web/components/preview/NPSQuestion.tsx b/apps/web/components/preview/NPSQuestion.tsx
index 87286d8b21..e4ae2152d2 100644
--- a/apps/web/components/preview/NPSQuestion.tsx
+++ b/apps/web/components/preview/NPSQuestion.tsx
@@ -18,6 +18,7 @@ export default function NPSQuestion({ question, onSubmit, lastQuestion, brandCol
const handleSelect = (number: number) => {
setSelectedChoice(number);
if (question.required) {
+ setSelectedChoice(null);
onSubmit({
[question.id]: number,
});
@@ -33,6 +34,7 @@ export default function NPSQuestion({ question, onSubmit, lastQuestion, brandCol
[question.id]: selectedChoice,
};
+ setSelectedChoice(null);
onSubmit(data);
// reset form
}}>
@@ -54,7 +56,7 @@ export default function NPSQuestion({ question, onSubmit, lastQuestion, brandCol
name="nps"
value={number}
className="absolute h-full w-full cursor-pointer opacity-0"
- onChange={() => handleSelect(number)}
+ onClick={() => handleSelect(number)}
required={question.required}
/>
{number}
diff --git a/apps/web/lib/linkSurvey/linkSurvey.ts b/apps/web/lib/linkSurvey/linkSurvey.ts
index 6569eea2dd..5e7bafef7e 100644
--- a/apps/web/lib/linkSurvey/linkSurvey.ts
+++ b/apps/web/lib/linkSurvey/linkSurvey.ts
@@ -108,6 +108,9 @@ export const useLinkSurveyUtils = (survey: Survey) => {
personId: personId,
finished,
data,
+ meta: {
+ url: window.location.href,
+ },
};
if (!responseId && !isPreview) {
const response = await createResponse(
diff --git a/docker/README.md b/docker/README.md
index fa0c5047ec..f9db6200c7 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -6,33 +6,33 @@ Follow the instructions below to quickly get Formbricks running on your system w
Open a terminal and create a new directory for Formbricks, then navigate into this new directory:
- \```bash
+ ```bash
mkdir formbricks-quickstart && cd formbricks-quickstart
- \```
+ ```
2. **Download the Docker-Compose File**
Download the docker-compose file directly from the Formbricks repository:
- \```bash
+ ```bash
curl -o docker-compose.yml https://raw.githubusercontent.com/formbricks/formbricks/docker/main/docker-compose.yml
- \```
+ ```
3. **Generate NextAuth Secret**
Next, you need to generate a NextAuth secret. This will be used for session signing and encryption. The `sed` command below generates a random string using `openssl`, then replaces the `NEXTAUTH_SECRET:` placeholder in the `docker-compose.yml` file with this generated secret:
- \```bash
+ ```bash
sed -i "/NEXTAUTH_SECRET:$/s/NEXTAUTH_SECRET:.\*/NEXTAUTH_SECRET: $(openssl rand -base64 32)/" docker-compose.yml
- \```
+ ```
4. **Start the Docker Setup**
You're now ready to start the Formbricks Docker setup. The following command will start Formbricks together with a postgreSQL database using Docker Compose:
- \```bash
+ ```bash
docker compose up -d
- \```
+ ```
The `-d` flag will run the containers in detached mode, meaning they'll run in the background.
diff --git a/package.json b/package.json
index e0cffa9c76..bce0201219 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"db:migrate:deploy": "turbo run db:migrate:deploy",
"db:migrate:vercel": "turbo run db:migrate:vercel",
"db:push": "turbo run db:push",
- "go": "turbo run go",
+ "go": "turbo run go --concurrency 16",
"dev": "turbo run dev --parallel",
"start": "turbo run start --parallel",
"format": "prettier --write \"**/*.{ts,tsx,md}\"",
diff --git a/packages/database/package.json b/packages/database/package.json
index 21a225f117..64cc84a348 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -17,7 +17,6 @@
"db:up": "docker-compose up -d",
"db:setup": "pnpm db:up && pnpm db:migrate:dev",
"db:start": "pnpm db:setup",
- "go": "pnpm db:setup",
"format": "prisma format",
"generate": "prisma generate",
"lint": "eslint ./src --fix",
diff --git a/packages/js/src/components/NPSQuestion.tsx b/packages/js/src/components/NPSQuestion.tsx
index 445dec4bde..1137c68065 100644
--- a/packages/js/src/components/NPSQuestion.tsx
+++ b/packages/js/src/components/NPSQuestion.tsx
@@ -20,6 +20,7 @@ export default function NPSQuestion({ question, onSubmit, lastQuestion, brandCol
const handleSelect = (number: number) => {
setSelectedChoice(number);
if (question.required) {
+ setSelectedChoice(null);
onSubmit({
[question.id]: number,
});
@@ -36,6 +37,7 @@ export default function NPSQuestion({ question, onSubmit, lastQuestion, brandCol
data[question.id] = selectedChoice;
}
+ setSelectedChoice(null);
onSubmit(data);
// reset form
}}>
@@ -57,7 +59,7 @@ export default function NPSQuestion({ question, onSubmit, lastQuestion, brandCol
name="nps"
value={number}
className="fb-absolute fb-h-full fb-w-full fb-cursor-pointer fb-opacity-0"
- onChange={() => handleSelect(number)}
+ onClick={() => handleSelect(number)}
required={question.required}
/>
{number}
diff --git a/packages/js/src/components/SurveyView.tsx b/packages/js/src/components/SurveyView.tsx
index 92404e81a2..88028b7caf 100644
--- a/packages/js/src/components/SurveyView.tsx
+++ b/packages/js/src/components/SurveyView.tsx
@@ -187,6 +187,9 @@ export default function SurveyView({ config, survey, close, errorHandler }: Surv
personId: config.state.person.id,
finished,
data,
+ meta: {
+ url: window.location.href,
+ },
};
if (!responseId) {
const [response, _] = await Promise.all([
diff --git a/packages/lib/services/environment.ts b/packages/lib/services/environment.ts
index 550e43bb40..9b2e3c7ab5 100644
--- a/packages/lib/services/environment.ts
+++ b/packages/lib/services/environment.ts
@@ -38,42 +38,40 @@ export const getEnvironment = cache(async (environmentId: string): Promise => {
- let productPrisma;
- try {
- productPrisma = await prisma.product.findFirst({
- where: {
- id: productId,
- },
- include:{
- environments:true
- }
- });
+export const getEnvironments = cache(async (productId: string): Promise => {
+ let productPrisma;
+ try {
+ productPrisma = await prisma.product.findFirst({
+ where: {
+ id: productId,
+ },
+ include: {
+ environments: true,
+ },
+ });
- if (!productPrisma) {
- throw new ResourceNotFoundError("Product", productId);
- }
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError("Database operation failed");
- }
- throw error;
+ if (!productPrisma) {
+ throw new ResourceNotFoundError("Product", productId);
}
-
- const environments:TEnvironment[]=[];
- for(let environment of productPrisma.environments){
- let targetEnvironment:TEnvironment=ZEnvironment.parse(environment);
- environments.push(targetEnvironment);
- }
-
- try {
- return environments;
- } catch (error) {
- if (error instanceof z.ZodError) {
- console.error(JSON.stringify(error.errors, null, 2));
- }
- throw new ValidationError("Data validation of environments array failed");
+ } catch (error) {
+ if (error instanceof Prisma.PrismaClientKnownRequestError) {
+ throw new DatabaseError("Database operation failed");
}
+ throw error;
}
-);
\ No newline at end of file
+
+ const environments: TEnvironment[] = [];
+ for (let environment of productPrisma.environments) {
+ let targetEnvironment: TEnvironment = ZEnvironment.parse(environment);
+ environments.push(targetEnvironment);
+ }
+
+ try {
+ return environments;
+ } catch (error) {
+ if (error instanceof z.ZodError) {
+ console.error(JSON.stringify(error.errors, null, 2));
+ }
+ throw new ValidationError("Data validation of environments array failed");
+ }
+});
diff --git a/packages/lib/services/person.ts b/packages/lib/services/person.ts
index 75e5df446f..5bdf0f02bb 100644
--- a/packages/lib/services/person.ts
+++ b/packages/lib/services/person.ts
@@ -33,13 +33,10 @@ type TransformPersonInput = {
};
export const transformPrismaPerson = (person: TransformPersonInput): TPerson => {
- const attributes = person.attributes.reduce(
- (acc, attr) => {
- acc[attr.attributeClass.name] = attr.value;
- return acc;
- },
- {} as Record
- );
+ const attributes = person.attributes.reduce((acc, attr) => {
+ acc[attr.attributeClass.name] = attr.value;
+ return acc;
+ }, {} as Record);
return {
id: person.id,
diff --git a/packages/lib/services/product.ts b/packages/lib/services/product.ts
index dc707f5313..12451da4e9 100644
--- a/packages/lib/services/product.ts
+++ b/packages/lib/services/product.ts
@@ -41,4 +41,3 @@ export const getProductByEnvironmentId = cache(async (environmentId: string): Pr
throw new ValidationError("Data validation of product failed");
}
});
-
diff --git a/packages/types/v1/responses.ts b/packages/types/v1/responses.ts
index d62c10bada..3d2e2bc428 100644
--- a/packages/types/v1/responses.ts
+++ b/packages/types/v1/responses.ts
@@ -28,6 +28,7 @@ const ZResponseNote = z.object({
export type TResponseNote = z.infer;
export const ZResponseMeta = z.object({
+ url: z.string(),
userAgent: z.object({
browser: z.string().optional(),
os: z.string().optional(),
@@ -67,6 +68,7 @@ export const ZResponseInput = z.object({
data: ZResponseData,
meta: z
.object({
+ url: z.string().optional(),
userAgent: z
.object({
browser: z.string().optional(),
diff --git a/packages/ui/components/ColorPicker.tsx b/packages/ui/components/ColorPicker.tsx
index ed73638ad3..1f3b996c4a 100644
--- a/packages/ui/components/ColorPicker.tsx
+++ b/packages/ui/components/ColorPicker.tsx
@@ -12,7 +12,7 @@ export const ColorPicker = ({ color, onChange }: { color: string; onChange: (v:
#
diff --git a/packages/ui/components/Input.tsx b/packages/ui/components/Input.tsx
index 8032e72f1f..7f5cf2ac53 100644
--- a/packages/ui/components/Input.tsx
+++ b/packages/ui/components/Input.tsx
@@ -7,6 +7,7 @@ export interface InputProps
dangerouslySetInnerHTML?: {
__html: string;
};
+ isInvalid?: boolean;
}
const Input = React.forwardRef(({ className, ...props }, ref) => {
@@ -14,7 +15,8 @@ const Input = React.forwardRef(({ className, ...pr