Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

improved preservation page

daniel31x13d2cb7604fa09
diff --git a/components/Preservation/PreservationContent.tsx b/components/Preservation/PreservationContent.tsx
index e7e700f1..e48d8c7d 100644
--- a/components/Preservation/PreservationContent.tsx
+++ b/components/Preservation/PreservationContent.tsx
@@ -1,54 +1,155 @@
import React, { useEffect, useRef, useState } from "react";
import clsx from "clsx";
+import { useRouter } from "next/router";
+import { useTranslation } from "next-i18next";
+import { BeatLoader } from "react-spinners";
+import Tab from "../Tab";
import ReadableView from "@/components/Preservation/ReadableView";
import { PreservationSkeleton } from "../Skeletons";
import {
- ArchivedFormat,
LinkIncludingShortenedCollectionAndTags,
+ ArchivedFormat,
} from "@/types/global";
-import { BeatLoader } from "react-spinners";
-import { useTranslation } from "next-i18next";
-import { atLeastOneFormatAvailable } from "@/lib/shared/formatStats";
-import Tab from "../Tab";
+import {
+ atLeastOneFormatAvailable,
+ formatAvailable,
+} from "@/lib/shared/formatStats";
type Props = {
link?: LinkIncludingShortenedCollectionAndTags;
- format?: ArchivedFormat; // Optional now, for backward compatibility
+ format?: ArchivedFormat;
};
+function findAvailableImageFormat(
+ link: LinkIncludingShortenedCollectionAndTags
+) {
+ return formatAvailable(link, "image")
+ ? link?.image?.endsWith(".png")
+ ? ArchivedFormat.png
+ : link?.image?.endsWith(".jpeg") || link?.image?.endsWith(".jpg")
+ ? ArchivedFormat.jpeg
+ : null
+ : null;
+}
+
export const PreservationContent: React.FC<Props> = ({ link, format }) => {
+ const router = useRouter();
+ const { t } = useTranslation();
+
const [pdfLoaded, setPdfLoaded] = useState(false);
const [monolithLoaded, setMonolithLoaded] = useState(false);
const [imageLoaded, setImageLoaded] = useState(false);
- const prevFormatRef = useRef<ArchivedFormat | undefined>(undefined);
- const { t } = useTranslation();
+ const prevFormatRef = useRef<ArchivedFormat | undefined>();
+
+ const [currentFormat, setCurrentFormat] = useState<ArchivedFormat>(
+ format ?? ArchivedFormat.readability
+ );
+
+ const screenshotFormat = findAvailableImageFormat(link!);
+
+ const potentialTabs = [
+ {
+ type: "readable" as const,
+ format: ArchivedFormat.readability,
+ icon: "bi-file-earmark-text",
+ name: "Readable",
+ },
+ {
+ type: "image" as const,
+ format: screenshotFormat,
+ icon: "bi-file-earmark-image",
+ name: "Screenshot",
+ },
+ {
+ type: "monolith" as const,
+ format: ArchivedFormat.monolith,
+ icon: "bi-filetype-html",
+ name: "Webpage",
+ },
+ {
+ type: "pdf" as const,
+ format: ArchivedFormat.pdf,
+ icon: "bi-file-earmark-pdf",
+ name: "PDF",
+ },
+ ].filter((tab) => {
+ if (tab.format == null) return false;
+ return formatAvailable(link!, tab.type);
+ });
- const [activeTabIndex, setActiveTabIndex] = useState<number>(0);
+ const activeTabIndex = potentialTabs.findIndex(
+ (tab) => tab.format === currentFormat
+ );
+ const validActiveTabIndex = activeTabIndex >= 0 ? activeTabIndex : 0;
+
+ function handleTabChange(newIndex: number) {
+ if (newIndex >= potentialTabs.length) return;
+ const newFormat = potentialTabs[newIndex].format!;
+
+ setCurrentFormat(newFormat);
+ router.push(
+ {
+ pathname: router.pathname,
+ query: { ...router.query, format: newFormat },
+ },
+ undefined,
+ { shallow: true }
+ );
+ }
useEffect(() => {
- if (prevFormatRef.current !== format) {
+ if (!router.isReady) return;
+
+ const queryVal = router.query.format;
+ if (queryVal) {
+ const qFormat = parseInt(queryVal as string, 10);
+ const allFormats = [
+ ArchivedFormat.readability,
+ ArchivedFormat.monolith,
+ ArchivedFormat.jpeg,
+ ArchivedFormat.png,
+ ArchivedFormat.pdf,
+ ];
+
+ if (allFormats.includes(qFormat)) {
+ setCurrentFormat(qFormat);
+ return;
+ }
+ }
+
+ if (format !== undefined) {
+ setCurrentFormat(format);
+ } else if (potentialTabs.length > 0) {
+ setCurrentFormat(potentialTabs[0].format!);
+ }
+ }, [router.query.format, router.isReady, format, potentialTabs]);
+
+ useEffect(() => {
+ if (prevFormatRef.current !== currentFormat) {
setPdfLoaded(false);
setMonolithLoaded(false);
setImageLoaded(false);
-
- prevFormatRef.current = format;
+ prevFormatRef.current = currentFormat;
}
- }, [format]);
+ }, [currentFormat]);
- if (!link?.id) return <></>;
+ if (!link?.id) return null;
const renderFormat = () => {
- switch (format) {
+ switch (currentFormat) {
case ArchivedFormat.readability:
return (
<div className="overflow-auto w-full h-full">
<ReadableView link={link} />
</div>
);
+
case ArchivedFormat.monolith:
return (
<>
- {!monolithLoaded && <PreservationSkeleton />}
+ {!monolithLoaded && (
+ <PreservationSkeleton className="max-w-screen-lg" />
+ )}
<iframe
src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.monolith}&_=${link.updatedAt}`}
className={clsx(
@@ -59,10 +160,11 @@ export const PreservationContent: React.FC<Props> = ({ link, format }) => {
/>
</>
);
+
case ArchivedFormat.pdf:
return (
<>
- {!pdfLoaded && <PreservationSkeleton />}
+ {!pdfLoaded && <PreservationSkeleton className="max-w-screen-lg" />}
<iframe
src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.pdf}&_=${link.updatedAt}`}
className={clsx(
@@ -73,48 +175,52 @@ export const PreservationContent: React.FC<Props> = ({ link, format }) => {
/>
</>
);
+
case ArchivedFormat.png:
case ArchivedFormat.jpeg:
return (
<>
- {!imageLoaded && <PreservationSkeleton />}
- <img
- alt=""
- src={`/api/v1/archives/${link.id}?format=${format}&_=${link.updatedAt}`}
- className={clsx("w-fit mx-auto", !imageLoaded && "hidden")}
- onLoad={() => setImageLoaded(true)}
- />
+ {!imageLoaded && (
+ <PreservationSkeleton className="max-w-screen-lg" />
+ )}
+ <div className={`h-screen overflow-auto flex items-start`}>
+ <img
+ alt=""
+ src={`/api/v1/archives/${link.id}?format=${currentFormat}`}
+ className={clsx("w-fit mx-auto", !imageLoaded && "hidden")}
+ onLoad={(e) => {
+ const img = e.currentTarget;
+ setImageLoaded(true);
+ setTimeout(() => {
+ if (img.naturalHeight < window.innerHeight) {
+ img.parentElement?.classList.replace(
+ "items-start",
+ "items-center"
+ );
+ }
+ }, 0);
+ }}
+ loading="eager"
+ />
+ </div>
</>
);
+
default:
- return <></>;
+ return null;
}
};
return (
- <div className="relative bg-base-200">
- {link.url && (
+ <div className="relative bg-base-200 h-screen">
+ {link.url && potentialTabs.length > 1 && (
<Tab
- tabs={[
- {
- icon: "bi-file-earmark-text",
- name: "Readable",
- },
- {
- icon: "bi-file-earmark-image",
- name: "Screenshot",
- },
- {
- icon: "bi-filetype-html",
- name: "Webpage",
- },
- {
- icon: "bi-file-earmark-pdf",
- name: "PDF",
- },
- ]}
- activeTabIndex={activeTabIndex}
- setActiveTabIndex={setActiveTabIndex}
+ tabs={potentialTabs.map((tab) => ({
+ icon: tab.icon,
+ name: tab.name,
+ }))}
+ activeTabIndex={validActiveTabIndex}
+ setActiveTabIndex={handleTabChange}
className="w-fit absolute left-1/2 -translate-x-1/2 rounded-full bg-base-100 top-2 text-sm shadow-md"
hideName
/>
@@ -126,7 +232,6 @@ export const PreservationContent: React.FC<Props> = ({ link, format }) => {
className="mx-auto mb-3"
size={30}
/>
-
<p className="text-center text-2xl">{t("preservation_in_queue")}</p>
<p className="text-center text-lg">{t("check_back_later")}</p>
</div>
diff --git a/components/Preservation/ReadableView.tsx b/components/Preservation/ReadableView.tsx
index 404bd12b..99c1cd2a 100644
--- a/components/Preservation/ReadableView.tsx
+++ b/components/Preservation/ReadableView.tsx
@@ -13,6 +13,7 @@ import isValidUrl from "@/lib/shared/isValidUrl";
import Link from "next/link";
import unescapeString from "@/lib/client/unescapeString";
import usePermissions from "@/hooks/usePermissions";
+import { PreservationSkeleton } from "../Skeletons";
type Props = {
link: LinkIncludingShortenedCollectionAndTags;
@@ -84,17 +85,7 @@ export default function ReadableView({ link }: Props) {
</div>
</>
) : (
- <div className="p-5 m-auto w-full flex flex-col items-center gap-5">
- <div className="w-full mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-full mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-full mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-3/4 mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-5/6 mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-3/4 mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-full mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-full mr-auto h-4 skeleton rounded-md"></div>
- <div className="w-5/6 mr-auto h-4 skeleton rounded-md"></div>
- </div>
+ <PreservationSkeleton />
)}
</>
) : (
diff --git a/components/Skeletons.tsx b/components/Skeletons.tsx
index ade8468a..43c5ed03 100644
--- a/components/Skeletons.tsx
+++ b/components/Skeletons.tsx
@@ -3,7 +3,7 @@ import clsx from "clsx";
export const PreservationSkeleton = ({ className }: { className?: string }) => (
<div
className={clsx(
- "p-5 m-auto w-full flex flex-col items-center gap-5 h-full bg-base-200",
+ "p-5 m-auto w-full flex flex-col items-center gap-5 h-full bg-base-200 justify-center",
className
)}
>