From 0bfcf77f381f1178753558df194a04bfb7e5699e Mon Sep 17 00:00:00 2001
From: mbaharip <62494292+mbahArip@users.noreply.github.com>
Date: Mon, 8 May 2023 11:31:47 +0700
Subject: [PATCH] Fix list view copy and download, and Make SWRLayout not
 inside a card on file preview

---
 src/components/File/List.tsx                  | 104 ++++++------------
 .../FilePreview/AudioPreview/index.tsx        |   1 +
 .../FilePreview/CodePreview/index.tsx         |   1 +
 .../FilePreview/ImagePreview/index.tsx        |   9 +-
 .../FilePreview/MarkdownPreview/index.tsx     |   1 +
 .../FilePreview/PDFPreview/index.tsx          |   1 +
 .../FilePreview/TextPreview/index.tsx         |   1 +
 src/components/layout/SWRLayout/index.tsx     |  13 ++-
 src/pages/folder/[id].tsx                     |   2 +-
 9 files changed, 57 insertions(+), 76 deletions(-)

diff --git a/src/components/File/List.tsx b/src/components/File/List.tsx
index 27ea95f..bf2100d 100644
--- a/src/components/File/List.tsx
+++ b/src/components/File/List.tsx
@@ -1,76 +1,24 @@
 import { drive_v3 } from "googleapis";
 import Link from "next/link";
 import { formatBytes, formatDate } from "utils/formatHelper";
-import { toast } from "react-toastify";
 import { MdContentCopy, MdDownload } from "react-icons/md";
 import { getFileIcon } from "utils/mimeTypesHelper";
 import { BsFolderFill } from "react-icons/bs";
 import siteConfig from "config/site.config";
 import { createFileId } from "utils/driveHelper";
+import useCopyText from "hooks/useCopyText";
 
 type Props = {
   data: drive_v3.Schema$File;
 };
 
