Skip to content

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

refactor(view): simplify document / dataroom view render

Marc Seitzd4d372f9bbae
diff --git a/pages/view/[linkId]/index.tsx b/pages/view/[linkId]/index.tsx
index 17bdfd50..19fc3c4d 100644
--- a/pages/view/[linkId]/index.tsx
+++ b/pages/view/[linkId]/index.tsx
@@ -259,39 +259,6 @@ export default function ViewPage({
);
}
- if (emailProtected || linkPassword || enableAgreement) {
- return (
- <>
- <CustomMetatag
- enableBranding={meta.enableCustomMetatag ?? false}
- title={
- meta.metaTitle ??
- `${link?.document?.name} | Powered by Papermark` ??
- "Document powered by Papermark"
- }
- description={meta.metaDescription ?? null}
- imageUrl={meta.metaImage ?? null}
- url={meta.metaUrl ?? ""}
- />
- <DocumentView
- link={link}
- userEmail={verifiedEmail ?? userEmail}
- userId={userId}
- isProtected={true}
- notionData={notionData}
- brand={brand}
- token={token}
- verifiedEmail={verifiedEmail}
- showPoweredByBanner={showPoweredByBanner}
- showAccountCreationSlide={showAccountCreationSlide}
- useAdvancedExcelViewer={useAdvancedExcelViewer}
- previewToken={previewToken}
- disableEditEmail={!!disableEditEmail}
- />
- </>
- );
- }
-
return (
<>
<CustomMetatag
@@ -309,7 +276,7 @@ export default function ViewPage({
link={link}
userEmail={verifiedEmail ?? userEmail}
userId={userId}
- isProtected={false}
+ isProtected={!!(emailProtected || linkPassword || enableAgreement)}
notionData={notionData}
brand={brand}
showPoweredByBanner={showPoweredByBanner}
@@ -350,6 +317,7 @@ export default function ViewPage({
emailProtected,
emailAuthenticated,
password: linkPassword,
+ enableAgreement,
isArchived,
} = link;
@@ -369,36 +337,6 @@ export default function ViewPage({
);
}
- if (emailProtected || linkPassword) {
- return (
- <>
- <CustomMetatag
- enableBranding={meta.enableCustomMetatag ?? false}
- title={
- meta.metaTitle ??
- `${link?.dataroom?.name} | Powered by Papermark` ??
- "Dataroom powered by Papermark"
- }
- description={meta.metaDescription ?? null}
- imageUrl={meta.metaImage ?? null}
- url={meta.metaUrl ?? ""}
- />
- <DataroomView
- link={link}
- userEmail={verifiedEmail ?? userEmail}
- userId={userId}
- isProtected={true}
- brand={brand}
- token={token}
- verifiedEmail={verifiedEmail}
- useAdvancedExcelViewer={useAdvancedExcelViewer}
- previewToken={previewToken}
- disableEditEmail={!!disableEditEmail}
- />
- </>
- );
- }
-
return (
<>
<CustomMetatag
@@ -416,7 +354,7 @@ export default function ViewPage({
link={link}
userEmail={verifiedEmail ?? userEmail}
userId={userId}
- isProtected={false}
+ isProtected={!!(emailProtected || linkPassword || enableAgreement)}
brand={brand}
useAdvancedExcelViewer={useAdvancedExcelViewer}
previewToken={previewToken}
diff --git a/pages/view/domains/[domain]/[slug]/index.tsx b/pages/view/domains/[domain]/[slug]/index.tsx
index 7ac79978..5f68c100 100644
--- a/pages/view/domains/[domain]/[slug]/index.tsx
+++ b/pages/view/domains/[domain]/[slug]/index.tsx
@@ -240,6 +240,7 @@ export default function ViewPage({
expiresAt,
emailProtected,
password: linkPassword,
+ enableAgreement,
isArchived,
} = link;
@@ -259,38 +260,6 @@ export default function ViewPage({
);
}
- if (emailProtected || linkPassword) {
- return (
- <>
- <CustomMetatag
- enableBranding={meta.enableCustomMetatag ?? false}
- title={
- meta.metaTitle ??
- `${link?.document?.name} | Powered by Papermark` ??
- "Document powered by Papermark"
- }
- description={meta.metaDescription ?? null}
- imageUrl={meta.metaImage ?? null}
- url={meta.metaUrl ?? ""}
- />
- <DocumentView
- link={link}
- userEmail={verifiedEmail ?? userEmail}
- userId={userId}
- isProtected={true}
- notionData={notionData}
- brand={brand}
- token={token}
- verifiedEmail={verifiedEmail}
- showAccountCreationSlide={showAccountCreationSlide}
- useAdvancedExcelViewer={useAdvancedExcelViewer}
- previewToken={previewToken}
- disableEditEmail={!!disableEditEmail}
- />
- </>
- );
- }
-
return (
<>
<CustomMetatag
@@ -308,7 +277,7 @@ export default function ViewPage({
link={link}
userEmail={verifiedEmail ?? userEmail}
userId={userId}
- isProtected={false}
+ isProtected={!!(emailProtected || linkPassword || enableAgreement)}
notionData={notionData}
brand={brand}
showAccountCreationSlide={showAccountCreationSlide}
@@ -348,6 +317,7 @@ export default function ViewPage({
emailProtected,
emailAuthenticated,
password: linkPassword,
+ enableAgreement,
isArchived,
} = link;
@@ -367,36 +337,6 @@ export default function ViewPage({
);
}
- if (emailProtected || linkPassword) {
- return (
- <>
- <CustomMetatag
- enableBranding={meta.enableCustomMetatag ?? false}
- title={
- meta.metaTitle ??
- `${link?.dataroom?.name} | Powered by Papermark` ??
- "Dataroom powered by Papermark"
- }
- description={meta.metaDescription ?? null}
- imageUrl={meta.metaImage ?? null}
- url={meta.metaUrl ?? ""}
- />
- <DataroomView
- link={link}
- userEmail={verifiedEmail ?? userEmail}
- userId={userId}
- isProtected={true}
- brand={brand}
- token={token}
- verifiedEmail={verifiedEmail}
- useAdvancedExcelViewer={useAdvancedExcelViewer}
- previewToken={previewToken}
- disableEditEmail={!!disableEditEmail}
- />
- </>
- );
- }
-
return (
<>
<CustomMetatag
@@ -414,7 +354,7 @@ export default function ViewPage({
link={link}
userEmail={verifiedEmail ?? userEmail}
userId={userId}
- isProtected={false}
+ isProtected={!!(emailProtected || linkPassword || enableAgreement)}
brand={brand}
useAdvancedExcelViewer={useAdvancedExcelViewer}
previewToken={previewToken}