瀏覽代碼

Remove unused sharedFiles app context prop

setSharedFiles was removed in 3b468cb1545e5ee5065fa89e06f5738c4fd0c06f (years ago).
Manav Rathi 1 年之前
父節點
當前提交
0fbafcc4f5
共有 2 個文件被更改,包括 5 次插入30 次删除
  1. 5 10
      web/apps/photos/src/components/Upload/Uploader.tsx
  2. 0 20
      web/apps/photos/src/pages/_app.tsx

+ 5 - 10
web/apps/photos/src/components/Upload/Uploader.tsx

@@ -198,7 +198,6 @@ export default function Uploader({
     };
     const handleCollectionSelectorCancel = () => {
         uploadRunning.current = false;
-        appContext.resetSharedFiles();
     };
 
     const handleUserNameInputDialogClose = () => {
@@ -298,10 +297,10 @@ export default function Uploader({
 
     useEffect(() => {
         if (
+            webFiles.length > 0 ||
             desktopFilePaths.length > 0 ||
             electronFiles.length > 0 ||
-            webFiles.length > 0 ||
-            appContext.sharedFiles?.length > 0
+
         ) {
             log.info(
                 `upload request type: ${
@@ -311,12 +310,11 @@ export default function Uploader({
                           ? "electronFiles"
                           : webFiles.length > 0
                             ? "webFiles"
-                            : "sharedFiles"
+                            : "-"
                 } count ${
                     desktopFilePaths.length +
                     electronFiles.length +
-                    webFiles.length +
-                    (appContext.sharedFiles?.length ?? 0)
+                    webFiles.length
                 }`,
             );
             if (uploadManager.isUploadRunning()) {
@@ -340,9 +338,6 @@ export default function Uploader({
                 // File selection by drag and drop or selection of file.
                 fileOrPathsToUpload.current = webFiles;
                 setWebFiles([]);
-            } else if (appContext.sharedFiles?.length > 0) {
-                fileOrPathsToUpload.current = appContext.sharedFiles;
-                appContext.resetSharedFiles();
             } else if (electronFiles?.length > 0) {
                 // File selection from desktop app - deprecated
                 log.warn("Using deprecated code path for ElectronFiles");
@@ -386,7 +381,7 @@ export default function Uploader({
             pickedUploadType.current = null;
             props.setLoading(false);
         }
-    }, [webFiles, appContext.sharedFiles, electronFiles, desktopFilePaths]);
+    }, [webFiles, , electronFiles, desktopFilePaths]);
 
     const preCollectionCreationAction = async () => {
         props.closeCollectionSelector?.();

+ 0 - 20
web/apps/photos/src/pages/_app.tsx

@@ -80,8 +80,6 @@ const redirectMap = new Map([
 
 type AppContextType = {
     showNavBar: (show: boolean) => void;
-    sharedFiles: File[];
-    resetSharedFiles: () => void;
     mlSearchEnabled: boolean;
     mapEnabled: boolean;
     updateMlSearchEnabled: (enabled: boolean) => Promise<void>;
@@ -114,7 +112,6 @@ export default function App({ Component, pageProps }: AppProps) {
         typeof window !== "undefined" && !window.navigator.onLine,
     );
     const [showNavbar, setShowNavBar] = useState(false);
-    const [sharedFiles, setSharedFiles] = useState<File[]>(null);
     const [redirectName, setRedirectName] = useState<string>(null);
     const [mlSearchEnabled, setMlSearchEnabled] = useState(false);
     const [mapEnabled, setMapEnabled] = useState(false);
@@ -227,7 +224,6 @@ export default function App({ Component, pageProps }: AppProps) {
 
     const setUserOnline = () => setOffline(false);
     const setUserOffline = () => setOffline(true);
-    const resetSharedFiles = () => setSharedFiles(null);
 
     useEffect(() => {
         const redirectTo = async (redirect) => {
@@ -354,20 +350,6 @@ export default function App({ Component, pageProps }: AppProps) {
                 <MessageContainer>
                     {isI18nReady && offline && t("OFFLINE_MSG")}
                 </MessageContainer>
-                {sharedFiles &&
-                    (router.pathname === "/gallery" ? (
-                        <MessageContainer>
-                            {t("files_to_be_uploaded", {
-                                count: sharedFiles.length,
-                            })}
-                        </MessageContainer>
-                    ) : (
-                        <MessageContainer>
-                            {t("login_to_upload_files", {
-                                count: sharedFiles.length,
-                            })}
-                        </MessageContainer>
-                    ))}
                 <LoadingBar color="#51cd7c" ref={loadingBar} />
 
                 <DialogBox
@@ -394,8 +376,6 @@ export default function App({ Component, pageProps }: AppProps) {
                         showNavBar,
                         mlSearchEnabled,
                         updateMlSearchEnabled,
-                        sharedFiles,
-                        resetSharedFiles,
                         startLoading,
                         finishLoading,
                         closeMessageDialog,