From 4ef7ebb0622f16d2d2c4d114b5fc15298e2ba24f Mon Sep 17 00:00:00 2001
From: Elias Schneider <login@eliasschneider.com>
Date: Thu, 14 Nov 2024 18:36:30 +0100
Subject: [PATCH] fix: improve share completed dialog redirection for reverse
 shares

---
 .../components/upload/modals/showCompletedUploadModal.tsx | 8 +++++++-
 frontend/src/i18n/translations/en-US.ts                   | 3 +++
 frontend/src/pages/upload/[reverseShareToken].tsx         | 6 ++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/upload/modals/showCompletedUploadModal.tsx b/frontend/src/components/upload/modals/showCompletedUploadModal.tsx
index b4648e0..6d67852 100644
--- a/frontend/src/components/upload/modals/showCompletedUploadModal.tsx
+++ b/frontend/src/components/upload/modals/showCompletedUploadModal.tsx
@@ -30,6 +30,8 @@ const Body = ({ share, appUrl }: { share: CompletedShare; appUrl: string }) => {
   const router = useRouter();
   const t = useTranslate();
 
+  const isReverseShare = !!router.query["reverseShareToken"];
+
   const link = `${appUrl}/s/${share.id}`;
 
   return (
@@ -65,7 +67,11 @@ const Body = ({ share, appUrl }: { share: CompletedShare; appUrl: string }) => {
       <Button
         onClick={() => {
           modals.closeAll();
-          router.push("/upload");
+          if (isReverseShare) {
+            router.reload();
+          } else {
+            router.push("/upload");
+          }
         }}
       >
         <FormattedMessage id="common.button.done" />
diff --git a/frontend/src/i18n/translations/en-US.ts b/frontend/src/i18n/translations/en-US.ts
index 1644ff8..4ae7cec 100644
--- a/frontend/src/i18n/translations/en-US.ts
+++ b/frontend/src/i18n/translations/en-US.ts
@@ -291,6 +291,9 @@ export default {
   "upload.notify.generic-error":
     "An error occurred while finishing your share.",
   "upload.notify.count-failed": "{count} files failed to upload. Trying again.",
+  "upload.reverse-share.error.invalid.title": "Invalid reverse share link",
+  "upload.reverse-share.error.invalid.description":
+    "This reverse share has expired or is invalid.",
 
   // Dropzone.tsx
   "upload.dropzone.title": "Upload files",
diff --git a/frontend/src/pages/upload/[reverseShareToken].tsx b/frontend/src/pages/upload/[reverseShareToken].tsx
index bf2bbd3..a874bb3 100644
--- a/frontend/src/pages/upload/[reverseShareToken].tsx
+++ b/frontend/src/pages/upload/[reverseShareToken].tsx
@@ -5,6 +5,7 @@ import { useEffect, useState } from "react";
 import Upload from ".";
 import showErrorModal from "../../components/share/showErrorModal";
 import shareService from "../../services/share.service";
+import useTranslate from "../../hooks/useTranslate.hook";
 
 export function getServerSideProps(context: GetServerSidePropsContext) {
   return {
@@ -14,6 +15,7 @@ export function getServerSideProps(context: GetServerSidePropsContext) {
 
 const Share = ({ reverseShareToken }: { reverseShareToken: string }) => {
   const modals = useModals();
+  const t = useTranslate();
   const [isLoading, setIsLoading] = useState(true);
 
   const [maxShareSize, setMaxShareSize] = useState(0);
@@ -30,8 +32,8 @@ const Share = ({ reverseShareToken }: { reverseShareToken: string }) => {
       .catch(() => {
         showErrorModal(
           modals,
-          "Invalid Link",
-          "This link is invalid. Please check your link.",
+          t("upload.reverse-share.error.invalid.title"),
+          t("upload.reverse-share.error.invalid.description"),
           "go-home",
         );
         setIsLoading(false);