=> {
- const personEmail = response.personAttributes?.email;
+ const personEmail = response.contactAttributes?.email;
const organization = await getOrganizationByEnvironmentId(environmentId);
if (!organization) {
diff --git a/apps/web/modules/surveys/components/QuestionFormInput/components/RecallItemSelect.tsx b/apps/web/modules/surveys/components/QuestionFormInput/components/RecallItemSelect.tsx
index 86e7036c80..a3588c8ff4 100644
--- a/apps/web/modules/surveys/components/QuestionFormInput/components/RecallItemSelect.tsx
+++ b/apps/web/modules/surveys/components/QuestionFormInput/components/RecallItemSelect.tsx
@@ -22,7 +22,7 @@ import {
} from "lucide-react";
import { useMemo, useState } from "react";
import { replaceRecallInfoWithUnderline } from "@formbricks/lib/utils/recall";
-import { TAttributeClass } from "@formbricks/types/attribute-classes";
+import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
import {
TSurvey,
TSurveyHiddenFields,
@@ -51,7 +51,7 @@ interface RecallItemSelectProps {
recallItems: TSurveyRecallItem[];
selectedLanguageCode: string;
hiddenFields: TSurveyHiddenFields;
- attributeClasses: TAttributeClass[];
+ contactAttributeKeys: TContactAttributeKey[];
}
export const RecallItemSelect = ({
@@ -61,7 +61,7 @@ export const RecallItemSelect = ({
setShowRecallItemSelect,
recallItems,
selectedLanguageCode,
- attributeClasses,
+ contactAttributeKeys,
}: RecallItemSelectProps) => {
const [searchValue, setSearchValue] = useState("");
const isNotAllowedQuestionType = (question: TSurveyQuestion): boolean => {
@@ -96,16 +96,16 @@ export const RecallItemSelect = ({
const attributeClassRecallItems = useMemo(() => {
if (localSurvey.type !== "app") return [];
- return attributeClasses
- .filter((attributeClass) => !recallItemIds.includes(attributeClass.name.replaceAll(" ", "nbsp")))
- .map((attributeClass) => {
+ return contactAttributeKeys
+ .filter((attributeKey) => !recallItemIds.includes(attributeKey.key.replaceAll(" ", "nbsp")))
+ .map((attributeKey) => {
return {
- id: attributeClass.name.replaceAll(" ", "nbsp"),
- label: attributeClass.name,
+ id: attributeKey.key.replaceAll(" ", "nbsp"),
+ label: attributeKey.name ?? attributeKey.key,
type: "attributeClass" as const,
};
});
- }, [attributeClasses]);
+ }, [contactAttributeKeys]);
const variableRecallItems = useMemo(() => {
if (localSurvey.variables.length) {
diff --git a/apps/web/modules/surveys/components/QuestionFormInput/index.tsx b/apps/web/modules/surveys/components/QuestionFormInput/index.tsx
index 6d90ea96c7..4ef03cdb45 100644
--- a/apps/web/modules/surveys/components/QuestionFormInput/index.tsx
+++ b/apps/web/modules/surveys/components/QuestionFormInput/index.tsx
@@ -29,7 +29,7 @@ import {
recallToHeadline,
replaceRecallInfoWithUnderline,
} from "@formbricks/lib/utils/recall";
-import { TAttributeClass } from "@formbricks/types/attribute-classes";
+import { TContactAttributeKey } from "@formbricks/types/contact-attribute-key";
import {
TI18nString,
TSurvey,
@@ -71,7 +71,7 @@ interface QuestionFormInputProps {
ref?: RefObject;
onBlur?: React.FocusEventHandler;
className?: string;
- attributeClasses: TAttributeClass[];
+ contactAttributeKeys: TContactAttributeKey[];
locale: TUserLocale;
}
@@ -92,7 +92,7 @@ export const QuestionFormInput = ({
placeholder,
onBlur,
className,
- attributeClasses,
+ contactAttributeKeys,
locale,
}: QuestionFormInputProps) => {
const t = useTranslations();
@@ -177,7 +177,7 @@ export const QuestionFormInput = ({
getLocalizedValue(text, usedLanguageCode),
localSurvey,
usedLanguageCode,
- attributeClasses
+ contactAttributeKeys
)
: []
);
@@ -205,7 +205,7 @@ export const QuestionFormInput = ({
getLocalizedValue(text, usedLanguageCode),
localSurvey,
usedLanguageCode,
- attributeClasses
+ contactAttributeKeys
)
: []
);
@@ -234,7 +234,7 @@ export const QuestionFormInput = ({
// Constructs an array of JSX elements representing segmented parts of text, interspersed with special formatted spans for recall headlines.
const processInput = (): JSX.Element[] => {
const parts: JSX.Element[] = [];
- let remainingText = recallToHeadline(text, localSurvey, false, usedLanguageCode, attributeClasses)[
+ let remainingText = recallToHeadline(text, localSurvey, false, usedLanguageCode, contactAttributeKeys)[
usedLanguageCode
];
filterRecallItems(remainingText);
@@ -411,13 +411,13 @@ export const QuestionFormInput = ({
localSurvey,
false,
usedLanguageCode,
- attributeClasses
+ contactAttributeKeys
);
setText(modifiedHeadlineWithName);
setShowFallbackInput(true);
},
- [attributeClasses, elementText, fallbacks, handleUpdate, localSurvey, usedLanguageCode]
+ [contactAttributeKeys, elementText, fallbacks, handleUpdate, localSurvey, usedLanguageCode]
);
// Filters and updates the list of recall questions based on their presence in the given text, also managing related text and fallback states.
@@ -503,7 +503,7 @@ export const QuestionFormInput = ({
localSurvey,
false,
usedLanguageCode,
- attributeClasses
+ contactAttributeKeys
);
setText(valueTI18nString);
@@ -585,7 +585,7 @@ export const QuestionFormInput = ({
aria-label={label}
autoComplete={showRecallItemSelect ? "off" : "on"}
value={
- recallToHeadline(text, localSurvey, false, usedLanguageCode, attributeClasses)[
+ recallToHeadline(text, localSurvey, false, usedLanguageCode, contactAttributeKeys)[
usedLanguageCode
]
}
@@ -659,14 +659,14 @@ export const QuestionFormInput = ({
recallItems={recallItems}
selectedLanguageCode={usedLanguageCode}
hiddenFields={localSurvey.hiddenFields}
- attributeClasses={attributeClasses}
+ contactAttributeKeys={contactAttributeKeys}
/>
)}
{usedLanguageCode !== "default" && value && typeof value["default"] !== undefined && (
{t("environments.project.languages.translate")}: {" "}
- {recallToHeadline(value, localSurvey, false, "default", attributeClasses)["default"]}
+ {recallToHeadline(value, localSurvey, false, "default", contactAttributeKeys)["default"]}
)}
{usedLanguageCode === "default" && localSurvey.languages?.length > 1 && isTranslationIncomplete && (
diff --git a/apps/web/modules/ui/components/basic-add-filter-modal/index.tsx b/apps/web/modules/ui/components/basic-add-filter-modal/index.tsx
deleted file mode 100644
index 4f7de0d707..0000000000
--- a/apps/web/modules/ui/components/basic-add-filter-modal/index.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-"use client";
-
-import { Input } from "@/modules/ui/components/input";
-import { Modal } from "@/modules/ui/components/modal";
-import { FingerprintIcon, TagIcon } from "lucide-react";
-import { useTranslations } from "next-intl";
-import { useMemo, useState } from "react";
-import { TAttributeClass } from "@formbricks/types/attribute-classes";
-import { TBaseFilter } from "@formbricks/types/segment";
-import { handleAddFilter } from "./lib/utils";
-
-interface TBasicAddFilterModalProps {
- open: boolean;
- setOpen: (open: boolean) => void;
- onAddFilter: (filter: TBaseFilter) => void;
- attributeClasses: TAttributeClass[];
-}
-
-export const BasicAddFilterModal = ({
- onAddFilter,
- open,
- setOpen,
- attributeClasses,
-}: TBasicAddFilterModalProps) => {
- const [searchValue, setSearchValue] = useState("");
- const t = useTranslations();
- const attributeClassesFiltered = useMemo(() => {
- if (!attributeClasses) return [];
-
- if (!searchValue) return attributeClasses;
-
- return attributeClasses.filter((attributeClass) =>
- attributeClass.name.toLowerCase().includes(searchValue.toLowerCase())
- );
- }, [attributeClasses, searchValue]);
-
- return (
-
-
-
-
-
-
-
{t("common.person")}
-
-
{
- handleAddFilter({
- type: "person",
- onAddFilter,
- setOpen,
- });
- }}
- className="flex cursor-pointer items-center gap-4 rounded-lg px-2 py-1 text-sm hover:bg-slate-50">
-
-
{t("common.user_id")}
-
-
-
-
-
-
-
-
{t("common.attributes")}
-
- {attributeClassesFiltered?.length === 0 && (
-
-
{t("environments.segments.no_attributes_yet")}
-
- )}
- {attributeClassesFiltered.map((attributeClass) => {
- return (
-
{
- handleAddFilter({
- type: "attribute",
- onAddFilter,
- setOpen,
- attributeClassName: attributeClass.name,
- });
- }}
- className="flex cursor-pointer items-center gap-4 rounded-lg px-2 py-1 text-sm hover:bg-slate-50">
-
-
{attributeClass.name}
-
- );
- })}
-
- );
-};
diff --git a/apps/web/modules/ui/components/basic-add-filter-modal/lib/utils.ts b/apps/web/modules/ui/components/basic-add-filter-modal/lib/utils.ts
deleted file mode 100644
index 7d2e2318ad..0000000000
--- a/apps/web/modules/ui/components/basic-add-filter-modal/lib/utils.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { createId } from "@paralleldrive/cuid2";
-import { TBaseFilter, TSegmentAttributeFilter, TSegmentPersonFilter } from "@formbricks/types/segment";
-
-export const handleAddFilter = ({
- type,
- attributeClassName,
- isUserId = false,
- onAddFilter,
- setOpen,
-}: {
- type: "person" | "attribute";
- attributeClassName?: string;
- isUserId?: boolean;
- onAddFilter: (filter: TBaseFilter) => void;
- setOpen: (open: boolean) => void;
-}) => {
- if (type === "person") {
- const newResource: TSegmentPersonFilter = {
- id: createId(),
- root: { type: "person", personIdentifier: "userId" },
- qualifier: {
- operator: "equals",
- },
- value: "",
- };
-
- const newFilter: TBaseFilter = {
- id: createId(),
- connector: "and",
- resource: newResource,
- };
-
- onAddFilter(newFilter);
- setOpen(false);
-
- return;
- }
-
- if (!attributeClassName) return;
-
- const newFilterResource: TSegmentAttributeFilter = {
- id: createId(),
- root: {
- type: "attribute",
- attributeClassName,
- },
- qualifier: {
- operator: "equals",
- },
- value: "",
- ...(isUserId && { meta: { isUserId } }),
- };
-
- const newFilter: TBaseFilter = {
- id: createId(),
- connector: "and",
- resource: newFilterResource,
- };
-
- onAddFilter(newFilter);
- setOpen(false);
-};
diff --git a/apps/web/modules/ui/components/basic-segment-editor/components/attribute-segment-filter.tsx b/apps/web/modules/ui/components/basic-segment-editor/components/attribute-segment-filter.tsx
deleted file mode 100644
index 215a56cc2b..0000000000
--- a/apps/web/modules/ui/components/basic-segment-editor/components/attribute-segment-filter.tsx
+++ /dev/null
@@ -1,223 +0,0 @@
-import { Input } from "@/modules/ui/components/input";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/modules/ui/components/select";
-import { TagIcon } from "lucide-react";
-import { useTranslations } from "next-intl";
-import { useEffect, useState } from "react";
-import { z } from "zod";
-import { cn } from "@formbricks/lib/cn";
-import {
- convertOperatorToText,
- convertOperatorToTitle,
- updateAttributeClassNameInFilter,
- updateOperatorInFilter,
-} from "@formbricks/lib/segment/utils";
-import { isCapitalized } from "@formbricks/lib/utils/strings";
-import { TAttributeClass } from "@formbricks/types/attribute-classes";
-import {
- ARITHMETIC_OPERATORS,
- ATTRIBUTE_OPERATORS,
- TArithmeticOperator,
- TAttributeOperator,
- TSegment,
- TSegmentAttributeFilter,
- TSegmentConnector,
- TSegmentFilterValue,
-} from "@formbricks/types/segment";
-import { SegmentFilterItemConnector } from "./segment-filter-item-connector";
-import { SegmentFilterItemContextMenu } from "./segment-filter-item-context-menu";
-
-interface AttributeSegmentFilterProps {
- connector: TSegmentConnector;
- environmentId: string;
- segment: TSegment;
- attributeClasses: TAttributeClass[];
- setSegment: (segment: TSegment) => void;
- onDeleteFilter: (filterId: string) => void;
- onMoveFilter: (filterId: string, direction: "up" | "down") => void;
- viewOnly?: boolean;
- resource: TSegmentAttributeFilter;
- updateValueInLocalSurvey: (filterId: string, newValue: TSegmentFilterValue) => void;
-}
-
-export const AttributeSegmentFilter = ({
- connector,
- resource,
- onDeleteFilter,
- onMoveFilter,
- updateValueInLocalSurvey,
- segment,
- setSegment,
- attributeClasses,
- viewOnly,
-}: AttributeSegmentFilterProps) => {
- const { attributeClassName } = resource.root;
- const operatorText = convertOperatorToText(resource.qualifier.operator);
- const t = useTranslations();
- const [valueError, setValueError] = useState("");
-
- // when the operator changes, we need to check if the value is valid
- useEffect(() => {
- const { operator } = resource.qualifier;
-
- if (ARITHMETIC_OPERATORS.includes(operator as TArithmeticOperator)) {
- const isNumber = z.coerce.number().safeParse(resource.value);
-
- if (isNumber.success) {
- setValueError("");
- } else {
- setValueError("Value must be a number");
- }
- }
- }, [resource.qualifier, resource.value]);
-
- const operatorArr = ATTRIBUTE_OPERATORS.map((operator) => {
- return {
- id: operator,
- name: convertOperatorToText(operator),
- };
- });
-
- const attributeClass = attributeClasses?.find((attrClass) => attrClass?.name === attributeClassName)?.name;
-
- const updateOperatorInLocalSurvey = (filterId: string, newOperator: TAttributeOperator) => {
- const updatedSegment = structuredClone(segment);
- if (updatedSegment.filters) {
- updateOperatorInFilter(updatedSegment.filters, filterId, newOperator);
- }
-
- setSegment(updatedSegment);
- };
-
- const updateAttributeClassNameInLocalSurvey = (filterId: string, newAttributeClassName: string) => {
- const updatedSegment = structuredClone(segment);
- if (updatedSegment.filters) {
- updateAttributeClassNameInFilter(updatedSegment.filters, filterId, newAttributeClassName);
- }
-
- setSegment(updatedSegment);
- };
-
- const checkValueAndUpdate = (e: React.ChangeEvent) => {
- const { value } = e.target;
- updateValueInLocalSurvey(resource.id, value);
-
- if (!value) {
- setValueError(t("environments.segments.value_cannot_be_empty"));
- return;
- }
-
- const { operator } = resource.qualifier;
-
- if (ARITHMETIC_OPERATORS.includes(operator as TArithmeticOperator)) {
- const isNumber = z.coerce.number().safeParse(value);
-
- if (isNumber.success) {
- setValueError("");
- updateValueInLocalSurvey(resource.id, parseInt(value, 10));
- } else {
- setValueError(t("environments.segments.value_must_be_a_number"));
- updateValueInLocalSurvey(resource.id, value);
- }
-
- return;
- }
-
- setValueError("");
- updateValueInLocalSurvey(resource.id, value);
- };
-
- return (
-
-
-
-
{
- updateAttributeClassNameInLocalSurvey(resource.id, value);
- }}
- disabled={viewOnly}>
-
-
-
-
-
-
-
- {attributeClasses
- ?.filter((attributeClass) => !attributeClass.archived)
- ?.map((attrClass) => (
-
- {attrClass.name}
-
- ))}
-
-
-
-
{
- updateOperatorInLocalSurvey(resource.id, operator);
- }}
- disabled={viewOnly}>
-
-
- {operatorText}
-
-
-
-
- {operatorArr.map((operator) => (
-
- {operator.name}
-
- ))}
-
-
-
- {!["isSet", "isNotSet"].includes(resource.qualifier.operator) && (
-
-
{
- checkValueAndUpdate(e);
- }}
- className={cn("w-auto bg-white", valueError && "border border-red-500 focus:border-red-500")}
- />
-
- {valueError && (
-
- {valueError}
-
- )}
-
- )}
-
-
-
) => {
- const { value } = e.target;
- updateValueInLocalSurvey(resource.id, value);
-
- if (!value) {
- setValueError(t("environments.segments.value_cannot_be_empty"));
- return;
- }
-
- const { operator } = resource.qualifier;
-
- if (ARITHMETIC_OPERATORS.includes(operator as TArithmeticOperator)) {
- const isNumber = z.coerce.number().safeParse(value);
-
- if (isNumber.success) {
- setValueError("");
- updateValueInLocalSurvey(resource.id, parseInt(value, 10));
- } else {
- setValueError(t("environments.segments.value_must_be_a_number"));
- updateValueInLocalSurvey(resource.id, value);
- }
-
- return;
- }
-
- setValueError("");
- updateValueInLocalSurvey(resource.id, value);
- };
-
- return (
-
-
-
-
{
- updatePersonIdentifierInLocalSurvey(resource.id, value);
- }}
- disabled={viewOnly}>
-
-
-
-
-
-
-
-
- {personIdentifier}
-
-
-
-
-
{
- updateOperatorInLocalSurvey(resource.id, operator);
- }}
- disabled={viewOnly}>
-
-
- {operatorText}
-
-
-
-
- {operatorArr.map((operator) => (
-
- {operator.name}
-
- ))}
-
-
-
- {!["isSet", "isNotSet"].includes(resource.qualifier.operator) && (
-
-
{
- checkValueAndUpdate(e);
- }}
- className={cn("w-auto bg-white", valueError && "border border-red-500 focus:border-red-500")}
- disabled={viewOnly}
- />
-
- {valueError && (
-
- {valueError}
-
- )}
-
- )}
-
-
-
- {
- if (viewOnly) return;
- onConnectorChange();
- }}>
- {!!connector ? connector : "Where"}
-
-
- );
-};
diff --git a/apps/web/modules/ui/components/basic-segment-editor/components/segment-filter-item-context-menu.tsx b/apps/web/modules/ui/components/basic-segment-editor/components/segment-filter-item-context-menu.tsx
deleted file mode 100644
index 1718f54b0c..0000000000
--- a/apps/web/modules/ui/components/basic-segment-editor/components/segment-filter-item-context-menu.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Button } from "@/modules/ui/components/button";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@/modules/ui/components/dropdown-menu";
-import { ArrowDownIcon, ArrowUpIcon, EllipsisVerticalIcon, Trash2Icon } from "lucide-react";
-import { useTranslations } from "next-intl";
-import { cn } from "@formbricks/lib/cn";
-
-interface SegmentFilterItemContextMenuProps {
- filterId: string;
- onDeleteFilter: (filterId: string) => void;
- onMoveFilter: (filterId: string, direction: "up" | "down") => void;
- viewOnly?: boolean;
-}
-
-export const SegmentFilterItemContextMenu = ({
- filterId,
- onDeleteFilter,
- onMoveFilter,
- viewOnly,
-}: SegmentFilterItemContextMenuProps) => {
- const t = useTranslations();
- return (
-
-
-
-
-
-
- onMoveFilter(filterId, "up")}
- icon={
- onMoveFilter(filterId, "down")}
- icon={
-
-
-
-
{
- onDeleteFilter(filterId);
- }}
- disabled={viewOnly}>
-
-
>;
- viewOnly?: boolean;
-}
-
-export const BasicSegmentEditor = ({
- group,
- environmentId,
- setSegment,
- segment,
- attributeClasses,
- viewOnly,
-}: BasicSegmentEditorProps) => {
- const [parent] = useAutoAnimate();
- const handleMoveResource = (resourceId: string, direction: "up" | "down") => {
- const localSegmentCopy = structuredClone(segment);
- if (localSegmentCopy.filters) {
- moveResource(localSegmentCopy.filters, resourceId, direction);
- }
-
- setSegment(localSegmentCopy);
- };
-
- const handleDeleteResource = (resourceId: string) => {
- const localSegmentCopy = structuredClone(segment);
-
- if (localSegmentCopy.filters) {
- deleteResource(localSegmentCopy.filters, resourceId);
- }
-
- setSegment(localSegmentCopy);
- };
-
- return (
-
- {group?.map((groupItem) => {
- const { connector, resource, id: groupId } = groupItem;
-
- if (isResourceFilter(resource)) {
- return (
- handleDeleteResource(filterId)}
- onMoveFilter={(filterId: string, direction: "up" | "down") =>
- handleMoveResource(filterId, direction)
- }
- viewOnly={viewOnly}
- />
- );
- } else {
- return null;
- }
- })}
-
- );
-};
diff --git a/apps/web/modules/ui/components/command/index.tsx b/apps/web/modules/ui/components/command/index.tsx
index 61f03f0bea..210847e2e9 100644
--- a/apps/web/modules/ui/components/command/index.tsx
+++ b/apps/web/modules/ui/components/command/index.tsx
@@ -13,7 +13,7 @@ const Command = React.forwardRef<
({ header, setIsTableSettingsModalOpen }: Dat
whiteSpace: "nowrap",
width: header.column.getSize(),
zIndex: isDragging ? 1 : 0,
-
...(header.column.id === "select" ? getCommonPinningStyles(header.column) : {}),
};
diff --git a/apps/web/modules/ui/components/data-table/components/data-table-settings-modal-item.tsx b/apps/web/modules/ui/components/data-table/components/data-table-settings-modal-item.tsx
index 9fd2b66c44..efbd521f79 100644
--- a/apps/web/modules/ui/components/data-table/components/data-table-settings-modal-item.tsx
+++ b/apps/web/modules/ui/components/data-table/components/data-table-settings-modal-item.tsx
@@ -36,6 +36,15 @@ export const DataTableSettingsModalItem = ({ column, survey }: DataTableSett
return t("environments.surveys.edit.zip");
case "verifiedEmail":
return t("common.verified_email");
+ case "userId":
+ return t("common.user_id");
+ case "contactsTableUser":
+ return "ID";
+ case "firstName":
+ return t("environments.contacts.first_name");
+ case "lastName":
+ return t("environments.contacts.last_name");
+
default:
return capitalize(column.id);
}
diff --git a/apps/web/modules/ui/components/data-table/components/data-table-settings-modal.tsx b/apps/web/modules/ui/components/data-table/components/data-table-settings-modal.tsx
index e4366b9cbd..bb4dbac0a1 100644
--- a/apps/web/modules/ui/components/data-table/components/data-table-settings-modal.tsx
+++ b/apps/web/modules/ui/components/data-table/components/data-table-settings-modal.tsx
@@ -11,6 +11,7 @@ import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable"
import { Table } from "@tanstack/react-table";
import { SettingsIcon } from "lucide-react";
import { useTranslations } from "next-intl";
+import { useMemo } from "react";
import { TSurvey } from "@formbricks/types/surveys/types";
import { DataTableSettingsModalItem } from "./data-table-settings-modal-item";
@@ -40,6 +41,8 @@ export const DataTableSettingsModal = ({
})
);
+ const tableColumns = useMemo(() => table.getAllColumns(), [table]);
+
return (
@@ -65,7 +68,7 @@ export const DataTableSettingsModal =
({
{columnOrder.map((columnId) => {
if (columnId === "select" || columnId === "createdAt") return;
- const column = table.getAllColumns().find((column) => column.id === columnId);
+ const column = tableColumns.find((column) => column.id === columnId);
if (!column) return null;
return {
isExpanded: boolean;
table: Table;
deleteRows: (rowIds: string[]) => void;
- type: "person" | "response";
+ type: "response" | "contact";
deleteAction: (id: string) => Promise;
+ refreshContacts?: () => void;
}
export const DataTableToolbar = ({
@@ -23,8 +24,10 @@ export const DataTableToolbar = ({
deleteRows,
type,
deleteAction,
+ refreshContacts,
}: DataTableToolbarProps) => {
const t = useTranslations();
+
return (
{table.getFilteredSelectedRowModel().rows.length > 0 ? (
@@ -33,6 +36,18 @@ export const DataTableToolbar =
({
)}
+ {type === "contact" ? (
+
+ refreshContacts?.()}
+ className="cursor-pointer rounded-md border bg-white hover:border-slate-400">
+
+
+ ) : null}
+
setIsTableSettingsModalOpen(true)}
diff --git a/apps/web/modules/ui/components/data-table/components/selected-row-settings.tsx b/apps/web/modules/ui/components/data-table/components/selected-row-settings.tsx
index 6da7d4b166..edd2b274b5 100644
--- a/apps/web/modules/ui/components/data-table/components/selected-row-settings.tsx
+++ b/apps/web/modules/ui/components/data-table/components/selected-row-settings.tsx
@@ -9,7 +9,7 @@ import { capitalizeFirstLetter } from "@formbricks/lib/utils/strings";
interface SelectedRowSettingsProps
{
table: Table;
deleteRows: (rowId: string[]) => void;
- type: "response" | "person";
+ type: "response" | "contact";
deleteAction: (id: string) => Promise;
}
@@ -40,8 +40,8 @@ export const SelectedRowSettings = ({
if (type === "response") {
await Promise.all(rowsToBeDeleted.map((responseId) => deleteAction(responseId)));
- } else if (type === "person") {
- await Promise.all(rowsToBeDeleted.map((personId) => deleteAction(personId)));
+ } else if (type === "contact") {
+ await Promise.all(rowsToBeDeleted.map((responseId) => deleteAction(responseId)));
}
deleteRows(rowsToBeDeleted);
@@ -75,7 +75,7 @@ export const SelectedRowSettings = ({
return (
- {selectedRowCount} {type}s selected
+ {selectedRowCount} {t(`common.${type}`)}s {t("common.selected")}
handleToggleAllRowsSelection(true)} />
@@ -93,7 +93,7 @@ export const SelectedRowSettings = ({
PRO
);
};
diff --git a/apps/web/modules/ui/components/upgrade-prompt/index.tsx b/apps/web/modules/ui/components/upgrade-prompt/index.tsx
new file mode 100644
index 0000000000..e9949d92cd
--- /dev/null
+++ b/apps/web/modules/ui/components/upgrade-prompt/index.tsx
@@ -0,0 +1,43 @@
+import { Button } from "@/modules/ui/components/button";
+
+export type ModalButton = {
+ text: string;
+ href?: string;
+ onClick?: () => void;
+};
+
+interface UpgradePromptProps {
+ icon: React.ReactNode;
+ title: string;
+ description: string;
+ buttons: [ModalButton, ModalButton];
+}
+
+export const UpgradePrompt = ({ icon, title, description, buttons }: UpgradePromptProps) => {
+ const [primaryButton, secondaryButton] = buttons;
+
+ return (
+
+
{icon}
+
+
{title}
+
{description}
+
+
+
+ {primaryButton.text}
+
+
+ {secondaryButton.text}
+
+
+
- ): Promise> {
+ ): Promise<
+ Result<
+ { changed: boolean; message: string; details?: Record },
+ NetworkError | Error | ForbiddenError
+ >
+ > {
// transform all attributes to string if attributes are present into a new attributes copy
const attributes: Record = {};
for (const key in attributeUpdateInput.attributes) {
@@ -23,7 +28,7 @@ export class AttributeAPI {
return makeRequest(
this.apiHost,
- `/api/v1/client/${this.environmentId}/people/${attributeUpdateInput.userId}/attributes`,
+ `/api/v1/client/${this.environmentId}/contacts/${attributeUpdateInput.userId}/attributes`,
"PUT",
{ attributes }
);
diff --git a/packages/api/src/api/client/display.ts b/packages/api/src/api/client/display.ts
index a01da13d37..4f3113ec19 100644
--- a/packages/api/src/api/client/display.ts
+++ b/packages/api/src/api/client/display.ts
@@ -1,6 +1,6 @@
import { type TDisplayCreateInput } from "@formbricks/types/displays";
import { type Result } from "@formbricks/types/error-handlers";
-import { type NetworkError } from "@formbricks/types/errors";
+import { type ForbiddenError, type NetworkError } from "@formbricks/types/errors";
import { makeRequest } from "../../utils/make-request";
export class DisplayAPI {
@@ -14,7 +14,7 @@ export class DisplayAPI {
async create(
displayInput: Omit
- ): Promise> {
+ ): Promise> {
return makeRequest(this.apiHost, `/api/v1/client/${this.environmentId}/displays`, "POST", displayInput);
}
}
diff --git a/packages/api/src/api/client/index.ts b/packages/api/src/api/client/index.ts
index 620bb8b3f4..e1a5704490 100644
--- a/packages/api/src/api/client/index.ts
+++ b/packages/api/src/api/client/index.ts
@@ -1,14 +1,12 @@
import { type ApiConfig } from "../../types";
import { AttributeAPI } from "./attribute";
import { DisplayAPI } from "./display";
-import { PeopleAPI } from "./people";
import { ResponseAPI } from "./response";
import { StorageAPI } from "./storage";
export class Client {
response: ResponseAPI;
display: DisplayAPI;
- people: PeopleAPI;
storage: StorageAPI;
attribute: AttributeAPI;
@@ -17,7 +15,6 @@ export class Client {
this.response = new ResponseAPI(apiHost, environmentId);
this.display = new DisplayAPI(apiHost, environmentId);
- this.people = new PeopleAPI(apiHost, environmentId);
this.attribute = new AttributeAPI(apiHost, environmentId);
this.storage = new StorageAPI(apiHost, environmentId);
}
diff --git a/packages/api/src/api/client/people.ts b/packages/api/src/api/client/people.ts
deleted file mode 100644
index 96c316fb20..0000000000
--- a/packages/api/src/api/client/people.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { type Result } from "@formbricks/types/error-handlers";
-import { type NetworkError } from "@formbricks/types/errors";
-import { makeRequest } from "../../utils/make-request";
-
-export class PeopleAPI {
- private apiHost: string;
- private environmentId: string;
-
- constructor(apiHost: string, environmentId: string) {
- this.apiHost = apiHost;
- this.environmentId = environmentId;
- }
-
- async create(userId: string): Promise> {
- return makeRequest(this.apiHost, `/api/v1/client/${this.environmentId}/people`, "POST", {
- environmentId: this.environmentId,
- userId,
- });
- }
-}
diff --git a/packages/api/src/api/client/response.ts b/packages/api/src/api/client/response.ts
index c510525cc1..ccd385ea0e 100644
--- a/packages/api/src/api/client/response.ts
+++ b/packages/api/src/api/client/response.ts
@@ -1,5 +1,5 @@
import { type Result } from "@formbricks/types/error-handlers";
-import { type NetworkError } from "@formbricks/types/errors";
+import { type ForbiddenError, type NetworkError } from "@formbricks/types/errors";
import { type TResponseInput, type TResponseUpdateInput } from "@formbricks/types/responses";
import { makeRequest } from "../../utils/make-request";
@@ -16,7 +16,7 @@ export class ResponseAPI {
async create(
responseInput: Omit
- ): Promise> {
+ ): Promise> {
return makeRequest(this.apiHost, `/api/v1/client/${this.environmentId}/responses`, "POST", responseInput);
}
@@ -28,7 +28,7 @@ export class ResponseAPI {
ttc,
variables,
language,
- }: TResponseUpdateInputWithResponseId): Promise> {
+ }: TResponseUpdateInputWithResponseId): Promise> {
return makeRequest(this.apiHost, `/api/v1/client/${this.environmentId}/responses/${responseId}`, "PUT", {
finished,
endingId,
diff --git a/packages/api/src/utils/make-request.ts b/packages/api/src/utils/make-request.ts
index 6624b37bcb..33ed9349eb 100644
--- a/packages/api/src/utils/make-request.ts
+++ b/packages/api/src/utils/make-request.ts
@@ -1,5 +1,5 @@
import { type Result, err, ok, wrapThrowsAsync } from "@formbricks/types/error-handlers";
-import { type NetworkError } from "@formbricks/types/errors";
+import { type ForbiddenError, type NetworkError } from "@formbricks/types/errors";
import type { ApiErrorResponse, ApiResponse, ApiSuccessResponse } from "../types";
export const makeRequest = async (
@@ -7,7 +7,7 @@ export const makeRequest = async (
endpoint: string,
method: "GET" | "POST" | "PUT" | "DELETE",
data?: unknown
-): Promise> => {
+): Promise> => {
const url = new URL(apiHost + endpoint);
const body = data ? JSON.stringify(data) : undefined;
@@ -27,7 +27,7 @@ export const makeRequest = async (
if (!response.ok) {
const errorResponse = json as ApiErrorResponse;
return err({
- code: "network_error",
+ code: errorResponse.code === "forbidden" ? "forbidden" : "network_error",
status: response.status,
message: errorResponse.message || "Something went wrong",
url,
diff --git a/packages/database/data-migrations/20241010133706_xm_user_identification/data-migration.ts b/packages/database/data-migrations/20241010133706_xm_user_identification/data-migration.ts
new file mode 100644
index 0000000000..b7ecb1bae5
--- /dev/null
+++ b/packages/database/data-migrations/20241010133706_xm_user_identification/data-migration.ts
@@ -0,0 +1,272 @@
+
+
+/* eslint-disable no-constant-condition -- Required for the while loop */
+
+/* eslint-disable @typescript-eslint/no-unnecessary-condition -- Required for a while loop here */
+
+/* eslint-disable no-console -- logging is allowed in migration scripts */
+import { PrismaClient } from "@prisma/client";
+
+const prisma = new PrismaClient();
+const TRANSACTION_TIMEOUT = 30 * 60 * 1000; // 30 minutes in milliseconds
+
+async function runMigration(): Promise {
+ const startTime = Date.now();
+ console.log("Starting data migration...");
+
+ await prisma.$transaction(
+ async (tx) => {
+ const totalContacts = await tx.contact.count();
+
+ // Check if any contacts still have a userId
+ const contactsWithUserId = await tx.contact.count({
+ where: {
+ userId: { not: null },
+ },
+ });
+
+ // If no contacts have a userId, migration is already complete
+ if (totalContacts > 0 && contactsWithUserId === 0) {
+ console.log("Migration already completed. No contacts with userId found.");
+ return;
+ }
+
+ const BATCH_SIZE = 10000; // Adjust based on your system's capacity
+ let skip = 0;
+
+ while (true) {
+ // Ensure email, firstName, lastName attributeKeys exist for all environments
+ const allEnvironmentsInBatch = await tx.environment.findMany({
+ select: { id: true },
+ skip,
+ take: BATCH_SIZE,
+ });
+
+ if (allEnvironmentsInBatch.length === 0) {
+ break;
+ }
+
+ console.log("Processing attributeKeys for", allEnvironmentsInBatch.length, "environments");
+
+ for (const env of allEnvironmentsInBatch) {
+ await tx.environment.update({
+ where: { id: env.id },
+ data: {
+ attributeKeys: {
+ upsert: [
+ {
+ where: {
+ key_environmentId: {
+ key: "email",
+ environmentId: env.id,
+ },
+ },
+ update: {
+ type: "default",
+ isUnique: true,
+ },
+ create: {
+ key: "email",
+ name: "Email",
+ description: "The email of a contact",
+ type: "default",
+ isUnique: true,
+ },
+ },
+ {
+ where: {
+ key_environmentId: {
+ key: "firstName",
+ environmentId: env.id,
+ },
+ },
+ update: {
+ type: "default",
+ },
+ create: {
+ key: "firstName",
+ name: "First Name",
+ description: "Your contact's first name",
+ type: "default",
+ },
+ },
+ {
+ where: {
+ key_environmentId: {
+ key: "lastName",
+ environmentId: env.id,
+ },
+ },
+ update: {
+ type: "default",
+ },
+ create: {
+ key: "lastName",
+ name: "Last Name",
+ description: "Your contact's last name",
+ type: "default",
+ },
+ },
+ {
+ where: {
+ key_environmentId: {
+ key: "userId",
+ environmentId: env.id,
+ },
+ },
+ update: {
+ type: "default",
+ isUnique: true,
+ },
+ create: {
+ key: "userId",
+ name: "User ID",
+ description: "The user ID of a contact",
+ type: "default",
+ isUnique: true,
+ },
+ },
+ ],
+ },
+ },
+ });
+ }
+
+ skip += allEnvironmentsInBatch.length;
+ }
+
+ const CONTACTS_BATCH_SIZE = 20000;
+ let processedContacts = 0;
+
+ // delete userIds for these environments:
+ const { count } = await tx.contactAttribute.deleteMany({
+ where: {
+ attributeKey: {
+ key: "userId",
+ },
+ },
+ });
+
+ console.log("Deleted userId attributes for", count, "contacts");
+
+ while (true) {
+ const contacts = await tx.contact.findMany({
+ take: CONTACTS_BATCH_SIZE,
+ select: {
+ id: true,
+ userId: true,
+ environmentId: true,
+ },
+ where: {
+ userId: { not: null },
+ },
+ });
+
+ if (contacts.length === 0) {
+ break;
+ }
+
+ const environmentIdsByContacts = contacts.map((c) => c.environmentId);
+
+ const attributeMap = new Map();
+
+ const userIdAttributeKeys = await tx.contactAttributeKey.findMany({
+ where: {
+ key: "userId",
+ environmentId: {
+ in: environmentIdsByContacts,
+ },
+ },
+ select: { id: true, environmentId: true },
+ });
+
+ userIdAttributeKeys.forEach((ak) => {
+ attributeMap.set(ak.environmentId, ak.id);
+ });
+
+ // Insert contactAttributes in bulk
+ await tx.contactAttribute.createMany({
+ data: contacts.map((contact) => {
+ if (!contact.userId) {
+ throw new Error(`Contact with id ${contact.id} has no userId`);
+ }
+
+ const userIdAttributeKey = attributeMap.get(contact.environmentId);
+
+ if (!userIdAttributeKey) {
+ throw new Error(`Attribute key for userId not found for environment ${contact.environmentId}`);
+ }
+
+ return {
+ contactId: contact.id,
+ value: contact.userId,
+ attributeKeyId: userIdAttributeKey,
+ };
+ }),
+ });
+
+ await tx.contact.updateMany({
+ where: {
+ id: { in: contacts.map((c) => c.id) },
+ },
+ data: {
+ userId: null,
+ },
+ });
+
+ processedContacts += contacts.length;
+
+ if (processedContacts > 0) {
+ console.log(`Processed ${processedContacts.toString()} contacts`);
+ }
+ }
+
+ const totalContactsAfterMigration = await tx.contact.count();
+
+ console.log("Total contacts after migration:", totalContactsAfterMigration);
+
+ // total attributes with userId:
+ const totalAttributes = await tx.contactAttribute.count({
+ where: {
+ attributeKey: {
+ key: "userId",
+ },
+ },
+ });
+
+ console.log("Total attributes with userId now:", totalAttributes);
+
+ if (totalContactsAfterMigration !== totalAttributes) {
+ throw new Error(
+ "Data migration failed. Total contacts after migration does not match total attributes with userId"
+ );
+ }
+ },
+ {
+ 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/data-migrations/20241021123456_xm_segment_migration/data-migration.ts b/packages/database/data-migrations/20241021123456_xm_segment_migration/data-migration.ts
new file mode 100644
index 0000000000..dacc9ab0e2
--- /dev/null
+++ b/packages/database/data-migrations/20241021123456_xm_segment_migration/data-migration.ts
@@ -0,0 +1,102 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-condition -- Required for a while loop here */
+
+/* eslint-disable no-console -- logging is allowed in migration scripts */
+import { PrismaClient } from "@prisma/client";
+import type { TBaseFilters, TSegmentAttributeFilter, TSegmentFilter } from "../../../types/segment";
+
+const prisma = new PrismaClient();
+const TRANSACTION_TIMEOUT = 30 * 60 * 1000; // 30 minutes in milliseconds
+
+export const isResourceFilter = (resource: TSegmentFilter | TBaseFilters): resource is TSegmentFilter => {
+ return (resource as TSegmentFilter).root !== undefined;
+};
+
+const findAndReplace = (filters: TBaseFilters): TBaseFilters => {
+ const newFilters: TBaseFilters = [];
+ for (const filter of filters) {
+ if (isResourceFilter(filter.resource)) {
+ let { root } = filter.resource;
+ if (root.type === "attribute") {
+ // @ts-expect-error -- Legacy type
+ if (root.attributeClassName as string) {
+ root = {
+ type: "attribute",
+ // @ts-expect-error -- Legacy type
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- Legacy type
+ contactAttributeKey: root.attributeClassName,
+ };
+
+ const newFilter = {
+ ...filter.resource,
+ root,
+ } as TSegmentAttributeFilter;
+
+ newFilters.push({
+ ...filter,
+ resource: newFilter,
+ });
+ }
+ } else {
+ newFilters.push(filter);
+ }
+ } else {
+ const updatedResource = findAndReplace(filter.resource);
+ newFilters.push({
+ ...filter,
+ resource: updatedResource,
+ });
+ }
+ }
+
+ return newFilters;
+};
+
+async function runMigration(): Promise {
+ const startTime = Date.now();
+ console.log("Starting data migration...");
+
+ await prisma.$transaction(
+ async (tx) => {
+ const allSegments = await tx.segment.findMany();
+ const updationPromises = [];
+ for (const segment of allSegments) {
+ updationPromises.push(
+ tx.segment.update({
+ where: { id: segment.id },
+ data: {
+ filters: findAndReplace(segment.filters),
+ },
+ })
+ );
+ }
+
+ await Promise.all(updationPromises);
+ },
+ {
+ 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/data-migrations/20241024123456_xm_attribute_removal/data-migration.ts b/packages/database/data-migrations/20241024123456_xm_attribute_removal/data-migration.ts
new file mode 100644
index 0000000000..96ecbc8244
--- /dev/null
+++ b/packages/database/data-migrations/20241024123456_xm_attribute_removal/data-migration.ts
@@ -0,0 +1,143 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-condition -- Required for a while loop here */
+
+/* eslint-disable no-console -- logging is allowed in migration scripts */
+import { PrismaClient } from "@prisma/client";
+
+const prisma = new PrismaClient();
+const TRANSACTION_TIMEOUT = 30 * 60 * 1000; // 30 minutes in milliseconds
+
+async function runMigration(): Promise {
+ const startTime = Date.now();
+ console.log("Starting data migration...");
+
+ await prisma.$transaction(
+ async (tx) => {
+ const emailAttributes = await tx.contactAttribute.findMany({
+ where: {
+ attributeKey: {
+ key: "email",
+ },
+ },
+ select: {
+ id: true,
+ value: true,
+ contact: {
+ select: {
+ id: true,
+ environmentId: true,
+ createdAt: true,
+ },
+ },
+ createdAt: true,
+ },
+ orderBy: {
+ createdAt: "asc", // Keep oldest attribute
+ },
+ });
+
+ // 2. Group by environment and email
+ const emailsByEnvironment: Record<
+ // environmentId key
+ string,
+ // email record
+ Record
+ > = {};
+
+ // Group attributes by environment and email
+ for (const attr of emailAttributes) {
+ const { environmentId } = attr.contact;
+ const email = attr.value;
+
+ if (!emailsByEnvironment[environmentId]) {
+ emailsByEnvironment[environmentId] = {};
+ }
+
+ if (!emailsByEnvironment[environmentId][email]) {
+ emailsByEnvironment[environmentId][email] = [];
+ }
+
+ emailsByEnvironment[environmentId][email].push({
+ id: attr.id,
+ contactId: attr.contact.id,
+ createdAt: attr.createdAt,
+ });
+ }
+
+ // 3. Identify and delete duplicates
+ const deletionSummary: Record<
+ string,
+ {
+ email: string;
+ deletedAttributeIds: string[];
+ keptAttributeId: string;
+ }[]
+ > = {};
+
+ for (const [environmentId, emailGroups] of Object.entries(emailsByEnvironment)) {
+ deletionSummary[environmentId] = [];
+
+ for (const [email, attributes] of Object.entries(emailGroups)) {
+ if (attributes.length > 1) {
+ // Sort by createdAt to ensure we keep the oldest
+ attributes.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+
+ // Keep the first (oldest) attribute and delete the rest
+ const [kept, ...duplicates] = attributes;
+ const duplicateIds = duplicates.map((d) => d.id);
+
+ // Delete duplicate attributes
+ await tx.contactAttribute.deleteMany({
+ where: {
+ id: {
+ in: duplicateIds,
+ },
+ },
+ });
+
+ deletionSummary[environmentId].push({
+ email,
+ deletedAttributeIds: duplicateIds,
+ keptAttributeId: kept.id,
+ });
+ }
+ }
+ }
+
+ // 4. Return summary of what was cleaned up
+ const summary = {
+ totalDuplicateAttributesRemoved: Object.values(deletionSummary).reduce(
+ (acc, env) => acc + env.reduce((sum, item) => sum + item.deletedAttributeIds.length, 0),
+ 0
+ ),
+ };
+
+ console.log("Data migration completed. Summary: ", summary);
+ },
+ {
+ 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/json-types.ts b/packages/database/json-types.ts
index 0868183be0..147d36f0e4 100644
--- a/packages/database/json-types.ts
+++ b/packages/database/json-types.ts
@@ -5,7 +5,7 @@ import { type TActionClassNoCodeConfig } from "../types/action-classes";
import { type TIntegrationConfig } from "../types/integration";
import { type TOrganizationBilling } from "../types/organizations";
import { type TProjectConfig, type TProjectStyling } from "../types/project";
-import { type TResponseData, type TResponseMeta, type TResponsePersonAttributes } from "../types/responses";
+import { type TResponseContactAttributes, type TResponseData, type TResponseMeta } from "../types/responses";
import { type TBaseFilters } from "../types/segment";
import {
type TSurveyClosedMessage,
@@ -18,7 +18,7 @@ import {
type TSurveyVariables,
type TSurveyWelcomeCard,
} from "../types/surveys/types";
-import { type TUserLocale, type TUserNotificationSettings } from "../types/user";
+import type { TUserLocale, TUserNotificationSettings } from "../types/user";
import type { TSurveyFollowUpAction, TSurveyFollowUpTrigger } from "./types/survey-follow-up";
declare global {
@@ -29,7 +29,7 @@ declare global {
export type ProjectConfig = TProjectConfig;
export type ResponseData = TResponseData;
export type ResponseMeta = TResponseMeta;
- export type ResponsePersonAttributes = TResponsePersonAttributes;
+ export type ResponseContactAttributes = TResponseContactAttributes;
export type SurveyWelcomeCard = TSurveyWelcomeCard;
export type SurveyQuestions = TSurveyQuestions;
export type SurveyEnding = TSurveyEnding;
diff --git a/packages/database/migrations/20241010133706_xm_user_identification/migration.sql b/packages/database/migrations/20241010133706_xm_user_identification/migration.sql
new file mode 100644
index 0000000000..7c733e69cf
--- /dev/null
+++ b/packages/database/migrations/20241010133706_xm_user_identification/migration.sql
@@ -0,0 +1,102 @@
+-- Rename table "Person" to "Contact"
+ALTER TABLE "Person" RENAME TO "Contact";
+ALTER TABLE "Contact" RENAME CONSTRAINT "Person_pkey" TO "Contact_pkey";
+ALTER TABLE "Contact" RENAME CONSTRAINT "Person_environmentId_fkey" TO "Contact_environmentId_fkey";
+-- Rename column "personId" to "contactId" in "Attribute" table
+ALTER TABLE "Attribute" RENAME COLUMN "personId" TO "contactId";
+
+-- Rename column "personId" to "contactId" in "Response" table
+ALTER TABLE "Response" RENAME COLUMN "personId" TO "contactId";
+ALTER TABLE "Response" RENAME COLUMN "personAttributes" TO "contactAttributes";
+
+-- Rename column "personId" to "contactId" in "Display" table
+ALTER TABLE "Display" RENAME COLUMN "personId" TO "contactId";
+
+-- If there are any foreign key constraints involving "personId", they should be renamed to "contactId" as well.
+ALTER TABLE "Attribute" RENAME CONSTRAINT "Attribute_personId_fkey" TO "Attribute_contactId_fkey";
+ALTER TABLE "Response" RENAME CONSTRAINT "Response_personId_fkey" TO "Response_contactId_fkey";
+ALTER TABLE "Display" RENAME CONSTRAINT "Display_personId_fkey" TO "Display_contactId_fkey";
+
+-- Rename indexes
+ALTER INDEX "Person_environmentId_idx" RENAME TO "Contact_environmentId_idx";
+ALTER INDEX "Person_environmentId_userId_key" RENAME TO "Contact_environmentId_userId_key";
+ALTER INDEX "Attribute_personId_attributeClassId_key" RENAME TO "Attribute_contactId_attributeClassId_key";
+ALTER INDEX "Response_personId_created_at_idx" RENAME TO "Response_contactId_created_at_idx";
+ALTER INDEX "Display_personId_created_at_idx" RENAME TO "Display_contactId_created_at_idx";
+
+-- Renaming the tables
+ALTER TABLE "AttributeClass" RENAME TO "ContactAttributeKey";
+ALTER TABLE "ContactAttributeKey" RENAME CONSTRAINT "AttributeClass_pkey" TO "ContactAttributeKey_pkey";
+ALTER TABLE "ContactAttributeKey" RENAME CONSTRAINT "AttributeClass_environmentId_fkey" TO "ContactAttributeKey_environmentId_fkey";
+
+ALTER TABLE "Attribute" RENAME TO "ContactAttribute";
+ALTER TABLE "ContactAttribute" RENAME CONSTRAINT "Attribute_pkey" TO "ContactAttribute_pkey";
+ALTER TABLE "ContactAttribute" RENAME COLUMN "attributeClassId" TO "attributeKeyId";
+ALTER TABLE "ContactAttribute" RENAME CONSTRAINT "Attribute_attributeClassId_fkey" TO "ContactAttribute_attributeKeyId_fkey";
+ALTER TABLE "ContactAttribute" RENAME CONSTRAINT "Attribute_contactId_fkey" TO "ContactAttribute_contactId_fkey";
+
+ALTER TABLE "SurveyAttributeFilter" RENAME COLUMN "attributeClassId" TO "attributeKeyId";
+ALTER TABLE "SurveyAttributeFilter" RENAME CONSTRAINT "SurveyAttributeFilter_attributeClassId_fkey" TO "SurveyAttributeFilter_attributeKeyId_fkey";
+
+ALTER INDEX "SurveyAttributeFilter_surveyId_attributeClassId_key" RENAME TO "SurveyAttributeFilter_surveyId_attributeKeyId_key";
+ALTER INDEX "SurveyAttributeFilter_attributeClassId_idx" RENAME TO "SurveyAttributeFilter_attributeKeyId_idx";
+ALTER INDEX "Attribute_contactId_attributeClassId_key" RENAME TO "ContactAttribute_contactId_attributeKeyId_key";
+ALTER INDEX "AttributeClass_name_environmentId_key" RENAME TO "ContactAttributeKey_name_environmentId_key";
+ALTER INDEX "AttributeClass_environmentId_created_at_idx" RENAME TO "ContactAttributeKey_environmentId_created_at_idx";
+ALTER INDEX "AttributeClass_environmentId_archived_idx" RENAME TO "ContactAttributeKey_environmentId_archived_idx";
+
+-- Step 1: Create the new enum type
+CREATE TYPE "ContactAttributeType" AS ENUM ('default', 'custom');
+
+-- Step 2: Add the new temporary column for 'type'
+ALTER TABLE "ContactAttributeKey" ADD COLUMN "type_new" "ContactAttributeType";
+
+-- Step 3: Update the new 'type_new' column with mapped values
+UPDATE "ContactAttributeKey"
+SET "type_new" = CASE
+ WHEN "type" = 'automatic' THEN 'default'::"ContactAttributeType"
+ ELSE 'custom'::"ContactAttributeType"
+END;
+
+-- Step 4: Drop the old 'type' column
+ALTER TABLE "ContactAttributeKey" DROP COLUMN "type";
+
+-- DropEnum
+DROP TYPE "AttributeType";
+
+-- Step 5: Rename the new 'type_new' column to 'type'
+ALTER TABLE "ContactAttributeKey" RENAME COLUMN "type_new" TO "type";
+
+-- AlterTable
+ALTER TABLE "ContactAttributeKey" ALTER COLUMN "type" SET NOT NULL,
+ALTER COLUMN "type" SET DEFAULT 'custom';
+
+-- Step 7: Add the new 'key' column with a default value
+ALTER TABLE "ContactAttributeKey" ADD COLUMN "key" TEXT NOT NULL DEFAULT '';
+
+-- Step 8: Copy data from 'name' to 'key'
+UPDATE "ContactAttributeKey" SET "key" = "name";
+
+-- Step 9: Make 'name' column nullable
+ALTER TABLE "ContactAttributeKey" ALTER COLUMN "name" DROP NOT NULL;
+
+-- Step 10: Drop the old unique index on 'name' and 'environmentId'
+DROP INDEX "ContactAttributeKey_name_environmentId_key";
+
+-- Step 11: Create a new unique index on 'key' and 'environmentId'
+CREATE UNIQUE INDEX "ContactAttributeKey_key_environmentId_key" ON "ContactAttributeKey"("key", "environmentId");
+
+-- Testing this rn
+-- ALTER TABLE "Contact" DROP COLUMN "userId";
+
+ALTER TABLE "Contact" ALTER COLUMN "userId" DROP NOT NULL;
+DROP INDEX "Contact_environmentId_userId_key";
+
+-- Step 12: Remove the default value from 'key' column
+ALTER TABLE "ContactAttributeKey" ALTER COLUMN "key" DROP DEFAULT;
+
+DROP INDEX "ContactAttributeKey_environmentId_archived_idx";
+ALTER TABLE "ContactAttributeKey" DROP COLUMN "archived";
+
+ALTER TABLE "ContactAttributeKey" ADD COLUMN "isUnique" BOOLEAN NOT NULL DEFAULT false;
+CREATE INDEX "ContactAttribute_attributeKeyId_value_idx" ON "ContactAttribute"("attributeKeyId", "value");
\ No newline at end of file
diff --git a/packages/database/package.json b/packages/database/package.json
index 25b523f2c4..911c64c799 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -54,6 +54,10 @@
"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",
+ "data-migration:xm": "ts-node ./data-migrations/20241010133706_xm_user_identification/data-migration.ts",
+ "data-migration:xm-segments": "ts-node ./data-migrations/20241021123456_xm_segment_migration/data-migration.ts",
+ "data-migration:xm-attribute-removal": "ts-node ./data-migrations/20241024123456_xm_attribute_removal/data-migration.ts",
+ "data-migration:xm-user-identification": "pnpm data-migration:xm && pnpm data-migration:xm-segments && pnpm data-migration:xm-attribute-removal",
"data-migration:add-teams": "ts-node ./data-migrations/20241107161932_add_teams/data-migration.ts",
"data-migration:v2.7": "pnpm data-migration:add-teams",
"data-migration:update-org-limits": "ts-node ./data-migrations/20241118123456_update_org_limits/data-migration.ts",
diff --git a/packages/database/schema.prisma b/packages/database/schema.prisma
index bac83a8887..2d316aa5ab 100644
--- a/packages/database/schema.prisma
+++ b/packages/database/schema.prisma
@@ -55,95 +55,94 @@ model Webhook {
@@index([environmentId])
}
-model Attribute {
- id String @id @default(cuid())
- createdAt DateTime @default(now()) @map(name: "created_at")
- updatedAt DateTime @updatedAt @map(name: "updated_at")
- attributeClass AttributeClass @relation(fields: [attributeClassId], references: [id], onDelete: Cascade)
- attributeClassId String
- person Person @relation(fields: [personId], references: [id], onDelete: Cascade)
- personId String
- value String
+model ContactAttribute {
+ id String @id @default(cuid())
+ createdAt DateTime @default(now()) @map(name: "created_at")
+ updatedAt DateTime @updatedAt @map(name: "updated_at")
+ attributeKey ContactAttributeKey @relation(fields: [attributeKeyId], references: [id], onDelete: Cascade)
+ attributeKeyId String
+ contact Contact @relation(fields: [contactId], references: [id], onDelete: Cascade)
+ contactId String
+ value String
- @@unique([personId, attributeClassId])
+ @@unique([contactId, attributeKeyId])
+ @@index([attributeKeyId, value])
}
-enum AttributeType {
- code
- noCode
- automatic
+enum ContactAttributeType {
+ default
+ custom
}
-model AttributeClass {
+model ContactAttributeKey {
id String @id @default(cuid())
createdAt DateTime @default(now()) @map(name: "created_at")
updatedAt DateTime @updatedAt @map(name: "updated_at")
- name String
+ isUnique Boolean @default(false)
+ key String
+ name String?
description String?
- archived Boolean @default(false)
- type AttributeType
+ type ContactAttributeType @default(custom)
environment Environment @relation(fields: [environmentId], references: [id], onDelete: Cascade)
environmentId String
- attributes Attribute[]
+ attributes ContactAttribute[]
attributeFilters SurveyAttributeFilter[]
- @@unique([name, environmentId])
+ @@unique([key, environmentId])
@@index([environmentId, createdAt])
- @@index([environmentId, archived])
}
-model Person {
- id String @id @default(cuid())
- userId String
- createdAt DateTime @default(now()) @map(name: "created_at")
- updatedAt DateTime @updatedAt @map(name: "updated_at")
- environment Environment @relation(fields: [environmentId], references: [id], onDelete: Cascade)
+model Contact {
+ id String @id @default(cuid())
+ userId String?
+ createdAt DateTime @default(now()) @map(name: "created_at")
+ updatedAt DateTime @updatedAt @map(name: "updated_at")
+ environment Environment @relation(fields: [environmentId], references: [id], onDelete: Cascade)
environmentId String
responses Response[]
- attributes Attribute[]
+ attributes ContactAttribute[]
displays Display[]
- @@unique([environmentId, userId])
@@index([environmentId])
}
model Response {
- id String @id @default(cuid())
- createdAt DateTime @default(now()) @map(name: "created_at")
- updatedAt DateTime @updatedAt @map(name: "updated_at")
- finished Boolean @default(false)
- endingId String?
- survey Survey @relation(fields: [surveyId], references: [id], onDelete: Cascade)
- surveyId String
- person Person? @relation(fields: [personId], references: [id], onDelete: Cascade)
- personId String?
- notes ResponseNote[]
+ id String @id @default(cuid())
+ createdAt DateTime @default(now()) @map(name: "created_at")
+ updatedAt DateTime @updatedAt @map(name: "updated_at")
+ finished Boolean @default(false)
+ survey Survey @relation(fields: [surveyId], references: [id], onDelete: Cascade)
+ surveyId String
+ contact Contact? @relation(fields: [contactId], references: [id], onDelete: Cascade)
+ contactId String?
+ endingId String?
+ notes ResponseNote[]
/// @zod.custom(imports.ZResponseData)
/// [ResponseData]
- data Json @default("{}")
+ data Json @default("{}")
/// @zod.custom(imports.ZResponseVariables)
/// [ResponseVariables]
- variables Json @default("{}")
+ variables Json @default("{}")
/// @zod.custom(imports.ZResponseTtc)
/// [ResponseTtc]
- ttc Json @default("{}")
+ ttc Json @default("{}")
/// @zod.custom(imports.ZResponseMeta)
/// [ResponseMeta]
- meta Json @default("{}")
- tags TagsOnResponses[]
- /// @zod.custom(imports.ZResponsePersonAttributes)
- /// [ResponsePersonAttributes]
- personAttributes Json?
+ meta Json @default("{}")
+ tags TagsOnResponses[]
+ /// @zod.custom(imports.ZResponseContactAttributes)
+ /// [ResponseContactAttributes]
+ contactAttributes Json?
// singleUseId, used to prevent multiple responses
- singleUseId String?
- language String?
- documents Document[]
- displayId String? @unique
- display Display? @relation(fields: [displayId], references: [id])
+ singleUseId String?
+ language String?
+ documents Document[]
+ displayId String? @unique
+ display Display? @relation(fields: [displayId], references: [id])
@@unique([surveyId, singleUseId])
@@index([surveyId, createdAt]) // to determine monthly response count
- @@index([personId, createdAt]) // to determine monthly identified users (persons)
+ @@index([contactId, createdAt]) // to determine monthly identified users (persons)
@@index([surveyId])
}
@@ -204,14 +203,14 @@ model Display {
updatedAt DateTime @updatedAt @map(name: "updated_at")
survey Survey @relation(fields: [surveyId], references: [id], onDelete: Cascade)
surveyId String
- person Person? @relation(fields: [personId], references: [id], onDelete: Cascade)
- personId String?
+ contact Contact? @relation(fields: [contactId], references: [id], onDelete: Cascade)
+ contactId String?
responseId String? @unique //deprecated
status DisplayStatus?
response Response?
@@index([surveyId])
- @@index([personId, createdAt])
+ @@index([contactId, createdAt])
}
model SurveyTrigger {
@@ -233,19 +232,19 @@ enum SurveyAttributeFilterCondition {
}
model SurveyAttributeFilter {
- id String @id @default(cuid())
- createdAt DateTime @default(now()) @map(name: "created_at")
- updatedAt DateTime @updatedAt @map(name: "updated_at")
- attributeClass AttributeClass @relation(fields: [attributeClassId], references: [id], onDelete: Cascade)
- attributeClassId String
- survey Survey @relation(fields: [surveyId], references: [id], onDelete: Cascade)
- surveyId String
- condition SurveyAttributeFilterCondition
- value String
+ id String @id @default(cuid())
+ createdAt DateTime @default(now()) @map(name: "created_at")
+ updatedAt DateTime @updatedAt @map(name: "updated_at")
+ attributeKey ContactAttributeKey @relation(fields: [attributeKeyId], references: [id], onDelete: Cascade)
+ attributeKeyId String
+ survey Survey @relation(fields: [surveyId], references: [id], onDelete: Cascade)
+ surveyId String
+ condition SurveyAttributeFilterCondition
+ value String
- @@unique([surveyId, attributeClassId])
+ @@unique([surveyId, attributeKeyId])
@@index([surveyId])
- @@index([attributeClassId])
+ @@index([attributeKeyId])
}
enum SurveyType {
@@ -407,18 +406,18 @@ model Integration {
}
model Environment {
- id String @id @default(cuid())
- createdAt DateTime @default(now()) @map(name: "created_at")
- updatedAt DateTime @updatedAt @map(name: "updated_at")
+ id String @id @default(cuid())
+ createdAt DateTime @default(now()) @map(name: "created_at")
+ updatedAt DateTime @updatedAt @map(name: "updated_at")
type EnvironmentType
- project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
+ project Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
projectId String
- widgetSetupCompleted Boolean @default(false)
- appSetupCompleted Boolean @default(false)
+ widgetSetupCompleted Boolean @default(false)
+ appSetupCompleted Boolean @default(false)
surveys Survey[]
- people Person[]
+ contacts Contact[]
actionClasses ActionClass[]
- attributeClasses AttributeClass[]
+ attributeKeys ContactAttributeKey[]
apiKeys ApiKey[]
webhooks Webhook[]
tags Tag[]
diff --git a/packages/js-core/src/lib/attributes.ts b/packages/js-core/src/lib/attributes.ts
index f13caffb5c..0db882563a 100644
--- a/packages/js-core/src/lib/attributes.ts
+++ b/packages/js-core/src/lib/attributes.ts
@@ -1,5 +1,6 @@
import { FormbricksAPI } from "@formbricks/api";
import { TAttributes } from "@formbricks/types/attributes";
+import { ForbiddenError } from "@formbricks/types/errors";
import { Config } from "./config";
import { MissingPersonError, NetworkError, Result, err, ok, okVoid } from "./errors";
import { Logger } from "./logger";
@@ -17,8 +18,9 @@ export const updateAttribute = async (
{
changed: boolean;
message: string;
+ details?: Record;
},
- Error | NetworkError
+ NetworkError | ForbiddenError
>
> => {
const { apiHost, environmentId } = config.get();
@@ -29,7 +31,7 @@ export const updateAttribute = async (
code: "network_error",
status: 500,
message: "Missing userId",
- url: `${apiHost}/api/v1/client/${environmentId}/people/${userId}/attributes`,
+ url: `${apiHost}/api/v1/client/${environmentId}/contacts/${userId}/attributes`,
responseMessage: "Missing userId",
});
}
@@ -53,22 +55,33 @@ export const updateAttribute = async (
},
};
}
+
return err({
- code: "network_error",
- status: 500,
- message: res.error.message ?? `Error updating person with userId ${userId}`,
- url: `${config.get().apiHost}/api/v1/client/${environmentId}/people/${userId}/attributes`,
+ code: (res.error as ForbiddenError).code ?? "network_error",
+ status: (res.error as NetworkError | ForbiddenError).status ?? 500,
+ message: `Error updating person with userId ${userId}`,
+ url: new URL(`${apiHost}/api/v1/client/${environmentId}/contacts/${userId}/attributes`),
responseMessage: res.error.message,
});
}
+ if (res.data.details) {
+ Object.entries(res.data.details).forEach(([key, value]) => {
+ logger.error(`${key}: ${value}`);
+ });
+ }
+
if (res.data.changed) {
logger.debug("Attribute updated in Formbricks");
+
return {
ok: true,
value: {
changed: true,
message: "Attribute updated in Formbricks",
+ ...(res.data.details && {
+ details: res.data.details,
+ }),
},
};
}
@@ -78,6 +91,9 @@ export const updateAttribute = async (
value: {
changed: false,
message: "Attribute not updated in Formbricks",
+ ...(res.data.details && {
+ details: res.data.details,
+ }),
},
};
};
@@ -87,7 +103,7 @@ export const updateAttributes = async (
environmentId: string,
userId: string,
attributes: TAttributes
-): Promise> => {
+): Promise> => {
// clean attributes and remove existing attributes if config already exists
const updatedAttributes = { ...attributes };
@@ -107,6 +123,12 @@ export const updateAttributes = async (
const res = await api.client.attribute.update({ userId, attributes: updatedAttributes });
if (res.ok) {
+ if (res.data.details) {
+ Object.entries(res.data.details).forEach(([key, value]) => {
+ logger.debug(`${key}: ${value}`);
+ });
+ }
+
return ok(updatedAttributes);
} else {
// @ts-expect-error
@@ -116,10 +138,10 @@ export const updateAttributes = async (
}
return err({
- code: "network_error",
- status: 500,
+ code: (res.error as ForbiddenError).code ?? "network_error",
+ status: (res.error as NetworkError | ForbiddenError).status ?? 500,
message: `Error updating person with userId ${userId}`,
- url: `${apiHost}/api/v1/client/${environmentId}/people/${userId}/attributes`,
+ url: new URL(`${apiHost}/api/v1/client/${environmentId}/people/${userId}/attributes`),
responseMessage: res.error.message,
});
}
@@ -172,6 +194,11 @@ export const setAttributeInApp = async (
}
return okVoid();
+ } else {
+ const error = result.error;
+ if (error && error.code === "forbidden") {
+ logger.error(`Authorization error: ${error.responseMessage}`);
+ }
}
return err(result.error as NetworkError);
diff --git a/packages/js-core/src/lib/initialize.ts b/packages/js-core/src/lib/initialize.ts
index 035c531f79..8231083e36 100644
--- a/packages/js-core/src/lib/initialize.ts
+++ b/packages/js-core/src/lib/initialize.ts
@@ -1,4 +1,5 @@
import { TAttributes } from "@formbricks/types/attributes";
+import { type ForbiddenError } from "@formbricks/types/errors";
import { type TJsConfig, type TJsConfigInput } from "@formbricks/types/js";
import { trackNoCodeAction } from "./actions";
import { updateAttributes } from "./attributes";
@@ -125,7 +126,7 @@ const migrateProductToProject = (): { changed: boolean; newState?: TJsConfig } =
export const initialize = async (
configInput: TJsConfigInput
-): Promise> => {
+): Promise> => {
const isDebug = getIsDebug();
if (isDebug) {
logger.configure({ logLevel: "debug" });
@@ -286,26 +287,6 @@ export const initialize = async (
config.resetConfig();
logger.debug("Syncing.");
- let updatedAttributes: TAttributes | null = null;
- if (configInput.attributes) {
- if (configInput.userId) {
- const res = await updateAttributes(
- configInput.apiHost,
- configInput.environmentId,
- configInput.userId,
- configInput.attributes
- );
-
- if (res.ok !== true) {
- return err(res.error);
- }
-
- updatedAttributes = res.value;
- } else {
- updatedAttributes = { ...configInput.attributes };
- }
- }
-
try {
const environmentState = await fetchEnvironmentState(
{
@@ -314,6 +295,7 @@ export const initialize = async (
},
false
);
+
const personState = configInput.userId
? await fetchPersonState(
{
@@ -327,6 +309,29 @@ export const initialize = async (
const filteredSurveys = filterSurveys(environmentState, personState);
+ let updatedAttributes: TAttributes | null = null;
+ if (configInput.attributes) {
+ if (configInput.userId) {
+ const res = await updateAttributes(
+ configInput.apiHost,
+ configInput.environmentId,
+ configInput.userId,
+ configInput.attributes
+ );
+
+ if (res.ok !== true) {
+ if (res.error.code === "forbidden") {
+ logger.error(`Authorization error: ${res.error.responseMessage}`);
+ }
+ return err(res.error);
+ }
+
+ updatedAttributes = res.value;
+ } else {
+ updatedAttributes = { ...configInput.attributes };
+ }
+ }
+
config.update({
apiHost: configInput.apiHost,
environmentId: configInput.environmentId,
@@ -336,7 +341,7 @@ export const initialize = async (
attributes: updatedAttributes ?? {},
});
} catch (e) {
- handleErrorOnFirstInit();
+ handleErrorOnFirstInit(e as Error);
}
// and track the new session event
@@ -356,7 +361,11 @@ export const initialize = async (
return okVoid();
};
-export const handleErrorOnFirstInit = () => {
+export const handleErrorOnFirstInit = (e: any) => {
+ if (e.error.code === "forbidden") {
+ logger.error(`Authorization error: ${e.error.responseMessage}`);
+ }
+
if (getIsDebug()) {
logger.debug("Not putting formbricks in error state because debug mode is active (no error state)");
return;
diff --git a/packages/js-core/src/lib/personState.ts b/packages/js-core/src/lib/personState.ts
index f3982e4e5c..920c63e756 100644
--- a/packages/js-core/src/lib/personState.ts
+++ b/packages/js-core/src/lib/personState.ts
@@ -39,7 +39,7 @@ export const fetchPersonState = async (
logger.debug("No cache option set for sync");
}
- const url = `${apiHost}/api/v1/client/${environmentId}/identify/people/${userId}`;
+ const url = `${apiHost}/api/v1/client/${environmentId}/identify/contacts/${userId}`;
const response = await fetch(url, fetchOptions);
@@ -47,7 +47,7 @@ export const fetchPersonState = async (
const jsonRes = await response.json();
const error = err({
- code: "network_error",
+ code: jsonRes.code === "forbidden" ? "forbidden" : "network_error",
status: response.status,
message: "Error syncing with backend",
url: new URL(url),
diff --git a/packages/js/index.html b/packages/js/index.html
index a2ab62e526..df5509546e 100644
--- a/packages/js/index.html
+++ b/packages/js/index.html
@@ -7,7 +7,7 @@
e.parentNode.insertBefore(t, e),
setTimeout(function () {
formbricks.init({
- environmentId: "cm2vz0ivu000562ncopa3hjwo",
+ environmentId: "cm48e77r50006ihewbunm8vta",
userId: "RANDOM_USER_ID",
apiHost: "http://localhost:3000",
});
diff --git a/packages/lib/attribute/cache.ts b/packages/lib/attribute/cache.ts
deleted file mode 100644
index 4b0939f5d7..0000000000
--- a/packages/lib/attribute/cache.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { revalidateTag } from "next/cache";
-
-interface RevalidateProps {
- id?: string;
- environmentId?: string;
- userId?: string;
- personId?: string;
- name: string;
-}
-
-export const attributeCache = {
- tag: {
- byEnvironmentIdAndUserId(environmentId: string, userId: string): string {
- return `environments-${environmentId}-personByUserId-${userId}-attributes`;
- },
- byPersonId(personId: string): string {
- return `person-${personId}-attributes`;
- },
- byNameAndPersonId(name: string, personId: string): string {
- return `person-${personId}-attribute-${name}`;
- },
- },
- revalidate({ environmentId, userId, personId, name }: RevalidateProps): void {
- if (environmentId && userId) {
- revalidateTag(this.tag.byEnvironmentIdAndUserId(environmentId, userId));
- }
- if (personId) {
- revalidateTag(this.tag.byPersonId(personId));
- }
- if (personId && name) {
- revalidateTag(this.tag.byNameAndPersonId(name, personId));
- }
- },
-};
diff --git a/packages/lib/attribute/service.ts b/packages/lib/attribute/service.ts
deleted file mode 100644
index 56e103a136..0000000000
--- a/packages/lib/attribute/service.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-import "server-only";
-import { Prisma } from "@prisma/client";
-import { cache as reactCache } from "react";
-import { prisma } from "@formbricks/database";
-import { TAttributes, ZAttributes } from "@formbricks/types/attributes";
-import { ZString } from "@formbricks/types/common";
-import { ZId } from "@formbricks/types/common";
-import { DatabaseError, OperationNotAllowedError } from "@formbricks/types/errors";
-import { attributeCache } from "../attribute/cache";
-import { attributeClassCache } from "../attributeClass/cache";
-import {
- getAttributeClassByName,
- getAttributeClasses,
- getAttributeClassesCount,
-} from "../attributeClass/service";
-import { cache } from "../cache";
-import { MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT } from "../constants";
-import { getPerson, getPersonByUserId } from "../person/service";
-import { validateInputs } from "../utils/validate";
-
-export const selectAttribute: Prisma.AttributeSelect = {
- value: true,
- attributeClass: {
- select: {
- name: true,
- id: true,
- },
- },
-};
-
-// convert prisma attributes to a key-value object
-const convertPrismaAttributes = (prismaAttributes: any): TAttributes => {
- return prismaAttributes.reduce(
- (acc, attr) => {
- acc[attr.attributeClass.name] = attr.value;
- return acc;
- },
- {} as Record
- );
-};
-
-export const getAttributes = reactCache(
- async (personId: string): Promise =>
- cache(
- async () => {
- validateInputs([personId, ZId]);
-
- try {
- const prismaAttributes = await prisma.attribute.findMany({
- where: {
- personId,
- },
- select: selectAttribute,
- });
-
- return convertPrismaAttributes(prismaAttributes);
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
-
- throw error;
- }
- },
- [`getAttributes-${personId}`],
- {
- tags: [attributeCache.tag.byPersonId(personId)],
- }
- )()
-);
-
-export const getAttributesByUserId = reactCache(
- async (environmentId: string, userId: string): Promise =>
- cache(
- async () => {
- validateInputs([environmentId, ZId], [userId, ZString]);
-
- const person = await getPersonByUserId(environmentId, userId);
-
- if (!person) {
- throw new Error("Person not found");
- }
-
- try {
- const prismaAttributes = await prisma.attribute.findMany({
- where: {
- personId: person.id,
- },
- select: selectAttribute,
- });
-
- return convertPrismaAttributes(prismaAttributes);
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
-
- throw error;
- }
- },
- [`getAttributesByUserId-${environmentId}-${userId}`],
- {
- tags: [attributeCache.tag.byEnvironmentIdAndUserId(environmentId, userId)],
- }
- )()
-);
-
-export const getAttribute = (name: string, personId: string): Promise =>
- cache(
- async () => {
- validateInputs([name, ZString], [personId, ZId]);
-
- const person = await getPerson(personId);
-
- if (!person) {
- throw new Error("Person not found");
- }
-
- const attributeClass = await getAttributeClassByName(person?.environmentId, name);
-
- if (!attributeClass) {
- return undefined;
- }
-
- try {
- const prismaAttributes = await prisma.attribute.findFirst({
- where: {
- attributeClassId: attributeClass.id,
- personId,
- },
- select: { value: true },
- });
-
- return prismaAttributes?.value;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
-
- throw error;
- }
- },
- [`getAttribute-${name}-${personId}`],
- {
- tags: [attributeCache.tag.byNameAndPersonId(name, personId)],
- }
- )();
-
-export const updateAttributes = async (personId: string, attributes: TAttributes): Promise => {
- validateInputs([personId, ZId], [attributes, ZAttributes]);
-
- const person = await getPerson(personId);
-
- if (!person) {
- throw new Error("Person not found");
- }
-
- const environmentId = person.environmentId;
- const userId = person.userId;
-
- const attributeClasses = await getAttributeClasses(environmentId);
-
- const attributeClassMap = new Map(attributeClasses.map((ac) => [ac.name, ac.id]));
- const upsertOperations: Promise[] = [];
- const createOperations: Promise[] = [];
- const newAttributes: { name: string; value: string }[] = [];
-
- for (const [name, value] of Object.entries(attributes)) {
- const attributeClassId = attributeClassMap.get(name);
-
- if (attributeClassId) {
- // Class exists, perform an upsert operation
- upsertOperations.push(
- prisma.attribute
- .upsert({
- select: {
- id: true,
- },
- where: {
- personId_attributeClassId: {
- personId,
- attributeClassId,
- },
- },
- update: {
- value,
- },
- create: {
- personId,
- attributeClassId,
- value,
- },
- })
- .then(() => {
- attributeCache.revalidate({ environmentId, personId, userId, name });
- })
- );
- } else {
- // Collect new attributes to be created later
- newAttributes.push({ name, value });
- }
- }
-
- // Execute all upsert operations concurrently
- await Promise.all(upsertOperations);
-
- if (newAttributes.length === 0) {
- // short-circuit if no new attributes to create
- return true;
- }
-
- // Check if new attribute classes will exceed the limit
- const attributeClassCount = await getAttributeClassesCount(environmentId);
-
- const totalAttributeClassesLength = attributeClassCount + newAttributes.length;
-
- if (totalAttributeClassesLength > MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT) {
- throw new OperationNotAllowedError(
- `Updating these attributes would exceed the maximum number of attribute classes (${MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT}) for environment ${environmentId}. Existing attributes have been updated.`
- );
- }
-
- for (const { name, value } of newAttributes) {
- createOperations.push(
- prisma.attributeClass
- .create({
- select: { id: true },
- data: {
- name,
- type: "code",
- environment: {
- connect: {
- id: environmentId,
- },
- },
- attributes: {
- create: {
- personId,
- value,
- },
- },
- },
- })
- .then(({ id }) => {
- attributeClassCache.revalidate({ id, environmentId, name });
- attributeCache.revalidate({ environmentId, personId, userId, name });
- })
- );
- }
-
- // Execute all create operations for new attribute classes
- await Promise.all(createOperations);
-
- // Revalidate the count cache
- attributeClassCache.revalidate({
- environmentId,
- });
-
- return true;
-};
diff --git a/packages/lib/attributeClass/auth.ts b/packages/lib/attributeClass/auth.ts
deleted file mode 100644
index 78e8bb1631..0000000000
--- a/packages/lib/attributeClass/auth.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import "server-only";
-import { ZId } from "@formbricks/types/common";
-import { cache } from "../cache";
-import { hasUserEnvironmentAccess } from "../environment/auth";
-import { validateInputs } from "../utils/validate";
-import { getAttributeClass } from "./service";
-
-export const canUserAccessAttributeClass = async (
- userId: string,
- attributeClassId: string
-): Promise =>
- cache(
- async () => {
- validateInputs([userId, ZId], [attributeClassId, ZId]);
- if (!userId) return false;
-
- try {
- const attributeClass = await getAttributeClass(attributeClassId);
- if (!attributeClass) return false;
-
- const hasAccessToEnvironment = await hasUserEnvironmentAccess(userId, attributeClass.environmentId);
- if (!hasAccessToEnvironment) return false;
-
- return true;
- } catch (error) {
- throw error;
- }
- },
-
- [`canUserAccessAttributeClass-${userId}-${attributeClassId}`],
- { tags: [`attributeClasses-${attributeClassId}`] }
- )();
diff --git a/packages/lib/attributeClass/cache.ts b/packages/lib/attributeClass/cache.ts
deleted file mode 100644
index 71714babb1..0000000000
--- a/packages/lib/attributeClass/cache.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { revalidateTag } from "next/cache";
-
-interface RevalidateProps {
- id?: string;
- name?: string;
- environmentId?: string;
-}
-
-export const attributeClassCache = {
- tag: {
- byId(id: string) {
- return `attributeClass-${id}`;
- },
- byEnvironmentId(environmentId: string) {
- return `environments-${environmentId}-attributeClasses`;
- },
- byEnvironmentIdAndName(environmentId: string, name: string) {
- return `environments-${environmentId}-name-${name}-attributeClasses`;
- },
- },
- revalidate({ id, environmentId, name }: RevalidateProps): void {
- if (id) {
- revalidateTag(this.tag.byId(id));
- }
-
- if (environmentId) {
- revalidateTag(this.tag.byEnvironmentId(environmentId));
- }
-
- if (environmentId && name) {
- revalidateTag(this.tag.byEnvironmentIdAndName(environmentId, name));
- }
- },
-};
diff --git a/packages/lib/attributeClass/service.ts b/packages/lib/attributeClass/service.ts
deleted file mode 100644
index de3c9ce487..0000000000
--- a/packages/lib/attributeClass/service.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-"use server";
-
-import "server-only";
-import { Prisma } from "@prisma/client";
-import { cache as reactCache } from "react";
-import { prisma } from "@formbricks/database";
-import {
- TAttributeClass,
- TAttributeClassType,
- TAttributeClassUpdateInput,
- ZAttributeClassType,
- ZAttributeClassUpdateInput,
-} from "@formbricks/types/attribute-classes";
-import { ZOptionalNumber, ZString } from "@formbricks/types/common";
-import { ZId } from "@formbricks/types/common";
-import { DatabaseError, OperationNotAllowedError } from "@formbricks/types/errors";
-import { cache } from "../cache";
-import { ITEMS_PER_PAGE, MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT } from "../constants";
-import { validateInputs } from "../utils/validate";
-import { attributeClassCache } from "./cache";
-
-export const getAttributeClass = reactCache(
- async (attributeClassId: string): Promise =>
- cache(
- async () => {
- validateInputs([attributeClassId, ZId]);
-
- try {
- const attributeClass = await prisma.attributeClass.findFirst({
- where: {
- id: attributeClassId,
- },
- });
-
- return attributeClass;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
- throw error;
- }
- },
- [`getAttributeClass-${attributeClassId}`],
- {
- tags: [attributeClassCache.tag.byId(attributeClassId)],
- }
- )()
-);
-
-export const getAttributeClasses = reactCache(
- async (
- environmentId: string,
- page?: number,
- options?: { skipArchived: boolean }
- ): Promise =>
- cache(
- async () => {
- validateInputs([environmentId, ZId], [page, ZOptionalNumber]);
-
- try {
- const attributeClasses = await prisma.attributeClass.findMany({
- where: {
- environmentId: environmentId,
- ...(options?.skipArchived ? { archived: false } : {}),
- },
- orderBy: {
- createdAt: "asc",
- },
- take: page ? ITEMS_PER_PAGE : undefined,
- skip: page ? ITEMS_PER_PAGE * (page - 1) : undefined,
- });
-
- return attributeClasses.filter((attributeClass) => {
- if (attributeClass.name === "userId" && attributeClass.type === "automatic") {
- return false;
- }
-
- return true;
- });
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
- throw error;
- }
- },
- [`getAttributeClasses-${environmentId}-${page}`],
- {
- tags: [attributeClassCache.tag.byEnvironmentId(environmentId)],
- }
- )()
-);
-
-export const updateAttributeClass = async (
- attributeClassId: string,
- data: Partial
-): Promise => {
- validateInputs([attributeClassId, ZId], [data, ZAttributeClassUpdateInput.partial()]);
-
- try {
- const attributeClass = await prisma.attributeClass.update({
- where: {
- id: attributeClassId,
- },
- data: {
- description: data.description,
- archived: data.archived,
- },
- });
-
- attributeClassCache.revalidate({
- id: attributeClass.id,
- environmentId: attributeClass.environmentId,
- name: attributeClass.name,
- });
-
- return attributeClass;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
- throw error;
- }
-};
-
-export const getAttributeClassByName = reactCache(async (environmentId: string, name: string) =>
- cache(
- async (): Promise => {
- validateInputs([environmentId, ZId], [name, ZString]);
-
- try {
- const attributeClass = await prisma.attributeClass.findFirst({
- where: {
- environmentId,
- name,
- },
- });
-
- return attributeClass;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
- throw error;
- }
- },
- [`getAttributeClassByName-${environmentId}-${name}`],
- {
- tags: [attributeClassCache.tag.byEnvironmentIdAndName(environmentId, name)],
- }
- )()
-);
-
-export const createAttributeClass = async (
- environmentId: string,
- name: string,
- type: TAttributeClassType
-): Promise => {
- validateInputs([environmentId, ZId], [name, ZString], [type, ZAttributeClassType]);
-
- const attributeClassesCount = await getAttributeClassesCount(environmentId);
-
- if (attributeClassesCount >= MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT) {
- throw new OperationNotAllowedError(
- `Maximum number of attribute classes (${MAX_ATTRIBUTE_CLASSES_PER_ENVIRONMENT}) reached for environment ${environmentId}`
- );
- }
-
- try {
- const attributeClass = await prisma.attributeClass.create({
- data: {
- name,
- type,
- environment: {
- connect: {
- id: environmentId,
- },
- },
- },
- });
-
- attributeClassCache.revalidate({
- id: attributeClass.id,
- environmentId: attributeClass.environmentId,
- name: attributeClass.name,
- });
-
- return attributeClass;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
- throw error;
- }
-};
-
-export const deleteAttributeClass = async (attributeClassId: string): Promise => {
- validateInputs([attributeClassId, ZId]);
-
- try {
- const deletedAttributeClass = await prisma.attributeClass.delete({
- where: {
- id: attributeClassId,
- },
- });
-
- attributeClassCache.revalidate({
- id: deletedAttributeClass.id,
- environmentId: deletedAttributeClass.environmentId,
- name: deletedAttributeClass.name,
- });
-
- return deletedAttributeClass;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
- throw error;
- }
-};
-
-export const getAttributeClassesCount = reactCache(
- async (environmentId: string): Promise =>
- cache(
- async () => {
- validateInputs([environmentId, ZId]);
-
- try {
- return prisma.attributeClass.count({
- where: {
- environmentId,
- },
- });
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
- throw error;
- }
- },
- [`getAttributeClassesCount-${environmentId}`],
- {
- tags: [attributeClassCache.tag.byEnvironmentId(environmentId)],
- }
- )()
-);
diff --git a/packages/lib/segment/cache.ts b/packages/lib/cache/segment.ts
similarity index 60%
rename from packages/lib/segment/cache.ts
rename to packages/lib/cache/segment.ts
index c49989c121..cbdc5d474a 100644
--- a/packages/lib/segment/cache.ts
+++ b/packages/lib/cache/segment.ts
@@ -3,7 +3,7 @@ import { revalidateTag } from "next/cache";
interface RevalidateProps {
id?: string;
environmentId?: string;
- attributeClassName?: string;
+ attributeKey?: string;
}
export const segmentCache = {
@@ -14,11 +14,11 @@ export const segmentCache = {
byEnvironmentId(environmentId: string): string {
return `environments-${environmentId}-segements`;
},
- byAttributeClassName(attributeClassName: string): string {
- return `attribute-${attributeClassName}-segements`;
+ byAttributeKey(attributeKey: string): string {
+ return `attribute-${attributeKey}-segements`;
},
},
- revalidate({ id, environmentId, attributeClassName }: RevalidateProps): void {
+ revalidate({ id, environmentId, attributeKey }: RevalidateProps): void {
if (id) {
revalidateTag(this.tag.byId(id));
}
@@ -27,8 +27,8 @@ export const segmentCache = {
revalidateTag(this.tag.byEnvironmentId(environmentId));
}
- if (attributeClassName) {
- revalidateTag(this.tag.byAttributeClassName(attributeClassName));
+ if (attributeKey) {
+ revalidateTag(this.tag.byAttributeKey(attributeKey));
}
},
};
diff --git a/packages/lib/display/cache.ts b/packages/lib/display/cache.ts
index a77e640e93..cb8c25d487 100644
--- a/packages/lib/display/cache.ts
+++ b/packages/lib/display/cache.ts
@@ -3,7 +3,7 @@ import { revalidateTag } from "next/cache";
interface RevalidateProps {
id?: string;
surveyId?: string;
- personId?: string | null;
+ contactId?: string | null;
userId?: string;
environmentId?: string;
}
@@ -16,8 +16,8 @@ export const displayCache = {
bySurveyId(surveyId: string) {
return `surveys-${surveyId}-displays`;
},
- byPersonId(personId: string) {
- return `people-${personId}-displays`;
+ byContactId(contactId: string) {
+ return `contacts-${contactId}-displays`;
},
byEnvironmentIdAndUserId(environmentId: string, userId: string) {
return `environments-${environmentId}-users-${userId}-displays`;
@@ -26,7 +26,7 @@ export const displayCache = {
return `environments-${environmentId}-displays`;
},
},
- revalidate({ id, surveyId, personId, environmentId, userId }: RevalidateProps): void {
+ revalidate({ id, surveyId, contactId, environmentId, userId }: RevalidateProps): void {
if (environmentId && userId) {
revalidateTag(this.tag.byEnvironmentIdAndUserId(environmentId, userId));
}
@@ -39,8 +39,8 @@ export const displayCache = {
revalidateTag(this.tag.bySurveyId(surveyId));
}
- if (personId) {
- revalidateTag(this.tag.byPersonId(personId));
+ if (contactId) {
+ revalidateTag(this.tag.byContactId(contactId));
}
if (environmentId) {
diff --git a/packages/lib/display/service.ts b/packages/lib/display/service.ts
index fd4ba1dbec..0a57dfd81a 100644
--- a/packages/lib/display/service.ts
+++ b/packages/lib/display/service.ts
@@ -2,18 +2,10 @@ import "server-only";
import { Prisma } from "@prisma/client";
import { cache as reactCache } from "react";
import { prisma } from "@formbricks/database";
-import { ZOptionalNumber, ZString } from "@formbricks/types/common";
import { ZId } from "@formbricks/types/common";
-import {
- TDisplay,
- TDisplayCreateInput,
- TDisplayFilters,
- ZDisplayCreateInput,
-} from "@formbricks/types/displays";
-import { DatabaseError, ResourceNotFoundError } from "@formbricks/types/errors";
+import { TDisplay, TDisplayFilters } from "@formbricks/types/displays";
+import { DatabaseError } from "@formbricks/types/errors";
import { cache } from "../cache";
-import { ITEMS_PER_PAGE } from "../constants";
-import { createPerson, getPersonByUserId } from "../person/service";
import { validateInputs } from "../utils/validate";
import { displayCache } from "./cache";
@@ -22,162 +14,9 @@ export const selectDisplay = {
createdAt: true,
updatedAt: true,
surveyId: true,
- personId: true,
+ contactId: true,
status: true,
-};
-
-export const getDisplay = reactCache(
- async (displayId: string): Promise =>
- cache(
- async () => {
- validateInputs([displayId, ZId]);
-
- try {
- const display = await prisma.display.findUnique({
- where: {
- id: displayId,
- },
- select: selectDisplay,
- });
-
- return display;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
-
- throw error;
- }
- },
- [`getDisplay-${displayId}`],
- {
- tags: [displayCache.tag.byId(displayId)],
- }
- )()
-);
-
-export const createDisplay = async (displayInput: TDisplayCreateInput): Promise => {
- validateInputs([displayInput, ZDisplayCreateInput]);
-
- const { environmentId, userId, surveyId } = displayInput;
- try {
- let person;
- if (userId) {
- person = await getPersonByUserId(environmentId, userId);
- if (!person) {
- person = await createPerson(environmentId, userId);
- }
- }
- const display = await prisma.display.create({
- data: {
- survey: {
- connect: {
- id: surveyId,
- },
- },
-
- ...(person && {
- person: {
- connect: {
- id: person.id,
- },
- },
- }),
- },
- select: selectDisplay,
- });
- displayCache.revalidate({
- id: display.id,
- personId: display.personId,
- surveyId: display.surveyId,
- userId,
- environmentId,
- });
- return display;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
-
- throw error;
- }
-};
-
-export const getDisplaysByPersonId = reactCache(
- async (personId: string, page?: number): Promise =>
- cache(
- async () => {
- validateInputs([personId, ZId], [page, ZOptionalNumber]);
-
- try {
- const displays = await prisma.display.findMany({
- where: {
- personId: personId,
- },
- select: selectDisplay,
- take: page ? ITEMS_PER_PAGE : undefined,
- skip: page ? ITEMS_PER_PAGE * (page - 1) : undefined,
- orderBy: {
- createdAt: "desc",
- },
- });
-
- return displays;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
-
- throw error;
- }
- },
- [`getDisplaysByPersonId-${personId}-${page}`],
- {
- tags: [displayCache.tag.byPersonId(personId)],
- }
- )()
-);
-
-export const getDisplaysByUserId = reactCache(
- async (environmentId: string, userId: string, page?: number): Promise =>
- cache(
- async () => {
- validateInputs([environmentId, ZId], [userId, ZString], [page, ZOptionalNumber]);
-
- const person = await getPersonByUserId(environmentId, userId);
-
- if (!person) {
- throw new ResourceNotFoundError("person", userId);
- }
-
- try {
- const displays = await prisma.display.findMany({
- where: {
- personId: person.id,
- },
- select: selectDisplay,
- take: page ? ITEMS_PER_PAGE : undefined,
- skip: page ? ITEMS_PER_PAGE * (page - 1) : undefined,
- orderBy: {
- createdAt: "desc",
- },
- });
-
- return displays;
- } catch (error) {
- if (error instanceof Prisma.PrismaClientKnownRequestError) {
- throw new DatabaseError(error.message);
- }
-
- throw error;
- }
- },
- [`getDisplaysByUserId-${environmentId}-${userId}-${page}`],
- {
- tags: [displayCache.tag.byEnvironmentIdAndUserId(environmentId, userId)],
- }
- )()
-);
+} satisfies Prisma.DisplaySelect;
export const getDisplayCountBySurveyId = reactCache(
async (surveyId: string, filters?: TDisplayFilters): Promise =>
@@ -231,7 +70,7 @@ export const deleteDisplay = async (displayId: string): Promise