Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: move feedback to links in view

Marc Seitz06ba5bbd8e8a
diff --git a/components/view/PagesViewer.tsx b/components/view/PagesViewer.tsx
index c097d5ed..1873276e 100644
--- a/components/view/PagesViewer.tsx
+++ b/components/view/PagesViewer.tsx
@@ -26,6 +26,7 @@ export default function PagesViewer({
dataroomId,
setDocumentData,
showPoweredByBanner,
+ enableQuestion = false,
feedback,
}: {
pages: { file: string; pageNumber: string; embeddedLinks: string[] }[];
@@ -40,16 +41,16 @@ export default function PagesViewer({
dataroomId?: string;
setDocumentData?: (data: any) => void;
showPoweredByBanner?: boolean;
+ enableQuestion?: boolean | null;
feedback?: {
id: string;
- enabled: boolean;
data: { question: string; type: string };
} | null;
}) {
const router = useRouter();
const numPages = pages.length;
const numPagesWithFeedback =
- feedback && feedback.enabled ? numPages + 1 : numPages;
+ enableQuestion && feedback ? numPages + 1 : numPages;
const pageQuery = router.query.p ? Number(router.query.p) : 1;
const [pageNumber, setPageNumber] = useState<number>(() =>
@@ -273,10 +274,8 @@ export default function PagesViewer({
) : (
<LoadingSpinner className="h-20 w-20 text-foreground" />
))}
- {feedback &&
- feedback.enabled &&
- pageNumber === numPagesWithFeedback ? (
- <div className="flex items-center justify-center">
+ {enableQuestion && feedback && pageNumber === numPagesWithFeedback ? (
+ <div className="flex items-center justify-center w-full">
<Question
feedback={feedback}
viewId={viewId}
diff --git a/components/view/question.tsx b/components/view/question.tsx
index cf8db4f6..67235c15 100644
--- a/components/view/question.tsx
+++ b/components/view/question.tsx
@@ -69,7 +69,7 @@ export default function Question({
return (
<motion.div
- className="z-10 mx-5 flex flex-col items-center space-y-10 text-center sm:mx-auto"
+ className="z-10 flex flex-col items-center space-y-10 text-center w-full"
variants={{
hidden: { opacity: 0, scale: 0.95 },
show: {
@@ -87,7 +87,7 @@ export default function Question({
>
<motion.div
variants={STAGGER_CHILD_VARIANTS}
- className="flex flex-col items-center space-y-10 text-center"
+ className="flex flex-col items-center space-y-10 text-center w-full"
>
<h1 className="font-display max-w-xl text-3xl font-semibold transition-colors sm:text-4xl text-white">
{feedback.data.question}
@@ -95,7 +95,7 @@ export default function Question({
</motion.div>
<motion.div
variants={STAGGER_CHILD_VARIANTS}
- className="grid w-full max-w-md grid-cols-1 divide-border text-white rounded-md border border-border md:grid-cols-2 md:divide-x md:divide-y-0 divide-y"
+ className="grid w-full max-w-sm grid-cols-1 divide-border text-white rounded-md border border-border md:grid-cols-2 md:divide-x md:divide-y-0 divide-y"
>
<button
onClick={() => handleQuestionSubmit("yes")}
diff --git a/components/view/view-data.tsx b/components/view/view-data.tsx
index a9c61479..c6c10bbd 100644
--- a/components/view/view-data.tsx
+++ b/components/view/view-data.tsx
@@ -45,7 +45,8 @@ export default function ViewData({
versionNumber={document.versions[0].versionNumber}
brand={brand}
showPoweredByBanner={showPoweredByBanner}
- feedback={document.feedback}
+ enableQuestion={link.enableQuestion}
+ feedback={link.feedback}
/>
) : (
<PDFViewer
diff --git a/lib/types.ts b/lib/types.ts
index bdae4369..ce59441c 100644
--- a/lib/types.ts
+++ b/lib/types.ts
@@ -8,6 +8,7 @@ import {
DataroomDocument,
Dataroom,
DataroomFolder,
+ Feedback,
} from "@prisma/client";
export type CustomUser = NextAuthUser & PrismaUser;
@@ -37,6 +38,7 @@ export interface LinkWithViews extends Link {
views: number;
};
views: View[];
+ feedback: { id: true; data: { question: string; type: string } } | null;
}
export interface LinkWithDocument extends Link {
@@ -51,15 +53,14 @@ export interface LinkWithDocument extends Link {
team: {
plan: string;
} | null;
- feedback: {
- id: string;
- enabled: boolean;
- data: {
- question: string;
- type: string;
- };
- } | null;
};
+ feedback: {
+ id: string;
+ data: {
+ question: string;
+ type: string;
+ };
+ } | null;
}
export interface Geo {
diff --git a/pages/api/links/[id]/index.ts b/pages/api/links/[id]/index.ts
index 2b7a9373..8c191804 100644
--- a/pages/api/links/[id]/index.ts
+++ b/pages/api/links/[id]/index.ts
@@ -32,6 +32,13 @@ export default async function handle(
metaTitle: true,
metaDescription: true,
metaImage: true,
+ enableQuestion: true,
+ feedback: {
+ select: {
+ id: true,
+ data: true,
+ },
+ },
document: {
select: {
id: true,
@@ -44,13 +51,6 @@ export default async function handle(
plan: true,
},
},
- feedback: {
- select: {
- id: true,
- enabled: true,
- data: true,
- },
- },
versions: {
where: { isPrimary: true },
select: {
@@ -188,6 +188,23 @@ export default async function handle(
metaTitle: linkData.metaTitle || null,
metaDescription: linkData.metaDescription || null,
metaImage: linkData.metaImage || null,
+ enableQuestion: linkData.enableQuestion,
+ feedback: {
+ upsert: {
+ create: {
+ data: {
+ question: linkData.questionText,
+ type: linkData.questionType,
+ },
+ },
+ update: {
+ data: {
+ question: linkData.questionText,
+ type: linkData.questionType,
+ },
+ },
+ },
+ },
},
include: {
views: {
diff --git a/pages/api/links/domains/[...domainSlug].ts b/pages/api/links/domains/[...domainSlug].ts
index 93b0c3f3..59c3d5b3 100644
--- a/pages/api/links/domains/[...domainSlug].ts
+++ b/pages/api/links/domains/[...domainSlug].ts
@@ -43,6 +43,13 @@ export default async function handle(
metaTitle: true,
metaDescription: true,
metaImage: true,
+ enableQuestion: true,
+ feedback: {
+ select: {
+ id: true,
+ data: true,
+ },
+ },
document: {
select: {
id: true,
@@ -60,13 +67,6 @@ export default async function handle(
},
take: 1,
},
- feedback: {
- select: {
- id: true,
- enabled: true,
- data: true,
- },
- },
},
},
},