-function CopyButton({ url, isFolder }: { url: string; isFolder: boolean }) {
-  return (
-    <button
-      className={"p-2"}
-      title={isFolder ? "Copy folder link" : "Copy raw file link"}
-      onClick={async (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-
-        if (!navigator.clipboard) {
-          toast.error("Your browser doesn't support clipboard API");
-          return;
-        }
-
-        try {
-          const host = window.location.host;
-          const copyUrl = isFolder ? host + url : host + url + "/view";
-          await navigator.clipboard.writeText(copyUrl);
-          toast.success(
-            isFolder ? "Folder link copied" : "Raw file link copied",
-          );
-        } catch (error: any) {
-          toast.error("Failed to copy to clipboard");
-          console.error(error.message);
-        }
-      }}
-    >
-      <MdContentCopy />
-    </button>
-  );
-}
-function DownloadButton({
-  fileId,
-  fileName,
-}: {
-  fileId: string;
-  fileName: string;
-}) {
-  return (
-    <button
-      className={"p-2"}
-      onClick={async (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-
-        window.open(`/download/${fileId}/${fileName}`, "_self");
-        toast.info("Downloading file...");
-      }}
-    >
-      <MdDownload />
-    </button>
-  );
-}
-
 export default function ListFile({ data }: Props) {
   const isFolder = data.mimeType === "application/vnd.google-apps.folder";
   const Icon = isFolder
     ? BsFolderFill
     : getFileIcon(data.fileExtension as string, data.mimeType as string);
+  const copyText = useCopyText();
+
   if (!data) return null;
 
   return (
@@ -122,19 +70,39 @@ export default function ListFile({ data }: Props) {
         {isFolder ? "" : formatBytes(data.size as string)}
       </div>
       <div className={"hidden gap-2 tablet:flex"}>
-        <CopyButton
-          url={
-            isFolder
-              ? `/folder/${createFileId(data, true)}`
-              : `/file/${createFileId(data, true)}`
-          }
-          isFolder={isFolder}
-        />
-        {isFolder ? null : (
-          <DownloadButton
-            fileId={data.id as string}
-            fileName={data.name as string}
-          />
+        <button
+          className={"p-2"}
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            copyText(
+              isFolder
+                ? `${process.env.NEXT_PUBLIC_DOMAIN}/folder/${createFileId(
+                    data,
+                    true,
+                  )}`
+                : `${process.env.NEXT_PUBLIC_DOMAIN}/file/${createFileId(
+                    data,
+                    true,
+                  )}`,
+            );
+          }}
+        >
+          <MdContentCopy />
+        </button>
+        {!isFolder && (
+          <Link
+            href={`/api/files/${createFileId(data, true)}?download=1`}
+            target={"_blank"}
+            rel={"noopener noreferrer"}
+            onClick={(e) => {
+              e.stopPropagation();
+            }}
+          >
+            <button className={"p-2"}>
+              <MdDownload />
+            </button>
+          </Link>
         )}
       </div>
     </Link>
diff --git a/src/components/FilePreview/AudioPreview/index.tsx b/src/components/FilePreview/AudioPreview/index.tsx
index 4bcd939..c8210bc 100644
--- a/src/components/FilePreview/AudioPreview/index.tsx
+++ b/src/components/FilePreview/AudioPreview/index.tsx
@@ -45,6 +45,7 @@ export default function AudioPreview({ data }: Props) {
         data={data}
         error={errorMessage}
         isLoading={isLoading}
+        useCard={false}
       >
         <div className={"preview-audio w-full"}>
           <H5AudioPlayer
diff --git a/src/components/FilePreview/CodePreview/index.tsx b/src/components/FilePreview/CodePreview/index.tsx
index 755915b..b6bba13 100644
--- a/src/components/FilePreview/CodePreview/index.tsx
+++ b/src/components/FilePreview/CodePreview/index.tsx
@@ -37,6 +37,7 @@ export default function CodePreview({ data }: Props) {
         data={codeContent}
         error={error}
         isLoading={isLoading}
+        useCard={false}
       >
         <div className={"w-full"}>
           <MarkdownRender content={codeContent} />
diff --git a/src/components/FilePreview/ImagePreview/index.tsx b/src/components/FilePreview/ImagePreview/index.tsx
index 0c5e79d..2dc3fd4 100644
--- a/src/components/FilePreview/ImagePreview/index.tsx
+++ b/src/components/FilePreview/ImagePreview/index.tsx
@@ -1,12 +1,12 @@
-import { TFile } from "types/googleapis";
 import { drive_v3 } from "googleapis";
 import { useEffect, useState } from "react";
 import config from "config/site.config";
 import { reverseString } from "utils/hashHelper";
 import SWRLayout from "components/layout/SWRLayout";
+import { createFileId } from "utils/driveHelper";
 
 type Props = {
-  data: TFile | drive_v3.Schema$File;
+  data: drive_v3.Schema$File;
   hash?: string;
 };
 
@@ -21,7 +21,7 @@ export default function ImagePreview({ data, hash }: Props) {
       setIsLoading(false);
     }, config.preview.timeout);
     const image = new Image();
-    image.src = `/media/${data.id}/${data.name}`;
+    image.src = `/api/files/${createFileId(data)}?download=1`;
     image.onload = () => {
       setImageSrc(image.src);
       setIsLoading(false);
@@ -36,7 +36,7 @@ export default function ImagePreview({ data, hash }: Props) {
     return () => {
       clearTimeout(timeout);
     };
-  }, [data.id, data.name]);
+  }, [data]);
 
   return (
     <div className='flex w-full items-center justify-center'>
@@ -44,6 +44,7 @@ export default function ImagePreview({ data, hash }: Props) {
         data={data}
         error={errorMessage}
         isLoading={isLoading}
+        useCard={false}
       >
         <img
           src={imageSrc}
diff --git a/src/components/FilePreview/MarkdownPreview/index.tsx b/src/components/FilePreview/MarkdownPreview/index.tsx
index 0b9530f..b252b07 100644
--- a/src/components/FilePreview/MarkdownPreview/index.tsx
+++ b/src/components/FilePreview/MarkdownPreview/index.tsx
@@ -22,6 +22,7 @@ export default function MarkdownPreview({ data }: Props) {
         data={swrData}
         error={error}
         isLoading={isLoading}
+        useCard={false}
       >
         <div className={"w-full"}>
           <MarkdownRender content={swrData as string} />
diff --git a/src/components/FilePreview/PDFPreview/index.tsx b/src/components/FilePreview/PDFPreview/index.tsx
index fea6740..f1acf31 100644
--- a/src/components/FilePreview/PDFPreview/index.tsx
+++ b/src/components/FilePreview/PDFPreview/index.tsx
@@ -33,6 +33,7 @@ export default function PDFPreview({ data }: Props) {
         data={data}
         error={errorMessage}
         isLoading={isLoading}
+        useCard={false}
       >
         <></>
       </SWRLayout>
diff --git a/src/components/FilePreview/TextPreview/index.tsx b/src/components/FilePreview/TextPreview/index.tsx
index 382074d..418e83f 100644
--- a/src/components/FilePreview/TextPreview/index.tsx
+++ b/src/components/FilePreview/TextPreview/index.tsx
@@ -22,6 +22,7 @@ export default function TextPreview({ data }: Props) {
         data={swrData}
         error={error}
         isLoading={isLoading}
+        useCard={false}
       >
         <div className={"w-full"}>
           <MarkdownRender content={swrData as string} />
diff --git a/src/components/layout/SWRLayout/index.tsx b/src/components/layout/SWRLayout/index.tsx
index d5a9497..e4ecf14 100644
--- a/src/components/layout/SWRLayout/index.tsx
+++ b/src/components/layout/SWRLayout/index.tsx
@@ -6,10 +6,17 @@ type Props = {
   data: unknown;
   error: unknown;
   isLoading: boolean;
+  useCard?: boolean;
   children: React.ReactNode;
 };
 
-export default function SWRLayout({ data, error, isLoading, children }: Props) {
+export default function SWRLayout({
+  data,
+  error,
+  isLoading,
+  useCard = true,
+  children,
+}: Props) {
   const [isMounted, setIsMounted] = useState<boolean>(false);
 
   useEffect(() => {
@@ -21,12 +28,12 @@ export default function SWRLayout({ data, error, isLoading, children }: Props) {
   return (
     <>
       {isLoading && (
-        <div className={"card"}>
+        <div className={useCard ? "card" : ""}>
           <LoadingFeedback />
         </div>
       )}
       {!isLoading && error && (
-        <div className={"card"}>
+        <div className={useCard ? "card" : ""}>
           <ErrorFeedback />
         </div>
       )}
diff --git a/src/pages/folder/[id].tsx b/src/pages/folder/[id].tsx
index 6580007..9eaa9d3 100644
--- a/src/pages/folder/[id].tsx
+++ b/src/pages/folder/[id].tsx
@@ -110,7 +110,7 @@ export default function Home({ id, folderName, bannerFileId }: Props) {
         openGraph={{
           title: folderName,
           url: `${process.env.NEXT_PUBLIC_DOMAIN}/folder/${id}`,
-          description: `Exploring ${folderName}}`,
+          description: `Exploring ${folderName}`,
           images: [
             {
               url: bannerFileId