Merge pull request #212 from beNative/codex/enhance-auto-update-functionality-with-notifications

beNative · web-flow · commit 656c09a854b8 · 2025-11-11T07:23:42.000+01:00
Enhance update notification controls for auto-install
diff --git a/App.tsx b/App.tsx
@@ -1192,6 +1192,54 @@ export const MainApp: React.FC = () => {
         }
     }, []);
 
+    useEffect(() => {
+        if (typeof window === 'undefined') {
+            return;
+        }
+        if (window.electronAPI) {
+            return;
+        }
+        const params = new URLSearchParams(window.location.search);
+        const demoToast = params.get('demoUpdateToast');
+        if (!demoToast) {
+            return;
+        }
+
+        if (demoToast === 'downloading') {
+            const demoProgress = Number(params.get('demoProgress') ?? '68');
+            setUpdateToast(prev => ({
+                ...prev,
+                status: 'downloading',
+                version: prev.version ?? '0.7.0',
+                releaseName: prev.releaseName ?? 'Aurora',
+                progress: Number.isFinite(demoProgress) ? Math.max(0, Math.min(100, demoProgress)) : 68,
+                bytesTransferred: 45 * 1024 * 1024,
+                bytesTotal: 80 * 1024 * 1024,
+                visible: true,
+                snoozed: false,
+                errorMessage: null,
+                errorDetails: null,
+            }));
+            return;
+        }
+
+        if (demoToast === 'downloaded') {
+            setUpdateToast(prev => ({
+                ...prev,
+                status: 'downloaded',
+                version: prev.version ?? '0.7.0',
+                releaseName: prev.releaseName ?? 'Aurora',
+                progress: 100,
+                bytesTransferred: prev.bytesTotal ?? 80 * 1024 * 1024,
+                bytesTotal: prev.bytesTotal ?? 80 * 1024 * 1024,
+                visible: true,
+                snoozed: false,
+                errorMessage: null,
+                errorDetails: null,
+            }));
+        }
+    }, []);
+
     useEffect(() => {
         if (!window.electronAPI) {
             return;
@@ -2251,6 +2299,12 @@ export const MainApp: React.FC = () => {
         });
     }, []);
 
