Merge pull request #480 from internxt/feat/block-manual-sync-in-syncing

[_]: manual-sync-permission-delay
internxt · Apr 3, 2024 · 24bd89d · 24bd89d
2 parents 20eb78b + 82615b5
commit 24bd89d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/src/apps/main/preload.d.ts b/src/apps/main/preload.d.ts
@@ -168,5 +168,6 @@ declare interface Window {
     openUrl: (url: string) => Promise<void>;
     getPreferredAppLanguage: () => Promise<Array<string>>;
     syncManually: () => Promise<void>;
+    getRecentlywasSyncing: () => Promise<boolean>;
   };
 }
diff --git a/src/apps/main/preload.js b/src/apps/main/preload.js
@@ -299,5 +299,9 @@ contextBridge.exposeInMainWorld('electron', {
   syncManually() {
     return ipcRenderer.invoke('SYNC_MANUALLY');
   },
+  getRecentlywasSyncing()  {
+    return ipcRenderer.invoke('CHECK_SYNC_IN_PROGRESS');
+  },
+
   path,
 });
diff --git a/src/apps/main/remote-sync/helpers.ts b/src/apps/main/remote-sync/helpers.ts
@@ -99,7 +99,7 @@ export type SyncConfig = {
 };
 
 export const SYNC_OFFSET_MS = 0;
-export const WAITING_AFTER_SYNCING = 1000 * 60 * 3; // 5 minutes
+export const WAITING_AFTER_SYNCING = 1000 * 60 * 3;
 
 export const lastSyncedAtIsNewer = (
   itemUpdatedAt: Date,

diff --git a/src/apps/renderer/pages/Widget/Header.tsx b/src/apps/renderer/pages/Widget/Header.tsx
@@ -12,6 +12,7 @@ import useUsage from '../../hooks/useUsage';
 import useVirtualDriveStatus from '../../hooks/VirtualDriveStatus';
 import { reportError } from '../../utils/errors';
 
+
 export default function Header() {
   const { translate } = useTranslationContext();
   const { virtualDriveCanBeOpened } = useVirtualDriveStatus();
@@ -45,10 +46,19 @@ export default function Header() {
     window.electron.quit();
   }
 
-  function onSyncClick() {
+  const wasSyncing =  () => {
+    return window.electron.getRecentlywasSyncing();
+  };
+
+  async function onSyncClick() {
+    const notAllowed = await wasSyncing();
+    if (notAllowed) {
+      return;
+    }
     window.electron.syncManually();
   }
 
+
   const handleOpenURL = async (URL: string) => {
     try {
       await window.electron.openUrl(URL);
@@ -200,13 +210,15 @@ export default function Header() {
                   )}
                 </Menu.Item>
                 <Menu.Item>
-                  {({ active }) => (
-                    <div>
-                      <DropdownItem active={active} onClick={onSyncClick}>
+                  {({active}) => {
+
+                    return (<div>
+                      <DropdownItem active={active} onClick={onSyncClick}  >
                         <span>{translate('widget.header.dropdown.sync')}</span>
                       </DropdownItem>
-                    </div>
-                  )}
+                    </div>);
+                  }
+                  }
                 </Menu.Item>
                 <Menu.Item>
                   {({ active }) => (

diff --git a/src/context/virtual-drive/shared/application/PollingMonitorStart.ts b/src/context/virtual-drive/shared/application/PollingMonitorStart.ts
@@ -5,15 +5,15 @@ import Logger from 'electron-log';
 export class PollingMonitorStart {
   constructor(private readonly polling: PollingMonitor) {}
   run(fn: MonitorFn) {
-    Logger.info('[SYNC ENGINE] check sync engine');
+    Logger.info('[START FALLBAK] Starting fallback sync...');
 
     const permission = this.permissionFn.bind(this);
     return this.polling.start(fn, permission);
   }
 
   private async permissionFn() {
     const isSyncing = await ipcRenderer.invoke('CHECK_SYNC_IN_PROGRESS');
-    Logger.info('[SYNC ENGINE] Not permitted to start fallback sync: ', isSyncing);
+    Logger.info('[START FALLBAK] Not permitted to start fallback sync: ', isSyncing);
 
     const isPermitted = !isSyncing;
     return isPermitted;