resolved merge conflicts

This commit is contained in:
Piyush Gupta
2023-09-13 00:07:02 +05:30
5 changed files with 1761 additions and 3009 deletions

View File

@@ -87,8 +87,8 @@ const TagsCombobox: React.FC<ITagsComboboxProps> = ({
onKeyDown={(e) => {
if (e.key === "Enter" && searchValue !== "") {
if (
!tagsToSearch?.find((tag) =>
tag?.label?.toLowerCase().includes(searchValue?.toLowerCase())
!tagsToSearch?.find(
(tag) => tag?.label?.toLowerCase().includes(searchValue?.toLowerCase())
)
) {
createTag?.(searchValue);

View File

@@ -33,7 +33,7 @@ export default function LinkSurveyShareButton({
<ShareIcon className="h-5 w-5" />
</Button>
{/* {showLinkModal && <LinkSurveyModal survey={survey} open={showLinkModal} setOpen={setShowLinkModal} />} */}
{showLinkModal && <EmbedSurveyModal survey={survey} open={showLinkModal} setOpen={setShowLinkModal} />}
{/* {showLinkModal && <EmbedSurveyModal survey={survey} open={showLinkModal} setOpen={setShowLinkModal} />} */}
{showLinkModal && (
<LinkSurveyModal
survey={survey}

View File

@@ -112,10 +112,13 @@ export default async function handle(req: NextApiRequest, res: NextApiResponse)
});
const transformPrismaPerson = (person): TPerson => {
const attributes = person.attributes.reduce((acc, attr) => {
acc[attr.attributeClass.name] = attr.value;
return acc;
}, {} as Record<string, string | number>);
const attributes = person.attributes.reduce(
(acc, attr) => {
acc[attr.attributeClass.name] = attr.value;
return acc;
},
{} as Record<string, string | number>
);
return {
id: person.id,

View File

@@ -157,10 +157,13 @@ export default async function handle(req: NextApiRequest, res: NextApiResponse)
});
const transformPrismaPerson = (person): TPerson => {
const attributes = person.attributes.reduce((acc, attr) => {
acc[attr.attributeClass.name] = attr.value;
return acc;
}, {} as Record<string, string | number>);
const attributes = person.attributes.reduce(
(acc, attr) => {
acc[attr.attributeClass.name] = attr.value;
return acc;
},
{} as Record<string, string | number>
);
return {
id: person.id,

4742
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff