fix: Fixed backup restore menu not updating after switching files

michaelkoelle · May 16, 2021 · 5e8953d · 5e8953d
1 parent c086e4d
commit 5e8953d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/app/containers/FramelessTitleBar.tsx b/app/containers/FramelessTitleBar.tsx
@@ -50,7 +50,15 @@ export default function FramelessTitleBar(props: {
     releaseName: '',
   });
   const [openReleaseNotes, setOpenReleaseNotes] = useState(false);
-  const [backupPaths, setBackupPaths] = useState<string[]>([]);
+  // Only for force reloading menu
+  const [, setBackupPaths] = useState<string[]>([]);
+
+  const setBackupFilePaths = () => {
+    const paths = fs
+      .readdirSync(Path.join(remote.app.getPath('userData'), 'Backup'))
+      .filter((p) => p.includes(Path.basename(workspace)));
+    setBackupPaths(paths);
+  };
 
   useEffect(() => {
     const acceleratorListener = (event) => {
@@ -61,13 +69,6 @@ export default function FramelessTitleBar(props: {
     };
     window.addEventListener('keydown', acceleratorListener, true);
 
-    const setBackupFilePaths = () => {
-      const paths = fs
-        .readdirSync(Path.join(remote.app.getPath('userData'), 'Backup'))
-        .filter((p) => p.includes(Path.basename(workspace)));
-      setBackupPaths(paths);
-    };
-
     ipcRenderer.on(BACKUP_SUCCESSFUL, setBackupFilePaths);
     return () => {
       ipcRenderer.removeListener(BACKUP_SUCCESSFUL, setBackupFilePaths);
@@ -128,7 +129,6 @@ export default function FramelessTitleBar(props: {
             unsavedChanges,
             recentPaths,
             setOpenFileError,
-            backupPaths,
             setOpenExportDialog,
             setExportSheetId,
             setReload,
@@ -162,7 +162,6 @@ export default function FramelessTitleBar(props: {
           workspace.length > 0 ? `${Path.parse(workspace).name} - ` : ''
         }correctinator v${version}${unsavedChanges ? ' •' : ''}`}
         onClose={() => {
-          console.log('onCLose');
           currentWindow.close();
         }}
         onMinimize={() => currentWindow.minimize()}

diff --git a/app/menu/FileMenu.ts b/app/menu/FileMenu.ts
@@ -27,7 +27,6 @@ const buildFileMenu = (
   unsavedChanges,
   recentPaths,
   setOpenFileError,
-  backupPaths,
   setOpenExportDialog,
   setExportSheetId
 ) => {
@@ -39,6 +38,9 @@ const buildFileMenu = (
       dispatch(reloadState());
     }
   };
+  const backupPaths = fs
+    .readdirSync(Path.join(remote.app.getPath('userData'), 'Backup'))
+    .filter((p) => p.includes(Path.basename(workspace)));
 
   return {
     label: 'File',

diff --git a/app/menu/Menu.ts b/app/menu/Menu.ts
@@ -11,7 +11,6 @@ const buildMenu = (
   unsavedChanges,
   recentPaths,
   setOpenFileError,
-  backupPaths,
   setOpenExportDialog,
   setExportSheetId,
   setReload,
@@ -29,7 +28,6 @@ const buildMenu = (
       unsavedChanges,
       recentPaths,
       setOpenFileError,
-      backupPaths,
       setOpenExportDialog,
       setExportSheetId
     ),