+    const handleAutoInstallPreferenceChange = useCallback((enabled: boolean) => {
+        addLog('INFO', `User action: ${enabled ? 'Enabled' : 'Disabled'} automatic installation via toast.`);
+        const nextSettings = { ...settings, autoInstallUpdates: enabled };
+        void saveSettings(nextSettings);
+    }, [addLog, saveSettings, settings]);
+
     const handleFormatDocument = useCallback(() => {
         const activeDoc = items.find(p => p.id === activeNodeId);
         if (activeDoc && activeDoc.type === 'document' && view === 'editor') {
@@ -3031,6 +3085,9 @@ export const MainApp: React.FC = () => {
                     onInstall={updateToast.status === 'downloaded' && window.electronAPI?.quitAndInstallUpdate
                         ? () => window.electronAPI!.quitAndInstallUpdate!()
                         : undefined}
+                    autoInstallEnabled={settings.autoInstallUpdates}
+                    autoInstallSupported={isElectron && !!window.electronAPI?.quitAndInstallUpdate}
+                    onAutoInstallChange={handleAutoInstallPreferenceChange}
                     onClose={handleUpdateToastClose}
                 />
             )}
diff --git a/components/SettingsView.tsx b/components/SettingsView.tsx
@@ -1929,6 +1929,17 @@ const GeneralSettingsSection: React.FC<Pick<SectionProps, 'settings' | 'setCurre
                 <SettingRow htmlFor="autoCheckForUpdates" label="Automatic Update Checks" description="Check for new releases whenever DocForge starts.">
                     <ToggleSwitch id="autoCheckForUpdates" checked={settings.autoCheckForUpdates} onChange={(val) => setCurrentSettings(s => ({...s, autoCheckForUpdates: val}))} />
                 </SettingRow>
+                <SettingRow
+                    htmlFor="autoInstallUpdates"
+                    label="Automatic Installation"
+                    description="When enabled, DocForge installs downloaded updates automatically the next time you restart."
+                >
+                    <ToggleSwitch
+                        id="autoInstallUpdates"
+                        checked={settings.autoInstallUpdates}
+                        onChange={(val) => setCurrentSettings(s => ({ ...s, autoInstallUpdates: val }))}
+                    />
+                </SettingRow>
                 <SettingRow label="Check for Updates" description="Run an update check immediately.">
                     <div className="flex flex-col items-start md:items-end gap-2 w-full">
                         <Button variant="secondary" onClick={handleManualUpdateCheck} isLoading={isManualCheckRunning} disabled={isManualCheckRunning || !canManuallyCheckForUpdates}>
diff --git a/components/UpdateNotification.tsx b/components/UpdateNotification.tsx
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom';
 import Button from './Button';
 import { DownloadIcon, XIcon, CheckIcon, InfoIcon } from './Icons';
 import IconButton from './IconButton';
+import ToggleSwitch from './ToggleSwitch';
 import { useLogger } from '../hooks/useLogger';
 
 type UpdateNotificationStatus = 'downloading' | 'downloaded' | 'error';
@@ -16,6 +17,9 @@ interface UpdateNotificationProps {
   errorMessage?: string | null;
   errorDetails?: string | null;
   onInstall?: () => void;
+  autoInstallEnabled?: boolean;
+  autoInstallSupported?: boolean;
+  onAutoInstallChange?: (enabled: boolean) => void;
   onClose: () => void;
 }
 
@@ -46,6 +50,9 @@ const UpdateNotification: React.FC<UpdateNotificationProps> = ({
   errorMessage,
   errorDetails,
   onInstall,
+  autoInstallEnabled,
+  autoInstallSupported = true,
+  onAutoInstallChange,
   onClose,
 }) => {
   const { addLog } = useLogger();
@@ -95,6 +102,14 @@ const UpdateNotification: React.FC<UpdateNotificationProps> = ({
     }
   };
 
+  const handleAutoInstallToggle = (value: boolean) => {
+    if (!onAutoInstallChange) {
+      return;
+    }
+    addLog('INFO', `User action: ${value ? 'Enabled' : 'Disabled'} automatic update installation from toast.`);
+    onAutoInstallChange(value);
+  };
+
   const renderContent = () => {
     if (status === 'downloaded') {
       return (
@@ -103,6 +118,36 @@ const UpdateNotification: React.FC<UpdateNotificationProps> = ({
           <p className="text-sm text-text-secondary mt-1">
             DocForge version <span className="font-semibold text-text-main">{versionLabel}</span> has been downloaded and is ready to go.
           </p>
+          {typeof autoInstallEnabled === 'boolean' && (
+            <div className="mt-4 space-y-3 rounded-lg border border-border-color/70 bg-background/40 p-4">
+              <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
+                <div className="space-y-1">
+                  <p className="text-sm font-semibold text-text-main">Install updates automatically</p>
+                  <p className="text-xs text-text-secondary">
+                    {autoInstallSupported
+                      ? 'DocForge will apply the update the next time you quit if this switch stays on.'
+                      : 'Automatic installation is only available in the desktop app.'}
+                  </p>
+                </div>
+                <ToggleSwitch
+                  id="update-auto-install"
+                  checked={autoInstallSupported ? autoInstallEnabled : false}
+                  disabled={!autoInstallSupported}
+                  onChange={handleAutoInstallToggle}
+                />
+              </div>
+              {autoInstallSupported && !autoInstallEnabled && (
+                <p className="text-xs text-warning">
+                  Auto-install is off. You&apos;ll need to restart DocForge manually to finish this update.
+                </p>
+              )}
+              {!autoInstallSupported && (
+                <p className="text-xs text-text-secondary">
+                  Switch to the desktop application to control automatic installation.
+                </p>
+              )}
+            </div>
+          )}
           <div className="mt-4 flex gap-3">
             {onInstall && (
               <Button onClick={handleInstall} variant="primary" className="flex-1">
diff --git a/constants.ts b/constants.ts
@@ -26,6 +26,7 @@ export const DEFAULT_SETTINGS: Settings = {
   autoSaveLogs: false,
   allowPrerelease: false,
   autoCheckForUpdates: true,
+  autoInstallUpdates: true,
   plantumlRendererMode: 'remote',
   uiScale: 100,
   documentTreeIndent: 16,
diff --git a/electron/main.ts b/electron/main.ts
@@ -59,6 +59,15 @@ if (process.platform === 'win32') {
 let mainWindow: BrowserWindow | null;
 let autoCheckEnabled = true;
 let pendingAutoUpdateCheck: NodeJS.Timeout | null = null;
+let autoInstallOnQuit = true;
+
+const applyAutoInstallPreference = (enabled: boolean) => {
+  autoInstallOnQuit = enabled;
+  autoUpdater.autoInstallOnAppQuit = enabled;
+  console.log(`Automatic update installation on quit ${enabled ? 'enabled' : 'disabled'}.`);
+};
+
+applyAutoInstallPreference(autoInstallOnQuit);
 
 const cancelScheduledAutoUpdateCheck = () => {
   if (pendingAutoUpdateCheck) {
@@ -385,6 +394,17 @@ app.on('ready', () => {
     console.error('Failed to read auto-update preference from settings:', error);
   }
 
+  try {
+    const storedAutoInstall = databaseService.getSetting('autoInstallUpdates');
+    if (typeof storedAutoInstall === 'boolean') {
+      applyAutoInstallPreference(storedAutoInstall);
+    } else if (typeof storedAutoInstall !== 'undefined') {
+      applyAutoInstallPreference(Boolean(storedAutoInstall));
+    }
+  } catch (error) {
+    console.error('Failed to read auto-install preference from settings:', error);
+  }
+
   if (autoCheckEnabled) {
     scheduleAutoUpdateCheck();
   } else {
@@ -648,6 +668,9 @@ ipcMain.on('updater:set-auto-check-enabled', (_, enabled: boolean) => {
         cancelScheduledAutoUpdateCheck();
     }
 });
+ipcMain.on('updater:set-auto-install-enabled', (_, enabled: boolean) => {
+    applyAutoInstallPreference(enabled);
+});
 ipcMain.on('updater:quit-and-install', () => {
     autoUpdater.quitAndInstall();
 });
diff --git a/electron/preload.ts b/electron/preload.ts
@@ -63,6 +63,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   renderPlantUML: (diagram: string, format: 'svg' = 'svg') => ipcRenderer.invoke('plantuml:render-svg', diagram, format),
   updaterSetAllowPrerelease: (allow: boolean) => ipcRenderer.send('updater:set-allow-prerelease', allow),
   updaterSetAutoCheckEnabled: (enabled: boolean) => ipcRenderer.send('updater:set-auto-check-enabled', enabled),
+  updaterSetAutoInstallEnabled: (enabled: boolean) => ipcRenderer.send('updater:set-auto-install-enabled', enabled),
   updaterCheckForUpdates: () => ipcRenderer.invoke('updater:check-now') as Promise<ManualUpdateCheckResult>,
   onUpdateAvailable: (callback: (info: UpdateAvailableInfo) => void) => {
     const handler = (_: IpcRendererEvent, info: UpdateAvailableInfo) => callback(info);
diff --git a/hooks/useSettings.ts b/hooks/useSettings.ts
@@ -88,6 +88,13 @@ export const useSettings = () => {
     }
   }, [settings.autoCheckForUpdates, loaded, addLog]);
 
+  useEffect(() => {
+    if (loaded && isElectron && window.electronAPI?.updaterSetAutoInstallEnabled) {
+      addLog('DEBUG', `Notifying main process: autoInstallUpdates is ${settings.autoInstallUpdates}`);
+      window.electronAPI.updaterSetAutoInstallEnabled(settings.autoInstallUpdates);
+    }
+  }, [settings.autoInstallUpdates, loaded, addLog]);
+
   const saveSettings = useCallback(async (newSettings: Settings) => {
     setSettings(newSettings);
     await repository.saveAllSettings(newSettings);
diff --git a/types.ts b/types.ts
@@ -42,6 +42,7 @@ declare global {
       ) => Promise<{ success: boolean; svg?: string; error?: string; details?: string }>;
       updaterSetAllowPrerelease: (allow: boolean) => void;
       updaterSetAutoCheckEnabled?: (enabled: boolean) => void;
+      updaterSetAutoInstallEnabled?: (enabled: boolean) => void;
       updaterCheckForUpdates?: () => Promise<ManualUpdateCheckResult>;
       onUpdateAvailable?: (callback: (info: UpdateAvailableInfo) => void) => () => void;
       onUpdateDownloadProgress?: (callback: (progress: UpdateDownloadProgress) => void) => () => void;
@@ -485,6 +486,7 @@ export interface Settings {
   autoSaveLogs: boolean;
   allowPrerelease: boolean;
   autoCheckForUpdates: boolean;
+  autoInstallUpdates: boolean;
   plantumlRendererMode: 'remote' | 'offline';
   uiScale: number;
   documentTreeIndent: number;
